tamar-model-client 0.1.2__tar.gz → 0.1.3__tar.gz

{tamar_model_client-0.1.2 → tamar_model_client-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tamar-model-client
-Version: 0.1.2
+Version: 0.1.3
 Summary: A Python SDK for interacting with the Model Manager gRPC service
 Home-page: http://gitlab.tamaredge.top/project-tap/AgentOS/model-manager-client
 Author: Oscar Ou

{tamar_model_client-0.1.2 → tamar_model_client-0.1.3}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="tamar-model-client",
-    version="0.1.2",
+    version="0.1.3",
     description="A Python SDK for interacting with the Model Manager gRPC service",
     author="Oscar Ou",
     author_email="oscar.ou@tamaredge.ai",

{tamar_model_client-0.1.2 → tamar_model_client-0.1.3}/tamar_model_client/async_client.py

@@ -1,5 +1,6 @@
 import asyncio
 import atexit
+import base64
 import json
 import logging
 import os
@@ -27,6 +28,72 @@ if not logging.getLogger().hasHandlers():
 logger = logging.getLogger(__name__)
 
 
+def is_effective_value(value) -> bool:
+    """
+    递归判断value是否是有意义的有效值
+    """
+    if value is None or value is NOT_GIVEN:
+        return False
+
+    if isinstance(value, str):
+        return value.strip() != ""
+
+    if isinstance(value, bytes):
+        return len(value) > 0
+
+    if isinstance(value, dict):
+        for v in value.values():
+            if is_effective_value(v):
+                return True
+        return False
+
+    if isinstance(value, list):
+        for item in value:
+            if is_effective_value(item):
+                return True
+        return False
+
+    return True  # 其他类型（int/float/bool）只要不是None就算有效
+
+
+def serialize_value(value):
+    """递归处理单个值，处理BaseModel, dict, list, bytes"""
+    if not is_effective_value(value):
+        return None
+    if isinstance(value, BaseModel):
+        return serialize_value(value.model_dump())
+    if hasattr(value, "dict") and callable(value.dict):
+        return serialize_value(value.dict())
+    if isinstance(value, dict):
+        return {k: serialize_value(v) for k, v in value.items()}
+    if isinstance(value, list) or (isinstance(value, Iterable) and not isinstance(value, (str, bytes))):
+        return [serialize_value(v) for v in value]
+    if isinstance(value, bytes):
+        return f"bytes:{base64.b64encode(value).decode('utf-8')}"
+    return value
+
+
+from typing import Any
+
+
+def remove_none_from_dict(data: Any) -> Any:
+    """
+    遍历 dict/list，递归删除 value 为 None 的字段
+    """
+    if isinstance(data, dict):
+        new_dict = {}
+        for key, value in data.items():
+            if value is None:
+                continue
+            cleaned_value = remove_none_from_dict(value)
+            new_dict[key] = cleaned_value
+        return new_dict
+    elif isinstance(data, list):
+        return [remove_none_from_dict(item) for item in data]
+    else:
+        return data
+
+
 class AsyncTamarModelClient:
     def __init__(
             self,
@@ -177,51 +244,15 @@ class AsyncTamarModelClient:
                 if field in model_request_dict:
                     value = model_request_dict[field]
 
-                    # Skip fields with NotGiven or None (unless explicitly allowed)
-                    if value is NOT_GIVEN or value is None:
+                    # 跳过无效的值
+                    if not is_effective_value(value):
                         continue
 
-                    # 特别处理：如果是自定义的 BaseModel 或特定类型
-                    if isinstance(value, BaseModel):
-                        grpc_request_kwargs[field] = value.model_dump()
-                    # 如果是 OpenAI / Google 里的自定义对象，通常有 dict() 方法
-                    elif hasattr(value, "dict") and callable(value.dict):
-                        grpc_request_kwargs[field] = value.dict()
-                    # 如果是 list，需要处理里面元素也是自定义对象的情况
-                    elif isinstance(value, Iterable) and not isinstance(value, (str, bytes, dict)):
-                        new_list = []
-                        for item in value:
-                            if isinstance(item, BaseModel):
-                                new_list.append(item.model_dump())
-                            elif hasattr(item, "dict") and callable(item.dict):
-                                new_list.append(item.dict())
-                            elif isinstance(item, dict):
-                                # Handle nested dictionaries
-                                nested_dict = {}
-                                for k, v in item.items():
-                                    if isinstance(v, BaseModel):
-                                        nested_dict[k] = v.model_dump()
-                                    elif hasattr(v, "dict") and callable(v.dict):
-                                        nested_dict[k] = v.dict()
-                                    else:
-                                        nested_dict[k] = v
-                                new_list.append(nested_dict)
-                            else:
-                                new_list.append(item)
-                        grpc_request_kwargs[field] = new_list
-                        # 如果是 dict，同理处理内部元素
-                    elif isinstance(value, dict):
-                        new_dict = {}
-                        for k, v in value.items():
-                            if isinstance(v, BaseModel):
-                                new_dict[k] = v.model_dump()
-                            elif hasattr(v, "dict") and callable(v.dict):
-                                new_dict[k] = v.dict()
-                            else:
-                                new_dict[k] = v
-                        grpc_request_kwargs[field] = new_dict
-                    else:
-                        grpc_request_kwargs[field] = value
+                    # 序列化grpc不支持的类型
+                    grpc_request_kwargs[field] = serialize_value(value)
+
+                    # 清理 serialize后的 grpc_request_kwargs
+                    grpc_request_kwargs = remove_none_from_dict(grpc_request_kwargs)
 
             request = model_service_pb2.ModelRequestItem(
                 provider=model_request.provider.value,
@@ -300,51 +331,15 @@ class AsyncTamarModelClient:
                     if field in model_request_dict:
                         value = model_request_dict[field]
 
-                        # Skip fields with NotGiven or None (unless explicitly allowed)
-                        if value is NOT_GIVEN or value is None:
+                        # 跳过无效的值
+                        if not is_effective_value(value):
                             continue
 
-                        # 特别处理：如果是自定义的 BaseModel 或特定类型
-                        if isinstance(value, BaseModel):
-                            grpc_request_kwargs[field] = value.model_dump()
-                        # 如果是 OpenAI / Google 里的自定义对象，通常有 dict() 方法
-                        elif hasattr(value, "dict") and callable(value.dict):
-                            grpc_request_kwargs[field] = value.dict()
-                        # 如果是 list，需要处理里面元素也是自定义对象的情况
-                        elif isinstance(value, Iterable) and not isinstance(value, (str, bytes, dict)):
-                            new_list = []
-                            for item in value:
-                                if isinstance(item, BaseModel):
-                                    new_list.append(item.model_dump())
-                                elif hasattr(item, "dict") and callable(item.dict):
-                                    new_list.append(item.dict())
-                                elif isinstance(item, dict):
-                                    # Handle nested dictionaries
-                                    nested_dict = {}
-                                    for k, v in item.items():
-                                        if isinstance(v, BaseModel):
-                                            nested_dict[k] = v.model_dump()
-                                        elif hasattr(v, "dict") and callable(v.dict):
-                                            nested_dict[k] = v.dict()
-                                        else:
-                                            nested_dict[k] = v
-                                    new_list.append(nested_dict)
-                                else:
-                                    new_list.append(item)
-                            grpc_request_kwargs[field] = new_list
-                            # 如果是 dict，同理处理内部元素
-                        elif isinstance(value, dict):
-                            new_dict = {}
-                            for k, v in value.items():
-                                if isinstance(v, BaseModel):
-                                    new_dict[k] = v.model_dump()
-                                elif hasattr(v, "dict") and callable(v.dict):
-                                    new_dict[k] = v.dict()
-                                else:
-                                    new_dict[k] = v
-                            grpc_request_kwargs[field] = new_dict
-                        else:
-                            grpc_request_kwargs[field] = value
+                        # 序列化grpc不支持的类型
+                        grpc_request_kwargs[field] = serialize_value(value)
+
+                        # 清理 serialize后的 grpc_request_kwargs
+                        grpc_request_kwargs = remove_none_from_dict(grpc_request_kwargs)
 
                 items.append(model_service_pb2.ModelRequestItem(
                     provider=model_request_item.provider.value,

{tamar_model_client-0.1.2 → tamar_model_client-0.1.3}/tamar_model_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tamar-model-client
-Version: 0.1.2
+Version: 0.1.3
 Summary: A Python SDK for interacting with the Model Manager gRPC service
 Home-page: http://gitlab.tamaredge.top/project-tap/AgentOS/model-manager-client
 Author: Oscar Ou