tamar-model-client 0.1.9__py3-none-any.whl → 0.1.11__py3-none-any.whl

tamar_model_client/async_client.py

@@ -153,6 +153,7 @@ class AsyncTamarModelClient:
         options = [
             ('grpc.max_send_message_length', MAX_MESSAGE_LENGTH),
             ('grpc.max_receive_message_length', MAX_MESSAGE_LENGTH),
+            ('grpc.keepalive_permit_without_calls', True)  # 即使没有活跃请求也保持连接
         ]
         if self.default_authority:
             options.append(("grpc.default_authority", self.default_authority))
@@ -178,14 +179,15 @@ class AsyncTamarModelClient:
                 logger.info(f"✅ gRPC channel initialized to {self.server_address}")
                 return
             except grpc.FutureTimeoutError as e:
-                logger.warning(f"❌ gRPC channel initialization timed out: {str(e)}")
+                logger.error(f"❌ gRPC channel initialization timed out: {str(e)}", exc_info=True)
             except grpc.RpcError as e:
-                logger.warning(f"❌ gRPC channel initialization failed: {str(e)}")
+                logger.error(f"❌ gRPC channel initialization failed: {str(e)}", exc_info=True)
             except Exception as e:
-                logger.warning(f"❌ Unexpected error during channel initialization: {str(e)}")
+                logger.error(f"❌ Unexpected error during channel initialization: {str(e)}", exc_info=True)
 
             retry_count += 1
             if retry_count > self.max_retries:
+                logger.error(f"❌ Failed to initialize gRPC channel after {self.max_retries} retries.", exc_info=True)
                 raise ConnectionError(f"❌ Failed to initialize gRPC channel after {self.max_retries} retries.")
 
             # 指数退避：延迟时间 = retry_delay * (2 ^ (retry_count - 1))
@@ -194,18 +196,13 @@ class AsyncTamarModelClient:
             await asyncio.sleep(delay)
 
     async def _stream(self, model_request, metadata, invoke_timeout) -> AsyncIterator[ModelResponse]:
-        try:
-            async for response in self.stub.Invoke(model_request, metadata=metadata, timeout=invoke_timeout):
-                yield ModelResponse(
-                    content=response.content,
-                    usage=json.loads(response.usage) if response.usage else None,
-                    raw_response=json.loads(response.raw_response) if response.raw_response else None,
-                    error=response.error or None,
-                )
-        except grpc.RpcError as e:
-            raise ConnectionError(f"gRPC call failed: {str(e)}")
-        except Exception as e:
-            raise ValidationError(f"Invalid input: {str(e)}")
+        async for response in self.stub.Invoke(model_request, metadata=metadata, timeout=invoke_timeout):
+            yield ModelResponse(
+                content=response.content,
+                usage=json.loads(response.usage) if response.usage else None,
+                raw_response=json.loads(response.raw_response) if response.raw_response else None,
+                error=response.error or None,
+            )
 
     async def invoke(self, model_request: ModelRequest, timeout: Optional[float] = None) -> Union[
         ModelResponse, AsyncIterator[ModelResponse]]:
@@ -283,19 +280,28 @@ class AsyncTamarModelClient:
 
         metadata = self._build_auth_metadata()
 
-        invoke_timeout = timeout or self.default_invoke_timeout
-        if model_request.stream:
-            return self._stream(request, metadata, invoke_timeout)
-        else:
-            async for response in self.stub.Invoke(request, metadata=metadata, timeout=invoke_timeout):
-                return ModelResponse(
-                    content=response.content,
-                    usage=json.loads(response.usage) if response.usage else None,
-                    raw_response=json.loads(response.raw_response) if response.raw_response else None,
-                    error=response.error or None,
-                    custom_id=None,
-                    request_id=response.request_id if response.request_id else None,
-                )
+        try:
+            invoke_timeout = timeout or self.default_invoke_timeout
+            if model_request.stream:
+                return self._stream(request, metadata, invoke_timeout)
+            else:
+                async for response in self.stub.Invoke(request, metadata=metadata, timeout=invoke_timeout):
+                    return ModelResponse(
+                        content=response.content,
+                        usage=json.loads(response.usage) if response.usage else None,
+                        raw_response=json.loads(response.raw_response) if response.raw_response else None,
+                        error=response.error or None,
+                        custom_id=None,
+                        request_id=response.request_id if response.request_id else None,
+                    )
+        except grpc.RpcError as e:
+            error_message = f"❌ Invoke gRPC failed: {str(e)}"
+            logger.error(error_message, exc_info=True)
+            raise e
+        except Exception as e:
+            error_message = f"❌ Invoke other error: {str(e)}"
+            logger.error(error_message, exc_info=True)
+            raise e
 
     async def invoke_batch(self, batch_request_model: BatchModelRequest, timeout: Optional[float] = None) -> \
             BatchModelResponse:
