dts-dance 0.2.1__tar.gz → 0.2.2__tar.gz

{dts_dance-0.2.1 → dts_dance-0.2.2}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: dts-dance
-Version: 0.2.1
+Version: 0.2.2
 Summary: dts dance lib
 Keywords: observation,tools
 Requires-Python: >=3.12
-Requires-Dist: boto3<2.0.0,>=1.42.27
+Requires-Dist: boto3<2.0.0,>=1.42.29
 Requires-Dist: loguru<0.8.0,>=0.7.3
 Requires-Dist: pyyaml<7.0.0,>=6.0.3
 Requires-Dist: requests<3.0.0,>=2.32.5

{dts_dance-0.2.1 → dts_dance-0.2.2}/dtsdance/bytecloud.py

@@ -22,13 +22,14 @@ class ByteCloudClient:
     # 每小时刷新一次，单位为秒
     _REFRESH_INTERVAL = 1 * 60 * 60
 
-    def __init__(self, sites: dict[str, SiteConfig]):
+    def __init__(self, enable_jwt_cache: bool, sites: dict[str, SiteConfig] | None = None) -> None:
         """
         初始化 ByteCloud Client
         从配置文件加载所有环境的信息，并为每个环境初始化 JWT 令牌
         sites 中保存内容 list[(name, endpoint, svc_account, svc_secret)]
         """
-        self.sites = sites
+        self.enable_jwt_cache = enable_jwt_cache
+        self.sites = sites if sites is not None else {}
 
         # 初始化线程锁，用于保护 jwt_tokens 的并发访问
         self.token_lock = threading.Lock()
@@ -36,11 +37,14 @@ class ByteCloudClient:
         # 初始化 JWT 令牌缓存，按环境名称索引
         self.jwt_tokens: Dict[str, str] = {}
 
-        # 更新所有环境的 JWT 令牌
-        self._refresh_tokens()
+        if enable_jwt_cache:
+            logger.info("启用 JWT 令牌缓存")
 
-        # 启动 JWT 令牌刷新线程
-        self._start_refresh_thread()
+            # 更新所有环境的 JWT 令牌
+            self._refresh_tokens()
+
+            # 启动 JWT 令牌刷新线程
+            self._start_refresh_thread()
 
     def _start_refresh_thread(self):
         """
@@ -131,11 +135,15 @@ class ByteCloudClient:
         """
         获取指定站点的 JWT 令牌
         """
-        # 使用线程锁保护并发访问
-        with self.token_lock:
-            if site not in self.jwt_tokens:
-                raise KeyError(f"站点 {site} 的 JWT 令牌不存在")
-            return self.jwt_tokens[site]
+        if self.enable_jwt_cache:
+            # 使用线程锁保护并发访问
+            with self.token_lock:
+                if site not in self.jwt_tokens:
+                    raise KeyError(f"站点 {site} 的 JWT 令牌不存在")
+                return self.jwt_tokens[site]
+        else:
+            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]:
         """
@@ -150,7 +158,7 @@ class ByteCloudClient:
         jwt_token = self.get_jwt_token(site)
         return {"Content-Type": "application/json", "x-jwt-token": jwt_token}
 
-    def get_site_info(self, site: str) -> SiteConfig:
+    def get_site_config(self, site: str) -> SiteConfig:
         """
         获取指定环境的信息
 

{dts_dance-0.2.1 → dts_dance-0.2.2}/dtsdance/dflow.py

@@ -64,7 +64,7 @@ class DFlowClient:
             dict[str, Any]: DFlow 任务信息，包含 create_time 等字段
         """
         # 构建 API URL
-        site_info = self.bytecloud_client.get_site_info(site)
+        site_info = self.bytecloud_client.get_site_config(site)
         url = f"{site_info.endpoint}/api/v1/bytedts/api/bytedts/v3/DescribeTaskInfo"
 
         # 构建请求数据
@@ -106,7 +106,7 @@ class DFlowClient:
             dict[str, Any]: DFlow 进程信息，包含 create_time 等字段
         """
         # 构建 API URL
-        site_info = self.bytecloud_client.get_site_info(site)
+        site_info = self.bytecloud_client.get_site_config(site)
         url = f"{site_info.endpoint}/api/v1/bytedts/api/bytedts/v3/DescribeDFlowDetail"
 
         # 构建请求数据
@@ -149,7 +149,7 @@ class DFlowClient:
             str: DFlow 任务详情页面的 URL
         """
         # 根据环境生成对应的 scope 参数
