Merge branch 'main' into lstein/fix-model-scan-on-rel-root

invokeai/backend/install/migrate_to_3.py

@@ -326,7 +326,7 @@ class MigrateTo3(object):
                 vae_path = p
             elif repo_id := vae.get('repo_id'):
                 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:
                     vae_path = self._download_vae(repo_id, vae.get('subfolder'))
 

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

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

invokeai/frontend/web/src/features/canvas/components/IAICanvasImage.tsx

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

invokeai/frontend/web/src/i18.d.ts

@@ -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' {
-  // Extend CustomTypeOptions
-  interface CustomTypeOptions {
-    // Setting Default Namespace As English
-    defaultNS: 'en';
-    // Custom Types For Resources
-    resources: {
-      en: typeof en;
-    };
-    // Never Return Null
-    returnNull: false;
-  }
-}
+// import en from '../public/locales/en.json';
+
+// declare module 'i18next' {
+//   // Extend CustomTypeOptions
+//   interface CustomTypeOptions {
+//     // Setting Default Namespace As English
+//     defaultNS: 'en';
+//     // Custom Types For Resources
+//     resources: {
+//       en: typeof en;
+//     };
+//     // Never Return Null
+//     returnNull: false;
+//   }
+// }
+export default {};

invokeai/frontend/web/src/i18n.ts

@@ -3,6 +3,8 @@ import LanguageDetector from 'i18next-browser-languagedetector';
 import Backend from 'i18next-http-backend';
 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 { LOCALSTORAGE_PREFIX } from 'app/store/constants';
 

invokeai/frontend/web/tsconfig.json

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