deepfos 1.1.80__tar.gz → 1.1.82__tar.gz

{deepfos-1.1.80 → deepfos-1.1.82}/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.1.82] - 2026-02-04
+
+### 更新
+
+* deepmodel.client开放部分api（数据流内部使用）
+
+
+## [1.1.81] - 2026-01-22
+
+### 更新
+
+* 兼容internal_token相关功能
+* 修复k8s服务发现可能绑定已关闭的eventloop的问题
+
 ## [1.1.80] - 2026-01-14
 
 ### 更新

{deepfos-1.1.80 → deepfos-1.1.82}/PKG-INFO

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

{deepfos-1.1.80 → deepfos-1.1.82}/deepfos/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2026-01-14T10:28:13+0000",
+ "date": "2026-02-04T10:59:10+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "1019f357203aa3e5a0453b8ef6ff017aea04d148",
- "version": "1.1.80"
+ "full-revisionid": "9a552677df0371195b48da76355f96583fd534db",
+ "version": "1.1.82"
 }
 '''  # END VERSION_JSON
 

{deepfos-1.1.80 → deepfos-1.1.82}/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.80 → deepfos-1.1.82}/deepfos/db/edb.py

@@ -54,7 +54,7 @@ def normalize_kw(query: str, kw: Dict):
 
 
 class _AsyncEdgeDBConnection(AsyncIOConnection):
-    async def raw_query(self, query_context, capabilities=enums.Capability.NONE):
+    async def raw_query(self, query_context, capabilities=enums.Capability.NONE, raw_type: bool = False):
         if self.is_closed():
             await self.connect()
 
@@ -99,13 +99,17 @@ class _AsyncEdgeDBConnection(AsyncIOConnection):
                 )
                 if codecs is not None:
                     out_dc = codecs[2]
-                    frame_desc = collect_output_frame(out_dc.make_type(
+                    type_desc = out_dc.make_type(
                         DescribeContext(
                             query='',
                             state=query_context.state,
                             inject_type_names=False
                         )
-                    ))
+                    )
+                    if raw_type:
+                        frame_desc = type_desc
+                    else:
+                        frame_desc = collect_output_frame(type_desc)
                 else:
                     frame_desc = None
                 return frame_desc, result
@@ -148,6 +152,20 @@ class _AsyncIOIteration(AsyncIOIteration):
                 query_context, enums.Capability.MODIFICATIONS
             )
 
+    async def query_with_raw_type(self, query: str, *args, **kwargs) -> list:
+        with self._exclusive():
+            await self._ensure_transaction()
+            return await self._connection.raw_query(
+                QueryContext(
+                    query=QueryWithArgs(query, args, kwargs),
+                    cache=self._get_query_cache(),
+                    query_options=_query_opts,
+                    retry_options=self._get_retry_options(),
+                    state=self._get_state(),
+                ),
+                raw_type=True,
+            )
+
     async def execute(self, commands: str, *args, **kwargs):
         return await self._execute(QueryContext(
             query=QueryWithArgs(commands, args, kwargs),
@@ -176,6 +194,20 @@ class _AsyncIOClient(AsyncIOClient):
     def transaction(self) -> _AsyncIORetry:
         return _AsyncIORetry(self)
 
+    async def query_with_raw_type(self, query: str, *args, **kwargs) -> list:
+        con = await self._impl.acquire()
+        try:
+            query_context = QueryContext(
+                query=QueryWithArgs(query, args, kwargs),
+                cache=self._get_query_cache(),
+                query_options=_query_opts,
+                retry_options=self._get_retry_options(),
+                state=self._get_state(),
+            )
+            return await con.raw_query(query_context, raw_type=True)
+        finally:
+            await self._impl.release(con)
+
 
 # All deprecated space in v3dev & v3test & alpha
 deprecated_space = [

{deepfos-1.1.80 → deepfos-1.1.82}/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.80 → deepfos-1.1.82}/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.80 → deepfos-1.1.82}/deepfos/lib/serutils.py

@@ -5,7 +5,7 @@ import decimal
 import functools
 import json
 import uuid
-from dataclasses import dataclass
+from dataclasses import dataclass, replace
 from typing import Any, Dict, Union, List
 
 import edgedb
@@ -17,10 +17,15 @@ from edgedb.datatypes import datatypes
 class Context:
     frame_desc: Any = None
     query_df: bool = False
+    uuid_as_str: bool = False
+    unnamedtuple_as_dict: bool = False
+
+
+DEFAULT_CONTEXT = Context()
 
 
 @functools.singledispatch
-def serialize(o, ctx: Context = Context()):
+def serialize(o, ctx: Context = DEFAULT_CONTEXT):
     raise TypeError(f'无法序列化类型: {type(o)}')
 
 
@@ -93,32 +98,36 @@ def to_scalar(o, field_info: Union[Dict, List[str], str] = None):
 
 
 @serialize.register
-def _tuple(o: edgedb.Tuple, ctx: Context = Context()):
+def _tuple(o: edgedb.Tuple, ctx: Context = DEFAULT_CONTEXT):
     if ctx.frame_desc is None:
-        return tuple(serialize(el) for el in o)
-    return tuple(
-        serialize(el, Context(frame_desc=ctx.frame_desc[idx])) 
-        for idx, el in enumerate(o)
-    )
-
+        tup = tuple(serialize(el, ctx) for el in o)
+    else:
+        tup = tuple(
+            serialize(el, replace(ctx, frame_desc=ctx.frame_desc[idx]))
+            for idx, el in enumerate(o)
+        )
+    if ctx.unnamedtuple_as_dict:
+        return dict(zip(map(str, range(len(tup))), tup))
+    else:
+        return tup
 
 @serialize.register
-def _namedtuple(o: edgedb.NamedTuple, ctx: Context = Context()):
+def _namedtuple(o: edgedb.NamedTuple, ctx: Context = DEFAULT_CONTEXT):
     if ctx.frame_desc is None:
-        return {attr: serialize(getattr(o, attr)) for attr in dir(o)}
+        return {attr: serialize(getattr(o, attr), ctx) for attr in dir(o)}
     return {
-        attr: serialize(getattr(o, attr), Context(frame_desc=ctx.frame_desc[attr]))
+        attr: serialize(getattr(o, attr), replace(ctx, frame_desc=ctx.frame_desc[attr]))
         for attr in ctx.frame_desc
     }
 
 
 @serialize.register
-def _linkset(o: edgedb.LinkSet, ctx: Context = Context()):
+def _linkset(o: edgedb.LinkSet, ctx: Context = DEFAULT_CONTEXT):
     return [serialize(el, ctx) for el in o]
 
 
 @serialize.register
-def _link(o: edgedb.Link, ctx: Context = Context()):
+def _link(o: edgedb.Link, ctx: Context = DEFAULT_CONTEXT):
     ret = {}
     if ctx.frame_desc is None:
         for lprop in dir(o):
@@ -131,7 +140,7 @@ def _link(o: edgedb.Link, ctx: Context = Context()):
 
     lprops = list(map(lambda x: f'@{x}', (set(dir(o)) - {'source', 'target'})))
     for field in ctx.frame_desc:
-        new_ctx = Context(frame_desc=ctx.frame_desc[field])
+        new_ctx = replace(ctx, frame_desc=ctx.frame_desc[field])
         if field in lprops:
             ret[field] = serialize(getattr(o, field[1:]), new_ctx)
         else:
@@ -144,7 +153,7 @@ def ignore_implicited_fields(o: edgedb.Object):
 
 
 @serialize.register
-def _object(o: edgedb.Object, ctx: Context = Context()):
+def _object(o: edgedb.Object, ctx: Context = DEFAULT_CONTEXT):
     ret = {}
 
     if ctx.frame_desc is None:
@@ -156,7 +165,7 @@ def _object(o: edgedb.Object, ctx: Context = Context()):
             try:
                 ret[attr] = serialize(o[attr])
             except (KeyError, TypeError):
-                ret[attr] = serialize(getattr(o, attr))
+                ret[attr] = serialize(getattr(o, attr), ctx)
         return ret
 
     ensure_one_field = ctx.query_df and len(ctx.frame_desc) == 1
@@ -168,17 +177,18 @@ def _object(o: edgedb.Object, ctx: Context = Context()):
                 ctx.frame_desc[key[0]] = maybe_drop
 
     for attr in ctx.frame_desc:
+        new_ctx = replace(ctx, frame_desc=ctx.frame_desc[attr])
         try:
-            ret[attr] = serialize(o[attr], Context(frame_desc=ctx.frame_desc[attr]))
+            ret[attr] = serialize(o[attr], new_ctx)
         except (KeyError, TypeError):
-            ret[attr] = serialize(getattr(o, attr), Context(frame_desc=ctx.frame_desc[attr]))
+            ret[attr] = serialize(getattr(o, attr), new_ctx)
 
     return ret
 
 
 @serialize.register(edgedb.Set)
 @serialize.register(edgedb.Array)
-def _set(o, ctx: Context = Context()):
+def _set(o, ctx: Context = DEFAULT_CONTEXT):
     return [serialize(el, ctx) for el in o]
 
 
@@ -193,14 +203,20 @@ def _set(o, ctx: Context = Context()):
 @serialize.register(datetime.datetime)
 @serialize.register(datetime.time)
 @serialize.register(edgedb.RelativeDuration)
-@serialize.register(uuid.UUID)
 @serialize.register(decimal.Decimal)
-def _scalar(o, ctx: Context = Context()):
+def _scalar(o, ctx: Context = DEFAULT_CONTEXT):
     if ctx.frame_desc == 'std::json' and isinstance(o, str):
         return json.loads(o)
     return o
 
 
+@serialize.register(uuid.UUID)
+def _scalar(o: uuid.UUID, ctx: Context = DEFAULT_CONTEXT):
+    if ctx.uuid_as_str:
+        return str(o)
+    return o
+
+
 @serialize.register
-def _enum(o: edgedb.EnumValue, ctx: Context = Context()):
+def _enum(o: edgedb.EnumValue, ctx: Context = DEFAULT_CONTEXT):
     return str(o)

{deepfos-1.1.80 → deepfos-1.1.82}/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.80 → deepfos-1.1.82}/deepfos.egg-info/PKG-INFO

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