@@ -398,7 +404,13 @@ class AsyncTamarModelClient:
                 responses=result
             )
         except grpc.RpcError as e:
-            raise ConnectionError(f"BatchInvoke failed: {str(e)}")
+            error_message = f"❌ BatchInvoke gRPC failed: {str(e)}"
+            logger.error(error_message, exc_info=True)
+            raise e
+        except Exception as e:
+            error_message = f"❌ BatchInvoke other error: {str(e)}"
+            logger.error(error_message, exc_info=True)
+            raise e
 
     async def close(self):
         """关闭 gRPC 通道"""

{tamar_model_client-0.1.9.dist-info → tamar_model_client-0.1.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tamar-model-client
-Version: 0.1.9
+Version: 0.1.11
 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
@@ -528,6 +528,13 @@ pip install -e .
 python make_grpc.py
 ```
 
+### 部署到 pip
+```bash
+python setup.py sdist bdist_wheel
+twine check dist/*
+
+```
+
 ## 许可证
 
 MIT License

{tamar_model_client-0.1.9.dist-info → tamar_model_client-0.1.11.dist-info}/RECORD

@@ -14,7 +14,7 @@ model_manager_client/schemas/__init__.py,sha256=AxuI-TcvA4OMTj2FtK4wAItvz9LrK_29
 model_manager_client/schemas/inputs.py,sha256=3HUxnbuyQbuvMz1C46zydFYz-iEvLAUWVzOx7-eKS_I,14338
 model_manager_client/schemas/outputs.py,sha256=M_fcqUtXPJnfiLabHlyA8BorlC5pYkf5KLjXO1ysKIQ,1031
 tamar_model_client/__init__.py,sha256=LMECAuDARWHV1XzH3msoDXcyurS2eihRQmBy26_PUE0,328
-tamar_model_client/async_client.py,sha256=hHF2ndfNQypmBd5V7uUYvgF9LTU1_FHOAk5N5t4HyKk,18950
+tamar_model_client/async_client.py,sha256=gmZ2xMHO_F-Vtg3OK7B_yf-gtI-WH2NU2LzC6YO_t7k,19649
 tamar_model_client/auth.py,sha256=gbwW5Aakeb49PMbmYvrYlVx1mfyn1LEDJ4qQVs-9DA4,438
 tamar_model_client/exceptions.py,sha256=jYU494OU_NeIa4X393V-Y73mTNm0JZ9yZApnlOM9CJQ,332
 tamar_model_client/sync_client.py,sha256=o8b20fQUvtMq1gWax3_dfOpputYT4l9pRTz6cHdB0lg,4006
@@ -28,7 +28,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=Y9zzt-RoRklkxxe_3VJbZvPghJ00KUjHtFUmD0pCdHs,18721
 tamar_model_client/schemas/outputs.py,sha256=M_fcqUtXPJnfiLabHlyA8BorlC5pYkf5KLjXO1ysKIQ,1031
-tamar_model_client-0.1.9.dist-info/METADATA,sha256=9EL7ZBkpNVy2J31gyYbzz53aahD5f1UYSn7qce1ePmk,16473
-tamar_model_client-0.1.9.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
-tamar_model_client-0.1.9.dist-info/top_level.txt,sha256=_LfDhPv_fvON0PoZgQuo4M7EjoWtxPRoQOBJziJmip8,19
-tamar_model_client-0.1.9.dist-info/RECORD,,
+tamar_model_client-0.1.11.dist-info/METADATA,sha256=Ia4eGAZVs3vebAQxIENipL-XfJ7_CXWag4OwFU3V5GA,16566
+tamar_model_client-0.1.11.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
+tamar_model_client-0.1.11.dist-info/top_level.txt,sha256=_LfDhPv_fvON0PoZgQuo4M7EjoWtxPRoQOBJziJmip8,19
+tamar_model_client-0.1.11.dist-info/RECORD,,