data-ops-cli 0.3.4__tar.gz → 0.3.6__tar.gz

{data_ops_cli-0.3.4 → data_ops_cli-0.3.6}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: data-ops-cli
-Version: 0.3.4
+Version: 0.3.6
 Summary: Command-line wrapper around dataops_sdk for the DataOps platform.
 Requires-Python: >=3.11
-Requires-Dist: dataops-sdk[runner]>=0.3.4
+Requires-Dist: dataops-sdk[runner]>=0.3.6
 Requires-Dist: typer
 Requires-Dist: rich
 Provides-Extra: dev

{data_ops_cli-0.3.4 → data_ops_cli-0.3.6}/pyproject.toml

@@ -8,7 +8,7 @@ dynamic = ["version"]
 description = "Command-line wrapper around dataops_sdk for the DataOps platform."
 requires-python = ">=3.11"
 dependencies = [
-    "dataops-sdk[runner]>=0.3.4",
+    "dataops-sdk[runner]>=0.3.6",
     "typer",
     "rich",
 ]

{data_ops_cli-0.3.4 → data_ops_cli-0.3.6}/src/data_ops_cli.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: data-ops-cli
-Version: 0.3.4
+Version: 0.3.6
 Summary: Command-line wrapper around dataops_sdk for the DataOps platform.
 Requires-Python: >=3.11
-Requires-Dist: dataops-sdk[runner]>=0.3.4
+Requires-Dist: dataops-sdk[runner]>=0.3.6
 Requires-Dist: typer
 Requires-Dist: rich
 Provides-Extra: dev

{data_ops_cli-0.3.4 → data_ops_cli-0.3.6}/src/data_ops_cli.egg-info/requires.txt

@@ -1,4 +1,4 @@
-dataops-sdk[runner]>=0.3.4
+dataops-sdk[runner]>=0.3.6
 typer
 rich
 

