Updated with latest changes

Author: jeppefrandsen

.gitignore

@@ -0,0 +1,2 @@
+autoinstalled/
+__pycache__/

WebKit/Tools/Scripts/libraries/reporelaypy/LICENSE

@@ -0,0 +1,21 @@
+Copyright (C) 2024 Apple Inc. All rights reserved.
+#
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1.  Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2.  Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+#
+THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

WebKit/Tools/Scripts/libraries/reporelaypy/README.md

@@ -0,0 +1,3 @@
+# reporelay
+
+Library implementing https://commits.webkit.org for the WebKit project.

WebKit/Tools/Scripts/libraries/reporelaypy/reporelaypy/__init__.py

@@ -20,9 +20,13 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import os
 import sys
 
+if sys.version_info < (3, 9):  # noqa: UP036
+    raise ImportError("reporelaypy requires Python 3.9 or above")
+
+import os
+
 
 def _maybe_add_webkit_python_library_paths():
     # Hopefully we're beside webkit*py libraries, otherwise webkit*py will need to be installed.
@@ -40,8 +44,8 @@ def _maybe_add_webkit_python_library_paths():
 except ImportError:
     raise ImportError(
         "'webkitcorepy' could not be found on your Python path.\n" +
-        "You are not running from a WebKit checkout.\n" +
-        "Please install webkitcorepy with `pip install webkitcorepy --extra-index-url <package index URL>`"
+        "You are not running from a complete WebKit checkout.\n" +
+        "See https://github.com/WebKit/WebKit/tree/main/Tools/Scripts/libraries/webkitcorepy"
     )
 
 version = Version(0, 8, 5)

WebKit/Tools/Scripts/libraries/reporelaypy/run

@@ -26,6 +26,7 @@ import argparse
 import json
 import math
 import os
+import shutil
 import subprocess
 import sys
 import time
@@ -41,7 +42,6 @@ if os.path.isdir(os.path.join(scripts, 'webkitpy')):
 from reporelaypy import Checkout, HookProcessor, HookReceiver, Redirector
 from webkitflaskpy import Database
 from webkitcorepy import arguments, AutoInstall
-from whichcraft import which
 
 
 def main(args=None):
@@ -189,7 +189,7 @@ def main(args=None):
     processor = HookProcessor(checkout=checkout, database=database) if args.hooks else None
 
     with subprocess.Popen(
-        [which('gunicorn'), 'reporelaypy.webserver:app'],
+        [shutil.which('gunicorn'), 'reporelaypy.webserver:app'],
         cwd=os.path.dirname(os.path.dirname(reporelaypy.__file__)),
         env=passenv,
     ) as webserver:

WebKit/Tools/Scripts/libraries/reporelaypy/setup.py

@@ -33,6 +33,7 @@ def readme():
     version='0.8.5',
     description='Library for visualizing, processing and storing test results.',
     long_description=readme(),
