Toya0421 commited on
Commit
fe1b58a
·
verified ·
1 Parent(s): 22d90ea

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +1 -16
app.py CHANGED
@@ -21,7 +21,6 @@ passages_df = pd.read_csv("passage.csv")
21
  used_passages = set()
22
  current_user_id = None
23
  current_level = None
24
- action_log = [] # ページ操作ログ
25
 
26
 
27
  def rewrite_level(text, target_level): # 変更点
@@ -102,9 +101,8 @@ def save_log(entry):
102
 
103
  def start_test(student_id, level_input):
104
  """開始:ジャンル選択なし版"""
105
- global current_user_id, current_level, used_passages, action_log # 変更点
106
  used_passages = set()
107
- action_log = []
108
 
109
  action = "start_pushed"
110
  now = (datetime.utcnow() + timedelta(hours=9)).isoformat()
@@ -116,7 +114,6 @@ def start_test(student_id, level_input):
116
  "original_level": None,
117
  "first_page_displayed": None,
118
  "action_time": now,
119
- "actions": json.dumps(action_log, ensure_ascii=False),
120
  "result": action
121
  }
122
  save_log(entry)
@@ -187,7 +184,6 @@ def next_page(pages_json, current_page, total_pages, pid, orig_lev, start_time):
187
  "original_level": orig_lev,
188
  "first_page_displayed": None,
189
  "action_time": now,
190
- "actions": json.dumps(action_log, ensure_ascii=False),
191
  "result": action
192
  }
193
  save_log(entry)
@@ -208,8 +204,6 @@ def next_page(pages_json, current_page, total_pages, pid, orig_lev, start_time):
208
  # ここでは new_page が最後のインデックスであれば prev を有効、next を隠し finish を表示
209
  if new_page == total_pages - 1:
210
  # 記録
211
- if new_page != current_page:
212
- action_log.append({"action": "next", "time": (datetime.utcnow() + timedelta(hours=9)).isoformat()})
213
  prev_upd = gr.update(interactive=True, visible=True)
214
  next_upd = gr.update(interactive=False, visible=False)
215
  finish_upd = gr.update(interactive=True, visible=True)
@@ -223,10 +217,6 @@ def next_page(pages_json, current_page, total_pages, pid, orig_lev, start_time):
223
  finish_upd
224
  )
225
 
226
- # 通常ページ遷移(最終ページではない)
227
- if new_page != current_page:
228
- action_log.append({"action": "next", "time": (datetime.utcnow() + timedelta(hours=9)).isoformat()})
229
-
230
  prev_enabled = (new_page > 0)
231
  prev_upd = gr.update(interactive=prev_enabled, visible=prev_enabled)
232
  next_upd = gr.update(interactive=True, visible=True)
@@ -255,7 +245,6 @@ def prev_page(pages_json, current_page, total_pages, pid, orig_lev, start_time):
255
  "original_level": orig_lev,
256
  "first_page_displayed": None,
257
  "action_time": now,
258
- "actions": json.dumps(action_log, ensure_ascii=False),
259
  "result": action
260
  }
261
  save_log(entry)
@@ -271,8 +260,6 @@ def prev_page(pages_json, current_page, total_pages, pid, orig_lev, start_time):
271
 
272
  new_page = max(current_page - 1, 0)
273
 
274
- if new_page != current_page:
275
- action_log.append({"action": "prev", "time": (datetime.utcnow() + timedelta(hours=9)).isoformat()})
276
 
277
  # 最終ページから戻った場合は next を再表示して finish を隠す
278
  prev_upd = gr.update(interactive=(new_page > 0), visible=(new_page > 0))
@@ -324,8 +311,6 @@ def finish_or_retire(pages_json, current_page, pid, orig_lev, start_time, action
324
  new_start = (datetime.utcnow() + timedelta(hours=9)).isoformat()
325
  total = len(new_pages)
326
 
327
- action_log.clear()
328
-
329
  # 新教材の最初のページ表示設定
330
  prev_upd = gr.update(interactive=False, visible=False)
331
  if total == 1:
 
21
  used_passages = set()
22
  current_user_id = None
23
  current_level = None
 
24
 
25
 
26
  def rewrite_level(text, target_level): # 変更点
 
101
 
102
  def start_test(student_id, level_input):
103
  """開始:ジャンル選択なし版"""
104
+ global current_user_id, current_level, used_passages # 変更点
105
  used_passages = set()
 
106
 
107
  action = "start_pushed"
108
  now = (datetime.utcnow() + timedelta(hours=9)).isoformat()
 
114
  "original_level": None,
115
  "first_page_displayed": None,
116
  "action_time": now,
 
117
  "result": action
118
  }
119
  save_log(entry)
 
184
  "original_level": orig_lev,
185
  "first_page_displayed": None,
186
  "action_time": now,
 
187
  "result": action
188
  }
189
  save_log(entry)
 
204
  # ここでは new_page が最後のインデックスであれば prev を有効、next を隠し finish を表示
205
  if new_page == total_pages - 1:
206
  # 記録
 
 
207
  prev_upd = gr.update(interactive=True, visible=True)
208
  next_upd = gr.update(interactive=False, visible=False)
209
  finish_upd = gr.update(interactive=True, visible=True)
 
217
  finish_upd
218
  )
219
 
 
 
 
 
220
  prev_enabled = (new_page > 0)
221
  prev_upd = gr.update(interactive=prev_enabled, visible=prev_enabled)
222
  next_upd = gr.update(interactive=True, visible=True)
 
245
  "original_level": orig_lev,
246
  "first_page_displayed": None,
247
  "action_time": now,
 
248
  "result": action
249
  }
250
  save_log(entry)
 
260
 
261
  new_page = max(current_page - 1, 0)
262
 
 
 
263
 
264
  # 最終ページから戻った場合は next を再表示して finish を隠す
265
  prev_upd = gr.update(interactive=(new_page > 0), visible=(new_page > 0))
 
311
  new_start = (datetime.utcnow() + timedelta(hours=9)).isoformat()
312
  total = len(new_pages)
313
 
 
 
314
  # 新教材の最初のページ表示設定
315
  prev_upd = gr.update(interactive=False, visible=False)
316
  if total == 1: