deepfos 1.1.77__tar.gz → 1.1.79__tar.gz

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

@@ -1,3 +1,19 @@
+## [1.1.79] - 2026-01-12
+
+### 更新
+
+* k8s客户端不校验证书有效性
+* FinancialCube添加两个参数dataAuditSwitch和cmtSwitch
+* DeepQL允许使用`__bk__` 作为查询字段
+* nacos支持账号密码验证
+
+## [1.1.78] - 2025-12-11
+
+### 更新
+
+* api base实现方式改进
+* 修复deepmodel无法insert必填多选链接的bug
+
 ## [1.1.77] - 2025-12-05
 
 ### 新增

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

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

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-12-05T02:41:19+0000",
+ "date": "2026-01-13T06:00:21+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "bd3d3dac6c3b6e4d9a695174c9064820da0912b6",
- "version": "1.1.77"
+ "full-revisionid": "d049dc802ae4862dbe78beae839ba023357d5e14",
+ "version": "1.1.79"
 }
 '''  # END VERSION_JSON
 

{deepfos-1.1.77 → deepfos-1.1.79}/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.79}/deepfos/api/models/financial_model.py

@@ -122,6 +122,10 @@ class CopyCalculateDTO(BaseModel):
     fixMembers: Optional[str] = None
     #: formula表达式
     formula: Optional[str] = None
+    #: 是否记录数据审计
+    dataAuditSwitch: Optional[bool] = None
+    #: 是否拷贝批注
+    cmtSwitch: Optional[bool] = None
 
 
 class CubeDataLogForm(BaseModel):

{deepfos-1.1.77 → deepfos-1.1.79}/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.79}/deepfos/element/finmodel.py

@@ -1393,13 +1393,21 @@ class AsyncFinancialCube(ElementBase[FinancialModelAPI]):
             processMap=process_map,
             status=status))
 
-    async def copy_calculate(self, formula: str, fix_members: str):
+    async def copy_calculate(
+        self,
+        formula: str,
+        fix_members: str,
+        data_audit_switch: Optional[bool] = None,
+        cmt_switch: Optional[bool] = None,
+    ):
         """
         cube copy计算接口
 
         Args:
             formula: 维度成员来源和目的的表达式
             fix_members: 维度成员的筛选表达式
+            data_audit_switch: 是否记录数据审计
+            cmt_switch: 是否拷贝批注
 
         Returns:
             更新结果
@@ -1422,7 +1430,9 @@ class AsyncFinancialCube(ElementBase[FinancialModelAPI]):
                 cubePath=self._path,
                 formula=formula,
                 fixMembers=fix_members,
-                entryObject="python"
+                entryObject="python",
+                dataAuditSwitch=data_audit_switch,
+                cmtSwitch=cmt_switch,
             )
         )
 
@@ -1861,7 +1871,13 @@ class FinancialCube(AsyncFinancialCube, metaclass=SyncMeta):
         ):
             ...
 
-        def copy_calculate(self, formula: str, fix_members: str):
+        def copy_calculate(
+            self,
+            formula: str,
+            fix_members: str,
+            data_audit_switch: Optional[bool] = None,
+            cmt_switch: Optional[bool] = None,
+        ):
             ...
 
         def mdx_execution(

{deepfos-1.1.77 → deepfos-1.1.79}/deepfos/lib/edb_lexer.py

@@ -652,6 +652,8 @@ class EdgeQLLexer(Lexer):
         Rule(token='BADIDENT',
              next_state=STATE_KEEP,
              regexp=r'''
+                    (?!__bk__\b)
+                    (?!`__bk__`)
                     __[^\W\d]\w*__
                     |
                     `__([^`]|``)*__`(?!`)

{deepfos-1.1.77 → deepfos-1.1.79}/deepfos/lib/k8s.py

@@ -16,7 +16,7 @@ from deepfos.lib.discovery import ServiceDiscovery
 from deepfos import OPTION
 
 
-class K8s(ServiceDiscovery):
+class K8sCli(ServiceDiscovery):
     def __init__(self):
         super().__init__()
         self._instance_lock: Dict[str, asyncio.Lock] = defaultdict(asyncio.Lock)
@@ -34,6 +34,9 @@ class K8s(ServiceDiscovery):
 
     @cached_property
     def _api(self):
+        c = client.Configuration.get_default_copy()
+        c.verify_ssl = False
+        client.Configuration.set_default(c)
         return client.CoreV1Api()
 
     async def on_interval(self):
@@ -99,3 +102,6 @@ class K8s(ServiceDiscovery):
                 logger.debug(f"{server_name} has no active endpoint, clear invalid...")
                 for item in list(cache):
                     cache.delete(item)
+
+
+K8s = K8sCli()

{deepfos-1.1.77 → deepfos-1.1.79}/deepfos/lib/nacos.py

@@ -2,15 +2,16 @@ import asyncio
 import functools
 import json
 from collections import defaultdict
-from typing import TypedDict, Any, Tuple, Type, Dict
+from typing import TypedDict, Any, Tuple, Type, Dict, Optional
 
 from loguru import logger
+from aiohttp import ClientError
 
 from deepfos import OPTION
 from deepfos.exceptions import APIResponseError
-from deepfos.lib.discovery import ServiceDiscovery
+from deepfos.lib.discovery import ServiceDiscovery, RankedCache
 from deepfos.lib.httpcli import AioHttpCli
-from deepfos.lib.utils import concat_url
+from deepfos.lib.utils import concat_url, retry
 
 __all__ = ['Nacos']
 
@@ -78,20 +79,46 @@ class Route:  # pragma: no cover
             is_get = method == 'GET'
 
             @functools.wraps(func)
-            async def call(*args, **kwargs):
-                ins = args[0]
-                url = concat_url(ins.base_url, endpoint)
-                body = func(ins, *args[1::], **kwargs)
-                logger.opt(lazy=True).debug(
-                    f"Sending request: {method} {url} "
-                    f"body: {repr(body)}"
-                )
+            async def call(ins: "NacosAPI", *args, **kwargs):
+                body = func(ins, *args, **kwargs)
                 req_args = {
                     'headers': ins.header,
                     'params' if is_get else 'data': body
                 }
-                response = await request(url, **req_args)
-                text = await response.text()
+                url_cache = ins.base_urls
+                for i, base_url in zip(reversed(range(len(url_cache))), url_cache.sort()):
+                    is_last_url = i == 0
+                    try:
+                        url = concat_url(base_url, endpoint)
+                        logger.opt(lazy=True).debug(
+                            f"Sending request: {method} {url} "
+                            f"body: {repr(body)}"
+                        )
+                        response = await request(url, **req_args)
+                        if (
+                            response.status == 403
+                            and func.__qualname__ != 'NacosAPI.login'
+                        ):
+                            # retry if token expired
+                            if await ins.maybe_login(schedule_renewal=False):
+                                body.update(func(ins, *args, **kwargs))
+                                response = await request(url, **req_args)
+
+                        if not (200 <= response.status < 300):
+                            raise APIResponseError(
+                                f"Call API: {endpoint} failed with http status: {response.status}"
+                            )
+                        url_cache.reward(base_url)
+                        break
+                    except ClientError as e:
+                        url_cache.punish(base_url)
+                        if is_last_url:
+                            logger.warning(f"Request of all urls failed.")
+                            raise
+                        else:
+                            logger.warning(f"Request failed with {e}, try next url...")
+
+                text = await response.text()  # noqa
                 if response_checker is not None:
                     ok, result = response_checker.validate(text, endpoint)
                     if not ok:
@@ -109,28 +136,89 @@ class Route:  # pragma: no cover
         return execute
 
 
+def auth(func):
+    @functools.wraps(func)
+    def wrapper(self, *args, **kwargs):
+        resp = func(self, *args, **kwargs)
+        if token := getattr(self, '_token', None):
+            resp['accessToken'] = token
+        return resp
+
+    return wrapper
+
+
 get = Route(method='get')
