deepfos 1.1.64__tar.gz → 1.1.65__tar.gz

{deepfos-1.1.64 → deepfos-1.1.65}/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.1.65] - 2025-07-09
+
+### 更新
+
+* 修正deepmodel元素试图set client引发的问题
+
+
 ## [1.1.64] - 2025-07-08
 
 ### 更新

{deepfos-1.1.64 → deepfos-1.1.65}/PKG-INFO

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

{deepfos-1.1.64 → deepfos-1.1.65}/deepfos/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-07-08T07:07:33+0000",
+ "date": "2025-07-09T10:58:56+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "53d949a38fa538718df6900080ebd8b0bc1358c9",
- "version": "1.1.64"
+ "full-revisionid": "7891ba3eb0b577f318140d5ea3b613c82bda9e68",
+ "version": "1.1.65"
 }
 '''  # END VERSION_JSON
 

{deepfos-1.1.64 → deepfos-1.1.65}/deepfos/element/deepmodel.py

@@ -804,7 +804,7 @@ class AsyncDeepModel(ElementBase[DeepModelAPI]):
             logger.debug('当前DeepModel为非直连模式')
         self.alias = AliasGenerator()
         self.pg_dsn = pg_dsn
-        self._globals = {}
+        self._globals = None
         self.before_chunk = before_chunk
         self.after_chunk = after_chunk
         self._clients = threading.local()
@@ -830,6 +830,7 @@ class AsyncDeepModel(ElementBase[DeepModelAPI]):
     @property
     def client(self):
         if not self.direct_access:
+            self._globals = {}
             return
 
         if (client := getattr(self._clients, 'value', None)) is not None:
@@ -845,6 +846,7 @@ class AsyncDeepModel(ElementBase[DeepModelAPI]):
                 user_id
             }
             client = client.with_globals(**default_globals)
+        if self._globals is None:
             self._globals = client._options.state._globals
         self._clients.value = client
         return client
@@ -944,7 +946,9 @@ class AsyncDeepModel(ElementBase[DeepModelAPI]):
             logger.opt(lazy=True).debug(f"Query: [{ql}],\n"
                                         f"kwargs: [{kwargs}],\n"
                                         f"globals: [{self._globals}].")
-            _, result = await self.client.query(ql, **kwargs)
+            client = self.client
+            client._options.state._globals = self._globals
+            _, result = await client.query(ql, **kwargs)
             return result
 
         result = await self._http_query(ql, **kwargs)
@@ -985,7 +989,9 @@ class AsyncDeepModel(ElementBase[DeepModelAPI]):
             logger.opt(lazy=True).debug(f"Query: [{ql}],\n"
                                         f"kwargs: [{kwargs}],\n"
                                         f"globals: [{self._globals}].")
-            frame_desc, result = await self.client.query(ql, **kwargs)
+            client = self.client
+            client._options.state._globals = self._globals
+            frame_desc, result = await client.query(ql, **kwargs)
             return serutils.serialize(
                 result, ctx=serutils.Context(frame_desc=frame_desc)
             )
@@ -1032,7 +1038,9 @@ class AsyncDeepModel(ElementBase[DeepModelAPI]):
         
         """
         if self.direct_access:
-            frame_desc, data = await self.client.query(ql, **kwargs)
+            client = self.client
+            client._options.state._globals = self._globals
+            frame_desc, data = await client.query(ql, **kwargs)
             # set of unnamed tuple
             if isinstance(frame_desc, list):
                 return pd.DataFrame(
@@ -1074,8 +1082,7 @@ class AsyncDeepModel(ElementBase[DeepModelAPI]):
     query_df.__doc__ = query_df.__doc__ + DOC_ARGS_KWARGS
 
     def _ensure_client(self):
-        if self.direct_access:
-            self.client # noqa
+        self.client # noqa
 
     @txn_support
     async def execute(
@@ -1152,7 +1159,9 @@ class AsyncDeepModel(ElementBase[DeepModelAPI]):
             return affected
 
         result = []
-        async for tx in self.client.transaction():
+        client = self.client
+        client._options.state._globals = self._globals
+        async for tx in client.transaction():
             async with tx:
                 for ql in qls_with_args:
                     logger.opt(lazy=True).debug(
@@ -1828,14 +1837,17 @@ class AsyncDeepModel(ElementBase[DeepModelAPI]):
             finally:
                 raise NotImplemented('非直连模式不支持设置state信息')
         else:
-            bak_cli = self.client
-            bak_globals = self.client._options.state._globals
+            if self._globals is None:
+                bak_globals = self.client._options.state._globals
+            else:
+                bak_globals = self._globals
             try:
-                self.client = self.client.with_globals(**globals_)
-                self._globals = self.client._options.state._globals
+                client = self.client
+                client._options.state._globals = bak_globals
+                client = client.with_globals(**globals_)
+                self._globals = client._options.state._globals
                 yield
             finally:
-                self.client = bak_cli
                 self._globals = bak_globals
 
     @contextmanager
@@ -1846,14 +1858,17 @@ class AsyncDeepModel(ElementBase[DeepModelAPI]):
             finally:
                 raise NotImplemented('非直连模式不支持设置state信息')
         else:
-            bak_cli = self.client
-            bak_globals = self.client._options.state._globals
+            if self._globals is None:
+                bak_globals = self.client._options.state._globals
+            else:
+                bak_globals = self._globals
             try:
-                self.client = self.client.without_globals(*global_names)
-                self._globals = self.client._options.state._globals
+                client = self.client
+                client._options.state._globals = bak_globals
+                client = client.without_globals(*global_names)
+                self._globals = client._options.state._globals
                 yield
             finally:
-                self.client = bak_cli
                 self._globals = bak_globals
 
 

{deepfos-1.1.64 → deepfos-1.1.65}/deepfos.egg-info/PKG-INFO

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