diff --git a/crazy_functions/图片生成.py b/crazy_functions/图片生成.py
index 104d403..d5c4eb0 100644
--- a/crazy_functions/图片生成.py
+++ b/crazy_functions/图片生成.py
@@ -150,18 +150,27 @@ class ImageEditState(GptAcademicState):
file = None if not confirm else file_manifest[0]
return confirm, file
+ def lock_plugin(self, chatbot):
+ chatbot._cookies['lock_plugin'] = 'crazy_functions.图片生成->图片修改_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},
+ {'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 = ""
@@ -171,7 +180,7 @@ class ImageEditState(GptAcademicState):
confirm, res = r['verify_fn'](prompt)
if confirm:
r['value'] = res
- self.set_state(chatbot, 'dummy_key', 'dummy_value')
+ self.dump_state(chatbot)
break
return self
@@ -190,22 +199,63 @@ def 图片修改_DALLE2(prompt, llm_kwargs, plugin_kwargs, chatbot, history, sys
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(["图片修改(先上传图片,再输入修改需求,最后输入分辨率)", state.next_req()])
+ 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]
- 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'中转网址预览: