dataops-sdk 0.3.5__tar.gz → 0.3.6__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dataops-sdk
-Version: 0.3.5
+Version: 0.3.6
 Summary: Python SDK for the DataOps platform.
 Requires-Python: >=3.11
 Requires-Dist: pydantic<3,>=2

{dataops_sdk-0.3.5 → dataops_sdk-0.3.6}/src/dataops_sdk/__init__.py

@@ -67,9 +67,7 @@ from .services import (  # noqa: F401
     service_get_table_detail_by_code,
     service_get_table_detail_by_name,
     service_get_table_list_by_code,
-    service_get_table_record_by_id,
     service_get_table_records_by_code,
-    service_get_table_reference_list,
     service_get_table_total_by_code,
     service_get_widget_data_by_code,
     service_get_widget_detail_by_code,
@@ -109,4 +107,4 @@ from .services import (  # noqa: F401
 )
 from .session import dataops_base_url_context, request_context
 
-__version__ = "0.3.5"
+__version__ = "0.3.6"

{dataops_sdk-0.3.5 → dataops_sdk-0.3.6}/src/dataops_sdk/schemas/__init__.py

@@ -28,6 +28,7 @@ from .meta import (
     MetaCreate,
     MetaRef,
     MetaUpdate,
+    MetaPageData,
 )
 from .query import PageParam, SqlCondition, SqlQueryParam, SqlSort
 from .report import ReportMeta, ReportMetaData
@@ -43,3 +44,4 @@ from .table import (
 from .user import Application, UserInfo
 from .widget import WidgetMeta, WidgetMetaData
 from .workflow import DataWorkflow, MetaWorkflow
+from .common import DataOpsResponse

dataops_sdk-0.3.6/src/dataops_sdk/schemas/common.py

@@ -0,0 +1,9 @@
+from typing_extensions import Annotated, TypeVar, Generic
+from pydantic import BaseModel, JsonValue, Field, NonNegativeInt
+
+DataVar = TypeVar("DataVar", default=JsonValue | None)
+
+class DataOpsResponse(BaseModel, Generic[DataVar]):
+    code: Annotated[NonNegativeInt, Field(description="响应码")]
+    msg: Annotated[str | None, Field(description="响应消息")]
+    data: Annotated[DataVar, Field(description="响应数据")]

{dataops_sdk-0.3.5 → dataops_sdk-0.3.6}/src/dataops_sdk/schemas/meta.py

@@ -127,10 +127,7 @@ class MetaBase(BaseModel):
     ] = None
     spaceName: Annotated[
         str | None,
-        Field(
-            description="空间名称",
-            validate_alias=AliasChoices("spaceName", "space_name", "SPACE_NAME"),
-        ),
+        Field(description="空间名称", validation_alias=AliasChoices("spaceName", "space_name", "SPACE_NAME")),
     ] = None
 
     subSystem: Annotated[
@@ -339,3 +336,10 @@ class MetaUpdate(BaseModel, Generic[META_DATA_TYPE]):
     data: Annotated[
         META_DATA_TYPE | None, Field(description="元数据", exclude_if=lambda x: x is None)
     ] = None
+
+
+class MetaPageData(BaseModel):
+    total: Annotated[int, Field(description="总数")]
+    page_num: Annotated[int, Field(description="页码", validation_alias=AliasChoices("pageNum", "page_num"))]
+    page_size: Annotated[int, Field(description="页大小", validation_alias=AliasChoices("pageSize", "page_size"))]
+    records: list[MetaBase] = Field(default_factory=list, description="数据")

{dataops_sdk-0.3.5 → dataops_sdk-0.3.6}/src/dataops_sdk/schemas/query.py

@@ -32,6 +32,7 @@ class SqlConditionBase(BaseModel):
 
     name: Annotated[str, Field(description="字段名")]
     value: Annotated[Any, Field(description="字段值")]
+    expression: Annotated[SqlExpression, Field(description="条件表达式")] = SqlExpression.EQ
 
 
 class SqlCondition(SqlConditionBase):
@@ -45,7 +46,6 @@ class SqlCondition(SqlConditionBase):
     """
 
     alias: Annotated[str | None, Field(description="表别名")] = None
-    expression: Annotated[SqlExpression, Field(description="条件表达式")]
 
 
 class SqlSort(BaseModel):
@@ -85,7 +85,7 @@ class SqlFilter(BaseModel):
         Returns:
             SqlFilter: 对应的过滤器实例。
         """
-        return cls(condition=SqlConditionBase(name=name, value=value))
+        return cls(condition=SqlConditionBase(name=name, value=value, expression=SqlExpression.EQ))
 
     @classmethod
     def ne(cls, name: str, value: Any):
@@ -222,11 +222,9 @@ class SqlQueryParam(BaseModel):
     """
 
     conjunction: Annotated[Literal["and", "or"], Field(description="条件连接符")] = "and"
-    conditionList: Annotated[
-        list[SqlCondition], Field(description="条件列表", default_factory=list)
-    ]
-    sorts: Annotated[list[SqlSort], Field(description="排序列表", default_factory=list)]
-    varMap: Annotated[dict[str, JsonValue], Field(description="变量映射", default_factory=dict)]
+    conditionList: list[SqlCondition] = Field(description="条件列表", default_factory=list)
+    sorts: list[SqlSort] = Field(description="排序列表", default_factory=list)
+    varMap: dict[str, JsonValue] = Field(description="变量映射", default_factory=dict)
 
     def add(self, *condition: SqlCondition):
         """追加条件.

{dataops_sdk-0.3.5 → dataops_sdk-0.3.6}/src/dataops_sdk/schemas/skill.py

@@ -16,6 +16,7 @@ class MetaSkillSubType(StrEnum):
     LLM = "llm"
     API = "api"
     REPORT = "report"
+    FORM = "form"
 
 
 class MetaSkillFileSubType(StrEnum):

{dataops_sdk-0.3.5 → dataops_sdk-0.3.6}/src/dataops_sdk/services/__init__.py

@@ -113,9 +113,7 @@ from .table import (
     service_get_table_detail_by_code,
     service_get_table_detail_by_name,
     service_get_table_list_by_code,
-    service_get_table_record_by_id,
     service_get_table_records_by_code,
-    service_get_table_reference_list,
     service_get_table_total_by_code,
     service_list_tables,
     service_update_table_record_by_id,

{dataops_sdk-0.3.5 → dataops_sdk-0.3.6}/src/dataops_sdk/services/data_table.py

@@ -1,14 +1,13 @@
 """多维表格 (DataTable) 的 SDK 服务层.
-
-纯 Python 接口，返回原始 Pydantic 模型，不依赖 typer/Rich。
 """
 
 from __future__ import annotations
 
-import warnings
 from collections.abc import Mapping, Sequence
+from typing_extensions import cast
 
 from pydantic import JsonValue, TypeAdapter
+from pydantic_core import to_json
 
 from dataops_sdk.schemas import (
     DataTableData,
@@ -23,18 +22,8 @@ from dataops_sdk.services.meta import (
     release_list_get_by_code,
     release_list_get_by_name,
 )
-from dataops_sdk.services.table import (
-    service_create_table_record,
-    service_delete_table_record_by_id,
-    service_delete_table_record_by_id_list,
-    service_get_table_list_by_code,
-    service_get_table_record_by_id,
-    service_get_table_records_by_code,
-    service_get_table_reference_list,
-    service_get_table_total_by_code,
-    service_update_table_record_by_id,
-    service_update_table_record_by_id_list,
-)
+from dataops_sdk.session import get_headers, get_session, vaild_respone
+from dataops_sdk.utils import encrypt_body
 
 __all__ = [
     "service_get_data_table_by_name",
@@ -53,15 +42,6 @@ __all__ = [
 ]
 
 
-def _warn_deprecated(old_name: str, new_name: str) -> None:
-    """提示调用方迁移到 ``table`` SDK 的同等服务。"""
-    warnings.warn(
-        f"{old_name} 已弃用，请改用 dataops_sdk.services.table.{new_name}",
-        DeprecationWarning,
-        stacklevel=3,
-    )
-
-
 def service_get_data_table_by_name(datasource: str, name: str) -> Meta[DataTableData]:
     """根据名称获取多维表格.
 
@@ -99,6 +79,26 @@ def service_get_data_table_by_code(code: str) -> Meta[DataTableData]:
     return release_list_get_by_code(MetaType.DATA_TABLE, code, _class=DataTableData)
 
 
+def service_create_data_table(meta: MetaCreate[DataTableData]) -> Meta[DataTableData]:
+    """创建多维表格.
+
+    Args:
+        meta: 要创建的多维表格元数据对象.
+
+    Returns:
+        后端返回的 ``data`` 字典.
+
+    Raises:
+        FailedToCreateError: 创建失败时.
+        DataOpsError: API 返回错误时.
+        AuthenticationError: 未认证或认证失败时.
+    """
+    return release_list_create(
+        meta,
+        _class=DataTableData,
+    )
+
+
 def service_get_data_table_data_by_code(
     code: str,
     page_param: PageParam | None = None,
@@ -107,7 +107,6 @@ def service_get_data_table_data_by_code(
     translate: bool = True,
     *,
     meta: Meta[DataTableData] | None = None,
-    _warn: bool = True,
 ) -> list[Mapping[str, JsonValue]]:
     """根据编码获取多维表格的数据.
 
@@ -115,7 +114,6 @@ def service_get_data_table_data_by_code(
         code: 数据表编码
         page_param: 分页参数，默认为 PageParam()（第一页，每页 20 条）
         query_param: 查询过滤条件，默认为 SqlQueryParam()
-        datasource: 数据源标识，指定从哪个子系统查询（可选）
         show_invisible: 是否显示未标记 visible 的字段，默认为 False
         translate: 是否对 DICT 类型字段进行值翻译，默认为 True
 
@@ -127,13 +125,8 @@ def service_get_data_table_data_by_code(
         DataOpsError: API 返回错误时
         AuthenticationError: 未认证或认证失败时
     """
-    if _warn:
-        _warn_deprecated(
-            "service_get_data_table_data_by_code",
-            "service_get_table_records_by_code"
-            if translate
-            else "service_get_table_list_by_code",
-        )
+    url = f"/data/table/records/{code}" if translate else f"/data/table/list/{code}"
+
 
     if page_param is None:
         page_param = PageParam()
@@ -141,24 +134,19 @@ def service_get_data_table_data_by_code(
         query_param = SqlQueryParam()
 
     meta = meta or service_get_data_table_by_code(code)
+    assert meta.data, "元数据为空 is None"
+
+    with get_session(timeout=15, sub_system=meta.subSystem) as session:
+        resp = session.post(url, content=to_json(encrypt_body(dict(pageParam=page_param, queryParam=query_param, code=code))))
+        body = vaild_respone(resp, True)
 
     adapter = TypeAdapter(list[Mapping[str, JsonValue]])
 
     if translate:
-        records_body = service_get_table_records_by_code(
-            code,
-            page_param=page_param,
-            query_param=query_param,
-            datasource=meta.subSystem,
-        )
-        datas = adapter.validate_python(records_body.get("list", []))
+        datas = adapter.validate_python(body.data.get("list", []))
     else:
-        datas = service_get_table_list_by_code(
-            code,
-            page_param=page_param,
-            query_param=query_param,
-            datasource=meta.subSystem,
-        )
+        datas = adapter.validate_python(body.data or [])
+
 
     # 过滤不需要显示的字段，建立字段名映射
     all_fields = meta.data.fields
@@ -170,13 +158,12 @@ def service_get_data_table_data_by_code(
     dict_fields_name: set[str] = set()
     dict_field_map: dict[str, dict[str, str]] = {}
     if translate:
-        relations = records_body.get("relations", {})
+        relations = body.data.get("data", {}).get("relations", {})
         dict_fields = [f for f in all_fields if f.type == MetaType.DICT.value]
         if not isinstance(relations, Mapping):
             relations = {}
         for key, relation in relations.items():
             if key.startswith("dict"):
-                # 查找匹配的字段（通过 ref.code 匹配）
                 field = next(
                     (f for f in dict_fields if f.type_ext.get("ref", {}).get("code")),
                     None,
@@ -188,7 +175,7 @@ def service_get_data_table_data_by_code(
                     }
                     dict_fields_name.add(field.dbName)
 
-    # 单次遍历完成所有转换： lowercase -> 过滤 -> 字典翻译 -> 字段名映射
+    # 单次遍历完成所有转换
     datas = [
         {
             field_name_map[k_lower]: (
@@ -213,9 +200,6 @@ def service_get_data_table_data_by_name(
 ):
     """按数据源与名称获取多维表格数据.
 
-    内部先按 ``datasource`` / ``name`` 获取 meta 对象，再委托给
-    :func:`service_get_data_table_data_by_code` 完成实际查询并复用 meta 提升性能.
-
     Args:
         datasource: 数据源.
         name: 多维表格名称.
@@ -232,10 +216,6 @@ def service_get_data_table_data_by_name(
         DataOpsError: API 返回错误时.
         AuthenticationError: 未认证或认证失败时.
     """
-    _warn_deprecated(
-        "service_get_data_table_data_by_name",
-        "service_get_table_records_by_code" if translate else "service_get_table_list_by_code",
-    )
     meta = service_get_data_table_by_name(datasource, name)
     return service_get_data_table_data_by_code(
         meta.code,
@@ -244,67 +224,9 @@ def service_get_data_table_data_by_name(
         show_invisible=show_invisible,
         translate=translate,
         meta=meta,
-        _warn=False,
-    )
-
-
-def service_create_data_table(meta: MetaCreate[DataTableData]) -> dict:
-    """创建多维表格.
-
-    Args:
-        meta: 要创建的多维表格元数据对象.
-
-    Returns:
-        后端返回的 ``data`` 字典.
-
-    Raises:
-        FailedToCreateError: 创建失败时.
-        DataOpsError: API 返回错误时.
-        AuthenticationError: 未认证或认证失败时.
-    """
-    return release_list_create(
-        meta,
-        _class=DataTableData,
     )
 
 
-# def service_update_data_table(
-#     code: str,
-#     title: str,
-#     data: dict,
-#     *,
-#     name: str | None = None,
-#     cuid: str | None = None,
-#     sub_type: str | None = None,
-# ) -> dict:
-#     """更新多维表格.
-
-#     Args:
-#         code: 多维表格编码
-#         title: 中文标题
-#         data: meta.data 字典，结构参考 DataTableData
-#         name: 名称 (默认为 code)
-#         cuid: 元数据 CUID (更新时必传)
-#         sub_type: 子类型 (可选)
-
-#     Returns:
-#         API 返回的 data 字典
-
-#     Raises:
-#         DataOpsError: API 返回错误时
-#         AuthenticationError: 未认证或认证失败时
-#     """
-#     return release_list_update(
-#         MetaType.DATA_TABLE,
-#         code=code,
-#         name=name or code,
-#         title=title,
-#         data=data,
-#         cuid=cuid,
-#         sub_type=sub_type,
-#     )
-
-
 def service_get_data_table_total(
     code: str,
     query_param: SqlQueryParam | None = None,
@@ -325,22 +247,18 @@ def service_get_data_table_total(
         DataOpsError: API 返回错误时
         AuthenticationError: 未认证或认证失败时
     """
-    _warn_deprecated(
-        "service_get_data_table_total",
-        "service_get_table_total_by_code",
-    )
     meta = meta or service_get_data_table_by_code(code)
-    return service_get_table_total_by_code(
-        code,
-        query_param=query_param,
-        datasource=meta.subSystem,
-    )
+    if query_param is None:
+        query_param = SqlQueryParam()
+    body = {
+        "queryParam": query_param,
+    }
+    with get_session(timeout=15, sub_system=meta.subSystem) as session:
+        resp = session.post(f"/data/table/total/{code}", content=to_json(encrypt_body(dict(queryParam=query_param))))
+        body = vaild_respone(resp, True)
+    return body.data or 0 # pyright: ignore[reportReturnType]
 
 
-@warnings.deprecated(
-    "Use dataops_sdk.services.table.service_get_table_reference_list instead.",
-    stacklevel=2,
-)
 def service_get_data_table_reference_list(
     code: str,
     subcode: str,
@@ -362,18 +280,17 @@ def service_get_data_table_reference_list(
         DataOpsError: API 返回错误时
         AuthenticationError: 未认证或认证失败时
     """
-    return service_get_table_reference_list(
-        code,
-        subcode,
-        page_param=page_param,
-        query_param=query_param,
-    )
+    meta = service_get_data_table_by_code(code)
+    body = {
+        "pageParam": page_param or PageParam(),
+        "queryParam": query_param or SqlQueryParam(),
+    }
+    with get_session(timeout=15, sub_system=meta.subSystem) as session:
+        resp = session.post(f"/data/table/referenceList/{code}/{subcode}", content=to_json(encrypt_body(body)))
+        body = vaild_respone(resp, True, _class=list[str])
+    return body.data or []
 
 
-@warnings.deprecated(
-    "Use dataops_sdk.services.table.service_get_table_record_by_id instead.",
-    stacklevel=2,
-)
 def service_get_data_table_record_by_id(code: str, id: str) -> dict[str, JsonValue]:
     """根据 ID 获取多维表格单条记录.
 
@@ -389,7 +306,10 @@ def service_get_data_table_record_by_id(code: str, id: str) -> dict[str, JsonVal
         DataOpsError: API 返回错误时
         AuthenticationError: 未认证或认证失败时
     """
-    return service_get_table_record_by_id(code, id)
+    with get_session() as session:
+        resp = session.get(f"/data/table/getById/{code}/{id}")
+        body = vaild_respone(resp, True, _class=dict[str, JsonValue])
+    return body.data or {}
 
 
 def service_create_data_table_record(
@@ -412,23 +332,20 @@ def service_create_data_table_record(
         DataOpsError: API 返回错误时
         AuthenticationError: 未认证或认证失败时
     """
-    _warn_deprecated(
-        "service_create_data_table_record",
-        "service_create_table_record",
-    )
     if meta is None:
         meta = service_get_data_table_by_code(code)
-    return service_create_table_record(code, data, datasource=meta.subSystem)
+    with get_session(sub_system=meta.subSystem) as session:
+        resp = session.post(f"/data/table/create/{code}", content=to_json(encrypt_body(dict(data))))
+        body = vaild_respone(resp, True)
+    return str(body.data) if body.data else ""
 
 
-@warnings.deprecated(
-    "Use dataops_sdk.services.table.service_update_table_record_by_id instead.",
-    stacklevel=2,
-)
 def service_update_data_table_record_by_id(
     code: str,
     id: str,
     data: Mapping[str, JsonValue],
+    *,
+    meta: Meta[DataTableData] | None = None,
 ) -> bool:
     """按 ID 更新多维表格记录.
 
@@ -436,6 +353,7 @@ def service_update_data_table_record_by_id(
         code: 数据表编码
         id: 主键 ID
         data: 要更新的字段数据
+        meta: 多维表格元数据对象（可选，用于获取 subSystem）
 
     Returns:
         更新是否成功
@@ -444,24 +362,28 @@ def service_update_data_table_record_by_id(
         DataOpsError: API 返回错误时
         AuthenticationError: 未认证或认证失败时
     """
-    return service_update_table_record_by_id(code, id, data)
+    if meta is None:
+        meta = service_get_data_table_by_code(code)
+    with get_session(sub_system=meta.subSystem) as session:
+        resp = session.post(f"/data/table/updateById/{code}/{id}", content=to_json(encrypt_body(dict(data))))
+        body = vaild_respone(resp, True)
+    return cast(bool, body.data)
 
 
-@warnings.deprecated(
-    "Use dataops_sdk.services.table.service_update_table_record_by_id_list instead.",
-    stacklevel=2,
-)
 def service_update_data_table_record_by_id_list(
     code: str,
-    id_list: Sequence[str],
+    ids: Sequence[str],
     data: Mapping[str, JsonValue],
+    *,
+    meta: Meta[DataTableData] | None = None,
 ) -> bool:
     """按 ID 列表批量更新多维表格记录.
 
     Args:
         code: 数据表编码
-        id_list: 主键 ID 列表
+        ids: 主键 ID 列表
         data: 要更新的字段数据
+        meta: 多维表格元数据对象（可选，用于获取 subSystem）
 
     Returns:
         更新是否成功
@@ -470,19 +392,27 @@ def service_update_data_table_record_by_id_list(
         DataOpsError: API 返回错误时
         AuthenticationError: 未认证或认证失败时
     """
-    return service_update_table_record_by_id_list(code, id_list, data)
+    if meta is None:
+        meta = service_get_data_table_by_code(code)
+    body = {"idList": ids, "data": data}
+    with get_session(sub_system=meta.subSystem) as session:
+        resp = session.post(f"/data/table/updateByIdList/{code}", content=to_json(encrypt_body(dict(body))))
+        body = vaild_respone(resp, True)
+    return cast(bool, body.data)
 
 
-@warnings.deprecated(
-    "Use dataops_sdk.services.table.service_delete_table_record_by_id instead.",
-    stacklevel=2,
-)
-def service_delete_data_table_record_by_id(code: str, id: str) -> bool:
+def service_delete_data_table_record_by_id(
+    code: str,
+    id: str,
+    *,
+    meta: Meta[DataTableData] | None = None,
+) -> bool:
     """按 ID 删除多维表格单条记录.
 
     Args:
         code: 数据表编码
         id: 主键 ID
+        meta: 多维表格元数据对象（可选，用于获取 subSystem）
 
     Returns:
         删除是否成功
@@ -491,22 +421,26 @@ def service_delete_data_table_record_by_id(code: str, id: str) -> bool:
         DataOpsError: API 返回错误时
         AuthenticationError: 未认证或认证失败时
     """
-    return service_delete_table_record_by_id(code, id)
+    if meta is None:
+        meta = service_get_data_table_by_code(code)
+    with get_session(sub_system=meta.subSystem) as session:
+        resp = session.post(f"/data/table/deleteById/{code}/{id}")
+        body = vaild_respone(resp, True)
+    return cast(bool, body.data)
 
 
-@warnings.deprecated(
-    "Use dataops_sdk.services.table.service_delete_table_record_by_id_list instead.",
-    stacklevel=2,
-)
 def service_delete_data_table_record_by_id_list(
     code: str,
     id_list: Sequence[str],
+    *,
+    meta: Meta[DataTableData] | None = None,
 ) -> bool:
     """按 ID 列表批量删除多维表格记录.
 
     Args:
         code: 数据表编码
         id_list: 主键 ID 列表
+        meta: 多维表格元数据对象（可选，用于获取 subSystem）
 
     Returns:
         删除是否成功
@@ -515,4 +449,10 @@ def service_delete_data_table_record_by_id_list(
         DataOpsError: API 返回错误时
         AuthenticationError: 未认证或认证失败时
     """
-    return service_delete_table_record_by_id_list(code, id_list)
+    if meta is None:
+        meta = service_get_data_table_by_code(code)
+    body = dict(idList=id_list)
+    with get_session(sub_system=meta.subSystem) as session:
+        resp = session.post(f"/data/table/deleteByIdList/{code}", content=to_json(encrypt_body(body)))
+        body = vaild_respone(resp, True)
+    return cast(bool, body.data)

{dataops_sdk-0.3.5 → dataops_sdk-0.3.6}/src/dataops_sdk/services/dict_.py

@@ -30,9 +30,7 @@ def service_list_dicts(datasource: str) -> list[MetaBase]:
         DataOpsError: API 请求失败时
         AuthenticationError: 未认证时
     """
-    headers = {"x-sub-system": datasource}
-    filters = (SqlQueryParam().add_eq("sub_system", datasource, "mrl"),)
-    return release_list_list(MetaType.DICT, filters=filters, headers=headers)
+    return release_list_list(MetaType.DICT, datasource=datasource)
 
 
 def service_get_dict_detail_by_name(datasource: str, name: str) -> Meta[DataDict]: