delete_file

app.py

@@ -1042,6 +1042,32 @@ def get_assignment_content(assignment_id):
         return None
     return assignment_data
 
+def get_assignment_formatted_deadline(submission_deadline_data):
+    if submission_deadline_data is None:
+        return "未設置截止日期"
+    
+    try:
+        # 嘗試解析 Unix 時間戳
+        if isinstance(submission_deadline_data, (int, float)):
+            submission_datetime = datetime.fromtimestamp(submission_deadline_data)
+        # 嘗試解析 ISO 格式字串
+        elif isinstance(submission_deadline_data, str):
+            try:
+                submission_datetime = datetime.fromisoformat(submission_deadline_data)
+            except ValueError:
+                # 如果不是 ISO 格式,嘗試其他常見格式
+                submission_datetime = datetime.strptime(submission_deadline_data, "%Y-%m-%d %H:%M:%S")
+        else:
+            raise ValueError(f"無效的日期類型: {type(submission_deadline_data)}")
+        
+        # 確保時間是 UTC+8
+        taipei_tz = pytz.timezone('Asia/Taipei')
+        submission_datetime = submission_datetime.astimezone(taipei_tz)
+        
+        return submission_datetime.strftime("%Y-%m-%d %H:%M")
+    except Exception as e:
+        return f"無效的日期格式: {str(e)}"
+
 def get_chinese_paragraph_practice_log_session_content(file_name):
     if file_name:
         content = GCS_SERVICE.download_as_string("jutor_logs", file_name)
@@ -1055,21 +1081,32 @@ def get_chinese_paragraph_practice_log_session_content(file_name):
         chinese_full_paragraph_refine_output_table_history = pd.DataFrame(content_json["chinese_full_paragraph_refine_output_table"]) if "chinese_full_paragraph_refine_output_table" in content_json else pd.DataFrame()
         chinese_full_paragraph_save_output_history = content_json["chinese_full_paragraph_save_output"] if "chinese_full_paragraph_save_output" in content_json else ""
 
+        # 作業模式 
         assignment_id = content_json["assignment_id"] if "assignment_id" in content_json else ""
+        chinese_assignment_content = gr.update(visible=False)
+        chinese_assignment_grade = ""
+        chinese_assignment_topic = ""
+        chinese_assignment_introduction = ""
+        chinese_assignment_description = ""
+        chinese_assignment_submission_deadline = ""
+        
         if assignment_id:
-            assignment = get_assignment_content(assignment_id)
             chinese_assignment_content = gr.update(visible=True)
-            chinese_assignment_grade = assignment["metadata"]["grade"]
-            chinese_assignment_topic = assignment["metadata"]["topic"]
-            chinese_assignment_introduction = assignment["metadata"]["introduction"]
-            chinese_assignment_description = assignment["metadata"]["description"]
-        else:
-            chinese_assignment_content = gr.update(visible=False)
-            chinese_assignment_grade = ""
-            chinese_assignment_topic = ""
-            chinese_assignment_introduction = ""
-            chinese_assignment_description = ""
-
+            try:
+                assignment = get_assignment_content(assignment_id)
+                chinese_assignment_grade = assignment["metadata"]["grade"]
+                chinese_assignment_topic = assignment["metadata"]["topic"]
+                chinese_assignment_introduction = assignment["metadata"]["introduction"]
+                chinese_assignment_description = assignment["metadata"]["description"]
+                submission_deadline = assignment["metadata"]["submission_deadline"]
+                chinese_assignment_submission_deadline = get_assignment_formatted_deadline(submission_deadline)
+            except Exception as e:
+                print(f"Error: {e}")
+                chinese_assignment_grade = "作業已刪除"
+                chinese_assignment_topic = "作業已刪除"
+                chinese_assignment_introduction = "作業已刪除"
+                chinese_assignment_description = "作業已刪除"
+                chinese_assignment_submission_deadline = "作業已刪除"
     else:
         chinese_full_paragraph_input_history = ""
         chinese_full_paragraph_evaluate_output_text_history = ""
@@ -1084,6 +1121,7 @@ def get_chinese_paragraph_practice_log_session_content(file_name):
         chinese_assignment_topic = ""
         chinese_assignment_introduction = ""
         chinese_assignment_description = ""
+        chinese_assignment_submission_deadline = ""
 
     return chinese_full_paragraph_input_history, \
             chinese_full_paragraph_evaluate_output_text_history, \
@@ -1096,7 +1134,8 @@ def get_chinese_paragraph_practice_log_session_content(file_name):
             chinese_assignment_grade, \
             chinese_assignment_topic, \
             chinese_assignment_introduction, \
-            chinese_assignment_description
+            chinese_assignment_description, \
+            chinese_assignment_submission_deadline
 
 
 # === OpenAI Assistant ===
