deepfos 1.1.76__tar.gz → 1.1.78__tar.gz

{deepfos-1.1.76 → deepfos-1.1.78}/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [1.1.78] - 2025-12-11
+
+### 更新
+
+* api base实现方式改进
+* 修复deepmodel无法insert必填多选链接的bug
+
+## [1.1.77] - 2025-12-05
+
+### 新增
+
+* 支持k8s作为服务发现
+* 支持RootAPI从服务发现中获取url
+
+
 ## [1.1.76] - 2025-11-06
 
 ### 更新

{deepfos-1.1.76 → deepfos-1.1.78}/PKG-INFO

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

{deepfos-1.1.76 → deepfos-1.1.78}/deepfos/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-11-06T08:50:17+0000",
+ "date": "2025-12-22T07:20:38+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "1f02db295b03468baac5e6df6dfd160ee0eba4a2",
- "version": "1.1.76"
+ "full-revisionid": "1a939ca4b6be850040e0d9076eaf235608eebb23",
+ "version": "1.1.78"
 }
 '''  # END VERSION_JSON
 

{deepfos-1.1.76 → deepfos-1.1.78}/deepfos/api/account.py

@@ -120,6 +120,7 @@ class UserImport(ChildAPI):
 class AccountAPI(RootAPI):
     """账户中心"""
     prefix = lambda: OPTION.server.account
+    server_name = "seepln-account"
 
     def __init__(self, *args, **kwargs):
         super(self.__class__.__base__, self).__init__(*args, **kwargs)

{deepfos-1.1.76 → deepfos-1.1.78}/deepfos/api/app.py

@@ -580,6 +580,7 @@ class PermissionAPI(ChildAPI):
 class AppAPI(RootAPI):
     """应用服务接口"""
     prefix = lambda: OPTION.server.app
+    server_name = "app-server"
 
     @cached_property
     def element_info(self) -> AppElementInfoAPI:

{deepfos-1.1.76 → deepfos-1.1.78}/deepfos/api/base.py

@@ -1,7 +1,6 @@
 import enum
 import json
 import re
-import weakref
 from importlib import import_module
 from shlex import quote
 from typing import (
@@ -366,7 +365,8 @@ class Route:
 
                 # ---------------------------------------------------------------------
                 # get request info
-                req = RequestInfo(url=concat_url(ins.base_url, endpoint), method=method)
+                base_url = await ins.get_base_url()
+                req = RequestInfo(url=concat_url(base_url, endpoint), method=method)
                 req.update_default(func(ins, *args, **kwargs))
                 url, body, ext_header = req.url, req.body, req.header
                 raw_result = model is None
@@ -533,6 +533,7 @@ post = DummyDeco(method='post')
 
 class APIBase:
     endpoint = '/'
+    server_name: str = None
 
     def __init__(
         self,
@@ -553,14 +554,27 @@ class APIBase:
         else:
             self.header = header
 
-        if mat := RE_SYS_SERVER_PARSER.match(prefix):
-            self.base_url = concat_url(OPTION.server.base, mat.group(1), self.endpoint)
-        else:
-            self.base_url = concat_url(prefix, self.endpoint)
+        self.prefix = prefix
         self.header.update({
             "Content-Type": "application/json;charset=UTF8",
             "Connection": "close",
         })
+        self.base_url = None
+
+    async def get_base_url(self):
+        if self.base_url is None:
+            if (
+                OPTION.discovery.enabled
+                and OPTION.discovery.take_over
+                and self.server_name is not None
+            ):
+                discovery = ServiceDiscovery.instantiate()
+                self.base_url = await discovery.get_url(self.server_name)
+            elif mat := RE_SYS_SERVER_PARSER.match(self.prefix):
+                self.base_url = concat_url(OPTION.server.base, mat.group(1))
+            else:
+                self.base_url = self.prefix
+        return self.base_url
 
 
 class APIMeta(type):
@@ -596,9 +610,11 @@ class SyncAPIBase(APIBase, metaclass=APIMeta):
 
 # noinspection PyUnresolvedReferences
 class _DynamicAPIMixin:
+    module_id: str
     server_cache = TTLCache(maxsize=128, ttl=3600)
     module_type: str = UNSET
-    server_known = False
+    server_name: str = None
+    base_url: str = None
     version = None
 
     def get_module_id(self, version: Union[float, str], module_id: str):
@@ -619,16 +635,30 @@ class _DynamicAPIMixin:
         self.server_cache[self.module_id] = server_name
         return server_name
 
-    def get_server_name(self):
-        return NotImplemented
-
-    # noinspection PyAttributeOutsideInit
-    def set_url(self, server_name):
-        self.base_url = concat_url(OPTION.server.base, server_name, self.base_url)
-        self.server_known = True
+    async def get_server_name(self):
+        if self.server_name is None:
+            if self.module_id in self.server_cache:
+                self.server_name = self.server_cache[self.module_id]
+            else:
+                from .space import SpaceAPI
+                api = SpaceAPI(self.header, sync=False)
+                server_meta = await api.module.detail(self.module_id)  # noqa
+                self.server_name = self._add_to_memo(server_meta)
+        return self.server_name
+
+    async def get_base_url(self):
+        if self.base_url is None:
+            server_name = await self.get_server_name()
+            if OPTION.discovery.enabled:  # pragma: no cover
+                discovery = ServiceDiscovery.instantiate()
+                base_url = await discovery.get_url(server_name)
+                self.base_url = concat_url(base_url)
+            else:
+                self.base_url = concat_url(OPTION.server.base, server_name)
+        return self.base_url
 
 
-class DynamicAPIBase(SyncAPIBase, _DynamicAPIMixin):
+class DynamicAPIBase(_DynamicAPIMixin, SyncAPIBase):
     def __init__(
         self,
         version: Union[float, str] = None,
@@ -637,33 +667,16 @@ class DynamicAPIBase(SyncAPIBase, _DynamicAPIMixin):
         lazy: bool = False
     ):
         super().__init__(header)
-        self.module_id = module_id = self.get_module_id(version, module_id)
-        # lazy = True means called from element/base, will be set url in ElementBase
-        if module_id is not None and not lazy:
-            if module_id in self.server_cache:
-                logger.debug(f'Find server name for module: {module_id} from cache.')
-                server_name = self.server_cache[module_id]
-            else:
-                server_name = self.get_server_name()
-            self.set_url(server_name)
-
-    def get_server_name(self):
-        from .space import SpaceAPI
-        api = SpaceAPI(self.header, sync=True)
-        server_meta = api.module.detail(self.module_id)
-        return self._add_to_memo(server_meta)
-
-    def set_url(self, server_name):
-        if OPTION.discovery.enabled:  # pragma: no cover
-            discovery = ServiceDiscovery.instantiate()
-            base_url = discovery.sync_get_url(server_name)
-            self.base_url = concat_url(base_url, self.endpoint)
-            self.server_known = True
-        else:
-            super().set_url(server_name)
+        self.module_id = self.get_module_id(version, module_id)
 
+    def set_server_name(self, server_name):
+        self.server_name = server_name
 
-class ADynamicAPIBase(AsyncAPIBase, _DynamicAPIMixin):
+    # backward compatibility
+    set_url = set_server_name
+
+
+class ADynamicAPIBase(_DynamicAPIMixin, AsyncAPIBase):
     def __init__(
         self,
         version: Union[float, str] = None,
@@ -678,32 +691,14 @@ class ADynamicAPIBase(AsyncAPIBase, _DynamicAPIMixin):
     def __await__(self):
         return self.init().__await__()
 
-    async def get_server_name(self):
-        from .space import SpaceAPI
-        api = SpaceAPI(self.header, sync=False)
-        server_meta = await api.module.detail(self.module_id)  # noqa
-        return self._add_to_memo(server_meta)
-
     async def init(self):
-        if self.module_id is None:
-            return self
-        # lazy = True means called from element/base, will be set url in ElementBase
-        if not self.lazy:
-            if self.module_id in self.server_cache:
-                server_name = self.server_cache[self.module_id]
-            else:
-                server_name = await self.get_server_name()
-            await self.set_url(server_name)
         return self
 
-    async def set_url(self, server_name):
-        if OPTION.discovery.enabled:  # pragma: no cover
-            discovery = ServiceDiscovery.instantiate()
-            base_url = await discovery.get_url(server_name)
-            self.base_url = concat_url(base_url, self.endpoint)
-            self.server_known = True
-        else:
-            super().set_url(server_name)
+    async def set_server_name(self, server_name):
+        self.server_name = server_name
+
+    # backward compatibility
+    set_url = set_server_name
 
 
 class RootAPI:
@@ -722,6 +717,7 @@ class RootAPI:
     api_version = None
     cls_name = None
     module_name = None
+    server_name = None
     builtin = True
 
     if TYPE_CHECKING:  # pragma: no cover
@@ -881,17 +877,19 @@ class ChildAPI(RootAPI):
     def __new__(cls, root: RootAPI):
         clz = cls.resolve_cls(
             root.sync, (SyncAPIBase, _ChildAPI), (AsyncAPIBase, _ChildAPI),
-            extra={'root': cls.root}
+            extra={'get_base_url': cls.get_base_url}
         )
-        ins = clz(header=root.header, prefix=root.base_url)
+        ins = clz(header=root.header, prefix=root.prefix)
         if root.url_need_format:
-            ins.base_url = ins.base_url.format(**root.header)
-        ins.__root = weakref.ref(root)
+            ins.endpoint = ins.endpoint.format(**root.header)
+        ins.root = root
         return ins
 
-    @property
-    def root(self):
-        return self.__root()
+    async def get_base_url(self):
+        if self.base_url is None:
+            base_url = await self.root.get_base_url()
+            self.base_url = concat_url(base_url, self.endpoint)
+        return self.base_url
 
 
 class DynamicRootAPI(RootAPI):

{deepfos-1.1.76 → deepfos-1.1.78}/deepfos/api/platform.py

@@ -175,6 +175,7 @@ class FilePyAPI(ChildAPI):
 class PlatformAPI(RootAPI):
     """文件上传服务接口"""
     prefix = lambda: OPTION.server.platform_file
+    server_name = "platform-file-server"
 
     @cached_property
     def file(self) -> StdFileAPI:

{deepfos-1.1.76 → deepfos-1.1.78}/deepfos/api/space.py

@@ -522,6 +522,7 @@ class SpaceInternalAPI(ChildAPI):
 class SpaceAPI(RootAPI):
     """空间服务接口"""
     prefix = lambda: OPTION.server.space
+    server_name = "space-server"
 
     @cached_property
     def app(self) -> SpaceAppAPI:

{deepfos-1.1.76 → deepfos-1.1.78}/deepfos/api/system.py

@@ -312,6 +312,7 @@ class Space(ChildAPI):
 class SystemAPI(RootAPI):
     """系统服务接口"""
     prefix = lambda: OPTION.server.system
+    server_name = "system-server"
 
     @cached_property
     def data_source(self) -> SysDataSourceAPI:

{deepfos-1.1.76 → deepfos-1.1.78}/deepfos/element/deepmodel.py

@@ -1249,7 +1249,7 @@ class AsyncDeepModel(ElementBase[DeepModelAPI]):
                 lambda f: f.name,
                 filter(lambda f: f.required, structure.fields.values())
             ))
-            if missing_fields := (required_fields - set(data.columns)):
+            if missing_fields := (required_fields - set(data.columns).union(relation)):
                 raise RequiredFieldUnfilled(f'缺少必填字段: {missing_fields}')
 
         if not relation:
@@ -1449,9 +1449,9 @@ class AsyncDeepModel(ElementBase[DeepModelAPI]):
             raise ExternalObjectReadOnly('外部对象只可读')
 
         structure = ObjectStructure(name=obj.name, structure=obj.fields.values())
+        relation = relation or {}
         self._valid_data(data, object_name, relation, structure, check_required=insert)
 
-        relation = relation or {}
         bkey = await self._get_bkey(obj)
         if bkey not in data.columns:
             raise RequiredFieldUnfilled(f'缺少业务主键[{bkey}]')

{deepfos-1.1.76 → deepfos-1.1.78}/deepfos/lib/discovery.py

@@ -256,6 +256,9 @@ class ServiceDiscovery(ABC):
             elif impl == 'nacos':
                 from deepfos.lib.nacos import Nacos
                 cls.__ins__[impl] = Nacos
+            elif impl == 'k8s':
+                from deepfos.lib.k8s import K8s
+                cls.__ins__[impl] = K8s
 
         return cls.__ins__[impl]
 

deepfos-1.1.78/deepfos/lib/k8s.py

@@ -0,0 +1,101 @@
+import asyncio
+from collections import defaultdict
+from functools import cached_property
+from typing import TypedDict, Literal, Type, Dict, FrozenSet
+
+from loguru import logger
+from kubernetes_asyncio import client, config
+from kubernetes_asyncio.client import (
+    V1ServiceList,
+    V1Endpoints,
+    V1EndpointSubset,
+    V1EndpointAddress,
+    CoreV1EndpointPort,
+)
+from deepfos.lib.discovery import ServiceDiscovery
+from deepfos import OPTION
+
+
+class K8s(ServiceDiscovery):
+    def __init__(self):
+        super().__init__()
+        self._instance_lock: Dict[str, asyncio.Lock] = defaultdict(asyncio.Lock)
+        self._server_lock = asyncio.Lock()
+        self._cares = set()
+        self._ns = OPTION.k8s.namespace
+
+    async def on_close(self):
+        self._cares.clear()
+        self.server_cache.clear()
+        self._instance_lock.clear()
+
+    async def on_startup(self):
+        config.load_incluster_config()
+
+    @cached_property
+    def _api(self):
+        return client.CoreV1Api()
+
+    async def on_interval(self):
+        await self._update_cache()
+
+    async def _update_cache(self):
+        logger.opt(lazy=True).debug(f"Update cache for instance: {self._cares}")
+        await asyncio.gather(*(
+            self.update_instance_for_service(sn)
+            for sn in self._cares
+        ))
+
+    async def update_service_cache(self, server_name: str):
+        async with self._server_lock:
+            if server_name not in self.server_cache:
+                await self.update_services()
+
+    async def update_instance_cache(self, server_name):
+        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)
+        return frozenset(svc.metadata.name for svc in svcs.items)
+
+    async def update_services(self):
+        new_services = await self._list_all_service_names()
+        cur_services = frozenset(self.server_cache.keys())
+
+        if added := new_services - cur_services:
+            for srv in added:
+                self.server_cache.__getitem__(srv)
+            logger.debug(f"Added services: {added}")
+
+        if removed := cur_services - new_services:
+            for srv in removed:
+                self.server_cache.pop(srv)
+                self._instance_lock.pop(srv, None)  # noqa
+            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,
+        )
+
+        no_active_nodes = True
+        async with self._instance_lock[server_name]:
+            cache = self.server_cache[server_name]
+
+            for subset in endpoints.subsets or []:
+                subset: V1EndpointSubset
+                for addr in subset.addresses or []:
+                    addr: V1EndpointAddress
+                    no_active_nodes = False
+                    for port in subset.ports:
+                        port: CoreV1EndpointPort
+                        url = f"{port.name}://{addr.ip}:{port.port}"
+                        cache.add(url)
+
+            if no_active_nodes:
+                logger.debug(f"{server_name} has no active endpoint, clear invalid...")
+                for item in list(cache):
+                    cache.delete(item)

{deepfos-1.1.76 → deepfos-1.1.78}/deepfos/options.py

@@ -115,7 +115,8 @@ def _ensure_discovery_server_is_set(value):
     impl = OPTION.discovery.implementation
     server_opt = {
         'eureka': OPTION.server.eureka,
-        'nacos': OPTION.nacos.server
+        'nacos': OPTION.nacos.server,
+        'k8s': OPTION.k8s.namespace,
     }[impl]
 
     if server_opt is None:
@@ -379,9 +380,9 @@ class _Category:
 class _Server(_Category):
     __id__ = 'server_url'
 
-    base = _Option('http://', val_type=str)
+    base = _Option('http://web-gateway', val_type=str)
     app = _Option('http://app-server', val_type=str)
-    account = _Option('http://account-server', val_type=str)
+    account = _Option('http://seepln-account', val_type=str)
     system = _Option('http://system-server', val_type=str)
     space = _Option('http://space-server', val_type=str)
     platform_file = _Option('http://platform-file-server', val_type=str)
@@ -484,16 +485,18 @@ class _Boost(_Category):
 class _ServiceDiscovery(_Category):
     __id__ = 'service_discovery'
 
-    #: 是否使用服务发现功能
+    #: 是否使用服务发现功能（仅影响DynamicAPI）
     enabled = _Option(False, val_type=bool, on_set=_ensure_discovery_server_is_set)
     #: 服务注册发现使用的实现
-    implementation = _Option('eureka', val_type=str, val_choices=('eureka', 'nacos'))
+    implementation = _Option('eureka', val_type=str, val_choices=('eureka', 'nacos', 'k8s'))
     #: 服务注册发现使用的缓存策略
     cache_strategy = _Option(
         'ranked',
         val_type=str,
         val_choices=('ranked', 'roundrobin', 'random')
     )
+    #: 是否完全使用服务发现获取请求地址（包括Root API）
+    take_over = _Option(False, val_type=bool)
 
     def __get__(self, instance, owner) -> '_ServiceDiscovery':
         """defined to help ide"""
@@ -513,6 +516,16 @@ class _Nacos(_Category):
         return super().__get__(instance, owner)
 
 
+class _Kubernets(_Category):
+    """Nacos 相关配置"""
+
+    namespace = _Option(None, val_type=str)
+
+    def __get__(self, instance, owner) -> '_Kubernets':
+        """defined to help ide"""
+        return super().__get__(instance, owner)
+
+
 # -----------------------------------------------------------------------------
 # Options
 class _GlobalOptions:
@@ -525,6 +538,7 @@ class _GlobalOptions:
     discovery = _ServiceDiscovery()
     nacos = _Nacos()
     edgedb = _Edgedb()
+    k8s = _Kubernets()
 
     def load_file(self, filepath):
         parser = configparser.ConfigParser()

{deepfos-1.1.76 → deepfos-1.1.78}/deepfos.egg-info/PKG-INFO

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

{deepfos-1.1.76 → deepfos-1.1.78}/deepfos.egg-info/SOURCES.txt

@@ -167,6 +167,7 @@ versioneer.py
 ./deepfos/lib/filterparser.py
 ./deepfos/lib/httpcli.py
 ./deepfos/lib/jsonstreamer.py
+./deepfos/lib/k8s.py
 ./deepfos/lib/msg.py
 ./deepfos/lib/nacos.py
 ./deepfos/lib/patch.py
@@ -348,6 +349,7 @@ deepfos/lib/eureka.py
 deepfos/lib/filterparser.py
 deepfos/lib/httpcli.py
 deepfos/lib/jsonstreamer.py
+deepfos/lib/k8s.py
 deepfos/lib/msg.py
 deepfos/lib/nacos.py
 deepfos/lib/patch.py

{deepfos-1.1.76 → deepfos-1.1.78}/setup.py

@@ -54,5 +54,5 @@ def resolve_extensions():
 setup(
     version=versioneer.get_version(),
     cmdclass=versioneer.get_cmdclass(),
-    ext_modules=resolve_extensions()
+    ext_modules=[]
 )