zhichyu commited on
Commit
7f2b93e
·
1 Parent(s): 43c49ab

Added time to progress message (#4185)

Browse files

### What problem does this PR solve?

Added time to progress message

### Type of change

- [x] Refactoring

api/db/services/task_service.py CHANGED
@@ -17,6 +17,7 @@ import os
17
  import random
18
  import xxhash
19
  import bisect
 
20
 
21
  from api.db.db_utils import bulk_insert_into_db
22
  from deepdoc.parser import PdfParser
@@ -84,7 +85,7 @@ class TaskService(CommonService):
84
  if not docs:
85
  return None
86
 
87
- msg = "\nTask has been received."
88
  prog = random.random() / 10.0
89
  if docs[0]["retry_count"] >= 3:
90
  msg = "\nERROR: Task is abandoned after 3 times attempts."
 
17
  import random
18
  import xxhash
19
  import bisect
20
+ from datetime import datetime
21
 
22
  from api.db.db_utils import bulk_insert_into_db
23
  from deepdoc.parser import PdfParser
 
85
  if not docs:
86
  return None
87
 
88
+ msg = f"\n{datetime.now().strftime('%H:%M:%S.%f')} Task has been received."
89
  prog = random.random() / 10.0
90
  if docs[0]["retry_count"] >= 3:
91
  msg = "\nERROR: Task is abandoned after 3 times attempts."
rag/svr/task_executor.py CHANGED
@@ -83,7 +83,7 @@ FACTORY = {
83
 
84
  CONSUMER_NAME = "task_consumer_" + CONSUMER_NO
85
  PAYLOAD: Payload | None = None
86
- BOOT_AT = datetime.now().isoformat()
87
  PENDING_TASKS = 0
88
  LAG_TASKS = 0
89
 
@@ -116,6 +116,8 @@ def set_progress(task_id, from_page=0, to_page=-1, prog=None, msg="Processing...
116
  if to_page > 0:
117
  if msg:
118
  msg = f"Page({from_page + 1}~{to_page + 1}): " + msg
 
 
119
  d = {"progress_msg": msg}
120
  if prog is not None:
121
  d["progress"] = prog
@@ -550,7 +552,7 @@ def report_status():
550
  with mt_lock:
551
  heartbeat = json.dumps({
552
  "name": CONSUMER_NAME,
553
- "now": now.isoformat(),
554
  "boot_at": BOOT_AT,
555
  "pending": PENDING_TASKS,
556
  "lag": LAG_TASKS,
 
83
 
84
  CONSUMER_NAME = "task_consumer_" + CONSUMER_NO
85
  PAYLOAD: Payload | None = None
86
+ BOOT_AT = datetime.now().astimezone().isoformat(timespec="milliseconds")
87
  PENDING_TASKS = 0
88
  LAG_TASKS = 0
89
 
 
116
  if to_page > 0:
117
  if msg:
118
  msg = f"Page({from_page + 1}~{to_page + 1}): " + msg
119
+ if msg:
120
+ msg = datetime.now().strftime("%H:%M:%S.%f") + " " + msg
121
  d = {"progress_msg": msg}
122
  if prog is not None:
123
  d["progress"] = prog
 
552
  with mt_lock:
553
  heartbeat = json.dumps({
554
  "name": CONSUMER_NAME,
555
+ "now": now.astimezone().isoformat(timespec="milliseconds"),
556
  "boot_at": BOOT_AT,
557
  "pending": PENDING_TASKS,
558
  "lag": LAG_TASKS,