_AssignmentService, _SubmissionService)

app.py

@@ -50,6 +50,9 @@ OPEN_AI_MODERATION_CLIENT = OpenAI(api_key=OPEN_AI_MODERATION_BOT1)
 GCS_SERVICE = GoogleCloudStorage(GCS_KEY)
 GCS_CLIENT = GCS_SERVICE.client
 
+_AssignmentService = AssignmentService(GCS_SERVICE)
+_SubmissionService = SubmissionService(GCS_SERVICE)
+
 def update_scenario_input(scenario_radio):
     return scenario_radio
 
@@ -971,55 +974,22 @@ def generate_chinese_paragraph_practice_history(
 
 def submit_assignment(user_data, user_nickname, assignment_id, submission_content, file_name):
     try:
-        # 生成唯一的提交ID
-        submission_id = generate_unique_submission_id()
-        timestamp_now = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-
-        # 创建提交数据
-        submission_data = {
-            "submission_id": submission_id,
-            "assignment_id": assignment_id,
-            "student_id": user_data,
-            "student_name": user_nickname,
-            "submission_data": {
-                "file_name": file_name,
-                "bucket_name": "jutor_logs",
-                "content": submission_content
-            },
-            "timestamp": timestamp_now
-        }
-
-        # 上传提交数据
-        submission_file_name = f"submissions/{submission_id}.json"
-        GCS_SERVICE.upload_json_string("ai_assignment_submission", submission_file_name, json.dumps(submission_data))
-
-        # 更新作业数据
-        assignment_file_name = f"assignments/{assignment_id}.json"
-        assignment_content = GCS_SERVICE.download_as_string("ai_assignment_submission", assignment_file_name)
-        assignment_data = json.loads(assignment_content)
-
-        if "submission_ids" not in assignment_data:
-            assignment_data["submission_ids"] = []
-        assignment_data["submission_ids"].append(submission_id)
-        GCS_SERVICE.upload_json_string("ai_assignment_submission", assignment_file_name, json.dumps(assignment_data))
-
-        # 更新用户的提交列表
-        user_submissions_file = f"users/{user_data}/submissions.json"
         try:
-            user_submissions = json.loads(GCS_SERVICE.download_as_string("ai_assignment_submission", user_submissions_file))
-        except:
-            user_submissions = {}
-
-        user_submissions[submission_id] = {
-            "assignment_id": assignment_id,
-            "assignment_name": assignment_data["metadata"]["topic"],
-            "assignment_type": assignment_data["assignment_type"],
-            "timestamp": timestamp_now
-        }
-        GCS_SERVICE.upload_json_string("ai_assignment_submission", user_submissions_file, json.dumps(user_submissions))
+        submission_id = _SubmissionService.submit_assignment(
+            assignment_id=assignment_id,
+            student_id=user_data,
+            student_name=user_nickname,
+            submission_content=submission_content,
+            file_name=file_name,
+            bucket_name="jutor_logs"
+        )
 
-        print(f"Updated assignment {assignment_id} with new submission: {submission_id}")
-        return submission_id
+        if submission_id:
+            print(f"Updated assignment {assignment_id} with new submission: {submission_id}")
+            return submission_id
+        else:
+            print(f"Failed to submit assignment {assignment_id}")
+            return None
 
     except Exception as e:
         print(f"Error submitting assignment {assignment_id}: {str(e)}")
@@ -3359,9 +3329,7 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
             with gr.Row():
                 gr.Markdown("# 📝 作業管理")
             with gr.Row():
-                assignment_service = AssignmentService(GCS_SERVICE)
-                submission_service = SubmissionService(GCS_SERVICE)
-                assignment_interface = create_assignment_ui(user_data, assignment_service, submission_service)
+                assignment_interface = create_assignment_ui(user_data, _AssignmentService, _SubmissionService)
 
     demo.load(
         init_params,