Skip to content

Commit 98f6bf1

Browse files
committed
Revert "fix image processing with controlnet"
This reverts commit 52df9cf.
1 parent 13eb78f commit 98f6bf1

File tree

2 files changed

+3
-26
lines changed

2 files changed

+3
-26
lines changed

modules/call_queue.py

+2-20
Original file line numberDiff line numberDiff line change
@@ -81,16 +81,7 @@ def sagemaker_inference(task, infer, username, sagemaker_endpoint, *args, **kwar
8181
if task == 'text-to-image':
8282
script_args = []
8383
for i in range(23, len(args)):
84-
if(isinstance(args[i], dict)):
85-
script_arg = {}
86-
for key in args[i]:
87-
if key == 'image' or key == 'mask':
88-
script_arg[key] = encode_image_to_base64(Image.fromarray(args[i][key]))
89-
else:
90-
script_arg[key] = args[i][key]
91-
script_args.append(script_arg)
92-
else:
93-
script_args.append(args[i])
84+
script_args.append(args[i])
9485

9586
prompt = args[0]
9687
negative_prompt = args[1]
@@ -189,16 +180,7 @@ def sagemaker_inference(task, infer, username, sagemaker_endpoint, *args, **kwar
189180

190181
script_args = []
191182
for i in range(36, len(args)):
192-
if(isinstance(args[i], dict)):
193-
script_arg = {}
194-
for key in args[i]:
195-
if key == 'image' or key == 'mask':
196-
script_arg[key] = encode_image_to_base64(Image.fromarray(args[i][key]))
197-
else:
198-
script_arg[key] = args[i][key]
199-
script_args.append(script_arg)
200-
else:
201-
script_args.append(args[i])
183+
script_args.append(args[i])
202184

203185
if mode == 1:
204186
# Drawn mask

modules/processing.py

+1-6
Original file line numberDiff line numberDiff line change
@@ -117,19 +117,14 @@ def __init__(self, sd_model=None, outpath_samples=None, outpath_grids=None, prom
117117

118118
self.script_args = json.loads(script_args) if script_args != None else None
119119

120-
if self.script_args:
121-
for key in self.script_args:
122-
if key == 'image' or key == 'mask':
123-
self.script_arg[key] = Image.open(io.BytesIO(base64.b64decode(self.script_args[key])))
124-
125-
126120
if not seed_enable_extras:
127121
self.subseed = -1
128122
self.subseed_strength = 0
129123
self.seed_resize_from_h = 0
130124
self.seed_resize_from_w = 0
131125

132126
self.scripts = None
127+
self.script_args = None
133128
self.all_prompts = None
134129
self.all_negative_prompts = None
135130
self.all_seeds = None

0 commit comments

Comments
 (0)