'commit'

dsLightRag/Liblib/T3_WenShengTu_DefaultCheckPoint.py

@@ -1,78 +1,29 @@
-import json
 from Liblib.LibLibGenerator import LibLibGenerator
-from Config.Config import OBS_BUCKET, OBS_SERVER
 
 if __name__ == '__main__':
-    # - Checkpoint默认为官方模型
-    """
-    - Checkpoint默认为官方模型
-    - 可用模型范围：基础算法F.1
-    - 支持additional network
-    """
-    generate_params = {
-        "templateUuid": "6f7c4652458d4802969f8d089cf5b91f",  # 参数模板ID F.1文生图
-        "generateParams": {
-            "prompt": "filmfotos, Asian portrait,A young woman wearing a green baseball cap,covering one eye with her hand",
-            "steps": 20,  # 采样步数
-            "width": 768,  # 宽
-            "height": 1024,  # 高
-            "imgCount": 1,  # 图片数量
-            "seed": -1,  # 随机种子值，-1 表示随机
-            "restoreFaces": 0,  # 面部修复，0 关闭，1 开启
-            # Lora添加，最多5个，不添加lora时请删除此结构体
-            "additionalNetwork": [
-                {
-                    "modelId": "169505112cee468b95d5e4a5db0e5669",  # LoRA的模型版本uuid
-                    "weight": 1.0  # LoRA权重
-                }
-            ]
-        }
-    }
-
     liblib = LibLibGenerator()
-    # 调用生成接口
-    response = liblib.post_request(
-        "/api/generate/webui/text2img",
-        generate_params
+    
+    # 设置LoRA参数
+    additional_network = [
+        {
+            "modelId": "169505112cee468b95d5e4a5db0e5669",  # LoRA的模型版本uuid
+            "weight": 1.0  # LoRA权重
+        }
+    ]
+    
+    # 调用通用方法进行文生图
+    result = liblib.generate_default_text_to_image(
+        prompt="filmfotos, Asian portrait,A young woman wearing a green baseball cap,covering one eye with her hand",
+        steps=20,
+        width=768,
+        height=1024,
+        img_count=1,
+        seed=-1,
+        restore_faces=0,
+        additional_network=additional_network
     )
     
-    print(f"API响应: {json.dumps(response, ensure_ascii=False, indent=2)}")
-
-    if response and "generateUuid" in response:
-        generate_uuid = response["generateUuid"]
-        print("✅ 图像生成任务已成功提交！")
-        print(f"生成UUID: {generate_uuid}")
-        print("开始轮询生成状态...")
-        
-        # 每2秒探测一次生成状态，直到完成
-        status_data = liblib.wait_for_generation_completion(
-            generate_uuid, interval=2
-        )
-        
-        # 检查生成状态
-        if status_data and status_data.get("generateStatus") == 5:
-            print("🎉 图像生成完成！开始处理文件...")
-            
-            # 提取图片URL
-            if status_data.get("images") and len(status_data["images"]) > 0:
-                image_url = status_data["images"][0]["imageUrl"]
-                
-                # 下载并上传到OBS
-                obs_url = liblib.download_and_upload_to_obs(
-                    image_url, generate_uuid
-                )
-                
-                if obs_url:
-                    print(f"✅ 文件处理完成，OBS地址: {obs_url}")
-                    file_url = f"https://{OBS_BUCKET}.{OBS_SERVER}/{obs_url}"
-                    print(f"完整OBS URL: {file_url}")
-                else:
-                    print("❌ 文件上传OBS失败")
-            else:
-                print("❌ 未找到生成的图片数据")
-        else:
-            error_msg = status_data.get('message', '未知错误') if status_data else '生成状态查询失败'
-            print(f"❌ 图像生成失败: {error_msg}")
+    if result:
+        print(f"🎉 生图任务完成！最终OBS地址: {result}")
     else:
-        error_msg = response.get('message', '未知错误') if response else 'API无响应'
-        print(f"❌ 图像生成失败: {error_msg}")
+        print("❌ 生图任务失败")