data-ops-cli 0.5.4__tar.gz → 0.5.6__tar.gz

{data_ops_cli-0.5.4 → data_ops_cli-0.5.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: data-ops-cli
-Version: 0.5.4
+Version: 0.5.6
 Summary: Command-line wrapper around dataops_sdk for the DataOps platform.
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{data_ops_cli-0.5.4 → data_ops_cli-0.5.6}/src/data_ops_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: data-ops-cli
-Version: 0.5.4
+Version: 0.5.6
 Summary: Command-line wrapper around dataops_sdk for the DataOps platform.
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{data_ops_cli-0.5.4 → data_ops_cli-0.5.6}/src/dataops_cli/__init__.py

@@ -14,4 +14,4 @@ groups command modules under :mod:`dataops_cli.cli` and re-exports the package
     removed in ``dataops_cli`` 1.0.
 """
 
-__version__ = "0.5.4"
+__version__ = "0.5.6"

{data_ops_cli-0.5.4 → data_ops_cli-0.5.6}/src/dataops_cli/cli/skill.py

@@ -15,14 +15,21 @@ from dataops_sdk.exceptions import DataOpsError
 from dataops_sdk.schemas import MetaSkillFileSubType, MetaSkillSubType, MetaType
 from dataops_sdk.services import (
     SkillPackValidationError,
+    release_list_get_by_name,
     service_delete_skill,
     service_get_skill_by_name,
     service_list_skill_files,
     service_list_skills,
     service_pack_skill_zip,
+    service_skill_bind_ontology,
     service_skill_call_by_name,
     service_skill_delete_sub_file,
     service_skill_download,
+    service_skill_followup_add,
+    service_skill_followup_list,
+    service_skill_followup_remove,
+    service_skill_followup_set,
+    service_skill_get_bindings,
     service_skill_list_skill_codes_by_ontology,
     service_skill_update,
     service_skill_upload,
@@ -53,8 +60,20 @@ skill_ontology_typer = typer.Typer(
     help="技能与本体归属",
     no_args_is_help=True,
 )
+skill_bind_typer = typer.Typer(
+    name="bind",
+    help="技能归属本体与后续动作",
+    no_args_is_help=True,
+)
+skill_followup_typer = typer.Typer(
+    name="followup",
+    help="后续动作",
+    no_args_is_help=True,
+)
 skill_typer.add_typer(skill_file_typer)
 skill_typer.add_typer(skill_ontology_typer)
+skill_typer.add_typer(skill_bind_typer)
+skill_bind_typer.add_typer(skill_followup_typer)
 MAKRDOWN_TABLE_STYLE = TableStyle.MARKDOWN
 
 
@@ -74,6 +93,124 @@ def ontology_skill_codes_cmd(
     print(json.dumps(codes, ensure_ascii=False, indent=2))
 
 
+def _resolve_ontology_code(ontology_code: str | None, ontology_name: str | None) -> str | None:
+    if ontology_code and ontology_name:
+        typer.echo("错误: --ontology-code 与 --ontology-name 不能同时使用")
+        raise typer.Exit(code=2)
+    if ontology_name:
+        meta = release_list_get_by_name(MetaType.ONTOLOGY, ontology_name)
+        return meta.code
+    return ontology_code
+
+
+@skill_bind_typer.command("show", no_args_is_help=True)
+def bind_show_cmd(name: Annotated[str, typer.Argument(help="技能业务名")]) -> None:
+    """查看技能归属本体与后续动作。"""
+    try:
+        bindings = service_skill_get_bindings(name)
+    except (DataOpsError, ValueError) as e:
+        message = e.message if isinstance(e, DataOpsError) else str(e)
+        typer.echo(f"错误: {message}")
+        raise typer.Exit(code=1) from None
+    print(json.dumps(bindings, ensure_ascii=False, indent=2))
+
+
+@skill_bind_typer.command("ontology", no_args_is_help=True)
+def bind_ontology_cmd(
+    name: Annotated[str, typer.Argument(help="技能业务名")],
+    ontology_code: Annotated[
+        str | None,
+        typer.Option("--ontology-code", help="本体 meta code"),
+    ] = None,
+    ontology_name: Annotated[
+        str | None,
+        typer.Option("--ontology-name", help="本体业务名，会解析为 code"),
+    ] = None,
+    clear: Annotated[bool, typer.Option("--clear", help="解除归属本体")] = False,
+) -> None:
+    """绑定或解除技能归属本体。"""
+    if clear and (ontology_code or ontology_name):
+        typer.echo("错误: --clear 不能与本体参数同时使用")
+        raise typer.Exit(code=2)
+    if not clear and not ontology_code and not ontology_name:
+        typer.echo("错误: 请指定 --ontology-code、--ontology-name 或 --clear")
+        raise typer.Exit(code=2)
+    try:
+        code = None if clear else _resolve_ontology_code(ontology_code, ontology_name)
+        service_skill_bind_ontology(name, code, clear=clear)
+    except (DataOpsError, ValueError) as e:
+        message = e.message if isinstance(e, DataOpsError) else str(e)
+        typer.echo(f"错误: {message}")
+        raise typer.Exit(code=1) from None
+    print("绑定已更新")
+
+
+@skill_followup_typer.command("list", no_args_is_help=True)
+def followup_list_cmd(name: Annotated[str, typer.Argument(help="技能业务名")]) -> None:
+    """列出后续动作。"""
+    try:
+        items = service_skill_followup_list(name)
+    except DataOpsError as e:
+        typer.echo(f"错误: {e.message}")
+        raise typer.Exit(code=1) from None
+    print(json.dumps(items, ensure_ascii=False, indent=2))
+
+
+@skill_followup_typer.command("set", no_args_is_help=True)
+def followup_set_cmd(
+    name: Annotated[str, typer.Argument(help="技能业务名")],
+    file: Annotated[Path, typer.Option("--file", help="后续动作 JSON 数组文件")],
+) -> None:
+    """用 JSON 文件全量替换后续动作。"""
+    if not file.exists():
+        typer.echo(f"错误: 文件不存在 {file}")
+        raise typer.Exit(code=2)
+    try:
+        payload = from_json(file.read_bytes())
+        if not isinstance(payload, list):
+            typer.echo("错误: JSON 须为数组")
+            raise typer.Exit(code=2)
+        service_skill_followup_set(name, payload)
+    except (DataOpsError, ValueError) as e:
+        message = e.message if isinstance(e, DataOpsError) else str(e)
+        typer.echo(f"错误: {message}")
+        raise typer.Exit(code=1) from None
+    print("后续动作已更新")
+
+
+@skill_followup_typer.command("add", no_args_is_help=True)
+def followup_add_cmd(
+    name: Annotated[str, typer.Argument(help="技能业务名")],
+    ref_type: Annotated[str, typer.Option("--type", help="目标类型 skill 或 workflow")],
+    code: Annotated[str, typer.Option("--code", help="目标 meta code")],
+    description: Annotated[str | None, typer.Option("--description", help="推荐描述")] = None,
+) -> None:
+    """追加一条后续动作。"""
+    try:
+        service_skill_followup_add(name, ref_type, code, description)
+    except (DataOpsError, ValueError) as e:
+        message = e.message if isinstance(e, DataOpsError) else str(e)
+        typer.echo(f"错误: {message}")
+        raise typer.Exit(code=1) from None
+    print("已添加后续动作")
+
+
+@skill_followup_typer.command("remove", no_args_is_help=True)
+def followup_remove_cmd(
+    name: Annotated[str, typer.Argument(help="技能业务名")],
+    index: Annotated[int | None, typer.Option("--index", help="列表下标，从 0 开始")] = None,
+    followup_id: Annotated[str | None, typer.Option("--id", help="后续动作 id")] = None,
+) -> None:
+    """删除一条后续动作。"""
+    try:
+        service_skill_followup_remove(name, index=index, followup_id=followup_id)
+    except (DataOpsError, ValueError) as e:
+        message = e.message if isinstance(e, DataOpsError) else str(e)
+        typer.echo(f"错误: {message}")
+        raise typer.Exit(code=1) from None
+    print("已删除后续动作")
+
+
 @skill_typer.command("list")
 def list_cmd(
     sub_types: Annotated[
@@ -154,6 +291,10 @@ def upload_cmd(
         typer.Option("--type", help="技能子类型"),
     ],
     title: Annotated[str | None, typer.Option("--title", help="技能简体中文名称")] = None,
+    ontology_code: Annotated[
+        str | None,
+        typer.Option("--ontology-code", help="发布时绑定的本体 meta code"),
+    ] = None,
 ) -> None:
     """从 ZIP 包导入技能到技能中心。
 
@@ -169,6 +310,7 @@ def upload_cmd(
             file_path=str(file),
             sub_type=dtype,
             title=title,
+            ontology_code=ontology_code,
         )
     except DataOpsError as e:
         typer.echo(f"错误: {e.message}")
@@ -185,6 +327,14 @@ def update_cmd(
         typer.Option("--type", help="技能子类型（可选）"),
     ] = None,
     title: Annotated[str | None, typer.Option("--title", help="技能简体中文名称")] = None,
+    ontology_code: Annotated[
+        str | None,
+        typer.Option("--ontology-code", help="更新时绑定的本体 meta code"),
+    ] = None,
+    clear_ontology: Annotated[
+        bool,
+        typer.Option("--clear-ontology", help="更新时解除归属本体"),
+    ] = False,
 ) -> None:
     """全量覆盖更新已有技能。
 
@@ -195,6 +345,9 @@ def update_cmd(
     if not file.exists():
         typer.echo(f"错误: 文件不存在 {file}")
         raise typer.Exit(code=2)
+    if clear_ontology and ontology_code:
+        typer.echo("错误: --ontology-code 与 --clear-ontology 不能同时使用")
+        raise typer.Exit(code=2)
 
     try:
         service_skill_update(
@@ -202,6 +355,8 @@ def update_cmd(
             file_path=str(file),
             sub_type=dtype,
             title=title,
+            ontology_code=ontology_code,
+            clear_ontology=clear_ontology,
         )
     except DataOpsError as e:
         typer.echo(f"错误: {e.message}")
@@ -310,6 +465,10 @@ def call_cmd(
         str,
         typer.Option("--input", "-i", help="入参 JSON 对象，如 '{\"a\": 1}'"),
     ] = "{}",
+    timeout: Annotated[
+        int | None,
+        typer.Option("--timeout", help="执行超时，单位秒"),
+    ] = None,
 ) -> None:
     """调用 skill 同步执行，等待 Python 容器返回结果。
 
@@ -326,7 +485,10 @@ def call_cmd(
         raise typer.Exit(code=2) from None
 
     try:
-        result = service_skill_call_by_name(name, inputs)
+        result = service_skill_call_by_name(name, inputs, timeout)
+    except ValueError as e:
+        typer.echo(f"错误: {e}")
+        raise typer.Exit(code=2) from None
     except DataOpsError as e:
         typer.echo(f"错误: {e.message}")
         raise typer.Exit(code=1) from None