Merge branch 'main' into main

invokeai/app/services/config.py

@@ -325,11 +325,11 @@ class InvokeAISettings(BaseSettings):
                 help=field.field_info.description,
             )
 def _find_root()->Path:
-    venv = os.environ.get("VIRTUAL_ENV")
+    venv = Path(os.environ.get("VIRTUAL_ENV") or ".")
     if os.environ.get("INVOKEAI_ROOT"):
         root = Path(os.environ.get("INVOKEAI_ROOT")).resolve()
-    elif any([Path(venv, '..', x).exists() for x in [INIT_FILE, LEGACY_INIT_FILE, MODEL_CORE]]):
-        root = Path(venv, "..").resolve()
+    elif any([(venv.parent/x).exists() for x in [INIT_FILE, LEGACY_INIT_FILE, MODEL_CORE]]):
+        root = (venv.parent).resolve()
     else:
         root = Path("~/invokeai").expanduser().resolve()
     return root

invokeai/frontend/web/src/features/parameters/components/Parameters/Core/ParamModelandVAEandScheduler.tsx

@@ -10,20 +10,19 @@ const ParamModelandVAEandScheduler = () => {
 
   return (
     <Flex gap={3} w="full" flexWrap={isVaeEnabled ? 'wrap' : 'nowrap'}>
+      <Box w="full">
+        <ModelSelect />
+      </Box>
       <Flex gap={3} w="full">
-        <Box w="full">
-          <ModelSelect />
-        </Box>
-
         {isVaeEnabled && (
           <Box w="full">
             <VAESelect />
           </Box>
         )}
+        <Box w="full">
+          <ParamScheduler />
+        </Box>
       </Flex>
-      <Box w="full">
-        <ParamScheduler />
-      </Box>
     </Flex>
   );
 };

pyproject.toml

@@ -42,7 +42,7 @@ dependencies = [
   "controlnet-aux>=0.0.6",
   "timm==0.6.13",           # needed to override timm latest in controlnet_aux, see  https://github.com/isl-org/ZoeDepth/issues/26
   "datasets",
-  "diffusers[torch]~=0.17.1",
+  "diffusers[torch]~=0.18.1",
   "dnspython==2.2.1",
   "dynamicprompts",
   "easing-functions",