tamar-model-client 0.1.21__py3-none-any.whl → 0.1.23__py3-none-any.whl

tamar_model_client/sync_client.py

@@ -31,7 +31,7 @@ from .core import (
     generate_request_id,
     set_request_id,
     get_protected_logger,
-    MAX_MESSAGE_LENGTH
+    MAX_MESSAGE_LENGTH, get_request_id
 )
 from .core.base_client import BaseClient
 from .core.request_builder import RequestBuilder
@@ -201,10 +201,17 @@ class TamarModelClient(BaseClient, HttpFallbackMixin):
         """
         使用增强的错误处理器进行重试（同步版本）
         """
+        # 记录方法开始时间
+        method_start_time = time.time()
+        
+        # 从kwargs中提取request_id（如果有的话），然后移除它
+        request_id = kwargs.pop('request_id', None) or get_request_id()
+        
         # 构建请求上下文
         context = {
             'method': func.__name__ if hasattr(func, '__name__') else 'unknown',
             'client_version': 'sync',
+            'request_id': request_id,
         }
 
         last_exception = None
@@ -222,9 +229,14 @@ class TamarModelClient(BaseClient, HttpFallbackMixin):
                 should_retry = self._should_retry(e, attempt)
                 if not should_retry or attempt >= self.max_retries:
                     # 不可重试或已达到最大重试次数
+                    current_duration = time.time() - method_start_time
+                    context['duration'] = current_duration
                     last_exception = self.error_handler.handle_error(e, context)
                     break
 
+                # 计算当前的耗时
+                current_duration = time.time() - method_start_time
+                
                 # 记录重试日志
                 log_data = {
                     "log_type": "info",
@@ -234,7 +246,8 @@ class TamarModelClient(BaseClient, HttpFallbackMixin):
                         "retry_count": attempt,
                         "max_retries": self.max_retries,
                         "method": context.get('method', 'unknown')
-                    }
+                    },
+                    "duration": current_duration
                 }
                 logger.warning(
                     f"Attempt {attempt + 1}/{self.max_retries + 1} failed: {e.code()}",
@@ -246,6 +259,7 @@ class TamarModelClient(BaseClient, HttpFallbackMixin):
                     delay = self._calculate_backoff(attempt, e.code())
                     time.sleep(delay)
 
+                context['duration'] = current_duration
                 last_exception = self.error_handler.handle_error(e, context)
 
             except Exception as e:
@@ -260,6 +274,73 @@ class TamarModelClient(BaseClient, HttpFallbackMixin):
         else:
             raise TamarModelException("Unknown error occurred")
 
+    def _should_retry(self, error: grpc.RpcError, attempt: int) -> bool:
+        """
+        判断是否应该重试
+        
+        Args:
+            error: gRPC错误
+            attempt: 当前重试次数
+            
+        Returns:
+            bool: 是否应该重试
+        """
+        error_code = error.code()
+        from .exceptions import get_retry_policy, ErrorContext
+        policy = get_retry_policy(error_code)
+        
+        # 先检查错误级别的 max_attempts 配置
+        # max_attempts 表示最大重试次数（不包括初始请求）
+        error_max_attempts = policy.get('max_attempts', self.max_retries)
+        if attempt >= error_max_attempts:
+            return False
+            
+        # 再检查全局的 max_retries
+        if attempt >= self.max_retries:
+            return False
+        
+        retryable = policy.get('retryable', False)
+        
+        if retryable == False:
+            return False
+        elif retryable == True:
+            return True
+        elif retryable == 'conditional':
+            # 条件重试，特殊处理
+            if error_code == grpc.StatusCode.CANCELLED:
+                # 检查是否是网络中断导致的取消
+                context = {'method': 'unknown', 'client_version': 'sync'}
+                error_context = ErrorContext(error, context)
+                return error_context.is_network_cancelled()
+            else:
+                return self._check_error_details_for_retry(error)
+        
+        return False
+    
+    def _check_error_details_for_retry(self, error: grpc.RpcError) -> bool:
+        """
+        检查错误详情决定是否重试
+        
+        Args:
+            error: gRPC错误
+            
+        Returns:
+            bool: 是否应该重试
+        """
+        error_message = error.details().lower() if error.details() else ""
+        
+        # 可重试的错误模式
+        retryable_patterns = [
+            'temporary', 'timeout', 'unavailable', 
+            'connection', 'network', 'try again'
+        ]
+        
+        for pattern in retryable_patterns:
+            if pattern in error_message:
+                return True
+                
+        return False
+
     def _calculate_backoff(self, attempt: int, error_code: grpc.StatusCode = None) -> float:
         """
         计算退避时间，支持不同的退避策略
@@ -316,10 +397,17 @@ class TamarModelClient(BaseClient, HttpFallbackMixin):
         Yields:
             流式响应的每个元素
         """
+        # 记录方法开始时间
+        method_start_time = time.time()
+        
+        # 从kwargs中提取request_id（如果有的话），然后移除它
+        request_id = kwargs.pop('request_id', None) or get_request_id()
+        
         last_exception = None
         context = {
             'method': 'stream',
             'client_version': 'sync',
+            'request_id': request_id,
         }
         
         for attempt in range(self.max_retries + 1):
@@ -334,6 +422,9 @@ class TamarModelClient(BaseClient, HttpFallbackMixin):
                 # 使用智能重试判断
                 context['retry_count'] = attempt
                 
+                # 计算当前的耗时
+                current_duration = time.time() - method_start_time
+                
                 # 判断是否应该重试
                 should_retry = self._should_retry(e, attempt)
                 if not should_retry or attempt >= self.max_retries:
@@ -347,12 +438,14 @@ class TamarModelClient(BaseClient, HttpFallbackMixin):
                             "max_retries": self.max_retries,
                             "method": "stream",
                             "will_retry": False
-                        }
+                        },
+                        "duration": current_duration
                     }
                     logger.error(
                         f"Stream failed: {e.code()} (no retry)",
                         extra=log_data
                     )
