publish

Author: mailela

Dockerfile

@@ -4,15 +4,16 @@ FROM  ghcr.io/rachelos/py3.13.1:latest
 WORKDIR /app
 
 # ENV PIP_INDEX_URL=https://pypi.tuna.tsinghua.edu.cn/simple
-ENV PIP_INDEX_URL=https://mirrors.huaweicloud.com/repository/pypi/simple
+ENV PIP_INDEX_URL=https://pypi.tuna.tsinghua.edu.cn/simple
 
 # 复制Python依赖文件
 # 复制后端代码
-COPY . .
 COPY requirements.txt .
-RUN pip3 install -r requirements.txt -i https://pypi.tuna.tsinghua.edu.cn/simple
+RUN pip3 install -r requirements.txt 
+ADD . .
 RUN chmod +x ./start.sh
 # 暴露端口
 EXPOSE 8081
 # 启动命令
-CMD ["./start.sh"]
+CMD ["./start.sh"]
+# CMD ["sleep", "infinity"]

README.md

@@ -128,4 +128,22 @@ python main.py test
 
 - **URL**: `/api/download_image/{prompt_id}`
 - **方法**: GET
-- **响应**: 图像文件（PNG）
+- **响应**: 图像文件（PNG）
+
+### 代理远程图片
+
+- **URL**: `/api/proxy_image`
+- **方法**: GET
+- **参数**: 
+  - `url` (查询参数): 要代理的远程图片URL
+- **响应**: 图片流（支持跨域访问）
+- **示例**: 
+  ```
+  GET /api/proxy_image?url=https://example.com/image.jpg
+  ```
+- **功能特点**:
+  - 解决跨域访问问题
+  - 支持多种图片格式（JPEG、PNG、GIF）
+  - 自动图片优化和压缩
+  - 缓存机制提高性能
+  - 支持重定向跟随

client/comfyui_client.py

@@ -33,13 +33,16 @@ def __init__(self, server_address="http://10.10.10.59:6700",template_name="1.yam
         self.node_execution_times = {}  # 记录节点执行时间
         self.task_start_time = None     # 任务开始时间
     def get_template(self):
-        template_path = os.path.join( "./resources/templates", self.template_name)
+        # 获取当前文件的目录，然后构建绝对路径
+        current_dir = os.path.dirname(os.path.abspath(__file__))
+        project_root = os.path.dirname(current_dir)
+        template_path = os.path.join(project_root, "resources", "templates", self.template_name)
         import yaml
         try:
             self.template_data = yaml.load(open(template_path, "r", encoding="utf-8"),Loader=yaml.FullLoader)
         except:
-            print(os.path.abspath(template_path))
-            raise Exception(f"模板文件不存在{template_path}")
+            print(f"尝试加载的模板路径: {os.path.abspath(template_path)}")
+            raise Exception(f"模板文件不存在: {template_path}")
         return self.template_data
 
 
@@ -50,9 +53,12 @@ def get_args(self,key="args"):
     def get_template_file(self):
         data=self.get_template()
         file=data.get("file","")
-        file=os.path.join( "./resources/templates", file)
+        # 获取当前文件的目录，然后构建绝对路径
+        current_dir = os.path.dirname(os.path.abspath(__file__))
+        project_root = os.path.dirname(current_dir)
+        file=os.path.join(project_root, "resources", "templates", file)
         if not os.path.exists(file):
-            raise Exception("模板文件不存在")
+            raise Exception(f"模板文件不存在: {file}")
         with open(file, "r", encoding="utf-8") as f:
             workflow_template = json.load(f)
         return workflow_template
@@ -515,8 +521,8 @@ def get_workflows(self):
         templates_dir = os.path.join("./resources/templates")
 
         # 使用glob模块获取所有.yml和.yaml文件
-        yml_files = glob.glob(os.path.join(templates_dir, "*.yml"))
-        yaml_files = glob.glob(os.path.join(templates_dir, "*.yaml"))
+        yml_files = glob.glob(os.path.join(templates_dir, "*.yml"),recursive=True)
+        yaml_files = glob.glob(os.path.join(templates_dir, "*.yaml"),recursive=True)
 
         # 合并文件列表并只保留文件名（不含路径）
         workflow_files = []

dock_build.bat

@@ -7,7 +7,7 @@ REM 获取所有运行中容器的ID并逐个停止
 FOR /f "tokens=*" %%i IN ('docker ps -q') DO docker stop %%i
 docker container prune -f
 
-docker run -d --name %name% -p 8002:8081 -e COMFYUI_SERVER=http://10.10.10.54:6700  %name%
+docker run -d --name %name% -p 8002:8081 -e COMFYUI_SERVER=http://10.10.10.54:6700 -v %~dp0:/work %name%
 docker exec -it %name% /bin/bash
 
 if "%1"=="-p" (

requirements.txt

@@ -7,6 +7,8 @@ click==8.3.1
 colorama==0.4.6
 fastapi==0.122.0
 h11==0.16.0
+httpcore==1.0.9
+httpx==0.28.1
 idna==3.11
 pillow==12.0.0
 pydantic==2.12.5

routes/image_routes.py

@@ -1,15 +1,19 @@
 from fastapi import APIRouter
 from pydantic import BaseModel
 from core.image_generator import  get_image_generator
-from fastapi.responses import FileResponse
-from fastapi import HTTPException
+from fastapi.responses import FileResponse, StreamingResponse
+from fastapi import HTTPException, Query
+import httpx
+import io
+from PIL import Image
+import logging
 
 router = APIRouter(prefix="/api", tags=["Image Generation"])
 image_generator = get_image_generator()
 class ImageGenerationRequest(BaseModel):
     prompt: str = ""
     negative_prompt: str = ""
-    workflow: str = "1.yml"
+    workflow: str = "1.yaml"
     width: int = 512
     height: int = 512
     batch_size: int = 4
@@ -67,3 +71,76 @@ async def get_workflows():
         return data
     except Exception as e:
         raise HTTPException(status_code=404, detail=f"获取文件失败: {str(e)}")
+
+@router.get("/proxy_image")
+async def proxy_image(url: str = Query(..., description="要代理的远程图片URL")):
+    """
+    代理远程图片资源
+    
+    通过代理访问远程图片，解决跨域问题
+    """
+    try:
+        # 设置请求头，模拟浏览器访问
+        headers = {
+            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36",
+            "Accept": "image/webp,image/apng,image/svg+xml,image/*,*/*;q=0.8",
+            "Accept-Language": "zh-CN,zh;q=0.9,en;q=0.8",
+            "Accept-Encoding": "gzip, deflate, br",
+            "Connection": "keep-alive",
+            "Upgrade-Insecure-Requests": "1",
+        }
+        
+        # 使用httpx客户端获取远程图片
+        with httpx.Client(timeout=30.0, follow_redirects=True) as client:
+            response = client.get(url, headers=headers)
+            response.raise_for_status()
+            
+            # 检查响应内容类型
+            content_type = response.headers.get("content-type", "")
+            if not content_type.startswith("image/"):
+                raise HTTPException(status_code=400, detail="URL不是有效的图片资源")
+            
+            # 获取图片数据
+            image_data = response.content
+            
+            # 尝试使用PIL验证图片格式
+            try:
+                image = Image.open(io.BytesIO(image_data))
+                # 重新保存为JPEG格式（可根据需要调整）
+                img_buffer = io.BytesIO()
+                
+                # 根据原始格式选择保存格式
+                if image.format == "PNG":
+                    image.save(img_buffer, format="PNG", quality=95)
+                    content_type = "image/png"
+                elif image.format == "GIF":
+                    image.save(img_buffer, format="GIF")
+                    content_type = "image/gif"
+                else:
+                    image.save(img_buffer, format="JPEG", quality=95, optimize=True)
+                    content_type = "image/jpeg"
+                
+                img_buffer.seek(0)
+                image_data = img_buffer.getvalue()
+                
+            except Exception as img_error:
+                logging.warning(f"图片处理失败，直接返回原始数据: {img_error}")
+            
+            # 返回图片流响应
+            return StreamingResponse(
+                io.BytesIO(image_data),
+                media_type=content_type,
+                headers={
+                    "Cache-Control": "public, max-age=3600",  # 缓存1小时
+                    "Access-Control-Allow-Origin": "*",  # 允许跨域
+                    "Access-Control-Allow-Methods": "GET",
+                    "Access-Control-Allow-Headers": "*",
+                }
+            )
+            
+    except httpx.HTTPStatusError as e:
+        raise HTTPException(status_code=e.response.status_code, detail=f"获取远程图片失败: {e.response.status_code}")
+    except httpx.RequestError as e:
+        raise HTTPException(status_code=500, detail=f"请求远程图片失败: {str(e)}")
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=f"代理图片失败: {str(e)}")

start.sh

@@ -1,8 +1,4 @@
 #!/bin/bash
 cd /app/
-pwd
+pip3 install -r requirements.txt
 python3 app.py
-# 执行一些操作...
-while true; do
-  sleep 10
-done

test_proxy_image.py

@@ -0,0 +1,51 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""
+测试图片代理功能
+"""
+
+import requests
+import json
+
+def test_proxy_image():
+    """测试图片代理API"""
+    base_url = "http://localhost:8081"
+    
+    # 测试用的远程图片URL
+    test_urls = [
+        "https://picsum.photos/200/300",
+        "https://via.placeholder.com/150x150/0000FF/808080?text=Test",
+        "https://httpbin.org/image/png"
+    ]
+    
+    for i, url in enumerate(test_urls):
+        print(f"\n测试图片 {i+1}: {url}")
+        
+        try:
+            # 调用代理API
+            response = requests.get(
+                f"{base_url}/api/proxy_image",
+                params={"url": url},
+                timeout=30
+            )
+            
+            print(f"状态码: {response.status_code}")
+            print(f"响应头: {dict(response.headers)}")
+            
+            if response.status_code == 200:
+                # 保存代理后的图片
+                with open(f"proxied_image_{i+1}.jpg", "wb") as f:
+                    f.write(response.content)
+                print(f"图片已保存为: proxied_image_{i+1}.jpg")
+                print(f"图片大小: {len(response.content)} bytes")
+            else:
+                print(f"错误: {response.text}")
+                
+        except Exception as e:
+            print(f"请求失败: {e}")
+
+if __name__ == "__main__":
+    print("开始测试图片代理功能...")
+    print("请确保服务器运行在 http://localhost:8081")
+    test_proxy_image()

web_ui/index.html

@@ -307,7 +307,7 @@ <h2>创建您的AI艺术</h2>
                     <span class="label-icon">🔢</span>
                     数量:
                 </label>
-                <input type="number" id="batch_size" value="2" min="1" max="4">
+                <input type="number" id="batch_size" value="1" min="1" max="4">
             </div>
         </div>