+    long_description_content_type='text/markdown',
     classifiers=[
         'Development Status :: 4 - Beta',
         'Framework :: Flask',
@@ -51,7 +52,7 @@ def readme():
     license='Modified BSD',
     packages=[
         'reporelaypy',
-        'reporelaypy.test',
+        'reporelaypy.tests',
     ],
     install_requires=[
         'xmltodict',

WebKit/Tools/Scripts/libraries/resultsdbpy/LICENSE

@@ -0,0 +1,21 @@
+Copyright (C) 2024 Apple Inc. All rights reserved.
+#
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1.  Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2.  Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+#
+THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

WebKit/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/__init__.py

@@ -20,9 +20,13 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import sys
+
+if sys.version_info < (3, 9):  # noqa: UP036
+    raise ImportError("resultsdbpy requires Python 3.9 or above")
+
 import os
 import platform
-import sys
 
 
 def _maybe_add_webkit_python_library_paths():
@@ -41,8 +45,8 @@ def _maybe_add_webkit_python_library_paths():
 except ImportError:
     raise ImportError(
         "'webkitcorepy' could not be found on your Python path.\n" +
-        "You are not running from a WebKit checkout.\n" +
-        "Please install webkitcorepy with `pip install webkitcorepy --extra-index-url <package index URL>`"
+        "You are not running from a complete WebKit checkout.\n" +
+        "See https://github.com/WebKit/WebKit/tree/main/Tools/Scripts/libraries/webkitcorepy"
     )
 
 version = Version(3, 1, 9)
@@ -53,34 +57,29 @@ def _maybe_add_webkit_python_library_paths():
 AutoInstall.register(Package('attrs', Version(21, 3, 0)))
 AutoInstall.register(Package('aioredis', Version(1, 3, 1)))
 AutoInstall.register(Package('async-timeout', Version(3, 0, 1)))
-
-if sys.version_info >= (3, 9):
-    AutoInstall.register(Package('boto3', Version(1, 33, 10), wheel=True))
-    AutoInstall.register(Package('botocore', Version(1, 34, 5), wheel=True))
-    AutoInstall.register(Package('jmespath', Version(1, 0, 1), wheel=True))
-else:
-    AutoInstall.register(Package('boto3', Version(1, 16, 63), wheel=True))
-    AutoInstall.register(Package('botocore', Version(1, 19, 63), wheel=True))
-    AutoInstall.register(Package('jmespath', Version(0, 10, 0), wheel=True))
+AutoInstall.register(Package('boto3', Version(1, 33, 10), wheel=True))
+AutoInstall.register(Package('botocore', Version(1, 34, 5), wheel=True))
+AutoInstall.register(Package('jmespath', Version(1, 0, 1), wheel=True))
 
 if platform.machine() == 'arm64':
     AutoInstall.register(Package('cassandra', Version(3, 25, 0), pypi_name='cassandra-driver', slow_install=True))
 else:
     AutoInstall.register(Package('cassandra', Version(3, 25, 0), pypi_name='cassandra-driver', wheel=True))
-AutoInstall.register(Package('click', Version(7, 1, 2)))
+
 AutoInstall.register(Package('Crypto', Version(3, 10, 1), pypi_name='pycryptodome'))
 AutoInstall.register(Package('fakeredis', Version(1, 5, 2)))
 AutoInstall.register(Package('geomet', Version(0, 2, 1)))
 AutoInstall.register(Package('gremlinpython', Version(3, 4, 6)))
-AutoInstall.register(Package('hiredis', Version(1, 1, 0)))
 AutoInstall.register(Package('isodate', Version(0, 6, 0)))
-AutoInstall.register(Package('lupa', Version(1, 13)))
 AutoInstall.register(Package('pyasn1_modules', Version(0, 2, 8), pypi_name='pyasn1-modules'))
 AutoInstall.register(Package('redis', Version(3, 5, 3)))
-if sys.version_info < (3, 8):
-    AutoInstall.register(Package('selenium', Version(3, 141, 0)))
+
+if sys.platform == 'linux':
+    AutoInstall.register(Package('selenium', Version(4, 24, 0), wheel=True, implicit_deps=[
+        Package('websocket', Version(1, 8, 0), pypi_name='websocket-client')]))
 else:
     AutoInstall.register(Package('selenium', Version(4, 12, 0), wheel=True))
+
 AutoInstall.register(Package('service_identity', Version(21, 1, 0), pypi_name='service-identity'))
 AutoInstall.register(Package('sortedcontainers', Version(2, 4, 0)))
 AutoInstall.register(Package('tornado', Version(4, 5, 3)))

WebKit/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/controller/archive_controller.py

@@ -85,7 +85,7 @@ def download(
 
         if not result:
             abort(404, description='No archives matching the specified criteria')
-        return send_file(result, attachment_filename=f'{filename}.zip', as_attachment=True)
+        return send_file(result, download_name=f'{filename}.zip', as_attachment=True)
 
     def upload(self):
         AssertRequest.is_type(['POST'])

WebKit/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/flask_support/flask_testcase.py

@@ -41,7 +41,7 @@ class FlaskTestCase(unittest.TestCase):
 
     @classmethod
     def driver(cls):
-        if cls._cached_driver:
+        if not int(os.environ.get('selenium', '0')) or cls._cached_driver:
             return cls._driver
 
         try:

WebKit/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/model/wait_for_docker_test_case.py

@@ -32,7 +32,7 @@
 class WaitForDockerTestCase(unittest.TestCase):
 
     def setUp(self):
-        if Docker.is_running() and int(os.environ.get('slow_tests', '0')):
+        if int(os.environ.get('slow_tests', '0')) and Docker.is_running():
             with Docker.instance():
                 StrictRedis().flushdb()
         FakeStrictRedis().flushdb()

WebKit/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/view/static/js/configuration.js

@@ -115,22 +115,45 @@ class Configuration {
             return '';
         if (['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H'].includes(match[2]))
             return match[2];
-        if (['J', 'N', 'R'].includes(match[2]))
-            return 'A';
-        if (['K', 'S'].includes(match[2])) {
+        if (['J', 'R'].includes(match[2])) {
             const count = parseInt(match[3]);
-            if (count < 200)
+            if (count < 500)
+                return 'A';
+            if (count < 700)
                 return 'B';
+            if (count < 800)
+                return 'C';
+            return 'D';
+        }
+        if (['N'].includes(match[2])) {
+            const count = parseInt(match[3]);
             if (count < 500)
-                return 'C'
+                return 'A';
+            if (count < 700)
+                return 'B';
+            if (count <= 800 || count >= 840 && count < 870)
+                return 'C';
             return 'D';
         }
+        if (['K'].includes(match[2])) {
+            const count = parseInt(match[3]);
+            if (count < 200)
+                return 'B';
+            if (count < 510)
+                return 'C';
+            return 'D';
+        }
+        if (['S'].includes(match[2])) {
+            return 'C';
+        }
         if (['L', 'O', 'T'].includes(match[2])) {
             const count = parseInt(match[3]);
             if (count < 400)
                 return 'E'
             return 'F';
         }
+        if (['M'].includes(match[2]) && Number(match[1]) >= 23)
+            return 'A';
         if (['M', 'U'].includes(match[2]))
             return 'G';
 

WebKit/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/view/static/js/drawer.js

@@ -123,10 +123,15 @@ function CommitSearchBar(onSearchAction = null) {
         }
     });
     const searchHotKeyFunction = (e) => {
-        if (e.key == "f" && ( e.ctrlKey || e.metaKey )) {
-            e.preventDefault();
-            searchInputRef.element.focus();
-        }
+        if (e.key !== "f" || !( e.ctrlKey || e.metaKey ))
+            return;
+
+        const element = searchInputRef.element;
+        if (element.disabled)
+            return;
+
+        e.preventDefault();
+        element.focus();
     };
     const searchInputEventStream = searchInputRef.fromEvent("keyup");
     searchInputEventStream.action((e) => {
@@ -138,8 +143,8 @@ function CommitSearchBar(onSearchAction = null) {
     });
 
     const searchButtonRef = REF.createRef({});
-    const searchButtonClikEventStream = searchButtonRef.fromEvent("click");
-    searchButtonClikEventStream.action((e) => {
+    const searchButtonClickEventStream = searchButtonRef.fromEvent("click");
+    searchButtonClickEventStream.action((e) => {
         const searchValue = searchInputRef.element.value;
         if (onSearchAction)
             onSearchAction(searchValue);

WebKit/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/view/static/library/css/webkit.css

@@ -649,6 +649,18 @@ pre {
   border-radius: var(--tinySize);
 }
 
+.dot.tiny img, .dot.tiny .text {
+  width: calc(var(--tinySize) - 2px);
+  height: calc(var(--tinySize) - 2px);
+  font-size: calc(var(--tinySize) - 2px);
+}
+
+.dot.tiny>img, .dot.tiny>.text {
+  position: absolute;
+  top: 1px;
+  left: 1px;
+}
+
 .dot.small {
   font-size: var(--tinySize);
   width: var(--smallSize);

WebKit/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/view/templates/search.html

@@ -340,7 +340,7 @@
                 const queryString = paramsToQuery(params);
                 window.history.pushState(queryString, '', splitURL[0] + '?' + queryString);
             }, SUITES)}
-            ${dashboards.map(dashboard=>{return dashboard.toString();})}
+            ${dashboards.map(dashboard=>{return dashboard.toString();}).join('')}
             ${view}
         </div>
     </div>`

WebKit/Tools/Scripts/libraries/resultsdbpy/resultsdbpy/view/view_routes_unittest.py

@@ -116,6 +116,7 @@ def test_commit_link(self, driver, **kwargs):
     @WaitForDockerTestCase.mock_if_no_docker(mock_redis=FakeStrictRedis, mock_cassandra=MockCassandraContext)
     @FlaskTestCase.run_with_webserver()
     def test_constants(self, client, **kwargs):
+        self.maxDiff = None
         response = client.get(f'{self.URL}/assets/js/constants.js')
         self.assertEqual(response.status_code, 200)
         self.assertEqual(
@@ -147,6 +148,10 @@ def test_constants(self, client, **kwargs):
     'Build',
 ];
 const DEFAULT_ARCHITECTURE = null;
+const TESTS_LIMITS = JSON.parse('{"max": 50000, "default": 5000}');
+const SUITES_LIMITS = JSON.parse('{"max": 10000, "default": 1000}');
+const COMMITS_LIMITS = JSON.parse('{"max": 10000, "default": 1000}');
+const DASHBOARD_QUERY = JSON.parse('[]');
 
-export {XCODE_CLOUD_SUITES, DEFAULT_ARCHITECTURE}''',
+export {XCODE_CLOUD_SUITES, DEFAULT_ARCHITECTURE, TESTS_LIMITS, SUITES_LIMITS, COMMITS_LIMITS, DASHBOARD_QUERY}''',
         )

WebKit/Tools/Scripts/libraries/resultsdbpy/setup.py

@@ -33,6 +33,7 @@ def readme():
     version='3.1.9',
     description='Library for visualizing, processing and storing test results.',
     long_description=readme(),
+    long_description_content_type='text/markdown',
     classifiers=[
         'Development Status :: 4 - Beta',
         'Framework :: Flask',

WebKit/Tools/Scripts/libraries/webkitbugspy/LICENSE

@@ -0,0 +1,21 @@
+Copyright (C) 2024 Apple Inc. All rights reserved.
+#
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1.  Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2.  Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+#
+THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

WebKit/Tools/Scripts/libraries/webkitbugspy/setup.py

@@ -30,9 +30,10 @@ def readme():
 
 setup(
     name='webkitbugspy',
-    version='0.15.0',
+    version='0.15.1',
     description='Library containing a shared API for various bug trackers.',
     long_description=readme(),
+    long_description_content_type='text/markdown',
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',