+                    context['duration'] = current_duration
                     last_exception = self.error_handler.handle_error(e, context)
                     break
                 
@@ -365,7 +458,8 @@ class TamarModelClient(BaseClient, HttpFallbackMixin):
                         "retry_count": attempt,
                         "max_retries": self.max_retries,
                         "method": "stream"
-                    }
+                    },
+                    "duration": current_duration
                 }
                 logger.warning(
                     f"Stream attempt {attempt + 1}/{self.max_retries + 1} failed: {e.code()} (will retry)",
@@ -609,10 +703,11 @@ class TamarModelClient(BaseClient, HttpFallbackMixin):
                 # 对于流式响应，使用重试包装器
                 return self._retry_request_stream(
                     self._stream_with_logging,
-                    request, metadata, invoke_timeout, start_time, model_request
+                    request, metadata, invoke_timeout, start_time, model_request,
+                    request_id=request_id
                 )
             else:
-                result = self._retry_request(self._invoke_request, request, metadata, invoke_timeout)
+                result = self._retry_request(self._invoke_request, request, metadata, invoke_timeout, request_id=request_id)
 
                 # 记录非流式响应的成功日志
                 duration = time.time() - start_time
@@ -742,7 +837,8 @@ class TamarModelClient(BaseClient, HttpFallbackMixin):
                 self.stub.BatchInvoke,
                 batch_request,
                 metadata=metadata,
-                timeout=invoke_timeout
+                timeout=invoke_timeout,
+                request_id=request_id
             )
 
             # 构建响应对象

{tamar_model_client-0.1.21.dist-info → tamar_model_client-0.1.23.dist-info}/METADATA

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

@@ -1,12 +1,12 @@
 tamar_model_client/__init__.py,sha256=4DEIUGlLTeiaECjJQbGYik7C0JO6hHwwfbLYpYpMdzg,444
-tamar_model_client/async_client.py,sha256=cU3cUrwP75zacyFa3KibcYfacJBsxRNLIu1vtQZrrcU,32836
+tamar_model_client/async_client.py,sha256=H6IhGI415DGXoeNAd4A0anw1oL4Ss3LYdcEVeG_Co68,34416
 tamar_model_client/auth.py,sha256=gbwW5Aakeb49PMbmYvrYlVx1mfyn1LEDJ4qQVs-9DA4,438
 tamar_model_client/circuit_breaker.py,sha256=0XHJXBYA4O8vwsDGwqNrae9zxNJphY5Rfucc9ytVFGA,5419
