Next rebased

[brandonrising]

What type of PR is this? (check all applicable)

• Refactor
• Feature
• Bug Fix
• Optimization
• Documentation Update
• Community Node Submission

Have you discussed this change with the InvokeAI team?

• Yes
• No, because:

Have you updated all relevant documentation?

• Yes
• No

Description

This is a PR to merge the next branch into main. I created a separate branch for the rebase due to branch protection rules. The rebase conflicts on main can be found below.

This PR includes:

• Session Processor remake
• Removal of invocation processor and invocation queue
• Create invocation context for improving the relationship between nodes and services
• Create invocation context data to provide a reliable path for delivering information to nodes
• Model Manager rewrite
• Queues for downloading multiple model installs in parallel
• Metadata provided on remote model installs
• New Model Manager UI
• New request structure for models in graphs

Related Tickets & Documents

diff --cc invokeai/frontend/web/src/services/api/index.ts
index 6a342bb72,1f567d790..000000000
--- a/invokeai/frontend/web/src/services/api/index.ts
+++ b/invokeai/frontend/web/src/services/api/index.ts
@@@ -52,22 -52,10 +52,27 @@@ const dynamicBaseQuery: BaseQueryFn<str
    const baseUrl = $baseUrl.get();
    const authToken = $authToken.get();
    const projectId = $projectId.get();
 +  const isOpenAPIRequest =
 +    (args instanceof Object && args.url.includes('openapi.json')) ||
 +    (typeof args === 'string' && args.includes('openapi.json'));
  
    const fetchBaseQueryArgs: FetchBaseQueryArgs = {
++<<<<<<< HEAD
 +    baseUrl: baseUrl ? `${baseUrl}/api/v1` : `${window.location.href.replace(/\/$/, '')}/api/v1`,
 +  };
 +
 +  // When fetching the openapi.json, we need to remove circular references from the JSON.
 +  if (isOpenAPIRequest) {
 +    fetchBaseQueryArgs.jsonReplacer = getCircularReplacer();
 +  }
 +
 +  // openapi.json isn't protected by authorization, but all other requests need to include the auth token and project id.
 +  if (!isOpenAPIRequest) {
 +    fetchBaseQueryArgs.prepareHeaders = (headers) => {
++=======
+     baseUrl: baseUrl || window.location.href.replace(/\/$/, ''),
+     prepareHeaders: (headers) => {
++>>>>>>> 86a372b02 (refactor(ui): url builders for each router)
        if (authToken) {
          headers.set('Authorization', `Bearer ${authToken}`);
        }
 
 
 Revision 
 
 
diff --cc invokeai/frontend/web/src/services/api/index.ts
index 6a342bb72,1f567d790..000000000
--- a/invokeai/frontend/web/src/services/api/index.ts
+++ b/invokeai/frontend/web/src/services/api/index.ts
@@@ -52,22 -52,10 +52,22 @@@ const dynamicBaseQuery: BaseQueryFn<str
    const baseUrl = $baseUrl.get();
    const authToken = $authToken.get();
    const projectId = $projectId.get();
 +  const isOpenAPIRequest =
 +    (args instanceof Object && args.url.includes('openapi.json')) ||
 +    (typeof args === 'string' && args.includes('openapi.json'));
  
    const fetchBaseQueryArgs: FetchBaseQueryArgs = {
-     baseUrl: baseUrl ? `${baseUrl}/api/v1` : `${window.location.href.replace(/\/$/, '')}/api/v1`,
 -    baseUrl: baseUrl || window.location.href.replace(/\/$/, ''),
 -    prepareHeaders: (headers) => {
++baseUrl: baseUrl || window.location.href.replace(/\/$/, ''),
 +  };
 +
 +  // When fetching the openapi.json, we need to remove circular references from the JSON.
 +  if (isOpenAPIRequest) {
 +    fetchBaseQueryArgs.jsonReplacer = getCircularReplacer();
 +  }
 +
 +  // openapi.json isn't protected by authorization, but all other requests need to include the auth token and project id.
 +  if (!isOpenAPIRequest) {
 +    fetchBaseQueryArgs.prepareHeaders = (headers) => {
        if (authToken) {
          headers.set('Authorization', `Bearer ${authToken}`);
        }
 
--------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
diff --cc invokeai/frontend/web/src/features/parameters/components/MainModel/ParamMainModelSelect.tsx
index 18f780bde,84b112eb5..000000000
--- a/invokeai/frontend/web/src/features/parameters/components/MainModel/ParamMainModelSelect.tsx
+++ b/invokeai/frontend/web/src/features/parameters/components/MainModel/ParamMainModelSelect.tsx
@@@ -1,16 -1,14 +1,22 @@@
++<<<<<<< HEAD
 +import { Box, Combobox, FormControl, FormLabel, Tooltip } from '@invoke-ai/ui-library';
 +import { createMemoizedSelector } from 'app/store/createMemoizedSelector';
 +import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 +import { InformationalPopover } from 'common/components/InformationalPopover/InformationalPopover';
 +import { useGroupedModelCombobox } from 'common/hooks/useGroupedModelCombobox';
++=======
+ import { CustomSelect, FormControl, FormLabel } from '@invoke-ai/ui-library';
+ import { createMemoizedSelector } from 'app/store/createMemoizedSelector';
+ import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
+ import { useModelCustomSelect } from 'common/hooks/useModelCustomSelect';
++>>>>>>> 17f5484f5 (feat(ui): fix main model & control adapter model selects)
  import { modelSelected } from 'features/parameters/store/actions';
  import { selectGenerationSlice } from 'features/parameters/store/generationSlice';
- import { pick } from 'lodash-es';
- import { memo, useCallback, useMemo } from 'react';
+ import { memo, useCallback } from 'react';
  import { useTranslation } from 'react-i18next';
  import { NON_REFINER_BASE_MODELS } from 'services/api/constants';
- import type { MainModelConfig } from 'services/api/endpoints/models';
- import { getModelId, mainModelsAdapterSelectors, useGetMainModelsQuery } from 'services/api/endpoints/models';
+ import { useGetMainModelsQuery } from 'services/api/endpoints/models';
+ import type { MainModelConfig } from 'services/api/types';
  
  const selectModel = createMemoizedSelector(selectGenerationSlice, (generation) => generation.model);
  
@@@ -42,21 -36,9 +44,27 @@@ const ParamMainModelSelect = () => 
    });
  
    return (
++<<<<<<< HEAD
 +    <FormControl isDisabled={!options.length} isInvalid={!options.length}>
 +      <InformationalPopover feature="paramModel">
 +        <FormLabel>{t('modelManager.model')}</FormLabel>
 +      </InformationalPopover>
 +      <Tooltip label={tooltipLabel}>
 +        <Box w="full">
 +          <Combobox
 +            value={value}
 +            placeholder={placeholder}
 +            options={options}
 +            onChange={onChange}
 +            noOptionsMessage={noOptionsMessage}
 +          />
 +        </Box>
 +      </Tooltip>
++=======
+     <FormControl isDisabled={!items.length} isInvalid={!selectedItem || !items.length}>
+       <FormLabel>{t('modelManager.model')}</FormLabel>
+       <CustomSelect selectedItem={selectedItem} placeholder={placeholder} items={items} onChange={onChange} />
++>>>>>>> 17f5484f5 (feat(ui): fix main model & control adapter model selects)
      </FormControl>
    );
  };
 
 
 Revision 
 
 
diff --cc invokeai/frontend/web/src/features/parameters/components/MainModel/ParamMainModelSelect.tsx
index 18f780bde,84b112eb5..000000000
--- a/invokeai/frontend/web/src/features/parameters/components/MainModel/ParamMainModelSelect.tsx
+++ b/invokeai/frontend/web/src/features/parameters/components/MainModel/ParamMainModelSelect.tsx
@@@ -1,16 -1,14 +1,15 @@@
- import { Box, Combobox, FormControl, FormLabel, Tooltip } from '@invoke-ai/ui-library';
+ import { CustomSelect, FormControl, FormLabel } from '@invoke-ai/ui-library';
  import { createMemoizedSelector } from 'app/store/createMemoizedSelector';
  import { useAppDispatch, useAppSelector } from 'app/store/storeHooks';
 +import { InformationalPopover } from 'common/components/InformationalPopover/InformationalPopover';
- import { useGroupedModelCombobox } from 'common/hooks/useGroupedModelCombobox';
+ import { useModelCustomSelect } from 'common/hooks/useModelCustomSelect';
  import { modelSelected } from 'features/parameters/store/actions';
  import { selectGenerationSlice } from 'features/parameters/store/generationSlice';
- import { pick } from 'lodash-es';
- import { memo, useCallback, useMemo } from 'react';
+ import { memo, useCallback } from 'react';
  import { useTranslation } from 'react-i18next';
  import { NON_REFINER_BASE_MODELS } from 'services/api/constants';
- import type { MainModelConfig } from 'services/api/endpoints/models';
- import { getModelId, mainModelsAdapterSelectors, useGetMainModelsQuery } from 'services/api/endpoints/models';
+ import { useGetMainModelsQuery } from 'services/api/endpoints/models';
+ import type { MainModelConfig } from 'services/api/types';
  
  const selectModel = createMemoizedSelector(selectGenerationSlice, (generation) => generation.model);
  
@@@ -42,21 -36,9 +37,11 @@@ const ParamMainModelSelect = () => 
    });
  
    return (
-     <FormControl isDisabled={!options.length} isInvalid={!options.length}>
+     <FormControl isDisabled={!items.length} isInvalid={!selectedItem || !items.length}>
 -      <FormLabel>{t('modelManager.model')}</FormLabel>
 +      <InformationalPopover feature="paramModel">
 +        <FormLabel>{t('modelManager.model')}</FormLabel>
 +      </InformationalPopover>
-       <Tooltip label={tooltipLabel}>
-         <Box w="full">
-           <Combobox
-             value={value}
-             placeholder={placeholder}
-             options={options}
-             onChange={onChange}
-             noOptionsMessage={noOptionsMessage}
-           />
-         </Box>
-       </Tooltip>
+       <CustomSelect selectedItem={selectedItem} placeholder={placeholder} items={items} onChange={onChange} />
      </FormControl>
    );
  };
 
--------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
diff --git a/invokeai/frontend/web/public/locales/en.json b/invokeai/frontend/web/public/locales/en.json
index 26d95e4c0..2f9064a77 100644
--- a/invokeai/frontend/web/public/locales/en.json
+++ b/invokeai/frontend/web/public/locales/en.json
@@ -1130,8 +1130,8 @@
         "codeformerFidelity": "Fidelity",
         "coherenceMode": "Mode",
         "coherencePassHeader": "Coherence Pass",
-        "coherenceSteps": "Steps",
-        "coherenceStrength": "Strength",
+        "coherenceEdgeSize": "Edge Size",
+        "coherenceMinDenoise": "Min Denoise",
         "compositingSettingsHeader": "Compositing Settings",
         "controlNetControlMode": "Control Mode",
         "copyImage": "Copy Image",
@@ -1478,6 +1478,7 @@
             "heading": "Mode",
             "paragraphs": ["Method used to create a coherent image with the newly generated masked area."]
         },
+<<<<<<< HEAD
         "compositingCoherenceSteps": {
             "heading": "Steps",
             "paragraphs": ["Number of steps in the Coherence Pass.", "Similar to Generation Steps."]
@@ -1485,6 +1486,18 @@
         "compositingStrength": {
             "heading": "Strength",
             "paragraphs": ["Amount of noise added for the Coherence Pass.", "Similar to Denoising Strength."]
+=======
+        "compositingCoherenceEdgeSize": {
+            "heading": "Edge Size",
+            "paragraphs": ["The edge size of the coherence pass."]
+        },
+        "compositingCoherenceMinDenoise": {
+            "heading": "Minimum Denoise",
+            "paragraphs": [
+                "Minimum denoise strength for the Coherence mode",
+                "The minimum denoise strength for the coherence region when inpainting or outpainting"
+            ]
+>>>>>>> 30b6a0ee2 (wip(ui): Replace 2 Layer Coherence pass with Gradient Mask)
         },
         "compositingMaskAdjustments": {
             "heading": "Mask Adjustments",
@@ -1762,6 +1775,9 @@
         "clearCanvasHistoryMessage": "Clearing the canvas history leaves your current canvas intact, but irreversibly clears the undo and redo history.",
         "clearHistory": "Clear History",
         "clearMask": "Clear Mask (Shift+C)",
+        "coherenceModeGaussianBlur": "Gaussian Blur",
+        "coherenceModeBoxBlur": "Box Blur",
+        "coherenceModeStaged": "Staged",
         "colorPicker": "Color Picker",
         "copyToClipboard": "Copy to Clipboard",
         "cursorPosition": "Cursor Position",
 
 
 Revision 
 
 
diff --git a/invokeai/frontend/web/public/locales/en.json b/invokeai/frontend/web/public/locales/en.json
index 26d95e4c0..3beb57add 100644
--- a/invokeai/frontend/web/public/locales/en.json
+++ b/invokeai/frontend/web/public/locales/en.json
@@ -1130,8 +1130,8 @@
         "codeformerFidelity": "Fidelity",
         "coherenceMode": "Mode",
         "coherencePassHeader": "Coherence Pass",
-        "coherenceSteps": "Steps",
-        "coherenceStrength": "Strength",
+        "coherenceEdgeSize": "Edge Size",
+        "coherenceMinDenoise": "Min Denoise",
         "compositingSettingsHeader": "Compositing Settings",
         "controlNetControlMode": "Control Mode",
         "copyImage": "Copy Image",
@@ -1486,6 +1486,17 @@
             "heading": "Strength",
             "paragraphs": ["Amount of noise added for the Coherence Pass.", "Similar to Denoising Strength."]
         },
+        "compositingCoherenceEdgeSize": {
+            "heading": "Edge Size",
+            "paragraphs": ["The edge size of the coherence pass."]
+        },
+        "compositingCoherenceMinDenoise": {
+            "heading": "Minimum Denoise",
+            "paragraphs": [
+                "Minimum denoise strength for the Coherence mode",
+                "The minimum denoise strength for the coherence region when inpainting or outpainting"
+            ]
+        },
         "compositingMaskAdjustments": {
             "heading": "Mask Adjustments",
             "paragraphs": ["Adjust the mask."]
@@ -1762,6 +1773,9 @@
         "clearCanvasHistoryMessage": "Clearing the canvas history leaves your current canvas intact, but irreversibly clears the undo and redo history.",
         "clearHistory": "Clear History",
         "clearMask": "Clear Mask (Shift+C)",
+        "coherenceModeGaussianBlur": "Gaussian Blur",
+        "coherenceModeBoxBlur": "Box Blur",
+        "coherenceModeStaged": "Staged",
         "colorPicker": "Color Picker",
         "copyToClipboard": "Copy to Clipboard",
         "cursorPosition": "Cursor Position",

QA Instructions, Screenshots, Recordings

Merge Plan

This PR can be merged when approved
#dev-chat on discord needs to be advised of this change when it is merged

Added/updated tests?

• Yes
• No : please replace this line with details on why tests
  have not been included

[psychedelicious]

Ty! I'm going to do the rebase also and compare the diff just as a sanity check