-        site_info = self.bytecloud_client.get_site_info(site)
+        site_info = self.bytecloud_client.get_site_config(site)
         return f"{site_info.endpoint}/bytedts/datasync/detail/{task_id}?scope={site}"
 
     def init_resources(self, site: str, ctrl_env: str) -> bool:
@@ -164,7 +164,7 @@ class DFlowClient:
             bool: CTRL 环境资源初始化结果
         """
         # 构建 API URL
-        site_info = self.bytecloud_client.get_site_info(site)
+        site_info = self.bytecloud_client.get_site_config(site)
         url = f"{site_info.endpoint}/api/v1/bytedts/api/bytedts/v3/InitSystemResource"
 
         # 构建请求数据
@@ -189,7 +189,7 @@ class DFlowClient:
             list[str]: CTRL 环境资源列表
         """
         # 构建 API URL
-        site_info = self.bytecloud_client.get_site_info(site)
+        site_info = self.bytecloud_client.get_site_config(site)
         url = f"{site_info.endpoint}/api/v1/bytedts/api/bytedts/v3/DescribeResources"
 
         # 构建请求数据

{dts_dance-0.2.1 → dts_dance-0.2.2}/dtsdance/dsyncer.py

@@ -89,7 +89,7 @@ class DSyncerClient:
             dict[str, str]: DSyncer 任务的 rocket_mq_connection 信息，只包含 cluster、topic 和 group 字段
         """
         # 构建 API URL
-        site_info = self.bytecloud_client.get_site_info(site)
+        site_info = self.bytecloud_client.get_site_config(site)
         url = f"{site_info.endpoint}/api/v1/dsyncer/openapi/taskinfo/{task_id}/"
 
         # 准备请求头
@@ -102,7 +102,7 @@ class DSyncerClient:
         获取迁移后的 DFlow 任务信息
         """
         # 构建 API URL
-        site_info = self.bytecloud_client.get_site_info(site)
+        site_info = self.bytecloud_client.get_site_config(site)
         url = f"{site_info.endpoint}/api/v1/dsyncer/openapi/taskinfo/{task_id}/migrate/"
 
         # 准备请求头
@@ -144,7 +144,7 @@ class DSyncerClient:
         Returns:
             str: DSyncer 任务详情页面的 URL
         """
-        site_info = self.bytecloud_client.get_site_info(site)
+        site_info = self.bytecloud_client.get_site_config(site)
         return DSyncer_Task_Detail_URL.format(endpoint=site_info.endpoint, task_id=task_id)
 
     def generate_task_grafana_url(self, task_id: str, change_time: str) -> str:
@@ -208,7 +208,7 @@ class DSyncerClient:
             bool: 如果任务正在迁移中，返回 True；否则返回 False
         """
         # 构建 API URL
-        site_info = self.bytecloud_client.get_site_info(site)
+        site_info = self.bytecloud_client.get_site_config(site)
         url = f"{site_info.endpoint}/api/v1/dsyncer/secret_api/task/migrate/check"
 
         # 准备请求头
@@ -230,7 +230,7 @@ class DSyncerClient:
         执行回滚
         """
         # 构建 API URL
-        site_info = self.bytecloud_client.get_site_info(site)
+        site_info = self.bytecloud_client.get_site_config(site)
         url = f"{site_info.endpoint}/api/v1/dsyncer/secret_api/task/rollback_migrate2dsyncer/"
 
         # 准备请求头
@@ -249,7 +249,7 @@ class DSyncerClient:
         标记迁移成功
         """
         # 构建 API URL
-        site_info = self.bytecloud_client.get_site_info(site)
+        site_info = self.bytecloud_client.get_site_config(site)
         url = f"{site_info.endpoint}/api/v1/dsyncer/secret_api/task/mark_migrate_success/"
 
         # 准备请求头
