浏览代码

repair sdapi/v1/upscalers returning bogus results

AUTOMATIC 2 年之前
父节点
当前提交
42a70d7477
共有 2 个文件被更改,包括 10 次插入8 次删除
  1. 9 7
      modules/api/api.py
  2. 1 1
      modules/api/models.py

+ 9 - 7
modules/api/api.py

@@ -375,13 +375,15 @@ class Api:
         return [{"name": sampler[0], "aliases":sampler[2], "options":sampler[3]} for sampler in sd_samplers.all_samplers]
         return [{"name": sampler[0], "aliases":sampler[2], "options":sampler[3]} for sampler in sd_samplers.all_samplers]
 
 
     def get_upscalers(self):
     def get_upscalers(self):
-        upscalers = []
-
-        for upscaler in shared.sd_upscalers:
-            u = upscaler.scaler
-            upscalers.append({"name":u.name, "model_name":u.model_name, "model_path":u.model_path, "model_url":u.model_url})
-
-        return upscalers
+        return [
+            {
+                "name": upscaler.name,
+                "model_name": upscaler.scaler.model_name,
+                "model_path": upscaler.data_path,
+                "scale": upscaler.scale,
+            }
+            for upscaler in shared.sd_upscalers
+        ]
 
 
     def get_sd_models(self):
     def get_sd_models(self):
         return [{"title": x.title, "model_name": x.model_name, "hash": x.shorthash, "sha256": x.sha256, "filename": x.filename, "config": find_checkpoint_config(x)} for x in checkpoints_list.values()]
         return [{"title": x.title, "model_name": x.model_name, "hash": x.shorthash, "sha256": x.sha256, "filename": x.filename, "config": find_checkpoint_config(x)} for x in checkpoints_list.values()]

+ 1 - 1
modules/api/models.py

@@ -219,7 +219,7 @@ class UpscalerItem(BaseModel):
     name: str = Field(title="Name")
     name: str = Field(title="Name")
     model_name: Optional[str] = Field(title="Model Name")
     model_name: Optional[str] = Field(title="Model Name")
     model_path: Optional[str] = Field(title="Path")
     model_path: Optional[str] = Field(title="Path")
-    model_url: Optional[str] = Field(title="URL")
+    scale: Optional[float] = Field(title="Scale")
 
 
 class SDModelItem(BaseModel):
 class SDModelItem(BaseModel):
     title: str = Field(title="Title")
     title: str = Field(title="Title")