@@ -1591,12 +1630,19 @@ def init_params(request: gr.Request):
                 chinese_assignment_topic = gr.update(value=assignment_json_value.get("metadata", {}).get("topic", ""))
                 chinese_assignment_introduction = gr.update(value=assignment_json_value.get("metadata", {}).get("introduction", ""))
                 chinese_assignment_description = gr.update(value=assignment_json_value.get("metadata", {}).get("description", ""))
+                submission_deadline = assignment_json_value.get("metadata", {}).get("submission_deadline", "")
+                # submission_deadline 轉成 y-m-d H:M
+                submission_deadline_value = submission_deadline_value = get_assignment_formatted_deadline(submission_deadline)
+                chinese_assignment_submission_deadline = gr.update(value=submission_deadline_value)
+
+                print(f"chinese_assignment_submission_deadline: {chinese_assignment_submission_deadline}")
             else:
                 chinese_assignment_row = gr.update(visible=False)
                 chinese_assignment_grade = gr.update(value="")
                 chinese_assignment_topic = gr.update(value="")
                 chinese_assignment_introduction = gr.update(value="")
                 chinese_assignment_description = gr.update(value="")
+                chinese_assignment_submission_deadline = gr.update(value="")
 
             assignment_id_input = gr.update(value=assignment_id_value)
             assignment_json = gr.update(value=assignment_json_value)
@@ -1607,13 +1653,19 @@ def init_params(request: gr.Request):
             chinese_assignment_topic = gr.update(value="")
             chinese_assignment_introduction = gr.update(value="")
             chinese_assignment_description = gr.update(value="")
+            chinese_assignment_submission_deadline = gr.update(value="")
             assignment_id_input = gr.update(value=None)
             assignment_json = gr.update(value=None)
         
     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, \