@@ -271,7 +271,7 @@ class DSyncerClient:
             Optional[str]: 错误信息，成功时返回None，失败时返回错误信息
         """
         # 构建 API URL
-        site_info = self.bytecloud_client.get_site_info(site)
+        site_info = self.bytecloud_client.get_site_config(site)
         url = f"{site_info.endpoint}/api/v1/dsyncer/secret_api/task/migrate2dflow/single"
 
         # 准备请求头

dts_dance-0.2.1/dtsdance/spacex.py → dts_dance-0.2.2/dtsdance/spacex_bytedts.py

@@ -5,7 +5,7 @@ from loguru import logger
 
 
 class GatewayInfo(NamedTuple):
-    mgr_env: str
+    mgr_name: str
     ctrl_name: str
     gateway_endpoint: str
     auth_user: str
@@ -26,7 +26,7 @@ class SpaceXClient:
         self.bytecloud_client = bytecloud_client
 
     def list_mgr(self, site: str) -> list[Any]:
-        site_info = self.bytecloud_client.get_site_info(site)
+        site_info = self.bytecloud_client.get_site_config(site)
         url = f"{site_info.endpoint_bytedts_spacex}/bytedts/v1/queryServerMeta"
 
         try:
@@ -41,10 +41,11 @@ class SpaceXClient:
             raise
 
     def register_gateway(self, site: str, gateway_info: GatewayInfo) -> bool:
-        site_info = self.bytecloud_client.get_site_info(site)
+        site_info = self.bytecloud_client.get_site_config(site)
         url = f"{site_info.endpoint_bytedts_spacex}/bytedts/v1/registryGateway"
         data_raw = {
-            "server_region": gateway_info.mgr_env,
+            "region": gateway_info.mgr_name,
+            "server_region": gateway_info.mgr_name,
             "cluster_region": gateway_info.ctrl_name,
             "cluster_name": gateway_info.ctrl_name,
             "server_domain": gateway_info.gateway_endpoint,
@@ -55,6 +56,10 @@ class SpaceXClient:
             "frontend_password": gateway_info.auth_password,
             "gw_meta_db": gateway_info.gw_meta_db,
             "gateway_type": "psm",
+            "runtime_psm": "bytedts.dflow.rownott",
+            "tao_service_name": "inf.bytedts.agent",
+            "tao_service_node_id": 1071,
+            "unified_tao_service": 1,
         }
         try:
             response = requests.post(url, json=data_raw, headers=self.bytecloud_client.build_request_headers(site))

{dts_dance-0.2.1 → dts_dance-0.2.2}/dtsdance/tcc_inner.py

@@ -24,7 +24,7 @@ class TCCInnerClient:
         """
         List TCC configurations.
         """
-        site_info = self.bytecloud_client.get_site_info(site)
+        site_info = self.bytecloud_client.get_site_config(site)
         url = f"{site_info.endpoint}/api/v3/tcc/bcc/config/list_v2"
 
         data_raw = {

{dts_dance-0.2.1 → dts_dance-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "dts-dance"
-version = "0.2.1"
+version = "0.2.2"
 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.27,<2.0.0",
+    "boto3>=1.42.29,<2.0.0",
     "pyyaml>=6.0.3,<7.0.0",
 ]
 

dts_dance-0.2.2/tests/config.py

@@ -0,0 +1,51 @@
+import os
+import yaml
+from dtsdance.bytecloud import SiteConfig
+
+
+class ConfigLoader:
+
+    _instance: "ConfigLoader | None" = None
+
+    def __init__(self):
+        self._site_configs: dict[str, SiteConfig] = {}
+
+    @classmethod
+    def get_instance(cls) -> "ConfigLoader":
+        """获取单例实例"""
+        if cls._instance is None:
+            cls._instance = cls()
+
+        return cls._instance
+
+    def load_from_file(self, sites: list[str] | None = None) -> None:
+        """从配置文件加载配置"""
+        config_path = os.environ.get("CONFIG_PATH", "config.yaml")
+
+        try:
+            with open(config_path, "r", encoding="utf-8") as f:
+                configs = yaml.safe_load(f)
+        except Exception as e:
+            raise ValueError(f"加载配置失败: {e}")
+
+        self._site_configs.update(
+            {
+                k: SiteConfig(k, v["endpoint"], v["svc_account"], v["svc_secret"], v.get("endpoint_bytedts_spacex", None))
+                for k, v in configs["sites"].items()
+                if sites is None or k in sites
+            }
+        )
+
+    def get(self, site: str) -> SiteConfig:
+        """获取指定站点的配置"""
+        if not self._site_configs:
+            raise RuntimeError("配置未加载，请先调用 load_from_file()")
+
+        if site not in self._site_configs:
+            raise KeyError(f"站点 {site} 不存在")
+
+        return self._site_configs[site]
+
+    def get_site_configs(self) -> dict[str, SiteConfig]:
+        """获取所有配置"""
+        return self._site_configs

{dts_dance-0.2.1 → dts_dance-0.2.2}/tests/test_dflow.py

@@ -1,10 +1,7 @@
 from dtsdance.dflow import DFlowClient
 from dtsdance.bytecloud import ByteCloudClient
 
-from config import load_site_configs
-
-site_configs = load_site_configs(["boe", "cn"])
-bytecloud_client = ByteCloudClient(site_configs)
+bytecloud_client = ByteCloudClient(False)
 dflow_client = DFlowClient(bytecloud_client)
 
 
@@ -13,6 +10,7 @@ def test_get_task_info():
     info = dflow_client.get_task_info("cn", "106037095986690")
     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")

{dts_dance-0.2.1 → dts_dance-0.2.2}/tests/test_spacex.py

@@ -1,24 +1,21 @@
 import json
 from dtsdance.bytecloud import ByteCloudClient
-from dtsdance.spacex import GatewayInfo, SpaceXClient
-from config import load_site_configs
+from dtsdance.spacex_bytedts import GatewayInfo, SpaceXClient
 
-site = "boe"
-site_configs = load_site_configs([site])
-bytecloud_client = ByteCloudClient(site_configs)
+bytecloud_client = ByteCloudClient(False)
 spacex = SpaceXClient(bytecloud_client)
 
 
 # pytest tests/test_spacex.py::test_list_mgr -s
 def test_list_mgr():
-    mgr_list = spacex.list_mgr(site)
+    mgr_list = spacex.list_mgr("boe")
     print(f"mgr_list: {json.dumps(mgr_list, indent=2, ensure_ascii=False)}")
 
 
 # pytest tests/test_spacex.py::test_register_gateway -s
 def test_register_gateway():
     gateway_info = GatewayInfo(
-        mgr_env="boe",
+        mgr_name="boe",
         ctrl_name="boe_halo_test",
         gateway_endpoint="volc.dts.gateway.service.boe:cluster:boe_halo_test:family:v6",
         auth_user="bytedts_backend",
@@ -26,5 +23,5 @@ def test_register_gateway():
         root_secret_key="97oscH5k",
         gw_meta_db="bytedts_sre_halo",
     )
-    result = spacex.register_gateway(site, gateway_info)
+    result = spacex.register_gateway("boe", gateway_info)
     print(f"result: {result}")

{dts_dance-0.2.1 → dts_dance-0.2.2}/tests/test_tcc.py

@@ -1,22 +1,24 @@
-from config import load_site_configs
 from dtsdance.bytecloud import ByteCloudClient
 from dtsdance.tcc_open import TCCClient
 from dtsdance.tcc_inner import TCCInnerClient
+from config import ConfigLoader
 
-site_configs = load_site_configs(["boe", "us-ttp"])
-bytecloud_client = ByteCloudClient(site_configs)
-client_inner = TCCInnerClient(bytecloud_client)
+loader = ConfigLoader.get_instance()
+loader.load_from_file(["boe"])
+site_configs = loader.get_site_configs()
 
 
 # pytest tests/test_tcc.py::test_get_config -s
 def test_get_config():
     site_info = site_configs["boe"]
     client_open = TCCClient(site_info.svc_account, site_info.svc_secret, endpoint=site_info.endpoint)
-    config_ctrl_env = client_open.get_config(ns_name="bytedts.mgr.api", region="China-BOE", dir="/default", conf_name="ctrl_env1")
+    config_ctrl_env = client_open.get_config(ns_name="bytedts.mgr.api", region="China-BOE", dir="/default", conf_name="ctrl_env")
     print(f"ctrl_env: {config_ctrl_env}")
 
 
 # pytest tests/test_tcc.py::test_list_configs -s
 def test_list_configs():
-    configs = client_inner.list_configs(site="us-ttp", ns_name="bytedts.mgr.api", region="US-TTP", dir="/default", conf_name="ctrl_env")
+    bytecloud_client = ByteCloudClient(False, site_configs)
+    client_inner = TCCInnerClient(bytecloud_client)
+    configs = client_inner.list_configs(site="boe", ns_name="bytedts.mgr.api", region="China-BOE", dir="/default", conf_name="ctrl_env")
     print(f"configs: {configs}")

{dts_dance-0.2.1 → dts_dance-0.2.2}/uv.lock

@@ -4,30 +4,30 @@ requires-python = ">=3.12"
 
 [[package]]
 name = "boto3"
-version = "1.42.27"
+version = "1.42.29"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "botocore" },
     { name = "jmespath" },
     { name = "s3transfer" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/8d/99/65569052c911160702ad371b0b08b751bb1df29deeef0c5c117528074c29/boto3-1.42.27.tar.gz", hash = "sha256:a8a53abb98ff1a24d9a88d9d8c0285bf02d23189666130456e8951ede2f7db98", size = 112765, upload-time = "2026-01-13T20:35:11.971Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/5c/24/1dd85b64004103c2e60476d0fa8d78435f5fed9db1129cd2cd332784037a/boto3-1.42.29.tar.gz", hash = "sha256:247e54f24116ad6792cfc14b274288383af3ec3433b0547da8a14a8bd6e81950", size = 112810, upload-time = "2026-01-15T20:36:39.404Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/44/9e/9554a8c1d7610ec8ea55bec0dac87ad894c83cada2ea2c05fc45f14d0cde/boto3-1.42.27-py3-none-any.whl", hash = "sha256:39dfec51aff3f9356e8c7331195f324cb498ec75b2601a902fc62aa127b8fd00", size = 140577, upload-time = "2026-01-13T20:35:09.35Z" },
+    { url = "https://files.pythonhosted.org/packages/51/30/2c25d7be8418e7f137ffece6097c68199dbd6996da645ec9b5a5a9647123/boto3-1.42.29-py3-none-any.whl", hash = "sha256:6c9c4dece67bf72d82ba7dff48e33a56a87cdf9b16c8887f88ca7789a95d3317", size = 140574, upload-time = "2026-01-15T20:36:37.206Z" },
 ]
 
 [[package]]
 name = "botocore"
-version = "1.42.27"
+version = "1.42.29"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "jmespath" },
     { name = "python-dateutil" },
     { name = "urllib3" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/65/90/55b003d38f947c90c0d7e306d377dcdfd9cd0dc1e184082b2d1a6adb0eec/botocore-1.42.27.tar.gz", hash = "sha256:c8e1e3ffb6c871622b1c8054f064d60cbc786aa5ca1f97f5f9fd5fa0a9d82d05", size = 14880030, upload-time = "2026-01-13T20:35:00.31Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/70/08/8a8e0255949845f764c5126f97b1bc09a6484077f124c2177b979ecfbbff/botocore-1.42.29.tar.gz", hash = "sha256:0fe869227a1dfe818f691a31b8c1693e39be8056a6dff5d6d4b3fc5b3a5e7d42", size = 14890916, upload-time = "2026-01-15T20:36:28.241Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/bf/32/8a4a0447432425cd2f772c757d988742685f46796cf5d68aeaf6bcb6bc37/botocore-1.42.27-py3-none-any.whl", hash = "sha256:d51fb3b8dd1a944c8d238d2827a0dd6e5528d6da49a3bd9eccad019c533e4c9c", size = 14555236, upload-time = "2026-01-13T20:34:55.918Z" },
+    { url = "https://files.pythonhosted.org/packages/94/76/cfa6a934ee5a8a87f626b38275193a046da894d2f9021e001587fc2e8c7d/botocore-1.42.29-py3-none-any.whl", hash = "sha256:b45f8dfc1de5106a9d040c5612f267582e68b2b2c5237477dff85c707c1c5d11", size = 14563947, upload-time = "2026-01-15T20:36:23.828Z" },
 ]
 
 [[package]]
@@ -107,7 +107,7 @@ wheels = [
 
 [[package]]
 name = "dts-dance"
-version = "0.2.1"
+version = "0.2.2"
 source = { editable = "." }
 dependencies = [
     { name = "boto3" },
@@ -118,7 +118,7 @@ dependencies = [
 
 [package.metadata]
 requires-dist = [
-    { name = "boto3", specifier = ">=1.42.27,<2.0.0" },
+    { name = "boto3", specifier = ">=1.42.29,<2.0.0" },
     { 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" },

dts_dance-0.2.1/tests/config.py

@@ -1,30 +0,0 @@
-import os
-from typing import Any
-import yaml
-from dtsdance.bytecloud import SiteConfig
-
-
-def load_site_configs(sites: list[str] | None = None) -> dict[str, SiteConfig]:
-    """从配置文件加载配置
-
-    Returns:
-        dict[str, Any]: 应用配置字典
-
-    Raises:
-        ValueError: 配置文件加载错误
-    """
-    config_path = os.environ.get("CONFIG_PATH", "config.yaml")
-
-    configs: dict[str, Any] = {}
-    try:
-        with open(config_path, "r", encoding="utf-8") as f:
-            configs = yaml.safe_load(f)
-
-    except Exception as e:
-        raise ValueError(f"加载配置失败: {e}")
-
-    return {
-        k: SiteConfig(k, v["endpoint"], v["svc_account"], v["svc_secret"], v.get("endpoint_bytedts_spacex", None))
-        for k, v in configs["sites"].items()
-        if k in sites
-    }