feature: add/remove/edit existing commands

Author: ninjinkun

smart_tests/__main__.py

@@ -4,7 +4,7 @@
 import os
 from glob import glob
 from os.path import basename, dirname, join
-from typing import Annotated, Optional
+from typing import Annotated
 
 import typer
 
@@ -89,7 +89,7 @@ def main(
     log_level: Annotated[str, typer.Option(
         help="Set logger's log level (CRITICAL, ERROR, WARNING, AUDIT, INFO, DEBUG)."
     )] = logger.LOG_LEVEL_DEFAULT_STR,
-    plugin_dir: Annotated[Optional[str], typer.Option(
+    plugin_dir: Annotated[str | None, typer.Option(
         "--plugin-dir", "--plugins",
         help="Directory to load plugins from"
     )] = None,
@@ -105,7 +105,7 @@ def main(
              "like CERTIFICATE_VERIFY_FAILED, at the expense of vulnerability against "
              "a possible man-in-the-middle attack. Use it as an escape hatch, but with caution."
     )] = False,
-    version: Annotated[Optional[bool], typer.Option(
+    version: Annotated[bool | None, typer.Option(
         "--version", help="Show version and exit", callback=version_callback, is_eager=True
     )] = None,
 ):

smart_tests/commands/record/build.py

@@ -6,7 +6,7 @@
 import typer
 from tabulate import tabulate
 
-from smart_tests.utils.link import CIRCLECI_KEY, GITHUB_ACTIONS_KEY, JENKINS_URL_KEY, LinkKind, capture_link
+from smart_tests.utils.link import CIRCLECI_KEY, GITHUB_ACTIONS_KEY, JENKINS_URL_KEY, capture_link
 from smart_tests.utils.tracking import Tracking, TrackingClient
 
 from ...utils import subprocess
@@ -34,6 +34,15 @@ def build(
         help="build name",
         metavar="BUILD_NAME"
     )],
+    branch: Annotated[str, typer.Option(
+        "--branch",
+        help="Branch name. A branch is a set of test sessions grouped and this option value will be used for a lineage name."
+    )],
+    repositories: Annotated[List[str], typer.Option(
+        "--repository",
+        help="Set repository name and branch name when you use --no-commit-collection option. "
+             "Please use the same repository name with a commit option"
+    )] = [],
     source: Annotated[List[str], typer.Option(
         help="path to local Git workspace, optionally prefixed by a label. "
              "like --source path/to/ws or --source main=path/to/ws",
@@ -51,23 +60,10 @@ def build(
              "possible. The commit data must be collected with a separate fully-cloned "
              "repository."
     )] = False,
-    scrub_pii: Annotated[bool, typer.Option(
-        help="Scrub emails and names",
-        hidden=True
-    )] = False,
     commits: Annotated[List[str], typer.Option(
         "--commit",
         help="set repository name and commit hash when you use --no-commit-collection option"
     )] = [],
-    links: Annotated[List[str], typer.Option(
-        "--link",
-        help="Set external link of title and url"
-    )] = [],
-    branches: Annotated[List[str], typer.Option(
-        "--branch",
-        help="Set repository name and branch name when you use --no-commit-collection option. "
-             "Please use the same repository name with a commit option"
-    )] = [],
     lineage: Annotated[Optional[str], typer.Option(
         help="hidden option to directly specify the lineage name without relying on branches",
         hidden=True
@@ -79,9 +75,8 @@ def build(
 ):
     app = ctx.obj
 
-    # Parse key-value pairs for commits and links
+    # Parse key-value pairs for commits
     parsed_commits = [validate_key_value(c) for c in commits]
-    parsed_links = [validate_key_value(link) for link in links]
 
     # Parse timestamp if provided
     parsed_timestamp = None
@@ -229,22 +224,23 @@ def list_submodules(workspaces: List[Workspace]) -> List[Workspace]:
     def compute_hash_and_branch(ws: List[Workspace]):
         ws_by_name = {w.name: w for w in ws}
 
+        # Process repository options to create branch name mappings
         branch_name_map = dict()
-        if len(branches) == 1 and len(ws) == 1 and not ('=' in branches[0]):
-            # if there's only one repo and the short form "--branch NAME" is used, then we assign that to the first repo
-            branch_name_map[ws[0].name] = branches[0]
+        if len(repositories) == 1 and len(ws) == 1 and not ('=' in repositories[0]):
+            # if there's only one repo and the short form "--repository NAME" is used, then we assign that to the first repo
+            branch_name_map[ws[0].name] = repositories[0]
         else:
-            for b in branches:
-                kv = b.split('=')
+            for r in repositories:
+                kv = r.split('=')
                 if len(kv) != 2:
                     typer.secho(
-                        "Expected --branch REPO=BRANCHNAME but got {}".format(kv),
+                        "Expected --repository REPO=BRANCHNAME but got {}".format(kv),
                         fg=typer.colors.YELLOW, err=True)
                     raise typer.Exit(1)
 
                 if not ws_by_name.get(kv[0]):
                     typer.secho(
-                        "Invalid repository name {} in a --branch option. ".format(kv[0]),
+                        "Invalid repository name {} in a --repository option. ".format(kv[0]),
                         fg=typer.colors.YELLOW, err=True)
                     # TODO: is there any reason this is not an error? for now erring on caution
                     # sys.exit(1)
@@ -289,20 +285,14 @@ def send(ws: List[Workspace]) -> Optional[str]:
         # figure out all the CI links to capture
         def compute_links():
             _links = capture_link(os.environ)
-            for k, v in parsed_links:
-                _links.append({
-                    "title": k,
-                    "url": v,
-                    "kind": LinkKind.CUSTOM_LINK.name,
-                })
             return _links
 
         tracking_client = TrackingClient(Tracking.Command.RECORD_BUILD, app=app)
         client = LaunchableClient(app=app, tracking_client=tracking_client)
         try:
             payload = {
                 "buildNumber": build_name,
-                "lineage": lineage or ws[0].branch,
+                "lineage": lineage or branch,
                 "commitHashes": [{
                     'repositoryName': w.name,
                     'commitHash': w.commit_hash,

smart_tests/commands/record/session.py

@@ -2,7 +2,7 @@
 import re
 import sys
 from http import HTTPStatus
-from typing import Annotated, List, Optional
+from typing import Annotated, List
 
 import typer
 
@@ -36,6 +36,11 @@ def session(
         "--session",
         help="test session name"
     )],
+    test_suite: Annotated[str, typer.Option(
+        "--test-suite",
+        help="Set test suite name. A test suite is a collection of test sessions. Setting a test suite allows you to "
+             "manage data over test sessions and lineages."
+    )],
     print_session: bool = True,
     flavor: Annotated[List[str], typer.Option(
         "--flavor",
@@ -54,16 +59,7 @@ def session(
         "--no-build",
         help="If you want to only send test reports, please use this option"
     )] = False,
-    lineage: Annotated[Optional[str], typer.Option(
-        help="Set lineage name. A lineage is a set of test sessions grouped and this option value will be used for a "
-             "lineage name."
-    )] = None,
-    test_suite: Annotated[Optional[str], typer.Option(
-        "--test-suite",
-        help="Set test suite name. A test suite is a collection of test sessions. Setting a test suite allows you to "
-             "manage data over test sessions and lineages."
-    )] = None,
-    timestamp: Annotated[Optional[str], typer.Option(
+    timestamp: Annotated[str | None, typer.Option(
         help="Used to overwrite the session time when importing historical data. Note: Format must be "
              "`YYYY-MM-DDThh:mm:ssTZD` or `YYYY-MM-DDThh:mm:ss` (local timezone applied)"
     )] = None,
@@ -155,7 +151,6 @@ def session(
         "flavors": flavor_dict,
         "isObservation": is_observation,
         "noBuild": is_no_build,
-        "lineage": lineage,
         "testSuite": test_suite,
         "timestamp": parsed_timestamp.isoformat() if parsed_timestamp else None,
     }

smart_tests/commands/record/tests.py

@@ -23,7 +23,6 @@
 from ...utils.launchable_client import LaunchableClient
 from ...utils.logger import Logger
 from ...utils.no_build import NO_BUILD_BUILD_NAME, NO_BUILD_TEST_SESSION_ID
-from ...utils.typer_types import validate_datetime_with_tz
 from ..helper import get_session_id, parse_session
 from .case_event import CaseEvent, CaseEventType
 
@@ -56,19 +55,18 @@ def tests_main(
         "--session",
         help="test session name"
     )],
-    base_path: Annotated[Optional[Path], typer.Option(
+    build_name: Annotated[str | None, typer.Option(
+        "--build",
+        help="build name"
+    )] = None,
+    base_path: Annotated[Path | None, typer.Option(
         "--base",
         help="(Advanced) base directory to make test names portable",
         exists=True,
         file_okay=False,
         dir_okay=True,
         resolve_path=True
     )] = None,
-    build_name: Annotated[Optional[str], typer.Option(
-        "--build",
-        help="build name",
-        hidden=True
-    )] = None,
     post_chunk: Annotated[int, typer.Option(
         "--post-chunk",
         help="Post chunk"
@@ -92,33 +90,18 @@ def tests_main(
              "Use with --dry-run",
         hidden=True
     )] = False,
-    group: Annotated[Optional[str], typer.Option(
+    group: Annotated[str | None, typer.Option(
         help="Grouping name for test results"
     )] = "",
     is_allow_test_before_build: Annotated[bool, typer.Option(
         "--allow-test-before-build",
         help="",
         hidden=True
     )] = False,
-    links: Annotated[List[str], typer.Option(
-        "--link",
-        help="Set external link of title and url"
-    )] = [],
     is_no_build: Annotated[bool, typer.Option(
         "--no-build",
         help="If you want to only send test reports, please use this option"
     )] = False,
-    lineage: Annotated[Optional[str], typer.Option(
-        help="Set lineage name. This option value will be passed to the record session command if a session isn't created yet."
-    )] = None,
-    test_suite: Annotated[Optional[str], typer.Option(
-        "--test-suite",
-        help="Set test suite name. This option value will be passed to the record session command if a session isn't created yet."
-    )] = "",
-    timestamp: Annotated[Optional[str], typer.Option(
-        help="Used to overwrite the test executed times when importing historical data. Note: Format must be "
-             "`YYYY-MM-DDThh:mm:ssTZD` or `YYYY-MM-DDThh:mm:ss` (local timezone applied)"
-    )] = None,
 ):
     logger = Logger()
 
@@ -133,7 +116,7 @@ def tests_main(
         # In NestedCommand, the test runner name should be available from the command structure
         # For now, temporarily extract from command chain
         command_chain = []
-        current_ctx: Optional[typer.Context] = ctx
+        current_ctx: typer.Context | None = ctx
         while current_ctx:
             if current_ctx.info_name:
                 command_chain.append(current_ctx.info_name)
@@ -157,28 +140,12 @@ def tests_main(
         else:
             raise typer.BadParameter(f"Expected a key-value pair formatted as --option key=value, but got '{kv}'")
 
-    links_tuples = []
-    for kv in links:
-        if '=' in kv:
-            parts = kv.split('=', 1)
-            links_tuples.append((parts[0].strip(), parts[1].strip()))
-        elif ':' in kv:
-            parts = kv.split(':', 1)
-            links_tuples.append((parts[0].strip(), parts[1].strip()))
-        else:
-            raise typer.BadParameter(f"Expected a key-value pair formatted as --option key=value, but got '{kv}'")
-
     # Validate group if provided and ensure it's never None
     if group is None:
         group = ""
     elif group:
         group = _validate_group(group)
 
-    # Validate and convert timestamp if provided
-    parsed_timestamp = None
-    if timestamp:
-        parsed_timestamp = validate_datetime_with_tz(timestamp)
-
     app_instance = ctx.obj
     tracking_client = TrackingClient(Tracking.Command.RECORD_TESTS, app=app_instance)
     client = LaunchableClient(test_runner=test_runner, app=app_instance, tracking_client=tracking_client)
@@ -359,7 +326,6 @@ def report(self, junit_report_file: str):
             if (
                     not self.is_allow_test_before_build  # nlqa: W503
                     and not self.is_no_build  # noqa: W503
-                    and parsed_timestamp is None  # noqa: W503
                     and self.check_timestamp  # noqa: W503
                     and ctime.timestamp() < record_start_at.timestamp()  # noqa: W503
             ):
@@ -394,9 +360,7 @@ def testcases(reports: List[str]) -> Generator[CaseEventType, None, None]:
                             if len(tc.get('testPath', [])) == 0:
                                 continue
 
-                            # Set specific time for importing historical data
-                            if parsed_timestamp is not None:
-                                tc["createdAt"] = parsed_timestamp.isoformat()
+                            # Timestamp option has been removed
 
                             yield tc
 
@@ -516,7 +480,7 @@ def recorded_result() -> Tuple[int, int, int, float]:
                         cases=chunk,
                         test_runner=test_runner,
                         group=group,
-                        test_suite_name=test_suite if test_suite else "",
+                        test_suite_name="",  # test_suite option was removed
                         flavors=dict(flavor_tuples),
                     )
 

smart_tests/commands/subset.py

@@ -36,6 +36,11 @@ def subset(
         help="test session name",
         metavar="SESSION_NAME"
     )],
+    build: Annotated[str | None, typer.Option(
+        "--build",
+        help="build name",
+        metavar="BUILD_NAME"
+    )] = None,
     target: Annotated[str | None, typer.Option(
         help="subsetting target from 0% to 100%"
     )] = None,
@@ -52,11 +57,6 @@ def subset(
         help="(Advanced) base directory to make test names portable",
         metavar="DIR"
     )] = None,
-    build: Annotated[str | None, typer.Option(
-        help="build name",
-        metavar="BUILD_NAME",
-        hidden=True
-    )] = None,
     rest: Annotated[str | None, typer.Option(
         help="Output the subset remainder to a file, e.g. `--rest=remainder.txt`"
     )] = None,
@@ -100,17 +100,10 @@ def subset(
         help="Ignore flaky tests above the value set by this option. You can confirm flaky scores in WebApp",
         min=0.0, max=1.0
     )] = None,
-    link: Annotated[list[str], typer.Option(
-        help="Set external link of title and url"
-    )] = [],
     no_build: Annotated[bool, typer.Option(
         "--no-build",
         help="If you want to only send test reports, please use this option"
     )] = False,
-    lineage: Annotated[str | None, typer.Option(
-        help="Set lineage name. This option value will be passed to the record session command if a session isn't created yet.",
-        metavar="LINEAGE"
-    )] = None,
     prioritize_tests_failed_within_hours: Annotated[int | None, typer.Option(
         help="Prioritize tests that failed within the specified hours; maximum 720 hours (= 24 hours * 30 days)",
         min=0, max=24 * 30
@@ -120,11 +113,6 @@ def subset(
         help="Prioritize tests based on test mapping file",
         mode="r"
     )] = None,
-    test_suite: Annotated[str | None, typer.Option(
-        help="Set test suite name. This option value will be passed to the record session command if a session "
-             "isn't created yet.",
-        metavar="TEST_SUITE"
-    )] = None,
 ):
     app = ctx.obj