deepfos 1.1.79__tar.gz → 1.1.81__tar.gz

{deepfos-1.1.79 → deepfos-1.1.81}/CHANGELOG.md

@@ -1,3 +1,16 @@
+## [1.1.81] - 2026-01-22
+
+### 更新
+
+* 兼容internal_token相关功能
+* 修复k8s服务发现可能绑定已关闭的eventloop的问题
+
+## [1.1.80] - 2026-01-14
+
+### 更新
+
+* 修复DeepConnectorAPI/TaskAPI在take_over=True情况下不可用的bug
+
 ## [1.1.79] - 2026-01-12
 
 ### 更新

{deepfos-1.1.79 → deepfos-1.1.81}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deepfos
-Version: 1.1.79
+Version: 1.1.81
 Summary: Collecions of useful and handy tools for deepfos platform
 Home-page: http://py.deepfos.com
 Author: deepfos-python-team

{deepfos-1.1.79 → deepfos-1.1.81}/deepfos/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2026-01-13T06:00:21+0000",
+ "date": "2026-01-22T08:33:03+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "d049dc802ae4862dbe78beae839ba023357d5e14",
- "version": "1.1.79"
+ "full-revisionid": "aa7164c60be8e0acdde1a4db53fc101402d4983a",
+ "version": "1.1.81"
 }
 '''  # END VERSION_JSON
 

{deepfos-1.1.79 → deepfos-1.1.81}/deepfos/api/base.py

@@ -23,7 +23,7 @@ from deepfos.lib.httpcli import AioHttpCli
 from deepfos.lib.utils import concat_url, retry, to_version_tuple, repr_version, trim_text
 from deepfos.lib.asynchronous import evloop
 from deepfos.lib.discovery import ServiceDiscovery
-from deepfos.lib.constant import UNSET, RE_SYS_SERVER_PARSER
+from deepfos.lib.constant import UNSET, RE_SYS_SERVER_PARSER, INTERNAL_TOKEN_HEADER
 from deepfos.options import OPTION
 from deepfos.exceptions import APIResponseError, APIRequestError
 
@@ -376,6 +376,9 @@ class Route:
                 else:
                     header = CaseInsensitiveDict(ins.header, **ext_header)
 
+                if internal_token := OPTION.general.internal_token:
+                    header[INTERNAL_TOKEN_HEADER] = internal_token
+
                 if use_cache:
                     if ((req_key := hash(req)), raw_result) in api_cache:
                         return api_cache[(req_key, raw_result)]

{deepfos-1.1.79 → deepfos-1.1.81}/deepfos/api/deepconnector.py

@@ -27,6 +27,7 @@ class DataSourceAPI(ChildAPI):
 class DeepConnectorAPI(RootAPI):
     """连接器组件接口"""
     prefix = lambda: 'http://deep-connector-server'
+    server_name = 'deep-connector-server'
     url_need_format = True
     module_type = 'CONN'
 

{deepfos-1.1.79 → deepfos-1.1.81}/deepfos/api/deepfos_task.py

@@ -74,6 +74,7 @@ class Job(ChildAPI):
 class TaskAPI(RootAPI):
     """任务管理接口"""
     prefix = lambda: OPTION.server.deepfos_task
+    server_name = 'deep-task-server'
 
     @cached_property
     def task_instance(self) -> TaskInstance:

{deepfos-1.1.79 → deepfos-1.1.81}/deepfos/lib/constant.py

@@ -37,3 +37,7 @@ RE_SYS_SERVER_PARSER = re.compile('^(?:https?://)?([a-z-]+-server)$', re.IGNOREC
 DECIMAL_COL = 'decimal_val'
 STRING_COL = 'string_val'
 INDEX_FIELD = 'index'
+
+# -----------------------------------------------------------------------------
+# Internal service token header
+INTERNAL_TOKEN_HEADER = "X-deepfos-internal-key"

{deepfos-1.1.79 → deepfos-1.1.81}/deepfos/lib/k8s.py

@@ -1,4 +1,5 @@
 import asyncio
+import contextlib
 from collections import defaultdict
 from functools import cached_property
 from typing import TypedDict, Literal, Type, Dict, FrozenSet
@@ -11,6 +12,7 @@ from kubernetes_asyncio.client import (
     V1EndpointSubset,
     V1EndpointAddress,
     CoreV1EndpointPort,
+    ApiClient,
 )
 from deepfos.lib.discovery import ServiceDiscovery
 from deepfos import OPTION
@@ -31,13 +33,14 @@ class K8sCli(ServiceDiscovery):
 
     async def on_startup(self):
         config.load_incluster_config()
-
-    @cached_property
-    def _api(self):
         c = client.Configuration.get_default_copy()
         c.verify_ssl = False
         client.Configuration.set_default(c)
-        return client.CoreV1Api()
+
+    @contextlib.asynccontextmanager
+    async def _acquire_api(self) -> client.CoreV1Api:
+        async with ApiClient() as cli:
+            yield client.CoreV1Api(cli)
 
     async def on_interval(self):
         await self._update_cache()
@@ -58,9 +61,9 @@ class K8sCli(ServiceDiscovery):
         self._cares.add(server_name)
         await self.update_instance_for_service(server_name)
 
-
     async def _list_all_service_names(self) -> FrozenSet[str]:
-        svcs: V1ServiceList = await self._api.list_namespaced_service(self._ns)
+        async with self._acquire_api() as api:
+            svcs: V1ServiceList = await api.list_namespaced_service(self._ns)
         return frozenset(svc.metadata.name for svc in svcs.items)
 
     async def update_services(self):
@@ -79,10 +82,11 @@ class K8sCli(ServiceDiscovery):
             logger.debug(f"Removed servieces: {removed}")
 
     async def update_instance_for_service(self, server_name: str):
-        endpoints: V1Endpoints = await self._api.read_namespaced_endpoints(
-            server_name,
-            self._ns,
-        )
+        async with self._acquire_api() as api:
+            endpoints: V1Endpoints = await api.read_namespaced_endpoints(
+                server_name,
+                self._ns,
+            )
 
         no_active_nodes = True
         async with self._instance_lock[server_name]:

{deepfos-1.1.79 → deepfos-1.1.81}/deepfos/options.py

@@ -432,6 +432,7 @@ class _General(_Category):
     socket_name = _Option(None, val_type=str)
     preserve_concurrency = _Option(1, val_type=int)
     response_display_length_on_error = _Option(20000, val_type=int)
+    internal_token = _Option(None, val_type=str)
 
     def __get__(self, instance, owner) -> '_General':
         """defined to help ide"""

{deepfos-1.1.79 → deepfos-1.1.81}/deepfos.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deepfos
-Version: 1.1.79
+Version: 1.1.81
 Summary: Collecions of useful and handy tools for deepfos platform
 Home-page: http://py.deepfos.com
 Author: deepfos-python-team