Merge pull request #2318 from visuddhinanda/development

Development

ai-translate/ai_translate/service.py

@@ -253,10 +253,11 @@ class AiTranslateService:
         response = requests.patch(
             url, json=data, headers=headers, timeout=self.api_timeout)
 
-        if not response.ok:
-            logger.error(f'ai_translate task status error: {response.json()}')
-        else:
+        if response.ok:
             logger.info(f'ai_translate task status successful ({status})')
+        else:
+            logger.error(
+                f'ai_translate task status update fail. response: {response.text}')
 
     def _save_model_log(self, token: str, data: Dict[str, Any]) -> bool:
         """保存模型日志"""

ai-translate/ai_translate/worker.py

@@ -28,9 +28,8 @@ def handle_message(redis, ch, method, id, content_type, body, api_url: str, cust
     except Exception as e:
         # retry
         retryKey = f'{redis[1]}/message/retry/{id}'
-        retry: int = 0
-        if redis[0].exists(retryKey):
-            retry = redis[0].get(retryKey)
+        retry = int(redis[0].get(retryKey)
+                    or 0) if redis[0].exists(retryKey) else 0
         if retry > MaxRetry:
             logger.error(f'超过最大重试次数[{MaxRetry}]，任务失败')
             # NACK 丢弃或者进入死信队列