-tamar_model_client/error_handler.py,sha256=kVfHL7DWvO3sIobjVuJbqjV4mtI4oqbS4Beax7Dmm9w,11788
-tamar_model_client/exceptions.py,sha256=FImLCBpYQ8DpsNbH-ZttxyClEZCL6ICmQGESIlbI--s,12038
+tamar_model_client/error_handler.py,sha256=oI_jUTjnq4OXu8fwJoGXNmQpddEgOFF9ZUhbytq7H6c,12384
+tamar_model_client/exceptions.py,sha256=D6G8igA-YO4AroeCa-9CDDPt4hSqBFX5C_4w-NCIL1w,13063
 tamar_model_client/json_formatter.py,sha256=IyBv_pEEzjF-KaMF-7rxRpNc_fxRYK2A-pu_2n4Liow,1990
 tamar_model_client/logging_icons.py,sha256=MRTZ1Xvkep9ce_jdltj54_XZUXvIpQ95soRNmLdJ4qw,1837
-tamar_model_client/sync_client.py,sha256=AhNFlhk9aC7JhNrI2BEZJDLjXZwVT9pMy3u9jgjO1QU,32603
+tamar_model_client/sync_client.py,sha256=RDM-ptIL0cNIie-2qpkTEFh60XTks8p2Wdz0Q5YHA1Q,36241
 tamar_model_client/utils.py,sha256=Kn6pFz9GEC96H4eejEax66AkzvsrXI3WCSDtgDjnVTI,5238
 tamar_model_client/core/__init__.py,sha256=bJRJllrp4Xc0g_qu1pW9G-lsXNB7c1r0NBIfb2Ypxe0,832
 tamar_model_client/core/base_client.py,sha256=sYvJZsDu_66akddAMowSnihFtgOoVKaQJxxnVruF9Ms,8995
@@ -27,9 +27,10 @@ tamar_model_client/schemas/inputs.py,sha256=dz1m8NbUIxA99JXZc8WlyzbKpDuz1lEzx3Vg
 tamar_model_client/schemas/outputs.py,sha256=M_fcqUtXPJnfiLabHlyA8BorlC5pYkf5KLjXO1ysKIQ,1031
 tests/__init__.py,sha256=kbmImddLDwdqlkkmkyKtl4bQy_ipe-R8eskpaBylU9w,38
 tests/stream_hanging_analysis.py,sha256=W3W48IhQbNAR6-xvMpoWZvnWOnr56CTaH4-aORNBuD4,14807
-tests/test_google_azure_final.py,sha256=wAnfodYCs8VIqYlgT6nm1YnLnufqSuYfXBaVqCXkmfU,17019
+tests/test_google_azure_final.py,sha256=9UI8G62prmnflBm4XuOxvBBshYvwCLQ1H2pqbish_DQ,26390
+tests/test_logging_issue.py,sha256=JTMbotfHpAEPMBj73pOwxPn-Zn4QVQJX6scMz48FRDQ,2427
 tests/test_simple.py,sha256=Xf0U-J9_xn_LzUsmYu06suK0_7DrPeko8OHoHldsNxE,7169
-tamar_model_client-0.1.21.dist-info/METADATA,sha256=gj8tUbP3goUZKi3pVVWMxEpmmK6W72IV23Ym2ohlcBs,23453
-tamar_model_client-0.1.21.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tamar_model_client-0.1.21.dist-info/top_level.txt,sha256=f1I-S8iWN-cgv4gB8gxRg9jJOTJMumvm4oGKVPfGg6A,25
-tamar_model_client-0.1.21.dist-info/RECORD,,
+tamar_model_client-0.1.23.dist-info/METADATA,sha256=aW4OAMkth31oY5n04wM1QTkfH7K1TFio9nrnQML5W6g,23453
+tamar_model_client-0.1.23.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tamar_model_client-0.1.23.dist-info/top_level.txt,sha256=f1I-S8iWN-cgv4gB8gxRg9jJOTJMumvm4oGKVPfGg6A,25
+tamar_model_client-0.1.23.dist-info/RECORD,,