def update_submission_data_html(submission_json):

README.md

@@ -4,7 +4,7 @@ emoji: 📚
 colorFrom: red
 colorTo: blue
 sdk: gradio
-sdk_version: 4.37.2
+sdk_version: 4.41.0
 app_file: app.py
 pinned: false
 ---

assignment_service.py

@@ -16,7 +16,7 @@ class AssignmentService:
             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):
+    def create_assignment_metadata(self, assignment_type, grade, topic, introduction, description, attach_materials, submission_deadline):
         if assignment_type == "中文寫作 AI 批改":
             metadata = {
                 "assignment_type": assignment_type,
@@ -24,7 +24,6 @@ class AssignmentService:
                 "topic": topic,
                 "introduction": introduction,
                 "description": description,
-                "url": url,
                 "attach_materials": attach_materials,
                 "submission_deadline": submission_deadline
             }
@@ -34,17 +33,42 @@ class AssignmentService:
     def create_assignment(self, user_data, assignment_type, metadata):
         assignment_id = self.create_assignment_id()
         timestamp_now = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        host_url = "https://www.junyiacademy.org/event/jutor_write_2024/?__theme=light"
+        language_mapping = {
+            "寫作 AI 批改": "chinese",
+            "英文寫作 AI 批改": "english"
+        }
+        language = language_mapping.get(assignment_type, "")
+
+        assignment_url = f"{host_url}&language={language}&assignment={assignment_id}"
         new_assignment = {
             "assignment_id": assignment_id,
             "assigner_data": user_data,
             "assignment_type": assignment_type,
             "metadata": metadata,
+            "assignment_url": assignment_url,
             "submission_ids": [],
             "timestamp": timestamp_now
         }
         self.save_assignment_to_gcs(new_assignment)
         self.save_user_assignment_to_gcs(user_data, assignment_id)
-        return assignment_id
+        return new_assignment
+    
+    def get_assignment_url(self, assignment_id):
+        assignment_data = self.get_assignment(assignment_id)
+        if isinstance(assignment_data, str):
+            print(f"错误：无法获取作业数据。返回的数据：{assignment_data}")
+            return None
+        
+        assignment_url = assignment_data.get("assignment_url")
+        if not assignment_url:
+            print(f"警告：作业 {assignment_id} 没有 URL")
+            return None
+
+        return assignment_url
+    
+    def update_assignment(self, assignment_id, assignment_data):
+        self.gcs_service.upload_json_string(self.bucket_name, f"assignments/{assignment_id}.json", json.dumps(assignment_data))
 
     def save_assignment_to_gcs(self, assignment):
         file_name = f"assignments/{assignment['assignment_id']}.json"

assignment_ui.py

@@ -5,29 +5,63 @@ def create_assignment_ui(user_data, assignment_service, submission_service):
         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="作業元數據")
+                    with gr.Row():
+                        gr.Markdown("### 作業資訊")
+                    with gr.Row():
+                        assignment_topic = gr.Textbox(label="題目（必填）")
+                        assignment_type_list = [
+                            "中文寫作 AI 批改",
+                            "英文寫作 AI 批改"
+                        ]
+                        assignment_type = gr.Radio(choices=assignment_type_list, label="選擇類型")
+                        assignment_grade = gr.Radio(["一年級", "二年級", "三年級", "四年級", "五年級", "六年級"], label="選擇年級", visible=False)
+                    with gr.Row():
+                        gr.Markdown("### 內容規範")
+                    with gr.Row():
+                        assignment_introduction = gr.TextArea(label="寫作引文��填）")
+                        assignment_description = gr.TextArea(label="作業說明")
+                    with gr.Row():
+                        gr.Markdown("### 繳交規範")
+                    with gr.Row():
+                        assignment_submission_deadline = gr.DateTime(label="提交截止日期")
+                        assignment_attach_materials = gr.Textbox(label="附件參考", placeholder='[{"type": "video", "url": "link1", "description": "描述"}]')
+                    with gr.Row():
+                        assignment_create_button = gr.Button("建立作業")
+                        assignment_metadata = gr.JSON(label="作業元數據", visible=False)
+                        assignment_data = gr.JSON(label="作業數據", visible=False)
+                        assignment_url = gr.Textbox(label="作業指派連結", interactive=False, show_copy_button=True)
+                        assignment_id_display_teacher = gr.Textbox(label="作業 ID", interactive=False, visible=False)
+                        
                     
