zhangjf commited on
Commit
e8be0db
1 Parent(s): 41c4b88

update existing qas.json

Browse files
Files changed (1) hide show
  1. app.py +6 -5
app.py CHANGED
@@ -80,7 +80,7 @@ def read_qs():
80
 
81
  qs, qas = read_qs()
82
  start_time = time.time()
83
-
84
 
85
  def ask(query, max_attempt_times=3):
86
  answer = None
@@ -162,11 +162,12 @@ def download(access_key):
162
  def display(access_key):
163
  if not access_key==os.getenv('access_key'):
164
  chatbot_ret = [(f"Your entered Access Key:<br>{access_key}<br>is incorrect.", f"So i cannot provide you any information in this private space.")]
165
- elif len(qas)<1:
166
  chatbot_ret = [(f"Your entered Access Key is correct.", f"But the progress has just started for a while and has no useful progress information to provide.")]
167
  else:
 
168
  time_takes = time.time() - start_time
169
- time_remains = time_takes * (len(qs)-len(qas)) / len(qas)
170
  end_time = start_time + time_remains
171
 
172
  messages = []
@@ -174,12 +175,12 @@ def display(access_key):
174
  messages.append({"role":"user", "content":qa["q"]})
175
  messages.append({"role":"assistant", "content":qa["a"]})
176
  num_tokens_processed = num_tokens_from_messages(messages)
177
- num_tokens_total = int(num_tokens_processed * len(qs) / len(qas))
178
  dollars_tokens_processed = 0.002 * int(num_tokens_processed/1000)
179
  dollars_tokens_total = 0.002 * int(num_tokens_total/1000)
180
 
181
  chatbot_ret = [(f"Your entered Access Key is correct.", f"The information of progress is displayed below.")]
182
- chatbot_ret += [(f"The number of processed / total queries:", f"{len(qas)} / {len(qs)}")]
183
  chatbot_ret += [(f"The hours already takes / est. remains:", f"{time_takes/3600:.2f} / {time_remains/3600:.2f}")]
184
  chatbot_ret += [(f"The time starts / est. ends:", f"{timestamp2string(start_time)} / {timestamp2string(end_time)}")]
185
  chatbot_ret += [(f"The number of processed / est. total tokens:", f"{num_tokens_processed} / {num_tokens_total}")]
 
80
 
81
  qs, qas = read_qs()
82
  start_time = time.time()
83
+ num_read_qas = len(qas)
84
 
85
  def ask(query, max_attempt_times=3):
86
  answer = None
 
162
  def display(access_key):
163
  if not access_key==os.getenv('access_key'):
164
  chatbot_ret = [(f"Your entered Access Key:<br>{access_key}<br>is incorrect.", f"So i cannot provide you any information in this private space.")]
165
+ elif len(qas)-num_read_qas<1:
166
  chatbot_ret = [(f"Your entered Access Key is correct.", f"But the progress has just started for a while and has no useful progress information to provide.")]
167
  else:
168
+ num_total_qs, num_processed_qs = len(qs), len(qas) - num_read_qas
169
  time_takes = time.time() - start_time
170
+ time_remains = time_takes * (num_total_qs-num_processed_qs) / num_processed_qs
171
  end_time = start_time + time_remains
172
 
173
  messages = []
 
175
  messages.append({"role":"user", "content":qa["q"]})
176
  messages.append({"role":"assistant", "content":qa["a"]})
177
  num_tokens_processed = num_tokens_from_messages(messages)
178
+ num_tokens_total = int(num_tokens_processed * (num_total_qs+num_read_qas) / (num_processed_qs+num_read_qas))
179
  dollars_tokens_processed = 0.002 * int(num_tokens_processed/1000)
180
  dollars_tokens_total = 0.002 * int(num_tokens_total/1000)
181
 
182
  chatbot_ret = [(f"Your entered Access Key is correct.", f"The information of progress is displayed below.")]
183
+ chatbot_ret += [(f"The number of processed / total queries:", f"{num_processed_qs} / {num_total_qs} (+{num_read_qas})")]
184
  chatbot_ret += [(f"The hours already takes / est. remains:", f"{time_takes/3600:.2f} / {time_remains/3600:.2f}")]
185
  chatbot_ret += [(f"The time starts / est. ends:", f"{timestamp2string(start_time)} / {timestamp2string(end_time)}")]
186
  chatbot_ret += [(f"The number of processed / est. total tokens:", f"{num_tokens_processed} / {num_tokens_total}")]