datex-studio-cli 0.3.3__tar.gz → 0.4.0__tar.gz

{datex_studio_cli-0.3.3 → datex_studio_cli-0.4.0}/.gitignore

@@ -3,6 +3,7 @@ exploration/
 reviews/
 .tap/
 .superpowers/
+.worktrees/
 
 node_modules/
 
@@ -92,3 +93,9 @@ Thumbs.db
 
 #Claude
 .claude/settings.local.json
+.claude/skills
+
+# Report generation assets
+/reports/
+test-preview.svg
+test-preview.svg

{datex_studio_cli-0.3.3 → datex_studio_cli-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datex-studio-cli
-Version: 0.3.3
+Version: 0.4.0
 Summary: CLI for Datex Studio low-code platform, designed for LLM-based AI agents
 Project-URL: Homepage, https://github.com/datex/datex-studio-cli
 Project-URL: Documentation, https://github.com/datex/datex-studio-cli
@@ -29,6 +29,7 @@ Requires-Dist: pydantic>=2.5.0
 Requires-Dist: pyyaml>=6.0
 Provides-Extra: dev
 Requires-Dist: fastapi>=0.115.0; extra == 'dev'
+Requires-Dist: jsonschema>=4.20.0; extra == 'dev'
 Requires-Dist: mypy>=1.8.0; extra == 'dev'
 Requires-Dist: pytest-cov>=4.0.0; extra == 'dev'
 Requires-Dist: pytest-httpx>=0.30.0; extra == 'dev'

{datex_studio_cli-0.3.3 → datex_studio_cli-0.4.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "datex-studio-cli"
-version = "0.3.3"
+version = "0.4.0"
 description = "CLI for Datex Studio low-code platform, designed for LLM-based AI agents"
 readme = "README.md"
 license = "MIT"
@@ -59,6 +59,7 @@ dev = [
     "ruff>=0.4.0",
     "mypy>=1.8.0",
     "types-PyYAML>=6.0.0",
+    "jsonschema>=4.20.0",
     # Include studio dependencies for testing studio/proxy commands
     "fastapi>=0.115.0",
     "uvicorn[standard]>=0.32.0",
@@ -81,7 +82,7 @@ exclude = ["src/dxs/web/frontend/", "example-reports/"]
 artifacts = ["src/dxs/web/static/"]
 exclude = [
     ".claude/",
-    "example-reports/",
+    "examples/",
     ".mypy_cache/",
     ".pytest_cache/",
     ".ruff_cache/",

{datex_studio_cli-0.3.3 → datex_studio_cli-0.4.0}/src/dxs/__init__.py

@@ -1,4 +1,4 @@
 """Datex Studio CLI - Command-line interface for Datex Studio platform."""
 
-__version__ = "0.3.3"
+__version__ = "0.4.0"
 __app_name__ = "dxs"

{datex_studio_cli-0.3.3 → datex_studio_cli-0.4.0}/src/dxs/cli.py

@@ -162,6 +162,13 @@ class DxsGroup(click.Group):
     default=False,
     help="Show authentication environment variables for debugging",
 )
+@click.option(
+    "--no-update-check",
+    "no_update_check",
+    is_flag=True,
+    default=False,
+    help="Skip the PyPI update check for this invocation",
+)
 @click.pass_context
 def cli(
     ctx: click.Context,
@@ -177,6 +184,7 @@ def cli(
     save_path: str | None,
     force_overwrite: bool,
     diagnose_auth: bool,
+    no_update_check: bool,
 ) -> None:
     """Datex Studio CLI - Command-line interface for Datex Studio platform.
 
@@ -249,6 +257,9 @@ def cli(
     if diagnose_auth:
         _show_auth_diagnostics()
 
+    # Stash for the result_callback to honor --no-update-check
+    dxs_ctx.no_update_check = no_update_check
+
 
 def _mask_token(token: str | None, visible_chars: int = 8) -> str:
     """Mask a token for display, showing only first/last few characters.
@@ -328,7 +339,9 @@ def register_commands() -> None:
         crm,
         datasource,
         devops,
+        endpoint,
         env,
+        function,
         marketplace,
         odata,
         organization,
@@ -345,7 +358,9 @@ def register_commands() -> None:
     cli.add_command(crm.crm)
     cli.add_command(datasource.datasource)
     cli.add_command(devops.devops)
+    cli.add_command(endpoint.endpoint)
     cli.add_command(env.env)
+    cli.add_command(function.function)
     cli.add_command(marketplace.marketplace)
     cli.add_command(odata.odata)
     cli.add_command(organization.organization)
@@ -362,6 +377,59 @@ def register_commands() -> None:
     cli.add_command(schema.schema)
 
 
+@cli.result_callback()
+@click.pass_context
+def _after_command(ctx: click.Context, result: Any, **kwargs: Any) -> Any:
+    """Run post-command hooks (currently: PyPI update notice)."""
+    from dxs.utils.update_check import maybe_show_update_notice
+
+    dxs_ctx: DxsContext | None = ctx.find_object(DxsContext)
+    skip = bool(dxs_ctx and dxs_ctx.no_update_check)
+    try:
+        maybe_show_update_notice(skip=skip)
+    except Exception:  # noqa: BLE001 - never let the update check break the CLI
+        pass
+    return result
+
+
+@cli.command("update")
+@click.option(
+    "--check",
+    "check_only",
+    is_flag=True,
+    default=False,
+    help="Print whether an update is available without prompting to install",
+)
+def update_cmd(check_only: bool) -> None:
+    """Check PyPI for a newer release and optionally upgrade in place."""
+    from dxs.utils.update_check import (
+        _fetch_latest_version,
+        _run_upgrade,
+        detect_upgrade_command,
+        is_newer,
+    )
+
+    click.echo(f"Current version: {__version__}", err=True)
+    click.echo("Checking PyPI...", err=True)
+    latest = _fetch_latest_version()
+    if latest is None:
+        click.echo("Could not reach PyPI. Check your network and try again.", err=True)
+        sys.exit(1)
+    click.echo(f"Latest on PyPI: {latest}", err=True)
+
+    if not is_newer(latest, __version__):
+        click.echo("You are on the latest version.", err=True)
+        return
+
+    upgrade_cmd = detect_upgrade_command()
+    click.echo(f"Upgrade command: {upgrade_cmd}", err=True)
+    if check_only:
+        return
+
+    if click.confirm("Upgrade now?", default=True, err=True):
+        sys.exit(_run_upgrade(upgrade_cmd))
+
+
 # Register commands when module loads
 register_commands()
 

{datex_studio_cli-0.3.3 → datex_studio_cli-0.4.0}/src/dxs/commands/branch.py

@@ -15,9 +15,11 @@ from dxs.core.api import (
     SourceControlEndpoints,
 )
 from dxs.core.api.models import (
+    APPLICATION_DEFINITION_TYPE_NAMES,
     BRANCH_STATUS_ALIASES,
     BRANCH_STATUS_CONTEXT,
     BRANCH_STATUS_NAMES,
+    ApplicationDefinitionType,
     BranchStatus,
 )
 from dxs.core.auth import require_auth, verify_org_match
@@ -44,10 +46,14 @@ def enrich_branch_with_status(branch: dict[str, Any]) -> dict[str, Any]:
     - statusName: Human-readable status (e.g., "Main", "WorkspaceActive")
     - statusContext: Semantic description for LLM understanding
     - isCommit: True if this is a commit snapshot (WorkspaceHistory)
-    - isRelease: True if this is a published release (PublishedMain or Inactive)
-    - isCurrentRelease: True if this is the current release (PublishedMain)
+    - isRelease: True if this is a published release (PublishedMain)
+    - isCurrentRelease: True if this is the latest release (PublishedMain with isLatest=true)
     - isFeatureBranch: True if this is a feature branch (WorkspaceActive)
     - isMainBranch: True if this is the main branch (Main)
+    - appTypeName: Human-readable application type (e.g., "API", "Web", "Mobile").
+      Only set when the upstream payload carries applicationDefinition.applicationDefinitionTypeId
+      (e.g. `branch show`); omitted on payloads that don't (e.g. `branch list`).
+    - isApiApplication: True if this is an API application (type 6). Same presence rule as appTypeName.
 
     Args:
         branch: Branch data dictionary from the API
@@ -62,11 +68,21 @@ def enrich_branch_with_status(branch: dict[str, Any]) -> dict[str, Any]:
 
     # Add semantic flags for easy LLM filtering/understanding
     branch["isCommit"] = status_id == BranchStatus.WORKSPACE_HISTORY
-    branch["isRelease"] = status_id in (BranchStatus.PUBLISHED_MAIN, BranchStatus.INACTIVE)
-    branch["isCurrentRelease"] = status_id == BranchStatus.PUBLISHED_MAIN
+    branch["isRelease"] = status_id == BranchStatus.PUBLISHED_MAIN
+    branch["isCurrentRelease"] = status_id == BranchStatus.PUBLISHED_MAIN and branch.get(
+        "isLatest", False
+    )
     branch["isFeatureBranch"] = status_id == BranchStatus.WORKSPACE_ACTIVE
     branch["isMainBranch"] = status_id == BranchStatus.MAIN
 
+    # Add application type info only when the upstream payload carries it.
+    app_def = branch.get("applicationDefinition") or {}
+    app_type_id = app_def.get("applicationDefinitionTypeId")
+    if app_type_id is not None:
+        app_type_id_int = int(app_type_id)
+        branch["appTypeName"] = APPLICATION_DEFINITION_TYPE_NAMES.get(app_type_id_int, "Unknown")
+        branch["isApiApplication"] = app_type_id_int == ApplicationDefinitionType.API
+
     return branch
 
 
@@ -230,40 +246,67 @@ def _fetch_branches_for_repo(
     client: ApiClient,
     repo_id: int,
     status_ids: list[int] | None = None,
+    group_id: int | None = None,
+    default_group_only: bool = False,
 ) -> list[dict[str, Any]]:
     """Fetch branches for a repository via its application groups.
 
     The API requires fetching branches through application groups, not directly
     via repository ID. Each repository has one or more groups (typically a
-    "Default" group) that contain its branches.
+    "Default" group plus zero-or-more Service Pack groups).
 
     Args:
         client: API client instance
         repo_id: Repository (ApplicationDefinition) ID
         status_ids: Optional list of status IDs for server-side filtering
+        group_id: If provided, fetch branches only from this application group
+            (skipping the "iterate all groups" flow). Mutually exclusive with
+            default_group_only.
+        default_group_only: If True, fetch branches only from the repository's
+            Default group (applicationGroupTypeId=1). Takes precedence when
+            group_id is also provided.
 
     Returns:
-        List of branch dictionaries
+        List of branch dictionaries. Each branch is stamped with the
+        ``applicationGroupId`` of the group it was fetched from — the server's
+        ``applicationGroupId`` field in list responses is unreliable (it sometimes
+        points at a child Service Pack group instead of the branch's own group).
     """
-    # First, fetch all groups for this repository
-    groups = client.get(*ApplicationGroupEndpoints.list(repo_id))
-    if not isinstance(groups, list):
-        groups = [groups] if groups else []
+    # Resolve the target groups. Three modes:
+    # 1. group_id given + default_group_only False  -> fetch from that one group
+    # 2. default_group_only True                    -> find Default group, fetch only that
+    # 3. Neither                                    -> iterate all groups (legacy flow)
+    target_groups: list[dict[str, Any]]
+
+    if default_group_only:
+        groups = client.get(*ApplicationGroupEndpoints.list(repo_id, group_type_id=1))
+        if not isinstance(groups, list):
+            groups = [groups] if groups else []
+        target_groups = [g for g in groups if g.get("id")]
+    elif group_id is not None:
+        target_groups = [{"id": group_id}]
+    else:
+        groups = client.get(*ApplicationGroupEndpoints.list(repo_id))
+        if not isinstance(groups, list):
+            groups = [groups] if groups else []
+        target_groups = [g for g in groups if g.get("id")]
 
-    if not groups:
+    if not target_groups:
         return []
 
-    # Fetch branches from all groups
     all_branches: list[dict[str, Any]] = []
-    for group in groups:
-        group_id = group.get("id")
-        if not group_id:
-            continue
-
-        branches = client.get(*BranchEndpoints.list(group_id, status_ids))
+    for group in target_groups:
+        gid = group["id"]
+        branches = client.get(*BranchEndpoints.list(gid, status_ids))
         if not isinstance(branches, list):
             branches = [branches] if branches else []
 
+        # Stamp the known group id on each branch — overrides the server's
+        # sometimes-misleading applicationGroupId field (which can reference a
+        # descendant Service Pack group rather than the branch's own group).
+        for branch in branches:
+            branch["applicationGroupId"] = gid
+
         all_branches.extend(branches)
 
     return all_branches
@@ -296,11 +339,25 @@ def _fetch_branches_for_repo(
     "--status",
     "status_filter",
     type=click.Choice(
-        ["main", "inactive", "published", "history", "feature", "all"],
+        ["main", "published", "history", "feature", "all"],
         case_sensitive=False,
     ),
     default=None,
-    help="Filter by branch status type (main, inactive, published, history, feature)",
+    help="Filter by branch status type (main, published, history, feature)",
+)
+@click.option(
+    "--group-id",
+    type=int,
+    default=None,
+    help="Filter to a specific application group ID (skips iterating all groups). "
+    "Incompatible with --all-repos.",
+)
+@click.option(
+    "--default-group",
+    is_flag=True,
+    default=False,
+    help="Filter to the repository's Default application group only (excludes "
+    "Service Pack groups). Incompatible with --all-repos and --group-id.",
 )
 @pagination_options(default_limit=10)
 @sorting_options(
@@ -325,6 +382,8 @@ def branch_list(
     org: str | None,
     all_repos: bool,
     status_filter: str | None,
+    group_id: int | None,
+    default_group: bool,
     limit: int,
     sort: str,
     sort_direction: str | None,
@@ -344,8 +403,7 @@ def branch_list(
     \b
     Status Types:
         main      Main development branch (receives commits)
-        inactive  Previous published releases
-        published Current published release
+        published Published releases (multiple can coexist in a group; use isLatest to find the current one)
         history   Commit snapshots (frozen after commit)
         feature   Feature branches (active development)
         all       All branches (default if not specified)
@@ -357,6 +415,8 @@ def branch_list(
         --org              Organization to scope repo search
         --all-repos        Search across all repositories
         --status           Filter by status type
+        --group-id         Filter to a specific application group ID
+        --default-group    Filter to the repository's Default group only (excludes Service Packs)
         --limit, -n        Maximum results (default: 10, 0 for unlimited)
         --with-changes     Include change counts (enables --sort changes)
         --sort             Sort by: name, created, modified, commit-date, status, changes
@@ -371,6 +431,8 @@ def branch_list(
     Examples:
         dxs source branch list --repo 10
         dxs source branch list --repo 10 --status feature
+        dxs source branch list --repo 10 --default-group --status published
+        dxs source branch list --repo 10 --group-id 42 --status published
         dxs source branch list --all-repos --status feature --modified-after 2024-01-01
         dxs source branch list --repo 10 --status history --sort commit-date
         dxs source branch list --repo-name "MyApp" --org "Datex"
@@ -382,6 +444,24 @@ def branch_list(
     resolver = EntityResolver()
     client = ApiClient()
 
+    # Validate mutually-exclusive group flags.
+    if all_repos and (group_id is not None or default_group):
+        raise ValidationError(
+            message="--group-id and --default-group cannot be combined with --all-repos",
+            code="DXS-VAL-002",
+            suggestions=[
+                "Drop --all-repos and scope to a single repo with --repo",
+            ],
+        )
+    if group_id is not None and default_group:
+        raise ValidationError(
+            message="--group-id and --default-group are mutually exclusive",
+            code="DXS-VAL-002",
+            suggestions=[
+                "Pick one: --group-id <id> (explicit) or --default-group (auto-resolved)",
+            ],
+        )
+
     # Handle --all-repos mode
     if all_repos:
         # Scope to org if provided via --org or active org from config
@@ -436,7 +516,13 @@ def branch_list(
                 ctx.log(f"Filtering by status: {status_filter} (id={status_id})...")
 
         # Fetch branches via application groups (API requires this flow)
-        branches = _fetch_branches_for_repo(client, repo_id, server_status_ids)
+        branches = _fetch_branches_for_repo(
+            client,
+            repo_id,
+            server_status_ids,
+            group_id=group_id,
+            default_group_only=default_group,
+        )
 
         total_count = len(branches)
 
@@ -551,6 +637,10 @@ def branch_list(
     # Add applied filters to metadata if any
     if status_filter and status_filter.lower() != "all":
         metadata_kwargs["status_filter"] = status_filter
+    if group_id is not None:
+        metadata_kwargs["group_id_filter"] = group_id
+    if default_group:
+        metadata_kwargs["default_group_only"] = True
     if created_after:
         metadata_kwargs["created_after"] = created_after.isoformat()
     if created_before:
@@ -799,63 +889,96 @@ def delete(ctx: DxsContext, branch_id: int, force: bool) -> None:
 def baseline(ctx: DxsContext, branch_id: int) -> None:
     """Find the baseline (previous release) for a branch.
 
-    Returns the most recent Inactive branch from the same repository,
-    which represents the previous published version. This is useful for
-    generating release notes comparing the new version to the baseline.
+    Among PublishedMain branches in the same application group as the target branch,
+    returns the one with the largest `releaseDate` strictly less than the target's
+    `releaseDate`. Useful for generating release notes comparing a release to its
+    predecessor.
+
+    Scoping by application group (rather than repository-wide) ensures that Service
+    Pack maintenance releases are compared against the previous SP release, and
+    Default group releases are compared against the previous Default release.
 
     \b
     Arguments:
-        BRANCH_ID  Branch ID of the target version
+        BRANCH_ID  Branch ID of the target release
 
     \b
     Returns:
-        The most recent Inactive branch for the same repository
+        The most recent PublishedMain branch released before the target within the
+        same application group, or a message if no prior release exists.
 
     \b
     Example:
         dxs source branch baseline 63338
-        # Returns branch 62582 (the previous published version)
+        # Returns branch 62582 (the previous published version in the same group)
     """
     client = ApiClient()
     ctx.log(f"Finding baseline for branch {branch_id}...")
 
-    # Get the target branch to find its repo ID
-    branch_data = client.get(BranchEndpoints.get(branch_id))
-    repo_id = branch_data.get("applicationDefinitionId")
+    # Get the target branch to find its group.
+    target_branch = client.get(BranchEndpoints.get(branch_id))
+    repo_id = target_branch.get("applicationDefinitionId")
+    group_id = target_branch.get("applicationGroupId")
 
-    if not repo_id:
+    if not repo_id or not group_id:
         raise ValidationError(
-            message=f"Could not determine repository for branch {branch_id}",
+            message=f"Could not determine repository/group for branch {branch_id}",
             code="DXS-VAL-001",
         )
 
-    ctx.log(f"Fetching inactive branches for repository {repo_id}...")
+    if target_branch.get("applicationStatusId") != BranchStatus.PUBLISHED_MAIN:
+        raise ValidationError(
+            message=f"Branch {branch_id} is not a published release",
+            code="DXS-VAL-002",
+            suggestions=[
+                "baseline is only meaningful for PublishedMain branches",
+                "Use `dxs source branch show <id>` to inspect a branch's status",
+            ],
+        )
+
+    ctx.log(f"Fetching PublishedMain branches in group {group_id}...")
+
+    # Fetch all PublishedMain branches in the same application group. The list
+    # endpoint includes releaseDate (the single-branch GET does not), so we use
+    # releaseDate when present and fall back to createdDate otherwise.
+    group_releases = client.get(*BranchEndpoints.list(group_id, [int(BranchStatus.PUBLISHED_MAIN)]))
+    if not isinstance(group_releases, list):
+        group_releases = [group_releases] if group_releases else []
+
+    def _sort_key(branch: dict) -> str:
+        return branch.get("releaseDate") or branch.get("createdDate") or ""
 
-    # Get inactive branches directly using server-side filtering
-    inactive_status_id = BRANCH_STATUS_ALIASES.get("inactive")
-    inactive_branches = _fetch_branches_for_repo(
-        client, repo_id, [inactive_status_id] if inactive_status_id else None
+    target_key = next(
+        (_sort_key(b) for b in group_releases if b.get("id") == branch_id),
+        "",
     )
+    if not target_key:
+        raise ValidationError(
+            message=f"Branch {branch_id} has no releaseDate or createdDate in group listing",
+            code="DXS-VAL-003",
+        )
+
+    # Keep only releases older than the target, sorted desc by the same key.
+    older = [
+        b
+        for b in group_releases
+        if b.get("id") != branch_id and _sort_key(b) and _sort_key(b) < target_key
+    ]
 
-    if not inactive_branches:
+    if not older:
         ctx.output(
             single(
-                item={"message": "No baseline found (no inactive branches)"},
+                item={"message": "No baseline found (no prior release in this group)"},
                 semantic_key="baseline",
                 branch_id=branch_id,
                 repository_id=repo_id,
+                application_group_id=group_id,
             )
         )
         return
 
-    # Sort by createdDate descending to get the most recent
-    inactive_branches = sort_items(inactive_branches, "createdDate", "desc")
-
-    # Get the most recent inactive branch
-    baseline_branch = inactive_branches[0]
-
-    # Enrich with status info
-    baseline_branch = enrich_branch_with_status(baseline_branch)
+    older.sort(key=_sort_key, reverse=True)
+    baseline_branch = enrich_branch_with_status(older[0])
 
     ctx.output(
         single(
@@ -863,6 +986,7 @@ def baseline(ctx: DxsContext, branch_id: int) -> None:
             semantic_key="baseline",
             target_branch_id=branch_id,
             repository_id=repo_id,
+            application_group_id=group_id,
         )
     )