deepfos 1.1.45__tar.gz → 1.1.47__tar.gz

{deepfos-1.1.45 → deepfos-1.1.47}/CHANGELOG.md

@@ -1,3 +1,19 @@
+## [1.1.47] - 2024-11-14
+
+### 变更
+
+* AccountAPI增加统一header用于绕过token校验
+
+## [1.1.46] - 2024-11-05
+
+### 变更
+
+* 修复update_from_dataframe在有chunksize时读取where条件错误的bug
+
+### 新增
+
+* DeepModel对象查询返回增加声明信息
+
 ## [1.1.45] - 2024-10-29
 
 ### 变更

{deepfos-1.1.45 → deepfos-1.1.47}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deepfos
-Version: 1.1.45
+Version: 1.1.47
 Summary: Collecions of useful and handy tools for deepfos platform
 Home-page: http://py.deepfos.com
 Author: deepfos-python-team
@@ -12,3 +12,19 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Requires-Python: >=3.8.3
+Requires-Dist: pandas==1.2.0
+Requires-Dist: requests==2.25.1
+Requires-Dist: pymysql==0.9.3
+Requires-Dist: aiohttp==3.9.0
+Requires-Dist: pydantic==1.8.2
+Requires-Dist: cachetools==4.2.2
+Requires-Dist: loguru==0.5.3
+Requires-Dist: PyPika==0.48.8
+Requires-Dist: aiomysql==0.0.22
+Requires-Dist: clickhouse-driver==0.2.2
+Requires-Dist: aioredis==2.0.1
+Requires-Dist: redis==4.5.3
+Requires-Dist: deepfos-ipc~=1.2.3
+Requires-Dist: typing-extensions==4.5.0
+Requires-Dist: edgedb~=1.4.0
+Requires-Dist: asyncpg~=0.29.0

{deepfos-1.1.45 → deepfos-1.1.47}/deepfos/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-10-29T07:47:00+0000",
+ "date": "2024-11-13T02:32:25+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "742b4ce0888dca998576239f0a5e43c779bbf70f",
- "version": "1.1.45"
+ "full-revisionid": "afbdac8f1acd9e3227431b4078b601d8a7ea2032",
+ "version": "1.1.47"
 }
 '''  # END VERSION_JSON
 

{deepfos-1.1.45 → deepfos-1.1.47}/deepfos/api/account.py

@@ -121,6 +121,14 @@ class AccountAPI(RootAPI):
     """账户中心"""
     prefix = lambda: OPTION.server.account
 
+    def __init__(self, *args, **kwargs):
+        super(self.__class__.__base__, self).__init__(*args, **kwargs)
+        extra_header = {"singFilter": "pass"}
+        if not self.header:
+            self.header = extra_header
+        else:
+            self.header = {**self.header, **extra_header}
+
     @cached_property
     def enterprise(self) -> ApiEnterprise:
         """

{deepfos-1.1.45 → deepfos-1.1.47}/deepfos/api/base.py

@@ -725,7 +725,7 @@ class RootAPI:
 
     if TYPE_CHECKING:  # pragma: no cover
         # 由APIBase带入，此处定义仅用于ide提示
-        header: str = ''
+        header: Dict[str, str] = {}
         base_url: str = ''
 
     @classmethod

{deepfos-1.1.45 → deepfos-1.1.47}/deepfos/element/datatable.py

@@ -1187,12 +1187,11 @@ class AsyncDataTableMySQL(ElementBase):
         if key_where not in source.columns:
             raise ValueError(f"Column <{key_where}> is missing in source dataframe.")
 
-        where_col = source[key_where]
         valid_columns = source.columns.intersection(self.structure.columns.keys())
-
         table = self.table
 
         def yield_sql(df):
+            where_col = df[key_where]
             for idx, upd_data in enumerate(df[valid_columns].to_dict(orient='records')):
                 q = self.query.update(table)
 

{deepfos-1.1.45 → deepfos-1.1.47}/deepfos/element/deepmodel.py

@@ -55,7 +55,8 @@ select ObjectType {
         expr,
         constraints: { name, expr, finalexpr, subjectexpr },
         source_property: {name}, 
-        target_property: {name}
+        target_property: {name},
+        annotations: {name, value := @value},
     } filter .name != '__type__',
     properties: {
         id, 
@@ -64,7 +65,8 @@ select ObjectType {
         required,
         target: { name },
         expr,
-        constraints: { name, expr, finalexpr, subjectexpr }
+        constraints: { name, expr, finalexpr, subjectexpr },
+        annotations: {name, value := @value},
     } filter .name != 'id',
     annotations: {name, value := @value},
     constraints: { name, expr, finalexpr, subjectexpr },
@@ -202,6 +204,7 @@ class PtrInfo(BaseModel):
     required: bool = False
     cardinality: str = None
     constraints: List[ConstraintField] = Field(default_factory=list)
+    annotations: List[Dict[str, str]] = Field(default_factory=list)
 
     @property
     def type(self) -> str:
@@ -240,6 +243,10 @@ class PtrInfo(BaseModel):
         if self.target_property:
             return self.target_property.name
 
+    @property
+    def info(self):
+        return {e['name'].rpartition('::')[-1]: e['value'] for e in self.annotations}
+
 
 _RE_CONSTRAINT_FIELDS = re.compile(r'\((((\.\w+)(,\s+)?)+)\)')
 

{deepfos-1.1.45 → deepfos-1.1.47}/deepfos.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deepfos
-Version: 1.1.45
+Version: 1.1.47
 Summary: Collecions of useful and handy tools for deepfos platform
 Home-page: http://py.deepfos.com
 Author: deepfos-python-team
@@ -12,3 +12,19 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Requires-Python: >=3.8.3
+Requires-Dist: pandas==1.2.0
+Requires-Dist: requests==2.25.1
+Requires-Dist: pymysql==0.9.3
+Requires-Dist: aiohttp==3.9.0
+Requires-Dist: pydantic==1.8.2
+Requires-Dist: cachetools==4.2.2
+Requires-Dist: loguru==0.5.3
+Requires-Dist: PyPika==0.48.8
+Requires-Dist: aiomysql==0.0.22
+Requires-Dist: clickhouse-driver==0.2.2
+Requires-Dist: aioredis==2.0.1
+Requires-Dist: redis==4.5.3
+Requires-Dist: deepfos-ipc~=1.2.3
+Requires-Dist: typing-extensions==4.5.0
+Requires-Dist: edgedb~=1.4.0
+Requires-Dist: asyncpg~=0.29.0