zhangyong 5 months ago
parent
commit
dbe924c623
4 changed files with 8 additions and 15 deletions
  1. 2 2
      docker-compose.yml
  2. 1 11
      utils/google_ai_studio.py
  3. 3 1
      workers/consumption_work.py
  4. 2 1
      workers/select_work.py

+ 2 - 2
docker-compose.yml

@@ -1,5 +1,5 @@
 services:
 services:
-  worker1:
+  select:
     build:
     build:
       context: .
       context: .
       dockerfile: Dockerfile
       dockerfile: Dockerfile
@@ -25,5 +25,5 @@ services:
       replicas: 2
       replicas: 2
     entrypoint: sh /app/sh/select.sh
     entrypoint: sh /app/sh/select.sh
 networks:
 networks:
-  google_net:
+  supply_net:
     name: supply_net
     name: supply_net

+ 1 - 11
utils/google_ai_studio.py

@@ -1,9 +1,8 @@
 import os
 import os
 import time
 import time
 import uuid
 import uuid
-from typing import  Optional, Tuple
+from typing import  Optional
 
 
-import cv2
 import google.generativeai as genai
 import google.generativeai as genai
 import orjson
 import orjson
 import requests
 import requests
@@ -18,15 +17,6 @@ CACHE_DIR = '/app/cache/'
 # os.environ['https_proxy'] = PROXY_ADDR
 # os.environ['https_proxy'] = PROXY_ADDR
 
 
 class GoogleAI(object):
 class GoogleAI(object):
-    @classmethod
-    def get_video_duration(cls, video_link: str) -> int:
-        cap = cv2.VideoCapture(video_link)
-        if cap.isOpened():
-            rate = cap.get(5)
-            frame_num = cap.get(7)
-            duration = int(frame_num / rate)
-            return duration
-        return 0
 
 
     @classmethod
     @classmethod
     def download_video(cls, video_link: str) -> Optional[str]:
     def download_video(cls, video_link: str) -> Optional[str]:

+ 3 - 1
workers/consumption_work.py

@@ -1,5 +1,6 @@
 import asyncio
 import asyncio
 import os
 import os
+import sys
 import time
 import time
 from datetime import datetime
 from datetime import datetime
 
 
@@ -7,7 +8,7 @@ import orjson
 from apscheduler.schedulers.asyncio import AsyncIOScheduler
 from apscheduler.schedulers.asyncio import AsyncIOScheduler
 from apscheduler.triggers.cron import CronTrigger
 from apscheduler.triggers.cron import CronTrigger
 from loguru import logger
 from loguru import logger
-
+sys.path.append('/app')
 from utils.feishu_utils import Feishu
 from utils.feishu_utils import Feishu
 from utils.google_ai_studio import GoogleAI
 from utils.google_ai_studio import GoogleAI
 from utils.gpt4o_mimi import GPT4oMini
 from utils.gpt4o_mimi import GPT4oMini
@@ -15,6 +16,7 @@ from utils.piaoquan import PQ
 from utils.redis import RedisHelper
 from utils.redis import RedisHelper
 
 
 
 
+
 class ConsumptionRecommend(object):
 class ConsumptionRecommend(object):
     @classmethod
     @classmethod
     async def run(cls):
     async def run(cls):

+ 2 - 1
workers/select_work.py

@@ -1,12 +1,13 @@
 import asyncio
 import asyncio
 import datetime
 import datetime
+import sys
 import time
 import time
 
 
 import orjson
 import orjson
 from apscheduler.schedulers.asyncio import AsyncIOScheduler
 from apscheduler.schedulers.asyncio import AsyncIOScheduler
 from apscheduler.triggers.cron import CronTrigger
 from apscheduler.triggers.cron import CronTrigger
 from loguru import logger
 from loguru import logger
-
+sys.path.append('/app')
 from utils.feishu_utils import Feishu
 from utils.feishu_utils import Feishu
 from utils.odps_data import OdpsDataCount
 from utils.odps_data import OdpsDataCount
 from utils.redis import RedisHelper
 from utils.redis import RedisHelper