smart-tests-cli 2.15.1__tar.gz → 2.16.0__tar.gz

{smart_tests_cli-2.15.1 → smart_tests_cli-2.16.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: smart-tests-cli
-Version: 2.15.1
+Version: 2.16.0
 Summary: Smart Tests CLI
 Author-email: CloudBees <support@cloudbees.com>
 License: Apache Software License v2
@@ -20,6 +20,7 @@ Requires-Dist: python-dateutil>=2.9
 Requires-Dist: tabulate>=0.9
 Requires-Dist: click<8.2,>=8.1
 Requires-Dist: InquirerPy>=0.3.4
+Requires-Dist: requests-toolbelt>=1.0.0
 Dynamic: license-file
 
 This is a CLI to interact with CloudBees Smart Tests.

{smart_tests_cli-2.15.1 → smart_tests_cli-2.16.0}/pyproject.toml

@@ -19,6 +19,7 @@ dependencies = [
     "tabulate>=0.9",
     "click>=8.1,<8.2",
     "InquirerPy>=0.3.4",
+    "requests-toolbelt>=1.0.0",
 ]
 dynamic = ["version"]
 

{smart_tests_cli-2.15.1 → smart_tests_cli-2.16.0}/scripts/update_schema.sh

@@ -5,12 +5,15 @@ set -e
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 CLI_DIR="$(dirname "$SCRIPT_DIR")"
 SCHEMA_FILE="$CLI_DIR/smart_tests/schema/openapi-schema.json"
+# Override with SCHEMA_PORT if the dev server runs on another port
+SCHEMA_PORT="${SCHEMA_PORT:-8081}"
+API_DOCS_URL="http://localhost:$SCHEMA_PORT/intake/v3/api-docs"
 
 echo "Fetching OpenAPI schema from local dev server..."
 
 # Check if mothership is running
-if ! curl -s -f http://localhost:8080/intake/v3/api-docs > /dev/null 2>&1; then
-    echo "Error: Mothership dev server not running at localhost:8080"
+if ! curl -s -f "$API_DOCS_URL" > /dev/null 2>&1; then
+    echo "Error: Mothership dev server not running at localhost:$SCHEMA_PORT"
     echo "Please start it with: cd mothership && bazel run //src/main/java/com/launchableinc/mercury/intake"
     exit 1
 fi
@@ -19,7 +22,7 @@ fi
 mkdir -p "$(dirname "$SCHEMA_FILE")"
 
 # Fetch and save schema
-curl -s http://localhost:8080/intake/v3/api-docs > "$SCHEMA_FILE"
+curl -s "$API_DOCS_URL" > "$SCHEMA_FILE"
 
 # Validate and format the JSON with proper indentation and trailing newline
 python3 << PYTHON_EOF

{smart_tests_cli-2.15.1 → smart_tests_cli-2.16.0}/smart_tests/commands/record/session.py

@@ -97,8 +97,8 @@ def session(
         res = client.request("post", sub_path, payload=payload)
 
         if res.status_code == HTTPStatus.NOT_FOUND:
-            msg = f"Build {build_name} was not found." \
-                f"Make sure to run `launchable record build --build {build_name}` before you run this command."
+            msg = f"Build {build_name} was not found. " \
+                f"Make sure to run `smart-tests record build --build {build_name}` before you run this command."
             tracking_client.send_error_event(
                 event_name=Tracking.ErrorEvent.INTERNAL_CLI_ERROR,
                 stack_trace=msg,

{smart_tests_cli-2.15.1 → smart_tests_cli-2.16.0}/smart_tests/commands/record/tests.py

@@ -12,6 +12,7 @@ import click
 from dateutil.parser import ParserError, parse
 from junitparser import JUnitXml, TestCase, TestSuite  # type: ignore  # noqa: F401
 from more_itertools import ichunked
+from requests_toolbelt import MultipartEncoder  # type: ignore
 from tabulate import tabulate
 
 import smart_tests.args4p.converters as converters
@@ -33,6 +34,13 @@ from ...utils.logger import Logger
 from ...utils.smart_tests_client import SmartTestsClient
 from .case_event import CaseEvent, CaseEventGenerator, CaseEventType, DataBuilder, TestPathBuilder
 
+# Together with the workers sending events, this stays within urllib3's default pool size (10 connections per host)
+MAX_RAW_FILE_UPLOAD_WORKERS = 5
+# (connect timeout, read timeout)
+# urllib3 applies the connect timeout to each write of the request body, too. The read timeout is long because
+# the server may store the file before responding.
+RAW_FILE_UPLOAD_TIMEOUT = (30, 300)
+
 GROUP_NAME_RULE = re.compile("^[a-zA-Z0-9][a-zA-Z0-9_-]*$")
 RESERVED_GROUP_NAMES = ["group", "groups", "nogroup", "nogroups"]
 
@@ -272,17 +280,19 @@ class RecordTests:
             url = f"{self.client.base_url()}{path}"
 
             with open(file_path, 'rb') as f:
-                files = {'file': (os.path.basename(file_path), f)}
+                # Stream the multipart body instead of using `files=`. With `files=`, requests builds the whole body
+                # in memory and writes it in one go, and urllib3 applies the connect timeout to that write, so large
+                # files fail with "The write operation timed out".
+                body = MultipartEncoder(fields={'file': (os.path.basename(file_path), f)})
                 headers = self.client.http_client._headers(compress=False)
-                # Remove Content-Type header to let requests set it for multipart
-                headers.pop('Content-Type', None)
+                headers['Content-Type'] = body.content_type
 
                 response = self.client.http_client.session.request(
                     'POST',
                     url,
-                    files=files,
+                    data=body,
                     headers=headers,
-                    timeout=(5, 60),
+                    timeout=RAW_FILE_UPLOAD_TIMEOUT,
                     verify=(not self.client.http_client.skip_cert_verification)
                 )
 
@@ -300,17 +310,21 @@ class RecordTests:
             self.logger.warning(f"Error uploading raw test result file {file_path}: {str(e)}")
             return False
 
-    def upload_raw_files(self) -> None:
+    def upload_raw_files(self, executor: ThreadPoolExecutor) -> None:
 
         if self.reports and not self.dry_run:
             self.logger.debug(f"Uploading {len(self.reports)} raw test result file(s)")
             for report_file in self.reports:
-                self.upload_raw_file(report_file)
+                executor.submit(self.upload_raw_file, report_file)
 
     def run(self):
-        # Upload raw test result files before parsing
-        self.upload_raw_files()
+        # Upload raw test result files in the background while parsing and recording test results,
+        # so that large files don't delay recording. Leaving the `with` block waits for the uploads to finish.
+        with ThreadPoolExecutor(max_workers=MAX_RAW_FILE_UPLOAD_WORKERS) as executor:
+            self.upload_raw_files(executor)
+            self._record_tests()
 
+    def _record_tests(self):
         count = 0  # count number of test cases sent
         is_observation = False
 
@@ -487,7 +501,7 @@ class RecordTests:
         url = self._get_test_session_url()
         click.echo(
             f"\nVisit {url} to view uploaded test results "
-            f"(or run `launchable inspect tests --test-session-id {self.test_session_id}`)")
+            f"(or run `smart-tests inspect tests --test-session-id {self.test_session_id}`)")
 
     def _get_test_session_url(self) -> str:
         cbp_workspace = self.client.get_cbp_workspace()

{smart_tests_cli-2.15.1 → smart_tests_cli-2.16.0}/smart_tests/commands/view/__init__.py

@@ -3,6 +3,7 @@ from ...app import Application
 from .flaky_tests import flaky_tests
 from .longest_tests import longest_tests
 from .never_failing_tests import never_failing_tests
+from .subsets import subsets
 from .test_results import test_results
 
 
@@ -14,4 +15,5 @@ def view(app: Application):
 view.add_command(flaky_tests)
 view.add_command(longest_tests)
 view.add_command(never_failing_tests)
+view.add_command(subsets)
 view.add_command(test_results)

smart_tests_cli-2.16.0/smart_tests/commands/view/subsets.py

@@ -0,0 +1,50 @@
+import json
+import sys
+from http import HTTPStatus
+from typing import Annotated
+
+import click
+
+import smart_tests.args4p.typer as typer
+from smart_tests.args4p.converters import intType
+
+from ... import args4p
+from ...app import Application
+from ...utils.smart_tests_client import SmartTestsClient
+
+
+@args4p.command(help="View subsets requested in a test session")
+def subsets(
+    app: Application,
+    test_session_id: Annotated[int, typer.Option(
+        "--test-session-id",
+        help="Test session ID to list subsets for (required)",
+        type=intType(min=1),
+        metavar="ID",
+        required=True
+    )],
+):
+    """View subsets requested in a test session, in the order they were requested"""
+    client = SmartTestsClient(app=app)
+
+    try:
+        res = client.request("get", "view/subsets", params={"test-session-id": str(test_session_id)})
+
+        if res.status_code == HTTPStatus.NOT_FOUND:
+            click.secho(
+                f"Test session {test_session_id} not found. Check the test session ID and try again.",
+                fg='yellow', err=True
+            )
+            sys.exit(1)
+
+        res.raise_for_status()
+        response_json = res.json()
+
+        click.echo(json.dumps(response_json, indent=2))
+
+    except Exception as e:
+        client.print_exception_and_recover(
+            e,
+            "Warning: failed to retrieve subsets from server"
+        )
+        sys.exit(1)