licos-dev-cli 0.4.9__tar.gz → 0.6.0__tar.gz

licos_dev_cli-0.6.0/PKG-INFO

@@ -0,0 +1,25 @@
+Metadata-Version: 2.4
+Name: licos-dev-cli
+Version: 0.6.0
+Summary: LICOS Dev CLI - generate files and call model capabilities
+Requires-Python: >=3.10
+Requires-Dist: click>=8.1
+Requires-Dist: licos-dev-sdk>=0.6.0
+Description-Content-Type: text/markdown
+
+# licos-dev CLI
+
+模型目录、模型调用和 `credit-check` 支持：
+
+- `--identity user`（默认）：用 `LICOS_CURRENT_USER_ID` 指定的容器执行用户换取 Token。
+- `--identity project`：使用项目身份。
+- `--token-stdin`：从标准输入读取本次请求的用户 Token，不含 `Bearer ` 前缀。不能与 `--identity project` 同时使用。
+
+`LICOS_CURRENT_USER_ID` 不是网页登录者。HTTP 服务调用 CLI 时，必须为用户操作使用 `--token-stdin`。缺少用户 ID、空 Token 或鉴权失败均报错，不切换到其他身份。
+
+```bash
+licos-dev credit-check --identity project
+licos-dev model-catalog --identity user
+```
+
+文档、图片排版等本地文件工具不需要用户身份选项。完整约定见仓库的 `tools/IDENTITY.md`。

licos_dev_cli-0.6.0/README.md

@@ -0,0 +1,16 @@
+# licos-dev CLI
+
+模型目录、模型调用和 `credit-check` 支持：
+
+- `--identity user`（默认）：用 `LICOS_CURRENT_USER_ID` 指定的容器执行用户换取 Token。
+- `--identity project`：使用项目身份。
+- `--token-stdin`：从标准输入读取本次请求的用户 Token，不含 `Bearer ` 前缀。不能与 `--identity project` 同时使用。
+
+`LICOS_CURRENT_USER_ID` 不是网页登录者。HTTP 服务调用 CLI 时，必须为用户操作使用 `--token-stdin`。缺少用户 ID、空 Token 或鉴权失败均报错，不切换到其他身份。
+
+```bash
+licos-dev credit-check --identity project
+licos-dev model-catalog --identity user
+```
+
+文档、图片排版等本地文件工具不需要用户身份选项。完整约定见仓库的 `tools/IDENTITY.md`。

{licos_dev_cli-0.4.9 → licos_dev_cli-0.6.0}/pyproject.toml

@@ -4,11 +4,12 @@ build-backend = "hatchling.build"
 
 [project]
 name = "licos-dev-cli"
-version = "0.4.9"
+version = "0.6.0"
 description = "LICOS Dev CLI - generate files and call model capabilities"
+readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
-    "licos-dev-sdk>=0.4.9",
+    "licos-dev-sdk>=0.6.0",
     "click>=8.1",
 ]
 

licos_dev_cli-0.6.0/src/licos_dev_cli/identity.py

@@ -0,0 +1,36 @@
+"""Explicit identity selection for model and credit CLI commands."""
+
+import os
+import sys
+import click
+from licos_platform_sdk import PlatformSdkError, runtime_user_token
+
+
+def identity_options(command):
+    command = click.option("--token-stdin", is_flag=True, help="Read the request user Token from stdin")(command)
+    return click.option(
+        "--identity",
+        type=click.Choice(["user", "project"]),
+        default="user",
+        show_default=True,
+        help="User uses LICOS_CURRENT_USER_ID; project uses project runtime credentials",
+    )(command)
+
+
+def user_token(identity: str, token_stdin: bool) -> str | None:
+    if token_stdin:
+        if identity == "project":
+            raise click.UsageError("--token-stdin cannot be combined with --identity project")
+        token = sys.stdin.read().strip()
+        if not token:
+            raise click.UsageError("--token-stdin requires a nonempty user Token")
+        return token
+    if identity == "project":
+        return None
+    user_id = os.environ.get("LICOS_CURRENT_USER_ID", "").strip()
+    if not user_id:
+        raise click.UsageError("User identity requires LICOS_CURRENT_USER_ID or --token-stdin")
+    try:
+        return runtime_user_token(user_id)
+    except PlatformSdkError as error:
+        raise click.ClickException(str(error)) from error

{licos_dev_cli-0.4.9 → licos_dev_cli-0.6.0}/src/licos_dev_cli/main.py

@@ -7,6 +7,7 @@ from pathlib import Path
 import click
 
 from .ppt_master import ppt_master
