'commit'

dsLightRag/Liblib/LiblibUtil.py

@@ -45,4 +45,67 @@ class LiblibUtil:
             return None
         except Exception as e:
             print(f"处理异常: {str(e)}")
-            return None
+            return None
+
+    # ===== 从T1_VersionGet.py迁移的方法 =====
+    def get_model_version_info(self, version_uuid):
+        """获取模型版本信息"""
+        uri = "/api/model/version/get"
+        payload = {"versionUuid": version_uuid}
+        
+        model_info = self.post_request(uri, payload)
+        if model_info:
+            return {
+                'modelName': model_info.get('modelName'),
+                'versionName': model_info.get('versionName'),
+                'commercialUse': model_info.get('commercialUse'),
+                'modelUrl': model_info.get('modelUrl')
+            }
+        return None
+
+    def generate_text_to_image(self, template_uuid, generate_params):
+        """调用text2img接口生成图片"""
+        uri = "/api/generate/webui/text2img"
+        payload = {
+            "templateUuid": template_uuid,
+            "generateParams": generate_params
+        }
+        return self.post_request(uri, payload)
+
+    # ===== 从T2.py迁移的方法 =====
+    def get_generation_status(self, generate_uuid):
+        """查询生图任务状态和结果"""
+        uri = "/api/generate/webui/status"
+        payload = {"generateUuid": generate_uuid}
+        return self.post_request(uri, payload)
+
+    def wait_for_generation_completion(self, generate_uuid, check_interval=5, max_wait_time=300):
+        """等待生图任务完成并获取最终结果"""
+        start_time = time.time()
+        
+        while time.time() - start_time < max_wait_time:
+            status_data = self.get_generation_status(generate_uuid)
+            
+            if status_data:
+                status = status_data.get('status')
+                progress = status_data.get('percentCompleted', 0) * 100
+                print(f"生成进度：{progress:.2f}%")
+                
+                if status == 'completed':
+                    print("生图任务已完成")
+                    images = status_data.get('images', [])
+                    if images:
+                        print("生成的最终图片：")
+                        for img in images:
+                            print(f"- {img.get('imageUrl')}")
+                    return status_data
+                elif status == 'failed':
+                    print(f"生图任务失败: {status_data.get('errorMessage', '未知错误')}")
+                    return None
+                else:
+                    print(f"生图任务处理中，当前状态: {status}")
+            
+            time.sleep(check_interval)
+        
+        print(f"生图任务超时（{max_wait_time}秒）")
+        return None