Explorar el Código

video insight

丁云鹏 hace 1 mes
padre
commit
7112f28798
Se han modificado 5 ficheros con 17 adiciones y 11 borrados
  1. 5 5
      docker-compose.yml
  2. 2 2
      product.env
  3. 1 1
      start.sh
  4. 8 2
      utils/mysql_db.py
  5. 1 1
      workers/consumption_work.py

+ 5 - 5
docker-compose.yml

@@ -3,16 +3,16 @@ services:
     build:
     build:
       context: .
       context: .
       dockerfile: Dockerfile
       dockerfile: Dockerfile
-    image: content_job
-    container_name: content_worker1
+    image: video_insight_job
+    container_name: video_insight_worker1
     restart: unless-stopped
     restart: unless-stopped
     environment:
     environment:
       - ENV=prod
       - ENV=prod
     networks:
     networks:
-      - content_net
+      - video_insight_net
     entrypoint: "python /app/workers/select_work.py"
     entrypoint: "python /app/workers/select_work.py"
   consumption:
   consumption:
-    image: content_job
+    image: video_insight_job
     restart: unless-stopped
     restart: unless-stopped
     env_file:
     env_file:
       - product.env
       - product.env
@@ -20,7 +20,7 @@ services:
       - ./sh:/app/sh
       - ./sh:/app/sh
       - /var/run/docker.sock:/var/run/docker.sock:ro
       - /var/run/docker.sock:/var/run/docker.sock:ro
     networks:
     networks:
-      - content_net
+      - video_insight_net
     deploy:
     deploy:
       replicas: 2
       replicas: 2
     entrypoint: sh /app/start.sh
     entrypoint: sh /app/start.sh

+ 2 - 2
product.env

@@ -1,5 +1,5 @@
 ENV=prod
 ENV=prod
-GEMINI_API_KEY_1=AIzaSyBFLCKMLX-Pf1iXoC2e_rMDLbNhNG23vTk
-GEMINI_API_KEY_2=AIzaSyBGPYEc9F3FoDEqwlaVBxUHsNdkxmR_sl0
+VIDEO_INSIGHT_GEMINI_API_KEY_1=AIzaSyBFLCKMLX-Pf1iXoC2e_rMDLbNhNG23vTk
+VIDEO_INSIGHT_GEMINI_API_KEY_2=AIzaSyBGPYEc9F3FoDEqwlaVBxUHsNdkxmR_sl0
 
 
 
 

+ 1 - 1
start.sh

@@ -2,7 +2,7 @@
 
 
 export CONTAINER_INFO="$(curl -s --unix-socket /var/run/docker.sock http://docker/containers/$HOSTNAME/json)"
 export CONTAINER_INFO="$(curl -s --unix-socket /var/run/docker.sock http://docker/containers/$HOSTNAME/json)"
 export CONTAINER_INDEX="$(echo "$CONTAINER_INFO" | jq '.Name' | sed 's/^"\(.*\)"$/\1/' | awk -F'-' '{print $NF}')"
 export CONTAINER_INDEX="$(echo "$CONTAINER_INFO" | jq '.Name' | sed 's/^"\(.*\)"$/\1/' | awk -F'-' '{print $NF}')"
-echo "export GEMINI_API_KEY=$(eval echo \$"GEMINI_API_KEY_${CONTAINER_INDEX}")" >> /root/.bashrc
+echo "export VIDEO_INSIGHT_GEMINI_API_KEY=$(eval echo \$"VIDEO_INSIGHT_GEMINI_API_KEY_${CONTAINER_INDEX}")" >> /root/.bashrc
 . /root/.bashrc
 . /root/.bashrc
 
 
 python /app/workers/consumption_work.py
 python /app/workers/consumption_work.py

+ 8 - 2
utils/mysql_db.py

@@ -57,9 +57,15 @@ class MysqlHelper:
             return res
             return res
         except Exception as e:
         except Exception as e:
             # 发生错误时回滚
             # 发生错误时回滚
+            print(f"Error executing SQL: {e}")
             connect.rollback()
             connect.rollback()
-        # 关闭数据库连接
-        connect.close()
+            return None  # 返回 None 表示失败
+        finally:
+            # 确保资源关闭
+            if mysql:
+                mysql.close()
+            if connect:
+                connect.close()
 
 
 
 
 
 

+ 1 - 1
workers/consumption_work.py

@@ -78,7 +78,7 @@ class ConsumptionRecommend(object):
         sql += ",\n".join(values) + ";"
         sql += ",\n".join(values) + ";"
         # Print SQL statement
         # Print SQL statement
         print(sql)
         print(sql)
-        MysqlHelper.update(sql)
+        MysqlHelper.update_values(sql)
 
 
         # AliyunLogger.logging(str(video_id), orjson.dumps(text).decode())
         # AliyunLogger.logging(str(video_id), orjson.dumps(text).decode())
         logger.info(f"[处理] 写入日志成功")
         logger.info(f"[处理] 写入日志成功")