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

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

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: data-ops-cli
-Version: 0.3.5
+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.5 → 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.5 → 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.5
+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.5 → 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.5 → 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.5"
+__version__ = "0.3.6"

{data_ops_cli-0.3.5 → 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.5 → data_ops_cli-0.3.6}/src/dataops_cli/cli/table.py

@@ -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} 完成")