dts-dance 0.2.5__tar.gz → 0.2.6__tar.gz

{dts_dance-0.2.5 → dts_dance-0.2.6}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: dts-dance
-Version: 0.2.5
+Version: 0.2.6
 Summary: dts dance lib
 Keywords: observation,tools
 Requires-Python: >=3.12
-Requires-Dist: boto3>=1.42.30
+Requires-Dist: boto3>=1.42.35
 Requires-Dist: loguru<0.8.0,>=0.7.3
 Requires-Dist: pyyaml<7.0.0,>=6.0.3
 Requires-Dist: requests-toolbelt==1.0.0

{dts_dance-0.2.5 → dts_dance-0.2.6}/dtsdance/bytecloud.py

@@ -145,18 +145,23 @@ class ByteCloudClient:
             site_config = self.get_site_config(site)
             return self._acquire_jwt_token(site_config.endpoint, site_config.svc_secret)
 
-    def build_request_headers(self, site: str) -> dict[str, str]:
+    def build_request_headers(self, site: str, vregion: str | None = None) -> dict[str, str]:
         """
         构建请求头
 
         Args:
             site: 站点名称
-
+            vregion: 默认为 None
         Returns:
             dict[str, str]: 请求头字典
         """
         jwt_token = self.get_jwt_token(site)
-        return {"Content-Type": "application/json", "x-jwt-token": jwt_token}
+        headers = {"Content-Type": "application/json", "x-jwt-token": jwt_token}
+        if vregion:
+            headers["x-bcgw-vregion"] = vregion
+            headers["get-svc"] = "1"  # response header 中显示实际请求的机房
+
+        return headers
 
     def get_site_config(self, site: str) -> SiteConfig:
         """

{dts_dance-0.2.5 → dts_dance-0.2.6}/dtsdance/ddutil.py

@@ -1,6 +1,7 @@
 from typing import Any, Optional
 from loguru import logger
 import requests
+import json
 
 
 def make_request(method: str, url: str, headers: dict[str, str], payload: Optional[dict] = None) -> dict[str, Any]:
@@ -37,3 +38,15 @@ def make_request(method: str, url: str, headers: dict[str, str], payload: Option
             error_msg += f", response.text: {response.text}"
         logger.warning(error_msg)
         raise
+
+
+def output_curl(url: str, headers: dict[str, str], payload: dict) -> str:
+    """
+    生成等效的 curl 命令字符串
+    """
+    curl_headers = " \\\n    ".join([f"-H '{k}: {v}'" for k, v in headers.items()])
+    curl_payload = json.dumps(payload, ensure_ascii=False)
+    curl_cmd = f"""curl -X POST '{url}' \\
+    {curl_headers} \\
+    -d '{curl_payload}'"""
+    return curl_cmd

{dts_dance-0.2.5 → dts_dance-0.2.6}/dtsdance/dflow.py

@@ -1,8 +1,8 @@
 import collections
-from typing import Any, cast
+from typing import Any
 from loguru import logger
 
-from dtsdance.ddutil import make_request
+from dtsdance.ddutil import make_request, output_curl
 from .bytecloud import ByteCloudClient
 
 
@@ -19,12 +19,6 @@ class DFlowClient:
     def __init__(self, bytecloud_client: ByteCloudClient) -> None:
         self.bytecloud_client = bytecloud_client
 
-    def build_request_headers(self, site: str, vregion: str | None) -> dict[str, str]:
-        headers = self.bytecloud_client.build_request_headers(site)
-        if vregion:
-            headers["x-bcgw-vregion"] = vregion
-        return headers
-
     def get_task_info(self, site: str, task_id: str, vregion: str | None = None) -> dict[str, Any]:
         """
         获取 DFlow 任务信息
@@ -43,7 +37,7 @@ class DFlowClient:
         # 构建请求数据
         payload = {"id": int(task_id)}
 
-        response_data = make_request("POST", url, self.build_request_headers(site, vregion), payload)
+        response_data = make_request("POST", url, self.bytecloud_client.build_request_headers(site, vregion), payload)
 
         message = response_data.get("message")
         # logger.debug(f"get_task_info {site} {task_id}, message: {message}")
@@ -52,8 +46,7 @@ class DFlowClient:
             raise TaskNotFound(f"获取 DFlow 任务信息失败，站点: {site}, 任务 ID: {task_id} 不存在")
 
         try:
