data-ops-cli 0.2.1__tar.gz → 0.2.2__tar.gz

{data_ops_cli-0.2.1 → data_ops_cli-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: data-ops-cli
-Version: 0.2.1
+Version: 0.2.2
 Requires-Python: <3.14,>=3.11
 Requires-Dist: requests
 Requires-Dist: pydantic-core

{data_ops_cli-0.2.1 → data_ops_cli-0.2.2}/src/data_ops_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: data-ops-cli
-Version: 0.2.1
+Version: 0.2.2
 Requires-Python: <3.14,>=3.11
 Requires-Dist: requests
 Requires-Dist: pydantic-core

{data_ops_cli-0.2.1 → data_ops_cli-0.2.2}/src/data_ops_cli.egg-info/SOURCES.txt

@@ -44,12 +44,14 @@ src/dataops_cli/runner/utils/log.py
 src/dataops_cli/runner/utils/nacos.py
 src/dataops_cli/runner/utils/neo4j_sync.py
 src/dataops_cli/schems/__init__.py
+src/dataops_cli/schems/data_table.py
 src/dataops_cli/schems/datasource.py
 src/dataops_cli/schems/enums.py
 src/dataops_cli/schems/group.py
 src/dataops_cli/schems/meta.py
 src/dataops_cli/schems/query.py
 src/dataops_cli/schems/report.py
+src/dataops_cli/schems/table.py
 src/dataops_cli/schems/user.py
 src/dataops_cli/schems/widget.py
 src/dataops_cli/schems/workflow.py

data_ops_cli-0.2.2/src/dataops_cli/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.2"

{data_ops_cli-0.2.1 → data_ops_cli-0.2.2}/src/dataops_cli/cli/auth.py

@@ -12,7 +12,6 @@ import typer
 from rich.console import Console
 from rich.table import Table
 
-from dataops_cli.cli.datasource import get_datasource_config
 from dataops_cli.constants import USER_INFO_FILE
 from dataops_cli.exceptions import AuthenticationError
 from dataops_cli.schems import UserInfo
@@ -23,6 +22,7 @@ from dataops_cli.sdk.auth import (
     service_logout,
     service_set_application,
 )
+from dataops_cli.sdk.datasource import get_application_datasource_config
 from dataops_cli.utils import get_work_dir
 
 auth_typer = typer.Typer(name="auth", help="认证相关命令", no_args_is_help=True)
@@ -43,14 +43,30 @@ def auth_status() -> None:
         print("未登录")
     else:
         user_info = UserInfo.model_validate_json(target_path.read_bytes())
-
-    # application
-    application = service_get_current_application()
-    if application is None:
-        print(f"用户 `{user_info.user_name}` 已登录, 应用未设置")
+    try:
+        # application
+        application = service_get_current_application()
+        datasource_config = get_application_datasource_config()
+    except AuthenticationError:
+        print(f"{user_info.true_name}({user_info.user_name})登录过期，请重新登录")
     else:
-        print(f"用户 `{user_info.user_name}` 已登录, 应用设置为 `{application.CODE}`")
-        get_datasource_config()
+        if application is None:
+            print(f"{user_info.true_name}({user_info.user_name})已登录, 应用未设置")
+        else:
+            print(
+                f"{user_info.true_name}({user_info.user_name})已登录, 应用设置为{application.LABEL_CN}({application.CODE})"
+            )
+
+        table = Table(
+            "datasource",
+            "功能",
+            title=f"应用数据源配置\n{application.LABEL_CN}({application.CODE})",
+        )
+        table.add_row(datasource_config.main.name, "主数据源")
+        table.add_row(datasource_config.hazard_read.name, "隐患读数据源")
+        table.add_row(datasource_config.hazard_write.name, "隐患写数据源")
+        console = Console(no_color=True)
+        console.print(table)
 
 
 @auth_typer.command("login", no_args_is_help=True)

data_ops_cli-0.2.2/src/dataops_cli/cli/data_table.py

@@ -0,0 +1,260 @@
+"""多维表格 (DataTable) CLI 命令模块.
+
+提供多维表格的列表查询和详情功能。
+"""
+
+from __future__ import annotations
+
+from typing import Annotated, Optional
+
+import typer
+from rich.console import Console
+from rich.table import Table
+
+from dataops_cli.cli.utils import render_table
+from dataops_cli.exceptions import DataOpsError
+from dataops_cli.schems import MetaType, PageParam, SqlQueryParam
+from dataops_cli.sdk import (
+    service_get_data_table_by_code,
+    service_get_data_table_by_name,
+    service_get_data_table_data_by_code,
+    service_get_data_table_data_by_name,
+)
+from dataops_cli.sdk.meta import release_list_list
+from dataops_cli.utils import filter_nodes_by_pattern
+
+# ---------------------------------------------------------------------------
+# CLI 命令
+# ---------------------------------------------------------------------------
+
+data_table_typer = typer.Typer(
+    name="data_table",
+    help="多维表格相关",
+    no_args_is_help=True,
+)
+
+
+@data_table_typer.command("list")
+def list_datatable(
+    datasource: Annotated[str | None, typer.Argument(help="数据源")] = None,
+    query: Annotated[str | None, typer.Option("-q", "--query", help="正则表达式")] = None,
+) -> None:
+    """列出所有多维表格.
+
+    从元数据服务获取多维表格列表，支持通过正则表达式按名称、标题或备注进行过滤。
+
+    示例:
+        列出所有多维表格
+        >>> data-ops-cli data_table list
+
+        按数据源过滤
+        >>> data-ops-cli data_table list my_datasource
+
+        按名称/标题/备注过滤
+        >>> data-ops-cli data_table list --query ".*报表.*"
+        >>> data-ops-cli data_table list -q "日报"
+    """
+    try:
+        group_nodes = release_list_list(MetaType.DATA_TABLE, datasource=datasource)
+    except DataOpsError as e:
+        typer.echo(f"错误: {e.message}")
+        raise typer.Exit(code=1) from None
+
+    if query:
+        group_nodes = filter_nodes_by_pattern(group_nodes, query, include_digest=True)
+
+    table = Table("code", "title", "remark")
+    console = Console(no_color=True)
+    for column in group_nodes:
+        table.add_row(column.CODE, column.TITLE, column.REMARK or "")
+    console.print(table)
+
+
+@data_table_typer.command("detail", no_args_is_help=True)
+def get_datatable_detail(
+    arg1: Annotated[str, typer.Argument(help="编码或数据源")],
+    name: Annotated[Optional[str], typer.Argument(help="表名")] = None,
+) -> None:
+    """获取多维表格的完整详情.
+
+    根据多维表格编码获取详细信息，包括字段定义、模型配置、查询配置等。
+    支持通过 --field 选项输出指定字段。
+
+    示例:
+        获取多维表格完整信息
+        >>> data-ops-cli data_table detail dt_code_001
+
+        只输出字段列表 (fields)
+        >>> data-ops-cli data_table detail dt_code_001 --field data.fields
+
+        输出指定字段的 JSON
+        >>> data-ops-cli data_table detail dt_code_001 -f data
+    """
+    try:
+        meta = (
+            service_get_data_table_by_name(arg1, name)
+            if name
+            else service_get_data_table_by_code(arg1)
+        )
+    except DataOpsError as e:
+        typer.echo(e.message)
+        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)
+
+    table = Table("column(visable)", "type", "title", "visible", title="字段")
+    for field in meta.data.fields:
+        table.add_row(field.name + f"({'√' if field.visible else 'x'})", field.type, field.title)
+    console.print(table)
+
+    # TODO 完善输出
+
+
+# @data_table_typer.command("create", no_args_is_help=True)
+# def create_datatable(
+#     code: Annotated[str, typer.Argument(help="多维表格编码")],
+#     title: Annotated[str, typer.Argument(help="中文标题")],
+#     data_file: Annotated[
+#         str,
+#         typer.Argument(
+#             help="meta.data JSON 文件路径或 JSON 字符串 (以 { 开头视为 JSON, 否则视为文件路径)"
+#         ),
+#     ],
+#     remark: Annotated[str | None, typer.Option("-r", "--remark", help="备注")] = None,
+# ) -> None:
+#     """创建多维表格.
+
+#     从本地 JSON 文件读取 meta.data 配置并创建多维表格。
+
+#     示例:
+#         从文件创建
+#         >>> data-ops-cli data_table create dt_code_001 "测试表格" ./data_table.json
+
+#         直接传入 JSON 字符串
+#         >>> data-ops-cli data_table create dt_code_001 "测试表格" '{"model": {...}, "fields": [...]}'
+#     """
+#     # 解析 data: 可能是文件路径或 JSON 字符串
+#     data: dict
+#     if data_file.strip().startswith("{"):
+#         try:
+#             data = json.loads(data_file)
+#         except json.JSONDecodeError as e:
+#             typer.echo(f"错误: JSON 解析失败: {e}")
+#             raise typer.Exit(code=1) from None
+#     else:
+#         path = Path(data_file)
+#         if not path.exists():
+#             typer.echo(f"错误: 文件不存在: {data_file}")
+#             raise typer.Exit(code=1) from None
+#         try:
+#             data = json.loads(path.read_text(encoding="utf-8"))
+#         except json.JSONDecodeError as e:
+#             typer.echo(f"错误: JSON 文件解析失败: {e}")
+#             raise typer.Exit(code=1) from None
+
+#     try:
+#         result = service_create_data_table(code=code, title=title, data=data)
+#         cuid = result.get("cuid", "") if isinstance(result, dict) else ""
+#         typer.echo(f"成功创建多维表格: code={code}, cuid={cuid}")
+#     except DataOpsError as e:
+#         typer.echo(f"错误: {e.message}")
+#         raise typer.Exit(code=1) from None
+
+
+# @data_table_typer.command("update", no_args_is_help=True)
+# def update_datatable(
+#     code: Annotated[str, typer.Argument(help="多维表格编码")],
+#     title: Annotated[str, typer.Argument(help="中文标题")],
+#     data_file: Annotated[
+#         str,
+#         typer.Argument(help="meta.data JSON 文件路径或 JSON 字符串"),
+#     ],
+#     cuid: Annotated[
+#         str | None, typer.Option("-c", "--cuid", help="元数据 CUID (更新时必传)")
+#     ] = None,
+# ) -> None:
+#     """更新多维表格.
+
+#     从本地 JSON 文件读取 meta.data 配置并更新多维表格。
+#     需要通过 --cuid 指定要更新的元数据 CUID。
+
+#     示例:
+#         从文件更新
+#         >>> data-ops-cli data_table update dt_code_001 "测试表格" ./data_table.json --cuid abc123
+
+#         直接传入 JSON 字符串
+#         >>> data-ops-cli data_table update dt_code_001 "测试表格" '{"model": {...}, "fields": [...]}' -c abc123
+#     """
+#     if not cuid:
+#         typer.echo("错误: 更新操作需要 --cuid 参数，请先通过 detail 命令获取 CUID")
+#         raise typer.Exit(code=1) from None
+
+#     # 解析 data: 可能是文件路径或 JSON 字符串
+#     data: dict
+#     if data_file.strip().startswith("{"):
+#         try:
+#             data = json.loads(data_file)
+#         except json.JSONDecodeError as e:
+#             typer.echo(f"错误: JSON 解析失败: {e}")
+#             raise typer.Exit(code=1) from None
+#     else:
+#         path = Path(data_file)
+#         if not path.exists():
+#             typer.echo(f"错误: 文件不存在: {data_file}")
+#             raise typer.Exit(code=1) from None
+#         try:
+#             data = json.loads(path.read_text(encoding="utf-8"))
+#         except json.JSONDecodeError as e:
+#             typer.echo(f"错误: JSON 文件解析失败: {e}")
+#             raise typer.Exit(code=1) from None
+
+#     try:
+#         service_update_data_table(code=code, title=title, data=data, cuid=cuid)
+#         typer.echo(f"成功更新多维表格: code={code}, cuid={cuid}")
+#     except DataOpsError as e:
+#         typer.echo(f"错误: {e.message}")
+#         raise typer.Exit(code=1) from None
+
+
+@data_table_typer.command("data", no_args_is_help=True)
+def get_datatable_data(
+    arg1: Annotated[str, typer.Argument(help="编码或数据源")],
+    name: Annotated[Optional[str], typer.Argument(help="表名")] = None,
+    page: Annotated[int, typer.Option("--page", "-p", min=0, help="耶稣")] = 0,
+    size: Annotated[int, typer.Option("--size", "-l", min=0, help="单页数")] = 20,
+    query_param: Annotated[
+        str | None, typer.Option("--query", "-q", help="查询参数(SqlQueryParam)")
+    ] = None,
+) -> None:
+    """获取多维表格数据.
+
+    示例:
+        >>> data-ops-cli data_table data dt_code_001
+    """
+    pp = PageParam(start=page, limit=size)
+    qp = SqlQueryParam.model_validate_json(query_param) if query_param else SqlQueryParam()
+
+    try:
+        data = (
+            service_get_data_table_data_by_name(arg1, name, pp, qp)
+            if name
+            else service_get_data_table_data_by_code(arg1, pp, qp)
+        )
+    except DataOpsError as e:
+        typer.echo(f"错误: {e.message}")
+        raise typer.Exit(code=1) from None
+    if not data:
+        print("未查询到数据")
+        return
+    print(render_table(data))
+
+
+if __name__ == "__main__":
+    list_datatable()

