cu-cli-core 0.1.0b1__tar.gz → 0.1.0b2__tar.gz

{cu_cli_core-0.1.0b1 → cu_cli_core-0.1.0b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cu-cli-core
-Version: 0.1.0b1
+Version: 0.1.0b2
 Summary: Framework-neutral command contracts and operations for Azure Content Understanding CLIs.
 Author: Microsoft Corporation
 License: MIT

{cu_cli_core-0.1.0b1 → cu_cli_core-0.1.0b2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cu-cli-core"
-version = "0.1.0b1"
+version = "0.1.0b2"
 description = "Framework-neutral command contracts and operations for Azure Content Understanding CLIs."
 readme = "README.md"
 requires-python = ">=3.10"
@@ -34,6 +34,13 @@ where = ["src"]
 "cu_cli_core" = [
     "py.typed",
     "resources/openapi/*/*.json",
+    "resources/azd_template/*.md",
+    "resources/azd_template/*.yaml",
+    "resources/azd_template/hooks/*.ps1",
+    "resources/azd_template/hooks/*.sh",
+    "resources/azd_template/infra/*.bicep",
+    "resources/azd_template/infra/*.json",
+    "resources/azd_template/infra/modules/*.bicep",
 ]
 
 [tool.pytest.ini_options]

{cu_cli_core-0.1.0b1 → cu_cli_core-0.1.0b2}/src/cu_cli_core/analysis.py

@@ -45,6 +45,7 @@ class AnalyzeJob:
     analyzer_id: str
     out_path: Optional[Path] = None  # None => caller streams to stdout
     output_format: str = "markdown"
+    input_url: Optional[str] = None
 
 
 @dataclass
@@ -249,6 +250,51 @@ def analyze_bytes_with_usage(
     return AnalyzeResponse(result=result, usage=getattr(poller, "usage", None))
 
 
+def _analysis_url_input(url: str) -> Any:
+    from azure.ai.contentunderstanding.models import AnalysisInput
+
+    return AnalysisInput(url=url)
+
+
+def analyze_url(
+    client: Any,
+    analyzer_id: str,
+    url: str,
+    *,
+    raw_json: bool = False,
+) -> Any:
+    """Analyze an HTTPS input reference and return the completed result."""
+    return analyze_url_with_usage(
+        client,
+        analyzer_id,
+        url,
+        raw_json=raw_json,
+    ).result
+
+
+def analyze_url_with_usage(
+    client: Any,
+    analyzer_id: str,
+    url: str,
+    *,
+    raw_json: bool = False,
+) -> AnalyzeResponse:
+    """Analyze an HTTPS input reference while retaining usage metadata."""
+    kwargs = {"cls": _capture_raw_response} if raw_json else {}
+    poller = client.begin_analyze(
+        analyzer_id=analyzer_id,
+        inputs=[_analysis_url_input(url)],
+        **kwargs,
+    )
+    completed = poller.result()
+    if raw_json:
+        _, raw_response = completed
+        result = raw_response.json()
+    else:
+        result = completed
+    return AnalyzeResponse(result=result, usage=getattr(poller, "usage", None))
+
+
 def analyze_bytes_inline(
     client: Any,
     analyzer_id: str,
@@ -288,8 +334,54 @@ def analyze_bytes_inline_with_usage(
     return AnalyzeResponse(result=result, usage=getattr(response, "usage", None))
 
 
+def analyze_url_inline(
+    client: Any,
+    analyzer_id: str,
+    url: str,
+    *,
+    raw_json: bool = False,
+) -> Any:
+    """Analyze an HTTPS input reference synchronously."""
+    return analyze_url_inline_with_usage(
+        client,
+        analyzer_id,
+        url,
+        raw_json=raw_json,
+    ).result
+
+
+def analyze_url_inline_with_usage(
+    client: Any,
+    analyzer_id: str,
+    url: str,
+    *,
+    raw_json: bool = False,
+) -> AnalyzeResponse:
+    """Analyze an HTTPS input reference synchronously with usage metadata."""
+    kwargs = {"cls": _capture_raw_response} if raw_json else {}
+    completed = client.analyze_inline(
+        analyzer_id=analyzer_id,
+        inputs=[_analysis_url_input(url)],
+        **kwargs,
+    )
+    if raw_json:
+        response, raw_response = completed
+        result = raw_response.json()
+    else:
+        response = completed
+        result = response.result
+    return AnalyzeResponse(result=result, usage=getattr(response, "usage", None))
+
+
 def analyze_one(client: Any, job: AnalyzeJob) -> Any:
     """Run a single :class:`AnalyzeJob`, returning the completed SDK result."""
+    if job.input_url is not None:
+        return analyze_url(
+            client,
+            job.analyzer_id,
+            job.input_url,
+            raw_json=job.output_format == "json",
+        )
     data = Path(job.input_ref).read_bytes()
     return analyze_bytes(
         client,
@@ -301,6 +393,13 @@ def analyze_one(client: Any, job: AnalyzeJob) -> Any:
 
 def analyze_one_inline(client: Any, job: AnalyzeJob) -> Any:
     """Run a single job synchronously through the inline analyze API."""
+    if job.input_url is not None:
+        return analyze_url_inline(
+            client,
+            job.analyzer_id,
+            job.input_url,
+            raw_json=job.output_format == "json",
+        )
     data = Path(job.input_ref).read_bytes()
     return analyze_bytes_inline(
         client,
@@ -312,6 +411,13 @@ def analyze_one_inline(client: Any, job: AnalyzeJob) -> Any:
 
 def analyze_one_with_usage(client: Any, job: AnalyzeJob) -> AnalyzeResponse:
     """Run one long-running analysis and retain its usage metadata."""
+    if job.input_url is not None:
+        return analyze_url_with_usage(
+            client,
+            job.analyzer_id,
+            job.input_url,
+            raw_json=job.output_format == "json",
+        )
     data = Path(job.input_ref).read_bytes()
     return analyze_bytes_with_usage(
         client,
@@ -323,6 +429,13 @@ def analyze_one_with_usage(client: Any, job: AnalyzeJob) -> AnalyzeResponse:
 
 def analyze_one_inline_with_usage(client: Any, job: AnalyzeJob) -> AnalyzeResponse:
     """Run one inline analysis and retain its usage metadata."""
+    if job.input_url is not None:
+        return analyze_url_inline_with_usage(
+            client,
+            job.analyzer_id,
+            job.input_url,
+            raw_json=job.output_format == "json",
+        )
     data = Path(job.input_ref).read_bytes()
     return analyze_bytes_inline_with_usage(
         client,

{cu_cli_core-0.1.0b1 → cu_cli_core-0.1.0b2}/src/cu_cli_core/command_spec.py

@@ -18,8 +18,11 @@ class SurfaceClassification(str, Enum):
     COMMON = "common"
     SHARED_ALIAS = "shared-alias"
     STANDALONE_SHORTCUT = "standalone-shortcut"
+    STANDALONE_ONLY = "standalone-only"
+    AZURE_ONLY = "azure-only"
     AZURE_HOST_GLOBAL = "azure-host-global"
     FRONTEND_PRESENTATION = "frontend-presentation"
+    INTERNAL = "internal"
 
 
 class ArgumentValueType(str, Enum):
@@ -27,6 +30,7 @@ class ArgumentValueType(str, Enum):
 
     STRING = "string"
     BOOLEAN = "boolean"
+    TRISTATE_BOOLEAN = "tristate-boolean"
     INTEGER = "integer"
     PATH = "path"
 
@@ -64,8 +68,8 @@ class CommandSpec:
 
     path: tuple[str, ...]
     help: str
-    operation: str
-    request_type: str
+    operation: str | None = None
+    request_type: str | None = None
     arguments: tuple[ArgumentSpec, ...] = ()
     service_options: tuple[str, ...] = ()
     classification: SurfaceClassification = SurfaceClassification.COMMON
@@ -127,6 +131,8 @@ def bind_command_arguments(
 def build_request(spec: CommandSpec, parsed: Mapping[str, Any]) -> Any:
     """Bind frontend values and instantiate the spec's lazy request type."""
 
+    if spec.request_type is None:
+        raise CommandBindingError(f"{' '.join(spec.path)} does not define a shared request type")
     request_type = resolve_identifier(spec.request_type)
     try:
         return request_type(**bind_command_arguments(spec, parsed))
@@ -136,7 +142,11 @@ def build_request(spec: CommandSpec, parsed: Mapping[str, Any]) -> Any:
         raise CommandBindingError(str(exc)) from exc
 
 
-_SERVICE_OPTIONS = ("endpoint", "api-version", "auth-mode", "api-key")
+_SERVICE_OPTIONS = ("endpoint", "api-version", "auth-mode", "api-key", "profile")
+_API_VERSION_HELP = (
+    "Content Understanding API version. Known versions: 2025-11-01 (GA) and "
+    "2026-06-01-preview (preview); any YYYY-MM-DD-preview version is also accepted."
+)
 
 
 def _profile_name_arguments(option_help: str) -> tuple[ArgumentSpec, ...]:
@@ -223,14 +233,33 @@ _INPUT_ARGUMENTS = (
     ),
 )
 
+_ANALYZE_INPUT_ARGUMENTS = (
+    ArgumentSpec(
+        "INPUTS",
+        field="positional_inputs",
+        parser_name="inputs",
+        help="Standalone local file, directory, or HTTPS URL shortcuts.",
+        repeatable=True,
+        classification=SurfaceClassification.STANDALONE_SHORTCUT,
+    ),
+    *_INPUT_ARGUMENTS[1:],
+    ArgumentSpec(
+        "--url",
+        field="urls",
+        parser_name="urls",
+        help="HTTPS or Azure Blob SAS URL. Repeat for multiple URLs.",
+        repeatable=True,
+    ),
+)
+
 
 ANALYZE = CommandSpec(
     path=("analyze",),
-    help="Process local files with an analyzer and return analyzer results.",
+    help="Process local files or HTTPS URLs and return analyzer results.",
     operation="cu_cli_core.operations.analysis#execute_analyze",
     request_type="cu_cli_core.contracts#AnalyzeRequest",
     arguments=(
-        *_INPUT_ARGUMENTS,
+        *_ANALYZE_INPUT_ARGUMENTS,
         ArgumentSpec(
             "--analyzer",
             aliases=("-a",),
@@ -317,7 +346,6 @@ ANALYZE = CommandSpec(
             value_type=ArgumentValueType.PATH,
             file_okay=True,
             dir_okay=False,
-            classification=SurfaceClassification.FRONTEND_PRESENTATION,
         ),
         ArgumentSpec(
             "--concurrency",
@@ -824,7 +852,6 @@ PROFILE_SHOW = CommandSpec(
             parser_name="deployments",
             help="Also list live Foundry model deployments.",
             value_type=ArgumentValueType.BOOLEAN,
-            classification=SurfaceClassification.FRONTEND_PRESENTATION,
         ),
     ),
 )
@@ -935,7 +962,17 @@ PROFILE_DELETE = CommandSpec(
     help="Delete an inactive named CU CLI profile.",
     operation="cu_cli_core.operations.profiles#delete_profile",
     request_type="cu_cli_core.contracts#ProfileDeleteRequest",
-    arguments=_profile_name_arguments("Existing inactive profile to delete."),
+    arguments=(
+        *_profile_name_arguments("Existing inactive profile to delete."),
+        ArgumentSpec(
+            "--yes",
+            aliases=("-y",),
+            field="yes",
+            parser_name="yes",
+            help="Delete without prompting for confirmation.",
+            value_type=ArgumentValueType.BOOLEAN,
+        ),
+    ),
 )
 
 PROFILE_COPY = CommandSpec(
@@ -1061,6 +1098,93 @@ ENV_VAR_LIST = CommandSpec(
     ),
 )
 
+DOCTOR = CommandSpec(
+    path=("doctor",),
+    help="Verify a Microsoft Foundry resource connection and Content Understanding defaults.",
+    arguments=(
+        ArgumentSpec(
+            "--profile",
+            aliases=("-p",),
+            field="profile_name",
+            parser_name="profile_name",
+            help="Named CU CLI profile to use.",
+        ),
+        ArgumentSpec(
+            "--endpoint",
+            field="endpoint",
+            parser_name="endpoint",
+            help="Override the configured Microsoft Foundry resource endpoint.",
+        ),
+        ArgumentSpec(
+            "--api-version",
+            field="api_version",
+            parser_name="api_version",
+            help=_API_VERSION_HELP,
+        ),
+        ArgumentSpec(
+            "--fix-defaults",
+            field="fix_defaults",
+            parser_name="fix_defaults",
+            help="Configure Content Understanding defaults from profile model mappings.",
+            value_type=ArgumentValueType.BOOLEAN,
+        ),
+        ArgumentSpec(
+            "--auth-mode",
+            field="auth_mode",
+            parser_name="auth_mode",
+            help="Authentication mode; defaults to the selected CU CLI profile.",
+            choices=("login", "key"),
+        ),
+        ArgumentSpec(
+            "--api-key",
+            field="api_key",
+            parser_name="api_key",
+            help="Override the configured API key.",
+        ),
+    ),
+)
+
+INFRA_GENERATE = CommandSpec(
+    path=("infra", "generate"),
+    help="Generate an azd/Bicep project for Content Understanding.",
+    arguments=(
+        ArgumentSpec("--output-dir", aliases=("-d",), field="output_dir", parser_name="output_dir", help="Directory where the azd template is generated.", value_type=ArgumentValueType.PATH, default="provision", file_okay=False),
+        ArgumentSpec("--environment", aliases=("-e",), field="environment", parser_name="environment", help="azd environment name."),
+        ArgumentSpec("--location", aliases=("-l",), field="location", parser_name="location", help="Azure region."),
+        ArgumentSpec("--subscription", field="subscription", parser_name="subscription", help="Azure subscription name or ID.", classification=SurfaceClassification.STANDALONE_ONLY),
+        ArgumentSpec("--api-version", field="api_version", parser_name="api_version", help=_API_VERSION_HELP),
+        ArgumentSpec("--models", field="models", parser_name="models", help="Comma-separated model names, 'recommended', or 'none'."),
+        ArgumentSpec("--foundry-endpoint", field="foundry_endpoint", parser_name="foundry_endpoint", help="Existing Microsoft Foundry resource endpoint."),
+        ArgumentSpec("--foundry-prefix", field="foundry_prefix", parser_name="foundry_prefix", help="Prefix for a new Microsoft Foundry resource name."),
+        ArgumentSpec("--assign-roles", field="assign_roles", parser_name="assign_roles", help="Whether to configure RBAC role assignments; omit to use interactive or default behavior.", value_type=ArgumentValueType.TRISTATE_BOOLEAN),
+        ArgumentSpec("--force", field="force", parser_name="force", help="Overwrite an existing generated template.", value_type=ArgumentValueType.BOOLEAN),
+    ),
+)
+
+INFRA_MODELS = CommandSpec(
+    path=("_infra-models",),
+    help="Configure model deployments for a generated infrastructure project.",
+    classification=SurfaceClassification.INTERNAL,
+    arguments=(
+        ArgumentSpec("--resource-group", field="resource_group", parser_name="resource_group", help="Resource group containing the Foundry account.", required=True),
+        ArgumentSpec("--account", field="account_name", parser_name="account_name", help="Foundry account name.", required=True),
+        ArgumentSpec("--subscription", field="subscription_id", parser_name="subscription_id", help="Azure subscription ID.", required=True, classification=SurfaceClassification.STANDALONE_ONLY),
+        ArgumentSpec("--selection", field="selection", parser_name="selection", help="prompt, recommended, none, or comma-separated model selectors.", required=True),
+        ArgumentSpec("--out", field="out_path", parser_name="out_path", help="Output Bicep model file.", value_type=ArgumentValueType.PATH, required=True),
+        ArgumentSpec("--deploy/--no-deploy", field="deploy", parser_name="deploy", help="Deploy selected models before writing the model file.", value_type=ArgumentValueType.BOOLEAN, default=True, classification=SurfaceClassification.STANDALONE_ONLY),
+        ArgumentSpec("--deploy", field="deploy", parser_name="deploy", help="Deploy selected models before writing the model file.", value_type=ArgumentValueType.BOOLEAN, default=True, classification=SurfaceClassification.AZURE_ONLY),
+        ArgumentSpec("--endpoint", field="endpoint", parser_name="endpoint", help="Microsoft Foundry resource endpoint.", required=True, classification=SurfaceClassification.AZURE_ONLY),
+        ArgumentSpec("--api-version", field="api_version", parser_name="api_version", help=_API_VERSION_HELP, classification=SurfaceClassification.AZURE_ONLY),
+        ArgumentSpec("--use-key", field="use_key", parser_name="use_key", help="Use an account key for the data-plane request.", value_type=ArgumentValueType.BOOLEAN, classification=SurfaceClassification.AZURE_ONLY),
+    ),
+)
+
+INFRA_POSTPROVISION_V1 = CommandSpec(
+    path=("_infra-postprovision-v1",),
+    help="Complete generated-project setup after azd provisioning.",
+    classification=SurfaceClassification.INTERNAL,
+)
+
 
 COMMAND_SPECS: tuple[CommandSpec, ...] = (
     ANALYZE,
@@ -1086,6 +1210,10 @@ COMMAND_SPECS: tuple[CommandSpec, ...] = (
     PROFILE_SET_ACTIVE,
     PROFILE_SYNC_DEFAULTS,
     ENV_VAR_LIST,
+    DOCTOR,
+    INFRA_GENERATE,
+    INFRA_MODELS,
+    INFRA_POSTPROVISION_V1,
 )
 _COMMAND_SPECS_BY_PATH = {spec.path: spec for spec in COMMAND_SPECS}
 

{cu_cli_core-0.1.0b1 → cu_cli_core-0.1.0b2}/src/cu_cli_core/contracts.py

@@ -20,13 +20,16 @@ class SelectionMode(str, Enum):
     POSITIONAL = "positional"
     NAMED_FILES = "named-files"
     NAMED_SOURCES = "named-sources"
+    NAMED_URLS = "named-urls"
 
 
 class InputOrigin(str, Enum):
     POSITIONAL_FILE = "positional-file"
     POSITIONAL_SOURCE = "positional-source"
+    POSITIONAL_URL = "positional-url"
     NAMED_FILE = "named-file"
     NAMED_SOURCE = "named-source"
+    NAMED_URL = "named-url"
 
 
 class ExistingResultPolicy(str, Enum):
@@ -49,6 +52,7 @@ class OutcomeStatus(str, Enum):
 @dataclass(frozen=True)
 class ProfileShowRequest:
     name: str | None = None
+    deployments: bool = False
 
 
 @dataclass(frozen=True)
@@ -83,6 +87,7 @@ class ProfileCreateRequest:
 @dataclass(frozen=True)
 class ProfileDeleteRequest:
     name: str
+    yes: bool = False
 
 
 @dataclass(frozen=True)
@@ -159,7 +164,7 @@ class AnalyzerDeleteRequest:
 
 @dataclass(frozen=True)
 class AnalyzeRequest:
-    positional_inputs: tuple[Path, ...] = ()
+    positional_inputs: tuple[str, ...] = ()
     files: tuple[Path, ...] = ()
     sources: tuple[Path, ...] = ()
     pattern: str | None = None
@@ -175,15 +180,17 @@ class AnalyzeRequest:
     yes: bool = False
     report_file: Path | None = None
     concurrency: int = 4
+    urls: tuple[str, ...] = ()
 
     def __post_init__(self) -> None:
         object.__setattr__(
             self,
             "positional_inputs",
-            tuple(Path(path) for path in self.positional_inputs),
+            tuple(str(value) for value in self.positional_inputs),
         )
         object.__setattr__(self, "files", tuple(Path(path) for path in self.files))
         object.__setattr__(self, "sources", tuple(Path(path) for path in self.sources))
+        object.__setattr__(self, "urls", tuple(str(value) for value in self.urls))
         if self.output_file is not None:
             object.__setattr__(self, "output_file", Path(self.output_file))
         if self.output_dir is not None:
@@ -329,11 +336,24 @@ class EnvironmentVariableListRequest:
 
 @dataclass(frozen=True)
 class PlannedInput:
-    path: Path
-    source_root: Path
+    path: Path | None
+    source_root: Path | None
     relative_path: Path
     origin: InputOrigin
-    size_bytes: int
+    size_bytes: int | None
+    url: str | None = None
+
+    @property
+    def reference(self) -> str:
+        if self.url is not None:
+            return self.url
+        if self.path is None:
+            raise ValueError("planned input must have either a local path or URL.")
+        return str(self.path)
+
+    @property
+    def is_remote(self) -> bool:
+        return self.url is not None
 
 
 @dataclass(frozen=True)