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

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

@@ -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.2.dist-info/RECORD

@@ -0,0 +1,14 @@
+dtsdance/__init__.py,sha256=Yl_jEZ5weYfcrklnDvwB4wSgCOvMBLRRgWx0gHs3qfM,49
+dtsdance/bytecloud.py,sha256=CQNebRy8UlILYmY8XhHhmEfW-WwW7SAlUh387X4OnY8,5646
+dtsdance/dflow.py,sha256=XB6RClJzs9B5fhLofYvb5JazBF-iDfbtv1ETH6ENNUo,7074
+dtsdance/dsyncer.py,sha256=3Oj1Ko5FuB_sUm9Hj-hBy95wee3b6TH2FXKoPFGsakM,11193
+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_bytedts.py,sha256=83lUU9sFPsvmZ0zLCGG_V6vMYXePKbEUeG1d6qfkQhE,2575
+dtsdance/tcc_inner.py,sha256=6Tuq_r2nNCK_HC4hqEGh7UVAa8kDtuIcU95WBu4zuFQ,1623
+dtsdance/tcc_open.py,sha256=Qb_ue3xH0CSsoReItdFKuvW7JsDTfFkDNIB_4zjzSQI,6893
+dts_dance-0.2.2.dist-info/METADATA,sha256=ZRzPIxPE0Y4uJRTwBK2_PukFRUBuHb8xkuxQPGQnOjo,793
+dts_dance-0.2.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+dts_dance-0.2.2.dist-info/RECORD,,

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:
         """
         获取指定环境的信息
 

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"
 
         # 构建请求数据

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"
 
         # 准备请求头

dtsdance/{spacex.py → 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))

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.dist-info/RECORD

@@ -1,14 +0,0 @@
-dtsdance/__init__.py,sha256=Yl_jEZ5weYfcrklnDvwB4wSgCOvMBLRRgWx0gHs3qfM,49
-dtsdance/bytecloud.py,sha256=SN82KIYAfq16s06-HUoj37PbgSbUa7MoFFcah2kaXOk,5213
-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=eYPx3-VKgPK6-IO8-HPuX0-mxsM6kt1HMZqyDA_KPbw,2340
-dtsdance/tcc_inner.py,sha256=xy3N1N3BNl1oc2oMNHKhnsj47rAKOOJ-aXw8GtA2De8,1621
-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,,