Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into main

Browse Source
This commit is contained in:
blessedcoolant 2023-07-09 11:56:17 +12:00 committed by GitHub
commit df27218f96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
invokeai/app/services/config.py
View File

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

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

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

2
pyproject.toml
View File

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