dts-dance 0.2.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

{dts_dance-0.2.0.dist-info → dts_dance-0.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dts-dance
-Version: 0.2.0
+Version: 0.2.1
 Summary: dts dance lib
 Keywords: observation,tools
 Requires-Python: >=3.12

{dts_dance-0.2.0.dist-info → dts_dance-0.2.1.dist-info}/RECORD

@@ -1,14 +1,14 @@
 dtsdance/__init__.py,sha256=Yl_jEZ5weYfcrklnDvwB4wSgCOvMBLRRgWx0gHs3qfM,49
 dtsdance/bytecloud.py,sha256=SN82KIYAfq16s06-HUoj37PbgSbUa7MoFFcah2kaXOk,5213
-dtsdance/dflow.py,sha256=WtD3AbDgGRraddJIxzZs8Bd6Ts56XtqJcjb0UrhnWFQ,5097
+dtsdance/dflow.py,sha256=N9u7uB9UyUbB2FswBezXB9SbwmlDr3PWhY_eUZJeQ-8,7064
 dtsdance/dsyncer.py,sha256=X59sKDvK6rDeumCajepcqSSJysDfvJByYZAhcdOyNLw,11179
 dtsdance/feishu_base.py,sha256=2j4ZM4PFqJ-9EhC6DQ1OmAg--3VBGZyyRuxyjL0j6OU,3733
 dtsdance/feishu_table.py,sha256=ZUeoKrM4nmm5hFhc3vWOVYeLP390orm-284Od92G4iQ,8424
 dtsdance/metrics_fe.py,sha256=hzIl5BJmuCrkqJOHELVzXm3YAqrPttbyVkKBglS4mgQ,18978
 dtsdance/s3.py,sha256=Bh-cwLksfO5PewNtIzE_Md3rRLDLI1DUVoOD7Pou5T8,1294
-dtsdance/spacex.py,sha256=lVhDfGzFZsfeYhWGT-8AE3JM5ZksJdBWRQ-GRL0ymqY,2342
+dtsdance/spacex.py,sha256=eYPx3-VKgPK6-IO8-HPuX0-mxsM6kt1HMZqyDA_KPbw,2340
 dtsdance/tcc_inner.py,sha256=xy3N1N3BNl1oc2oMNHKhnsj47rAKOOJ-aXw8GtA2De8,1621
-dtsdance/tcc_open.py,sha256=wjUh56_CDb15s0qXw61fb5JehgIVcySUf0hTaF7V92Y,6674
-dts_dance-0.2.0.dist-info/METADATA,sha256=7IBiJk2ubNRRx2p6gjWnSxqYXa1PzQ_HLTf3DFwSkCI,793
-dts_dance-0.2.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-dts_dance-0.2.0.dist-info/RECORD,,
+dtsdance/tcc_open.py,sha256=Qb_ue3xH0CSsoReItdFKuvW7JsDTfFkDNIB_4zjzSQI,6893
+dts_dance-0.2.1.dist-info/METADATA,sha256=QQohyobEcAlWjdpCDwPBXzYlSRBZxeGcV-xfN9_ladU,793
+dts_dance-0.2.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+dts_dance-0.2.1.dist-info/RECORD,,

dtsdance/dflow.py

@@ -4,6 +4,14 @@ from .bytecloud import ByteCloudClient
 import requests
 
 
+class TaskNotFound(Exception):
+    pass
+
+
+class DFlowNotFound(Exception):
+    pass
+
+
 class DFlowClient:
 
     def __init__(self, bytecloud_client: ByteCloudClient) -> None:
@@ -44,7 +52,7 @@ class DFlowClient:
             logger.warning(error_msg)
             raise
 
-    def get_dflow_info(self, site: str, task_id: str) -> dict[str, Any]:
+    def get_task_info(self, site: str, task_id: str) -> dict[str, Any]:
         """
         获取 DFlow 任务信息
 
@@ -64,7 +72,11 @@ class DFlowClient:
 
         response_data = self._make_request("POST", url, self.bytecloud_client.build_request_headers(site), json_data)
 
-        logger.info(f"get_dflow_info {site} {task_id}, message: {response_data.get('message')}")
+        message = response_data.get("message")
+        # logger.debug(f"get_task_info {site} {task_id}, message: {message}")
+
+        if message == "task not exists":
+            raise TaskNotFound(f"获取 DFlow 任务信息失败，站点: {site}, 任务 ID: {task_id} 不存在")
 
         try:
             data = cast(dict, response_data.get("data", {}))
@@ -82,6 +94,49 @@ class DFlowClient:
         except (KeyError, AttributeError, Exception) as e:
             raise Exception(f"无法从响应中提取 DFlow 任务信息数据: {str(e)}")
 
+    def get_dflow_info(self, site: str, dflow_id: str) -> dict[str, Any]:
+        """
+        获取 DFlow 进程信息
+
+        Args:
+            site: 站点名称
+            dflow_id: DFlow 进程 ID
+
+        Returns:
+            dict[str, Any]: DFlow 进程信息，包含 create_time 等字段
+        """
+        # 构建 API URL
+        site_info = self.bytecloud_client.get_site_info(site)
+        url = f"{site_info.endpoint}/api/v1/bytedts/api/bytedts/v3/DescribeDFlowDetail"
+
+        # 构建请求数据
+        json_data = {"dflow_id": int(dflow_id)}
+
+        response_data = self._make_request("POST", url, self.bytecloud_client.build_request_headers(site), json_data)
+
+        message = response_data.get("message", "")
+        # logger.debug(f"get_dflow_info {site} {dflow_id}, message: {message}")
+
+        if "dflow not found" in message:
+            raise DFlowNotFound(f"获取 DFlow 进程信息失败，站点: {site}, 进程 ID: {dflow_id} 不存在")
+
+        try:
+            data = cast(dict, response_data.get("data", {}))
+            dflow = cast(dict, data.get("dflow", {}))
+            # 提取核心信息
+            filtered_data = {
+                "dflow_id": dflow.get("id", ""),
+                "task_id": dflow.get("task_id", ""),
+                "app": dflow.get("app", ""),
+                "schedule_plan_name": dflow.get("schedule_plan_name", ""),
+                "running_state.healthy_status": dflow.get("running_state", {}).get("healthy_status", ""),
+            }
+
+            return filtered_data
+
+        except (KeyError, AttributeError, Exception) as e:
+            raise Exception(f"无法从响应中提取 DFlow 进程信息数据: {str(e)}")
+
     def generate_task_url(self, site: str, task_id: str) -> str:
         """
         获取 DFlow 任务详情页面的 URL

dtsdance/spacex.py

@@ -5,7 +5,7 @@ from loguru import logger
 
 
 class GatewayInfo(NamedTuple):
-    mgr_name: str
+    mgr_env: str
     ctrl_name: str
     gateway_endpoint: str
     auth_user: str
@@ -40,11 +40,11 @@ class SpaceXClient:
             logger.warning(f"do quest queryServerMeta exception: {e}")
             raise
 
-    def registry_gateway(self, site: str, gateway_info: GatewayInfo) -> bool:
+    def register_gateway(self, site: str, gateway_info: GatewayInfo) -> bool:
         site_info = self.bytecloud_client.get_site_info(site)
         url = f"{site_info.endpoint_bytedts_spacex}/bytedts/v1/registryGateway"
         data_raw = {
-            "server_region": gateway_info.mgr_name,
+            "server_region": gateway_info.mgr_env,
             "cluster_region": gateway_info.ctrl_name,
             "cluster_name": gateway_info.ctrl_name,
             "server_domain": gateway_info.gateway_endpoint,

dtsdance/tcc_open.py

@@ -16,8 +16,10 @@ class TCCConfigItem:
 
 
 class TCCError(Exception):
-    """TCC API error."""
+    pass
+
 
+class TCCItemNotFound(Exception):
     pass
 
 
@@ -229,7 +231,11 @@ class TCCClient:
             # Check for errors in response
             base_resp = result.get("base_resp", {})
             if base_resp.get("error_code", 0) != 0:
-                raise TCCError(f"TCC API error: {base_resp.get('error_message', 'Unknown error')}")
+                error_message = base_resp.get("error_message", "Unknown error")
+                if "reason:RESOURCE_NOT_FOUND" in error_message:
+                    raise TCCItemNotFound(f"TCC Item not found error: {error_message}")
+
+                raise TCCError(f"TCC API error: {error_message}")
 
             return result.get("data", {})