deployer 3 anni fa
parent
commit
0703032bb6
1 ha cambiato i file con 7 aggiunte e 7 eliminazioni
  1. 7 7
      api/main.py

+ 7 - 7
api/main.py

@@ -697,7 +697,7 @@ async def make_anchor_video_eng(req:util.models.request_eng,token: str = Depends
     if 6 in util.user.get_user_role_list(user_id):
     if 6 in util.user.get_user_role_list(user_id):
         freeTrial = 1
         freeTrial = 1
     print(freeTrial)
     print(freeTrial)
-    x = threading.Thread(target=gen_video_queue_eng, args=(name_hash,req.name, req.text_content, req.image_urls,req.sub_titles,int(req.avatar),video_id,freeTrial))
+    x = threading.Thread(target=gen_video_queue_eng, args=(name_hash,req.name, req.text_content, req.image_urls,req.sub_titles,int(req.avatar),video_id,user_id,freeTrial))
     x.start()
     x.start()
      
      
     if first(db.query('SELECT COUNT(1) FROM video_queue'))['COUNT(1)'] >= 3:
     if first(db.query('SELECT COUNT(1) FROM video_queue'))['COUNT(1)'] >= 3:
@@ -727,7 +727,7 @@ async def make_anchor_video_eng(req:util.models.request_eng):
  
  
     video_id = save_history(req,name_hash, -1)
     video_id = save_history(req,name_hash, -1)
     freeTrial = 1
     freeTrial = 1
-    x = threading.Thread(target=gen_video_queue_eng, args=(name_hash,req.name, req.text_content, req.image_urls,req.sub_titles,int(req.avatar),video_id,freeTrial))
+    x = threading.Thread(target=gen_video_queue_eng, args=(name_hash,req.name, req.text_content, req.image_urls,req.sub_titles,int(req.avatar),video_id,-1,freeTrial))
     x.start()
     x.start()
      
      
     if first(db.query('SELECT COUNT(1) FROM video_queue'))['COUNT(1)'] >= 3:
     if first(db.query('SELECT COUNT(1) FROM video_queue'))['COUNT(1)'] >= 3:
@@ -757,7 +757,7 @@ async def make_anchor_video_eng(req:util.models.request_eng):
  
  
     video_id = save_history(req,name_hash, -1)
     video_id = save_history(req,name_hash, -1)
     freeTrial = 1
     freeTrial = 1
-    x = threading.Thread(target=gen_video_queue_eng, args=(name_hash,req.name, req.text_content, req.image_urls,req.sub_titles,int(req.avatar),video_id,freeTrial))
+    x = threading.Thread(target=gen_video_queue_eng, args=(name_hash,req.name, req.text_content, req.image_urls,req.sub_titles,int(req.avatar),video_id,-1,freeTrial))
     x.start()
     x.start()
      
      
     if first(db.query('SELECT COUNT(1) FROM video_queue'))['COUNT(1)'] >= 3:
     if first(db.query('SELECT COUNT(1) FROM video_queue'))['COUNT(1)'] >= 3:
@@ -1141,7 +1141,7 @@ def gen_video_queue(name_hash,name,text_content, image_urls,avatar,multiLang,vid
         db.close()
         db.close()
     db.close()
     db.close()
 
 
-def gen_video_queue_eng(name_hash,name,text_content, image_urls,sub_titles,avatar,video_id,freeTrial):
+def gen_video_queue_eng(name_hash,name,text_content, image_urls,sub_titles,avatar,video_id,user_id,freeTrial):
     db = dataset.connect('mysql://choozmo:pAssw0rd@db.ptt.cx:3306/AI_anchor?charset=utf8mb4')
     db = dataset.connect('mysql://choozmo:pAssw0rd@db.ptt.cx:3306/AI_anchor?charset=utf8mb4')
     if name_hash == 'keepRunning':
     if name_hash == 'keepRunning':
         if first(db.query('SELECT COUNT(1) FROM video_queue where video_type="eng"'))['COUNT(1)'] == 0:
         if first(db.query('SELECT COUNT(1) FROM video_queue where video_type="eng"'))['COUNT(1)'] == 0:
@@ -1164,7 +1164,7 @@ def gen_video_queue_eng(name_hash,name,text_content, image_urls,sub_titles,avata
         subtitles_seperate_by_dot = subtitles_seperate_by_dot[:-1]
         subtitles_seperate_by_dot = subtitles_seperate_by_dot[:-1]
 
 
         db['video_queue'].insert({'name_hash':name_hash,'name':name,'text_content':txt_content_seperate_by_dot
         db['video_queue'].insert({'name_hash':name_hash,'name':name,'text_content':txt_content_seperate_by_dot
-        ,'image_urls':img_urls_seperate_by_dot,'subtitles':subtitles_seperate_by_dot,'multiLang':multiLang,'video_type':'eng','avatar':avatar,'timestamp':time_stamp,'freeTrial':freeTrial})
+        ,'image_urls':img_urls_seperate_by_dot,'subtitles':subtitles_seperate_by_dot,'video_type':'eng','avatar':avatar,'timestamp':time_stamp,'freeTrial':freeTrial})
     while True:
     while True:
         db = dataset.connect('mysql://choozmo:pAssw0rd@db.ptt.cx:3306/AI_anchor?charset=utf8mb4')
         db = dataset.connect('mysql://choozmo:pAssw0rd@db.ptt.cx:3306/AI_anchor?charset=utf8mb4')
         if first(db.query('SELECT * FROM video_queue_status'))['status'] == 1:#only one row in this table, which is the id 1 one
         if first(db.query('SELECT * FROM video_queue_status'))['status'] == 1:#only one row in this table, which is the id 1 one
@@ -1325,10 +1325,10 @@ def db_check():
 
 
 
 
 def clear_video_queue():
 def clear_video_queue():
-    x = threading.Thread(target=gen_video_queue_eng, args=('keepRunning','', '', '','','',''))
+    x = threading.Thread(target=gen_video_queue_eng, args=('keepRunning','', '', '','','','',-1,0))
     x.start()
     x.start()
 
 
-    x2 = threading.Thread(target=gen_video_queue, args=('keepRunning','', '', '','','','',''))
+    x2 = threading.Thread(target=gen_video_queue, args=('keepRunning','', '', '','','','',-1,0))
     x2.start()
     x2.start()
 
 
     x3 = threading.Thread(target=gen_video_long_queue, args=('keepRunning','', '', '','','','',''))
     x3 = threading.Thread(target=gen_video_long_queue, args=('keepRunning','', '', '','','','',''))