{data_ops_cli-0.2.1 → data_ops_cli-0.2.2}/src/dataops_cli/cli/dataset.py

@@ -5,8 +5,7 @@ from rich.console import Console
 from rich.table import Table
 
 from dataops_cli.exceptions import DataOpsError
-from dataops_cli.schems.datasource import MetaDataSourceDDL
-from dataops_cli.schems.enums import MetaType
+from dataops_cli.schems import DataSourceDDL, MetaType
 from dataops_cli.sdk.meta import release_list_get_by_code, release_list_list
 from dataops_cli.utils import filter_nodes_by_pattern
 
@@ -62,7 +61,7 @@ def get_dataset_detail_by_code(
         >>> data-ops-cli dataset detail my_dataset_code --full
     """
     try:
-        meta = release_list_get_by_code(MetaType.DATASET.value, code, _class=MetaDataSourceDDL)
+        meta = release_list_get_by_code(MetaType.DATASET.value, code, _class=DataSourceDDL)
     except DataOpsError as e:
         typer.echo(f"错误: {e.message}")
         raise typer.Exit(code=1) from None

{data_ops_cli-0.2.1 → data_ops_cli-0.2.2}/src/dataops_cli/cli/datasource.py

@@ -18,7 +18,7 @@ from dataops_cli.exceptions import DataOpsError
 from dataops_cli.schems import (
     InnerMetaType,
 )
-from dataops_cli.sdk.datasource import get_datasource
+from dataops_cli.sdk.datasource import get_application_datasource_config, get_datasource
 from dataops_cli.sdk.meta import release_list_list
 from dataops_cli.sdk.table import (
     service_get_table_data_by_name,
@@ -47,16 +47,13 @@ def get_datasource_config() -> None:
         >>> data-ops-cli datasource config
     """
     application = get_application()
-    # 主数据源
-    datasource_main = get_datasource()
-    # 隐患读数据源
-    datasource_hazard_read = get_datasource(param_name="datasource_hazard_read")
-    # 隐患写数据源
-    datasource_hazard_write = get_datasource(param_name="datasource_hazard_write")
-    table = Table("name", "功能", title=f"{application.LABEL_CN}({application.CODE})\n数据源配置")
-    table.add_row(datasource_main.name, "主数据源")
-    table.add_row(datasource_hazard_read.name, "隐患读数据源")
-    table.add_row(datasource_hazard_write.name, "隐患写数据源")
+    datasource_config = get_application_datasource_config(application.CUID)
+    table = Table(
+        "name", "功能", title=f"应用数据源配置\n{application.LABEL_CN}({application.CODE})"
+    )
+    table.add_row(datasource_config.main.name, "主数据源")
+    table.add_row(datasource_config.hazard_read.name, "隐患读数据源")
+    table.add_row(datasource_config.hazard_write.name, "隐患写数据源")
     console = Console(no_color=True)
     console.print(table)
 

{data_ops_cli-0.2.1 → data_ops_cli-0.2.2}/src/dataops_cli/cli/table.py

@@ -86,10 +86,11 @@ def get_table_detail(
         >>> data-ops-cli table detail mydatasource t_user --full
     """
     try:
-        if name:
-            meta = service_get_table_detail_by_name(arg1, name)
-        else:
-            meta = service_get_table_detail_by_code(arg1)
+        meta = (
+            service_get_table_detail_by_name(arg1, name)
+            if name
+            else service_get_table_detail_by_code(arg1)
+        )
     except DataOpsError as e:
         typer.echo(f"错误: {e.message}")
         raise typer.Exit(code=1) from None

{data_ops_cli-0.2.1 → data_ops_cli-0.2.2}/src/dataops_cli/cli/widget.py

@@ -55,5 +55,6 @@ def detail_widget(
 
     typer.echo(json.dumps(meta.data, indent=2, ensure_ascii=False))
 
+
 if __name__ == "__main__":
     list_widget()

{data_ops_cli-0.2.1 → data_ops_cli-0.2.2}/src/dataops_cli/cli/workflow.py

@@ -108,7 +108,7 @@ def get_workflow_detail(
 
         print(f"{n_id}:", to_json(node.data.config).decode("utf-8"))
         if code_content:
-            print(f"```{node.data.config.get('language', '')}")
+            print(f"\n```{node.data.config.get('language', '')}")
             print(code_content)
             print("```")
     if node_id:

{data_ops_cli-0.2.1 → data_ops_cli-0.2.2}/src/dataops_cli/exceptions.py

@@ -17,3 +17,15 @@ class AuthenticationError(DataOpsError):
     """认证失败异常。"""
 
     pass
+
+
+class FailedToCreateError(DataOpsError):
+    """创建失败异常。"""
+
+    pass
+
+
+class FailedToUpdateError(DataOpsError):
+    """更新失败异常。"""
+
+    pass

{data_ops_cli-0.2.1 → data_ops_cli-0.2.2}/src/dataops_cli/runner/schemas/nacos/__init__.py

@@ -2,4 +2,4 @@ from .config import NacosSettings
 from .instance import Instance
 from .service import Service
 
-__all__ = ['Service', 'Instance', 'NacosSettings'] 
+__all__ = ["Service", "Instance", "NacosSettings"]

{data_ops_cli-0.2.1 → data_ops_cli-0.2.2}/src/dataops_cli/runner/utils/dbConn_sync.py

@@ -310,8 +310,8 @@ class DatabaseConn(DatabaseConnBase):
             if len(args) > 1 and isinstance(args[0], list):
                 return sql, list(map(tuple, args))
             else:
-                # return sql, tuple(args)
-                return sql, args
+                return sql, tuple(args)
+                # return sql, args
         else:
             return sql, args
 

data_ops_cli-0.2.2/src/dataops_cli/schems/__init__.py

@@ -0,0 +1,20 @@
+from .data_table import DataTableData, MetaDataTable
+from .datasource import DataSourceDDL, MetaDataSourceDDL
+from .enums import InnerMetaType, MetaType
+from .group import GroupNode
+from .meta import (
+    DEFAULT_META_DATA_TYPE,
+    META_DATA_TYPE,
+    Meta,
+    MetaBase,
+    MetaCreate,
+    MetaRef,
+    MetaRelease,
+    MetaUpdate,
+)
+from .query import PageParam, SqlCondition, SqlQueryParam, SqlSort
+from .report import ReportMeta, ReportMetaData
+from .table import DataDict
+from .user import Application, UserInfo
+from .widget import WidgetMeta
+from .workflow import DataWorkflow, MetaWorkflow