deepfos 1.1.42__tar.gz → 1.1.44__tar.gz

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

@@ -1,3 +1,19 @@
+## [1.1.44] - 2024-10-21
+
+### 变更
+
+* DeepModel query_df处理std::decimal类型列的cast使用float作为dtype
+
+## [1.1.43] - 2024-10-17
+
+### 变更
+
+* DeepModel query_df处理Bool的cast不使用pd.BooleanDtype()
+
+### 新增
+
+* DeepModel start_transaction支持flatten
+
 ## [1.1.42] - 2024-09-19
 
 ### 新增

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

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

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

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-09-24T05:39:42+0000",
+ "date": "2024-10-21T08:14:04+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "14152a2be32b02192ca40c87779a76367645c6a4",
- "version": "1.1.42"
+ "full-revisionid": "81ec9211612d91a85e107e567bd28282295c42c5",
+ "version": "1.1.44"
 }
 '''  # END VERSION_JSON
 

{deepfos-1.1.42 → deepfos-1.1.44}/deepfos/element/deepmodel.py

@@ -6,7 +6,7 @@ import json
 import uuid
 from contextlib import asynccontextmanager, contextmanager
 from contextvars import ContextVar
-from itertools import chain, count
+from itertools import count
 from typing import (
     List, TYPE_CHECKING, Any, Dict, Union, NamedTuple,
     Iterable, Optional, Literal
@@ -380,7 +380,7 @@ class FieldInt(BaseField):
 
 class FieldDecimal(FieldString):
     def cast(self, df: pd.DataFrame, field_name: str, direct_access: bool = True):
-        df[field_name] = df[field_name].astype(pd.Float64Dtype(), errors='ignore')
+        df[field_name] = df[field_name].astype(float, errors='ignore')
 
 
 class FieldBool(BaseField):
@@ -393,7 +393,7 @@ class FieldBool(BaseField):
         df[field_name] = df[field_name].apply(self.format_bool)
 
     def cast(self, df: pd.DataFrame, field_name: str, direct_access: bool = True):
-        df[field_name] = df[field_name].astype(pd.BooleanDtype(), errors='ignore')
+        pass
 
 
 class FieldFactory:
@@ -513,10 +513,10 @@ def _iter_single_assign(
             )
         )"""
     else:
-        assign_string += f"""(
+        assign_string += f"""assert_single((
             select detached {target}
             filter .{main_field.business_key} = <{main_field.type}>(json_get(item, '{link}'))
-        )"""
+        ))"""
 
     return assign_string
 
@@ -730,12 +730,13 @@ txn_support = flagmethod('_txn_support_')
 
 
 class _TxnConfig:
-    __slots__ = ('qls', 'in_txn', 'txn_support')
+    __slots__ = ('qls', 'in_txn', 'txn_support', 'flatten')
 
     def __init__(self):
-        self.qls = []
-        self.in_txn = False
+        self.qls = [[]]
+        self.in_txn = [False]
         self.txn_support = False
+        self.flatten = False
 
 
 @lru_cache(maxsize=128, cache_factory=SpaceSeperatedLRUCache)
@@ -1107,8 +1108,8 @@ class AsyncDeepModel(ElementBase[DeepModelAPI]):
     ) -> Optional[List]:
         txn_conf = self._safe_get_txn_conf()
 
-        if txn_conf.in_txn and self._txn_support_:
-            txn_conf.qls.extend(qls_with_args)
+        if txn_conf.in_txn[-1] and self._txn_support_:
+            txn_conf.qls[-1].extend(qls_with_args)
             return
 
         return await self._execute(qls_with_args)
@@ -1577,7 +1578,7 @@ class AsyncDeepModel(ElementBase[DeepModelAPI]):
             await conn.close()
 
     @asynccontextmanager
-    async def start_transaction(self):
+    async def start_transaction(self, flatten: bool = False):
         """开启事务
 
         上下文管理器，使用with语法开启上下文，上下文中的ql将作为事务执行
@@ -1617,14 +1618,32 @@ class AsyncDeepModel(ElementBase[DeepModelAPI]):
             仅 :func:`insert_df` :func:`execute` 方法支持在事务中执行
 
         """
-        self._safe_get_txn_conf().in_txn = True
+        try:
+            self._txn_.get()
+        except LookupError:
+            self._txn_.set(_TxnConfig())
+
+        bak_flatten = self._txn_.get().flatten
+        self._txn_.get().in_txn.append(True)
+
+        if flatten and not self._txn_.get().flatten:
+            force_submit = True
+        else:
+            force_submit = False
+
+        self._txn_.get().flatten = bak_flatten or flatten
+
+        if not self._txn_.get().flatten:
+            self._txn_.get().qls.append([])
 
         try:
             yield
-            if qls := self._txn_.get().qls:
-                await self._execute(qls)
+            if force_submit or not self._txn_.get().flatten:
+                if qls := self._txn_.get().qls.pop():
+                    await self._execute(qls)
         finally:
-            self._txn_.set(_TxnConfig())
+            self._txn_.get().in_txn.pop()
+            self._txn_.get().flatten = bak_flatten
 
     @contextmanager
     def with_globals(self, globals_):
@@ -1712,7 +1731,7 @@ class DeepModel(AsyncDeepModel, metaclass=SyncMeta):
             ...
 
     @contextmanager
-    def start_transaction(self):
+    def start_transaction(self, flatten: bool = False):
         """开启事务
 
         上下文管理器，使用with语法开启上下文，上下文中的ql将作为事务执行
@@ -1752,11 +1771,29 @@ class DeepModel(AsyncDeepModel, metaclass=SyncMeta):
             仅 :func:`insert_df` :func:`execute` 方法支持在事务中执行
 
         """
-        self._safe_get_txn_conf().in_txn = True
+        try:
+            self._txn_.get()
+        except LookupError:
+            self._txn_.set(_TxnConfig())
+
+        bak_flatten = self._txn_.get().flatten
+        self._txn_.get().in_txn.append(True)
+
+        if flatten and not self._txn_.get().flatten:
+            force_submit = True
+        else:
+            force_submit = False
+
+        self._txn_.get().flatten = bak_flatten or flatten
+
+        if not self._txn_.get().flatten:
+            self._txn_.get().qls.append([])
 
         try:
             yield
-            if qls := self._txn_.get().qls:
-                evloop.run(self._execute(qls))
+            if force_submit or not self._txn_.get().flatten:
+                if qls := self._txn_.get().qls.pop():
+                    evloop.run(self._execute(qls))
         finally:
-            self._txn_.set(_TxnConfig())
+            self._txn_.get().in_txn.pop()
+            self._txn_.get().flatten = bak_flatten

{deepfos-1.1.42 → deepfos-1.1.44}/deepfos.egg-info/PKG-INFO

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