Merge branch 'experimental' into adetailer

Author: Stax124

api/routes/models.py

@@ -249,7 +249,7 @@ def delete_model(req: DeleteModelRequest):
 
 @router.post("/download-model")
 def download_checkpoint(
- link: str, model_type: Literal["Checkpoint", "TextualInversion", "LORA"]
+ link: str, model_type: Literal["Checkpoint", "TextualInversion", "LORA", "VAE"]
 ) -> str:
  "Download a model from a link and return the path to the downloaded file."
 
@@ -260,7 +260,12 @@ def download_checkpoint(
  folder = "textual-inversion"
  elif mtype == "lora":
  folder = "lora"
+ elif mtype == "vae":
+ folder = "vae"
  else:
  raise ValueError(f"Unknown model type {mtype}")
 
- return download_file(link, Path("data") / folder, True).as_posix()
+ saved_path = download_file(link, Path("data") / folder, True).as_posix()
+ websocket_manager.broadcast_sync(Data(data_type="refresh_models", data={}))
+
+ return saved_path

core/config/api_settings.py

@@ -31,7 +31,7 @@ class APIConfig:
  "xformers", "sdpa", "cross-attention", "subquadratic", "multihead"
  ] = "sdpa"
  subquadratic_size: int = 512
- attention_slicing: Union[int, Literal["auto", "disabled"]] = "disabled"
+ attention_slicing: Union[int, Literal["auto", "disabled"]] = "auto"
  channels_last: bool = True
  trace_model: bool = False
  clear_memory_policy: Literal["always", "after_disconnect", "never"] = "always"
@@ -88,7 +88,7 @@ class APIConfig:
 
  # Hypertile
  hypertile: bool = False
- hypertile_unet_chunk: int = 256
+ hypertile_unet_chunk: int = 512
 
  # Kohya Deep-Shrink
  deepshrink_enabled: bool = True

frontend/dist/assets/ModelsView.js

@@ -6602,7 +6602,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
  useCssVars((_ctx) => {
  var _a, _b;
  return {
- "3d50ed98": (_b = (_a = unref(theme)) == null ? void 0 : _a.Card) == null ? void 0 : _b.color
+ "66e6d45b": (_b = (_a = unref(theme)) == null ? void 0 : _a.Card) == null ? void 0 : _b.color
  };
  });
  const theme = inject(themeOverridesKey);
@@ -6767,22 +6767,14 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
  value: types.value,
  "onUpdate:value": _cache[3] || (_cache[3] = ($event) => types.value = $event),
  options: [
- {
- value: "",
- label: "All"
- },
+ { value: "", label: "All" },
  {
  value: "Checkpoint",
  label: "Checkpoint"
  },
- {
- value: "TextualInversion",
- label: "Textual Inversion"
- },
- {
- value: "LORA",
- label: "LORA"
- }
+ { value: "TextualInversion", label: "Textual Inversion" },
+ { value: "LORA", label: "LORA" },
+ { value: "VAE", label: "VAE" }
  ],
  style: { "margin-right": "4px" }
  }, null, 8, ["value"]),
@@ -6831,7 +6823,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
  };
  }
 });
-const CivitAIDownload = /* @__PURE__ */ _export_sfc(_sfc_main$5, [["__scopeId", "data-v-241a4664"]]);
+const CivitAIDownload = /* @__PURE__ */ _export_sfc(_sfc_main$5, [["__scopeId", "data-v-89afc237"]]);
 const _hoisted_1$3 = ["src"];
 const _hoisted_2$3 = { style: { "position": "absolute", "width": "100%", "bottom": "0", "padding": "0 8px 0 12px", "min-height": "32px", "overflow": "hidden", "box-sizing": "border-box", "backdrop-filter": "blur(12px)", "background-color": "rgba(0, 0, 0, 0.3)" } };
 const _hoisted_3$3 = { style: { "display": "flex", "flex-direction": "column" } };

frontend/dist/assets/index.css

@@ -59,23 +59,23 @@
  justify-content: center;
 }
 
