deepfos 1.1.44__tar.gz → 1.1.46__tar.gz

{deepfos-1.1.44 → deepfos-1.1.46}/CHANGELOG.md

@@ -1,3 +1,19 @@
+## [1.1.46] - 2024-11-05
+
+### 变更
+
+* 修复update_from_dataframe在有chunksize时读取where条件错误的bug
+
+### 新增
+
+* DeepModel对象查询返回增加声明信息
+
+## [1.1.45] - 2024-10-29
+
+### 变更
+
+* 因漏洞修复更新aiohttp版本至3.9.0
+
 ## [1.1.44] - 2024-10-21
 
 ### 变更

{deepfos-1.1.44 → deepfos-1.1.46}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deepfos
-Version: 1.1.44
+Version: 1.1.46
 Summary: Collecions of useful and handy tools for deepfos platform
 Home-page: http://py.deepfos.com
 Author: deepfos-python-team
@@ -15,7 +15,7 @@ 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.8.4
+Requires-Dist: aiohttp==3.9.0
 Requires-Dist: pydantic==1.8.2
 Requires-Dist: cachetools==4.2.2
 Requires-Dist: loguru==0.5.3

{deepfos-1.1.44 → deepfos-1.1.46}/deepfos/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-10-21T08:14:04+0000",
+ "date": "2024-11-11T10:30:58+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "81ec9211612d91a85e107e567bd28282295c42c5",
- "version": "1.1.44"
+ "full-revisionid": "b7f1de2acf936621af9a82dedb47942630dffaaf",
+ "version": "1.1.46"
 }
 '''  # END VERSION_JSON
 

{deepfos-1.1.44 → deepfos-1.1.46}/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.44 → deepfos-1.1.46}/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.44 → deepfos-1.1.46}/deepfos.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deepfos
-Version: 1.1.44
+Version: 1.1.46
 Summary: Collecions of useful and handy tools for deepfos platform
 Home-page: http://py.deepfos.com
 Author: deepfos-python-team
@@ -15,7 +15,7 @@ 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.8.4
+Requires-Dist: aiohttp==3.9.0
 Requires-Dist: pydantic==1.8.2
 Requires-Dist: cachetools==4.2.2
 Requires-Dist: loguru==0.5.3

{deepfos-1.1.44 → deepfos-1.1.46}/deepfos.egg-info/requires.txt

@@ -1,7 +1,7 @@
 pandas==1.2.0
 requests==2.25.1
 pymysql==0.9.3
-aiohttp==3.8.4
+aiohttp==3.9.0
 pydantic==1.8.2
 cachetools==4.2.2
 loguru==0.5.3

{deepfos-1.1.44 → deepfos-1.1.46}/setup.cfg

@@ -21,7 +21,7 @@ install_requires =
 	pandas==1.2.0
 	requests==2.25.1
 	pymysql==0.9.3
-	aiohttp==3.8.4
+	aiohttp==3.9.0
 	pydantic==1.8.2
 	cachetools==4.2.2
 	loguru==0.5.3