Browse Source

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 months ago
parent
commit
8d73cf6f02
No account linked to committer's email address
2 changed files with 6 additions and 3 deletions
  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 View File

import random import random
import xxhash import xxhash
import bisect import bisect
from datetime import datetime


from api.db.db_utils import bulk_insert_into_db from api.db.db_utils import bulk_insert_into_db
from deepdoc.parser import PdfParser from deepdoc.parser import PdfParser
if not docs: if not docs:
return None 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 prog = random.random() / 10.0
if docs[0]["retry_count"] >= 3: if docs[0]["retry_count"] >= 3:
msg = "\nERROR: Task is abandoned after 3 times attempts." msg = "\nERROR: Task is abandoned after 3 times attempts."

+ 4
- 2
rag/svr/task_executor.py View File



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


if to_page > 0: if to_page > 0:
if msg: if msg:
msg = f"Page({from_page + 1}~{to_page + 1}): " + 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} d = {"progress_msg": msg}
if prog is not None: if prog is not None:
d["progress"] = prog d["progress"] = prog
with mt_lock: with mt_lock:
heartbeat = json.dumps({ heartbeat = json.dumps({
"name": CONSUMER_NAME, "name": CONSUMER_NAME,
"now": now.isoformat(),
"now": now.astimezone().isoformat(timespec="milliseconds"),
"boot_at": BOOT_AT, "boot_at": BOOT_AT,
"pending": PENDING_TASKS, "pending": PENDING_TASKS,
"lag": LAG_TASKS, "lag": LAG_TASKS,

Loading…
Cancel
Save