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 lstein/new-model-manager

Browse Source
This commit is contained in:
Lincoln Stein 2023-05-11 00:16:03 -04:00
commit 590942edd7
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
installer/lib/installer.py
View File

@ -247,8 +247,8 @@ class InvokeAiInstance:
pip[ pip[
"install", "install",
"--require-virtualenv", "--require-virtualenv",
"torch", "torch~=2.0.0",
"torchvision", "torchvision>=0.14.1",
"--force-reinstall", "--force-reinstall",
"--find-links" if find_links is not None else None, "--find-links" if find_links is not None else None,
find_links, find_links,

3
invokeai/app/api_app.py
View File

@ -126,7 +126,6 @@ app.openapi = custom_openapi
# Override API doc favicons # Override API doc favicons
app.mount("/static", StaticFiles(directory="static/dream_web"), name="static") app.mount("/static", StaticFiles(directory="static/dream_web"), name="static")
@app.get("/docs", include_in_schema=False) @app.get("/docs", include_in_schema=False)
def overridden_swagger(): def overridden_swagger():
return get_swagger_ui_html( return get_swagger_ui_html(
@ -144,6 +143,8 @@ def overridden_redoc():
redoc_favicon_url="/static/favicon.ico", redoc_favicon_url="/static/favicon.ico",
) )
# Must mount *after* the other routes else it borks em
app.mount("/", StaticFiles(directory="invokeai/frontend/web/dist", html=True), name="ui")
def invoke_api(): def invoke_api():
# Start our own event loop for eventing usage # Start our own event loop for eventing usage

1
invokeai/app/services/image_storage.py
View File

@ -270,4 +270,5 @@ class DiskImageStorage(ImageStorageBase):
) # TODO: this should refresh position for LRU cache ) # TODO: this should refresh position for LRU cache
if len(self.__cache) > self.__max_cache_size: if len(self.__cache) > self.__max_cache_size:
cache_id = self.__cache_ids.get() cache_id = self.__cache_ids.get()
if cache_id in self.__cache:
del self.__cache[cache_id] del self.__cache[cache_id]

2
invokeai/frontend/web/src/i18n.ts
View File

@ -3,7 +3,7 @@ import LanguageDetector from 'i18next-browser-languagedetector';
import Backend from 'i18next-http-backend'; import Backend from 'i18next-http-backend';
import { initReactI18next } from 'react-i18next'; import { initReactI18next } from 'react-i18next';
import translationEN from '../dist/locales/en.json'; import translationEN from '../public/locales/en.json';
if (import.meta.env.MODE === 'package') { if (import.meta.env.MODE === 'package') {
i18n.use(initReactI18next).init({ i18n.use(initReactI18next).init({

8
pyproject.toml
View File

@ -38,9 +38,9 @@ dependencies = [
"albumentations", "albumentations",
"click", "click",
"clip_anytorch", # replacing "clip @ https://github.com/openai/CLIP/archive/eaa22acb90a5876642d0507623e859909230a52d.zip", "clip_anytorch", # replacing "clip @ https://github.com/openai/CLIP/archive/eaa22acb90a5876642d0507623e859909230a52d.zip",
"compel==1.0.5", "compel~=1.1.5",
"datasets", "datasets",
"diffusers[torch]==0.15.1", "diffusers[torch]~=0.16.1",
"dnspython==2.2.1", "dnspython==2.2.1",
"einops", "einops",
"eventlet", "eventlet",
@ -73,7 +73,7 @@ dependencies = [
"scikit-image>=0.19", "scikit-image>=0.19",
"send2trash", "send2trash",
"test-tube>=0.7.5", "test-tube>=0.7.5",
"torch>=1.13.1", "torch~=2.0.0",
"torchvision>=0.14.1", "torchvision>=0.14.1",
"torchmetrics", "torchmetrics",
"transformers~=4.26", "transformers~=4.26",
@ -93,7 +93,7 @@ dependencies = [
] ]
"test" = ["pytest>6.0.0", "pytest-cov"] "test" = ["pytest>6.0.0", "pytest-cov"]
"xformers" = [ "xformers" = [
"xformers~=0.0.16; sys_platform!='darwin'", "xformers~=0.0.19; sys_platform!='darwin'",
"triton; sys_platform=='linux'", "triton; sys_platform=='linux'",
] ]