datex-studio-cli 0.4.15__tar.gz → 0.4.16__tar.gz

{datex_studio_cli-0.4.15 → datex_studio_cli-0.4.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: datex-studio-cli
-Version: 0.4.15
+Version: 0.4.16
 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

{datex_studio_cli-0.4.15 → datex_studio_cli-0.4.16}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "datex-studio-cli"
-version = "0.4.15"
+version = "0.4.16"
 description = "CLI for Datex Studio low-code platform, designed for LLM-based AI agents"
 readme = "README.md"
 license = "MIT"

{datex_studio_cli-0.4.15 → datex_studio_cli-0.4.16}/src/dxs/__init__.py

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

{datex_studio_cli-0.4.15 → datex_studio_cli-0.4.16}/src/dxs/commands/auth.py

@@ -15,7 +15,7 @@ from dxs.core.auth.decorators import get_access_token
 from dxs.core.auth.tenants import org_needs_tenant_login, tenant_authority_for
 from dxs.core.auth.token_cache import CachedIdentity, get_identity_override
 from dxs.core.footprint import get_footprint_token
-from dxs.utils.errors import AuthenticationError, ValidationError
+from dxs.utils.errors import AuthenticationError, DxsError, ValidationError
 from dxs.utils.responses import list_response, single
 from dxs.utils.restricted import restrict_in_restricted_mode
 
@@ -255,8 +255,12 @@ def auth() -> None:
     default=None,
     help="Footprint API app registration client secret (for daemon auth)",
 )
