deepfos 1.1.49__tar.gz → 1.1.51__tar.gz

{deepfos-1.1.49 → deepfos-1.1.51}/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [1.1.51] - 2024-12-20
+
+### 变更
+
+* DeepModel query_df修正返回空dataframe时frame_desc未处理的问题
+
+## [1.1.50] - 2024-12-19
+
+### 变更
+
+* DeepModel query_df修正不提供shape时会返回空dataframe的问题
+
 ## [1.1.49] - 2024-11-21
 
 ### 变更

{deepfos-1.1.49 → deepfos-1.1.51}/PKG-INFO

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

{deepfos-1.1.49 → deepfos-1.1.51}/deepfos/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-11-26T02:28:34+0000",
+ "date": "2024-12-20T04:42:08+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "e764c23720721ec089056e2e10f985fdeb9c949c",
- "version": "1.1.49"
+ "full-revisionid": "2664c348c5ff65b57204c2f8fe508f37ae6d66c3",
+ "version": "1.1.51"
 }
 '''  # END VERSION_JSON
 

{deepfos-1.1.49 → deepfos-1.1.51}/deepfos/api/base.py

@@ -20,7 +20,7 @@ from loguru import logger
 
 from deepfos.cache import Manager, AppSeperatedLRUCache
 from deepfos.lib.httpcli import AioHttpCli
-from deepfos.lib.utils import concat_url, retry, to_version_tuple, repr_version
+from deepfos.lib.utils import concat_url, retry, to_version_tuple, repr_version, trim_text
 from deepfos.lib.asynchronous import evloop
 from deepfos.lib.discovery import ServiceDiscovery
 from deepfos.lib.constant import UNSET, RE_SYS_SERVER_PARSER
@@ -453,7 +453,7 @@ class Route:
                         "Detail: {text}.",
                         url=lambda: req.url,
                         code=lambda: status_code,
-                        text=lambda: text,
+                        text=lambda: trim_text(text, OPTION.general.response_display_length_on_error),
                     )
                     flag, obj, err = False, None, f"[code: {status_code}] ErrMsg from server: {text}"
 
@@ -474,7 +474,7 @@ class Route:
                                     "Call API: {url} failed. "
                                     "Bad response because status is False. Detail: {text}.",
                                     url=lambda: req.url,
-                                    text=lambda: text,
+                                    text=lambda: trim_text(text, OPTION.general.response_display_length_on_error),
                                 )
                                 flag, obj, err = False, resp.get('data'), resp.get('message', text)
                                 err_code = resp.get('code')

{deepfos-1.1.49 → deepfos-1.1.51}/deepfos/db/edb.py

@@ -19,9 +19,8 @@ __all__ = ['create_async_client']
 def collect_output_frame(ele_desc: describe.AnyType):
     if isinstance(ele_desc, describe.ObjectType):
         return {
-            field: collect_output_frame(element.type)
+            (field, element.is_implicit == 0): collect_output_frame(element.type)
             for field, element in ele_desc.elements.items()
-            if element.is_implicit == 0
         }
     if isinstance(ele_desc, describe.ArrayType):
         return collect_output_frame(ele_desc.element_type)
@@ -108,7 +107,7 @@ class _AsyncEdgeDBConnection(AsyncIOConnection):
                         )
                     ))
                 else:
-                    frame_desc = {}
+                    frame_desc = None
                 return frame_desc, result
             except errors.EdgeDBError as e:
                 if query_context.retry_options is None:

{deepfos-1.1.49 → deepfos-1.1.51}/deepfos/element/deepmodel.py

@@ -646,7 +646,7 @@ def collect_query_result_structure(
 def collect_frame_desc_structure(desc: Dict[str, str]):
     fields = [
         PtrInfo(
-            name=name,
+            name=name if isinstance(name, str) else name[0],
             target=NamedField(
                 name=tname
                 if isinstance(tname, str) else NOT_SCALAR
@@ -985,7 +985,7 @@ class AsyncDeepModel(ElementBase[DeepModelAPI]):
             frame_desc, data = await self.client.query(ql, **kwargs)
 
             data = pd.DataFrame(data=serutils.serialize(
-                data, ctx=serutils.Context(frame_desc=frame_desc)
+                data, ctx=serutils.Context(frame_desc=frame_desc, query_df=True)
             ))
             # Not records for dict-like
             if not isinstance(frame_desc, dict):

{deepfos-1.1.49 → deepfos-1.1.51}/deepfos/lib/serutils.py

@@ -15,6 +15,7 @@ from edgedb.datatypes import datatypes
 @dataclass(frozen=True)
 class Context:
     frame_desc: Any = None
+    query_df: bool = False
 
 
 @functools.singledispatch
@@ -124,18 +125,30 @@ def _object(o: edgedb.Object, ctx: Context = Context()):
     ret = {}
 
     if ctx.frame_desc is None:
-        for attr in ignore_implicited_fields(o):
+        if ctx.query_df:
+            attrs = dir(o)
+        else:
+            attrs = ignore_implicited_fields(o)
+        for attr in attrs:
             try:
                 ret[attr] = serialize(o[attr])
             except (KeyError, TypeError):
                 ret[attr] = serialize(getattr(o, attr))
         return ret
 
-    for attr in (desc := ctx.frame_desc):
+    ensure_one_field = ctx.query_df and len(ctx.frame_desc) == 1
+    for key, value in dict(ctx.frame_desc).items():
+        if isinstance(key, tuple):
+            # key: (field_name, not_implicit)
+            maybe_drop = ctx.frame_desc.pop(key)
+            if ensure_one_field or key[1]:
+                ctx.frame_desc[key[0]] = maybe_drop
+
+    for attr in ctx.frame_desc:
         try:
-            ret[attr] = serialize(o[attr], Context(frame_desc=desc[attr]))
+            ret[attr] = serialize(o[attr], Context(frame_desc=ctx.frame_desc[attr]))
         except (KeyError, TypeError):
-            ret[attr] = serialize(getattr(o, attr), Context(frame_desc=desc[attr]))
+            ret[attr] = serialize(getattr(o, attr), Context(frame_desc=ctx.frame_desc[attr]))
 
     return ret
 

{deepfos-1.1.49 → deepfos-1.1.51}/deepfos/lib/utils.py

@@ -993,3 +993,11 @@ class AliasGenerator(SimpleCounter):
     def get(self, hint: str = '') -> str:
         idx = self.nextval(hint)
         return f'{hint}{idx}'
+
+
+def trim_text(content: str, limit: Union[int, None], appendor: str = '...') -> str:
+    limit = limit or 0
+    if 0 < limit < len(content):
+        return f"{content[:limit]} {appendor}"
+    else:
+        return content

{deepfos-1.1.49 → deepfos-1.1.51}/deepfos/options.py

@@ -425,6 +425,7 @@ class _General(_Category):
     parallel_mode = _Option(False, val_type=bool)
     socket_name = _Option(None, val_type=str)
     preserve_concurrency = _Option(1, val_type=int)
+    response_display_length_on_error = _Option(20000, val_type=int)
 
     def __get__(self, instance, owner) -> '_General':
         """defined to help ide"""

{deepfos-1.1.49 → deepfos-1.1.51}/deepfos.egg-info/PKG-INFO

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