Просмотр исходного кода

Added time to progress message (#4185)

### What problem does this PR solve?

Added time to progress message

### Type of change

- [x] Refactoring
tags/v0.15.1
Zhichang Yu 10 месяцев назад
Родитель
Сommit
8d73cf6f02
Аккаунт пользователя с таким Email не найден
2 измененных файлов: 6 добавлений и 3 удалений
  1. 2
    1
      api/db/services/task_service.py
  2. 4
    2
      rag/svr/task_executor.py

+ 2
- 1
api/db/services/task_service.py Просмотреть файл

@@ -17,6 +17,7 @@ import os
import random
import xxhash
import bisect
from datetime import datetime

from api.db.db_utils import bulk_insert_into_db
from deepdoc.parser import PdfParser
@@ -84,7 +85,7 @@ class TaskService(CommonService):
if not docs:
return None

msg = "\nTask has been received."
msg = f"\n{datetime.now().strftime('%H:%M:%S.%f')} Task has been received."
prog = random.random() / 10.0
if docs[0]["retry_count"] >= 3:
msg = "\nERROR: Task is abandoned after 3 times attempts."

+ 4
- 2
rag/svr/task_executor.py Просмотреть файл

@@ -83,7 +83,7 @@ FACTORY = {

CONSUMER_NAME = "task_consumer_" + CONSUMER_NO
PAYLOAD: Payload | None = None
BOOT_AT = datetime.now().isoformat()
BOOT_AT = datetime.now().astimezone().isoformat(timespec="milliseconds")
PENDING_TASKS = 0
LAG_TASKS = 0

@@ -116,6 +116,8 @@ def set_progress(task_id, from_page=0, to_page=-1, prog=None, msg="Processing...
if to_page > 0:
if msg:
msg = f"Page({from_page + 1}~{to_page + 1}): " + msg
if msg:
msg = datetime.now().strftime("%H:%M:%S.%f") + " " + msg
d = {"progress_msg": msg}
if prog is not None:
d["progress"] = prog
@@ -550,7 +552,7 @@ def report_status():
with mt_lock:
heartbeat = json.dumps({
"name": CONSUMER_NAME,
"now": now.isoformat(),
"now": now.astimezone().isoformat(timespec="milliseconds"),
"boot_at": BOOT_AT,
"pending": PENDING_TASKS,
"lag": LAG_TASKS,

Загрузка…
Отмена
Сохранить