-            data = cast(dict, response_data.get("data", {}))
-            task = cast(dict, data.get("task", {}))
+            task = response_data.get("data", {}).get("task", {})
             # 提取核心信息
             filtered_data = {
                 "task_id": task.get("id", ""),
@@ -85,7 +78,7 @@ class DFlowClient:
         # 构建请求数据
         payload = {"dflow_id": int(dflow_id)}
 
-        response_data = make_request("POST", url, self.build_request_headers(site, vregion), payload)
+        response_data = make_request("POST", url, self.bytecloud_client.build_request_headers(site, vregion), payload)
 
         message = response_data.get("message", "")
         # logger.debug(f"get_dflow_info {site} {dflow_id}, message: {message}")
@@ -94,8 +87,7 @@ class DFlowClient:
             raise DFlowNotFound(f"获取 DFlow 进程信息失败，站点: {site}, 进程 ID: {dflow_id} 不存在")
 
         try:
-            data = cast(dict, response_data.get("data", {}))
-            dflow = cast(dict, data.get("dflow", {}))
+            dflow = response_data.get("data", {}).get("dflow", {})
             # 提取核心信息
             filtered_data = {
                 "dflow_id": dflow.get("id", ""),
@@ -143,21 +135,21 @@ class DFlowClient:
         # 构建请求数据
         payload = {"ctrl_env": ctrl_env}
 
-        response_data = make_request("POST", url, self.build_request_headers(site, None), payload)
+        response_data = make_request("POST", url, self.bytecloud_client.build_request_headers(site, None), payload)
 
         message = response_data.get("message")
         logger.info(f"int_resources {site} {ctrl_env}, message: {message}")
 
         return message == "ok"
 
-    def list_resources(self, site: str, ctrl_env: str) -> list[str]:
+    def list_resources(self, site: str, ctrl_env: str, vregion: str | None = None) -> list[str]:
         """
         列举 CTRL 环境资源列表，连同 agent 列表
 
         Args:
             site: 站点名称
             ctrl_env: 控制环境
-
+            vregion: 虚拟区域
         Returns:
             list[str]: CTRL 环境资源列表
         """
@@ -166,10 +158,13 @@ class DFlowClient:
         url = f"{site_info.endpoint}/api/v1/bytedts/api/bytedts/v3/DescribeResources"
 
         # 构建请求数据
+        headers = self.bytecloud_client.build_request_headers(site, vregion)
         payload = {"offset": 0, "limit": 10, "ctrl_env": ctrl_env}
+        response_data = make_request("POST", url, headers, payload)
 
-        response_data = make_request("POST", url, self.build_request_headers(site, None), payload)
-
+        # curl_cmd = output_curl(url, headers, payload)
+        # print(f"Equivalent curl:\n{curl_cmd}")
+        
         try:
             data = response_data.get("data", {})
             items = data.get("items", [])
@@ -181,7 +176,7 @@ class DFlowClient:
         """获取所有可用的控制环境列表，返回以domain为键，ctrl_env列表为值的字典"""
         site_info = self.bytecloud_client.get_site_config(site)
         url = f"{site_info.endpoint}/api/v1/bytedts/api/bytedts/v3/DescribeRegions"
-        resp_json = make_request("POST", url, self.build_request_headers(site, None), {})
+        resp_json = make_request("POST", url, self.bytecloud_client.build_request_headers(site, None), {})
         if resp_json["code"] != 0:
             raise Exception(resp_json["message"])
 

{dts_dance-0.2.5 → dts_dance-0.2.6}/dtsdance/dsyncer.py

@@ -21,7 +21,7 @@ class DSyncerClient:
         self.envs = envs
         self.bytecloud_client = bytecloud_client
 
-    def _build_headers(self, env: str, secret_api: bool = False) -> dict[str, str]:
+    def _build_headers(self, site: str, secret_api: bool = False) -> dict[str, str]:
         """
         构建请求头
 
@@ -32,11 +32,11 @@ class DSyncerClient:
         Returns:
             dict[str, str]: 请求头字典
         """
-        jwt_token = self.bytecloud_client.get_jwt_token(env)
-        headers = {"X-Jwt-Token": jwt_token, "x-bcgw-vregion": env}
+        jwt_token = self.bytecloud_client.get_jwt_token(site)
+        headers = {"X-Jwt-Token": jwt_token}
 
         if secret_api:
-            token = self.envs[env].token
+            token = self.envs[site].token
             headers["Authorization"] = f"Token {token}"
 
         return headers

{dts_dance-0.2.5 → dts_dance-0.2.6}/dtsdance/spacex.py

@@ -40,11 +40,11 @@ class SpaceXClient:
             logger.warning(f"do quest queryServerMeta exception: {e}")
             raise
 
-    def register_resource(self, site: str, data_raw: dict[str, Any]) -> bool:
+    def register_resource(self, site: str, payload: dict[str, Any]) -> bool:
         site_info = self.bytecloud_client.get_site_config(site)
         url = f"{site_info.endpoint_bytedts_spacex}/resource/v1/registerResource"
         try:
-            response = requests.post(url, json=data_raw, headers=self.bytecloud_client.build_request_headers(site))
+            response = requests.post(url, json=payload, headers=self.bytecloud_client.build_request_headers(site))
             # print(f"response status code: {response.status_code}, response text: {response.text}")
 
             response.raise_for_status()
@@ -56,11 +56,11 @@ class SpaceXClient:
             logger.warning(f"do quest registerResource exception: {e}")
             raise
 
-    def list_resources(self, site: str, data_raw: dict[str, Any]) -> list[str]:
+    def list_resources(self, site: str, payload: dict[str, Any]) -> list[str]:
         site_info = self.bytecloud_client.get_site_config(site)
         url = f"{site_info.endpoint_bytedts_spacex}/resource/v1/listResource"
         try:
-            response = requests.post(url, json=data_raw, headers=self.bytecloud_client.build_request_headers(site))
+            response = requests.post(url, json=payload, headers=self.bytecloud_client.build_request_headers(site))
             # print(f"response status code: {response.status_code}, response text: {response.text}")
 
             response.raise_for_status()
@@ -78,7 +78,7 @@ class SpaceXClient:
     def register_gateway(self, site: str, gateway_info: GatewayInfo) -> bool:
         site_info = self.bytecloud_client.get_site_config(site)
         url = f"{site_info.endpoint_bytedts_spacex}/bytedts/v1/registryGateway"
-        data_raw = {
+        payload = {
             "region": gateway_info.mgr_name,
             "server_region": gateway_info.mgr_name,
             "cluster_region": gateway_info.ctrl_name,
@@ -97,7 +97,7 @@ class SpaceXClient:
             "unified_tao_service": 1,
         }
         try:
-            response = requests.post(url, json=data_raw, headers=self.bytecloud_client.build_request_headers(site))
+            response = requests.post(url, json=payload, headers=self.bytecloud_client.build_request_headers(site))
             response.raise_for_status()
 
             result = response.json()
@@ -107,11 +107,11 @@ class SpaceXClient:
             logger.warning(f"do quest registryGateway exception: {e}")
             raise
 
-    def gateway_operation(self, site: str, operation: str, data_raw: dict[str, Any]) -> dict[str, Any]:
+    def gateway_operation(self, site: str, operation: str, payload: dict[str, Any]) -> dict[str, Any]:
         site_info = self.bytecloud_client.get_site_config(site)
         url = f"{site_info.endpoint_bytedts_spacex}/bytedts/v1/{operation}"
         try:
-            response = requests.post(url, json=data_raw, headers=self.bytecloud_client.build_request_headers(site))
+            response = requests.post(url, json=payload, headers=self.bytecloud_client.build_request_headers(site))
             # print(f"response status code: {response.status_code}, response text: {response.text}")
 
             response.raise_for_status()

{dts_dance-0.2.5 → dts_dance-0.2.6}/dtsdance/tcc_inner.py

@@ -27,7 +27,7 @@ class TCCInnerClient:
         site_info = self.bytecloud_client.get_site_config(site)
         url = f"{site_info.endpoint}/api/v3/tcc/bcc/config/list_v2"
 
-        data_raw = {
+        payload = {
             "ns_name": ns_name,
             "region": region,
             "dir_path": dir,
@@ -40,7 +40,7 @@ class TCCInnerClient:
         }
 
         try:
-            response = requests.post(url, headers=self.bytecloud_client.build_request_headers(site), json=data_raw, timeout=30)
+            response = requests.post(url, headers=self.bytecloud_client.build_request_headers(site), json=payload, timeout=30)
             response.raise_for_status()
             result = response.json()
 

{dts_dance-0.2.5 → dts_dance-0.2.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "dts-dance"
-version = "0.2.5"
+version = "0.2.6"
 description = "dts dance lib"
 readme = "README.md"
 keywords = ["tools", "observation"]
@@ -12,7 +12,7 @@ requires-python = ">=3.12"
 dependencies = [
     "requests>=2.32.5,<3.0.0",
     "loguru>=0.7.3,<0.8.0",
-    "boto3>=1.42.30",
+    "boto3>=1.42.35",
     "pyyaml>=6.0.3,<7.0.0",
     "requests_toolbelt==1.0.0",
 ]

{dts_dance-0.2.5 → dts_dance-0.2.6}/tests/test_dflow.py

@@ -10,23 +10,16 @@ bytecloud_client = ByteCloudClient(site_configs)
 dflow_client = DFlowClient(bytecloud_client)
 
 
-# pytest tests/test_dflow.py::test_get_task_info1 -s
-def test_get_task_info1():
-    info = dflow_client.get_task_info("cn", "106037095986690")
-    print(f"DFlow Info: {info}")
-
-
-# pytest tests/test_dflow.py::test_get_task_info2 -s
-def test_get_task_info2():
-    info = dflow_client.get_task_info("cn", "99868429582521")
-    print(f"DFlow Info: {info}")
-
-
-# pytest tests/test_dflow.py::test_get_dflow_info -s
-def test_get_dflow_info():
-    info = dflow_client.get_dflow_info("cn", "106029334786818")
+# pytest tests/test_dflow.py::test_get_task_info -s
+def test_get_task_info():
+    # info = dflow_client.get_task_info("cn", "106037095986690")
+    info = dflow_client.get_task_info("cn", "10457709471247")
     print(f"DFlow Info: {info}")
 
+# pytest tests/test_dflow.py::test_list_resources -s
+def test_list_resources():
+    resources = dflow_client.list_resources("cn", "cn_east", vregion = "China-East")
+    print(f"list_resources: {json.dumps(resources, indent=2)}")
 
 # pytest tests/test_dflow.py::test_get_all_ctrl_envs -s
 def test_get_all_ctrl_envs():

{dts_dance-0.2.5 → dts_dance-0.2.6}/uv.lock

@@ -4,30 +4,30 @@ requires-python = ">=3.12"
 
 [[package]]
 name = "boto3"
-version = "1.42.30"
+version = "1.42.36"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "botocore" },
     { name = "jmespath" },
     { name = "s3transfer" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/42/79/2dac8b7cb075cfa43908ee9af3f8ee06880d84b86013854c5cca8945afac/boto3-1.42.30.tar.gz", hash = "sha256:ba9cd2f7819637d15bfbeb63af4c567fcc8a7dcd7b93dd12734ec58601169538", size = 112809, upload-time = "2026-01-16T20:37:23.636Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/54/06/50ff808cf4f40efada8edc20f9d563ab287864423c874dfb94f755a60c52/boto3-1.42.36.tar.gz", hash = "sha256:a4eb51105c8c5d7b2bc2a9e2316e69baf69a55611275b9f189c0cf59f1aae171", size = 112839, upload-time = "2026-01-27T20:38:26.992Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/52/b3/2c0d828c9f668292e277ca5232e6160dd5b4b660a3f076f20dd5378baa1e/boto3-1.42.30-py3-none-any.whl", hash = "sha256:d7e548bea65e0ae2c465c77de937bc686b591aee6a352d5a19a16bc751e591c1", size = 140573, upload-time = "2026-01-16T20:37:22.089Z" },
+    { url = "https://files.pythonhosted.org/packages/8d/d1/35d12f04a7792e2f5e9ddff3c7b60493a32027761380dee7f24ee8ae80cc/boto3-1.42.36-py3-none-any.whl", hash = "sha256:e0ff6f2747bfdec63405b35ea185a7aea35239c3f4fe99e4d29368a6de9c4a84", size = 140604, upload-time = "2026-01-27T20:38:25.349Z" },
 ]
 
 [[package]]
 name = "botocore"
-version = "1.42.30"
+version = "1.42.36"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "jmespath" },
     { name = "python-dateutil" },
     { name = "urllib3" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/44/38/23862628a0eb044c8b8b3d7a9ad1920b3bfd6bce6d746d5a871e8382c7e4/botocore-1.42.30.tar.gz", hash = "sha256:9bf1662b8273d5cc3828a49f71ca85abf4e021011c1f0a71f41a2ea5769a5116", size = 14891439, upload-time = "2026-01-16T20:37:13.77Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/66/4e/b24089cf7a77d38886ac4fbae300a3c4c6d68c1b9ccb66af03cb07b6c35c/botocore-1.42.36.tar.gz", hash = "sha256:2ebd89cc75927944e2cee51b7adce749f38e0cb269a758a6464a27f8bcca65fb", size = 14909073, upload-time = "2026-01-27T20:38:16.621Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/3d/8d/6d7b016383b1f74dd93611b1c5078bbaddaca901553ab886dcda87cae365/botocore-1.42.30-py3-none-any.whl", hash = "sha256:97070a438cac92430bb7b65f8ebd7075224f4a289719da4ee293d22d1e98db02", size = 14566340, upload-time = "2026-01-16T20:37:10.94Z" },
+    { url = "https://files.pythonhosted.org/packages/e6/e8/f14d25bd768187424b385bc6a44e2ed5e96964e461ba019add03e48713c7/botocore-1.42.36-py3-none-any.whl", hash = "sha256:2cfae4c482e5e87bd835ab4289b711490c161ba57e852c06b65a03e7c25e08eb", size = 14583066, upload-time = "2026-01-27T20:38:14.02Z" },
 ]
 
 [[package]]
@@ -119,7 +119,7 @@ dependencies = [
 
 [package.metadata]
 requires-dist = [
-    { name = "boto3", specifier = ">=1.42.30" },
+    { name = "boto3", specifier = ">=1.42.35" },
     { name = "loguru", specifier = ">=0.7.3,<0.8.0" },
     { name = "pyyaml", specifier = ">=6.0.3,<7.0.0" },
     { name = "requests", specifier = ">=2.32.5,<3.0.0" },