dataops-sdk 0.3.0__tar.gz → 0.3.1__tar.gz

{dataops_sdk-0.3.0 → dataops_sdk-0.3.1}/PKG-INFO

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

{dataops_sdk-0.3.0 → dataops_sdk-0.3.1}/src/dataops_sdk/__init__.py

@@ -14,6 +14,7 @@ from .services import (  # noqa: F401
     service_count_alarm_rule_matches,
     service_count_alarm_rules,
     service_count_alarm_specs,
+    service_count_dataset_by_code,
     service_count_table_by_code,
     service_count_table_by_name,
     service_count_widget_by_code,
@@ -48,6 +49,8 @@ from .services import (  # noqa: F401
     service_get_metrics,
     service_get_rel_table_columns,
     service_get_report,
+    service_get_skill_by_code,
+    service_get_skill_by_name,
     service_get_table_data_by_code,
     service_get_table_data_by_name,
     service_get_table_detail_by_code,
@@ -66,6 +69,8 @@ from .services import (  # noqa: F401
     service_list_hazard_records,
     service_list_metrics,
     service_list_reports,
+    service_list_skill_files,
+    service_list_skills,
     service_list_tables,
     service_list_widgets,
     service_list_workflows,
@@ -74,6 +79,9 @@ from .services import (  # noqa: F401
     service_ref_backward,
     service_ref_forward,
     service_set_application,
+    service_skill_call_by_code,
+    service_skill_import,
+    service_skill_upload_sub_file,
     service_start_workflow,
     service_start_workflow_async,
     service_trigger_hazard_task,
@@ -81,4 +89,4 @@ from .services import (  # noqa: F401
     service_update_data_table_record_by_id_list,
 )
 
-__version__ = "0.3.0"
+__version__ = "0.3.1"

{dataops_sdk-0.3.0 → dataops_sdk-0.3.1}/src/dataops_sdk/runner/utils/common.py

@@ -17,9 +17,10 @@ Example:
 
 from base64 import b64decode, b64encode
 from calendar import monthrange
+from collections.abc import Mapping
 from datetime import date, datetime, timedelta
 from email.utils import parsedate_to_datetime
-from typing import Any, Literal, Mapping
+from typing import Any, Literal
 from uuid import uuid4
 
 from pydantic import BaseModel, JsonValue

{dataops_sdk-0.3.0 → dataops_sdk-0.3.1}/src/dataops_sdk/runner/utils/dbConn_sync.py

@@ -286,8 +286,7 @@ class DatabaseConn(DatabaseConnBase):
         mapping: Literal[True] = True,
         *,
         log_sql: bool | None = None,
-    ) -> list[dict[str, Any]]:
-        ...
+    ) -> list[dict[str, Any]]: ...
 
     @overload
     def select(
@@ -298,8 +297,7 @@ class DatabaseConn(DatabaseConnBase):
         mapping: Literal[False] = False,
         *,
         log_sql: bool | None = None,
-    ) -> list[tuple[Any]]:
-        ...
+    ) -> list[tuple[Any]]: ...
 
     def select(
         self,
@@ -378,7 +376,7 @@ class DatabaseConn(DatabaseConnBase):
         if hasattr(self, "_engine") and self._engine is not None:
             self.engine.dispose()
             self._engine = None
-            self._logger.info(f"closed")
+            self._logger.info("closed")
 
     @property
     def session_factory(self):
@@ -398,21 +396,21 @@ class DatabaseConn(DatabaseConnBase):
         """
         提交当前事务。
         """
-        self._logger.debug(f"committing")
+        self._logger.debug("committing")
         self.session.commit()
 
     def rollback(self):
         """
         回滚当前事务。
         """
-        self._logger.warning(f"rolling back")
+        self._logger.warning("rolling back")
         self.session.rollback()
 
     def begin(self):
         """
         开始一个新的事务。
         """
-        self._logger.debug(f"beginning")
+        self._logger.debug("beginning")
         if self.session:
             assert self._session is not None, "session not closed"
         self._session = self.session_factory()
@@ -428,6 +426,7 @@ class DatabaseConn(DatabaseConnBase):
         """
         return self._session
 
+
 class DatabaseConnDataOps(DatabaseConn):
     def __init__(self, datasource: str, log_sql: bool | None = None):
         from dataops_sdk.services.meta import Meta, release_list_get_by_name

{dataops_sdk-0.3.0 → dataops_sdk-0.3.1}/src/dataops_sdk/runner/utils/file_transfer_base.py

@@ -30,7 +30,6 @@ Example:
     ...     ft.upload("/local/file.txt", "remote_file.txt")
 """
 
-import os
 from abc import ABC, abstractmethod
 from logging import Logger
 from typing import BinaryIO

{dataops_sdk-0.3.0 → dataops_sdk-0.3.1}/src/dataops_sdk/runner/utils/nacos.py

@@ -15,6 +15,7 @@ import random
 from collections.abc import Mapping
 
 import httpx2
+
 from dataops_sdk.runner.schemas.nacos import NacosSettings, Service
 from dataops_sdk.runner.schemas.nacos.constants import Constants
 
@@ -88,7 +89,9 @@ def get_service_instance(
 
     instance = random.choice(service.hosts)
 
-    http_client = httpx2.Client(base_url=f"http://{instance.ip}:{instance.port}/{service_name}", headers=headers)
+    http_client = httpx2.Client(
+        base_url=f"http://{instance.ip}:{instance.port}/{service_name}", headers=headers
+    )
 
     # 主进程结束前执行 http_client.close()
     atexit.register(http_client.close)

{dataops_sdk-0.3.0 → dataops_sdk-0.3.1}/src/dataops_sdk/runner/utils/queue_base.py

@@ -185,7 +185,6 @@ class QueueBase(ABC):
         """
         return self._bootstrap_servers
 
-
     def __enter__(self):
         """
         上下文管理器入口方法。

{dataops_sdk-0.3.0 → dataops_sdk-0.3.1}/src/dataops_sdk/schemas/datasource.py

@@ -1,8 +1,9 @@
 from typing import Annotated
 
-from dataops_sdk.schemas.enums import DataSourceType
 from pydantic import BaseModel, BeforeValidator, Field
 
+from dataops_sdk.schemas.enums import DataSourceType
+
 
 def str_to_number(v: str):
     assert v.isnumeric(), "must be number"

{dataops_sdk-0.3.0 → dataops_sdk-0.3.1}/src/dataops_sdk/services/__init__.py

@@ -75,15 +75,15 @@ 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 (
-    service_call_skill_by_code,
     service_delete_skill,
-    service_delete_sub_file,
     service_get_skill_by_code,
     service_get_skill_by_name,
-    service_import_skill,
     service_list_skill_files,
     service_list_skills,
-    service_upload_sub_file,
+    service_skill_call_by_code,
+    service_skill_delete_sub_file,
+    service_skill_import,
+    service_skill_upload_sub_file,
 )
 from .table import (
     service_count_table_by_code,

{dataops_sdk-0.3.0 → dataops_sdk-0.3.1}/src/dataops_sdk/services/datasource.py

@@ -1,12 +1,13 @@
 from dataclasses import dataclass
 
+from pydantic_core import to_json
+
 from dataops_sdk.exceptions import AuthenticationError, DataOpsError
 from dataops_sdk.schemas import DataDataSource, Meta
 from dataops_sdk.schemas.enums import InnerMetaType
 from dataops_sdk.services.meta import release_list_get_by_name
 from dataops_sdk.session import get_application, get_session
 from dataops_sdk.utils import encrypt_body
-from pydantic_core import to_json
 
 
 def service_get_datasource_config_by_application_id(
@@ -39,16 +40,22 @@ class DatasourceConfig:
     hazard_write: Meta[DataDataSource]
 
 
-def service_get_main_datasource_config_by_application(app_id: str | None = None) -> DatasourceConfig:
+def service_get_main_datasource_config_by_application(
+    app_id: str | None = None,
+) -> DatasourceConfig:
     if app_id is None:
         application = get_application()
         app_id = application.CUID
     # 主数据源
     datasource_main = service_get_datasource_config_by_application_id(prod_id=app_id)
     # 隐患读数据源
-    datasource_hazard_read = service_get_datasource_config_by_application_id(prod_id=app_id, param_name="datasource_hazard_read")
+    datasource_hazard_read = service_get_datasource_config_by_application_id(
+        prod_id=app_id, param_name="datasource_hazard_read"
+    )
     # 隐患写数据源
-    datasource_hazard_write = service_get_datasource_config_by_application_id(prod_id=app_id, param_name="datasource_hazard_write")
+    datasource_hazard_write = service_get_datasource_config_by_application_id(
+        prod_id=app_id, param_name="datasource_hazard_write"
+    )
     return DatasourceConfig(datasource_main, datasource_hazard_read, datasource_hazard_write)
 
 

{dataops_sdk-0.3.0 → dataops_sdk-0.3.1}/src/dataops_sdk/services/skill.py

@@ -4,7 +4,13 @@ from pathlib import Path
 from pydantic_core import to_json
 
 from dataops_sdk.exceptions import AuthenticationError, DataOpsError
-from dataops_sdk.schemas import DataSkill, MetaRelease, MetaSkill, MetaType, SkillCallResult
+from dataops_sdk.schemas import (
+    DataSkill,
+    MetaRelease,
+    MetaSkill,
+    MetaType,
+    SkillCallResult,
+)
 from dataops_sdk.services.meta import (
     release_list_get_by_code,
     release_list_get_by_name,
@@ -14,15 +20,15 @@ from dataops_sdk.session import get_session, post_multipart
 from dataops_sdk.utils import encrypt_body, filter_nodes_by_pattern
 
 __all__ = [
-    "service_call_skill_by_code",
+    "service_skill_call_by_code",
     "service_delete_skill",
-    "service_delete_sub_file",
+    "service_skill_delete_sub_file",
     "service_get_skill_by_code",
     "service_get_skill_by_name",
-    "service_import_skill",
+    "service_skill_import",
     "service_list_skill_files",
     "service_list_skills",
-    "service_upload_sub_file",
+    "service_skill_upload_sub_file",
 ]
 
 
@@ -125,7 +131,7 @@ def _post_skill(url: str, body: dict | None = None, *, params: dict | None = Non
         raise AuthenticationError("认证失败，请先登录") from e
 
 
-def service_import_skill(
+def service_skill_import(
     file_path: str | Path,
     sub_type: str = "llm",
     name: str | None = None,
@@ -193,7 +199,7 @@ def service_delete_skill(name: str) -> dict:
     return _post_skill(f"/data/skill/delete/{name}")
 
 
-def service_upload_sub_file(
+def service_skill_upload_sub_file(
     skill_name: str,
     file_path: str | Path,
     path: str,
@@ -225,7 +231,7 @@ def service_upload_sub_file(
         resp.json()  # 仅校验响应
 
 
-def service_delete_sub_file(skill_name: str, path: str) -> None:
+def service_skill_delete_sub_file(skill_name: str, path: str) -> None:
     """删除技能下的指定子文件.
 
     Args:
@@ -239,7 +245,7 @@ def service_delete_sub_file(skill_name: str, path: str) -> None:
     _post_skill(f"/data/skill/{skill_name}/subfile/delete", params={"path": path})
 
 
-def service_call_skill_by_code(code: str, inputs: Mapping) -> SkillCallResult:
+def service_skill_call_by_code(code: str, inputs: Mapping) -> SkillCallResult:
     """调用 skill 同步执行，返回 Python 容器运行结果.
 
     对应后端 ``POST /data/skill/callByCode/{code}``，入参 ``{"inputs": {...}}``。

{dataops_sdk-0.3.0 → dataops_sdk-0.3.1}/src/dataops_sdk/session.py

@@ -1,16 +1,40 @@
 import os
 from collections.abc import Mapping
 from contextlib import contextmanager
+from contextvars import ContextVar
 from os import getenv
 from typing import IO, BinaryIO
 
 import httpx2
+from pydantic import BaseModel
+from pydantic_core import from_json, to_json
+
 from dataops_sdk.constants import APPLICATION_FILE, USER_INFO_FILE
 from dataops_sdk.exceptions import AuthenticationError, DataOpsError
 from dataops_sdk.schemas.user import Application, UserInfo
 from dataops_sdk.utils import get_work_dir
-from pydantic import BaseModel
-from pydantic_core import from_json, to_json
+
+__all__ = [
+    "DataOpsConfig",
+    "configure",
+    "get_config",
+    "set_request_auth",
+    "clear_request_auth",
+    "request_context",
+    "get_user_info_file_path",
+    "get_application_file_path",
+    "get_user_info",
+    "get_headers",
+    "refresh_token",
+    "get_application",
+    "get_session",
+    "post_multipart",
+]
+
+# Request-scoped auth headers context variable
+# 默认 None，表示使用模块级认证（环境变量/file/config）
+# 在 FastAPI/异步环境中，每个 async task 有独立的副本，互不干扰
+REQUEST_HEADERS: ContextVar[dict[str, str] | None] = ContextVar("REQUEST_HEADERS", default=None)
 
 
 class DataOpsConfig(BaseModel):
@@ -81,6 +105,59 @@ def get_config() -> DataOpsConfig:
     return _config
 
 
+def set_request_auth(headers: dict[str, str]) -> None:
+    """设置本次请求的认证头。
+
+    在 FastAPI 请求处理器开头调用，后续 SDK 调用会使用此认证信息。
+    每个 async task 有独立的上下文副本，支持并发请求。
+
+    Args:
+        headers: 认证相关请求头字典，格式：
+            {"Fmind-Auth": "Bearer <token>", "X-App-Code": "xxx", ...}
+
+    Example:
+        # In FastAPI handler:
+        def handler(request: Request):
+            set_request_auth({"Fmind-Auth": request.headers.get("Fmind-Auth")})
+            result = service_get_skill_by_code("my-skill")
+    """
+    REQUEST_HEADERS.set(headers)
+
+
+def get_request_auth() -> dict[str, str] | None:
+    """获取当前请求的认证头。
+
+    通常在请求结束时自动调用（如果使用 request_context 管理器则无需手动调用）。
+    """
+    return REQUEST_HEADERS.get()
+
+
+def clear_request_auth() -> None:
+    """清除本次请求的认证头。
+
+    通常在请求结束时自动调用（如果使用 request_context 管理器则无需手动调用）。
+    """
+    REQUEST_HEADERS.set(None)
+
+
+@contextmanager
+def request_context(headers: dict[str, str]):
+    """请求级认证上下文管理器。
+
+    自动在退出时清理认证上下文。推荐用于包装请求处理器。
+
+    Example:
+        def handler(request: Request):
+            with request_context({"Fmind-Auth": request.headers.get("Fmind-Auth")}):
+                result = service_get_skill_by_code("my-skill")
+    """
+    token = REQUEST_HEADERS.set(headers)
+    try:
+        yield
+    finally:
+        REQUEST_HEADERS.reset(token)
+
+
 def get_user_info_file_path() -> str:
     """返回用户信息文件路径。"""
     return get_work_dir(USER_INFO_FILE)
@@ -127,7 +204,13 @@ def get_user_info(strict: bool = True) -> UserInfo | None:
 
 
 def get_headers(strict: bool = True) -> Mapping[str, str]:
-    # 优先从环境变量获取
+    # 最高优先级：请求上下文中的认证头（web app 场景）
+    global REQUEST_HEADERS
+    request_headers = REQUEST_HEADERS.get()
+    if request_headers is not None:
+        return request_headers
+
+    # 降级：原有的 CLI/环境变量/file 认证逻辑
     fmind_auth_headers = os.getenv("FMIND_AUTH_HEADERS", None)
     if fmind_auth_headers is not None:
         headers = from_json(fmind_auth_headers)
@@ -203,12 +286,32 @@ def refresh_token(response: httpx2.Response):
 
 
 @contextmanager
-def get_session(strict: bool = True, timeout: int = 10):
+def get_session(
+    strict: bool = True,
+    timeout: int = 10,
+    auth_headers: dict[str, str] | None = None,
+):
     """获取请求 Session。
 
     使用 httpx2 管理 HTTP 连接，base_url 指向 DataOps 服务。
+
+    Args:
+        strict: 是否要求认证
+        timeout: 请求超时秒数，默认 10s
+        auth_headers: 可选的认证头，用于一次性认证场景。
+            如果设置，会覆盖 contextvar 和模块级认证。
+
+    Example:
+        # 使用请求上下文认证（推荐）:
+        set_request_auth({"Fmind-Auth": "Bearer token"})
+        with get_session() as session:
+            session.get("/api")
+
+        # 一次性认证（不常用）:
+        with get_session(auth_headers={"Fmind-Auth": "Bearer token"}) as session:
+            session.get("/api")
     """
-    headers = get_headers(strict)
+    headers = auth_headers if auth_headers is not None else get_headers(strict)
     with httpx2.Client(
         headers=headers,
         base_url=_config.base_url,

{dataops_sdk-0.3.0 → dataops_sdk-0.3.1}/src/dataops_sdk/tiptap/markdown_parser.py

@@ -60,7 +60,9 @@ class MarkdownToTipTapParser:
                 node, index = self._parse_table(tokens, index)
                 content.append(node)
             elif token.type == "html_block":
-                content.append(parse_utils.parse_paragraph([parse_utils.create_text_node(token.content)]))
+                content.append(
+                    parse_utils.parse_paragraph([parse_utils.create_text_node(token.content)])
+                )
                 index += 1
             else:
                 raise ValueError(f"Unsupported Markdown block token: {token.type}")
@@ -133,7 +135,9 @@ class MarkdownToTipTapParser:
             if opening.type == "bullet_list_open"
             else constants.NodeTypes.ORDERED_LIST
         )
-        return parse_utils.create_node(node_type, attrs=attrs, content=[item for item, _ in items]), index
+        return parse_utils.create_node(
+            node_type, attrs=attrs, content=[item for item, _ in items]
+        ), index
 
     def _convert_task_item(self, paragraph: dict) -> dict | None:
         if paragraph.get("type") != constants.NodeTypes.PARAGRAPH:

{dataops_sdk-0.3.0 → dataops_sdk-0.3.1}/src/dataops_sdk.egg-info/PKG-INFO

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

{dataops_sdk-0.3.0 → dataops_sdk-0.3.1}/tests/test_session.py

@@ -11,24 +11,22 @@ import json
 from pathlib import Path
 from unittest.mock import MagicMock
 
+import dataops_sdk.session as session_module
 import httpx2
 import pytest
-from pydantic import ValidationError
-
 from dataops_sdk.session import (
     DataOpsConfig,
     configure,
     get_application,
+    get_application_file_path,
     get_config,
     get_headers,
     get_session,
     get_user_info,
     get_user_info_file_path,
-    get_application_file_path,
     refresh_token,
 )
-import dataops_sdk.session as session_module
-
+from pydantic import ValidationError
 
 # === DataOpsConfig ===
 
@@ -463,4 +461,4 @@ def test_get_session_closes_on_exception(mocker) -> None:
         with get_session(strict=False):
             raise RuntimeError("user code failed")
 
-    fake_client.close.assert_called()
+    fake_client.close.assert_called()

{dataops_sdk-0.3.0 → dataops_sdk-0.3.1}/tests/test_utils.py

@@ -12,17 +12,15 @@ from pathlib import Path
 from typing import ClassVar
 
 import pytest
-from pydantic import BaseModel
-
 from dataops_sdk.utils import (
-    deep_merge,
     decrypt_body,
+    deep_merge,
     encrypt_body,
     encrypt_hex,
     filter_nodes_by_pattern,
     get_work_dir,
 )
-
+from pydantic import BaseModel
 
 # === 辅助 fixture：构造 SearchableNode 兼容对象 ===
 
@@ -314,4 +312,4 @@ def test_deep_merge_deeply_nested() -> None:
     src = {"a": {"b": {"c": {"d": 1}}}}
     dst = {"a": {"b": {"c": {"e": 2}}}}
     merged = deep_merge(src, dst)
-    assert merged == {"a": {"b": {"c": {"d": 1, "e": 2}}}}
+    assert merged == {"a": {"b": {"c": {"d": 1, "e": 2}}}}