with gr.Tab("老師｜作業列表") as assignment_list_tab:

app.py

@@ -15,7 +15,11 @@ import urllib.parse
 import pandas as pd
 import re
 
+# From other files
 from storage_service import GoogleCloudStorage
+from assignment_ui import create_assignment_ui
+from assignment_service import AssignmentService
+from submission_service import SubmissionService
 
 is_env_local = os.getenv("IS_ENV_LOCAL", "false") == "true"
 print(f"is_env_local: {is_env_local}")
@@ -1353,6 +1357,9 @@ def init_params(request: gr.Request):
         admin_group = gr.update(visible=False)
         english_group = gr.update(visible=True)
         chinese_group = gr.update(visible=True)
+        assignment_tab = gr.update(visible=False)
+
+        user_data = gr.update(value="")
 
         # check if origin is from junyiacademy
         query_params = dict(request.query_params)
@@ -1372,19 +1379,27 @@ def init_params(request: gr.Request):
         # admin_group visible in local
         if is_env_local:
             admin_group = gr.update(visible=True)
+            user_data = gr.update(value="aa")
 
         # session timestamp 用 2024-01-01-12-00-00 格式, 要用 UTC+8 時間
         session_timestamp = datetime.now(pytz.utc).astimezone(pytz.timezone('Asia/Taipei')).strftime("%Y-%m-%d-%H-%M-%S")
 
-        if "language" in query_params:
-            if query_params["language"] == "english":
+        if "language" in query_params and query_params["language"] == "english":
                 print(f"language: english")
                 english_group = gr.update(visible=True)
                 chinese_group = gr.update(visible=False)
-            elif query_params["language"] == "chinese":
+                assignment_tab = gr.update(visible=False)
+        
+        if "language" in query_params and query_params["language"] == "chinese":
                 print(f"language: chinese")
                 english_group = gr.update(visible=False)
                 chinese_group = gr.update(visible=True)
+                assignment_tab = gr.update(visible=False)
+
+        if "assignment_mode" in query_params and query_params["assignment_mode"] == "true":
+            english_group = gr.update(visible=False)
+            chinese_group = gr.update(visible=False)
+            assignment_tab = gr.update(visible=True)
 
         assignment_id_value = None
         assignment_json_value = None
@@ -1417,10 +1432,11 @@ def init_params(request: gr.Request):
             assignment_id_input = gr.update(value=None)
             assignment_json = gr.update(value=None)
         
-    return admin_group, session_timestamp, request_origin, \
+    return user_data, \
+            admin_group, session_timestamp, request_origin, \
             assignment_id_input, assignment_json, \
             chinese_assignment_row, chinese_assignment_grade, chinese_assignment_topic, chinese_assignment_introduction, chinese_assignment_description, \
