Skip to content

Commit 317a9a6

Browse files
committed
partial fix for upstream refactor
1 parent fe4c102 commit 317a9a6

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

scripts/extension.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,9 +279,14 @@ def run(self, p, *args):
279279
# encapsulating the request object within a txt2imgreq object is deprecated and no longer works
280280
# see test/basic_features/txt2img_test.py for an example
281281
payload = copy.copy(p.__dict__)
282+
logger.debug(payload)
282283
payload['batch_size'] = Script.world.default_batch_size()
283284
payload['scripts'] = None
284-
del payload['script_args']
285+
try:
286+
del payload['script_args']
287+
except KeyError:
288+
del payload['script_args_value']
289+
285290

286291
payload['alwayson_scripts'] = {}
287292
for packed in packed_script_args:
@@ -313,7 +318,9 @@ def run(self, p, *args):
313318
return
314319

315320
for job in Script.world.jobs:
316-
payload_temp = copy.deepcopy(payload)
321+
payload_temp = copy.copy(payload)
322+
del payload_temp['scripts_value']
323+
payload_temp = copy.deepcopy(payload_temp)
317324

318325
if job.worker.master:
319326
started_jobs.append(job)

scripts/spartan/Worker.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,11 @@ def request(self, payload: dict, option_payload: dict, sync_options: bool):
366366
response_queue = queue.Queue()
367367

368368
def preemptible_request(response_queue):
369+
logger.debug(f"sending {payload}")
370+
if payload['sampler_index'] is None:
371+
logger.debug("had to substitute sampler index with name")
372+
payload['sampler_index'] = payload['sampler_name']
373+
369374
try:
370375
response = self.session.post(
371376
self.full_url("txt2img") if init_images is None else self.full_url("img2img"),

0 commit comments

Comments
 (0)