-@click.option("--tenant-id", default=None, help="External Entra tenant ID (customer self-service)")
-@click.option("--domain", default=None, help="External Entra domain name (display only)")
+@click.option("--tenant-id", default=None, help="Entra tenant ID (customer self-service)")
+@click.option(
+    "--domain",
+    default=None,
+    help="Entra domain (e.g. csw-wi.com) — resolves the tenant ID for you",
+)
 @pass_context
 def login(
     ctx: DxsContext,
@@ -275,8 +279,11 @@ def login(
     If you are already authenticated with a different identity, this will
     add a new identity and set it as active (use 'dxs auth switch' to change).
 
-    Optionally specify an organization name to authenticate directly against
-    an external tenant (for organizations with external B2C authentication).
+    Name an organization to authenticate against its own Entra tenant, looked up
+    from the API. On a machine with no credentials that lookup is impossible, so
+    pass --domain instead: it is resolved against Entra's public discovery
+    document and needs no prior authentication. --tenant-id does the same when
+    you already know the GUID.
 
     Use --client-id and --client-secret together to configure daemon (client
     credentials) authentication for the Footprint API, needed for cross-tenant
@@ -284,8 +291,10 @@ def login(
 
     \b
     Examples:
-        dxs auth login           # Login to default tenant
-        dxs auth login CAG       # Login to CAG's external tenant
+        dxs auth login                        # Login to default tenant
+        dxs auth login CAG                    # Login to CAG's tenant (needs an identity)
+        dxs auth login --domain csw-wi.com    # Bootstrap: no identity required
+        dxs auth login --tenant-id <guid>     # Same, when you know the GUID
         dxs auth login CAG --client-id <id> --client-secret <secret>
     """
     _reject_tenant_override(ctx, "login")
@@ -304,20 +313,33 @@ def login(
         )
         raise SystemExit(1)
 
-    if tenant_id and org:
+    if org and (tenant_id or domain):
         ctx.output_error(
             ValidationError(
-                message="Pass either an organization name or --tenant-id, not both",
+                message="Pass either an organization name or --domain/--tenant-id, not both",
                 code="DXS-AUTH-017",
                 suggestions=[
-                    "dxs auth login <org>            # Datex staff / known org",
-                    "dxs auth login --tenant-id <id> # customer self-service",
+                    "dxs auth login <org>               # Datex staff / known org",
+                    "dxs auth login --domain <domain>   # customer self-service",
+                    "dxs auth login --tenant-id <guid>  # when you know the GUID",
                 ],
             )
         )
         raise SystemExit(1)
 
-    if tenant_id:
+    if tenant_id or domain:
+        # Bootstrap path: no API lookup, so it works with an empty credentials
+        # cache. An explicit GUID wins, making the domain lookup free to skip.
+        if not tenant_id:
+            from dxs.core.auth.tenants import normalize_entra_domain, resolve_tenant_id_from_domain
+
+            try:
+                tenant_id = resolve_tenant_id_from_domain(domain)  # type: ignore[arg-type]
+            except DxsError as e:
+                ctx.output_error(e)
+                raise SystemExit(1) from None
+            # Store/display the bare domain, never the sign-in address it came from.
+            domain = normalize_entra_domain(domain)  # type: ignore[arg-type]
 
         def on_device_code_external(device_code: dict[str, Any]) -> None:
             ctx.output(
@@ -873,12 +895,12 @@ def switch(
 @click.option(
     "--tenant-id",
     default=None,
-    help="External Entra tenant ID — self-service; skips the organization lookup",
+    help="Entra tenant ID — self-service; skips the organization lookup",
 )
 @click.option(
     "--domain",
     default=None,
-    help="External Entra domain name (display only)",
+    help="Entra domain (e.g. csw-wi.com) — resolves the tenant ID for you",
 )
 @click.option("--open/--no-open", default=True, help="Open URL in browser (default: yes)")
 @pass_context
@@ -889,33 +911,46 @@ def consent(
     domain: str | None,
     open: bool,
 ) -> None:
-    """Generate admin consent URL(s) for an organization's external tenant.
+    """Generate the admin consent URL for an organization's Entra tenant.
 
-    Provide either an organization NAME (Datex staff — looked up from the API) or
-    a --tenant-id directly (customer self-service — no prior authentication needed).
+    Identify the tenant one of three ways: an organization NAME (Datex staff —
+    looked up from the API), a --domain (resolved against Entra's public
+    discovery document, no authentication needed), or a --tenant-id directly.
     """
     import webbrowser
 
+    from dxs.core.auth.tenants import normalize_entra_domain, resolve_tenant_id_from_domain
     from dxs.utils.config import get_settings
 
-    if not org and not tenant_id:
+    if not org and not tenant_id and not domain:
         ctx.output_error(
             ValidationError(
-                message="Provide an organization name or --tenant-id",
+                message="Provide an organization name, --domain, or --tenant-id",
                 code="DXS-AUTH-016",
                 suggestions=[
-                    "dxs auth consent <org>            # Datex staff (API lookup)",
-                    "dxs auth consent --tenant-id <id> # customer self-service",
+                    "dxs auth consent <org>                 # Datex staff (API lookup)",
+                    "dxs auth consent --domain <domain>     # resolves the tenant for you",
+                    "dxs auth consent --tenant-id <id>      # when you already know the GUID",
                 ],
             )
         )
         raise SystemExit(1)
 
-    if tenant_id:
-        # Self-service: use the supplied descriptor, no API lookup.
+    if tenant_id or domain:
+        # Self-service: no API lookup. An explicit GUID wins over the domain, so
+        # supplying both never costs a network round trip.
         org_name = org or "your organization"
         org_id: int | None = None
-        resolved_tenant_id = tenant_id
+        if tenant_id:
+            resolved_tenant_id = tenant_id
+        else:
+            try:
+                resolved_tenant_id = resolve_tenant_id_from_domain(domain)  # type: ignore[arg-type]
+            except DxsError as e:
+                ctx.output_error(e)
+                raise SystemExit(1) from None
+            # Display the bare domain, never the sign-in address it came from.
+            domain = normalize_entra_domain(domain)  # type: ignore[arg-type]
         resolved_domain = domain
     else:
         org_info = _fetch_organization_by_name(ctx, org)  # type: ignore[arg-type]

{datex_studio_cli-0.4.15 → datex_studio_cli-0.4.16}/src/dxs/commands/crm.py

@@ -9,10 +9,18 @@ import click
 
 if TYPE_CHECKING:
     from dxs.cli import DxsContext
-from markdownify import markdownify as md
 
+from dxs.commands.crm_delivery import request_group, requirement_group
+from dxs.commands.crm_time import time_group
 from dxs.core.auth import require_auth
 from dxs.core.dynamics.client import DynamicsClient
+from dxs.core.dynamics.html import html_to_markdown as _html_to_markdown
+from dxs.core.dynamics.resolvers import (
+    is_guid,
+    resolve_account,
+    resolve_case_for_write,
+    resolve_picklist_value,
+)
 from dxs.core.output.yaml_fmt import LiteralString
 from dxs.utils.responses import count_response, list_response, search_response, single
 from dxs.utils.restricted import check_restricted_mode_for_option, restrict_in_restricted_mode
@@ -31,10 +39,6 @@ _CASE_STATUS_LABELS = {
     2: "Cancelled",
 }
 
-_GUID_PATTERN = re.compile(
-    r"^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$"
-)
-
 
 def _extract_attachment_urls(markdown: str | None) -> list[dict[str, str]]:
     """Extract attachment URLs and UUIDs from markdown content.
@@ -193,29 +197,6 @@ def _download_attachments(
     return downloaded
 
 
-def _html_to_markdown(html: str | None) -> str | LiteralString | None:
-    """Convert HTML content to Markdown.
-
-    Args:
-        html: HTML string to convert.
-
-    Returns:
-        Markdown string (LiteralString for multiline), or None if input was None/empty.
-    """
-    if not html:
-        return None
-
-    # Convert HTML to Markdown, stripping script/style tags
-    markdown = md(html, strip=["script", "style"]).strip()
-
-    # Use LiteralString for multiline content (renders as YAML block scalar)
-    # LiteralString automatically handles trailing whitespace cleanup
-    if "\n" in markdown:
-        return LiteralString(markdown)
-
-    return markdown
-
-
 # =============================================================================
 # HTML → plain text stripping (for compact activity output)
 # =============================================================================
@@ -553,11 +534,6 @@ _COMMENT_STATE_COMPLETED = 1
 _COMMENT_STATUS_SENT = 2
 
 
-def _is_guid(value: str) -> bool:
-    """Whether a value is a bare GUID rather than a name to look up."""
-    return bool(_GUID_PATTERN.match(value.strip().strip("{}")))
-
-
 def _wrap_description_html(text: str) -> str:
     """Convert plain text to the HTML the case description field expects.
 
@@ -614,47 +590,6 @@ def _read_body(text: str | None, text_file: "Path | None", flag: str) -> str:
     return body
 
 
-def _resolve_case_for_write(client: "DynamicsClient", ticket_number: str) -> dict[str, Any]:
-    """Resolve a ticket number to the one incident a write may land on.
-
-    ``resolve_ticket`` raises when a ticket number matches several cases, which
-    is what we want here: appending to an arbitrary one of them would be worse
-    than failing.
-    """
-    incident = client.resolve_ticket(ticket_number)
-    return client.get_incident(incident["incidentid"])
-
-
-def _resolve_account(client: "DynamicsClient", value: str) -> tuple[str, str]:
-    """Resolve an account name or GUID to (account_id, account_name)."""
-    from dxs.utils.errors import ValidationError
-
-    if _is_guid(value):
-        account_id = value.strip().strip("{}")
-        record = client.get(f"/accounts({account_id})", params={"$select": "accountid,name"})
-        return account_id, record.get("name") or account_id
-
-    matches = client.search_accounts(value).get("value", [])
-    if len(matches) == 1:
-        return matches[0]["accountid"], matches[0].get("name") or ""
-
-    if not matches:
-        raise ValidationError(
-            message=f"No active account matches '{value}'",
-            code="DXS-CRM-CASE-ACCOUNT",
-            suggestions=[
-                f"Search for the account: dxs crm account search '{value}'",
-                "Pass the accountid GUID directly if the name is not searchable",
-            ],
-        )
-
-    raise ValidationError(
-        message=f"'{value}' matches {len(matches)} accounts - narrow it or pass the GUID",
-        code="DXS-CRM-CASE-ACCOUNT",
-        suggestions=[f"{m.get('name')} ({m.get('accountid')})" for m in matches[:10]],
-    )
-
-
 def _resolve_contact(
     client: "DynamicsClient", account_id: str, account_name: str, value: str
 ) -> tuple[str, str]:
@@ -666,7 +601,7 @@ def _resolve_contact(
     """
     from dxs.utils.errors import ValidationError
 
-    if _is_guid(value):
+    if is_guid(value):
         return value.strip().strip("{}"), value
 
     contacts = client.list_contacts_for_account(account_id).get("value", [])
@@ -720,7 +655,7 @@ def _resolve_entitlement(
     """
     from dxs.utils.errors import ValidationError
 
-    if value and _is_guid(value):
+    if value and is_guid(value):
         return value.strip().strip("{}"), value
 
     all_entitlements = client.list_entitlements_for_account(account_id).get("value", [])
@@ -761,45 +696,6 @@ def _resolve_entitlement(
     )
 
 
-def _resolve_picklist_value(
-    client: "DynamicsClient", entity: str, attribute: str, value: str, flag: str
-) -> tuple[int, str]:
-    """Resolve an option-set label or integer to (value, label).
-
-    Integers are validated rather than trusted, so a stale option value fails
-    here instead of writing a meaningless number onto the record.
-    """
-    from dxs.utils.errors import ValidationError
-
-    options = client.get_picklist_options(entity, attribute)
-    needle = value.strip().lower()
-
-    def _fail(message: str, candidates: list[dict[str, Any]]) -> ValidationError:
-        return ValidationError(
-            message=message,
-            code="DXS-CRM-CASE-PICKLIST",
-            suggestions=[f"{o.get('label')} ({o.get('value')})" for o in candidates[:20]],
-        )
-
-    if re.fullmatch(r"-?\d+", needle):
-        wanted = int(needle)
-        for option in options:
-            if option.get("value") == wanted:
-                return wanted, str(option.get("label"))
-        raise _fail(f"{flag}: {wanted} is not a valid {attribute} value", options)
-
-    exact = [o for o in options if str(o.get("label", "")).lower() == needle]
-    matches = exact or [o for o in options if needle in str(o.get("label", "")).lower()]
-
-    if len(matches) == 1:
-        return int(matches[0]["value"]), str(matches[0].get("label"))
-
-    if not matches:
-        raise _fail(f"{flag}: '{value}' is not a valid {attribute} option", options)
-
-    raise _fail(f"{flag}: '{value}' matches {len(matches)} options", matches)
-
-
 def _format_entitlement(entitlement: dict[str, Any]) -> dict[str, Any]:
     """Format an entitlement for display."""
     return {
@@ -827,9 +723,9 @@ def _format_contact(contact: dict[str, Any]) -> dict[str, Any]:
 def crm() -> None:
     """Dynamics CRM / Dataverse commands.
 
-    Query support cases, accounts, and activities - or run raw OData against
-    any Dataverse entity. Read-only apart from 'case create/note/comment' and
-    'commit-ref'.
+    Query support cases, accounts, activities and time entries - or run raw
+    OData against any Dataverse entity. Read-only apart from
+    'case create/note/comment', 'time create' and 'commit-ref'.
 
     \b
     Setup (one-time):
@@ -841,6 +737,9 @@ def crm() -> None:
         case        Support cases: search, get, create, note, comment, types
         account     Accounts (companies): list, search, contacts, entitlements
         activity    Portal comments & emails - by date range or ticket
+        time        Time entries: list, get, summary, create
+        request     Project Requests + priced lines (read-only)
+        requirement Requirements (project tasks): the unit of delivery
         metadata    Discover entities, fields, and relationships
         picklist    Resolve option-set (picklist) integer values <-> labels
         odata       Raw OData against ANY entity (escape hatch)
@@ -910,6 +809,13 @@ def case() -> None:
 # Register case as subcommand of crm
 crm.add_command(case)
 
+# Time entries live in their own module; crm.py is large enough already.
+crm.add_command(time_group)
+
+# Delivery: Project Requests (pre-requirement) and Requirements (the deliverable).
+crm.add_command(request_group)
+crm.add_command(requirement_group)
+
 
 @case.command()
 @click.argument("query", required=False, default=None)
@@ -1318,7 +1224,7 @@ def case_create(
     client = DynamicsClient()
 
     ctx.log(f"Resolving account '{account}'...")
-    account_id, account_name = _resolve_account(client, account)
+    account_id, account_name = resolve_account(client, account)
 
     ctx.log(f"Resolving contact '{contact}' at {account_name}...")
     contact_id, contact_name = _resolve_contact(client, account_id, account_name, contact)
@@ -1328,10 +1234,10 @@ def case_create(
         client, account_id, account_name, entitlement
     )
 
-    type_value, type_label = _resolve_picklist_value(
+    type_value, type_label = resolve_picklist_value(
         client, "incident", "casetypecode", case_type, "--type"
     )
-    priority_value, priority_label = _resolve_picklist_value(
+    priority_value, priority_label = resolve_picklist_value(
         client, "incident", "prioritycode", priority, "--priority"
     )
 
@@ -1347,14 +1253,14 @@ def case_create(
 
     impact_label = None
     if business_impact is not None:
-        impact_value, impact_label = _resolve_picklist_value(
+        impact_value, impact_label = resolve_picklist_value(
             client, "incident", "daa_immediatebusinessimpact", business_impact, "--business-impact"
         )
         payload["daa_immediatebusinessimpact"] = impact_value
 
     origin_label = None
     if origin is not None:
-        origin_value, origin_label = _resolve_picklist_value(
+        origin_value, origin_label = resolve_picklist_value(
             client, "incident", "caseorigincode", origin, "--origin"
         )
         payload["caseorigincode"] = origin_value
@@ -1468,7 +1374,7 @@ def case_note(
     client = DynamicsClient()
 
     ctx.log(f"Resolving case {ticket_number}...")
-    incident = _resolve_case_for_write(client, ticket_number)
+    incident = resolve_case_for_write(client, ticket_number)
     incident_id = incident["incidentid"]
 
     payload: dict[str, Any] = {
@@ -1559,7 +1465,7 @@ def case_comment(
     client = DynamicsClient()
 
     ctx.log(f"Resolving case {ticket_number}...")
-    incident = _resolve_case_for_write(client, ticket_number)
+    incident = resolve_case_for_write(client, ticket_number)
     incident_id = incident["incidentid"]
 
     account_name = incident.get("_customerid_value@OData.Community.Display.V1.FormattedValue") or ""
@@ -2185,7 +2091,7 @@ def account_contacts(ctx: "DxsContext", account_name: str) -> None:
     """
     client = DynamicsClient()
 
-    account_id, resolved_name = _resolve_account(client, account_name)
+    account_id, resolved_name = resolve_account(client, account_name)
     ctx.log(f"Fetching contacts for {resolved_name}...")
     raw = client.list_contacts_for_account(account_id).get("value", [])
 
@@ -2226,7 +2132,7 @@ def account_entitlements(ctx: "DxsContext", account_name: str, include_inactive:
     """
     client = DynamicsClient()
 
-    account_id, resolved_name = _resolve_account(client, account_name)
+    account_id, resolved_name = resolve_account(client, account_name)
     ctx.log(f"Fetching entitlements for {resolved_name}...")
     raw = client.list_entitlements_for_account(account_id).get("value", [])
 
@@ -3759,7 +3665,7 @@ def _validate_task_id(task_id: str) -> str:
     from dxs.utils.errors import ValidationError
 
     candidate = task_id.strip().strip("{}")
-    if not _GUID_PATTERN.match(candidate):
+    if not is_guid(candidate):
         raise ValidationError(
             message=f"'{task_id}' is not a valid msdyn_projecttask GUID",
             code="DXS-CRM-COMMIT-001",