data-ops-cli 0.2.1__py3-none-any.whl → 0.2.2__py3-none-any.whl

{data_ops_cli-0.2.1.dist-info → data_ops_cli-0.2.2.dist-info}/METADATA

@@ -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.dist-info → data_ops_cli-0.2.2.dist-info}/RECORD

@@ -1,23 +1,23 @@
-dataops_cli/__init__.py,sha256=HfjVOrpTnmZ-xVFCYSVmX50EXaBQeJteUHG-PD6iQs8,22
+dataops_cli/__init__.py,sha256=m6kyaNpwBcP1XYcqrelX2oS3PJuOnElOcRdBa9pEb8c,22
 dataops_cli/constants.py,sha256=Nc0ZofLF_sX_wDyVDvvrZPKOj6c_jahEOXmhy5phvF8,293
-dataops_cli/exceptions.py,sha256=16orv-vSvIai9Fi-q8iSV9C5lLKPimMmjBRYDTD0fCc,405
+dataops_cli/exceptions.py,sha256=GnNqDlMfgjMiL0Kp-H0KZMDJdRAckG6kd3V-NJiugFg,575
 dataops_cli/session.py,sha256=6agqEwJSL024vf2OHg8CiucmFGmQT1yEY4mao-NQp9E,5344
-dataops_cli/utils.py,sha256=qeO06dqy_aWLdX9kN8tyXyFU5N-GRhzefpIRRqz-eOc,3335
+dataops_cli/utils.py,sha256=-7iBbYjp9JM5LhuCkNhYoNITa26YJxyhd_oTYzPjERU,3740
 dataops_cli/cli/__init__.py,sha256=TvJw3xrE81YSwUrauHaJwQsRNf-YAlxLnadce1KYo4c,67
-dataops_cli/cli/auth.py,sha256=yEN2cFMRT45KxHMSYGWQAvUqkdx5mWzjuIAkAFeJQMs,5625
-dataops_cli/cli/data_table.py,sha256=eoqnXxFGq6u9se7VpYHXlxMeFKomJzsFrKTquiYyYSM,1460
-dataops_cli/cli/dataset.py,sha256=vUWOqo59P6ss7OU8035DjzqO_eFwSOd-sncbWpq3XqE,3442
-dataops_cli/cli/datasource.py,sha256=EvUaIDRV6WIK-X20zGlJkhD9XTIc4sT-E_8HiUByYEI,3481
+dataops_cli/cli/auth.py,sha256=7kM0c0hjALZ-u7-RsNZhwRct5kshA2S5_zmqSlFVzc4,6381
+dataops_cli/cli/data_table.py,sha256=vzzC7naHBNKe5aYsxjkFUdTHkQrkgsVHY3w_SGi3tKo,9402
+dataops_cli/cli/dataset.py,sha256=9r3T7tlXUg2swALAjlpcyRm_N2XZ6ui7r6AJYtOg1zA,3387
+dataops_cli/cli/datasource.py,sha256=E3B_Uspo0lQ5iApptqex45nSBNkvHQnGD9XtuJImClY,3361
 dataops_cli/cli/factory.py,sha256=Miib8v8iTylw7pUfvp4NV19bTKwpEQGTg1l8Lhj4uGA,1553
 dataops_cli/cli/metrics.py,sha256=CioC_l2DHlg3s97_-kAfLihdz7tLgOwb9lo2AIngb5I,6195
 dataops_cli/cli/ref.py,sha256=jfc5EhkXrhqUwu4IuftEjUepPB3d6SK4ZDhrh40YGOE,4765
 dataops_cli/cli/report.py,sha256=-qo5Nz31bCI_y8dvPoBnpn4-ggQ0Leo5mUsmiWBzNJ8,2437
-dataops_cli/cli/table.py,sha256=iHDUHvjp1dZFJEe7cDplp3Phx4hAz1L0O8p-qfzTNWs,7488
+dataops_cli/cli/table.py,sha256=5EoDrV32FSCLuyvhNl3yz5LSorAFL6Rw1oWNBcx9Iwg,7495
 dataops_cli/cli/utils.py,sha256=Qi3BGmZgIapasHAGCYVdOS8deYz5GmZIqKd289HYgeE,529
