From aee57364dd8377ee6c86dfde0944f48f48ccbaeb Mon Sep 17 00:00:00 2001
From: qingxu fu <505030475@qq.com>
Date: Sun, 26 Nov 2023 00:24:51 +0800
Subject: [PATCH] edit image
---
crazy_functional.py | 12 +++++++++-
crazy_functions/图片生成.py | 48 ++++++++++++++++++++++++++-----------
2 files changed, 45 insertions(+), 15 deletions(-)
diff --git a/crazy_functional.py b/crazy_functional.py
index 3d4df71..b3dc5ba 100644
--- a/crazy_functional.py
+++ b/crazy_functional.py
@@ -354,7 +354,7 @@ def get_crazy_functions():
print('Load function plugin failed')
try:
- from crazy_functions.图片生成 import 图片生成_DALLE2, 图片生成_DALLE3
+ from crazy_functions.图片生成 import 图片生成_DALLE2, 图片生成_DALLE3, 图片修改_DALLE2
function_plugins.update({
"图片生成_DALLE2 (先切换模型到openai或api2d)": {
"Group": "对话",
@@ -377,6 +377,16 @@ def get_crazy_functions():
"Function": HotReload(图片生成_DALLE3)
},
})
+ # function_plugins.update({
+ # "图片修改_DALLE2 (先切换模型到openai或api2d)": {
+ # "Group": "对话",
+ # "Color": "stop",
+ # "AsButton": True,
+ # "AdvancedArgs": False, # 调用时,唤起高级参数输入区(默认False)
+ # # "Info": "使用DALLE2修改图片 | 输入参数字符串,提供图像的内容",
+ # "Function": HotReload(图片修改_DALLE2)
+ # },
+ # })
except:
print(trimmed_format_exc())
print('Load function plugin failed')
diff --git a/crazy_functions/图片生成.py b/crazy_functions/图片生成.py
index 642a9e2..5c56b79 100644
--- a/crazy_functions/图片生成.py
+++ b/crazy_functions/图片生成.py
@@ -54,19 +54,23 @@ def edit_image(llm_kwargs, prompt, image_path, resolution="1024x1024", model="da
img_endpoint = chat_endpoint.replace('chat/completions','images/edits')
# # Generate the image
url = img_endpoint
+ n = 1
headers = {
'Authorization': f"Bearer {api_key}",
- 'Content-Type': 'application/json'
}
- data = {
- 'image': open(image_path, 'rb'),
- 'prompt': prompt,
- 'n': 1,
- 'size': resolution,
- 'model': model,
- 'response_format': 'url'
- }
- response = requests.post(url, headers=headers, json=data, proxies=proxies)
+ make_transparent(image_path, image_path+'.transparent.png')
+ image_path = image_path+'.transparent.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)
print(response.content)
try:
image_url = json.loads(response.content.decode('utf8'))['data'][0]['url']
@@ -187,14 +191,14 @@ def 图片修改_DALLE2(prompt, llm_kwargs, plugin_kwargs, chatbot, history, sys
yield from update_ui(chatbot=chatbot, history=history)
return
- image_path = state.req[0]
- resolution = state.req[1]
- prompt = state.req[2]
+ 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([state.prompt,
+ chatbot.append([prompt,
f'图像中转网址:
`{image_url}`
'+
f'中转网址预览: