deepfos 1.1.77__tar.gz → 1.1.78__tar.gz

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

@@ -1,3 +1,10 @@
+## [1.1.78] - 2025-12-11
+
+### 更新
+
+* api base实现方式改进
+* 修复deepmodel无法insert必填多选链接的bug
+
 ## [1.1.77] - 2025-12-05
 
 ### 新增

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deepfos
-Version: 1.1.77
+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.77 → deepfos-1.1.78}/deepfos/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-12-05T02:41:19+0000",
+ "date": "2025-12-22T07:20:38+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "bd3d3dac6c3b6e4d9a695174c9064820da0912b6",
- "version": "1.1.77"
+ "full-revisionid": "1a939ca4b6be850040e0d9076eaf235608eebb23",
+ "version": "1.1.78"
 }
 '''  # END VERSION_JSON
 

{deepfos-1.1.77 → 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
 
+    # backward compatibility
+    set_url = set_server_name
 
-class ADynamicAPIBase(AsyncAPIBase, _DynamicAPIMixin):
+
+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:
@@ -860,17 +855,7 @@ class RootAPI:
 
         """
         clz = cls.resolve_cls(sync, SyncAPIBase, AsyncAPIBase)
-        if (
-            OPTION.discovery.enabled
-            and OPTION.discovery.take_over
-            and cls.server_name is not None
-        ):
-            discovery = ServiceDiscovery.instantiate()
-            prefix = discovery.sync_get_url(cls.server_name)
-        else:
-            prefix = cls.prefix()
-
-        ins = clz(header=header, prefix=prefix)
+        ins = clz(header=header, prefix=cls.prefix())
         ins.sync = sync
         ins.multi_version = cls.multi_version
         ins.default_version = cls.default_version
@@ -892,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.77 → 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.77 → deepfos-1.1.78}/deepfos.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deepfos
-Version: 1.1.77
+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.77 → 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=[]
 )