deepfos 1.1.60__py3-none-any.whl → 1.1.78__py3-none-any.whl

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/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/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 (
@@ -14,11 +13,12 @@ from urllib.parse import urlencode
 from reprlib import repr
 
 from requests.utils import CaseInsensitiveDict, to_key_val_list
-from pydantic import parse_obj_as, BaseModel as PydanticBaseModel
+from pydantic import BaseModel as PydanticBaseModel
 from cachetools import TTLCache
 from loguru import logger
 
 from deepfos.cache import Manager, AppSeperatedLRUCache
+from deepfos.api.models import compat_parse_obj_as as parse_obj_as
 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
@@ -365,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
@@ -532,6 +533,7 @@ post = DummyDeco(method='post')
 
 class APIBase:
     endpoint = '/'
+    server_name: str = None
 
     def __init__(
         self,
@@ -552,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):
@@ -595,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):
@@ -618,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,
@@ -636,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,
@@ -677,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:
@@ -721,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
@@ -880,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/api/deep_pipeline.py

@@ -12,7 +12,7 @@ class RunAPI(ChildAPI):
     endpoint = '/'
 
     @post('run')
-    def run_async(self, run_info: RunInfo) -> Union[str, Awaitable[str]]:
+    def run_async(self, run_info: Union[RunInfo, RunInfoWithParam]) -> Union[str, Awaitable[str]]:
         """
         异步执行数据流
         异步执行数据流，返回任务id

deepfos/api/deepconnector.py

@@ -3,7 +3,7 @@ from typing import Union, Awaitable
 from deepfos.element.base import T_ElementInfoWithServer
 from deepfos.lib.decorator import cached_property
 
-from .base import ChildAPI, get, RootAPI
+from .base import ChildAPI, RootAPI, post
 from .models.deepconnector import *
 
 
@@ -14,10 +14,10 @@ class DataSourceAPI(ChildAPI):
     """连接信息相关接口"""
     endpoint = '/apis/v3/ds/spaces/{space}/apps/{app}'
 
-    @get('connection-info', data_wrapped=False)
+    @post('connection-info/query', data_wrapped=False)
     def connection_info(self, element_info: T_ElementInfoWithServer) -> Union[ConnectionInfoVo, Awaitable[ConnectionInfoVo]]:
         return {
-            'param': {
+            'body': {
                 'elementName': element_info.elementName,
                 'folderId': element_info.folderId
             }

deepfos/api/financial_model.py

@@ -53,6 +53,10 @@ class Extra(ChildAPI):
         """
         return {'body': calculateDTO}
 
+    @get('git-version')
+    def git_version(self) -> Union[str, Awaitable[str]]:
+        return {}
+
 
 class CubeDataAPI(ChildAPI):
     endpoint = '/cube-data'
@@ -163,6 +167,14 @@ class CubeCalculateAPI(ChildAPI):
         """
         return {'body': clearDataDTO}
 
+    @post('/sync/clearData')
+    def clear_data_ex(self, clearDataDTO: SyncClearDataDto) -> Union[Any, Awaitable[Any]]:
+        """
+        根据财务数据模型名称 所在文件夹Id 维度表达式 清除相关的数据
+
+        """
+        return {'body': clearDataDTO}
+
 
 class ReactSpreadsheet(ChildAPI):
     endpoint = '/react/spreadsheet'