-                    create_button.click(
+                    def update_gr_assignment_url(assignment_data):
+                        return assignment_data['assignment_url']
+                    
+                    def update_gr_assignment_id(assignment_data):
+                        return assignment_data['assignment_id']
+
+                    assignment_create_button.click(
                         assignment_service.create_assignment_metadata,
-                        inputs=[assignment_type, grade, topic, introduction, description, url, attach_materials, submission_deadline],
+                        inputs=[
+                            assignment_type, 
+                            assignment_grade, 
+                            assignment_topic, 
+                            assignment_introduction, 
+                            assignment_description, 
+                            assignment_attach_materials, 
+                            assignment_submission_deadline
+                        ],
                         outputs=[assignment_metadata]
                     ).then(
                         assignment_service.create_assignment,
                         inputs=[user_data, assignment_type, assignment_metadata],
+                        outputs=[assignment_data]
+                    ).then(
+                        update_gr_assignment_url,
+                        inputs=[assignment_data],
+                        outputs=[assignment_url]
+                    ).then(
+                        update_gr_assignment_id,
+                        inputs=[assignment_data],
                         outputs=[assignment_id_display_teacher]
                     )
         
@@ -38,40 +72,66 @@ def create_assignment_ui(user_data, assignment_service, submission_service):
                     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)
+                    assignment_data_html = gr.HTML()
             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="提交內容")
+                    submission_data_html = gr.HTML()
 
             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)
+                assignment_data_html = 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
+                submission_data_html = gr.update(value=None)
+                return assignment_list, assignment_data, assignment_data_html, submissions_list_json, submissions_list_radio, submission_data_json, submission_data_html
 
-            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']}
+            def update_assignment_data_html(assignment_data):
+                html = f"""
+                <div style="background-color: #f8f9fa; padding: 30px; border-radius: 15px; font-family: 'Helvetica', sans-serif;">
+                    <h2 style="color: #007bff; font-size: 28px; margin-bottom: 20px;">✨ 作業詳情</h2>
+                    <div style="background-color: white; border-radius: 10px; padding: 20px; box-shadow: 0 2px 4px rgba(0,0,0,0.05);">
+                        <div style="margin-bottom: 20px;">
+                            <div style="font-weight: bold; color: #6c757d; margin-bottom: 5px;">🏷️ 作業類型</div>
+                            <div style="background-color: #f8f9fa; padding: 10px 15px; border-radius: 5px;">{assignment_data['assignment_type']}</div>
+                        </div>
+                        <div style="margin-bottom: 20px;">
+                            <div style="font-weight: bold; color: #6c757d; margin-bottom: 5px;">📝 作業題目</div>
+                            <div style="background-color: #f8f9fa; padding: 10px 15px; border-radius: 5px;">{assignment_data['metadata']['topic']}</div>
+                        </div>
+                        <div style="margin-bottom: 20px;">
+                            <div style="font-weight: bold; color: #6c757d; margin-bottom: 5px;">🗓️ 日期</div>
+                            <div style="background-color: #f8f9fa; padding: 10px 15px; border-radius: 5px;">{assignment_data['timestamp']}</div>
+                        </div>
+                        
+                        <div style="margin-bottom: 20px;">
+                            <div style="font-weight: bold; color: #28a745; margin-bottom: 5px;">📖 寫作引文</div>
+                            <div style="background-color: #f8f9fa; padding: 10px 15px; border-radius: 5px;">{assignment_data['metadata']['introduction']}</div>
+                        </div>
+                        
+                        <div style="margin-bottom: 20px;">
+                            <div style="font-weight: bold; color: #ffc107; margin-bottom: 5px;">ℹ️ 作業說明</div>
+                            <div style="background-color: #f8f9fa; padding: 10px 15px; border-radius: 5px;">{assignment_data['metadata']['description']}</div>
+                        </div>
+                        
+                        <div style="margin-bottom: 20px;">
+                            <div style="font-weight: bold; color: #17a2b8; margin-bottom: 5px;">🔗 作業連結</div>
+                            <a href="{assignment_data['assignment_url']}" style="display: inline-block; padding: 10px 15px; background-color: #007bff; color: white; text-decoration: none; border-radius: 5px; transition: background-color 0.3s;" onmouseover="this.style.backgroundColor='#0056b3'" onmouseout="this.style.backgroundColor='#007bff'">點擊前往作業</a>
+                        </div>
+                        
+                        <div>
+                            <div style="font-weight: bold; color: #dc3545; margin-bottom: 5px;">📎 附加材料</div>
+                            <div style="background-color: #f8f9fa; padding: 10px 15px; border-radius: 5px;">{assignment_data['metadata']['attach_materials']}</div>
+                        </div>
+                    </div>
+                </div>
                 """
