botrun-flow-lang 5.10.291__tar.gz → 5.11.11__tar.gz

{botrun_flow_lang-5.10.291 → botrun_flow_lang-5.11.11}/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [5.11.11]
+### Added
+- DALL-E 圖片永久化儲存功能 [參考 specs/gen-img/design.md]
+  - Storage API 新增 `/api/img-files/{user_id}` endpoint，支援圖片永久儲存到 GCS
+  - 新增 `_upload_img_file_internal` 內部函數處理圖片上傳
+  - local_files.py 新增 `download_image_from_url` 函數從 URL 下載圖片到記憶體
+  - local_files.py 新增 `upload_image_and_get_public_url` 函數處理圖片下載與上傳流程
+  - MCP generate_image 工具現在會將 DALL-E 生成的圖片自動上傳到 GCS，回傳永久 URL
+  - 圖片儲存路徑：`img/{user_id}/dalle_{timestamp}_{random_id}.png`
+  - 支援 fallback 機制：上傳失敗時回傳臨時 URL（1小時有效）
+
+### Updated
+- GCS bucket lifecycle rules：將 tmp/ 目錄檔案的自動刪除期限從 7 天延長至 365 天（1年）
+- local_files.py 重新命名 `_perform_upload` → `_perform_tmp_file_upload`，明確表示暫存檔案上傳
+
 ## [5.10.291]
 ### Updated
 - line bot api ，呼叫 cbh 做的 api