+            chinese_assignment_row, \
+            chinese_assignment_grade, \
+            chinese_assignment_topic, \
+            chinese_assignment_introduction, \
+            chinese_assignment_description, \
+            chinese_assignment_submission_deadline, \
             english_group, chinese_group, assignment_group
 
 CSS = """
@@ -3192,6 +3244,7 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
                         chinese_assignment_topic = gr.Textbox(label="主題", interactive=False)
                         chinese_assignment_introduction = gr.Textbox(label="寫作引文", interactive=False)
                         chinese_assignment_description = gr.Textbox(label="作業說明", interactive=False)
+                        chinese_assignment_submission_deadline = gr.Textbox(label="截止日期", interactive=False)
 
             # =====中文全文批改=====
             with gr.Tab("中文全文批改") as chinese_full_paragraph_tab:
@@ -3462,6 +3515,8 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
                                     chinese_assignment_introduction_history_log = gr.Markdown()
                                     gr.Markdown("<span style='color:#4e80ee'>作業說明</span>")
                                     chinese_assignment_description_history_log = gr.Markdown()
+                                    gr.Markdown("<span style='color:#4e80ee'>作業繳交截止時間</span>")
+                                    chinese_assignment_submission_deadline_history_log = gr.Markdown()
 
                                     gr.Markdown("---")
                                     gr.Markdown("# 回傳作業內容")
@@ -3505,7 +3560,8 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
                                     chinese_assignment_grade_history_log,
                                     chinese_assignment_topic_history_log,
                                     chinese_assignment_introduction_history_log,
-                                    chinese_assignment_description_history_log
+                                    chinese_assignment_description_history_log,
+                                    chinese_assignment_submission_deadline_history_log
                                 ]
                             )
 
@@ -3585,6 +3641,7 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
             chinese_assignment_topic, 
             chinese_assignment_introduction, 
             chinese_assignment_description,
+            chinese_assignment_submission_deadline,
             english_group,
             chinese_group,
             assignment_group

assignment_service.py

@@ -19,7 +19,11 @@ class AssignmentService:
                 return assignment_id
             
     def create_assignment_metadata(self, assignment_type, grade, topic, introduction, description, attach_materials, submission_deadline):
-        # if assignment_type == ["中文寫作 AI 批改", "英文寫作 AI 批改"]:
+        # submission_deadline is Unix timestamp (seconds)
+        # convert to ISO format with timezone, example: 2024-06-01T00:00:00+08:00
+        taipei_tz = pytz.timezone('Asia/Taipei')
+        submission_deadline = datetime.fromtimestamp(submission_deadline, tz=taipei_tz).isoformat()
+        
         metadata = {
             "assignment_type": assignment_type,
             "grade": grade,
@@ -135,5 +139,23 @@ class AssignmentService:
         return gr.update(choices=choices)
     
 
-    
+    def delete_assignment(self, assignment_id, user_data):
+        try:
+            # 刪除作業文件
+            file_name = f"assignments/{assignment_id}.json"
+            if not self.gcs_service.delete_file(self.bucket_name, file_name):
+                raise Exception("Failed to delete assignment file")
+
+            # 從用戶的作業列表中刪除
+            user_assignments = self.get_user_assignments(user_data)
+            if assignment_id in user_assignments:
+                del user_assignments[assignment_id]
+                encoded_user_id_url = urllib.parse.quote(user_data, safe='')
+                self.gcs_service.upload_json_string(self.bucket_name, f"users/{encoded_user_id_url}/assignments.json", json.dumps(user_assignments))
+
+            return True
+        except Exception as e:
+            print(f"Error deleting assignment: {e}")
+            return False
+
 

assignment_ui.py

@@ -1,4 +1,5 @@
 import gradio as gr
+from datetime import datetime
 
 def create_assignment_ui(user_data, assignment_service, submission_service):
     with gr.Blocks() as assignment_interface:
@@ -13,7 +14,7 @@ def create_assignment_ui(user_data, assignment_service, submission_service):
                             "中文寫作 AI 批改",
                             "英文寫作 AI 批改"
                         ]
-                        assignment_type = gr.Radio(choices=assignment_type_list, label="選擇類型")
+                        assignment_type = gr.Radio(choices=assignment_type_list, label="選擇類型", value="中文寫作 AI 批改")
                         assignment_grade = gr.Radio(["一年級", "二年級", "三年級", "四年級", "五年級", "六年級"], label="選擇年級", visible=False)
                     with gr.Row():
                         gr.Markdown("### 內容規範")
@@ -24,7 +25,7 @@ def create_assignment_ui(user_data, assignment_service, submission_service):
                         gr.Markdown("### 繳交規範")
                     with gr.Row():
                         assignment_submission_deadline = gr.DateTime(label="提交截止日期")
-                        assignment_attach_materials = gr.Textbox(label="附件參考", placeholder='[{"type": "video", "url": "link1", "description": "描述"}]')
+                        assignment_attach_materials = gr.Textbox(label="附件參考", placeholder='[{"type": "video", "url": "link1", "description": "描述"}]', visible=False)
                     with gr.Row():
                         assignment_create_button = gr.Button("建立作業")
                         assignment_metadata = gr.JSON(label="作業元數據", visible=False)
@@ -73,6 +74,37 @@ def create_assignment_ui(user_data, assignment_service, submission_service):
                 with gr.Column(scale=2):
                     assignment_data = gr.JSON(label="作業內容", visible=False)
                     assignment_data_html = gr.HTML()
+                    delete_assignment_button = gr.Button("刪除此作業", visible=False, variant="stop")
+                    with gr.Row(visible=False) as check_delete_confirmation_row:
+                        delete_assignment_execute_button = gr.Button(visible=True, value="⚠️ 警告：刪除作業將永久移除此作業相關數據。請將確認框打勾即可點擊刪除。", interactive=False)
+                        delete_confirm = gr.Checkbox(label="我確認要刪除這個作業", visible=True)
+                        delete_warning = gr.Markdown(visible=True)
+
+                    def show_delete_confirmation():
+                        check_delete_confirmation_row = gr.update(visible=True)
+                        return check_delete_confirmation_row
+
+                    def init_check_delete_confirmation_row():
+                        check_delete_confirmation_row = gr.update(visible=False)
+                        delete_confirm = gr.update(value=False)
+                        delete_warning = gr.update(value="")
+                        return check_delete_confirmation_row, delete_confirm, delete_warning
+
+                    def check_delete_confirmation(confirmed):
+                        if confirmed:
+                            delete_assignment_execute_button = gr.update(interactive=True)                            
+                        else:
+                            delete_assignment_execute_button = gr.update(interactive=False)
+                        
+                        return delete_assignment_execute_button
+
+                    def delete_assignment(assignment_id, user_data):
+                        success = assignment_service.delete_assignment(assignment_id, user_data)
+                        if success:
+                            return gr.update(value="作業已成功刪除"), gr.update(value=None), gr.update(value=None), gr.update(choices=[]), gr.update(value=None), gr.update(value=None)
+                        else:
+                            return gr.update(value="刪除作業失敗，請稍後再試"), gr.update(), gr.update(), gr.update(), gr.update(), gr.update()
+
             with gr.Row():
                 with gr.Column(scale=1):
                     submissions_list_json = gr.JSON(visible=False)
@@ -92,6 +124,25 @@ def create_assignment_ui(user_data, assignment_service, submission_service):
                 return assignment_list, assignment_data, assignment_data_html, submissions_list_json, submissions_list_radio, submission_data_json, submission_data_html
 
             def update_assignment_data_html(assignment_data):
+                # 處理 submission_deadline
+                submission_deadline = assignment_data['metadata'].get('submission_deadline')
+                formatted_deadline = "未設置截止日期"
+                
+                if submission_deadline is not None:
+                    try:
+                        if isinstance(submission_deadline, (int, float)):
+                            # 假設這是一個 Unix 時間戳（秒）
+                            submission_datetime = datetime.fromtimestamp(submission_deadline)
+                        elif isinstance(submission_deadline, str):
+                            # 嘗試解析 ISO 格式的字串
+                            submission_datetime = datetime.fromisoformat(submission_deadline)
+                        else:
+                            raise ValueError(f"無效的日期類型: {type(submission_deadline)}")
+                        
+                        formatted_deadline = submission_datetime.strftime("%Y-%m-%d %H:%M")
+                    except ValueError as e:
+                        formatted_deadline = f"無效的日期格式: {str(e)}"
+
                 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>
@@ -123,6 +174,11 @@ def create_assignment_ui(user_data, assignment_service, submission_service):
                             <div style="font-weight: bold; color: #17a2b8; margin-bottom: 5px;">🔗 作業連結</div>
                             <a href="{assignment_data['assignment_url']}" target="_blank" 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 style="margin-bottom: 20px;">
+                            <div style="font-weight: bold; color: #17a2b8; margin-bottom: 5px;">🔗 作業截止日期</div>
+                            <div style="background-color: #f8f9fa; padding: 10px 15px; border-radius: 5px;">{formatted_deadline}</div>
+                        </div>
                         
                         <div>
                             <div style="font-weight: bold; color: #dc3545; margin-bottom: 5px;">📎 附加材料</div>
@@ -133,6 +189,12 @@ def create_assignment_ui(user_data, assignment_service, submission_service):
                 """
                 return gr.update(value=html)
 