-                return gr.update(value=markdown_value)
+                return gr.update(value=html)
 
             def update_submissions_list_radio(submission_ids):
                 choices = []
@@ -82,14 +142,27 @@ def create_assignment_ui(user_data, assignment_service, submission_service):
                     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']}
+            def update_submission_data_html(submission_json):
+                html = f"""
+                <div style="background-color: #f8f9fa; padding: 30px; border-radius: 15px; font-family: 'Helvetica', sans-serif;">
+                    <h2 style="color: #007bff; font-size: 28px; margin-bottom: 20px;">📝 學生回傳作業</h2>
+                    <div style="background-color: white; border-radius: 10px; padding: 20px; box-shadow: 0 2px 4px rgba(0,0,0,0.05);">
+                        <div style="margin-bottom: 20px;">
+                            <div style="font-weight: bold; color: #6c757d; margin-bottom: 5px;">👤 學生姓名</div>
+                            <div style="background-color: #f8f9fa; padding: 10px 15px; border-radius: 5px;">{submission_json['student_name']}</div>
+                        </div>
+                        <div style="margin-bottom: 20px;">
+                            <div style="font-weight: bold; color: #28a745; margin-bottom: 5px;">📄 回傳内容</div>
+                            <div style="background-color: #f8f9fa; padding: 10px 15px; border-radius: 5px; white-space: pre-wrap;">{submission_json['submission_data']['content']}</div>
+                        </div>
+                        <div>
+                            <div style="font-weight: bold; color: #17a2b8; margin-bottom: 5px;">🕒 回傳日期</div>
+                            <div style="background-color: #f8f9fa; padding: 10px 15px; border-radius: 5px;">{submission_json['timestamp']}</div>
+                        </div>
+                    </div>
+                </div>
                 """
-                return gr.update(value=markdown_value)
+                return gr.update(value=html)
 
             get_all_assignments_button.click(
                 assignment_service.update_assignment_list,
@@ -98,21 +171,21 @@ def create_assignment_ui(user_data, assignment_service, submission_service):
             ).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]
+                outputs=[assignment_list, assignment_data, assignment_data_html, submissions_list_json, submissions_list_radio, submission_data_json, submission_data_html]
             )
 
             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]
+                outputs=[assignment_list, assignment_data, assignment_data_html, submissions_list_json, submissions_list_radio, submission_data_json, submission_data_html]
             ).then(
                 assignment_service.get_assignment,
                 inputs=[assignment_list],
                 outputs=[assignment_data]
             ).then(
-                fn=update_assignment_data_markdown,
+                fn=update_assignment_data_html,
                 inputs=[assignment_data],
-                outputs=[assignment_data_markdown]
+                outputs=[assignment_data_html]
             ).then(
                 assignment_service.get_assignment_submissions,
                 inputs=[assignment_list],
@@ -128,9 +201,9 @@ def create_assignment_ui(user_data, assignment_service, submission_service):
                 inputs=[submissions_list_radio],
                 outputs=submission_data_json
             ).then(
-                fn=update_submission_data_markdown,
+                fn=update_submission_data_html,
                 inputs=[submission_data_json],
-                outputs=[submission_data_markdown]
+                outputs=[submission_data_html]
             )
 
         with gr.Tab("學生"):

requirements.txt

@@ -1,4 +1,4 @@
-gradio==4.37.2
+gradio==4.41.0
 openai>=1.16.2
 python-docx
 google-api-python-client