{botrun_flow_lang-5.10.291 → botrun_flow_lang-5.11.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: botrun-flow-lang
-Version: 5.10.291
+Version: 5.11.11
 Summary: A flow language for botrun
 Author-email: sebastian-hsu <sebastian.hsu@gmail.com>
 License: MIT

{botrun_flow_lang-5.10.291 → botrun_flow_lang-5.11.11}/botrun_flow_lang/api/storage_api.py

@@ -202,6 +202,43 @@ async def _upload_html_file_internal(
     return public_url
 
 
+async def _upload_img_file_internal(
+    user_id: str, file_content: bytes, file_name: str, content_type: str = "image/png"
+) -> str:
+    """
+    Internal function to upload image file to GCS
+
+    Args:
+        user_id: User ID
+        file_content: File content as bytes
+        file_name: File name
+        content_type: MIME type of the file
+
+    Returns:
+        str: Public URL of the uploaded file
+
+    Raises:
+        Exception: If upload fails
+    """
+    storage = storage_store_factory()
+
+    # Create file object from bytes
+    file_object = BytesIO(file_content)
+
+    # Build storage path - use img directory for permanent storage
+    storage_path = f"img/{user_id}/{file_name}"
+
+    # Store file with public access and content type
+    success, public_url = await storage.store_file(
+        storage_path, file_object, public=True, content_type=content_type
+    )
+
+    if not success:
+        raise Exception("Failed to store image file")
+
+    return public_url
+
+
 @router.post("/html-files/{user_id}")
 async def upload_html_file(
     user_id: str,
@@ -244,6 +281,48 @@ async def upload_html_file(
         raise HTTPException(status_code=500, detail=str(e))
 
 
+@router.post("/img-files/{user_id}")
+async def upload_img_file(
+    user_id: str,
+    file: FastAPIUploadFile = File(...),
+    file_name: str = Form(...),
+    content_type: str = Form(None),
+    # current_user: CurrentUser = Depends(verify_jwt_token)
+) -> dict:
+    """
+    儲存圖片檔案到 GCS，檔案會是公開可存取且永久保存
+
+    Args:
+        user_id: 使用者 ID
+        file: 上傳的檔案
+        file_name: 檔案名稱
+        content_type: 檔案的 MIME type，如果沒有提供則使用檔案的 content_type
+    """
+    # Verify user permission
+    # verify_user_permission(current_user, user_id)
+
+    try:
+        # 讀取上傳的檔案內容
+        contents = await file.read()
+
+        # 如果沒有提供 content_type，使用檔案的 content_type
+        if not content_type:
+            content_type = file.content_type
+
+        # Use internal function to upload file
+        public_url = await _upload_img_file_internal(
+            user_id, contents, file_name, content_type
+        )
+
+        return {
+            "message": "Image file uploaded successfully",
+            "success": True,
+            "url": public_url,
+        }
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=str(e))
+
+
 @router.get("/directory-sizes")
 async def get_directory_sizes(current_user: CurrentUser = Depends(verify_jwt_token)):
     """

{botrun_flow_lang-5.10.291 → botrun_flow_lang-5.11.11}/botrun_flow_lang/langgraph_agents/agents/util/local_files.py

@@ -52,7 +52,7 @@ def upload_and_get_tmp_public_url(
     """
     # 外層 try-except: 處理第一次嘗試與重試邏輯
     try:
-        return _perform_upload(file_path, botrun_flow_lang_url, user_id)
+        return _perform_tmp_file_upload(file_path, botrun_flow_lang_url, user_id)
     except Exception as e:
         import traceback
 
@@ -68,7 +68,7 @@ def upload_and_get_tmp_public_url(
         # 第二次嘗試
         try:
             print("Retry attempt...")
-            return _perform_upload(file_path, botrun_flow_lang_url, user_id)
+            return _perform_tmp_file_upload(file_path, botrun_flow_lang_url, user_id)
         except Exception as retry_e:
             # 第二次嘗試也失敗，記錄錯誤並返回錯誤訊息
             print(f"Retry attempt failed: {str(retry_e)}")
@@ -76,7 +76,7 @@ def upload_and_get_tmp_public_url(
             return "Error uploading file"
 
 
-def _perform_upload(
+def _perform_tmp_file_upload(
     file_path: str, botrun_flow_lang_url: str = "", user_id: str = ""
 ) -> str:
     """執行實際的上傳操作
@@ -343,3 +343,77 @@ async def _perform_html_upload(
         traceback.print_exc()
         # 這裡把異常往上拋，讓外層的重試邏輯處理
         raise e
+
+
+async def download_image_from_url(image_url: str) -> tuple[BytesIO, str]:
+    """
+    從 URL 下載圖片到記憶體
+
+    Args:
+        image_url: 圖片的 URL
+
+    Returns:
+        tuple[BytesIO, str]: (圖片內容, content_type)
+
+    Raises:
+        Exception: 下載失敗時拋出例外
+    """
+    try:
+        import httpx
+
+        async with httpx.AsyncClient(timeout=30.0) as client:
+            response = await client.get(image_url, follow_redirects=True)
+            response.raise_for_status()
+
+            # 從 response headers 取得 content type
+            content_type = response.headers.get("content-type", "image/png")
+
+            # 將圖片內容存入 BytesIO
+            image_data = BytesIO(response.content)
+
+            return image_data, content_type
+
+    except Exception as e:
+        raise Exception(f"Failed to download image from URL: {str(e)}")
+
+
+async def upload_image_and_get_public_url(
+    image_url: str, botrun_flow_lang_url: str = "", user_id: str = ""
+) -> str:
+    """
+    從 URL 下載圖片並上傳到 GCS /img 目錄，取得永久公開 URL
+
+    Args:
+        image_url: 圖片來源 URL（如 DALL-E 生成的臨時 URL）
+        botrun_flow_lang_url: botrun flow lang API 的 URL
+        user_id: 使用者 ID
+
+    Returns:
+        str: 上傳後的永久公開存取 URL
+    """
+    try:
+        # 1. 從 URL 下載圖片
+        image_data, content_type = await download_image_from_url(image_url)
+
+        # 2. 生成唯一檔案名稱
+        import uuid
+        from datetime import datetime
+
+        timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
+        file_name = f"dalle_{timestamp}_{uuid.uuid4().hex[:8]}.png"
+
+        # 3. 使用內部函數上傳
+        from botrun_flow_lang.api.storage_api import _upload_img_file_internal
+
+        public_url = await _upload_img_file_internal(
+            user_id, image_data.getvalue(), file_name, content_type
+        )
+
+        return public_url
+
+    except Exception as e:
+        import traceback
+
+        print(f"Error uploading image: {str(e)}")
+        traceback.print_exc()
+        raise e

{botrun_flow_lang-5.10.291 → botrun_flow_lang-5.11.11}/botrun_flow_lang/mcp_server/default_mcp.py

@@ -128,9 +128,11 @@ async def chat_with_imgs(
 
 
 @mcp.tool()
-async def generate_image(user_input: str, user_id: str = "") -> str:
+async def generate_image(
+    user_input: str, user_id: str = "", botrun_flow_lang_url: str = ""
+) -> str:
     """
-    Generate high-quality images using DALL-E 3.
+    Generate high-quality images using DALL-E 3 and store permanently in GCS.
 
     When using generate_image tool, you must include the image URL in your response.
     You MUST respond using this format (from @begin img to @end, including the image URL):
@@ -161,17 +163,22 @@ async def generate_image(user_input: str, user_id: str = "") -> str:
     Args:
         user_input: Detailed description of the image you want to generate.
                    Be specific about style, content, and composition.
-        user_id: REQUIRED - User ID for rate limit checking (LLM can get this from system prompt)
+        user_id: REQUIRED - User ID for rate limit and file storage (LLM can get this from system prompt)
+        botrun_flow_lang_url: REQUIRED - URL for the botrun flow lang API (LLM can get this from system prompt)
 
     Returns:
-        str: URL to the generated image, or error message if generation fails
+        str: Permanent URL to the generated image stored in GCS, or error message if generation fails
     """
     try:
         logger.info(f"generate_image user_input: {user_input}")
 
+        # 驗證必要參數
         if not user_id:
-            logger.error("User ID not available for rate limit check")
-            raise Exception("User ID not available for rate limit check")
+            logger.error("User ID not available")
+            raise Exception("User ID not available")
+        if not botrun_flow_lang_url:
+            logger.error("botrun_flow_lang_url not available")
+            raise Exception("botrun_flow_lang_url not available")
 
         # Check rate limit before generating image
         rate_limit_client = RateLimitClient()
@@ -193,25 +200,42 @@ async def generate_image(user_input: str, user_id: str = "") -> str:
                 f"Current usage: {current_usage}. Please try again tomorrow."
             )
 
-        # Proceed with image generation using DALL-E API Wrapper
+        # 2. 使用 DALL-E 生成圖片
         dalle_wrapper = DallEAPIWrapper(
             api_key=os.getenv("OPENAI_API_KEY"), model="dall-e-3"
         )
 
         # Generate image with token usage tracking
         with get_openai_callback() as cb:
-            image_url = dalle_wrapper.run(user_input)
+            temp_image_url = dalle_wrapper.run(user_input)
             logger.info(
-                f"generate_image=======> Estimated prompt tokens: {cb.prompt_tokens}, "
+                f"DALL-E generated temporary URL: {temp_image_url}, "
+                f"prompt tokens: {cb.prompt_tokens}, "
                 f"completion tokens: {cb.completion_tokens}"
             )
 
-        logger.info(f"generate_image generated============> {image_url}")
+        # 3. 下載並上傳到 GCS，取得永久 URL
+        from botrun_flow_lang.langgraph_agents.agents.util.local_files import (
+            upload_image_and_get_public_url,
+        )
 
-        # Update usage counter after successful generation
-        await rate_limit_client.update_drawing_usage(user_id)
+        try:
+            permanent_url = await upload_image_and_get_public_url(
+                temp_image_url, botrun_flow_lang_url, user_id
+            )
+            logger.info(f"Image uploaded to GCS: {permanent_url}")
 
-        return image_url
+            # 4. 更新使用計數
+            await rate_limit_client.update_drawing_usage(user_id)
+
+            return permanent_url
+        except Exception as upload_error:
+            logger.error(
+                f"Failed to upload to GCS, returning temporary URL: {upload_error}"
+            )
+            # Fallback: 回傳臨時 URL
+            await rate_limit_client.update_drawing_usage(user_id)
+            return temp_image_url
 
     except Exception as e:
         logger.error(f"generate_image error: {e}", error=str(e), exc_info=True)

{botrun_flow_lang-5.10.291 → botrun_flow_lang-5.11.11}/botrun_flow_lang/services/storage/storage_cs_store.py

@@ -38,7 +38,7 @@ class StorageCsStore(StorageStore):
             desired_rules = [
                 {
                     "action": {"type": "Delete"},
-                    "condition": {"age": 7, "matchesPrefix": ["tmp/"]},
+                    "condition": {"age": 365, "matchesPrefix": ["tmp/"]},
                 }
             ]
 

{botrun_flow_lang-5.10.291 → botrun_flow_lang-5.11.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "botrun-flow-lang"
-version = "5.10.291"
+version = "5.11.11"
 description = "A flow language for botrun"
 authors = [
     { name = "sebastian-hsu", email = "sebastian.hsu@gmail.com" }