+            def show_button():
+                return gr.update(visible=True)
+
+            def hide_button():
+                return gr.update(visible=False)
+
             def update_submissions_list_radio(submission_ids):
                 choices = []
                 for submission_id in submission_ids:
@@ -373,6 +435,10 @@ def create_assignment_ui(user_data, assignment_service, submission_service):
                 fn=init_assignment_list_data,
                 inputs=[],
                 outputs=[assignment_list, assignment_data, assignment_data_html, submissions_list_json, submissions_list_radio, submission_data_json, submission_data_html]
+            ).then(
+                fn=hide_button,
+                inputs=[],
+                outputs=[delete_assignment_button]
             )
 
             assignment_list.select(
@@ -395,6 +461,10 @@ def create_assignment_ui(user_data, assignment_service, submission_service):
                 fn=update_submissions_list_radio,
                 inputs=[submissions_list_json],
                 outputs=[submissions_list_radio]
+            ).then(
+                fn=show_button,
+                inputs=[],
+                outputs=[delete_assignment_button]
             )
 
             submissions_list_radio.select(
@@ -407,48 +477,38 @@ def create_assignment_ui(user_data, assignment_service, submission_service):
                 outputs=[submission_data_html]
             )
 
-        # 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
-        #             )
+            delete_assignment_button.click(
+                fn=hide_button,
+                inputs=[],
+                outputs=[delete_assignment_button]
+            ).then(
+                fn=show_delete_confirmation,
+                inputs=[],
+                outputs=[check_delete_confirmation_row]
+            )
+
+            delete_confirm.change(
+                fn=check_delete_confirmation,
+                inputs=[delete_confirm],
+                outputs=[delete_assignment_execute_button]
+            )
+
+            delete_assignment_execute_button.click(
+                fn=delete_assignment,
+                inputs=[assignment_list, user_data],
+                outputs=[assignment_data_html, assignment_data, submissions_list_json, submissions_list_radio, submission_data_json, submission_data_html]
+            ).then(
+                fn=init_check_delete_confirmation_row,
+                inputs=[],
+                outputs=[check_delete_confirmation_row, delete_confirm, delete_warning]
+            ).then(
+                fn=hide_button,
+                inputs=[],
+                outputs=[delete_assignment_button]
+            ).then(
+                assignment_service.update_assignment_list,
+                inputs=[user_data],
+                outputs=assignment_list
+            )
 
     return assignment_interface

storage_service.py

@@ -56,4 +56,15 @@ class GoogleCloudStorage:
 
     def list_files(self, bucket_name, prefix=None):
         blobs = self.client.bucket(bucket_name).list_blobs(prefix=prefix)
-        return [blob.name for blob in blobs]
+        return [blob.name for blob in blobs]
+
+    def delete_file(self, bucket_name, file_name):
+        try:
+            bucket = self.client.bucket(bucket_name)
+            blob = bucket.blob(file_name)
+            blob.delete()
+            print(f"File {file_name} deleted from {bucket_name}")
+            return True
+        except Exception as e:
+            print(f"Error deleting file {file_name} from {bucket_name}: {e}")
+            return False