data-ops-cli 0.4.0__tar.gz → 0.4.1__tar.gz

{data_ops_cli-0.4.0 → data_ops_cli-0.4.1}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: data-ops-cli
-Version: 0.4.0
+Version: 0.4.1
 Summary: Command-line wrapper around dataops_sdk for the DataOps platform.
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: dataops-sdk[runner]>=0.4.0
+Requires-Dist: dataops-sdk[runner]>=0.4.1
 Requires-Dist: typer
 Requires-Dist: rich
 Provides-Extra: dev

{data_ops_cli-0.4.0 → data_ops_cli-0.4.1}/pyproject.toml

@@ -9,7 +9,7 @@ description = "Command-line wrapper around dataops_sdk for the DataOps platform.
 requires-python = ">=3.11"
 readme = "README.md"
 dependencies = [
-    "dataops-sdk[runner]>=0.4.0",
+    "dataops-sdk[runner]>=0.4.1",
     "typer",
     "rich",
 ]

{data_ops_cli-0.4.0 → data_ops_cli-0.4.1}/src/data_ops_cli.egg-info/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: data-ops-cli
-Version: 0.4.0
+Version: 0.4.1
 Summary: Command-line wrapper around dataops_sdk for the DataOps platform.
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: dataops-sdk[runner]>=0.4.0
+Requires-Dist: dataops-sdk[runner]>=0.4.1
 Requires-Dist: typer
 Requires-Dist: rich
 Provides-Extra: dev

{data_ops_cli-0.4.0 → data_ops_cli-0.4.1}/src/data_ops_cli.egg-info/SOURCES.txt

@@ -31,4 +31,5 @@ src/dataops_cli/cli/skill.py
 src/dataops_cli/cli/table.py
 src/dataops_cli/cli/utils.py
 src/dataops_cli/cli/widget.py
-src/dataops_cli/cli/workflow.py
+src/dataops_cli/cli/workflow.py
+tests/test_table_relation.py

{data_ops_cli-0.4.0 → data_ops_cli-0.4.1}/src/data_ops_cli.egg-info/requires.txt

@@ -1,4 +1,4 @@
-dataops-sdk[runner]>=0.4.0
+dataops-sdk[runner]>=0.4.1
 typer
 rich
 

{data_ops_cli-0.4.0 → data_ops_cli-0.4.1}/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.4.0"
+__version__ = "0.4.1"

{data_ops_cli-0.4.0 → data_ops_cli-0.4.1}/src/dataops_cli/cli/auth.py

@@ -9,14 +9,13 @@
 from typing import Annotated
 
 import typer
