deepfos 1.1.78__tar.gz → 1.1.80__tar.gz

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

@@ -1,3 +1,18 @@
+## [1.1.80] - 2026-01-14
+
+### 更新
+
+* 修复DeepConnectorAPI/TaskAPI在take_over=True情况下不可用的bug
+
+## [1.1.79] - 2026-01-12
+
+### 更新
+
+* k8s客户端不校验证书有效性
+* FinancialCube添加两个参数dataAuditSwitch和cmtSwitch
+* DeepQL允许使用`__bk__` 作为查询字段
+* nacos支持账号密码验证
+
 ## [1.1.78] - 2025-12-11
 
 ### 更新

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

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

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

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-12-22T07:20:38+0000",
+ "date": "2026-01-14T10:28:13+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "1a939ca4b6be850040e0d9076eaf235608eebb23",
- "version": "1.1.78"
+ "full-revisionid": "1019f357203aa3e5a0453b8ef6ff017aea04d148",
+ "version": "1.1.80"
 }
 '''  # END VERSION_JSON
 

{deepfos-1.1.78 → deepfos-1.1.80}/deepfos/api/deepconnector.py

@@ -27,6 +27,7 @@ class DataSourceAPI(ChildAPI):
 class DeepConnectorAPI(RootAPI):
     """连接器组件接口"""
     prefix = lambda: 'http://deep-connector-server'
+    server_name = 'deep-connector-server'
     url_need_format = True
     module_type = 'CONN'
 

{deepfos-1.1.78 → deepfos-1.1.80}/deepfos/api/deepfos_task.py

@@ -74,6 +74,7 @@ class Job(ChildAPI):
 class TaskAPI(RootAPI):
     """任务管理接口"""
     prefix = lambda: OPTION.server.deepfos_task
+    server_name = 'deep-task-server'
 
     @cached_property
     def task_instance(self) -> TaskInstance:

{deepfos-1.1.78 → deepfos-1.1.80}/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.78 → deepfos-1.1.80}/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.78 → deepfos-1.1.80}/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.78 → deepfos-1.1.80}/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.78 → deepfos-1.1.80}/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.78 → deepfos-1.1.80}/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.78 → deepfos-1.1.80}/deepfos.egg-info/PKG-INFO

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