Merge branch 'main' into nextprevcurrentimagenode

invokeai/frontend/install/widgets.py

@@ -177,6 +177,8 @@ class FloatTitleSlider(npyscreen.TitleText):
 
 
 class SelectColumnBase:
+    """Base class for selection widget arranged in columns."""
+
     def make_contained_widgets(self):
         self._my_widgets = []
         column_width = self.width // self.columns
@@ -253,6 +255,7 @@ class MultiSelectColumns(SelectColumnBase, npyscreen.MultiSelect):
 class SingleSelectWithChanged(npyscreen.SelectOne):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
+        self.on_changed = None
 
     def h_select(self, ch):
         super().h_select(ch)
@@ -260,7 +263,9 @@ class SingleSelectWithChanged(npyscreen.SelectOne):
             self.on_changed(self.value)
 
 
-class SingleSelectColumns(SelectColumnBase, SingleSelectWithChanged):
+class SingleSelectColumnsSimple(SelectColumnBase, SingleSelectWithChanged):
+    """Row of radio buttons. Spacebar to select."""
+
     def __init__(self, screen, columns: int = 1, values: list = [], **keywords):
         self.columns = columns
         self.value_cnt = len(values)
@@ -268,12 +273,6 @@ class SingleSelectColumns(SelectColumnBase, SingleSelectWithChanged):
         self.on_changed = None
         super().__init__(screen, values=values, **keywords)
 
-    def when_value_edited(self):
-        self.h_select(self.cursor_line)
-
-    def when_cursor_moved(self):
-        self.h_select(self.cursor_line)
-
     def h_cursor_line_right(self, ch):
         self.h_exit_down("bye bye")
 
@@ -281,6 +280,13 @@ class SingleSelectColumns(SelectColumnBase, SingleSelectWithChanged):
         self.h_exit_up("bye bye")
 
 
+class SingleSelectColumns(SingleSelectColumnsSimple):
+    """Row of radio buttons. When tabbing over a selection, it is auto selected."""
+
+    def when_cursor_moved(self):
+        self.h_select(self.cursor_line)
+
+
 class TextBoxInner(npyscreen.MultiLineEdit):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)

invokeai/frontend/web/src/features/gallery/components/ImageContextMenu/SingleSelectionMenuItems.tsx

@@ -1,4 +1,4 @@
-import { MenuItem } from '@chakra-ui/react';
+import { Flex, MenuItem, Text } from '@chakra-ui/react';
 import { skipToken } from '@reduxjs/toolkit/dist/query';
 import { useAppToaster } from 'app/components/Toaster';
 import { useAppDispatch } from 'app/store/storeHooks';
@@ -228,6 +228,18 @@ const SingleSelectionMenuItems = (props: SingleSelectionMenuItemsProps) => {
       >
         {t('gallery.deleteImage')}
       </MenuItem>
+      {metadata?.created_by && (
+        <Flex
+          sx={{
+            padding: '5px 10px',
+            marginTop: '5px',
+          }}
+        >
+          <Text fontSize="xs" fontWeight="bold">
+            Created by {metadata?.created_by}
+          </Text>
+        </Flex>
+      )}
     </>
   );
 };

invokeai/frontend/web/src/features/gallery/components/ImageMetadataViewer/ImageMetadataActions.tsx

@@ -69,6 +69,9 @@ const ImageMetadataActions = (props: Props) => {
 
   return (
     <>
+      {metadata.created_by && (
+        <ImageMetadataItem label="Created By" value={metadata.created_by} />
+      )}
       {metadata.generation_mode && (
         <ImageMetadataItem
           label="Generation Mode"

invokeai/frontend/web/src/services/api/schema.d.ts

@@ -1453,6 +1453,11 @@ export type components = {
        * @description The generation mode that output this image
        */
       generation_mode: string;
+      /**
+       * Created By
+       * @description The name of the creator of the image
+       */
+      created_by?: string;
       /**
        * Positive Prompt
        * @description The positive prompt parameter
@@ -6319,18 +6324,18 @@ export type components = {
      * @enum {string}
      */
     ControlNetModelFormat: "checkpoint" | "diffusers";
-    /**
-     * StableDiffusionOnnxModelFormat
-     * @description An enumeration.
-     * @enum {string}
-     */
-    StableDiffusionOnnxModelFormat: "olive" | "onnx";
     /**
      * StableDiffusion1ModelFormat
      * @description An enumeration.
      * @enum {string}
      */
     StableDiffusion1ModelFormat: "checkpoint" | "diffusers";
+    /**
+     * StableDiffusionOnnxModelFormat
+     * @description An enumeration.
+     * @enum {string}
+     */
+    StableDiffusionOnnxModelFormat: "olive" | "onnx";
     /**
      * StableDiffusionXLModelFormat
      * @description An enumeration.