chore(ui): bump version to v5.4.1rc1

invokeai/backend/model_manager/util/model_util.py

@@ -172,6 +172,8 @@ def get_clip_variant_type(location: str) -> Optional[ClipVariantType]:
     try:
         path = Path(location)
         config_path = path / "config.json"
+        if not config_path.exists():
+            config_path = path / "text_encoder" / "config.json"
         if not config_path.exists():
             return ClipVariantType.L
         with open(config_path) as file:

invokeai/backend/model_manager/util/select_hf_files.py

@@ -85,6 +85,7 @@ def _filter_by_variant(files: List[Path], variant: ModelRepoVariant) -> Set[Path
     """Select the proper variant files from a list of HuggingFace repo_id paths."""
     result: set[Path] = set()
     subfolder_weights: dict[Path, list[SubfolderCandidate]] = {}
+    safetensors_detected = False
     for path in files:
         if path.suffix in [".onnx", ".pb", ".onnx_data"]:
             if variant == ModelRepoVariant.ONNX:
@@ -119,10 +120,16 @@ def _filter_by_variant(files: List[Path], variant: ModelRepoVariant) -> Set[Path
             # We prefer safetensors over other file formats and an exact variant match. We'll score each file based on
             # variant and format and select the best one.
 
+            if safetensors_detected and path.suffix == ".bin":
+                continue
+
             parent = path.parent
             score = 0
 
             if path.suffix == ".safetensors":
+                safetensors_detected = True
+                if parent in subfolder_weights:
+                    subfolder_weights[parent] = [sfc for sfc in subfolder_weights[parent] if sfc.path.suffix != ".bin"]
                 score += 1
 
             candidate_variant_label = path.suffixes[0] if len(path.suffixes) == 2 else None

invokeai/frontend/web/public/locales/en.json

@@ -2102,8 +2102,10 @@
     },
     "whatsNew": {
         "whatsNewInInvoke": "What's New in Invoke",
-        "line1": "<StrongComponent>Layer Merging</StrongComponent>: New <StrongComponent>Merge Down</StrongComponent> and improved <StrongComponent>Merge Visible</StrongComponent> for all layers, with special handling for Regional Guidance and Control Layers.",
-        "line2": "<StrongComponent>HF Token Support</StrongComponent>: Upload models that require Hugging Face authentication.",
+        "items": [
+            "<StrongComponent>SD 3.5</StrongComponent>: Support for Text-to-Image in Workflows with SD 3.5 Medium and Large.",
+            "<StrongComponent>Canvas</StrongComponent>: Streamlined Control Layer processing and improved default Control settings."
+        ],
         "readReleaseNotes": "Read Release Notes",
         "watchRecentReleaseVideos": "Watch Recent Release Videos",
         "watchUiUpdatesOverview": "Watch UI Updates Overview"

invokeai/frontend/web/src/features/ui/components/WhatsNew.tsx

@@ -2,45 +2,41 @@ import { ExternalLink, Flex, ListItem, Text, UnorderedList } from '@invoke-ai/ui
 import { createSelector } from '@reduxjs/toolkit';
 import { useAppSelector } from 'app/store/storeHooks';
 import { selectConfigSlice } from 'features/system/store/configSlice';
+import type { ReactNode } from 'react';
 import { useMemo } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 import { useGetAppVersionQuery } from 'services/api/endpoints/appInfo';
 
 const selectIsLocal = createSelector(selectConfigSlice, (config) => config.isLocal);
 
+const components = {
+  StrongComponent: <Text as="span" color="white" fontSize="sm" fontWeight="semibold" />,
+};
+
 export const WhatsNew = () => {
   const { t } = useTranslation();
   const { data } = useGetAppVersionQuery();
   const isLocal = useAppSelector(selectIsLocal);
 
-  const highlights = useMemo(() => (data?.highlights ? data.highlights : []), [data]);
+  const items = useMemo<ReactNode[]>(() => {
+    if (data?.highlights?.length) {
+      return data.highlights.map((highlight, index) => <ListItem key={`${highlight}-${index}`}>{highlight}</ListItem>);
+    }
+
+    const tKeys = t<string, { returnObjects: true }, string[]>('whatsNew.items', {
+      returnObjects: true,
+    });
+
+    return tKeys.map((key, index) => (
+      <ListItem key={`${key}-${index}`}>
+        <Trans i18nKey={key} components={components} />
+      </ListItem>
+    ));
+  }, [data?.highlights, t]);
 
   return (
     <Flex gap={4} flexDir="column">
-      <UnorderedList fontSize="sm">
-        {highlights.length ? (
-          highlights.map((highlight, index) => <ListItem key={index}>{highlight}</ListItem>)
-        ) : (
-          <>
-            <ListItem>
-              <Trans
-                i18nKey="whatsNew.line1"
-                components={{
-                  StrongComponent: <Text as="span" color="white" fontSize="sm" fontWeight="semibold" />,
-                }}
-              />
-            </ListItem>
-            <ListItem>
-              <Trans
-                i18nKey="whatsNew.line2"
-                components={{
-                  StrongComponent: <Text as="span" color="white" fontSize="sm" fontWeight="semibold" />,
-                }}
-              />
-            </ListItem>
-          </>
-        )}
-      </UnorderedList>
+      <UnorderedList fontSize="sm">{items}</UnorderedList>
       <Flex flexDir="column" gap={1}>
         <ExternalLink
           fontSize="sm"

invokeai/version/invokeai_version.py

@@ -1 +1 @@
-__version__ = "5.4.0"
+__version__ = "5.4.1rc1"