Merge branch 'main' into feat/compel_node

invokeai/frontend/web/src/common/util/getPromptAndNegative.ts

@@ -1,4 +1,4 @@
-import * as InvokeAI from 'app/invokeai';
+import * as InvokeAI from 'app/types/invokeai';
 import promptToString from './promptToString';
 
 export function getPromptAndNegative(inputPrompt: InvokeAI.Prompt) {

invokeai/frontend/web/src/common/util/getUrl.ts

@@ -1,5 +1,6 @@
-import { RootState } from 'app/store';
-import { useAppSelector } from 'app/storeHooks';
+import { RootState } from 'app/store/store';
+import { useAppSelector } from 'app/store/storeHooks';
+import { useCallback } from 'react';
 import { OpenAPI } from 'services/api';
 
 export const getUrlAlt = (url: string, shouldTransformUrls: boolean) => {
@@ -15,14 +16,19 @@ export const useGetUrl = () => {
     (state: RootState) => state.config.shouldTransformUrls
   );
 
-  return {
-    shouldTransformUrls,
-    getUrl: (url?: string) => {
+  const getUrl = useCallback(
+    (url?: string) => {
       if (OpenAPI.BASE && shouldTransformUrls) {
         return [OpenAPI.BASE, url].join('/');
       }
 
       return url;
     },
+    [shouldTransformUrls]
+  );
+
+  return {
+    shouldTransformUrls,
+    getUrl,
   };
 };

invokeai/frontend/web/src/common/util/parseMetadata.ts

@@ -1,4 +1,4 @@
-import { forEach, size } from 'lodash';
+import { forEach, size } from 'lodash-es';
 import { ImageField, LatentsField, ConditioningField } from 'services/api';
 
 const OBJECT_TYPESTRING = '[object Object]';

invokeai/frontend/web/src/common/util/promptToString.ts

@@ -1,4 +1,4 @@
-import * as InvokeAI from 'app/invokeai';
+import * as InvokeAI from 'app/types/invokeai';
 
 const promptToString = (prompt: InvokeAI.Prompt): string => {
   if (typeof prompt === 'string') {

invokeai/frontend/web/src/common/util/seedWeightPairs.ts

@@ -1,4 +1,4 @@
-import * as InvokeAI from 'app/invokeai';
+import * as InvokeAI from 'app/types/invokeai';
 
 export const stringToSeedWeights = (
   string: string