fix(api): parse border and upscale in chain stages

ssube · Jan 29, 2023 · 18803db · 18803db
1 parent 151ebff
commit 18803db
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 18 deletions.
diff --git a/api/onnx_web/chain/blend_img2img.py b/api/onnx_web/chain/blend_img2img.py
@@ -49,6 +49,6 @@ def blend_img2img(
     )
     output = result.images[0]
 
-    logger.info('final output image size', output.size)
+    logger.info('final output image size: %sx%s', output.width, output.height)
     return output
 
diff --git a/api/onnx_web/serve.py b/api/onnx_web/serve.py
@@ -573,14 +573,24 @@ def chain():
 
         callback = chain_stages[stage_data.get('type')]
         kwargs = stage_data.get('params', {})
+        print('stage', callback.__name__, kwargs)
 
         stage = StageParams(
             stage_data.get('name', callback.__name__),
             tile_size=int(kwargs.get('tile_size', SizeChart.auto)),
             outscale=int(kwargs.get('outscale', 1)),
         )
+
         # TODO: create Border from border
+        if 'border' in kwargs:
+            border = Border.even(int(kwargs.get('border')))
+            kwargs['border'] = border
+
         # TODO: create Upscale from upscale
+        if 'upscale' in kwargs:
+            upscale = UpscaleParams(params.model, params.provider)
+            kwargs['upscale'] = upscale
+
         pipeline.append((callback, stage, kwargs))
 
     # build and run chain pipeline

diff --git a/api/schema.yaml b/api/schema.yaml
@@ -39,22 +39,17 @@ $defs:
       type:
         type: string
       params:
-        type: object
-        properties:
-          args:
-            type: object
-            additionalProperties: False
-            patternProperties:
-              "^[-_A-Za-z]+$":
-                oneOf:
-                  - type: number
-                  - type: string
-          border:
-            $ref: "#/$defs/border_params"
-          image:
-            $ref: "#/$defs/image_params"
-          upscale:
-            $ref: "#/$defs/upscale_params"
+        allOf:
+        - $ref: "#/$defs/border_params"
+        - $ref: "#/$defs/image_params"
+        - $ref: "#/$defs/upscale_params"
+        - type: object
+          additionalProperties: False
+          patternProperties:
+            "^[-_A-Za-z]+$":
+              oneOf:
+                - type: number
+                - type: string
 
   request_chain:
     type: array

diff --git a/common/pipelines/example.json b/common/pipelines/example.json
@@ -11,7 +11,8 @@
       "name": "refine",
       "type": "blend-img2img",
       "params": {
-        "prompt": "a magical wizard in a robe fighting a dragon"
+        "prompt": "a magical wizard in a robe fighting a dragon",
+        "strength": 0.5
       }
     },
     {