Merge branch 'xieyongliang:api' into api

AIRI-AUBE · Apr 27, 2023 · b34e11e · b34e11e
2 parents a28f598 + 71169e0
commit b34e11e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/modules/api/api.py b/modules/api/api.py
@@ -405,6 +405,7 @@ def img2imgapi(self, img2imgreq: StableDiffusionImg2ImgProcessingAPI):
             img2imgreq.init_images = None
             img2imgreq.mask = None
 
+        populate.mask = img2imgreq.mask
         return ImageToImageResponse(images=b64images, parameters=vars(populate), info=processed.js())
 
     def extras_single_image_api(self, req: ExtrasSingleImageRequest):
@@ -762,7 +763,7 @@ def invocations(self, req: InvocationsRequest):
             hypernetwork_s3uri = shared.cmd_opts.hypernetwork_s3uri
 
             if hypernetwork_s3uri !='':
-                self.download_s3files(hypernetwork_s3uri, os.path.join(script_path, shared.cmd_opts.hypernetwork_dir))
+                self.download_s3files(hypernetwork_s3uri, shared.cmd_opts.hypernetwork_dir)
                 shared.reload_hypernetworks()
 
             if req.options != None:
@@ -774,14 +775,14 @@ def invocations(self, req: InvocationsRequest):
 
             if req.task == 'text-to-image':
                 if embeddings_s3uri != '':
-                    self.download_s3files(embeddings_s3uri, os.path.join(script_path, shared.cmd_opts.embeddings_dir))
+                    self.download_s3files(embeddings_s3uri, shared.cmd_opts.embeddings_dir)
                     sd_hijack.model_hijack.embedding_db.load_textual_inversion_embeddings()
                 response = self.text2imgapi(req.txt2img_payload)
                 response.images = self.post_invocations(response.images, quality)
                 return response
             elif req.task == 'image-to-image':
                 if embeddings_s3uri != '':
-                    self.download_s3files(embeddings_s3uri, os.path.join(script_path, shared.cmd_opts.embeddings_dir))
+                    self.download_s3files(embeddings_s3uri, shared.cmd_opts.embeddings_dir)
                     sd_hijack.model_hijack.embedding_db.load_textual_inversion_embeddings()
                 response = self.img2imgapi(req.img2img_payload)
                 response.images = self.post_invocations(response.images, quality)

diff --git a/modules/api/models.py b/modules/api/models.py
@@ -293,6 +293,7 @@ class ScriptsList(BaseModel):
 
 class InvocationsRequest(BaseModel):
     task: str
+    id: Optional[str]
     model: Optional[str]
     vae: Optional[str]
     quality: Optional[int]