dataops-sdk 0.3.2__tar.gz → 0.3.3__tar.gz

{dataops_sdk-0.3.2 → dataops_sdk-0.3.3}/PKG-INFO

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

{dataops_sdk-0.3.2 → dataops_sdk-0.3.3}/src/dataops_sdk/__init__.py

@@ -6,6 +6,7 @@ Nacos 集成能力，未安装时仍可独立导入本包核心功能。
 """
 
 from . import runner, schemas, utils
+from .runner import service_get_datasource_instent
 from .services import (  # noqa: F401
     release_list_create,
     release_list_get_by_code,
@@ -83,11 +84,12 @@ from .services import (  # noqa: F401
     service_list_workflows,
     service_login,
     service_logout,
+    service_pack_skill_zip,
     service_ref_backward,
     service_ref_forward,
     service_set_application,
     service_skill_call_by_code,
-    service_skill_import,
+    service_skill_upload,
     service_skill_upload_sub_file,
     service_start_workflow,
     service_start_workflow_async,
@@ -96,4 +98,4 @@ from .services import (  # noqa: F401
     service_update_data_table_record_by_id_list,
 )
 
-__version__ = "0.3.2"
+__version__ = "0.3.3"

{dataops_sdk-0.3.2 → dataops_sdk-0.3.3}/src/dataops_sdk/runner/__init__.py

@@ -11,7 +11,7 @@ Example:
     >>> from dataops_sdk.runner import DatabaseConn, getLogger
 """
 