-dataops_cli/cli/widget.py,sha256=7rvBR4RS1zAg9j48yzLjWQvDF9vBN3H7TYRFjkpGOqU,1744
-dataops_cli/cli/workflow.py,sha256=HxZcR71ykPkLI5QoF9IutwLrmaPbTvxHxgnd9aHnMIU,4802
+dataops_cli/cli/widget.py,sha256=7Kzie7GqNf1vLK2O9G1HVSJnzjUGRHJqGaypVCEkLsE,1745
+dataops_cli/cli/workflow.py,sha256=Do0bwV9kHSSOICW5RELLJoL34fLhf7tIcqcOSokKFLw,4804
 dataops_cli/runner/__init__.py,sha256=BursdHKoU_4Bq-BhrYxNCJ88SpUajeMzVrnLMpbC4fc,767
-dataops_cli/runner/schemas/nacos/__init__.py,sha256=E_E8GI3ijWIRwXob34Oy6JaQaIir3qbF32aslmNrrVQ,147
+dataops_cli/runner/schemas/nacos/__init__.py,sha256=yXsULXK8G5IiZz2c26yrVhtvflbDLwgTkajm74YAA10,146
 dataops_cli/runner/schemas/nacos/config.py,sha256=pHrwJRoDGQNuqMVoQnkmNF0ENqUqcmUvp-j3Q_YgTx0,1326
 dataops_cli/runner/schemas/nacos/constants.py,sha256=034uKkGHqlfcOzk1CvG92OhBZM_5oBx1WHfZGzOuE7g,4262
 dataops_cli/runner/schemas/nacos/instance.py,sha256=jRHSYLcOLSdVEzS6ol7z1Ta7kK7E5pSu199eMSV1kMo,3974
@@ -30,30 +30,32 @@ dataops_cli/runner/schemas/nacos/service.py,sha256=C-27WmWW-ziZuplMTp2-xcIIPONVm
 dataops_cli/runner/utils/__init__.py,sha256=C0e_iiM80fScn_FGL4-HIRwmsHADiyN5TQ08a75FgQk,880
 dataops_cli/runner/utils/common.py,sha256=fz7uUjVRluZUUUaIhw2b9OXvs5k9M_W0l4TH6oxGilg,6282
 dataops_cli/runner/utils/dbConn_base.py,sha256=3reXPJ9uAcOVhl3sRNe4MPplYpKfG5DTfW0ETaqXeEo,8239
-dataops_cli/runner/utils/dbConn_sync.py,sha256=C8l1zzbDMeGryt-mPStVbTc7Q16dVLMt6cfJ7WjdfI8,12938
+dataops_cli/runner/utils/dbConn_sync.py,sha256=QG9_9ExNGeTWGkXmf6r16nSbu3YXLBchKU5STo3s08c,12938
 dataops_cli/runner/utils/duckdb_manager.py,sha256=xIREgkx6hcAbt6cYSTEHfGPGu7QgZsCwQrU4u2Vb1ng,6902
 dataops_cli/runner/utils/log.py,sha256=EwctSAohPIP1wo2FtUTjv5kswyoGHK70-2CFlyQ9yN4,1438
 dataops_cli/runner/utils/nacos.py,sha256=HSJyjswRk1ohzzUEjn4yRDtWKPjgsU_yYoS1nh5TWss,2994
 dataops_cli/runner/utils/neo4j_sync.py,sha256=cbpb4K5QUHcD1DuJg7_KeoBi8N1DLwru2sbiDMq779M,6603
-dataops_cli/schems/__init__.py,sha256=-bOjpAo_FfR7FnnyGJOLgmoOoHVOXvpmZ0zlGSURHCA,373
+dataops_cli/schems/__init__.py,sha256=xK0fa3LMvpQLIzVt-9GY-DC7C1z1c0xf5ZRlvicePKM,600
+dataops_cli/schems/data_table.py,sha256=SV_OR_pAzagVGZybgF5VjuqnHErAJO0lMBbbghWD_Jw,17292
 dataops_cli/schems/datasource.py,sha256=2b0dUf0xdO0J9fV5V1eCEM9Hj6ERButULuChl34i0Ik,2287
 dataops_cli/schems/enums.py,sha256=3lCxF5E4Jo1LUw9ZbA2-PiIbSGaYLBmrwQdlwdcmh-k,1438
 dataops_cli/schems/group.py,sha256=TvH0nsrGz1DpftrLAPpHqQuhMNgu0e5gu_Og3PiVnBc,1306
-dataops_cli/schems/meta.py,sha256=_tNcSm_s7OIJbx6kQaJ0CB7_oc0Wlym3Ac9uERjBZaM,4499
+dataops_cli/schems/meta.py,sha256=lHkk97cn2-lzIYgqGdIfE_KQvL8Os-bKl2jKhh4MK5Q,5938
 dataops_cli/schems/query.py,sha256=AWH0P51lkBQEKhotIOoqJaOEIEoaWaiT_r7hSXlzK2Q,6455
 dataops_cli/schems/report.py,sha256=Eklh1gMaRoPDvgrWZIBrLkQXhB0KuuAteJUzOzZngb8,493
+dataops_cli/schems/table.py,sha256=Y0ebyXYCw4vBhBgHyPXCz_4yVALAxMkQQlxSQsjJNs0,394
 dataops_cli/schems/user.py,sha256=mAPgLCCKeoC7qvOj6TOSC2xI3OrL7P5eNOGy4R3RVyw,2522
-dataops_cli/schems/widget.py,sha256=bzxkzh2ATGawjznZgLf7F_7nYrNkfddAnpRuC8ptX5k,21572
-dataops_cli/schems/workflow.py,sha256=KQr7bAlJtuUUxeVUVPrN7x4DL_iKHhNR3OuxVnYnsAc,1805
-dataops_cli/sdk/__init__.py,sha256=8e2ItcT178lDGO1OisQJdNr-pkC-SAf5HGbtercdkiY,335
-dataops_cli/sdk/auth.py,sha256=lqbG5WfGI_ylFCog5_lAWd43VuT25YbzLifggKeDO8Q,3936
-dataops_cli/sdk/data_table.py,sha256=rLPUK8Dk8ih_DSbFweL5B-fHtBhFMec1o9lFT-VbFTU,2083
-dataops_cli/sdk/datasource.py,sha256=Nsj1uqksigUG4f9U9i8Oc1J_jZhzcd9c6WqmdJUOmNs,1276
-dataops_cli/sdk/meta.py,sha256=V4lXHAvK0mRC3VBXacZPwdQk8OQ4bMGgjbGg3LRkExE,8628
+dataops_cli/schems/widget.py,sha256=q1zsVv9g0bS_Fev_IRzHaH86T3cQfwzS5fcm5VhVMrM,21691
+dataops_cli/schems/workflow.py,sha256=opRkEwYXntTO-BCOLcZJK2joA32qELpdnN6pI2LS_2Y,1805
+dataops_cli/sdk/__init__.py,sha256=7aGMRkNbuHPj4e4_Lz537Dy0M64A2CiVsfUL_a_zuuw,961
+dataops_cli/sdk/auth.py,sha256=75dyLs_cmgDm2vSjkiS8WhO_y3DW3lKHBXsOMmYut74,3978
+dataops_cli/sdk/data_table.py,sha256=eQ1VmmyOo5zITWIl4QvebcnYyajudV_-xSA16saKrTw,6940
+dataops_cli/sdk/datasource.py,sha256=BqeKEQKRhhLxSGM0wKBsGvh48NW7a5SlqRjLRSfh9AM,2043
+dataops_cli/sdk/meta.py,sha256=oBjefAKCd1o10NxM0tQOmQyAHOJZfqv_DESX5_FcVpA,16443
 dataops_cli/sdk/ref.py,sha256=BPttMiqaW7z1nuCvgY0nV6d-u1O1i_EbEJ7ZrL0KhFY,1925
-dataops_cli/sdk/report.py,sha256=3WQrNluI8sH80Pm_30bjtTuDhu0H-JZtuOpw0HmX22s,418
-dataops_cli/sdk/table.py,sha256=PbFI5MatzYMtvsQpZEKyVHNQ-LwUuCHWwyoaJzKtxSw,5730
-dataops_cli/sdk/workflow.py,sha256=uTlqzZVZUgQExTQ3N0b_bokqMcp-rCENV9H7D9OfyZA,508
+dataops_cli/sdk/report.py,sha256=uBmfgPCzqRMJQk8yS3kqSMLgOKijKEDRNOWamhjC6mw,376
+dataops_cli/sdk/table.py,sha256=zNaoqZMIC2Ot-gIsy-smf6eBlw0LVH6-s0ycfzlO6Dw,6646
+dataops_cli/sdk/workflow.py,sha256=go39E4Cc96bEuNW0pGeDvZZwonkKQ5njMaFTwLW-3jE,472
 dataops_cli/tiptap/__init__.py,sha256=UaHc1Q0T6OtmN02WNxTY1tp1-Iw8wzZjIyZE6rlMBgQ,612
 dataops_cli/tiptap/builder.py,sha256=w8lzbCcRo-AOFRvOoN3b_JV4hNLch_iSPbcYIcSqelk,2245
 dataops_cli/tiptap/constants.py,sha256=mkD8wRxKxPyvGl7V-csl8W4VRehfuUYJsm_2lWTS2Xk,3055
@@ -62,8 +64,8 @@ dataops_cli/tiptap/parse_utils.py,sha256=iJ4_gean-tkPXks4UShXuyPAkUwwFh41WL6cS7G
 dataops_cli/tiptap/render_utils.py,sha256=f5CDNLm0Y3uPXD0oPEjq4cKw1hDvWviY3IVlfS05vzE,21021
 dataops_cli/tiptap/renderers.py,sha256=qHAeYZeJf1Wip0svKtmy-28uFSeoTELzh3iE8bAQwaw,1235
 dataops_cli/tiptap/tool.py,sha256=7Uxoq-Kv_3XzU5ZW0k16wzwz79nhQf8D6qq7ygxERLw,27902
-data_ops_cli-0.2.1.dist-info/METADATA,sha256=33xzlMcc6PPkzL5ddA_zRina1_iKucLb5Z72hN8CvQ0,503
-data_ops_cli-0.2.1.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-data_ops_cli-0.2.1.dist-info/entry_points.txt,sha256=vc_2b5byVdLofaQ2ppuPM484AcaZnGsaHdcMKmtcSkU,53
-data_ops_cli-0.2.1.dist-info/top_level.txt,sha256=KFHplpKxwE9_wWypzVLESa4eLkOBsk-iUD_Qbld2IcY,12
-data_ops_cli-0.2.1.dist-info/RECORD,,
+data_ops_cli-0.2.2.dist-info/METADATA,sha256=T_6XcM0uKaqxt2yeEsc6Yzy97JwvC8ez-PFaFCfZbgc,503
+data_ops_cli-0.2.2.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+data_ops_cli-0.2.2.dist-info/entry_points.txt,sha256=vc_2b5byVdLofaQ2ppuPM484AcaZnGsaHdcMKmtcSkU,53
+data_ops_cli-0.2.2.dist-info/top_level.txt,sha256=KFHplpKxwE9_wWypzVLESa4eLkOBsk-iUD_Qbld2IcY,12
+data_ops_cli-0.2.2.dist-info/RECORD,,

dataops_cli/__init__.py

@@ -1 +1 @@
-__version__ = "0.2.1"
+__version__ = "0.2.2"

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)

dataops_cli/cli/data_table.py

@@ -1,21 +1,37 @@
+"""多维表格 (DataTable) CLI 命令模块.
+
+提供多维表格的列表查询和详情功能。
+"""
+
 from __future__ import annotations
 
-from typing import Annotated
+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
+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 命令（薄包装，负责输出渲染）
+# CLI 命令
 # ---------------------------------------------------------------------------
 
-data_table_typer = typer.Typer(name="data_table", help="多维表格相关", no_args_is_help=True)
+data_table_typer = typer.Typer(
+    name="data_table",
+    help="多维表格相关",
+    no_args_is_help=True,
+)
 
 
 @data_table_typer.command("list")
@@ -23,8 +39,23 @@ 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.value, datasource=datasource)
+        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
@@ -32,12 +63,198 @@ def list_datatable(
     if query:
         group_nodes = filter_nodes_by_pattern(group_nodes, query, include_digest=True)
 
-    table = Table("code", "alias", "remark")
+    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()

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

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)
 

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

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()

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:

dataops_cli/exceptions.py

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

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"]

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
 

dataops_cli/schems/__init__.py

@@ -1,9 +1,20 @@
-from .datasource import MetaDataSourceDDL
+from .data_table import DataTableData, MetaDataTable
+from .datasource import DataSourceDDL, MetaDataSourceDDL
 from .enums import InnerMetaType, MetaType
 from .group import GroupNode
-from .meta import Meta, MetaBase, MetaRef, MetaRelease
+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
+from .report import ReportMeta, ReportMetaData
+from .table import DataDict
 from .user import Application, UserInfo
-from .workflow import MetaWorkflow
 from .widget import WidgetMeta
+from .workflow import DataWorkflow, MetaWorkflow