deepfos 1.1.36__tar.gz → 1.1.37__tar.gz

{deepfos-1.1.36 → deepfos-1.1.37}/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.1.37] - 2024-06-14
+
+### 新增
+
+* DeepModel兼容外部库的直连
+
+### 变更
+
+* 无
+
+### 文档
+
+* 无
+
 ## [1.1.36] - 2024-06-05
 
 ### 新增

{deepfos-1.1.36 → deepfos-1.1.37}/PKG-INFO

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

{deepfos-1.1.36 → deepfos-1.1.37}/deepfos/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-06-13T03:28:47+0000",
+ "date": "2024-06-20T03:28:41+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "c5a5bf3e7fd0a5d6c8596d27d66fa32752792983",
- "version": "1.1.36"
+ "full-revisionid": "7f98da1b818edb559a68f03f99464a02b1af6899",
+ "version": "1.1.37"
 }
 '''  # END VERSION_JSON
 

{deepfos-1.1.36 → deepfos-1.1.37}/deepfos/api/deepmodel.py

@@ -77,6 +77,15 @@ class SeqAPI(ChildAPI):
         """
         return {'param': {'id': id, 'filterValue': filter_value}}
 
+
+class ShardingAPI(ChildAPI):
+    endpoint = '/sharding'
+
+    @get('database')
+    def database(self, ) -> Union[SimpleSpaceConnectionConfig, Awaitable[SimpleSpaceConnectionConfig]]:
+        return {}
+
+
 class DeepQLAPI(ChildAPI):
     endpoint = '/public/deepql/actions'
 
@@ -89,6 +98,14 @@ class DeepQLAPI(ChildAPI):
         return {'body': {'module': module, 'query': query, 'variables': variables}}
 
 
+class ExtraAPI(ChildAPI):
+    endpoint = '/'
+
+    @get('git-version')
+    def version(self, ) -> Union[str, Awaitable[str]]:
+        return {}
+
+
 class DeepModelAPI(DynamicRootAPI, builtin=True):
     module_type = 'DM'
     default_version = (1, 0)
@@ -112,3 +129,11 @@ class DeepModelAPI(DynamicRootAPI, builtin=True):
     @cached_property
     def seq(self) -> SeqAPI:
         return SeqAPI(self)
+
+    @cached_property
+    def sharding(self) -> ShardingAPI:
+        return ShardingAPI(self)
+
+    @cached_property
+    def extra(self) -> ExtraAPI:
+        return ExtraAPI(self)

{deepfos-1.1.36 → deepfos-1.1.37}/deepfos/api/models/deepmodel.py

@@ -19,7 +19,8 @@ __all__ = [
     "RuleErrorMsg",
     "RuleParam",
     "SequenceInstance",
-    "_IndexParam"
+    "_IndexParam",
+    "SimpleSpaceConnectionConfig"
 ]
 
 
@@ -254,5 +255,16 @@ class SequenceInstance(BaseModel):
     sequenceName: Optional[str]
 
 
+class SimpleSpaceConnectionConfig(BaseModel):
+    space: str
+    dbType: Optional[str]
+    dbName: Optional[str]
+    schema_: Optional[str] = Field(alias='schema')
+    edgedbName: str
+    edgedbSchema: Optional[str]
+    createTime: Optional[str]
+    updateTime: Optional[str]
+
+
 ObjectParam.update_forward_refs()
 ObjectLinkParam.update_forward_refs()

{deepfos-1.1.36 → deepfos-1.1.37}/deepfos/db/edb.py

@@ -170,9 +170,10 @@ deprecated_space = [
 ]
 
 
-def create_async_client(default_module=None):
-    space = OPTION.api.header['space']
-    dbname = None if space in deprecated_space else f"deepmodel_space{space}"
+def create_async_client(default_module=None, dbname=None):
+    if dbname is None:
+        space = OPTION.api.header['space']
+        dbname = None if space in deprecated_space else f"deepmodel_space{space}"
     cli = _AsyncIOClient(
         connection_class=_AsyncEdgeDBConnection,
         max_concurrency=None,

{deepfos-1.1.36 → deepfos-1.1.37}/deepfos/element/deepmodel.py

@@ -23,6 +23,7 @@ from deepfos.api.models.deepmodel import (
     ObjectBasicDTO, ObjectParam,
     QueryResultObjectInfo, QueryResult
 )
+from deepfos.cache import SpaceSeperatedLRUCache
 from deepfos.db.edb import create_async_client
 from deepfos.element.base import ElementBase, SyncMeta
 from deepfos.exceptions import (
@@ -32,8 +33,8 @@ from deepfos.exceptions import (
 )
 from deepfos.lib import serutils
 from deepfos.lib.asynchronous import future_property, evloop
-from deepfos.lib.decorator import flagmethod, cached_property
-from deepfos.lib.utils import AliasGenerator
+from deepfos.lib.decorator import flagmethod, cached_property, lru_cache
+from deepfos.lib.utils import AliasGenerator, to_version_tuple
 
 __all__ = ['AsyncDeepModel', 'DeepModel', 'to_fields', 'QueryWithArgs']
 
@@ -737,6 +738,19 @@ class _TxnConfig:
         self.txn_support = False
 
 
+@lru_cache(maxsize=128, cache_factory=SpaceSeperatedLRUCache)
+async def get_element_info():
+    from deepfos.api.space import SpaceAPI
+    from deepfos.api.models.app import ElementRelationInfo
+    from deepfos.exceptions import ElementTypeMissingError
+    modules = await SpaceAPI(sync=False).module.get_usable_module()
+    target_module = ['MAINVIEW', 'DM']
+    for mdl in modules:
+        if mdl.moduleType in target_module and mdl.status == 1:
+            return ElementRelationInfo.construct_from(mdl)
+    raise ElementTypeMissingError('DeepModel组件在空间内不可用')
+
+
 # -----------------------------------------------------------------------------
 # core
 class AsyncDeepModel(ElementBase[DeepModelAPI]):
@@ -753,32 +767,42 @@ class AsyncDeepModel(ElementBase[DeepModelAPI]):
         self.appmodule = f"app{OPTION.api.header['app']}"
         self.spacemodule = f"space{OPTION.api.header['space']}"
         self.direct_access = direct_access
-        if direct_access:
-            self.client = create_async_client(default_module=self.appmodule)
+        self.alias = AliasGenerator()
+        self.pg_dsn = pg_dsn
+
+    @future_property
+    async def client(self):
+        if self.direct_access:
+            api = await self.wait_for('async_api')
+            ver = await api.extra.version()
+            if to_version_tuple(ver, -1) >= (3, 0, 18, 8, 0):
+                db_info = await api.sharding.database()
+                space = OPTION.api.header['space']
+                if db_info.space != space:
+                    raise ValueError(
+                        f'Space id in sharding database info invalid. '
+                        f'Expected space id: {space}, actual: {db_info.space}'
+                    )
+                dbname = db_info.edgedbName
+            else:
+                dbname = None
+            client = create_async_client(
+                default_module=self.appmodule,
+                dbname=dbname
+            )
             if user_id := OPTION.api.header.get('user'):
-                self.client = self.client.with_globals(
+                client = client.with_globals(
                     **{
                         f'{self.spacemodule}::current_user_id':
                         user_id
                     }
                 )
-        else:
-            self.client = None
-        self.alias = AliasGenerator()
-        self.pg_dsn = pg_dsn
+            return client
 
     @future_property
     async def element_info(self):
         """元素信息"""
-        from deepfos.api.space import SpaceAPI
-        from deepfos.api.models.app import ElementRelationInfo
-        from deepfos.exceptions import ElementTypeMissingError
-        modules = await SpaceAPI(sync=False).module.get_usable_module()
-        target_module = ['MAINVIEW', 'DM']
-        for mdl in modules:
-            if mdl.moduleType in target_module and mdl.status == 1:
-                return ElementRelationInfo.construct_from(mdl)
-        raise ElementTypeMissingError('DeepModel组件在空间内不可用')
+        return await get_element_info()
 
     @future_property
     async def async_api(self):

{deepfos-1.1.36 → deepfos-1.1.37}/deepfos/lib/decorator.py

@@ -282,16 +282,28 @@ def lru_cache(maxsize=128, cache_factory=LRUCache):
     cache = Manager.create_cache(cache_factory, maxsize=maxsize)
 
     def deco_fun(func):
-        @functools.wraps(func)
-        def wrapper(*args, **kwargs):
-            key = hashkey(*args, **kwargs)
+        if inspect.iscoroutinefunction(func):
+            @functools.wraps(func)
+            async def wrapper(*args, **kwargs):
+                key = hashkey(*args, **kwargs)
+
+                if key in cache:
+                    return cache[key]
+
+                result = await func(*args, **kwargs)
+                cache[key] = result
+                return result
+        else:
+            @functools.wraps(func)
+            def wrapper(*args, **kwargs):
+                key = hashkey(*args, **kwargs)
 
-            if key in cache:
-                return cache[key]
+                if key in cache:
+                    return cache[key]
 
-            result = func(*args, **kwargs)
-            cache[key] = result
-            return result
+                result = func(*args, **kwargs)
+                cache[key] = result
+                return result
 
         return wrapper
 

{deepfos-1.1.36 → deepfos-1.1.37}/deepfos/lib/utils.py

@@ -903,18 +903,19 @@ def find_str(
             return candidate
 
 
-def to_version_tuple(ver: Union[float, str]):
+def to_version_tuple(ver: Union[float, str], max_split: int = 1):
     """返回版本元组
 
     Args:
         ver: 表示版本的字符串或数字，例如'1.0'，'1_0'，1.0
+        max_split: 以'.'和'_'分割的最大次数，如为-1，则无限制
 
     Returns:
         形如(1, 0)的版本元组
     """
     if isinstance(ver, float):
         ver = str(ver)
-    version_parts = ver.replace('.', '_').split('_', 1)
+    version_parts = ver.replace('.', '_').split('_', max_split)
     version_list = [int(part) for part in version_parts]
     return tuple(version_list)
 

{deepfos-1.1.36 → deepfos-1.1.37}/deepfos.egg-info/PKG-INFO

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