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/fix-model-scan-on-rel-root

Browse Source
This commit is contained in:
blessedcoolant 2023-06-29 17:54:12 +12:00 committed by GitHub
commit 5be1e71d1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
invokeai/backend/install/migrate_to_3.py
View File

@ -326,7 +326,7 @@ class MigrateTo3(object):
vae_path = p vae_path = p
elif repo_id := vae.get('repo_id'): elif repo_id := vae.get('repo_id'):
if repo_id=='stabilityai/sd-vae-ft-mse': # this guy is already downloaded if repo_id=='stabilityai/sd-vae-ft-mse': # this guy is already downloaded
vae_path = 'models/core/convert/se-vae-ft-mse' vae_path = 'models/core/convert/sd-vae-ft-mse'
else: else:
vae_path = self._download_vae(repo_id, vae.get('subfolder')) vae_path = self._download_vae(repo_id, vae.get('subfolder'))

2
invokeai/frontend/web/src/app/store/middleware/listenerMiddleware/index.ts
View File

@ -198,7 +198,7 @@ addControlNetImageProcessedListener();
addControlNetAutoProcessListener(); addControlNetAutoProcessListener();
// Update image URLs on connect // Update image URLs on connect
addUpdateImageUrlsOnConnectListener(); // addUpdateImageUrlsOnConnectListener();
// Boards // Boards
addImageAddedToBoardFulfilledListener(); addImageAddedToBoardFulfilledListener();

6
invokeai/frontend/web/src/features/canvas/components/IAICanvasImage.tsx
View File

@ -3,6 +3,7 @@ import { Image, Rect } from 'react-konva';
import { useGetImageDTOQuery } from 'services/api/endpoints/images'; import { useGetImageDTOQuery } from 'services/api/endpoints/images';
import useImage from 'use-image'; import useImage from 'use-image';
import { CanvasImage } from '../store/canvasTypes'; import { CanvasImage } from '../store/canvasTypes';
import { $authToken } from 'services/api/client';
type IAICanvasImageProps = { type IAICanvasImageProps = {
canvasImage: CanvasImage; canvasImage: CanvasImage;
@ -12,7 +13,10 @@ const IAICanvasImage = (props: IAICanvasImageProps) => {
const { currentData: imageDTO, isError } = useGetImageDTOQuery( const { currentData: imageDTO, isError } = useGetImageDTOQuery(
imageName ?? skipToken imageName ?? skipToken
); );
const [image] = useImage(imageDTO?.image_url ?? '', 'anonymous'); const [image] = useImage(
imageDTO?.image_url ?? '',
$authToken.get() ? 'use-credentials' : 'anonymous'
);
if (isError) { if (isError) {
return <Rect x={x} y={y} width={width} height={height} fill="red" />; return <Rect x={x} y={y} width={width} height={height} fill="red" />;

33
invokeai/frontend/web/src/i18.d.ts vendored
View File

@ -1,17 +1,20 @@
import 'i18next'; // TODO: Disabled for IDE performance issues with our translation JSON
import en from '../public/locales/en.json'; // import 'i18next';
declare module 'i18next' { // import en from '../public/locales/en.json';
// Extend CustomTypeOptions
interface CustomTypeOptions { // declare module 'i18next' {
// Setting Default Namespace As English // // Extend CustomTypeOptions
defaultNS: 'en'; // interface CustomTypeOptions {
// Custom Types For Resources // // Setting Default Namespace As English
resources: { // defaultNS: 'en';
en: typeof en; // // Custom Types For Resources
}; // resources: {
// Never Return Null // en: typeof en;
returnNull: false; // };
} // // Never Return Null
} // returnNull: false;
// }
// }
export default {};

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

@ -3,6 +3,8 @@ 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';
// TODO: Disabled for IDE performance issues with our translation JSON
// @ts-ignore
import translationEN from '../public/locales/en.json'; import translationEN from '../public/locales/en.json';
import { LOCALSTORAGE_PREFIX } from 'app/store/constants'; import { LOCALSTORAGE_PREFIX } from 'app/store/constants';

3
invokeai/frontend/web/tsconfig.json
View File

@ -11,7 +11,8 @@
"forceConsistentCasingInFileNames": true, "forceConsistentCasingInFileNames": true,
"module": "ESNext", "module": "ESNext",
"moduleResolution": "Node", "moduleResolution": "Node",
"resolveJsonModule": true, // TODO: Disabled for IDE performance issues with our translation JSON
// "resolveJsonModule": true,
"isolatedModules": true, "isolatedModules": true,
"noEmit": true, "noEmit": true,
"jsx": "react-jsx", "jsx": "react-jsx",