-from .datasource_factory import get_datasource_instent
+from .datasource_factory import service_get_datasource_instent
 from .schemas.nacos import NacosSettings
 from .utils import (
     DatabaseConn,
@@ -40,5 +40,5 @@ __all__ = [
     "parse_args",
     "NacosSettings",
     "get_service_instance",
-    "get_datasource_instent",
+    "service_get_datasource_instent",
 ]

{dataops_sdk-0.3.2 → dataops_sdk-0.3.3}/src/dataops_sdk/runner/datasource_factory.py

@@ -6,7 +6,7 @@
 from dataops_sdk.services.datasource import service_get_datasource_by_name
 
 
-def get_datasource_instent(datasource: str, log_sql: bool | None = None):
+def service_get_datasource_instent(datasource: str, log_sql: bool | None = None, **kwargs):
     """
     根据数据源名称获取对应的连接实例。
 
@@ -80,3 +80,5 @@ def get_datasource_instent(datasource: str, log_sql: bool | None = None):
                 log_sql=log_sql,
                 name=meta.title,
             )
+    else:
+        raise NotImplementedError(f"Category {meta.data.category} is not supported")

{dataops_sdk-0.3.2 → dataops_sdk-0.3.3}/src/dataops_sdk/runner/utils/dbConn_sync.py

@@ -464,7 +464,9 @@ class DatabaseConn(DatabaseConnBase):
             >>> conn.commit()  # 或者 conn.rollback()
         """
         if self._session is not None:
-            raise RuntimeError("Transaction already active. Commit or rollback before starting a new one.")
+            raise RuntimeError(
+                "Transaction already active. Commit or rollback before starting a new one."
+            )
         self._logger.debug("beginning transaction")
         self._session = self.session_factory()
         self._session.begin().__enter__()

{dataops_sdk-0.3.2 → dataops_sdk-0.3.3}/src/dataops_sdk/runner/utils/duckdb_manager.py

@@ -19,6 +19,7 @@ from uuid import uuid4
 
 import duckdb
 import pandas as pd
+
 from dataops_sdk.utils.log import getLogger
 
 from .dbConn_sync import DatabaseConn

{dataops_sdk-0.3.2 → dataops_sdk-0.3.3}/src/dataops_sdk/schemas/query.py

@@ -228,6 +228,18 @@ class SqlQueryParam(BaseModel):
     sorts: Annotated[list[SqlSort], Field(description="排序列表", default_factory=list)]
     varMap: Annotated[dict[str, JsonValue], Field(description="变量映射", default_factory=dict)]
 
+    def add(self, *condition: SqlCondition):
+        """追加条件.
+
+        Args:
+            condition: 条件。
+
+        Returns:
+            SqlQueryParam: ``self``，便于链式调用。
+        """
+        self.conditionList.extend(condition)
+        return self
+
     def add_eq(self, name: str, value: Any, alias: str | None = None):
         """追加 ``=`` 等值条件.
 

{dataops_sdk-0.3.2 → dataops_sdk-0.3.3}/src/dataops_sdk/schemas/skill.py

@@ -5,6 +5,7 @@
 """
 
 from collections.abc import Mapping
+from enum import StrEnum
 from typing import Annotated, Any
 
 from pydantic import AliasChoices, BaseModel, Field, JsonValue
@@ -12,33 +13,53 @@ from pydantic import AliasChoices, BaseModel, Field, JsonValue
 from dataops_sdk.schemas.meta import Meta
 
 
+class MetaSkillSubType(StrEnum):
+    LLM = "llm"
+    API = "api"
+    REPORT = "report"
+
+
+class MetaSkillFileSubType(StrEnum):
+    DOC = "doc"
+    CODE = "code"
+    IMAGE = "image"
+
+
 class DataSkill(BaseModel):
     """技能实体 rawData 私有字段.
 
     字段命名参考前端 ``SkillFile.vue`` 与后端 ``SkillService`` 的约定：
-    - ``markdown``: SKILL.md 的 Markdown 正文（用于 LLM 子类型技能）
     - ``editor``: TipTap JSON 文档结构（用于编辑器渲染）
     - ``args``: 技能对外入参定义列表
-    - ``input_json_schema``: JSON Schema 格式的入参约束
 
     Attributes:
         markdown: SKILL.md Markdown 内容。
         editor: TipTap JSON 文档结构。
         args: 技能对外入参定义。
-        input_json_schema: JSON Schema 入参约束。
     """
 
-    markdown: Annotated[str | None, Field(description="SKILL.md Markdown 内容")] = None
-    editor: Annotated[Mapping[str, JsonValue] | None, Field(description="TipTap JSON 文档结构")] = (
-        None
-    )
+    editor: Annotated[Mapping[str, JsonValue], Field(description="TipTap JSON 文档结构")]
     args: Annotated[
         list[Mapping[str, JsonValue]] | None,
         Field(description="技能对外入参定义"),
     ] = None
-    input_json_schema: Annotated[
-        Mapping[str, JsonValue] | None, Field(description="JSON Schema 入参约束")
-    ] = None
+
+
+class DataSkillSubFileDoc(BaseModel):
+    mimetype: Annotated[str, Field(description="文件 MIME 类型")]
+    editor: Annotated[Mapping[str, JsonValue], Field(description="TipTap JSON 文档结构")]
+
+
+class DataSkillSubFileCode(BaseModel):
+    mimetype: Annotated[str, Field(description="文件 MIME 类型")]
+    content: Annotated[str, Field(description="文件内容")]
+    language: Annotated[str, Field(description="编程语言")]
+
+
+class DataSkillSubFileImage(BaseModel):
+    mimetype: Annotated[str, Field(description="文件 MIME 类型")]
+    content: Annotated[str, Field(description="文件内容")]
+    language: Annotated[str, Field(description="编程语言")]
 
 
 class MetaSkill(Meta[DataSkill]):

{dataops_sdk-0.3.2 → dataops_sdk-0.3.3}/src/dataops_sdk/services/__init__.py

@@ -65,6 +65,7 @@ from .meta import (
     release_list_get_by_code,
     release_list_get_by_name,
     release_list_list,
+    release_list_list_by_parent_id,
     release_list_page,
     release_list_total,
     release_list_update,
@@ -75,14 +76,19 @@ from .metrics import service_get_metrics, service_list_metrics
 from .ref import service_ref_backward, service_ref_forward
 from .report import service_get_report, service_list_reports
 from .skill import (
+    SkillPackValidationError,
     service_delete_skill,
     service_get_skill_by_code,
     service_get_skill_by_name,
     service_list_skill_files,
     service_list_skills,
+    service_pack_skill_zip,
     service_skill_call_by_code,
+    service_skill_call_by_name,
     service_skill_delete_sub_file,
-    service_skill_import,
+    service_skill_get_subfile_by_code,
+    service_skill_get_subfile_by_name,
+    service_skill_upload,
     service_skill_upload_sub_file,
 )
 from .table import (

{dataops_sdk-0.3.2 → dataops_sdk-0.3.3}/src/dataops_sdk/services/meta.py

@@ -26,18 +26,73 @@ from dataops_sdk.schemas import (
     MetaRelease,
     MetaType,
     PageParam,
+    SqlCondition,
     SqlQueryParam,
 )
 from dataops_sdk.session import get_session
 from dataops_sdk.utils import encrypt_body
 
 
+def release_list_list_by_parent_id(
+    meta_type: MetaType | InnerMetaType | str,
+    parent_id: str,
+    datasource: str | None = None,
+) -> list[MetaRelease]:
+    """获取 Meta Release 列表.
+
+    Args:
+        meta_type: 元数据类型（MetaType 枚举或字符串）.
+        filters: SQL 查询过滤条件列表.
+        headers: 额外的请求头.
+        datasource: 数据源；非空时写入 ``x-sub-system`` 头.
+        extra_conditions: 额外的 SQL 查询条件.
+
+    Returns:
+        MetaRelease 对象列表
+
+    Raises:
+        DataOpsError: API 返回错误时
+        AuthenticationError: 未认证或认证失败时
+    """
+    type_str = meta_type.value if isinstance(meta_type, (MetaType, InnerMetaType)) else meta_type
+    url = "/meta/release/list/list"
+
+    sql_query_param = (
+        SqlQueryParam().add_eq("type", type_str, "mrl").add_eq("parent_id", parent_id, "mrl")
+    )
+
+    body = {
+        "pageParam": PageParam(limit=-1),
+        "queryParam": sql_query_param,
+    }
+
+    if datasource:
+        body["subSystem"] = datasource
+
+    try:
+        with get_session() as session:
+            resp = session.post(url, content=to_json(encrypt_body(body)))
+            resp_body = resp.json()
+            if resp.status_code == 401:
+                raise AuthenticationError("认证失败，请先登录")
+            if resp.status_code != 200:
+                raise DataOpsError(
+                    resp_body.get("msg", f"HTTP {resp.status_code}"), resp.status_code
+                )
+            group_nodes = TypeAdapter(
+                list[MetaRelease], config=ConfigDict(str_to_lower=True)
+            ).validate_python(resp_body["data"])
+        return group_nodes
+    except SystemExit as e:
+        raise AuthenticationError("认证失败，请先登录") from e
+
+
 def release_list_list(
     meta_type: MetaType | InnerMetaType | str,
     filters: Sequence[dict] | None = None,
     headers: dict[str, str] | None = None,
     datasource: str | None = None,
-    extra_conditions: Sequence[dict] | None = None,
+    extra_conditions: Sequence[SqlCondition] | None = None,
 ) -> list[MetaRelease]:
     """获取 Meta Release 列表.
 
@@ -46,9 +101,7 @@ def release_list_list(
         filters: SQL 查询过滤条件列表.
         headers: 额外的请求头.
         datasource: 数据源；非空时写入 ``x-sub-system`` 头.
-        extra_conditions: 在默认 ``type=meta_type`` 之上追加等值条件列表，每项形如
-            ``{"name": "parent_id", "value": "xxx", "alias": "mrl"}``. 主要用于按
-            parent_id 等辅助字段过滤。
+        extra_conditions: 额外的 SQL 查询条件.
 
     Returns:
         MetaRelease 对象列表
@@ -61,8 +114,8 @@ def release_list_list(
     url = "/meta/release/list/list"
 
     sql_query_param = SqlQueryParam().add_eq("type", type_str, "mrl")
-    for cond in extra_conditions or []:
-        sql_query_param.add_eq(cond["name"], cond["value"], cond.get("alias", "mrl"))
+    if extra_conditions:
+        sql_query_param.add(extra_conditions)
 
     headers = headers or {}
     if datasource: