dataops-sdk 0.5.1__tar.gz → 0.5.3__tar.gz

{dataops_sdk-0.5.1 → dataops_sdk-0.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dataops-sdk
-Version: 0.5.1
+Version: 0.5.3
 Summary: Python SDK for the DataOps platform.
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -16,7 +16,8 @@ Provides-Extra: runner
 Requires-Dist: paramiko>4; extra == "runner"
 Requires-Dist: pandas; extra == "runner"
 Requires-Dist: sqlalchemy; extra == "runner"
-Requires-Dist: mariadb[binary]; extra == "runner"
+Requires-Dist: PyMySQL; extra == "runner"
+Requires-Dist: asyncmy; (platform_system == "Darwin" or platform_system == "Linux") and extra == "runner"
 Requires-Dist: psycopg[binary]>=3; extra == "runner"
 Requires-Dist: dmpython~=2.5.32; platform_system != "Darwin" and extra == "runner"
 Requires-Dist: dmsqlalchemy<3,>2; platform_system != "Darwin" and extra == "runner"

{dataops_sdk-0.5.1 → dataops_sdk-0.5.3}/pyproject.toml

@@ -27,7 +27,8 @@ runner = [
     "pandas",
     # 关系数据库
     "sqlalchemy",
-    "mariadb[binary]",
+    "PyMySQL",
+    "asyncmy; platform_system == 'Darwin' or platform_system == 'Linux'",
     "psycopg[binary]>=3",
     "dmpython~=2.5.32; platform_system != 'Darwin'",
     "dmsqlalchemy>2,<3; platform_system != 'Darwin'",

{dataops_sdk-0.5.1 → dataops_sdk-0.5.3}/src/dataops_sdk/__init__.py

@@ -17,11 +17,6 @@ from .services import (  # noqa: F401
     release_list_update,
     release_ref_list,
     release_ref_list_by_ref,
-    service_clear_hazard_history_records,
-    service_count_alarm_action,
-    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,
@@ -34,10 +29,6 @@ from .services import (  # noqa: F401
     service_delete_table_record_by_id,
     service_delete_table_record_by_id_list,
     service_exec_sql_by_datasource,
-    service_find_alarm_table_data,
-    service_find_meta_by_codes,
-    service_get_alarm_rule_enums,
-    service_get_alarm_table_columns,
     service_get_api_by_code,
     service_get_api_by_name,
     service_get_current_application,
@@ -56,11 +47,8 @@ from .services import (  # noqa: F401
     service_get_datasource_config_by_application_id,
     service_get_dict_detail_by_code,
     service_get_dict_detail_by_name,
-    service_get_hazard_task_log_records,
-    service_get_hazard_task_logs,
     service_get_main_datasource_config_by_application,
     service_get_metrics,
-    service_get_rel_table_columns,
     service_get_report,
     service_get_skill_by_code,
     service_get_skill_by_name,
@@ -75,14 +63,9 @@ from .services import (  # noqa: F401
     service_get_widget_detail_by_code,
     service_get_workflow_by_code,
     service_get_workflow_by_name,
-    service_list_alarm_rule_matches,
-    service_list_alarm_rules,
-    service_list_alarm_specs,
     service_list_applications,
     service_list_datasets,
     service_list_dicts,
-    service_list_hazard_history_records,
-    service_list_hazard_records,
     service_list_metrics,
     service_list_reports,
     service_list_skill_files,
@@ -103,7 +86,6 @@ from .services import (  # noqa: F401
     service_skill_upload_sub_file,
     service_start_workflow,
     service_start_workflow_async,
-    service_trigger_hazard_task,
     service_update_data_table_record_by_id,
     service_update_data_table_record_by_id_list,
     service_update_table_record_by_id,
@@ -111,4 +93,4 @@ from .services import (  # noqa: F401
 )
 from .session import dataops_base_url_context, request_context
 
-__version__ = "0.5.1"
+__version__ = "0.5.3"

{dataops_sdk-0.5.1 → dataops_sdk-0.5.3}/src/dataops_sdk/runner/utils/dbConn_async.py

@@ -30,11 +30,11 @@ from .dbConn_base import DatabaseConnBaseAsync
 
 # 数据库类型到异步驱动程序的映射
 ASYNC_DBTYPE_DRIVER: Final[Mapping[str, str]] = {
-    "mysql": "mariadbconnector",
-    "mariadb": "mariadbconnector",
+    "mysql": "asyncmy",
+    "mariadb": "asyncmy",
     "postgresql": "psycopg",
     "oracle": "oracledb",
-    "doris": "mariadbconnector",
+    "doris": "asyncmy",
 }
 
 

{dataops_sdk-0.5.1 → dataops_sdk-0.5.3}/src/dataops_sdk/runner/utils/dbConn_sync.py

@@ -27,12 +27,12 @@ from .dbConn_base import DatabaseConnBase
 # 数据库类型到驱动程序的映射
 # 用于 build_url 函数构建数据库连接 URL
 DBTYPE_DRIVER: Final[Mapping[str, str]] = {
-    "mysql": "mariadbconnector",
+    "mysql": "pymysql",
     "postgresql": "psycopg",
     "dm": "dmpython",
     "oracle": "oracledb",
-    "doris": "mariadbconnector",
-    "mariadb": "mariadbconnector",
+    "doris": "pymysql",
+    "mariadb": "pymysql",
 }
 
 
@@ -73,7 +73,7 @@ def build_url(
         raise NotImplementedError(f"{db_type} 尚未支持，请联系管理员")
 
     query: dict[str, str] = dict()
-    if db_type in {"mysql", "doris"}:
+    if db_type in {"mysql", "mariadb", "doris"}:
         query["local_infile"] = "True"
         query["ssl_disabled"] = "True"
 
@@ -548,8 +548,8 @@ def create_engine_safe(db_type: str, url: str, **kwargs: Any) -> Engine:
         raise NotImplementedError(f"{db_type} 尚未支持，请联系管理员")
 
     # 根据不同数据库类型调整连接参数
-    if db_type in ("mysql", "doris"):
-        # MySQL 需要添加一些兼容参数
+    if db_type in ("mysql", "mariadb", "doris"):
+        # MySQL 协议族需要添加一些兼容参数
         kwargs.setdefault("pool_pre_ping", True)
         kwargs.setdefault("pool_recycle", 3600)
     elif db_type == "postgresql":

{dataops_sdk-0.5.1 → dataops_sdk-0.5.3}/src/dataops_sdk/schemas/__init__.py

@@ -4,15 +4,6 @@
 dataops_sdk.schemas import ...`` 使用。
 """
 
-from .alarm import (
-    AlarmActionItem,
-    AlarmBuiltinFunctionItem,
-    AlarmDetail,
-    AlarmPreprocessItem,
-    AlarmRuleItem,
-    AlarmRuleMatchItem,
-    AlarmSpecItem,
-)
 from .api import ApiMeta, HttpInterfaceData
 from .common import DataOpsResponse
 from .data_table import DataTableData, MetaDataTable
@@ -29,7 +20,6 @@ from .enums import (
     MetaWidgetSubType,
 )
 from .group import GroupNode, GroupTree
-from .hazard import HazardRecordDTO, HazardTaskDTO
 from .meta import (
     DEFAULT_META_DATA_TYPE,
     META_DATA_TYPE,

{dataops_sdk-0.5.1 → dataops_sdk-0.5.3}/src/dataops_sdk/schemas/meta.py

@@ -31,7 +31,7 @@ class MetaRelease(BaseModel):
     """后端 meta release 详情基类，字段采用大写下划线.
 
     ``MetaRelease`` 是后端 meta 数据模型在 release 状态下的标准基类，
-    所有子类实体（如 ``AlarmRuleItem``、``MetaWorkflow`` 等）都继承自该类。
+    所有子类实体（如 ``MetaWorkflow`` 等）都继承自该类。
 
     Attributes:
         CUID: 元数据 ID。

{dataops_sdk-0.5.1 → dataops_sdk-0.5.3}/src/dataops_sdk/services/__init__.py

@@ -1,26 +1,3 @@
-from .alarm import (
-    service_count_alarm_action,
-    service_count_alarm_rule_matches,
-    service_count_alarm_rules,
-    service_count_alarm_specs,
-    service_find_alarm_table_data,
-    service_find_meta_by_codes,
-    service_get_alarm_action_detail,
-    service_get_alarm_builtin_function_detail,
-    service_get_alarm_preprocess_detail,
-    service_get_alarm_rule_detail,
-    service_get_alarm_rule_enums,
-    service_get_alarm_rule_type_detail,
-    service_get_alarm_spec_detail,
-    service_get_alarm_table_columns,
-    service_get_rel_table_columns,
-    service_list_alarm_action,
-    service_list_alarm_builtin_functions,
-    service_list_alarm_preprocess,
-    service_list_alarm_rule_matches,
-    service_list_alarm_rules,
-    service_list_alarm_specs,
-)
 from .api import service_get_api_by_code, service_get_api_by_name
 from .auth import (
     service_get_current_application,
@@ -68,15 +45,6 @@ from .group import (
     get_group_by_name,
     get_group_by_sapce,
 )
-from .hazard import (
-    service_clear_hazard_history_records,
-    service_dispatch_hazard_callback,
-    service_get_hazard_task_log_records,
-    service_get_hazard_task_logs,
-    service_list_hazard_history_records,
-    service_list_hazard_records,
-    service_trigger_hazard_task,
-)
 from .meta import (
     release_list_create,
     release_list_get_by_code,
@@ -193,27 +161,6 @@ from .workflow import (
 )
 
 __all__ = [
-    "service_count_alarm_action",
-    "service_count_alarm_rule_matches",
-    "service_count_alarm_rules",
-    "service_count_alarm_specs",
-    "service_find_alarm_table_data",
-    "service_find_meta_by_codes",
-    "service_get_alarm_action_detail",
-    "service_get_alarm_builtin_function_detail",
-    "service_get_alarm_preprocess_detail",
-    "service_get_alarm_rule_detail",
-    "service_get_alarm_rule_enums",
-    "service_get_alarm_rule_type_detail",
-    "service_get_alarm_spec_detail",
-    "service_get_alarm_table_columns",
-    "service_get_rel_table_columns",
-    "service_list_alarm_action",
-    "service_list_alarm_builtin_functions",
-    "service_list_alarm_preprocess",
-    "service_list_alarm_rule_matches",
-    "service_list_alarm_rules",
-    "service_list_alarm_specs",
     "service_get_api_by_code",
     "service_get_api_by_name",
     "service_get_current_application",
@@ -250,13 +197,6 @@ __all__ = [
     "create_group_node",
     "get_group_by_name",
     "get_group_by_sapce",
-    "service_clear_hazard_history_records",
-    "service_dispatch_hazard_callback",
-    "service_get_hazard_task_log_records",
-    "service_get_hazard_task_logs",
-    "service_list_hazard_history_records",
-    "service_list_hazard_records",
-    "service_trigger_hazard_task",
     "release_list_create",
     "release_list_get_by_code",
     "release_list_get_by_name",

{dataops_sdk-0.5.1 → dataops_sdk-0.5.3}/src/dataops_sdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dataops-sdk
-Version: 0.5.1
+Version: 0.5.3
 Summary: Python SDK for the DataOps platform.
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -16,7 +16,8 @@ Provides-Extra: runner
 Requires-Dist: paramiko>4; extra == "runner"
 Requires-Dist: pandas; extra == "runner"
 Requires-Dist: sqlalchemy; extra == "runner"
-Requires-Dist: mariadb[binary]; extra == "runner"
+Requires-Dist: PyMySQL; extra == "runner"
+Requires-Dist: asyncmy; (platform_system == "Darwin" or platform_system == "Linux") and extra == "runner"
 Requires-Dist: psycopg[binary]>=3; extra == "runner"
 Requires-Dist: dmpython~=2.5.32; platform_system != "Darwin" and extra == "runner"
 Requires-Dist: dmsqlalchemy<3,>2; platform_system != "Darwin" and extra == "runner"

{dataops_sdk-0.5.1 → dataops_sdk-0.5.3}/src/dataops_sdk.egg-info/SOURCES.txt

@@ -36,7 +36,6 @@ src/dataops_sdk/runner/utils/queue_kafka.py
 src/dataops_sdk/runner/utils/sftp_file_transfer.py
 src/dataops_sdk/runner/utils/websocket_client.py
 src/dataops_sdk/schemas/__init__.py
-src/dataops_sdk/schemas/alarm.py
 src/dataops_sdk/schemas/api.py
 src/dataops_sdk/schemas/common.py
 src/dataops_sdk/schemas/data_table.py
@@ -44,7 +43,6 @@ src/dataops_sdk/schemas/datasource.py
 src/dataops_sdk/schemas/dict_.py
 src/dataops_sdk/schemas/enums.py
 src/dataops_sdk/schemas/group.py
-src/dataops_sdk/schemas/hazard.py
 src/dataops_sdk/schemas/meta.py
 src/dataops_sdk/schemas/ontology.py
 src/dataops_sdk/schemas/query.py
@@ -57,7 +55,6 @@ src/dataops_sdk/schemas/widget.py
 src/dataops_sdk/schemas/wiki.py
 src/dataops_sdk/schemas/workflow.py
 src/dataops_sdk/services/__init__.py
-src/dataops_sdk/services/alarm.py
 src/dataops_sdk/services/api.py
 src/dataops_sdk/services/auth.py
 src/dataops_sdk/services/data_table.py
@@ -65,7 +62,6 @@ src/dataops_sdk/services/dataset.py
 src/dataops_sdk/services/datasource.py
 src/dataops_sdk/services/dict_.py
 src/dataops_sdk/services/group.py
-src/dataops_sdk/services/hazard.py
 src/dataops_sdk/services/meta.py
 src/dataops_sdk/services/metrics.py
 src/dataops_sdk/services/ontology.py
@@ -93,6 +89,7 @@ src/dataops_sdk/utils/utils.py
 tests/test_constants.py
 tests/test_datasource_factory.py
 tests/test_db_conn_async.py
+tests/test_db_conn_sync.py
 tests/test_exceptions.py
 tests/test_session.py
 tests/test_utils.py

{dataops_sdk-0.5.1 → dataops_sdk-0.5.3}/src/dataops_sdk.egg-info/requires.txt

@@ -16,7 +16,7 @@ ruff
 paramiko>4
 pandas
 sqlalchemy
-mariadb[binary]
+PyMySQL
 psycopg[binary]>=3
 doris-python>=1.0.4
 oracledb~=4.0.1
@@ -27,3 +27,6 @@ websockets>=13
 [runner:platform_system != "Darwin"]
 dmpython~=2.5.32
 dmsqlalchemy<3,>2
+
+[runner:platform_system == "Darwin" or platform_system == "Linux"]
+asyncmy

{dataops_sdk-0.5.1 → dataops_sdk-0.5.3}/tests/test_db_conn_async.py

@@ -66,12 +66,15 @@ def _conn(monkeypatch, session: _Session | None = None) -> DatabaseConnAsync:
 
 def test_build_async_url_drivers():
     mysql = build_async_url("127.0.0.1", 3306, "u", "p", "db", "mysql")
-    assert mysql.drivername == "mysql+mariadbconnector"
+    assert mysql.drivername == "mysql+asyncmy"
     assert mysql.query["local_infile"] == "True"
     assert mysql.query["ssl_disabled"] == "True"
 
     mariadb = build_async_url("127.0.0.1", 3306, "u", "p", "db", "mariadb")
-    assert mariadb.drivername == "mariadb+mariadbconnector"
+    assert mariadb.drivername == "mariadb+asyncmy"
+
+    doris = build_async_url("127.0.0.1", 9030, "u", "p", "db", "doris")
+    assert doris.drivername == "doris+asyncmy"
 
     postgres = build_async_url("127.0.0.1", 5432, "u", "p", "db", "postgresql")
     assert postgres.drivername == "postgresql+psycopg"

dataops_sdk-0.5.3/tests/test_db_conn_sync.py

@@ -0,0 +1,26 @@
+"""DatabaseConn 同步连接 URL 构建单元测试."""
+
+import pytest
+from dataops_sdk.runner.utils.dbConn_sync import DBTYPE_DRIVER, build_url
+
+
+def test_build_url_drivers():
+    mysql = build_url("127.0.0.1", 3306, "u", "p", "db", "mysql")
+    assert mysql.drivername == "mysql+pymysql"
+    assert mysql.query["local_infile"] == "True"
+    assert mysql.query["ssl_disabled"] == "True"
+
+    mariadb = build_url("127.0.0.1", 3306, "u", "p", "db", "mariadb")
+    assert mariadb.drivername == "mariadb+pymysql"
+
+    doris = build_url("127.0.0.1", 9030, "u", "p", "db", "doris")
+    assert doris.drivername == "doris+pymysql"
+
+    postgres = build_url("127.0.0.1", 5432, "u", "p", "db", "postgresql")
+    assert postgres.drivername == "postgresql+psycopg"
+    assert "local_infile" not in postgres.query
+
+    assert DBTYPE_DRIVER["oracle"] == "oracledb"
+
+    with pytest.raises(NotImplementedError):
+        build_url("127.0.0.1", 5236, "u", "p", "db", "unknown")

dataops_sdk-0.5.1/src/dataops_sdk/schemas/alarm.py

@@ -1,119 +0,0 @@
-"""告警 (Alarm) 相关实体的 Schema 定义.
-
-对应平台告警规则、规则规格、处理动作与匹配项等数据模型，
-统一继承自 ``MetaBase`` 并复用了启用状态相关字段。
-"""
-
-from typing import Annotated
-
-from pydantic import BaseModel, ConfigDict, Field, JsonValue
-
-from dataops_sdk.schemas.meta import Meta, MetaBase, MetaRelease
-
-
-class AlarmExternal(BaseModel):
-    """启用状态相关字段集合.
-
-    被各类告警实体复用，提供 ``IS_ENABLED`` 与 ``N_IS_ENABLED`` 两个字段。
-    """
-
-    IS_ENABLED: Annotated[str, Field(description="是否启用")]
-    N_IS_ENABLED: Annotated[str, Field(description="是否启用名称")]
-
-
-class AlarmRuleItem(MetaBase, AlarmExternal):
-    """告警规则条目.
-
-    Attributes:
-        INDUSTRY: 行业标识。
-        DESCRIPTION: 规则描述。
-    """
-
-    INDUSTRY: Annotated[str, Field(description="行业")]
-    DESCRIPTION: Annotated[str, Field(description="描述")] = ""
-
-
-class AlarmSpecItem(MetaBase, AlarmExternal):
-    """告警规则规格条目.
-
-    Attributes:
-        INDUSTRY: 行业标识。
-        N_INDUSTRY: 行业名称（人类可读）。
-        BUSINESS_DOMAIN: 业务域。
-        N_BUSINESS_DOMAIN: 业务域名称（人类可读）。
-        KAFKA_TOPICS: 关联的 Kafka 主题列表。
-    """
-
-    INDUSTRY: Annotated[str, Field(description="行业")]
-    N_INDUSTRY: Annotated[str, Field(description="行业名称")]
-    BUSINESS_DOMAIN: Annotated[str | None, Field(description="业务域")] = None
-    N_BUSINESS_DOMAIN: Annotated[str | None, Field(description="业务域名称")] = None
-    KAFKA_TOPICS: Annotated[str | None, Field(description="Kafka主题列表")] = None
-
-
-class AlarmActionItem(MetaBase, AlarmExternal):
-    """告警处理动作条目.
-
-    Attributes:
-        RULE_TYPE: 规则类型。
-        N_RULE_TYPE: 规则类型名称。
-        SCRIPT_CONTENT: 触发动作的执行脚本内容。
-    """
-
-    RULE_TYPE: Annotated[str, Field(description="规则类型")]
-    N_RULE_TYPE: Annotated[str, Field(description="规则类型名称")]
-
-    SCRIPT_CONTENT: Annotated[str, Field(description="脚本内容")]
-
-
-class AlarmRuleMatchItem(MetaBase, AlarmExternal):
-    """告警规则匹配条目.
-
-    Attributes:
-        AREA: 区域。
-        SPEC_TYPE: 规则规格类型。
-        N_SPEC_TYPE: 规则规格类型名称。
-        RULE_TYPE: 规则类型。
-        N_RULE_TYPE: 规则类型名称。
-    """
-
-    AREA: Annotated[str, Field(description="区域")]
-    SPEC_TYPE: Annotated[str, Field(description="规则类型")]
-    N_SPEC_TYPE: Annotated[str, Field(description="规则类型名称")]
-    RULE_TYPE: Annotated[str, Field(description="规则类型")]
-    N_RULE_TYPE: Annotated[str, Field(description="规则类型名称")]
-
-
-class AlarmPreprocessItem(MetaRelease, AlarmExternal):
-    """预处理脚本列表条目。
-
-    前端列表接口返回大写字段；说明、脚本内容和专业名称可能为空，
-    因此这里不把这些展示字段设置为必填。
-    """
-
-    N_SPEC_TYPE: Annotated[str | None, Field(description="关联专业名称")] = None
-    DESCRIPTION: Annotated[str | None, Field(description="脚本说明")] = None
-    SCRIPT_CONTENT: Annotated[str | None, Field(description="脚本内容")] = None
-
-    model_config = ConfigDict(extra="allow", str_to_lower=False)
-
-
-class AlarmBuiltinFunctionItem(MetaRelease, AlarmExternal):
-    """内置函数列表条目。"""
-
-    CLAZZ: Annotated[str | None, Field(description="类全路径")] = None
-    SCRIPT: Annotated[str | None, Field(description="函数脚本")] = None
-    REMARK: Annotated[str | None, Field(description="备注")] = None
-
-    model_config = ConfigDict(extra="allow", str_to_lower=False)
-
-
-class AlarmDetail(BaseModel):
-    """告警详情的统一返回结构。
-
-    ``meta`` 来自主体接口，``params`` 来自 Meta 参数接口；data 使用 JSON
-    映射保留前端可能新增的字段，避免详情查询因未知字段失败。
-    """
-
-    meta: Meta[dict[str, JsonValue]]
-    params: dict[str, JsonValue] = Field(default_factory=dict)