AI/ragflow
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/infiniflow/ragflow.git synced 2025-07-31 19:31:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added time to progress message (#4185)

Browse Source 
### What problem does this PR solve?

Added time to progress message

### Type of change

- [x] Refactoring
This commit is contained in:
Zhichang Yu 2024-12-23 17:25:55 +08:00 committed by GitHub
parent b635002666
commit 8d73cf6f02
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/db/services/task_service.py
View File

@ -17,6 +17,7 @@ import os
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
@ -84,7 +85,7 @@ class TaskService(CommonService):
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."

6
rag/svr/task_executor.py
View File

@ -83,7 +83,7 @@ FACTORY = {
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
@ -116,6 +116,8 @@ def set_progress(task_id, from_page=0, to_page=-1, prog=None, msg="Processing...
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
@ -550,7 +552,7 @@ def report_status():
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,