+from .identity import identity_options, user_token
 from .docx_commands import DOCX_COMMANDS
 from .common import _read_input, _read_json, _json_option, _echo_json, _path_to_cli_output, _echo_path
 
@@ -30,7 +31,8 @@ for command in DOCX_COMMANDS:
 @click.option("--resource-type", default="MODEL_TOOL", show_default=True)
 @click.option("--resource-code", default="MANUAL_CHECK", show_default=True)
 @click.option("--request-id", default=None)
-def credit_check(estimated_points, resource_type, resource_code, request_id):
+@identity_options
+def credit_check(estimated_points, resource_type, resource_code, request_id, identity, token_stdin):
     """Check whether the current SDK identity can execute a billed operation."""
     from licos_dev_sdk import check_credit_availability
 
@@ -40,6 +42,7 @@ def credit_check(estimated_points, resource_type, resource_code, request_id):
             resource_type=resource_type,
             resource_code=resource_code,
             request_id=request_id,
+            user_token=user_token(identity, token_stdin),
         )
     )
 
@@ -547,16 +550,20 @@ def html_cmd(input_path, content, filename, output_dir, content_type):
 
 # ── Model Catalog ────────────────────────────────────────────────────────────
 
+
 @cli.command("model-catalog")
 @click.option("--refresh", is_flag=True, help="Bypass local catalog cache")
 @click.option("--workspace-id", default=None, help="Workspace id; defaults to runtime workspace")
-@click.option("--input-capabilities", default=None, help="Optional input capabilities filter, for example text or image")
+@click.option(
+    "--input-capabilities", default=None, help="Optional input capabilities filter, for example text or image"
+)
 @click.option(
     "--category-code",
     default="llm",
     help="Model category code, for example llm, image_generation, video_generation",
 )
-def model_catalog(refresh, workspace_id, input_capabilities, category_code):
+@identity_options
+def model_catalog(refresh, workspace_id, input_capabilities, category_code, identity, token_stdin):
     """Print platform model capability catalog."""
     from licos_dev_sdk import fetch_model_catalogs
 
@@ -566,6 +573,7 @@ def model_catalog(refresh, workspace_id, input_capabilities, category_code):
             workspace_id=workspace_id,
             category_code=category_code,
             input_capabilities=input_capabilities,
+            user_token=user_token(identity, token_stdin),
         )
     )
 
@@ -585,7 +593,8 @@ def llm_group():
 @click.option("--temperature", default=None, type=float)
 @click.option("--max-completion-tokens", default=None, type=int)
 @click.option("--extra", default=None, help="Extra request fields as JSON object")
-def llm_invoke(prompt, messages, model, temperature, max_completion_tokens, extra):
+@identity_options
+def llm_invoke(prompt, messages, model, temperature, max_completion_tokens, extra, identity, token_stdin):
     """Run a non-streaming chat completion."""
     from licos_dev_sdk import LLMClient
 
