tamar-model-client 0.1.18__py3-none-any.whl → 0.1.19__py3-none-any.whl

tamar_model_client/__init__.py

@@ -2,6 +2,7 @@ from .sync_client import TamarModelClient
 from .async_client import AsyncTamarModelClient
 from .exceptions import ModelManagerClientError, ConnectionError, ValidationError
 from .json_formatter import JSONFormatter
+from . import logging_icons
 
 __all__ = [
     "TamarModelClient",
@@ -10,4 +11,5 @@ __all__ = [
     "ConnectionError",
     "ValidationError",
     "JSONFormatter",
+    "logging_icons",
 ]

tamar_model_client/async_client.py

@@ -183,7 +183,7 @@ class AsyncTamarModelClient:
                 # 对于取消的情况进行指数退避重试
                 if isinstance(e, grpc.aio.AioRpcError) and e.code() == grpc.StatusCode.CANCELLED:
                     retry_count += 1
-                    logger.info(f"❌ RPC cancelled, retrying {retry_count}/{self.max_retries}...",
+                    logger.warning(f"⚠️ RPC cancelled, retrying {retry_count}/{self.max_retries}...",
                                  extra={"log_type": "info", "data": {"retry_count": retry_count, "max_retries": self.max_retries, "error_code": "CANCELLED"}})
                     if retry_count < self.max_retries:
                         delay = self.retry_delay * (2 ** (retry_count - 1))
@@ -196,7 +196,7 @@ class AsyncTamarModelClient:
                 elif isinstance(e, grpc.RpcError) and e.code() in {grpc.StatusCode.UNAVAILABLE,
                                                                    grpc.StatusCode.DEADLINE_EXCEEDED}:
                     retry_count += 1
-                    logger.info(f"❌ gRPC error {e.code()}, retrying {retry_count}/{self.max_retries}...",
+                    logger.warning(f"⚠️ gRPC error {e.code()}, retrying {retry_count}/{self.max_retries}...",
                                  extra={"log_type": "info", "data": {"retry_count": retry_count, "max_retries": self.max_retries, "error_code": str(e.code())}})
                     if retry_count < self.max_retries:
                         delay = self.retry_delay * (2 ** (retry_count - 1))
@@ -219,7 +219,7 @@ class AsyncTamarModelClient:
                 # 对于取消的情况进行指数退避重试
                 if isinstance(e, grpc.aio.AioRpcError) and e.code() == grpc.StatusCode.CANCELLED:
                     retry_count += 1
-                    logger.info(f"❌ RPC cancelled, retrying {retry_count}/{self.max_retries}...",
+                    logger.warning(f"⚠️ RPC cancelled, retrying {retry_count}/{self.max_retries}...",
                                  extra={"log_type": "info", "data": {"retry_count": retry_count, "max_retries": self.max_retries, "error_code": "CANCELLED"}})
                     if retry_count < self.max_retries:
                         delay = self.retry_delay * (2 ** (retry_count - 1))
@@ -232,7 +232,7 @@ class AsyncTamarModelClient:
                 elif isinstance(e, grpc.RpcError) and e.code() in {grpc.StatusCode.UNAVAILABLE,
                                                                    grpc.StatusCode.DEADLINE_EXCEEDED}:
                     retry_count += 1
-                    logger.info(f"❌ gRPC error {e.code()}, retrying {retry_count}/{self.max_retries}...",
+                    logger.warning(f"⚠️ gRPC error {e.code()}, retrying {retry_count}/{self.max_retries}...",
                                  extra={"log_type": "info", "data": {"retry_count": retry_count, "max_retries": self.max_retries, "error_code": str(e.code())}})
                     if retry_count < self.max_retries:
                         delay = self.retry_delay * (2 ** (retry_count - 1))
@@ -310,7 +310,7 @@ class AsyncTamarModelClient:
 
             # 指数退避：延迟时间 = retry_delay * (2 ^ (retry_count - 1))
             delay = self.retry_delay * (2 ** (retry_count - 1))
-            logger.info(f"🚀 Retrying connection (attempt {retry_count}/{self.max_retries}) after {delay:.2f}s delay...",
+            logger.warning(f"🔄 Retrying connection (attempt {retry_count}/{self.max_retries}) after {delay:.2f}s delay...",
                       extra={"log_type": "info", "data": {"retry_count": retry_count, "max_retries": self.max_retries, "delay": delay}})
             await asyncio.sleep(delay)
 
@@ -740,7 +740,7 @@ class AsyncTamarModelClient:
                 else:
                     loop.run_until_complete(self.close())
             except Exception as e:
-                logger.info(f"❌ gRPC channel close failed at exit: {e}",
+                logger.warning(f"⚠️ gRPC channel close failed at exit: {e}",
                              extra={"log_type": "info", "data": {"status": "failed", "error": str(e)}})
 
     async def __aenter__(self):

tamar_model_client/logging_icons.py

@@ -0,0 +1,60 @@
+"""
+日志图标规范
+
+本模块定义了统一的日志图标标准，确保整个项目中日志消息的视觉一致性。
+"""
+
+# 请求生命周期图标
+REQUEST_START = "🔵"      # 请求开始
+RESPONSE_SUCCESS = "✅"   # 响应成功
+RESPONSE_ERROR = "❌"     # 响应错误
+
+# 连接和网络图标
+SECURE_CONNECTION = "🔐"  # 安全连接 (TLS)
+INSECURE_CONNECTION = "🔓"  # 不安全连接 (无TLS)
+CONNECTION_SUCCESS = "✅"  # 连接成功
+CONNECTION_RETRY = "🔄"   # 连接重试
+CONNECTION_ERROR = "❌"   # 连接错误
+
+# 操作状态图标
+SUCCESS = "✅"           # 成功
+ERROR = "❌"             # 错误
+WARNING = "⚠️"           # 警告
+INFO = "ℹ️"              # 信息
+RETRY = "🔄"             # 重试
+PROCESSING = "⚙️"        # 处理中
+
+# 流式响应图标
+STREAM_SUCCESS = "✅"     # 流完成
+STREAM_ERROR = "❌"       # 流错误
+STREAM_CHUNK = "📦"       # 流数据块
+
+# 批量操作图标
+BATCH_START = "🔵"        # 批量开始
+BATCH_SUCCESS = "✅"      # 批量成功
+BATCH_ERROR = "❌"        # 批量错误
+
+# 系统操作图标
+INIT = "🚀"              # 初始化
+CLOSE = "🔚"             # 关闭
+CLEANUP = "🧹"           # 清理
+
+def get_icon_for_log_type(log_type: str, is_success: bool = True) -> str:
+    """
+    根据日志类型和状态获取合适的图标
+    
+    Args:
+        log_type: 日志类型 (request, response, info)
+        is_success: 是否成功
+    
+    Returns:
+        对应的图标字符串
+    """
+    if log_type == "request":
+        return REQUEST_START
+    elif log_type == "response":
+        return RESPONSE_SUCCESS if is_success else RESPONSE_ERROR
+    elif log_type == "info":
+        return INFO if is_success else WARNING
+    else:
+        return INFO

tamar_model_client/sync_client.py

@@ -176,7 +176,7 @@ class TamarModelClient:
             except (grpc.RpcError) as e:
                 if e.code() in {grpc.StatusCode.UNAVAILABLE, grpc.StatusCode.DEADLINE_EXCEEDED}:
                     retry_count += 1
-                    logger.info(f"❌ gRPC error {e.code()}, retrying {retry_count}/{self.max_retries}...",
+                    logger.warning(f"⚠️ gRPC error {e.code()}, retrying {retry_count}/{self.max_retries}...",
                                  extra={"log_type": "info", "data": {"retry_count": retry_count, "max_retries": self.max_retries, "error_code": str(e.code())}})
                     if retry_count < self.max_retries:
                         delay = self.retry_delay * (2 ** (retry_count - 1))
@@ -255,7 +255,7 @@ class TamarModelClient:
 
             # 指数退避：延迟时间 = retry_delay * (2 ^ (retry_count - 1))
             delay = self.retry_delay * (2 ** (retry_count - 1))
-            logger.info(f"🚀 Retrying connection (attempt {retry_count}/{self.max_retries}) after {delay:.2f}s delay...",
+            logger.warning(f"🔄 Retrying connection (attempt {retry_count}/{self.max_retries}) after {delay:.2f}s delay...",
                       extra={"log_type": "info", "data": {"retry_count": retry_count, "max_retries": self.max_retries, "delay": delay}})
             time.sleep(delay)  # Blocking sleep in sync version
 
@@ -679,7 +679,7 @@ class TamarModelClient:
             try:
                 self.close()  # 直接调用关闭方法
             except Exception as e:
-                logger.error(f"❌ gRPC channel close failed at exit: {e}",
+                logger.warning(f"⚠️ gRPC channel close failed at exit: {e}",
                            extra={"log_type": "info", "data": {"status": "failed", "error": str(e)}})
 
     def __enter__(self):

{tamar_model_client-0.1.18.dist-info → tamar_model_client-0.1.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tamar-model-client
-Version: 0.1.18
+Version: 0.1.19
 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.18.dist-info → tamar_model_client-0.1.19.dist-info}/RECORD

@@ -1,9 +1,10 @@
-tamar_model_client/__init__.py,sha256=gT2OwD5e4nXAZXIXG9QRn3DwwyDZb-LlICU2vBJX7FU,393
-tamar_model_client/async_client.py,sha256=SVRxIRAgVa7Mfm2krxFDUdjcs1W7uwdjlRa-9msIIDg,36810
+tamar_model_client/__init__.py,sha256=4DEIUGlLTeiaECjJQbGYik7C0JO6hHwwfbLYpYpMdzg,444
+tamar_model_client/async_client.py,sha256=PaI0a-hSkp7s99Aib-eL2-Ouh8d3A4E-L6EdSsfeE3w,36843
 tamar_model_client/auth.py,sha256=gbwW5Aakeb49PMbmYvrYlVx1mfyn1LEDJ4qQVs-9DA4,438
 tamar_model_client/exceptions.py,sha256=jYU494OU_NeIa4X393V-Y73mTNm0JZ9yZApnlOM9CJQ,332
 tamar_model_client/json_formatter.py,sha256=9iO4Qn7FiyPTjcn07uHuP4q80upVlmqI_P1UV12YPxI,991
-tamar_model_client/sync_client.py,sha256=bWPkGMcWE73Qtif0thT1lAtF_Kmtvd6j8KV3Jb-N_T4,32493
+tamar_model_client/logging_icons.py,sha256=MRTZ1Xvkep9ce_jdltj54_XZUXvIpQ95soRNmLdJ4qw,1837
+tamar_model_client/sync_client.py,sha256=FXdBeAqCHuLDPKzOyLMsPi33ibbNFLf9hWYfP1NFHuw,32507
 tamar_model_client/utils.py,sha256=Kn6pFz9GEC96H4eejEax66AkzvsrXI3WCSDtgDjnVTI,5238
 tamar_model_client/enums/__init__.py,sha256=3cYYn8ztNGBa_pI_5JGRVYf2QX8fkBVWdjID1PLvoBQ,182
 tamar_model_client/enums/channel.py,sha256=wCzX579nNpTtwzGeS6S3Ls0UzVAgsOlfy4fXMzQTCAw,199
@@ -15,7 +16,7 @@ tamar_model_client/generated/model_service_pb2_grpc.py,sha256=k4tIbp3XBxdyuOVR18
 tamar_model_client/schemas/__init__.py,sha256=AxuI-TcvA4OMTj2FtK4wAItvz9LrK_293pu3cmMLE7k,394
 tamar_model_client/schemas/inputs.py,sha256=dz1m8NbUIxA99JXZc8WlyzbKpDuz1lEzx3VghC33zYI,14625
 tamar_model_client/schemas/outputs.py,sha256=M_fcqUtXPJnfiLabHlyA8BorlC5pYkf5KLjXO1ysKIQ,1031
-tamar_model_client-0.1.18.dist-info/METADATA,sha256=od6DIz8FluOEDUwfst42_pNvwBO1nZUTjWzTDqZJLwo,16562
-tamar_model_client-0.1.18.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tamar_model_client-0.1.18.dist-info/top_level.txt,sha256=_LfDhPv_fvON0PoZgQuo4M7EjoWtxPRoQOBJziJmip8,19
-tamar_model_client-0.1.18.dist-info/RECORD,,
+tamar_model_client-0.1.19.dist-info/METADATA,sha256=-eCR9u_ULva97BJ0GwuaAuwEL7xyXGlmD2TwQUNSMxw,16562
+tamar_model_client-0.1.19.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tamar_model_client-0.1.19.dist-info/top_level.txt,sha256=_LfDhPv_fvON0PoZgQuo4M7EjoWtxPRoQOBJziJmip8,19
+tamar_model_client-0.1.19.dist-info/RECORD,,