{data_ops_cli-0.3.4 → data_ops_cli-0.3.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.3.4"
+__version__ = "0.3.6"

{data_ops_cli-0.3.4 → data_ops_cli-0.3.6}/src/dataops_cli/cli/alarm.py

@@ -11,7 +11,6 @@ from typing import Annotated, Any
 
 import typer
 from dataops_sdk.exceptions import DataOpsError
-from dataops_sdk.schemas.query import SqlQueryParam
 from dataops_sdk.services.alarm import (
     service_count_alarm_action,
     service_count_alarm_rule_matches,
@@ -19,10 +18,18 @@ from dataops_sdk.services.alarm import (
     service_count_alarm_specs,
     service_find_alarm_table_data,
     service_find_meta_by_codes,
+    service_get_alarm_action_detail,
+    service_get_alarm_builtin_function_detail,
+    service_get_alarm_preprocess_detail,
+    service_get_alarm_rule_detail,
     service_get_alarm_rule_enums,
+    service_get_alarm_rule_type_detail,
+    service_get_alarm_spec_detail,
     service_get_alarm_table_columns,
     service_get_rel_table_columns,
     service_list_alarm_action,
+    service_list_alarm_builtin_functions,
+    service_list_alarm_preprocess,
     service_list_alarm_rule_matches,
     service_list_alarm_rules,
     service_list_alarm_specs,
@@ -39,13 +46,21 @@ from dataops_cli.cli.utils import print_list
 
 alarm_typer = typer.Typer(name="alarm", help="告警规则配置", no_args_is_help=True)
 alarm_rule_typer = typer.Typer(name="rule", help="告警规则命令", no_args_is_help=True)
+alarm_rule_type_typer = typer.Typer(name="type", help="告警规则类型命令", no_args_is_help=True)
 alarm_spec_typer = typer.Typer(name="spec", help="告警专业命令", no_args_is_help=True)
 alarm_action_typer = typer.Typer(name="action", help="告警动作命令", no_args_is_help=True)
+alarm_preprocess_typer = typer.Typer(name="preprocess", help="预处理脚本命令", no_args_is_help=True)
+alarm_builtin_function_typer = typer.Typer(
+    name="builtin-function", help="内置函数命令", no_args_is_help=True
+)
 rule_match_typer = typer.Typer(name="match", help="规则匹配命令", no_args_is_help=True)
 alarm_typer.add_typer(alarm_rule_typer, no_args_is_help=True)
 alarm_typer.add_typer(alarm_spec_typer, no_args_is_help=True)
+alarm_rule_typer.add_typer(alarm_rule_type_typer, no_args_is_help=True)
 alarm_rule_typer.add_typer(rule_match_typer, no_args_is_help=True)
 alarm_typer.add_typer(alarm_action_typer, no_args_is_help=True)
+alarm_typer.add_typer(alarm_preprocess_typer, no_args_is_help=True)
+alarm_typer.add_typer(alarm_builtin_function_typer, no_args_is_help=True)
 
 
 def _safe_str(value: Any) -> str:
@@ -87,6 +102,155 @@ def _print_column_list(data: Any) -> None:
         print(to_json(columns).decode("utf-8"))
 
 
+def _print_alarm_detail(detail: Any, title: str, simplify: bool = False) -> None:
+    """渲染告警详情的主体、data 和参数。"""
+    console = Console(no_color=True)
+    meta = detail.meta
+    basic_table = Table("字段", "值", title=title, show_header=False)
+    for field in ("code", "title", "type", "remark", "createUser", "lastModifyTime"):
+        value = getattr(meta, field, None)
+        if value is not None:
+            basic_table.add_row(field, _safe_str(value))
+    console.print(basic_table)
+
+    data = meta.data or {}
+    if hasattr(data, "model_dump"):
+        data = data.model_dump(mode="json")
+    if isinstance(data, dict):
+        data_table = Table("data 字段", "值", title="详情数据", show_header=False)
+        for key, value in data.items():
+            if simplify and key.lower() in {"script", "scriptcontent", "script_content"}:
+                continue
+            data_table.add_row(str(key), _safe_str(value))
+        if data_table.row_count:
+            console.print(data_table)
+
+    if detail.params:
+        params_table = Table("参数", "值", title="Meta 参数", show_header=False)
+        for key, value in detail.params.items():
+            params_table.add_row(str(key), _safe_str(value))
+        console.print(params_table)
+
+
+def _handle_alarm_detail(detail_service, code: str, title: str, simplify: bool) -> None:
+    """统一处理详情 service 的错误和终端输出。"""
+    try:
+        detail = detail_service(code)
+    except DataOpsError as e:
+        typer.echo(f"错误: {e.message}")
+        raise typer.Exit(code=1) from None
+    _print_alarm_detail(detail, title, simplify)
+
+
+@alarm_preprocess_typer.command("list", help="查询预处理脚本")
+def list_alarm_preprocess(
+    spec_type: Annotated[
+        list[str] | None, typer.Option("--spec-type", help="关联专业编码，可重复传入")
+    ] = None,
+    enabled: Annotated[
+        list[str] | None, typer.Option("--enabled", help="启用状态值 1/0，可重复传入")
+    ] = None,
+    page_num: Annotated[int, typer.Option("-n", "--page-num", "--page", help="页码")] = 0,
+    page_size: Annotated[int, typer.Option("-s", "--page-size", "--size", help="每页大小")] = 20,
+    query: Annotated[str | None, typer.Option("-q", "--query", help="脚本名称关键词")] = None,
+) -> None:
+    """查询预处理脚本列表。"""
+    try:
+        rows = service_list_alarm_preprocess(
+            page_num,
+            page_size,
+            query,
+            spec_type or [],
+            enabled or [],
+        )
+    except DataOpsError as e:
+        typer.echo(f"错误: {e.message}")
+        raise typer.Exit(code=1) from None
+
+    if not rows:
+        print("未查询到预处理脚本")
+        return
+    print_list(
+        ["脚本编码", "脚本名称", "关联专业", "脚本说明", "启用状态", "创建人", "创建时间"],
+        [
+            [
+                row.CODE,
+                row.TITLE,
+                row.N_SPEC_TYPE,
+                row.DESCRIPTION,
+                row.IS_ENABLED,
+                row.CREATE_USER,
+                row.CREATE_TIME,
+            ]
+            for row in rows
+        ],
+    )
+
+
+@alarm_preprocess_typer.command("detail", no_args_is_help=True)
+def get_alarm_preprocess_detail(
+    code: Annotated[str, typer.Argument(help="预处理脚本编码")],
+    simplify: Annotated[bool, typer.Option("-s", "--simplify", help="隐藏脚本正文")] = False,
+) -> None:
+    """按编码查询预处理脚本详情。"""
+    _handle_alarm_detail(
+        service_get_alarm_preprocess_detail,
+        code,
+        "预处理脚本详情",
+        simplify,
+    )
+
+
+@alarm_builtin_function_typer.command("list", help="查询内置函数")
+def list_alarm_builtin_functions(
+    enabled: Annotated[
+        list[str] | None, typer.Option("--enabled", help="启用状态值 1/0，可重复传入")
+    ] = None,
+    page_num: Annotated[int, typer.Option("-n", "--page-num", "--page", help="页码")] = 0,
+    page_size: Annotated[int, typer.Option("-s", "--page-size", "--size", help="每页大小")] = 20,
+    query: Annotated[str | None, typer.Option("-q", "--query", help="函数名称关键词")] = None,
+) -> None:
+    """查询内置函数列表。"""
+    try:
+        rows = service_list_alarm_builtin_functions(page_num, page_size, query, enabled or [])
+    except DataOpsError as e:
+        typer.echo(f"错误: {e.message}")
+        raise typer.Exit(code=1) from None
+
+    if not rows:
+        print("未查询到内置函数")
+        return
+    print_list(
+        ["函数编码", "函数名称", "类全路径", "备注", "启用状态", "创建人", "创建时间"],
+        [
+            [
+                row.CODE,
+                row.TITLE,
+                row.CLAZZ,
+                row.REMARK,
+                row.IS_ENABLED,
+                row.CREATE_USER,
+                row.CREATE_TIME,
+            ]
+            for row in rows
+        ],
+    )
+
+
+@alarm_builtin_function_typer.command("detail", no_args_is_help=True)
+def get_alarm_builtin_function_detail(
+    code: Annotated[str, typer.Argument(help="内置函数编码")],
+    simplify: Annotated[bool, typer.Option("-s", "--simplify", help="隐藏函数脚本")] = False,
+) -> None:
+    """按编码查询内置函数详情。"""
+    _handle_alarm_detail(
+        service_get_alarm_builtin_function_detail,
+        code,
+        "内置函数详情",
+        simplify,
+    )
+
+
 @rule_match_typer.command("count", help="查询告警匹配规则数量")
 def count_alarm_rules_match(
     spec: Annotated[list[str], typer.Option(help="专业值", default_factory=list)],
@@ -116,8 +280,8 @@ def count_alarm_rules_match(
 @rule_match_typer.command("list", help="查询告警匹配规则")
 def list_alarm_rules_match(
     spec: Annotated[list[str], typer.Option(help="专业值", default_factory=list)],
-    page_num: Annotated[int, typer.Option("-n", "--page-num", help="页码")] = 0,
-    page_size: Annotated[int, typer.Option("-s", "--page-size", help="每页大小")] = 20,
+    page_num: Annotated[int, typer.Option("-n", "--page-num", "--page", help="页码")] = 0,
+    page_size: Annotated[int, typer.Option("-s", "--page-size", "--size", help="每页大小")] = 20,
     query: Annotated[str | None, typer.Option("-q", "--query", help="搜索关键字")] = None,
     enabled: Annotated[bool | None, typer.Option(help="启用状态")] = None,
 ):
@@ -169,10 +333,53 @@ def list_alarm_rules_match(
     )
 
 
+@alarm_rule_typer.command("list", help="查询告警匹配规则")
+def list_alarm_rules(
+    spec: Annotated[list[str], typer.Option(help="专业值", default_factory=list)],
+    page_num: Annotated[int, typer.Option("-n", "--page-num", "--page", help="页码")] = 0,
+    page_size: Annotated[int, typer.Option("-s", "--page-size", "--size", help="每页大小")] = 20,
+    query: Annotated[str | None, typer.Option("-q", "--query", help="搜索关键字")] = None,
+    enabled: Annotated[bool | None, typer.Option(help="启用状态")] = None,
+) -> None:
+    """查询告警匹配规则列表。
+
+    这是前端 ``pages/alarm/rule`` 对应的 canonical 命令；旧的
+    ``alarm rule match list`` 仍保留作为兼容入口。
+    """
+    list_alarm_rules_match(spec, page_num, page_size, query, enabled)
+
+
+@alarm_rule_typer.command("detail", no_args_is_help=True)
+def get_alarm_rule_detail(
+    code: Annotated[str, typer.Argument(help="告警匹配规则编码")],
+    simplify: Annotated[bool, typer.Option("-s", "--simplify", help="简化详情输出")] = False,
+) -> None:
+    """按编码查询告警匹配规则基础详情。"""
+    _handle_alarm_detail(service_get_alarm_rule_detail, code, "告警匹配规则详情", simplify)
+
+
+@alarm_rule_typer.command("count", help="兼容查询告警规则类型数量")
+def count_alarm_rules_compat(
+    query: Annotated[str | None, typer.Option("-q", "--query", help="搜索关键字")] = None,
+    enabled: Annotated[bool | None, typer.Option(help="启用状态")] = None,
+) -> None:
+    """兼容保留的原规则类型数量命令。
+
+    规则类型的 canonical 列表命令是 ``alarm rule type list``；匹配规则数量
+    仍使用 ``alarm rule match count``。
+    """
+    try:
+        total = service_count_alarm_rules(query, enabled)
+    except DataOpsError as e:
+        typer.echo(f"错误: {e.message}")
+        raise typer.Exit(code=1) from None
+    print(total)
+
+
 @alarm_spec_typer.command("list", help="查询告警专业")
 def list_alarm_specs(
-    page_num: Annotated[int, typer.Option("-n", "--page-num", help="页码")] = 0,
-    page_size: Annotated[int, typer.Option("-s", "--page-size", help="每页大小")] = 20,
+    page_num: Annotated[int, typer.Option("-n", "--page-num", "--page", help="页码")] = 0,
+    page_size: Annotated[int, typer.Option("-s", "--page-size", "--size", help="每页大小")] = 20,
     query: Annotated[str | None, typer.Option("-q", "--query", help="搜索关键字")] = None,
     active: Annotated[bool | None, typer.Option(help="启用状态")] = None,
 ):
@@ -189,12 +396,7 @@ def list_alarm_specs(
     Examples:
         >>> data-ops-cli alarm spec list -q "网元"
     """
-    query_param = SqlQueryParam()
-    if active is not None:
-        query_param.varMap["isEnabled"] = "1" if active else "0"
-    if query:
-        query_param.add_like("title", query, "mrl")
-    group_nodes = service_list_alarm_specs(page_num, page_size, query_param)
+    group_nodes = service_list_alarm_specs(page_num, page_size, query, active)
 
     print_list(
         ["专业名称", "值", "行业", "启用状态", "创建人", "更新时间"],
@@ -212,6 +414,15 @@ def list_alarm_specs(
     )
 
 
+@alarm_spec_typer.command("detail", no_args_is_help=True)
+def get_alarm_spec_detail(
+    code: Annotated[str, typer.Argument(help="告警专业编码")],
+    simplify: Annotated[bool, typer.Option("-s", "--simplify", help="简化详情输出")] = False,
+) -> None:
+    """按编码查询告警专业详情。"""
+    _handle_alarm_detail(service_get_alarm_spec_detail, code, "告警专业详情", simplify)
+
+
 @alarm_spec_typer.command("count", help="查询告警专业数量")
 def count_alarm_specs(
     query: Annotated[str | None, typer.Option("-q", "--query", help="搜索关键字")] = None,
@@ -230,14 +441,14 @@ def count_alarm_specs(
     print(total)
 
 
-@alarm_rule_typer.command("list", help="查询告警规则")
-def list_alarm_rules(
-    page_num: Annotated[int, typer.Option("-n", "--page-num", help="页码")] = 0,
-    page_size: Annotated[int, typer.Option("-s", "--page-size", help="每页大小")] = 20,
+@alarm_rule_type_typer.command("list", help="查询告警规则类型")
+def list_alarm_rule_types(
+    page_num: Annotated[int, typer.Option("-n", "--page-num", "--page", help="页码")] = 0,
+    page_size: Annotated[int, typer.Option("-s", "--page-size", "--size", help="每页大小")] = 20,
     query: Annotated[str | None, typer.Option("-q", "--query", help="搜索关键字")] = None,
     enabled: Annotated[bool | None, typer.Option(help="启用状态")] = None,
 ):
-    """查询告警规则列表。
+    """查询告警规则类型列表。
 
     按关键字与启用状态过滤告警规则，并以平面表格输出名称、值与启用状态。
 
@@ -248,7 +459,7 @@ def list_alarm_rules(
         enabled: 可选启用状态过滤。
 
     Examples:
-        >>> data-ops-cli alarm rule list -q "电压"
+        >>> data-ops-cli alarm rule type list -q "电压"
     """
     group_nodes = service_list_alarm_rules(page_num, page_size, query, enabled)
 
@@ -267,8 +478,17 @@ def list_alarm_rules(
     )
 
 
-@alarm_spec_typer.command("count", help="查询告警规则数量")
-def count_alarm_specs(
+@alarm_rule_type_typer.command("detail", no_args_is_help=True)
+def get_alarm_rule_type_detail(
+    code: Annotated[str, typer.Argument(help="告警规则类型编码")],
+    simplify: Annotated[bool, typer.Option("-s", "--simplify", help="简化详情输出")] = False,
+) -> None:
+    """按编码查询告警规则类型详情。"""
+    _handle_alarm_detail(service_get_alarm_rule_type_detail, code, "告警规则类型详情", simplify)
+
+
+@alarm_rule_type_typer.command("count", help="查询告警规则类型数量")
+def count_alarm_rule_types(
     query: Annotated[str | None, typer.Option("-q", "--query", help="搜索关键字")] = None,
     enabled: Annotated[bool | None, typer.Option(help="启用状态")] = None,
 ):
@@ -279,7 +499,7 @@ def count_alarm_specs(
         enabled: 可选启用状态过滤。
 
     Examples:
-        >>> data-ops-cli alarm rule count
+        >>> data-ops-cli alarm rule type count
     """
     total = service_count_alarm_rules(query, enabled)
     print(total)
@@ -288,8 +508,8 @@ def count_alarm_specs(
 @alarm_action_typer.command("list", help="查询告警动作")
 def list_alarm_actions(
     rule: Annotated[list[str], typer.Option(help="专业值", default_factory=list)],
-    page_num: Annotated[int, typer.Option("-n", "--page-num", help="页码")] = 0,
-    page_size: Annotated[int, typer.Option("-s", "--page-size", help="每页大小")] = 20,
+    page_num: Annotated[int, typer.Option("-n", "--page-num", "--page", help="页码")] = 0,
+    page_size: Annotated[int, typer.Option("-s", "--page-size", "--size", help="每页大小")] = 20,
     query: Annotated[str | None, typer.Option("-q", "--query", help="搜索关键字")] = None,
     enabled: Annotated[bool | None, typer.Option(help="启用状态")] = None,
 ):
@@ -339,6 +559,15 @@ def list_alarm_actions(
     )
 
 
+@alarm_action_typer.command("detail", no_args_is_help=True)
+def get_alarm_action_detail(
+    code: Annotated[str, typer.Argument(help="告警动作编码")],
+    simplify: Annotated[bool, typer.Option("-s", "--simplify", help="简化详情输出")] = False,
+) -> None:
+    """按编码查询告警处置动作详情。"""
+    _handle_alarm_detail(service_get_alarm_action_detail, code, "告警处置动作详情", simplify)
+
+
 @alarm_action_typer.command("count", help="查询告警动作数量")
 def count_alarm_actions(
     rule: Annotated[list[str], typer.Option(help="专业值", default_factory=list)],

{data_ops_cli-0.3.4 → data_ops_cli-0.3.6}/src/dataops_cli/cli/api.py

@@ -90,7 +90,7 @@ def list_apis(
 
     print_list(
         ["code", "title", "remark"],
-        [[node.CODE, node.TITLE, _first_line(node.REMARK or "")] for node in group_nodes],
+        [[node.code, node.title, _first_line(node.remark or "")] for node in group_nodes],
     )
 
 

{data_ops_cli-0.3.4 → data_ops_cli-0.3.6}/src/dataops_cli/cli/auth.py

@@ -128,7 +128,9 @@ def logout() -> None:
 
 
 @application_typer.command("list")
-def application_list(query: Annotated[str | None, typer.Argument(help="关键字")] = None) -> None:
+def application_list(
+    query: Annotated[str | None, typer.Option("-q", "--query", help="关键字")] = None,
+) -> None:
     """列出所有可用应用。
 
     显示当前用户可访问的所有应用列表，支持通过关键字过滤。
@@ -142,7 +144,7 @@ def application_list(query: Annotated[str | None, typer.Argument(help="关键字
         >>> data-ops-cli auth application list
 
         通过关键字过滤应用
-        >>> data-ops-cli auth application list myapp
+        >>> data-ops-cli auth application list -q myapp
     """
     try:
         applications = service_list_applications(query)

{data_ops_cli-0.3.4 → data_ops_cli-0.3.6}/src/dataops_cli/cli/data_table.py

@@ -68,8 +68,8 @@ def list_datatable(
         group_nodes = filter_nodes_by_pattern(group_nodes, query, include_digest=True)
 
     print_list(
-        ["code", "title", "remark"],
-        [[column.CODE, column.TITLE, column.REMARK] for column in group_nodes],
+        ["code", "name", "title", "remark"],
+        [[column.code, column.name, column.title, column.remark or ""] for column in group_nodes],
     )
 
 
@@ -106,23 +106,17 @@ def get_datatable_detail(
         typer.echo("错误: 未找到多维表格")
         raise typer.Exit(code=1) from None
 
-    table = Table("field", "value", show_header=False)
-    table.add_row("datasource", meta.data.model.datasource)
-    table.add_row("引用类型", meta.data.model.ref_type)
-    table.add_row("引用编码", meta.data.model.ref_code)
-    table.add_row("引用表名", meta.data.model.table_name)
-
-    console = Console(no_color=True)
-    console.print(table)
+    print("ref-datasource ref-type ref-code ref-table-name")
+    print(meta.data.model.datasource, meta.data.model.ref_type, meta.data.model.ref_code, meta.data.model.table_name)
+    print()
 
     print_list(
-        ["column(visable)", "type", "title", "visible"],
+        ["column(visable)", "type", "title"],
         [
             [
                 field.name + f"({'√' if field.visible else 'x'})",
                 field.type,
                 field.title,
-                field.visible,
             ]
             for field in meta.data.fields
         ],
@@ -260,8 +254,15 @@ def get_datatable_data(
         query_param: 可选 SqlQueryParam JSON。
 
     Examples:
-        >>> data-ops-cli data_table data dt_code_001
+        通过多为表格编码查询数据
+        >>> data-ops-cli data_table data <code>
+        通过数据源和表名查询数据
+        >>> data-ops-cli data_table data <datasource> <name>
     """
+    if not name and not arg1.replace("_", "").replace("-", "").isnumeric():
+        print("输入参数错误 using `table detail <code>` or `table detail <datasource> <name>`")
+        raise typer.Exit(code=1) from None
+
     pp = PageParam(start=page_num * page_size, limit=page_size)
     qp = SqlQueryParam.model_validate_json(query_param) if query_param else SqlQueryParam()
 

{data_ops_cli-0.3.4 → data_ops_cli-0.3.6}/src/dataops_cli/cli/dataset.py

@@ -26,7 +26,7 @@ dataset_typer = typer.Typer(name="dataset", help="Manage dataset.", no_args_is_h
 
 @dataset_typer.command("list")
 def list_dataset(
-    query: Annotated[str | None, typer.Argument(help="名称关键字")] = None,
+    query: Annotated[str | None, typer.Option("-q", "--query", help="名称关键字")] = None,
 ) -> None:
     """列出所有数据集。
 
@@ -40,7 +40,7 @@ def list_dataset(
         >>> data-ops-cli dataset list
 
         # 按名称关键字过滤
-        >>> data-ops-cli dataset list "HHI.*"
+        >>> data-ops-cli dataset list -q "HHI.*"
     """
     try:
         group_nodes = service_list_datasets()
@@ -53,7 +53,7 @@ def list_dataset(
 
     print_list(
         ["code", "name", "alias", "remark"],
-        [[column.CODE, column.NAME, column.TITLE, column.REMARK] for column in group_nodes],
+        [[column.code, column.name, column.title, column.remark] for column in group_nodes],
     )
 
 

{data_ops_cli-0.3.4 → data_ops_cli-0.3.6}/src/dataops_cli/cli/datasource.py

@@ -100,10 +100,7 @@ def list_datasource(
 
     print_list(
         ["name", "alias", "type", "remark"],
-        [
-            [column.NAME, column.TITLE, column.SUB_TYPE, column.REMARK or ""]
-            for column in group_nodes
-        ],
+        [[column.code, column.name, column.title, column.remark or ""] for column in group_nodes],
     )
 
 

{data_ops_cli-0.3.4 → data_ops_cli-0.3.6}/src/dataops_cli/cli/dict_.py

@@ -22,7 +22,7 @@ dict_typer = typer.Typer(name="dict", help="Manage dict.", no_args_is_help=True)
 @dict_typer.command("list")
 def list_dict(
     datasource: Annotated[str, typer.Argument(help="数据源")],
-    query: Annotated[str | None, typer.Argument(help="字典名称关键字")] = None,
+    query: Annotated[str | None, typer.Option("-q", "--query", help="字典名称关键字")] = None,
 ) -> None:
     """列出数据源中的字典列表。
 
@@ -37,10 +37,10 @@ def list_dict(
         >>> data-ops-cli dict list <datasource>
 
         # 列出数据源中名称包含 "user" 的字典
-        >>> data-ops-cli dict list <datasource> user
+        >>> data-ops-cli dict list <datasource> -q user
 
         # 使用正则过滤字典名
-        >>> data-ops-cli dict list <datasource> "^user_.*"
+        >>> data-ops-cli dict list <datasource> -q "^user_.*"
     """
     try:
         group_nodes = service_list_dicts(datasource)
@@ -57,7 +57,7 @@ def list_dict(
 
     print_list(
         ["code", "name", "alias"],
-        [[column.CODE, column.NAME, column.TITLE] for column in group_nodes],
+        [[column.code, column.name, column.title] for column in group_nodes],
     )
 
 

{data_ops_cli-0.3.4 → data_ops_cli-0.3.6}/src/dataops_cli/cli/metrics.py

@@ -35,7 +35,7 @@ metrics_typer = typer.Typer(
 
 @metrics_typer.command("list")
 def list_metrics(
-    query: Annotated[str | None, typer.Argument(help="正则关键词")] = None,
+    query: Annotated[str | None, typer.Option("-q", "--query", help="正则关键词")] = None,
 ) -> None:
     """列出所有指标。
 
@@ -50,7 +50,7 @@ def list_metrics(
         >>> data-ops-cli metrics list
 
         通过正则过滤指标
-        >>> data-ops-cli metrics list "网元.*"
+        >>> data-ops-cli metrics list -q "网元.*"
     """
     try:
         group_nodes = release_list_list(MetaType.METRICS)
@@ -62,7 +62,7 @@ def list_metrics(
         group_nodes = filter_nodes_by_pattern(group_nodes, query)
     print_list(
         ["code", "title", "subType"],
-        [[column.CODE, column.TITLE, column.SUB_TYPE or "atomic"] for column in group_nodes],
+        [[column.code, column.title, column.subType or "atomic"] for column in group_nodes],
     )
 
 

{data_ops_cli-0.3.4 → data_ops_cli-0.3.6}/src/dataops_cli/cli/report.py

@@ -28,7 +28,7 @@ report_typer = typer.Typer(name="report", help="Manage reports", no_args_is_help
 
 @report_typer.command("list", rich_help_panel="报告查询")
 def list_reports(
-    query: Annotated[str | None, typer.Argument(help="正则关键词")] = None,
+    query: Annotated[str | None, typer.Option("-q", "--query", help="正则关键词")] = None,
 ) -> None:
     """列出所有报告。
 
@@ -42,7 +42,7 @@ def list_reports(
         >>> data-ops-cli report list
 
         通过正则关键词过滤报告
-        >>> data-ops-cli report list "daily.*"
+        >>> data-ops-cli report list -q "daily.*"
     """
     try:
         group_nodes = release_list_list(MetaType.REPORT)
@@ -55,7 +55,7 @@ def list_reports(
 
     print_list(
         ["code", "title", "subType"],
-        [[column.CODE, column.TITLE, column.SUB_TYPE or "doc"] for column in group_nodes],
+        [[column.code, column.title, column.subType or "doc"] for column in group_nodes],
     )
 
 

{data_ops_cli-0.3.4 → data_ops_cli-0.3.6}/src/dataops_cli/cli/skill.py

@@ -11,8 +11,10 @@ from pathlib import Path
 from typing import Annotated
 
 import typer
+from dataops_cli.cli.utils import paginate_with_line_numbers, print_list
 from dataops_sdk.exceptions import DataOpsError
-from dataops_sdk.schemas.skill import MetaSkillSubType
+from dataops_sdk.schemas.enums import MetaType
+from dataops_sdk.schemas.skill import MetaSkillFileSubType, MetaSkillSubType
 from dataops_sdk.services import (
     SkillPackValidationError,
     service_delete_skill,
@@ -29,11 +31,10 @@ from dataops_sdk.services.skill import (
     service_skill_get_subfile_by_name,
 )
 from dataops_sdk.tiptap import TipTapTool
+from dataops_sdk.tiptap.constants import TableStyle
 from pydantic_core import from_json
 from rich.console import Console
 
-from dataops_cli.cli.utils import paginate_with_line_numbers, print_list
-
 # ---------------------------------------------------------------------------
 # CLI 命令
 # ---------------------------------------------------------------------------
@@ -49,6 +50,7 @@ skill_file_typer = typer.Typer(
     no_args_is_help=True,
 )
 skill_typer.add_typer(skill_file_typer)
+MAKRDOWN_TABLE_STYLE = TableStyle.MARKDOWN
 
 
 @skill_typer.command("list")
@@ -76,31 +78,44 @@ def list_cmd(
 
     print_list(
         ("name", "title", "subType", "remark"),
-        [[it.NAME, it.TITLE, it.SUB_TYPE or "", it.REMARK or ""] for it in items],
+        [[it.name, it.title, it.subType or "", it.remark or ""] for it in items],
     )
 
 
 @skill_typer.command("detail", no_args_is_help=True)
 def detail_cmd(
-    name: Annotated[str | None, typer.Argument(help="技能名称")],
+    name: Annotated[str, typer.Argument(help="技能名称")],
+    path: Annotated[str | None, typer.Argument(help="文件路径")] = None,
     start: Annotated[int | None, typer.Option("--start", help="起始位置", min=1)] = None,
     size: Annotated[int | None, typer.Option("--size", help="读取长度", min=1)] = None,
 ) -> None:
     """查看技能详情。
 
     Examples:
-        >>> data-ops-cli skill detail --code my-skill
-        >>> data-ops-cli skill detail --name my-skill --full
+        获取 my-skill 技能文档
+        >>> data-ops-cli skill detail my-skill
+        获取 my-skill 技能 scripts/main.py 文件详情
+        >>> data-ops-cli skill detail my-skill scripts/main.py
     """
     try:
-        meta = service_get_skill_by_name(name)
+        meta = service_get_skill_by_name(name, path=path)
     except DataOpsError as e:
         typer.echo(f"错误: {e.message}")
         raise typer.Exit(code=1) from None
 
-    content = TipTapTool().serialize(meta.data.editor)
+    add_line_num = False
+    if meta.type == MetaType.SKILL.value or (
+        meta.type == MetaType.SKILL_FILE.value and meta.subType == MetaSkillFileSubType.DOC.value
+    ):
+        content = TipTapTool(table_style=MAKRDOWN_TABLE_STYLE).serialize(meta.data.editor)
+        add_line_num = True
+    elif meta.type == MetaType.SKILL_FILE.value and meta.subType == MetaSkillFileSubType.CODE.value:
+        add_line_num = True
+        content = meta.data.content
 
-    print(paginate_with_line_numbers(content, start=start, size=size))
+    if add_line_num:
+        content = paginate_with_line_numbers(content, start=start, size=size)
+    print(content)
 
 
 @skill_typer.command("upload", no_args_is_help=True)
@@ -248,7 +263,7 @@ def files_cmd(
     """列出某技能下的所有子文件。
 
     Examples:
-        >>> data-ops-cli skill files --skill-id <id>
+        >>> data-ops-cli skill files my-skills
     """
     try:
         items = service_list_skill_files(name)
@@ -262,43 +277,6 @@ def files_cmd(
     print("\n".join(it.DIGEST for it in items))
 
 
-@skill_file_typer.command("detail")
-def files_detail_cmd(
-    name: Annotated[str, typer.Argument(help="技能名称")],
-    path: Annotated[str, typer.Argument(help="子文件路径")],
-    start: Annotated[int | None, typer.Option("--start", help="起始位置", min=1)] = None,
-    size: Annotated[int | None, typer.Option("--size", help="读取长度", min=1)] = None,
-) -> None:
-    """获取某技能下某子文件的详细信息。
-
-    Examples:
-        >>> data-ops-cli skill files detail <skill-name> scripts/main.py
-    """
-    try:
-        meta = service_skill_get_subfile_by_name(name, path)
-    except DataOpsError as e:
-        typer.echo(f"错误: {e.message}")
-        raise typer.Exit(code=1) from None
-    content = None
-    add_line_num = False
-    if meta.subType == "doc":
-        add_line_num = True
-        content = TipTapTool().serialize(meta.data.get("editor", None))
-    elif meta.subType == "image":
-        raise NotImplementedError("不支持查看图片")
-    elif meta.subType == "code":
-        add_line_num = True
-        content = meta.data.get("content", None)
-    else:
-        raise NotImplementedError(f"未知的子文件类型 {meta.subType}")
-    if content is None:
-        print("未查询到子文件内容")
-
-    if add_line_num:
-        content = paginate_with_line_numbers(content, start=start, size=size)
-    print(content)
-
-
 @skill_file_typer.command("upload", no_args_is_help=True)
 def upload_sub_file_cmd(
     name: Annotated[str, typer.Argument(help="技能名称")],

{data_ops_cli-0.3.4 → data_ops_cli-0.3.6}/src/dataops_cli/cli/table.py

@@ -43,7 +43,7 @@ config_typer.add_typer(column_typer)
 @table_typer.command("list")
 def list_table(
     datasource: Annotated[str, typer.Argument(help="数据源")],
-    query: Annotated[str | None, typer.Argument(help="表名关键字")] = None,
+    query: Annotated[str | None, typer.Option("-q", "--query", help="表名关键字")] = None,
 ) -> None:
     """列出数据源中的表列表。
 
@@ -58,10 +58,10 @@ def list_table(
         >>> data-ops-cli table list mydatasource
 
         # 列出数据源中名称包含 "user" 的表
-        >>> data-ops-cli table list mydatasource user
+        >>> data-ops-cli table list mydatasource -q user
 
         # 使用正则过滤表名
-        >>> data-ops-cli table list mydatasource "^user_.*"
+        >>> data-ops-cli table list mydatasource -q "^user_.*"
     """
     try:
         group_nodes = service_list_tables(datasource)
@@ -77,7 +77,7 @@ def list_table(
         group_nodes = filter_nodes_by_pattern(group_nodes, query)
     print_list(
         ["code", "name", "alias", "remark"],
-        [[column.CODE, column.NAME, column.TITLE, column.REMARK] for column in group_nodes],
+        [[column.code, column.name, column.title, column.remark] for column in group_nodes],
     )
 
 
@@ -111,6 +111,9 @@ def get_table_detail(
         # 显示完整的DDL信息(含关联字段)
         >>> data-ops-cli table detail mydatasource t_user --full
     """
+    if not name and not arg1.replace("_", "").replace("-", "").isnumeric():
+        print("输入参数错误 using `table detail <code>` or `table detail <datasource> <name>`")
+        raise typer.Exit(code=1) from None
     try:
         meta = (
             service_get_table_detail_by_name(arg1, name)
@@ -123,7 +126,11 @@ def get_table_detail(
 
     datasource = meta.subSystem
 
-    print(datasource, meta.name)
+    assert meta.data, "元数据不存在"
+
+    print("datasource name code remark")
+    print(datasource, meta.name, meta.code, meta.remark or "")
+    print()
 
     def show_column(column: ColumnItem):
         if column.pk and column.labelKey:
@@ -205,6 +212,9 @@ def count_table_by_code(
         带查询条件统计数量
         >>> data-ops-cli table count mydatasource t_user --query '{"where":"status=1"}'
     """
+    if not name and not arg1.replace("_", "").replace("-", "").isnumeric():
+        print("输入参数错误 using `table detail <code>` or `table detail <datasource> <name>`")
+        raise typer.Exit(code=1) from None
     qp = SqlQueryParam.model_validate_json(query_param) if query_param else None
     try:
         count = (
@@ -228,14 +238,7 @@ def get_table_data(
         str | None, typer.Option("--query", "-q", help="查询参数(SqlQueryParam)")
     ] = None,
 ) -> None:
-    """获取表的实际数据内容。
-
-    支持两种查询方式:
-
-    1. 通过表编码(CODE)直接查询
-    2. 通过数据源名称和表名组合查询
-
-    支持分页参数 ``-n/--page-num``、``-s/--page-size``，以及 ``--query/-q`` 条件过滤。
+    """获取表的实际数据内容。s
 
     Args:
         arg1: 表编码；当同时提供 ``name`` 时为数据源名称。
@@ -257,6 +260,10 @@ def get_table_data(
         # 带条件过滤查询
         >>> data-ops-cli table data mydatasource t_user --query '{"where":"status=1"}'
     """
+    if not name and not arg1.replace("_", "").replace("-", "").isnumeric():
+        print("输入参数错误 using `table detail <code>` or `table detail <datasource> <name>`")
+        raise typer.Exit(code=1) from None
+
     pp = PageParam(start=page_num * page_size, limit=page_size)
     qp = SqlQueryParam.model_validate_json(query_param) if query_param else SqlQueryParam()
     try:
@@ -319,13 +326,12 @@ def exec_sql(
 @column_typer.command("base", no_args_is_help=True)
 def set_column_config(
     datasource: Annotated[str, typer.Argument(help="编数据源")],
-    name: Annotated[str | None, typer.Argument(help="表名")],
-    column: Annotated[str, typer.Argument(help="列名")],
+    name: Annotated[str, typer.Argument(help="表名")],
+    column_name: Annotated[str, typer.Argument(help="列名")],
     title: Annotated[str | None, typer.Option(help="中文名称")] = None,
     pk: Annotated[bool | None, typer.Option(help="主键")] = None,
     nullable: Annotated[bool | None, typer.Option(help="是否可为空")] = None,
     labelKey: Annotated[bool | None, typer.Option(help="名称键")] = None,
-    remark: Annotated[str | None, typer.Option(help="备注")] = None,
 ) -> None:
     """修改列基础配置。
 
@@ -337,10 +343,10 @@ def set_column_config(
         pk: 可选主键标记。
         nullable: 可空标记。
         labelKey: 可选名称键标记。
-        remark: 可选备注。
     """
     meta = service_get_table_detail_by_name(datasource, name)
-    column = next(filter(lambda c: c.name == column, meta.data.columns))
+    assert meta.data, f"表 {name} 元数据不存在"
+    column = next(filter(lambda c: c.name == column_name, meta.data.columns))
     if title:
         column.title = title
     if pk is not None:
@@ -349,18 +355,16 @@ def set_column_config(
         column.nullable = nullable
     if labelKey:
         column.labelKey = labelKey
-    if remark:
-        column.remark = remark
     result = release_list_update(meta)
     typer.echo(f"修改 {datasource} {name} {column.name} 完成")
 
 
 @column_typer.command("dict", no_args_is_help=True)
-def set_column_dict_config(
+def get_column_dict_config(
     datasource: Annotated[str, typer.Argument(help="编数据源")],
-    name: Annotated[str | None, typer.Argument(help="表名")],
-    column: Annotated[str, typer.Argument(help="列名")],
-    dict_name: Annotated[str, typer.Option("--dict", help="字典名称")] = None,
+    name: Annotated[str, typer.Argument(help="表名")],
+    column_name: Annotated[str, typer.Argument(help="列名")],
+    dict_name: Annotated[str, typer.Option("--dict", help="字典名称")],
 ) -> None:
     """设置列字典关系配置。
 
@@ -371,21 +375,23 @@ def set_column_dict_config(
         dict_name: 字典名称。
     """
     table_meta = service_get_table_detail_by_name(datasource, name)
-    column_item = next(filter(lambda c: c.name == column, table_meta.data.columns))
+    assert table_meta.data, f"表 {name} 元数据不存在"
+    column_item = next(filter(lambda c: c.name == column_name, table_meta.data.columns), None)
+    assert column_item, f"列 {column_name} 不存在"
     dict_meta = service_get_dict_detail_by_name(datasource, dict_name)
     column_item.type = "dict"
     column_item.typeExt = DataBaseColumnDictExternal(
         ref__dict=DataBaseColumnReference(type="dict", code=dict_meta.code)
     )
     result = release_list_update(table_meta)
-    typer.echo(f"修改 {datasource} {name} {column.name} 完成")
+    typer.echo(f"修改 {datasource} {name} {column_item.name} 完成")
 
 
 @column_typer.command("relation", no_args_is_help=True)
 def set_column_dict_config(
     datasource: Annotated[str, typer.Argument(help="编数据源")],
-    name: Annotated[str | None, typer.Argument(help="表名")],
-    column: Annotated[str, typer.Argument(help="列名")],
+    name: Annotated[str, typer.Argument(help="表名")],
+    column_name: Annotated[str, typer.Argument(help="列名")],
     r_name: Annotated[str, typer.Option(help="目标表名")] = None,
     r_col_name: Annotated[str, typer.Option(help="目标列名")] = None,
 ) -> None:
@@ -399,9 +405,13 @@ def set_column_dict_config(
         r_col_name: 目标列名。
     """
     table_meta = service_get_table_detail_by_name(datasource, name)
-    column_item = next(filter(lambda c: c.name == column, table_meta.data.columns))
+    assert table_meta.data, f"表 {name} 元数据不存在"
+    column_item = next(filter(lambda c: c.name == column_name, table_meta.data.columns), None)
+    assert column_item, f"列 {column_name} 不存在"
     dst_table_meta = service_get_table_detail_by_name(datasource, r_name)
-    dst_column_item = next(filter(lambda c: c.name == r_col_name, dst_table_meta.data.columns))
+    dst_column_item = next(filter(lambda c: c.name == r_col_name, dst_table_meta.data.columns), None)
+    assert dst_column_item, f"列 {r_col_name} 不存在"
+
     column_item.type = "relation"
     column_item.typeExt = DataBaseColumnTableExternal(
         ref__table=DataBaseColumnReference(type="table", code=dst_table_meta.code),
@@ -410,4 +420,4 @@ def set_column_dict_config(
         ),
     )
     result = release_list_update(table_meta)
-    typer.echo(f"修改 {datasource} {name} {column.name} 完成")
+    typer.echo(f"修改 {datasource} {name} {column_item.name} 完成")

{data_ops_cli-0.3.4 → data_ops_cli-0.3.6}/src/dataops_cli/cli/widget.py

@@ -50,7 +50,7 @@ def list_widget(
 
     print_list(
         ["code", "title", "subType", "remark"],
-        [[column.CODE, column.TITLE, column.SUB_TYPE, column.REMARK] for column in group_nodes],
+        [[column.code, column.title, column.subType, column.REMARK] for column in group_nodes],
     )
 
 

{data_ops_cli-0.3.4 → data_ops_cli-0.3.6}/src/dataops_cli/cli/workflow.py

@@ -69,7 +69,7 @@ def list_workflow(
 
     print_list(
         ["code", "title", "subType", "remark"],
-        [[column.CODE, column.TITLE, column.SUB_TYPE, column.REMARK] for column in group_nodes],
+        [[column.code, column.title, column.subType, column.remark] for column in group_nodes],
     )