data pop

app.py

@@ -15,6 +15,7 @@ from moviepy.editor import VideoFileClip
 from pytube import YouTube
 import os
 
+from google.cloud import storage
 from google.oauth2 import service_account
 from googleapiclient.discovery import build
 from googleapiclient.http import MediaFileUpload
@@ -55,11 +56,35 @@ VIDEO_ID = ""
 
 OPEN_AI_KEY = os.getenv("OPEN_AI_KEY")
 client = OpenAI(api_key=OPEN_AI_KEY)
+DRIVE_KEY = os.getenv("GOOGLE_APPLICATION_CREDENTIALS_JSON")
+GCS_KEY = os.getenv("GOOGLE_APPLICATION_CREDENTIALS_JSON")
+
+def init_gcs_client(service_account_key_string):
+    """使用服务账号密钥文件创建 GCS 客户端"""
+    credentials_json_string = service_account_key_string
+    credentials_dict = json.loads(credentials_json_string)
+    credentials = service_account.Credentials.from_service_account_info(credentials_dict)
+    gcs_client = storage.Client(credentials=credentials, project=credentials_dict['project_id'])
+    return gcs_client
+
+def upload_file_to_gcs(gcs_client, bucket_name, source_file_name, destination_blob_name, service_account_key_file):
+    """上传文件到 GCS"""
+    bucket = gcs_client.bucket(bucket_name)
+    blob = bucket.blob(destination_blob_name)
+    blob.upload_from_filename(source_file_name)
+    print(f"{source_file_name} uploaded to {destination_blob_name}.")
+
+def download_file_from_gcs(gcs_client, bucket_name, source_blob_name, destination_file_name, service_account_key_file):
+    """从 GCS 下载文件"""
+    bucket = gcs_client.bucket(bucket_name)
+    blob = bucket.blob(source_blob_name)
+    blob.download_to_filename(destination_file_name)
+    print(f"{source_blob_name} downloaded to {destination_file_name}.")
 
 
 # # ====drive====初始化Google Drive服务
 def init_drive_service():
-    credentials_json_string = os.getenv("GOOGLE_APPLICATION_CREDENTIALS_JSON")
+    credentials_json_string = DRIVE_KEY
     credentials_dict = json.loads(credentials_json_string)
     SCOPES = ['https://www.googleapis.com/auth/drive']
     credentials = service_account.Credentials.from_service_account_info(
@@ -694,10 +719,15 @@ def respond(user_message, df_string_output, chat_history, socratic_mode=False):
     print("=== 變數：chat_history ===")
     print(chat_history)
 
+    data = df_string_output
+    for entry in data:
+        entry.pop('embed_url', None)  # Remove 'embed_url' if it exists
+        entry.pop('screenshot_path', None) 
+
     if socratic_mode:
         sys_content = f"""
             你是一個擅長資料分析跟影片教學的老師，user 為學生
-            請用 {df_string_output} 為資料文本，自行判斷資料的種類，
+            請用 {data} 為資料文本，自行判斷資料的種類，
             並進行對話，使用 zh-TW
 
             如果是影片類型，不用解釋逐字稿格式，直接回答學生問題
@@ -715,7 +745,7 @@ def respond(user_message, df_string_output, chat_history, socratic_mode=False):
     else:
         sys_content = f"""
             你是一個擅長資料分析跟影片教學的老師，user 為學生
-            請用 {df_string_output} 為資料文本，自行判斷資料的種類，
+            請用 {data} 為資料文本，自行判斷資料的種類，
             並進行對話，使用 zh-TW
 
             如果是影片類型，不用解釋逐字稿格式，直接回答學生問題