From 83f67f7d54af78a672cd651103d2bd54a31f624d Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Thu, 4 Sep 2025 10:43:10 +0800
Subject: [PATCH] 'commit'

---
 dsLightRag/Liblib/LibLibUtil.py               |   2 +-
 dsLightRag/Liblib/T2.py                       |  75 ++++++++----------
 .../__pycache__/LibLibUtil.cpython-310.pyc    | Bin 8189 -> 8206 bytes
 dsLightRag/Liblib/参数模板预设.txt            |  21 +++++
 4 files changed, 54 insertions(+), 44 deletions(-)
 create mode 100644 dsLightRag/Liblib/参数模板预设.txt

diff --git a/dsLightRag/Liblib/LibLibUtil.py b/dsLightRag/Liblib/LibLibUtil.py
index e7ee6b49..d536fb6a 100644
--- a/dsLightRag/Liblib/LibLibUtil.py
+++ b/dsLightRag/Liblib/LibLibUtil.py
@@ -85,6 +85,7 @@ class LibLibUtil:
             "templateUuid": template_uuid,
             "generateParams": generate_params
         }
+        print(payload)
         return self.post_request(uri, payload)
 
     def get_generation_status(self, generate_uuid):
@@ -207,7 +208,6 @@ class LibLibUtil:
         """
         try:
             # 调用生成接口
-
             response = self.generate_text_to_image(template_uuid, generate_params)
             
             if response and "generateUuid" in response:
diff --git a/dsLightRag/Liblib/T2.py b/dsLightRag/Liblib/T2.py
index 26d043a4..f4e7d8c4 100644
--- a/dsLightRag/Liblib/T2.py
+++ b/dsLightRag/Liblib/T2.py
@@ -1,45 +1,34 @@
-import json
-from LibLibUtil import LibLibUtil, SAMPLING_METHODS
-
-def test_generate_image_with_obs():
-    """测试generate_image_with_obs方法"""
-    liblib = LibLibUtil()
-    print("===== 测试 generate_image_with_obs 方法 =====")
-    
-    # 加载配置文件
-    with open('config.json', 'r', encoding='utf-8') as f:
-        config = json.load(f)
-    
-    # 使用第一个模型的配置
-    first_model = config['models'][0]
-    
-    # 设置生图参数
-    template_uuid = first_model["template_uuid"]
-    generate_params = {
-        "prompt": first_model["prompt"],
-        "negative_prompt": first_model["negative_prompt"],
-        "steps": first_model["steps"],
-        "width": first_model["width"],
-        "height": first_model["height"],
-        "cfg_scale": first_model["cfgScale"],
-        "sampler_name": first_model["sampler"],
-        "sampler_index": SAMPLING_METHODS[first_model["sampler"]],
-        "seed": first_model["seed"]
-    }
-    
-    print(f"使用模型: {first_model['name']}")
-    print(f"模板UUID: {template_uuid}")
-    
-    # 使用新的generate_image_with_obs方法
-    file_url = liblib.generate_image_with_obs(template_uuid, generate_params)
-    
-    if file_url:
-        print(f"✅ 生图任务完成，OBS地址: {file_url}")
-        return file_url
-    else:
-        print("❌ 生图任务失败")
-        return None
+from Liblib.LibLibUtil import LibLibUtil
 
 if __name__ == '__main__':
-    # 测试新的方法
-    test_generate_image_with_obs()
+    """
+
+"""
+    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 = LibLibUtil()
+    # 调用生成接口
+    response = liblib.post_request(
+        "/api/generate/webui/text2img",
+        generate_params
+    )
+    # {'generateUuid': 'f16463d55e144214ae12d5177f8256fc'}
+    print(response)
diff --git a/dsLightRag/Liblib/__pycache__/LibLibUtil.cpython-310.pyc b/dsLightRag/Liblib/__pycache__/LibLibUtil.cpython-310.pyc
index 925605575a2af2573efc2d630c35e49adee2a44d..fa0740f36253c6251ce65a9b8a7b49739bdad32e 100644
GIT binary patch
delta 570
zcmXYu%}X0m6vcDjd?cM@f~F{FViTn;9k8v~3S!k{tYiJ?Kp{|cY$4H1D>RArYFtR9
zpnDari!Qoop)0$R*>vAsH!dq#2>ux&Eq!<5Tl_e4-g)=VeeZAnppaZQO(P=L<<-x%
zUxTN~i(7XF<YxtTl_oSrMSKyv>Q<zw?gK=ck*`3)s6{P-k7SBI8Y>+MDb$z{0`z||
zH34*K{7@~x5ju#^!E$gOUj>+=akB<CotQIEXXF8V!LTJP4GXNf9^RH{X`5Bw-@u1b
zTQQ8YpQpRYPf!lNCtoX&r|ZsR*rTJ=8aTmKswluAw=1JR=crBVU7u~2<vod(R%z5W
zHp6NyrRvwQ#9Kp*P6;b|(}9h7#sb5m+3qno3HH1H2$-bho|TltX=rC|I-T{5##cEG
zj7pH|RiJl*bvRA<6FdgKW0dG|+Ri>>InH>($TQk4S-qvh^gR5gRvJyd9h{PoT^(A=
zOtwoG*bYmVSiNV|=`=I!b{KlB-*}M7p(@RtsMDzWm@9i)C~#Vup7PQyB9G#!vwowF
q{1~1({mLB<pJYd8nJc3m4E3FXz9_e`NLuzje4xSX7HreE?3@2VRDE;+

delta 525
zcmeBk_-oIX&&$ij00c~5c4W-Z-pF^4Q%nlTO<}BMu3@ZUN@1GARLfGsuz+DQ7gsLR
zO2)}`TuFQ&9V|>hz{vKGhh_2yuGLIM)|2ORdoqS>e#xE8$ml%Tmp7NuY4UDfHz9YR
z;vx?a;RGZ!S&JMe3-c*5I!rd@t7nYbyp=DE8OY%gn!;E;d7)4SquXXK;b104x5;s$
zGHfnjeUlqRXE^$Sn5sbH7HdjrZb5O8E{M&XlbTnQ2$C`Y5rRNMlf8%=#C8A?-XOvU
zL_|-H6tiMnym^Y)btXpp$vKiqLT*5DO-6_ss7((fEx1!a${9gK>SkprW=1JH5L*vK
zfE@v{xF{V&Bu;jac9gdPF>OJFF^F&g5fCduthmVwq`epqPkt?3#0v_6B4;20wAF2L
zmW&<5Xh)DR*l4g%GC<t?$%kZ&d^x$;I25@wcod3QfPz)*uBADtMGA>gtYAiwD^M_s
z*~d4y2;`M07LU}@ydqG5N3pmB_!@zOy^0OQR7fmx+UzKMo{=pQC|wjXSxjDyF=w)^
Md<kRz<W2H10Gls$B>(^b

diff --git a/dsLightRag/Liblib/参数模板预设.txt b/dsLightRag/Liblib/参数模板预设.txt
new file mode 100644
index 00000000..b8b86b73
--- /dev/null
+++ b/dsLightRag/Liblib/参数模板预设.txt
@@ -0,0 +1,21 @@
+适用方向   模板名称                             模板UUID                                  备注
+F.1文生图  F.1文生图 - 自定义完整参数            6f7c4652458d4802969f8d089cf5b91f    - Checkpoint默认为官方模型
+                                                                                - 可用模型范围：基础算法F.1
+                                                                                - 支持additional network
+F.1图生图  F.1图生图 - 自定义完整参数            63b72710c9574457ba303d9d9b8df8bd    - Checkpoint默认为官方模型
+                                                                                - 可用模型范围：基础算法F.1
+                                                                                - 支持additional network
+1.5和XL文生图   1.5和XL文生图 - 自定义完整参数     e10adc3949ba59abbe56e057f20f883e    - 可用模型范围：基础算法1.5，基础算法XL
+                                                                                - 支持additional network，高分辨率修复和controlnet
+                                                                                - 可通过自由拼接参数实现各类的文生图诉求
+1.5和XL图生图   1.5和XL图生图 - 自定义完整参数     9c7d531dc75f476aa833b3d452b8f7ad    - 可用模型范围：基础算法1.5，基础算法XL
+                                                                                - 支持additional network和controlnet
+                                                                                - 可通过自由拼接参数实现各类的图生图和蒙版重绘诉求
+局部重绘    Controlnet局部重绘  b689de89e8c9407a874acd415b3aa126                    - 提取自文生图完整参数
+                                                                                - 支持additional network和controlnet
+                                                                                - 不支持高分辨率修复（hiresfix）
+局部重绘    图生图局部重绘       74509e1b072a4c45a7f1843a963c8462                  - 提取自图生图完整参数
+                                                                                - 支持additionalNetwork
+                                                                                - 不支持Controlnet
+人物换脸    InstantID人像换脸   7d888009f81d4252a7c458c874cd017f                    - 仅用于人像换脸
+                                                                                 - 注意人像参考图中的人物面部特征务必清晰
\ No newline at end of file