rynmurdock commited on
Commit
1ee2207
·
1 Parent(s): 5f63f2a
Files changed (1) hide show
  1. app.py +5 -10
app.py CHANGED
@@ -230,11 +230,8 @@ def background_next_image():
230
  # only let it get N (maybe 3) ahead of the user
231
  #not_rated_rows = prevs_df[[i[1]['user:rating'] == {' ': ' '} for i in prevs_df.iterrows()]]
232
  rated_rows = prevs_df[[i[1]['user:rating'] != {' ': ' '} for i in prevs_df.iterrows()]]
233
- #while len(rated_rows) < 4:
234
- # not_rated_rows = prevs_df[[i[1]['user:rating'] == {' ': ' '} for i in prevs_df.iterrows()]]
235
- # rated_rows = prevs_df[[i[1]['user:rating'] != {' ': ' '} for i in prevs_df.iterrows()]]
236
- # time.sleep(.01)
237
- # print('all users have 4 or less rows rated')
238
 
239
  user_id_list = set(rated_rows['latest_user_to_rate'].to_list())
240
  for uid in user_id_list:
@@ -257,9 +254,6 @@ def background_next_image():
257
  print('skipping because >=10 in queue unrated for user')
258
  continue
259
 
260
- if len(rated_from_user) < 4:
261
- continue
262
-
263
  print(uid)
264
  embs, ys = pluck_embs_ys(uid)
265
 
@@ -307,11 +301,10 @@ def next_image(calibrate_prompts, user_id):
307
  print('######### Calibrating with sample media #########')
308
  cal_video = calibrate_prompts.pop(0)
309
  image = prevs_df[prevs_df['paths'] == cal_video]['paths'].to_list()[0]
310
-
311
  return image, calibrate_prompts
312
  else:
313
  print('######### Roaming #########')
314
- is_started = True
315
  embs, ys = pluck_embs_ys(user_id)
316
  user_emb = get_user_emb(embs, ys)
317
  image = pluck_img(user_id, user_emb)
@@ -328,9 +321,11 @@ is_started = False
328
 
329
  def bg_check(_):
330
  global is_started
 
331
  if not is_started:
332
  scheduler.add_job(func=background_next_image, trigger="interval", seconds=.1)
333
  scheduler.start()
 
334
 
335
  def start(_, calibrate_prompts, user_id, request: gr.Request):
336
  global is_started
 
230
  # only let it get N (maybe 3) ahead of the user
231
  #not_rated_rows = prevs_df[[i[1]['user:rating'] == {' ': ' '} for i in prevs_df.iterrows()]]
232
  rated_rows = prevs_df[[i[1]['user:rating'] != {' ': ' '} for i in prevs_df.iterrows()]]
233
+ if len(rated_rows) < 4:
234
+ return
 
 
 
235
 
236
  user_id_list = set(rated_rows['latest_user_to_rate'].to_list())
237
  for uid in user_id_list:
 
254
  print('skipping because >=10 in queue unrated for user')
255
  continue
256
 
 
 
 
257
  print(uid)
258
  embs, ys = pluck_embs_ys(uid)
259
 
 
301
  print('######### Calibrating with sample media #########')
302
  cal_video = calibrate_prompts.pop(0)
303
  image = prevs_df[prevs_df['paths'] == cal_video]['paths'].to_list()[0]
304
+ is_started = True
305
  return image, calibrate_prompts
306
  else:
307
  print('######### Roaming #########')
 
308
  embs, ys = pluck_embs_ys(user_id)
309
  user_emb = get_user_emb(embs, ys)
310
  image = pluck_img(user_id, user_emb)
 
321
 
322
  def bg_check(_):
323
  global is_started
324
+ global scheduler
325
  if not is_started:
326
  scheduler.add_job(func=background_next_image, trigger="interval", seconds=.1)
327
  scheduler.start()
328
+ is_started = True
329
 
330
  def start(_, calibrate_prompts, user_id, request: gr.Request):
331
  global is_started