-from dataops_sdk.constants import USER_INFO_FILE
+from dataops_sdk.constants import APPLICATION_FILE, USER_INFO_FILE
 from dataops_sdk.exceptions import AuthenticationError
 from dataops_sdk.schemas import UserInfo
 from dataops_sdk.services.auth import (
     service_get_current_application,
     service_list_applications,
     service_login,
-    service_logout,
     service_set_application,
 )
 from dataops_sdk.services.datasource import (
@@ -33,6 +32,15 @@ application_typer = typer.Typer(name="application", help="应用相关命令", n
 auth_typer.add_typer(application_typer)
 
 
+def _require_login() -> None:
+    """未登录时引导登录并退出。"""
+    if not get_work_dir(USER_INFO_FILE).exists():
+        typer.echo("未登录，请先执行登录：")
+        typer.echo("  data-ops-cli auth login <用户名> <密码>")
+        typer.echo("登录后执行 data-ops-cli auth application set <应用code> 设置应用")
+        raise typer.Exit(code=401)
+
+
 @auth_typer.command("status")
 def auth_status() -> None:
     """显示当前认证状态。
@@ -43,13 +51,9 @@ def auth_status() -> None:
     如果已登录但未设置应用，提示用户设置应用；
     否则同时输出应用关联的主/隐患数据源信息。
     """
-    target_path = get_work_dir(USER_INFO_FILE)
-    if not target_path.exists():
-        print("未登录")
-    else:
-        user_info = UserInfo.model_validate_json(target_path.read_bytes())
+    _require_login()
+    user_info = UserInfo.model_validate_json(get_work_dir(USER_INFO_FILE).read_bytes())
     try:
-        # application
         application = service_get_current_application()
         datasource_config = service_get_main_datasource_config_by_application()
     except AuthenticationError:
@@ -120,11 +124,11 @@ def logout() -> None:
     Examples:
         >>> data-ops-cli auth logout
     """
-    ret = service_logout()
-    if ret:
-        print("登出成功")
-    else:
-        print("登出失败: 未登录")
+    for filename in (USER_INFO_FILE, APPLICATION_FILE):
+        path = get_work_dir(filename)
+        if path.exists() and path.is_file():
+            path.unlink()
+    print("登出成功，已清除本地登录信息")
 
 
 @application_typer.command("list")
@@ -146,6 +150,7 @@ def application_list(
         通过关键字过滤应用
         >>> data-ops-cli auth application list -q myapp
     """
+    _require_login()
     try:
         applications = service_list_applications(query)
     except Exception as e:
@@ -175,11 +180,12 @@ def application_set(code: Annotated[str, typer.Argument(help="应用编码")]) -
         设置当前应用
         >>> data-ops-cli auth application set myapp_code
     """
+    _require_login()
     try:
         application = service_set_application(code)
-    except ValueError as e:
-        typer.echo(f"错误: {e}")
-        raise typer.Exit(code=1) from None
+    except ValueError:
+        typer.echo("输入的code值错误，请重新输入！")
+        raise typer.Exit(code=1)
 
     table = Table("field", "value", title="应用信息", show_header=False)
     table.add_row("code", application.CODE)
@@ -197,6 +203,7 @@ def application_info() -> None:
     查看当前已设置应用的详细信息，包括编码、标题和备注。
     如果尚未设置应用，提示用户使用 ``auth application set`` 命令进行设置。
     """
+    _require_login()
     application = service_get_current_application()
     if application is None:
         print("未设置应用, 执行 `data-ops-cli auth application set <code>` 进行设置应用.")

{data_ops_cli-0.4.0 → data_ops_cli-0.4.1}/src/dataops_cli/cli/dataset.py

@@ -9,6 +9,7 @@ import typer
 from dataops_sdk.exceptions import DataOpsError
 from dataops_sdk.schemas import PageParam, SqlFilter, SqlQueryParam
 from dataops_sdk.services import (
+    release_list_update,
     service_count_dataset_by_code,
     service_get_dataset_data_by_code,
     service_get_dataset_detail_by_code,
@@ -19,6 +20,10 @@ from dataops_sdk.utils import filter_nodes_by_pattern
 from dataops_cli.cli.utils import print_list, print_table_column_detail
 
 dataset_typer = typer.Typer(name="dataset", help="Manage dataset.", no_args_is_help=True)
+update_typer = typer.Typer(name="update", help="变更", no_args_is_help=True)
+dataset_typer.add_typer(update_typer)
+column_typer = typer.Typer(name="column", help="列变更", no_args_is_help=True)
+update_typer.add_typer(column_typer)
 
 
 @dataset_typer.command("list")
@@ -195,3 +200,44 @@ def get_dataset_data(
     headers = list(data[0].keys())
     rows = (tuple(row.get(header) for header in headers) for row in data)
     print_list(headers, rows)
+
+
+@column_typer.command("base", no_args_is_help=True)
+def update_dataset_column(
+    code: 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:
+    """修改数据集的列基础配置."""
+    updates = {
+        attr: value
+        for attr, value in {
+            "title": title,
+            "pk": pk,
+            "nullable": nullable,
+            "labelKey": labelKey,
+            "remark": remark,
+        }.items()
+        if value is not None
+    }
+    if not updates:
+        typer.echo("请输入要修改的列配置", err=True)
+        raise typer.Exit(code=1)
+    try:
+        meta = service_get_dataset_detail_by_code(code)
+        assert meta.data, f"数据集 {code} 不存在"
+        column_item = next((c for c in meta.data.columns if c.name == column_name), None)
+        if column_item is None:
+            typer.echo(f"数据集 {code} 中不存在字段 {column_name}")
+            raise typer.Exit(code=1)
+        for attr, value in updates.items():
+            setattr(column_item, attr, value)
+        release_list_update(meta)
+    except DataOpsError as e:
+        typer.echo(f"错误: {e.message}")
+        raise typer.Exit(code=1) from None
+    typer.echo(f"修改数据集 {code} 字段 {column_item.name} 完成")

{data_ops_cli-0.4.0 → data_ops_cli-0.4.1}/src/dataops_cli/cli/metrics.py

@@ -9,12 +9,12 @@
 from typing import Annotated
 
 import typer
-from dataops_sdk.schemas.enums import MetaType
-from dataops_sdk.schemas.query import SqlQueryParam
-from dataops_sdk.services.meta import (
-    DataOpsError,
+from dataops_sdk.exceptions import DataOpsError
+from dataops_sdk.schemas import MetaType, PageParam, SqlFilter, SqlQueryParam
+from dataops_sdk.services import (
     release_list_get_by_code,
     release_list_list,
+    service_get_metrics_data_by_code,
 )
 from dataops_sdk.utils import filter_nodes_by_pattern
 from rich.console import Console
@@ -175,3 +175,67 @@ def get_metrics_detail(
                     style.get("color", ""),
                 )
             console.print(level_table)
+
+
+@metrics_typer.command("data", no_args_is_help=True)
+def get_metrics_data(
+    code: Annotated[str, typer.Argument(help="指标编码")],
+    page_num: Annotated[int, typer.Option("-n", "--page-num", help="页码")] = 0,
+    page_size: Annotated[int, typer.Option("-s", "--page-size", help="每页大小")] = 20,
+    filters: Annotated[
+        list[SqlFilter] | None,
+        typer.Option(
+            "--condition",
+            "-c",
+            parser=SqlFilter.from_str,
+            help='查询条件(可多次传入)，JSON 格式 {"name":"字段名","value":值[,"expression":"eq"]}，expression 缺省 eq',
+        ),
+    ] = None,
+    dimensions: Annotated[
+        list[str] | None,
+        typer.Option(
+            "--dimension",
+            "-d",
+            help="维度字段名",
+        ),
+    ] = None,
+) -> None:
+    """获取指标实际数据。
+
+    通过指标编码查询指标维度下的实际数据行，支持分页与查询条件过滤。
+
+    Args:
+        code: 指标编码。
+        page_num: 页码，默认 0。
+        page_size: 每页大小，默认 20。
+        filters: 查询条件，JSON 格式 ``{"name": 字段名, "value": 值[, "expression": 表达式]}``。
+            可多次传入，多个条件按 AND 组合；``expression`` 缺省为 ``eq``，可选
+            ``eq/ne/gt/ge/lt/le/in/notin/like/notlike/between/notbetween/isnull/isnotnull``。
+
+    Examples:
+        通过指标编码获取指标数据（默认返回前20条）
+        >>> data-ops-cli metrics data 1777544300561_98429
+
+        从第2页开始，每页50条
+        >>> data-ops-cli metrics data 1777544300561_98429 --page-num 2 --page-size 50
+
+        带查询条件过滤（d_cycle_time 等于 2026-04-18）
+        >>> data-ops-cli metrics data 1777544300561_98429 -c '{"name":"d_cycle_time","value":"2026-04-18"}'
+    """
+    pp = PageParam(start=page_num * page_size, limit=page_size)
+
+    qp = SqlQueryParam()
+    if filters:
+        qp.add(*(filter_item.to_condition() for filter_item in filters))
+    try:
+        data = service_get_metrics_data_by_code(code, pp, qp, dimensions)
+    except DataOpsError as e:
+        typer.echo(f"错误: {e.message}")
+        raise typer.Exit(code=1) from None
+    if not data:
+        typer.echo("未查询到数据", err=True)
+        return
+    # 使用第一行字段顺序作为表头，保证每行数据与表头位置对应。
+    headers = list(data[0].keys())
+    rows = (tuple(row.get(header) for header in headers) for row in data)
+    print_list(headers, rows)

data_ops_cli-0.4.1/src/dataops_cli/cli/report.py

@@ -0,0 +1,142 @@
+"""文档管理模块.
+
+提供文档的读取和列表查询功能。
+
+- 服务层函数 (service_*)：纯 Python 接口，返回原始数据
+- CLI 命令：基于服务层的薄包装，负责格式化输出
+"""
+
+from typing import Annotated
+
+import typer
+from dataops_cli.cli.utils import print_group_tree, print_list
+from dataops_sdk.exceptions import DataOpsError
+from dataops_sdk.schemas import MetaReportSubType, MetaType
+from dataops_sdk.services.meta import (
+    release_list_list,
+)
+from dataops_sdk.services.report import service_get_report, servive_tree_report
+from dataops_sdk.utils import filter_nodes_by_pattern
+
+# ---------------------------------------------------------------------------
+# CLI 命令
+# ---------------------------------------------------------------------------
+
+report_typer = typer.Typer(name="report", help="Manage reports", no_args_is_help=True)
+space_typer = typer.Typer(name="space", help="Manage spaces", no_args_is_help=True)
+report_typer.add_typer(space_typer)
+
+
+@report_typer.command("list", rich_help_panel="报告查询")
+def list_reports(
+    sub_types: Annotated[
+        list[MetaReportSubType],
+        typer.Option("--type", "-t", help="报告子类型", default_factory=list),
+    ],
+    query: Annotated[str | None, typer.Option("-q", "--query", help="正则关键词")] = None,
+) -> None:
+    """列出所有报告。
+
+    从元数据服务获取报告列表，支持按报告子类型过滤，也支持通过正则表达式过滤报告编码或标题。
+
+    Args:
+        sub_types: 可选报告子类型列表（doc / ontology / dashboard）。
+        query: 可选正则关键词。
+
+    Examples:
+        列出所有报告
+        >>> data-ops-cli report list
+
+        只列出看板类报告
+        >>> data-ops-cli report list -t dashboard
+
+        通过正则关键词过滤报告
+        >>> data-ops-cli report list -q "daily.*"
+    """
+    try:
+        group_nodes = release_list_list(
+            MetaType.REPORT,
+            sub_types=[sub_type.value for sub_type in sub_types] if sub_types else None,
+        )
+    except DataOpsError as e:
+        typer.echo(f"错误: {e.message}")
+        raise typer.Exit(code=1)
+
+    if query:
+        group_nodes = filter_nodes_by_pattern(group_nodes, query)
+
+    print_list(
+        ["code", "title", "subType"],
+        [[column.code, column.title, column.subType or "doc"] for column in group_nodes],
+    )
+
+
+@report_typer.command("detail", rich_help_panel="报告查询")
+def read_report(code: Annotated[str, typer.Argument(help="报告编码")]) -> None:
+    """读取指定报告的完整内容。
+
+    通过报告编码从元数据服务获取报告详情，包括报告名称和正文内容。
+
+    Args:
+        code: 报告编码。
+
+    Examples:
+        读取报告详情
+        >>> data-ops-cli report detail daily_sales_2024
+    """
+    try:
+        meta = service_get_report(code)
+    except DataOpsError as e:
+        typer.echo(f"错误: {e.message}")
+        raise typer.Exit(code=1) from e
+    if meta.data is None:
+        typer.echo(f"错误: 报告({code})不存在")
+        raise typer.Exit(code=1) from None
+    content = meta.data.content
+    print(f"文档({meta.name})\n\n{content}")
+
+
+@space_typer.command("tree", no_args_is_help=True)
+def tree_report(
+    space_code: Annotated[str, typer.Argument(help="文档中心空间编码")],
+    query: Annotated[str | None, typer.Option("-q", "--query", help="表名关键字")] = None,
+    types: Annotated[
+        list[str] | None,
+        typer.Option("--type", "-t", help="类型过滤 (report/skill/workflow/data_table)"),
+    ] = None,
+) -> None:
+    """展示文档中心树结构。
+
+    Args:
+        space_code: 文档中心空间编码。
+        query: 表名关键字。
+        types: 文档、多维表格、技能、工作流子类型列表。
+    """
+    try:
+        tree = servive_tree_report(space_code)
+    except DataOpsError as e:
+        typer.echo(f"错误: {e.message}")
+        raise typer.Exit(code=1) from None
+    print_group_tree(tree, query, types=types)
+
+
+@space_typer.command("list")
+def list_report_space(
+    query: Annotated[str | None, typer.Option("-q", "--query", help="正则关键词")] = None,
+):
+    try:
+        group_nodes = release_list_list("report_space")
+    except DataOpsError as e:
+        typer.echo(f"错误: {e.message}")
+        raise typer.Exit(code=1)
+
+    if query:
+        group_nodes = filter_nodes_by_pattern(group_nodes, query)
+
+    output = [["report", "默认空间", "禁止删除"]]
+    output.extend([column.code, column.title, column.remark or ""] for column in group_nodes)
+
+    print_list(
+        ["space-code", "title", "remark"],
+        output,
+    )

{data_ops_cli-0.4.0 → data_ops_cli-0.4.1}/src/dataops_cli/cli/skill.py

@@ -14,6 +14,7 @@ import typer
 from dataops_cli.cli.utils import paginate_with_line_numbers, print_list
 from dataops_sdk.exceptions import DataOpsError
 from dataops_sdk.schemas import MetaSkillFileSubType, MetaSkillSubType, MetaType
+from dataops_sdk.schemas.enums import GroupNodeRefType
 from dataops_sdk.services import (
     SkillPackValidationError,
     service_delete_skill,
@@ -122,17 +123,28 @@ def detail_cmd(
 
 @skill_typer.command("upload", no_args_is_help=True)
 def upload_cmd(
+    space_code: Annotated[
+        str, typer.Argument(help="空间编码 (通过 ``report sapce list`` 查看空间编码)")
+    ],
     file: Annotated[Path, typer.Argument(help="技能 ZIP 文件路径")],
     dtype: Annotated[
         MetaSkillSubType,
         typer.Option("--type", help="技能子类型"),
     ],
+    ref_node_id: Annotated[
+        str | None, typer.Option("--ref-node-id", help="引用节点ID (通过 `report sapce tree` 查看)")
+    ] = None,
+    ref_type: Annotated[
+        GroupNodeRefType,
+        typer.Option("--ref-type", help="引用节点类型 (放置在引用节点前、后还是内)"),
+    ] = GroupNodeRefType.AFTER,
     title: Annotated[str | None, typer.Option("--title", help="技能简体中文名称")] = None,
 ) -> None:
-    """从 ZIP 包上传技能。
+    """从 ZIP 包上传技能到文档中心指定位置。
 
     Examples:
-        >>> data-ops-cli skill import my-skill.zip --type api
+        把技能上传到指定空间的执行Node里面
+        >>> data-ops-cli skill import {space-code} my-skill.zip --type api --ref-node-id {node-id} --ref-type inner
     """
     if not file.exists():
         typer.echo(f"错误: 文件不存在 {file}")
@@ -143,6 +155,9 @@ def upload_cmd(
             file_path=str(file),
             sub_type=dtype,
             title=title,
+            group_name=space_code,
+            ref_node_id=ref_node_id,
+            ref_type=ref_type,
         )
     except DataOpsError as e:
         typer.echo(f"错误: {e.message}")