@@ -596,7 +605,7 @@ def llm_invoke(prompt, messages, model, temperature, max_completion_tokens, extr
     extra_payload = _json_option(extra, "--extra") or {}
     if not isinstance(extra_payload, dict):
         raise click.BadParameter("--extra must be a JSON object")
-    result = LLMClient().invoke(
+    result = LLMClient(user_token=user_token(identity, token_stdin)).invoke(
         message_payload,
         model=model,
         temperature=temperature,
@@ -613,7 +622,8 @@ def llm_invoke(prompt, messages, model, temperature, max_completion_tokens, extr
 @click.option("--temperature", default=None, type=float)
 @click.option("--max-completion-tokens", default=None, type=int)
 @click.option("--extra", default=None, help="Extra request fields as JSON object")
-def llm_stream(prompt, messages, model, temperature, max_completion_tokens, extra):
+@identity_options
+def llm_stream(prompt, messages, model, temperature, max_completion_tokens, extra, identity, token_stdin):
     """Run a streaming chat completion and print text chunks."""
     from licos_dev_sdk import LLMClient
 
@@ -624,7 +634,7 @@ def llm_stream(prompt, messages, model, temperature, max_completion_tokens, extr
     extra_payload = _json_option(extra, "--extra") or {}
     if not isinstance(extra_payload, dict):
         raise click.BadParameter("--extra must be a JSON object")
-    for chunk in LLMClient().stream(
+    for chunk in LLMClient(user_token=user_token(identity, token_stdin)).stream(
         message_payload,
         model=model,
         temperature=temperature,
@@ -643,14 +653,17 @@ def vision_group():
 
 
 @vision_group.command("understand")
-@click.option("--image", "image", multiple=True, help="Image URL, Base64 data URI, or plain Base64 image data. Can be repeated.")
+@click.option(
+    "--image", "image", multiple=True, help="Image URL, Base64 data URI, or plain Base64 image data. Can be repeated."
+)
 @click.option("--image-url", "image_url", multiple=True, help="Alias for --image. Can be repeated.")
 @click.option("--file-path", "file_path", multiple=True, help="Local image file path. Can be repeated.")
 @click.option("-p", "--prompt", default="Describe this image.")
 @click.option("--model", default=None)
 @click.option("--mime-type", default=None, help="MIME type for plain Base64 image inputs. Defaults to image/png.")
 @click.option("--raw-request", default=None, help="Raw JSON request body")
-def vision_understand(image, image_url, file_path, prompt, model, mime_type, raw_request):
+@identity_options
+def vision_understand(image, image_url, file_path, prompt, model, mime_type, raw_request, identity, token_stdin):
     """Understand one or more images with the catalog vision model."""
     from licos_dev_sdk import VisionClient
 
@@ -659,7 +672,7 @@ def vision_understand(image, image_url, file_path, prompt, model, mime_type, raw
         raise click.BadParameter("--raw-request must be a JSON object")
     if raw_payload is None and not image_url and not image and not file_path:
         raise click.UsageError("Provide --image, --image-url, --file-path, or --raw-request.")
-    result = VisionClient().understand(
+    result = VisionClient(user_token=user_token(identity, token_stdin)).understand(
         images=[*image, *image_url],
         file_paths=list(file_path),
         prompt=prompt,
@@ -692,6 +705,7 @@ def image_generation_group():
 @click.option("--parameters", default=None, help="Parameters JSON object")
 @click.option("--raw-request", default=None, help="Raw JSON request body")
 @click.option("--no-wait", is_flag=True, help="Return submit response without polling async tasks")
+@identity_options
 def image_generate(
     prompt,
     image,
@@ -706,6 +720,8 @@ def image_generate(
     parameters,
     raw_request,
     no_wait,
+    identity,
+    token_stdin,
 ):
     """Generate images from text, image URLs/Base64, or local image files."""
     from licos_dev_sdk import ImageGenerationClient
@@ -718,7 +734,7 @@ def image_generate(
         raise click.BadParameter("--raw-request must be a JSON object")
     if raw_payload is None and not prompt:
         raise click.UsageError("Provide --prompt or --raw-request.")
-    result = ImageGenerationClient().generate(
+    result = ImageGenerationClient(user_token=user_token(identity, token_stdin)).generate(
         prompt or "",
         negative_prompt=negative_prompt,
         count=count,
@@ -756,6 +772,7 @@ def video_generation_group():
 @click.option("--parameters", default=None, help="Parameters JSON object")
 @click.option("--raw-request", default=None, help="Raw JSON request body")
 @click.option("--no-wait", is_flag=True, help="Return submit response without polling async tasks")
+@identity_options
 def video_generate(
     prompt,
     image,
@@ -769,6 +786,8 @@ def video_generate(
     parameters,
     raw_request,
     no_wait,
+    identity,
+    token_stdin,
 ):
     """Generate a video from a text prompt and optional first-frame image."""
     from licos_dev_sdk import VideoGenerationClient
@@ -781,7 +800,7 @@ def video_generate(
         raise click.BadParameter("--raw-request must be a JSON object")
     if raw_payload is None and not prompt:
         raise click.UsageError("Provide --prompt or --raw-request.")
-    result = VideoGenerationClient().generate(
+    result = VideoGenerationClient(user_token=user_token(identity, token_stdin)).generate(
         prompt or "",
         image=image,
         image_url=image_url,
@@ -807,7 +826,9 @@ def audio_group():
 
 
 @audio_group.command("recognize")
-@click.option("--audio", "audio", multiple=True, help="Audio URL, Base64 data URI, or plain Base64 audio data. Can be repeated.")
+@click.option(
+    "--audio", "audio", multiple=True, help="Audio URL, Base64 data URI, or plain Base64 audio data. Can be repeated."
+)
 @click.option("--audio-url", "audio_url", multiple=True, help="Alias for --audio. Can be repeated.")
 @click.option("--file-path", "file_path", multiple=True, help="Local audio file path. Can be repeated.")
 @click.option("--model", default=None)
@@ -815,7 +836,10 @@ def audio_group():
 @click.option("--parameters", default=None, help="Parameters JSON object")
 @click.option("--raw-request", default=None, help="Raw JSON request body")
 @click.option("--no-wait", is_flag=True, help="Return submit response without polling async tasks")
-def audio_recognize(audio, audio_url, file_path, model, mime_type, parameters, raw_request, no_wait):
+@identity_options
+def audio_recognize(
+    audio, audio_url, file_path, model, mime_type, parameters, raw_request, no_wait, identity, token_stdin
+):
     """Recognize speech from one or more audio inputs."""
     from licos_dev_sdk import SpeechRecognitionClient
 
@@ -827,7 +851,7 @@ def audio_recognize(audio, audio_url, file_path, model, mime_type, parameters, r
         raise click.BadParameter("--raw-request must be a JSON object")
     if raw_payload is None and not audio and not audio_url and not file_path:
         raise click.UsageError("Provide --audio, --audio-url, --file-path, or --raw-request.")
-    result = SpeechRecognitionClient().recognize(
+    result = SpeechRecognitionClient(user_token=user_token(identity, token_stdin)).recognize(
         audios=[*audio, *audio_url],
         file_paths=list(file_path),
         model=model,

{licos_dev_cli-0.4.9 → licos_dev_cli-0.6.0}/tests/test_credit_check.py

@@ -19,6 +19,8 @@ def test_credit_check_forwards_structured_options() -> None:
             cli,
             [
                 "credit-check",
+                "--identity",
+                "project",
                 "--estimated-points",
                 "2",
                 "--resource-type",
@@ -33,6 +35,7 @@ def test_credit_check_forwards_structured_options() -> None:
     assert result.exit_code == 0
     assert json.loads(result.output) == availability
     check.assert_called_once_with(
+        user_token=None,
         estimated_points=2,
         resource_type="MODEL_TOOL",
         resource_code="IMAGE_GENERATE",

licos_dev_cli-0.6.0/tests/test_identity.py

@@ -0,0 +1,44 @@
+import json
+from unittest import mock
+
+from click.testing import CliRunner
+from licos_dev_cli.main import cli
+
+
+def test_model_catalog_defaults_to_cli_execution_user():
+    with mock.patch.dict("os.environ", {"LICOS_CURRENT_USER_ID": "initializer"}, clear=True), mock.patch(
+        "licos_dev_cli.identity.runtime_user_token", return_value="cli-token"
+    ) as exchange, mock.patch("licos_dev_sdk.fetch_model_catalogs", return_value={}) as catalog:
+        result = CliRunner().invoke(cli, ["model-catalog"])
+    assert result.exit_code == 0, result.output
+    exchange.assert_called_once_with("initializer")
+    assert catalog.call_args.kwargs["user_token"] == "cli-token"
+
+
+def test_credit_check_accepts_web_token_from_stdin():
+    with mock.patch("licos_dev_cli.identity.runtime_user_token") as exchange, mock.patch(
+        "licos_dev_sdk.check_credit_availability", return_value={"allowed": True}
+    ) as check:
+        result = CliRunner().invoke(cli, ["credit-check", "--token-stdin"], input="web-token\n")
+    assert result.exit_code == 0, result.output
+    assert json.loads(result.output) == {"allowed": True}
+    assert check.call_args.kwargs["user_token"] == "web-token"
+    exchange.assert_not_called()
+
+
+def test_missing_cli_user_does_not_fall_back_to_owner():
+    with mock.patch.dict("os.environ", {"LICOS_USER_ID": "owner"}, clear=True), mock.patch(
+        "licos_dev_sdk.fetch_model_catalogs"
+    ) as catalog:
+        result = CliRunner().invoke(cli, ["model-catalog"])
+    assert result.exit_code != 0
+    assert "LICOS_CURRENT_USER_ID" in result.output
+    catalog.assert_not_called()
+
+
+def test_empty_or_conflicting_identity_options_fail():
+    with mock.patch("licos_dev_sdk.check_credit_availability") as check:
+        for args in [["--token-stdin"], ["--identity", "project", "--token-stdin"]]:
+            result = CliRunner().invoke(cli, ["credit-check", *args], input="")
+            assert result.exit_code != 0
+    check.assert_not_called()

licos_dev_cli-0.4.9/PKG-INFO

@@ -1,7 +0,0 @@
-Metadata-Version: 2.4
-Name: licos-dev-cli
-Version: 0.4.9
-Summary: LICOS Dev CLI - generate files and call model capabilities
-Requires-Python: >=3.10
-Requires-Dist: click>=8.1
-Requires-Dist: licos-dev-sdk>=0.4.9