-            english_group, chinese_group
+            english_group, chinese_group, assignment_tab
 
 CSS = """
     .accordion-prompts {
@@ -3343,10 +3359,16 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
                         outputs=chinese_essay_idea_output
                     )
  
+    with gr.Tab("作業管理") as assignment_tab:
+        assignment_service = AssignmentService(GCS_SERVICE)
+        submission_service = SubmissionService(GCS_SERVICE)
+        assignment_interface = create_assignment_ui(user_data, assignment_service, submission_service)
+
     demo.load(
         init_params, 
         inputs =[],
         outputs = [
+            user_data,
             admin_group,
             session_timestamp,
             request_origin,
@@ -3358,7 +3380,8 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
             chinese_assignment_introduction, 
             chinese_assignment_description,
             english_group,
-            chinese_group
+            chinese_group,
+            assignment_tab
         ]
     )
 

assignment_service.py

@@ -1,6 +1,5 @@
 import uuid
 import json
-import datetime
 import gradio as gr
 from datetime import datetime
 
@@ -16,6 +15,21 @@ class AssignmentService:
             file_name = f"assignments/{assignment_id}.json"
             if not self.gcs_service.check_file_exists(self.bucket_name, file_name):
                 return assignment_id
+            
+    def create_assignment_metadata(self, assignment_type, grade, topic, introduction, description, url, attach_materials, submission_deadline):
+        if assignment_type == "中文寫作 AI 批改":
+            metadata = {
+                "assignment_type": assignment_type,
+                "grade": grade,
+                "topic": topic,
+                "introduction": introduction,
+                "description": description,
+                "url": url,
+                "attach_materials": attach_materials,
+                "submission_deadline": submission_deadline
+            }
+        
+        return metadata
 
     def create_assignment(self, user_data, assignment_type, metadata):
         assignment_id = self.create_assignment_id()
@@ -55,6 +69,10 @@ class AssignmentService:
             print(f"Error: {e}")
             return "無效的作業 ID"
         return assignment_data
+    
+    def get_assignment_submissions(self, assignment_id):
+        assignment_data = self.get_assignment(assignment_id)
+        return assignment_data["submission_ids"]
 
     def get_user_assignments(self, user_id):
         try:
@@ -68,10 +86,26 @@ class AssignmentService:
     def update_assignment_list(self, assigner_data):
         choices = []
         user_assignments = self.get_user_assignments(assigner_data)
-        for assignment_id in user_assignments.keys():
+        for assignment_id, assignment_info in user_assignments.items():
             assignment_data = self.get_assignment(assignment_id)
             metadata = assignment_data.get("metadata", {})
-            topic = metadata.get("topic", "未命名作业")
-            choice = (topic, assignment_id)
+            topic = metadata.get("topic", "未命名作業")
+            assignment_type = assignment_data.get("assignment_type", "未知類型")
+            timestamp = assignment_data.get("timestamp", "未知日期")
+            
+            # 格式化日期
+            date = datetime.strptime(timestamp, "%Y-%m-%d %H:%M:%S").strftime("%Y-%m-%d")
+            
+            # 創建格式化的選項
+            formatted_choice = f"{date}|{assignment_type}|{topic}"
+            choice = (formatted_choice, assignment_id)
             choices.append(choice)
+        
+        # 按日期降序排序
+        choices.sort(key=lambda x: x[0].split("|")[0], reverse=True)
+        
         return gr.update(choices=choices)
+    
+
+    
+

assignment_ui.py

@@ -0,0 +1,180 @@
+import gradio as gr
+
+def create_assignment_ui(user_data, assignment_service, submission_service):
+    with gr.Blocks() as assignment_interface:
+        with gr.Tab("老師|建立作業"):
+            with gr.Row():
+                with gr.Column():
+                    assignment_type_list = [
+                        "中文寫作 AI 批改",
+                        "英文寫作 AI 批改"
+                    ]
+                    assignment_type = gr.Radio(choices=assignment_type_list, label="選擇類型")
+                    grade = gr.Radio(["一年級", "二年級", "三年級", "四年級", "五年級", "六年級"], label="選擇年級")
+                    topic = gr.Textbox(label="題目")
+                    introduction = gr.Textbox(label="寫作引文（非必填）")
+                    description = gr.Textbox(label="作業說明")
+                    url = gr.Textbox(label="作業链接")
+                    attach_materials = gr.Textbox(label="附加材料 (JSON 格式)", placeholder='[{"type": "video", "url": "link1", "description": "描述"}]')
+                    submission_deadline = gr.Textbox(label="提交截止日期", placeholder="2024-09-01T23:59:59Z")
+                    create_button = gr.Button("建立作業")
+                    assignment_id_display_teacher = gr.Textbox(label="作業 ID", interactive=False)
+                    assignment_metadata = gr.JSON(label="作業元數據")
+                    
+                    create_button.click(
+                        assignment_service.create_assignment_metadata,
+                        inputs=[assignment_type, grade, topic, introduction, description, url, attach_materials, submission_deadline],
+                        outputs=[assignment_metadata]
+                    ).then(
+                        assignment_service.create_assignment,
+                        inputs=[user_data, assignment_type, assignment_metadata],
+                        outputs=[assignment_id_display_teacher]
+                    )
+        
+        with gr.Tab("老師｜作業列表") as assignment_list_tab:
+            with gr.Row():
+                with gr.Column(scale=1):
+                    get_all_assignments_button = gr.Button("獲取所有作業")
+                    assignment_list = gr.Radio([], label="作業列表", interactive=True)
+                with gr.Column(scale=2):
+                    assignment_data = gr.JSON(label="作業內容", visible=False)
+                    assignment_data_markdown = gr.Markdown(label="作業內容", show_label=True)
+            with gr.Row():
+                with gr.Column(scale=1):
+                    submissions_list_json = gr.JSON(visible=False)
+                    submissions_list_radio = gr.Radio([], label="已提交的作業學生", interactive=True)
+                with gr.Column(scale=2):
+                    submission_data_json = gr.JSON(label="提交內容", visible=False)
+                    submission_data_markdown = gr.Markdown(label="提交內容")
+
+            def init_assignment_list_data(assignment_list_value=None):
+                assignment_list = gr.update(value=assignment_list_value)
+                assignment_data = gr.update(value=None)
+                assignment_data_markdown = gr.update(value=None)
+                submissions_list_json = gr.update(value=None)
+                submissions_list_radio = gr.update(choices=[], value=None)
+                submission_data_json = gr.update(value=None)
+                submission_data_markdown = gr.update(value=None)
+                return assignment_list, assignment_data, assignment_data_markdown, submissions_list_json, submissions_list_radio, submission_data_json, submission_data_markdown
+
+            def update_assignment_data_markdown(assignment_data):
+                markdown_value = f"""
+                    ### 作業類型: {assignment_data['assignment_type']}
+                    ### 作業年級: {assignment_data['metadata']['grade']}
+                    ### 作業題目: {assignment_data['metadata']['topic']}
+                    ### 日期: {assignment_data['timestamp']}
+                    ### 作業引文
+                    {assignment_data['metadata']['introduction']}
+                    ### 作業說明:
+                    {assignment_data['metadata']['description']}
+                    ### 作業連結: {assignment_data['metadata']['url']}
+                    ### 附加材料:
+                    {assignment_data['metadata']['attach_materials']}
+                """
+                return gr.update(value=markdown_value)
+
+            def update_submissions_list_radio(submission_ids):
+                choices = []
+                for submission_id in submission_ids:
+                    submission_data = submission_service.get_submission_from_gcs(submission_id)
+                    choice_text = f"{submission_data['student_name']}"
+                    choice = (choice_text, submission_id)
+                    choices.append(choice)
+                return gr.update(choices=choices)
+            
+            def update_submission_data_markdown(submission_json):
+                markdown_value = f"""
+                    ### 提交內容
+                    {submission_json['submission_data']['content']}
+                    ### 提交日期
+                    {submission_json['timestamp']}
+                """
+                return gr.update(value=markdown_value)
+
+            get_all_assignments_button.click(
+                assignment_service.update_assignment_list,
+                inputs=[user_data],
+                outputs=assignment_list
+            ).then(
+                fn=init_assignment_list_data,
+                inputs=[],
+                outputs=[assignment_list, assignment_data, assignment_data_markdown, submissions_list_json, submissions_list_radio, submission_data_json, submission_data_markdown]
+            )
+
+            assignment_list.select(
+                fn=init_assignment_list_data,
+                inputs=[assignment_list],
+                outputs=[assignment_list, assignment_data, assignment_data_markdown, submissions_list_json, submissions_list_radio, submission_data_json, submission_data_markdown]
+            ).then(
+                assignment_service.get_assignment,
+                inputs=[assignment_list],
+                outputs=[assignment_data]
+            ).then(
+                fn=update_assignment_data_markdown,
+                inputs=[assignment_data],
+                outputs=[assignment_data_markdown]
+            ).then(
+                assignment_service.get_assignment_submissions,
+                inputs=[assignment_list],
+                outputs=[submissions_list_json]
+            ).then(
+                fn=update_submissions_list_radio,
+                inputs=[submissions_list_json],
+                outputs=[submissions_list_radio]
+            )
+
+            submissions_list_radio.select(
+                submission_service.get_submission_from_gcs,
+                inputs=[submissions_list_radio],
+                outputs=submission_data_json
+            ).then(
+                fn=update_submission_data_markdown,
+                inputs=[submission_data_json],
+                outputs=[submission_data_markdown]
+            )
+
+        with gr.Tab("學生"):
+            with gr.Row():
+                with gr.Column():
+                    assignment_id_input_student = gr.Textbox(label="作業 ID")
+                    get_assignment_button = gr.Button("獲取作業")
+                    assignment_display = gr.JSON(label="作業內容")
+                    
+                    get_assignment_button.click(
+                        assignment_service.get_assignment,
+                        inputs=[assignment_id_input_student],
+                        outputs=assignment_display
+                    )
+                
+            with gr.Row():
+                with gr.Column():
+                    student_name_input = gr.Textbox(label="學生姓名")
+                    submission_input = gr.Textbox(label="文字輸入")
+                    submit_button = gr.Button("繳交作業")
+                    submission_status = gr.Textbox(label="繳交狀態", interactive=False)
+                    
+                    submit_button.click(
+                        submission_service.submit_assignment,
+                        inputs=[assignment_id_input_student, user_data, student_name_input, submission_input],
+                        outputs=submission_status
+                    )
+            
+            with gr.Row():
+                with gr.Column():
+                    load_submissions_button = gr.Button("獲取提交的作業")
+                    submissions_radio = gr.Radio([], label="提交的作業", interactive=True)
+                    submission_display = gr.JSON(label="作業內容")
+
+                    load_submissions_button.click(
+                        submission_service.update_submission_list,
+                        inputs=[user_data],
+                        outputs=submissions_radio
+                    )
+
+                    submissions_radio.select(
+                        submission_service.get_submission_from_gcs,
+                        inputs=[submissions_radio],
+                        outputs=submission_display
+                    )
+
+    return assignment_interface

submission_service.py

@@ -1,6 +1,5 @@
 import uuid
 import json
-import datetime
 import gradio as gr
 from datetime import datetime
 
@@ -36,8 +35,21 @@ class SubmissionService:
 
         self.save_submission_to_gcs(submission_data)
         self.save_user_submissions_to_gcs(student_id, submission_data)
+        self.update_assignment_submission_ids(assignment_id, submission_id)
 
         return f"作業已收到，學生ID：{student_id}"
+    
+    def update_assignment_submission_ids(self, assignment_id, submission_id):
+        try:
+            assignment_data = self.get_assignment_data(assignment_id)
+            if assignment_data:
+                if "submission_ids" not in assignment_data:
+                    assignment_data["submission_ids"] = []
+                assignment_data["submission_ids"].append(submission_id)
+                file_name = f"assignments/{assignment_id}.json"
+                self.gcs_service.upload_json_string(self.bucket_name, file_name, json.dumps(assignment_data))
+        except Exception as e:
+            print(f"更新作業提交ID時出錯：{e}")
 
     def get_assignment_data(self, assignment_id):
         try:
@@ -111,7 +123,7 @@ class SubmissionService:
             choices.append(choice)
         return gr.update(choices=choices)
 
-    def get_student_submission(self, student_id):
+    def get_student_submissions(self, student_id):
         submission_ids = self.list_submissions()
         for submission_id in submission_ids:
             submission_data = self.get_submission_from_gcs(submission_id)