-.progress-container[data-v-fd90df03] {
+.progress-container[data-v-3a99505a] {
  margin: 12px;
  flex-grow: 1;
  width: 400px;
 }
-.top-bar[data-v-fd90df03] {
+.top-bar[data-v-3a99505a] {
  display: inline-flex;
  align-items: center;
  padding-top: 10px;
  padding-bottom: 10px;
- width: var(--0ccf3a18);
+ width: var(--ca9a9586);
  height: 32px;
  position: fixed;
  top: 0;
  z-index: 1;
 }
-.logo[data-v-fd90df03] {
+.logo[data-v-3a99505a] {
  margin-right: 16px;
  margin-left: 16px;
 }
@@ -158,13 +158,13 @@
  justify-content: center;
 }
 
-.image-grid[data-v-241a4664] {
+.image-grid[data-v-89afc237] {
  display: grid;
  grid-template-columns: repeat(auto-fill, minmax(280px, 1fr));
  grid-gap: 8px;
 }
-.top-bar[data-v-241a4664] {
- background-color: var(--3d50ed98);
+.top-bar[data-v-89afc237] {
+ background-color: var(--66e6d45b);
 }
 
 .install[data-v-b405f046] {

frontend/dist/assets/index.js

@@ -42354,7 +42354,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
  };
  }
 });
-const _withScopeId = (n) => (pushScopeId("data-v-fd90df03"), n = n(), popScopeId(), n);
+const _withScopeId = (n) => (pushScopeId("data-v-3a99505a"), n = n(), popScopeId(), n);
 const _hoisted_1$2 = { class: "top-bar" };
 const _hoisted_2$1 = { key: 0 };
 const _hoisted_3$1 = { key: 0 };
@@ -42380,7 +42380,7 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
  __name: "TopBar",
  setup(__props) {
  useCssVars((_ctx) => ({
- "0ccf3a18": topBarWidth.value
+ "ca9a9586": topBarWidth.value
  }));
  const router2 = useRouter();
  const websocketState = useWebsocket();
@@ -42659,7 +42659,7 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
  "Content-Type": "application/json"
  },
  body: JSON.stringify({
- model: global2.state.selected_model.name,
+ model: global2.state.selected_model.path,
  vae: vae.path
  })
  });
@@ -42680,7 +42680,7 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
  "Content-Type": "application/json"
  },
  body: JSON.stringify({
- model: global2.state.selected_model.name,
+ model: global2.state.selected_model.path,
  textual_inversion: textualInversion.path
  })
  });
@@ -43412,14 +43412,14 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
  };
  }
 });
-const TopBar_vue_vue_type_style_index_0_scoped_fd90df03_lang = "";
-const TopBar = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-fd90df03"]]);
+const TopBar_vue_vue_type_style_index_0_scoped_3a99505a_lang = "";
+const TopBar = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-3a99505a"]]);
 const Prompt_vue_vue_type_style_index_0_lang = "";
 const Prompt_vue_vue_type_style_index_1_scoped_780680bc_lang = "";
 const ControlNet_vue_vue_type_style_index_0_scoped_d4ff54ab_lang = "";
 const Img2Img_vue_vue_type_style_index_0_scoped_a4145f6c_lang = "";
 const Inpainting_vue_vue_type_style_index_0_scoped_b1671b35_lang = "";
-const CivitAIDownload_vue_vue_type_style_index_0_scoped_241a4664_lang = "";
+const CivitAIDownload_vue_vue_type_style_index_0_scoped_89afc237_lang = "";
 const HuggingfaceDownload_vue_vue_type_style_index_0_scoped_b405f046_lang = "";
 const _hoisted_1$1 = { style: { "margin": "16px 0" } };
 const _hoisted_2 = /* @__PURE__ */ createBaseVNode("b", null, "Key in question:", -1);

frontend/src/components/TopBar.vue

@@ -784,7 +784,7 @@ async function loadVAE(vae: ModelEntry) {
  "Content-Type": "application/json",
  },
  body: JSON.stringify({
- model: global.state.selected_model.name,
+ model: global.state.selected_model.path,
  vae: vae.path,
  }),
  });
@@ -806,7 +806,7 @@ async function loadTextualInversion(textualInversion: ModelEntry) {
  "Content-Type": "application/json",
  },
  body: JSON.stringify({
- model: global.state.selected_model.name,
+ model: global.state.selected_model.path,
  textual_inversion: textualInversion.path,
  }),
  });

frontend/src/components/models/CivitAIDownload.vue

@@ -46,22 +46,14 @@
  <NSelect
  v-model:value="types"
  :options="[
- {
- value: '',
- label: 'All',
- },
+ { value: '', label: 'All' },
  {
  value: 'Checkpoint',
  label: 'Checkpoint',
  },
- {
- value: 'TextualInversion',
- label: 'Textual Inversion',
- },
- {
- value: 'LORA',
- label: 'LORA',
- },
+ { value: 'TextualInversion', label: 'Textual Inversion' },
+ { value: 'LORA', label: 'LORA' },
+ { value: 'VAE', label: 'VAE' },
  ]"
  style="margin-right: 4px"
  />
@@ -113,7 +105,8 @@ const theme = inject(themeOverridesKey);
 const loadingLock = ref(false);
 const currentPage = ref(1);
 const sortBy = ref("Most Downloaded");
-const types: Ref<"Checkpoint" | "TextualInversion" | "LORA" | ""> = ref("");
+const types: Ref<"Checkpoint" | "TextualInversion" | "LORA" | "VAE" | ""> =
+ ref("");
 
 const currentModel = ref<ICivitAIModel | null>(null);
 const showModal = ref(false);