+post = Route(method='post')
 
 
 class NacosAPI:
     def __init__(self):  # noqa
         nacos_server: str = OPTION.nacos.server.lower()
-        if nacos_server.rstrip('/').endswith('nacos'):
-            base_url = nacos_server
-        else:
-            base_url = concat_url(nacos_server, 'nacos')
-
-        self.base_url = concat_url(base_url, 'v1')
+        self._base_urls = self._resolve_base_urls(nacos_server)
         self.header = {"Content-Type": "application/x-www-form-urlencoded"}
+        self._token = None
+        self._user = OPTION.nacos.user
+        self._password = OPTION.nacos.password
+
+    @staticmethod
+    def _resolve_base_urls(url: str) -> RankedCache:
+        urls = RankedCache()
+        for nacos_server in url.split(','):
+            if nacos_server.rstrip('/').endswith('nacos'):
+                base_url = nacos_server
+            else:
+                base_url = concat_url(nacos_server, 'nacos')
+            urls.add(concat_url(base_url, 'v1'))
+        return urls
+
+    @property
+    def base_urls(self) -> RankedCache:
+        return self._base_urls
+
+    async def maybe_login(
+        self,
+        schedule_renewal: bool = True,
+        delay: Optional[float] = None,
+    ) -> bool:
+        if self._user is not None and self._password is not None:
+            if delay:
+                await asyncio.sleep(delay)
+
+            resp = await retry(self.login, wait=1)(self._user, self._password)
+            self._token = resp['accessToken']
+
+            ttl = resp['tokenTtl']
+            if schedule_renewal:
+                _ = asyncio.create_task(self.maybe_login(
+                    schedule_renewal=True,
+                    delay=min((ttl * 2 / 3), ttl - 5)
+                ))
+            return True
+        return False
+
+    @post('auth/login', JsonResponse)
+    def login(self, user: str, password: str):
+        return {
+            "username": user,
+            "password": password
+        }
 
     @get('ns/service/list', JsonResponse)
-    def list_service(self):  # pragma: no cover
+    @auth
+    def list_service(
+        self,
+        group: str = 'DEFAULT_GROUP',
+        namespace: str = 'public',
+    ):
         return {
             'pageNo': 1,
             'pageSize': 1000000,
+            'namespaceId': namespace,
+            'groupName': group,
         }
 
     @get('ns/instance/list', JsonResponse)
+    @auth
     def list_instance(
         self,
         service_name: str,
@@ -163,7 +251,7 @@ class NacosCli(ServiceDiscovery):
         self._instance_lock.clear()
 
     async def on_startup(self):
-        pass
+        await self._api.maybe_login()
 
     async def on_interval(self):
         await self._update_cache()
@@ -186,7 +274,10 @@ class NacosCli(ServiceDiscovery):
         await self.update_instance_for_service(server_name)
 
     async def update_services(self):
-        new_services = frozenset((await self._api.list_service())['doms'])
+        new_services = frozenset((await self._api.list_service(
+            group=self._group,
+            namespace=self._ns,
+        ))['doms'])
         cur_services = frozenset(self.server_cache.keys())
 
         if added := new_services - cur_services:

{deepfos-1.1.77 → deepfos-1.1.79}/deepfos/options.py

@@ -510,6 +510,8 @@ class _Nacos(_Category):
     cluster = _Option('DEFAULT', val_type=str)
     namespace = _Option('public', val_type=str)
     group = _Option('DEFAULT_GROUP', val_type=str)
+    user = _Option(None, val_type=str)
+    password = _Option(None, val_type=str)
 
     def __get__(self, instance, owner) -> '_Nacos':
         """defined to help ide"""

{deepfos-1.1.77 → deepfos-1.1.79}/deepfos.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deepfos
-Version: 1.1.77
+Version: 1.1.79
 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.79}/setup.py

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