zhangyong 6 months ago
parent
commit
c0992be000
3 changed files with 17 additions and 3 deletions
  1. 2 1
      common/aliyun_log.py
  2. 13 1
      docker-compose.yml
  3. 2 1
      job.py

+ 2 - 1
common/aliyun_log.py

@@ -6,6 +6,7 @@ import json
 from datetime import date, timedelta
 from datetime import datetime
 from typing import Optional
+from loguru import logger
 
 from aliyun.log import PutLogsRequest, LogClient, LogItem
 
@@ -72,4 +73,4 @@ class AliyunLogger:
 
             client.put_logs(request)
         except Exception as e:
-            print("写入日志失败")
+            logger.info( f'[+] 日志写入失败: {e}' )

+ 13 - 1
docker-compose.yml

@@ -20,10 +20,22 @@ services:
     restart: unless-stopped
     environment:
       - ENV=prod
-      - API_KEY=AIzaSyCor0q5w37Dy6fGxloLlCT7KqyEFU3PWP8
+      - API_KEY=AIzaSyB43Pvugb-CMkEXJUSubXEAxKxYflCPPNU
       - TASK_TYPE=top
     networks:
       - google_net
+  worker3:
+    depends_on:
+      - worker1
+    image: google_ai_studio
+    container_name: google_worker3
+    restart: unless-stopped
+    environment:
+      - ENV=prod
+      - API_KEY=AIzaSyCor0q5w37Dy6fGxloLlCT7KqyEFU3PWP8
+      - TASK_TYPE=recommend
+    networks:
+      - google_net
 
 networks:
   google_net:

+ 2 - 1
job.py

@@ -204,8 +204,9 @@ def run():
 
     usage_info, text = str(response.usage_metadata).replace('\n', ', '), response.text.strip()
     logger.info(f'[+] 使用情况: {usage_info}')
+    cleaned_text = text.replace("```json", '').replace("```", '').strip()
+    AliyunLogger.logging( str(redis_task['video_id']), redis_task['title'], redis_task['video_path'], mark, redis_task['type'], redis_task['partition'], str(cleaned_text))
     logger.info(f'[+] 模型响应结果: {text}')
-    AliyunLogger.logging( str( redis_task['video_id'] ), redis_task['title'], redis_task['video_path'], mark, redis_task['type'], redis_task['partition'], text )
 
     genai.delete_file(google_file)