FIX AutoDL修复log

This commit is contained in:
kyj@bowong.ai 2025-04-17 15:58:10 +08:00
parent d0cc6f27b5
commit 8a61905b55
2 changed files with 4 additions and 3 deletions

View File

@ -30,7 +30,7 @@ class RunningPool:
def result(self, uid:str) -> Union[dict, None]:
if uid in self.tasks:
try:
resp = requests.get(self.tasks[uid]["base_url"] + "/" + self.tasks[uid]["code"], headers=self._headers)
resp = requests.get(self.tasks[uid]["base_url"] + "/" + self.tasks[uid]["code"], headers=self._headers, timeout=10)
if resp.status_code != 200:
raise Exception("%s Get Result Failed: %s" % (uid, resp.status_code))
else:
@ -59,7 +59,7 @@ class RunningPool:
"audio_file": audio_file
}
resp = requests.post(base_url, data, headers=self._headers, allow_redirects=True, stream=True)
loguru.logger.info("Submit Response: " % resp.text)
loguru.logger.info("Submit Response: %s" % resp.text)
if resp.status_code == 200:
if resp.json()["status"] == "success":
code = resp.json()["code"]

View File

@ -22,7 +22,7 @@ class Server:
self.waiting_queue = WaitingQueue()
self.running_pool = RunningPool()
#账号限制max_instance不能超过30
self.instance_pool = InstancePool(max_instance=5)
self.instance_pool = InstancePool(max_instance=3)
self.result_map = ResultMap()
self.executor = ThreadPoolExecutor(max_workers=2)
self.worker_1 = self.executor.submit(self.scaling_worker)
@ -77,6 +77,7 @@ class Server:
if not instance.active:
# 从等待队列取出任务
uid, video_path, audio_path = self.waiting_queue.dequeue()
loguru.logger.info("Task[%s] Submitting to Instance[%s]" % (uid, instance.uuid))
# 提交任务到运行池
if self.running_pool.run(instance.uuid, uid, instance.domain, video_path, audio_path):
# 更新实例池状态