controlnet: use alwayson_scripts

Author: mix1009

setup.py

@@ -11,7 +11,7 @@
 
 setup(
     name="webuiapi",
-    version="0.6.0",
+    version="0.6.1",
     description="Python API client for AUTOMATIC1111/stable-diffusion-webui",
     url="https://github.com/mix1009/sdwebuiapi",
     author="ChunKoo Park",

webuiapi/__init__.py

@@ -1,6 +1,6 @@
 from .webuiapi import WebUIApi, WebUIApiResult, Upscaler, HiResUpscaler, b64_img, raw_b64_img, ModelKeywordResult, ModelKeywordInterface, InstructPix2PixInterface, ControlNetInterface, ControlNetUnit
 
-__version__ = "0.6.0"
+__version__ = "0.6.1"
 
 __all__ = [
     "__version__",

webuiapi/webuiapi.py

@@ -203,6 +203,7 @@ def txt2img(self,
                 alwayson_scripts={},
                 controlnet_units: List[ControlNetUnit] = [],
                 sampler_index=None, # deprecated: use sampler_name
+                use_deprecated_controlnet=False,
                 ):
         if sampler_index is None:
             sampler_index = self.default_sampler
@@ -255,12 +256,18 @@ def txt2img(self,
             "save_images": save_images,
             "alwayson_scripts": alwayson_scripts,
         }
-        if controlnet_units and len(controlnet_units)>0:
+
+        if use_deprecated_controlnet and controlnet_units and len(controlnet_units)>0:
             payload["controlnet_units"] = [x.to_dict() for x in controlnet_units]
             return self.custom_post('controlnet/txt2img', payload=payload)
-        else:
-            response = self.session.post(url=f'{self.baseurl}/txt2img', json=payload)
-            return self._to_api_result(response)
+
+        if controlnet_units and len(controlnet_units)>0:
+            payload["alwayson_scripts"]["ControlNet"] = {
+                "args": [x.to_dict() for x in controlnet_units]
+            }
+
+        response = self.session.post(url=f'{self.baseurl}/txt2img', json=payload)
+        return self._to_api_result(response)
 
     def img2img(self,
                 images=[],  # list of PIL Image