Unverified Commit 26522c7d authored by AUTOMATIC1111's avatar AUTOMATIC1111 Committed by GitHub
Browse files

Merge pull request #6015 from philpax/api-begin-end-in-queue

fix(api): only begin/end state in lock
parents 3d8256e4 5be9387b
Loading
Loading
Loading
Loading
+4 −8
Original line number Diff line number Diff line
@@ -130,15 +130,13 @@ class Api:
        if populate.sampler_name:
            populate.sampler_index = None  # prevent a warning later on
        p = StableDiffusionProcessingTxt2Img(**vars(populate))
        # Override object param

        shared.state.begin()

        with self.queue_lock:
            shared.state.begin()
            processed = process_images(p)

            shared.state.end()


        b64images = list(map(encode_pil_to_base64, processed.images))

        return TextToImageResponse(images=b64images, parameters=vars(txt2imgreq), info=processed.js())
@@ -169,11 +167,9 @@ class Api:

        p.init_images = [decode_base64_to_image(x) for x in init_images]

        shared.state.begin()

        with self.queue_lock:
            shared.state.begin()
            processed = process_images(p)

            shared.state.end()

        b64images = list(map(encode_pil_to_base64, processed.images))