From 8a01c56dd1540f806f39458f04eaf414dded9c7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9D=92=E8=BD=A9?= Date: Sun, 24 Nov 2024 23:24:36 +0800 Subject: [PATCH] update --- crazy_functional.py | 34 +---- crazy_functions/AntFin.py | 271 +-------------------------------- crazy_functions/AntFin_Wrap.py | 17 +-- main.py | 6 +- 4 files changed, 13 insertions(+), 315 deletions(-) diff --git a/crazy_functional.py b/crazy_functional.py index 6113e760..ef341f2e 100644 --- a/crazy_functional.py +++ b/crazy_functional.py @@ -3,29 +3,15 @@ from toolbox import trimmed_format_exc from loguru import logger def get_crazy_functions(): - from crazy_functions.SourceCode_Analyse import 解析项目本身 + from crazy_functions.AntFin import AntFinTest function_plugins = { - "多媒体智能体": { + "蚂小财测试": { "Group": "智能体", "Color": "stop", "AsButton": False, - "Info": "【仅测试】多媒体任务", - "Function": HotReload(多媒体任务), - }, - "虚空终端": { - "Group": "对话|编程|学术|智能体", - "Color": "stop", - "AsButton": True, - "Info": "使用自然语言实现您的想法", - "Function": HotReload(虚空终端), - }, - "解析整个Python项目": { - "Group": "编程", - "Color": "stop", - "AsButton": True, - "Info": "解析一个Python项目的所有源文件(.py) | 输入参数为路径", - "Function": HotReload(解析一个Python项目), + "Info": "蚂小财测试", + "Function": HotReload(AntFinTest), }, } @@ -50,8 +36,6 @@ def get_crazy_functions(): return function_plugins - - def get_multiplex_button_functions(): """多路复用主提交按钮的功能映射 """ @@ -59,12 +43,6 @@ def get_multiplex_button_functions(): "常规对话": "", - "多模型对话": - "询问多个GPT模型", # 映射到上面的 `询问多个GPT模型` 插件 - - "智能召回 RAG": - "Rag智能召回", # 映射到上面的 `Rag智能召回` 插件 - - "多媒体查询": - "多媒体智能体", # 映射到上面的 `多媒体智能体` 插件 + "蚂小财测试": + "蚂小财测试", # 映射到上面的 `询问多个GPT模型` 插件 } diff --git a/crazy_functions/AntFin.py b/crazy_functions/AntFin.py index d4d0a612..99d0909a 100644 --- a/crazy_functions/AntFin.py +++ b/crazy_functions/AntFin.py @@ -2,275 +2,8 @@ from toolbox import CatchException, update_ui, get_conf, select_api_key, get_log from crazy_functions.multi_stage.multi_stage_utils import GptAcademicState -def gen_image(llm_kwargs, prompt, resolution="1024x1024", model="dall-e-2", quality=None, style=None): - import requests, json, time, os - from request_llms.bridge_all import model_info - - proxies = get_conf('proxies') - # Set up OpenAI API key and model - api_key = select_api_key(llm_kwargs['api_key'], llm_kwargs['llm_model']) - chat_endpoint = model_info[llm_kwargs['llm_model']]['endpoint'] - # 'https://api.openai.com/v1/chat/completions' - img_endpoint = chat_endpoint.replace('chat/completions','images/generations') - # # Generate the image - url = img_endpoint - headers = { - 'Authorization': f"Bearer {api_key}", - 'Content-Type': 'application/json' - } - data = { - 'prompt': prompt, - 'n': 1, - 'size': resolution, - 'model': model, - 'response_format': 'url' - } - if quality is not None: - data['quality'] = quality - if style is not None: - data['style'] = style - response = requests.post(url, headers=headers, json=data, proxies=proxies) - # logger.info(response.content) - try: - image_url = json.loads(response.content.decode('utf8'))['data'][0]['url'] - except: - raise RuntimeError(response.content.decode()) - # 文件保存到本地 - r = requests.get(image_url, proxies=proxies) - file_path = f'{get_log_folder()}/image_gen/' - os.makedirs(file_path, exist_ok=True) - file_name = 'Image' + time.strftime("%Y-%m-%d-%H-%M-%S", time.localtime()) + '.png' - with open(file_path+file_name, 'wb+') as f: f.write(r.content) - - - return image_url, file_path+file_name - - -def edit_image(llm_kwargs, prompt, image_path, resolution="1024x1024", model="dall-e-2"): - import requests, json, time, os - from request_llms.bridge_all import model_info - - proxies = get_conf('proxies') - api_key = select_api_key(llm_kwargs['api_key'], llm_kwargs['llm_model']) - chat_endpoint = model_info[llm_kwargs['llm_model']]['endpoint'] - # 'https://api.openai.com/v1/chat/completions' - img_endpoint = chat_endpoint.replace('chat/completions','images/edits') - # # Generate the image - url = img_endpoint - n = 1 - headers = { - 'Authorization': f"Bearer {api_key}", - } - make_transparent(image_path, image_path+'.tsp.png') - make_square_image(image_path+'.tsp.png', image_path+'.tspsq.png') - resize_image(image_path+'.tspsq.png', image_path+'.ready.png', max_size=1024) - image_path = image_path+'.ready.png' - with open(image_path, 'rb') as f: - file_content = f.read() - files = { - 'image': (os.path.basename(image_path), file_content), - # 'mask': ('mask.png', open('mask.png', 'rb')) - 'prompt': (None, prompt), - "n": (None, str(n)), - 'size': (None, resolution), - } - - response = requests.post(url, headers=headers, files=files, proxies=proxies) - # logger.info(response.content) - try: - image_url = json.loads(response.content.decode('utf8'))['data'][0]['url'] - except: - raise RuntimeError(response.content.decode()) - # 文件保存到本地 - r = requests.get(image_url, proxies=proxies) - file_path = f'{get_log_folder()}/image_gen/' - os.makedirs(file_path, exist_ok=True) - file_name = 'Image' + time.strftime("%Y-%m-%d-%H-%M-%S", time.localtime()) + '.png' - with open(file_path+file_name, 'wb+') as f: f.write(r.content) - - - return image_url, file_path+file_name - - @CatchException -def 图片生成_DALLE2(prompt, llm_kwargs, plugin_kwargs, chatbot, history, system_prompt, user_request): - """ - txt 输入栏用户输入的文本,例如需要翻译的一段话,再例如一个包含了待处理文件的路径 - llm_kwargs gpt模型参数,如温度和top_p等,一般原样传递下去就行 - plugin_kwargs 插件模型的参数,暂时没有用武之地 - chatbot 聊天显示框的句柄,用于显示给用户 - history 聊天历史,前情提要 - system_prompt 给gpt的静默提醒 - user_request 当前用户的请求信息（IP地址等） - """ - history = [] # 清空历史,以免输入溢出 - if prompt.strip() == "": - chatbot.append((prompt, "[Local Message] 图像生成提示为空白，请在“输入区”输入图像生成提示。")) - yield from update_ui(chatbot=chatbot, history=history) # 刷新界面 界面更新 - return - chatbot.append(("您正在调用“图像生成”插件。", "[Local Message] 生成图像, 使用前请切换模型到GPT系列。如果中文Prompt效果不理想, 请尝试英文Prompt。正在处理中 .....")) - yield from update_ui(chatbot=chatbot, history=history) # 刷新界面 由于请求gpt需要一段时间,我们先及时地做一次界面更新 - if ("advanced_arg" in plugin_kwargs) and (plugin_kwargs["advanced_arg"] == ""): plugin_kwargs.pop("advanced_arg") - resolution = plugin_kwargs.get("advanced_arg", '1024x1024') - image_url, image_path = gen_image(llm_kwargs, prompt, resolution) - chatbot.append([prompt, - f'图像中转网址:
`{image_url}`
'+ - f'中转网址预览:
' - f'本地文件地址:
`{image_path}`
'+ - f'本地文件预览:
' - ]) +def AntFinTest(prompt, llm_kwargs, plugin_kwargs, chatbot, history, system_prompt, user_request): + chatbot.append(("AntFin Test", "AntFin Test")) yield from update_ui(chatbot=chatbot, history=history) # 刷新界面 界面更新 - -@CatchException -def 图片生成_DALLE3(prompt, llm_kwargs, plugin_kwargs, chatbot, history, system_prompt, user_request): - history = [] # 清空历史,以免输入溢出 - if prompt.strip() == "": - chatbot.append((prompt, "[Local Message] 图像生成提示为空白，请在“输入区”输入图像生成提示。")) - yield from update_ui(chatbot=chatbot, history=history) # 刷新界面 界面更新 - return - chatbot.append(("您正在调用“图像生成”插件。", "[Local Message] 生成图像, 使用前请切换模型到GPT系列。如果中文Prompt效果不理想, 请尝试英文Prompt。正在处理中 .....")) - yield from update_ui(chatbot=chatbot, history=history) # 刷新界面 由于请求gpt需要一段时间,我们先及时地做一次界面更新 - if ("advanced_arg" in plugin_kwargs) and (plugin_kwargs["advanced_arg"] == ""): plugin_kwargs.pop("advanced_arg") - resolution_arg = plugin_kwargs.get("advanced_arg", '1024x1024-standard-vivid').lower() - parts = resolution_arg.split('-') - resolution = parts[0] # 解析分辨率 - quality = 'standard' # 质量与风格默认值 - style = 'vivid' - # 遍历检查是否有额外参数 - for part in parts[1:]: - if part in ['hd', 'standard']: - quality = part - elif part in ['vivid', 'natural']: - style = part - image_url, image_path = gen_image(llm_kwargs, prompt, resolution, model="dall-e-3", quality=quality, style=style) - chatbot.append([prompt, - f'图像中转网址:
`{image_url}`
'+ - f'中转网址预览:
' - f'本地文件地址:
`{image_path}`
'+ - f'本地文件预览:
' - ]) - yield from update_ui(chatbot=chatbot, history=history) # 刷新界面 界面更新 - - -class ImageEditState(GptAcademicState): - # 尚未完成 - def get_image_file(self, x): - import os, glob - if len(x) == 0: return False, None - if not os.path.exists(x): return False, None - if x.endswith('.png'): return True, x - file_manifest = [f for f in glob.glob(f'{x}/**/*.png', recursive=True)] - confirm = (len(file_manifest) >= 1 and file_manifest[0].endswith('.png') and os.path.exists(file_manifest[0])) - file = None if not confirm else file_manifest[0] - return confirm, file - - def lock_plugin(self, chatbot): - chatbot._cookies['lock_plugin'] = 'crazy_functions.Image_Generate->图片修改_DALLE2' - self.dump_state(chatbot) - - def unlock_plugin(self, chatbot): - self.reset() - chatbot._cookies['lock_plugin'] = None - self.dump_state(chatbot) - - def get_resolution(self, x): - return (x in ['256x256', '512x512', '1024x1024']), x - - def get_prompt(self, x): - confirm = (len(x)>=5) and (not self.get_resolution(x)[0]) and (not self.get_image_file(x)[0]) - return confirm, x - - def reset(self): - self.req = [ - {'value':None, 'description': '请先上传图像（必须是.png格式）, 然后再次点击本插件', 'verify_fn': self.get_image_file}, - {'value':None, 'description': '请输入分辨率,可选：256x256, 512x512 或 1024x1024, 然后再次点击本插件', 'verify_fn': self.get_resolution}, - {'value':None, 'description': '请输入修改需求,建议您使用英文提示词, 然后再次点击本插件', 'verify_fn': self.get_prompt}, - ] - self.info = "" - - def feed(self, prompt, chatbot): - for r in self.req: - if r['value'] is None: - confirm, res = r['verify_fn'](prompt) - if confirm: - r['value'] = res - self.dump_state(chatbot) - break - return self - - def next_req(self): - for r in self.req: - if r['value'] is None: - return r['description'] - return "已经收集到所有信息" - - def already_obtained_all_materials(self): - return all([x['value'] is not None for x in self.req]) - -@CatchException -def 图片修改_DALLE2(prompt, llm_kwargs, plugin_kwargs, chatbot, history, system_prompt, user_request): - # 尚未完成 - history = [] # 清空历史 - state = ImageEditState.get_state(chatbot, ImageEditState) - state = state.feed(prompt, chatbot) - state.lock_plugin(chatbot) - if not state.already_obtained_all_materials(): - chatbot.append(["图片修改\n\n1. 上传图片（图片中需要修改的位置用橡皮擦擦除为纯白色，即RGB=255,255,255）\n2. 输入分辨率 \n3. 输入修改需求", state.next_req()]) - yield from update_ui(chatbot=chatbot, history=history) - return - - image_path = state.req[0]['value'] - resolution = state.req[1]['value'] - prompt = state.req[2]['value'] - chatbot.append(["图片修改, 执行中", f"图片:`{image_path}`
分辨率:`{resolution}`
修改需求:`{prompt}`"]) - yield from update_ui(chatbot=chatbot, history=history) - image_url, image_path = edit_image(llm_kwargs, prompt, image_path, resolution) - chatbot.append([prompt, - f'图像中转网址:
`{image_url}`
'+ - f'中转网址预览:
' - f'本地文件地址:
`{image_path}`
'+ - f'本地文件预览:
' - ]) - yield from update_ui(chatbot=chatbot, history=history) # 刷新界面 界面更新 - state.unlock_plugin(chatbot) - -def make_transparent(input_image_path, output_image_path): - from PIL import Image - image = Image.open(input_image_path) - image = image.convert("RGBA") - data = image.getdata() - new_data = [] - for item in data: - if item[0] == 255 and item[1] == 255 and item[2] == 255: - new_data.append((255, 255, 255, 0)) - else: - new_data.append(item) - image.putdata(new_data) - image.save(output_image_path, "PNG") - -def resize_image(input_path, output_path, max_size=1024): - from PIL import Image - with Image.open(input_path) as img: - width, height = img.size - if width > max_size or height > max_size: - if width >= height: - new_width = max_size - new_height = int((max_size / width) * height) - else: - new_height = max_size - new_width = int((max_size / height) * width) - - resized_img = img.resize(size=(new_width, new_height)) - resized_img.save(output_path) - else: - img.save(output_path) - -def make_square_image(input_path, output_path): - from PIL import Image - with Image.open(input_path) as img: - width, height = img.size - size = max(width, height) - new_img = Image.new("RGBA", (size, size), color="black") - new_img.paste(img, ((size - width) // 2, (size - height) // 2)) - new_img.save(output_path) diff --git a/crazy_functions/AntFin_Wrap.py b/crazy_functions/AntFin_Wrap.py index 62019607..a2c81bdf 100644 --- a/crazy_functions/AntFin_Wrap.py +++ b/crazy_functions/AntFin_Wrap.py @@ -1,7 +1,7 @@ from toolbox import get_conf, update_ui -from crazy_functions.AntFin import 图片生成_DALLE2, 图片生成_DALLE3, 图片修改_DALLE2 from crazy_functions.plugin_template.plugin_class_template import GptAcademicPluginTemplate, ArgProperty +from crazy_functions.AntFin import AntFinTest class ImageGen_Wrap(GptAcademicPluginTemplate): @@ -38,19 +38,6 @@ class ImageGen_Wrap(GptAcademicPluginTemplate): """ 执行插件 """ - # 分辨率 - resolution = plugin_kwargs["resolution"].replace("(限DALLE2)", "").replace("(限DALLE3)", "") + yield from AntFinTest(txt, llm_kwargs, plugin_kwargs, chatbot, history, system_prompt, user_request) - if plugin_kwargs["model_name"] == "DALLE2": - plugin_kwargs["advanced_arg"] = resolution - yield from 图片生成_DALLE2(txt, llm_kwargs, plugin_kwargs, chatbot, history, system_prompt, user_request) - elif plugin_kwargs["model_name"] == "DALLE3": - quality = plugin_kwargs["quality (仅DALLE3生效)"] - style = plugin_kwargs["style (仅DALLE3生效)"] - plugin_kwargs["advanced_arg"] = f"{resolution}-{quality}-{style}" - yield from 图片生成_DALLE3(txt, llm_kwargs, plugin_kwargs, chatbot, history, system_prompt, user_request) - - else: - chatbot.append([None, "抱歉，找不到该模型"]) - yield from update_ui(chatbot=chatbot, history=history) # 刷新界面 diff --git a/main.py b/main.py index 76ccd667..69717758 100644 --- a/main.py +++ b/main.py @@ -112,12 +112,12 @@ def main(): with gr.Row(): txt = gr.Textbox(show_label=False, placeholder="Input question here.", elem_id='user_input_main').style(container=False) with gr.Row(elem_id="gpt-submit-row"): - multiplex_submit_btn = gr.Button("提交", elem_id="elem_submit_visible", variant="primary") + multiplex_submit_btn = gr.Button("蚂小财测试", elem_id="elem_submit_visible", variant="primary") multiplex_sel = gr.Dropdown( - choices=get_multiplex_button_functions().keys(), value="常规对话", + choices=get_multiplex_button_functions().keys(), value="蚂小财测试", interactive=True, label='', show_label=False, elem_classes='normal_mut_select', elem_id="gpt-submit-dropdown").style(container=False) - submit_btn = gr.Button("提交", elem_id="elem_submit", variant="primary", visible=False) + submit_btn = gr.Button("蚂小财测试", elem_id="elem_submit", variant="primary", visible=False) with gr.Row(): resetBtn = gr.Button("重置", elem_id="elem_reset", variant="secondary"); resetBtn.style(size="sm") stopBtn = gr.Button("停止", elem_id="elem_stop", variant="secondary"); stopBtn.style(size="sm")