v2.4.0 (#168)

.gitignore

@@ -1,3 +1,4 @@
 Cozy-Nest.iml
 nevyui_settings.json
-data/images.cache
+data/images.cache
+/scripts/cozy_lib/log_enabled

PATCHNOTE.md

@@ -3,9 +3,18 @@
 - Automatic1111's webui 1.3.2 release.
 - SD Next (Vlad's fork) Version: 4867dafa Fri Jun 23. (Not compatible with latest!)
 
+## New features in 2.4.0
+- [x]  Dedicated Extra Network component which *should* be more stable and faster.
+  - [x]  Compatible with Civitai Helper (and hard requirement to generate civitai.info file)
+  - [x]  Search field
+  - [x]  NSFW filter
+  - [x]  Mark as NSFW
+  - [x]  Folder tree view (toggleable)
+- [x]  Multithread image indexer for image browser
+
 ## Minor changes & fixes in 2.3.4
 - [x]  Compatibility with https://github.com/DominikDoom/a1111-sd-webui-tagcomplete (ctrl+space to autocomplete tags in Cozy Prompt)
-- [x]  Synthax color in prompt for wildcard (ie: '__devilkkw/body-1/eyes_iris_colors__')
+- [x]  Synthax color in prompt for wildcard (ie: '\_\_devilkkw/body-1/eyes_iris_colors\_\_')
 - [x]  Synthax color in prompt for attention value (':1.1', ':2.3', ...)
 - [x]  Keybinding to increase or decrease attention value (ctrl+up, ctrl+down)
 
@@ -29,140 +38,3 @@
 - [x]  Move prompt tools button ("redo last prompt", ...)
 - [x]  Add a secondary accent color in settings, applied to some elements (open scripts...)
 - [x]  Reworked a lots of padding for a cleaner and more compact view
-
-## Minor changes & fixes in 2.2.4
-- [x] Fix image url which was hardcoded to port 7860.
-- [x] use data_dir args to locate and save settings.
-- [x] small space optimization.
-
-## Minor changes & fixes in 2.2.3
-- [x] Differed Extra Network loading. This mean that the initial loading of Cozy Nest should be faster.
-
-## New features in 2.2.0
-- [x]  Redo the Extra Network tweaks from scratch. User experiencing issues with previous version should not experience issues anymore.
-- [x]  Enhanced prompt editor with color (in txt2img and img2img) - It can be disabled through settings
-- [x]  Tag system for image browser : you can now add tag to your images and filter them by tag. Tags are saved in exif metadata.
-- [x]  Exif metadata editor : you can now edit exif metadata of your images
-- [x]  You can move img into a separated archive folder (set through settings)
-- [x]  You can hide image from image browser (a tag is added to the image exif)
-- [x]  You can delete images from image browser
-- [x]  Image browser now build a cache of its index to speed up loading time
-
-## Minor changes & fixes in 2.1.7
-
-- [x]  Quick fix to be able to save settings despite the new ui-config.json save ui system. (pruning the file from Cozy Nest entry on startup)
-
-## Minor changes & fixes in 2.1.6
-
-- [x]  Some settings were not saved properly
-
-## Minor changes & fixes in 2.1.5
-
-- [x]  Font color settings added (and auto calculate subdued color)
-- [x]  Cozy Nest should detect more easily if it is running on Automatic1111's webui or SD Next (Vlad's fork)
-- [x]  Few tweaks for SD Next
-
-## Minor changes & fixes in 2.1.4
-
-- [x]  Add a "clear" button to txt2img and img2img gallery
-- [x]  When background and waves animation are disabled they now remain visible but static
-- [x]  Settings to enable/disable extra networks tweaks
-- [x]  Settings to enable/disable clear gallery button tweaks
-- [x]  Fix CozyNest=No not working
-
-## Minor changes & fixes in 2.1.3
-
-- [x]  Fix for default "send to" button
-- [x]  Fix image browser search
-- [x]  SFW settings to blur all images in the UI 👀
-- [x]  Removed console spam from image browser
-- [x]  Faster animation for settings, update and side panels
-- [x]  Fix for troubleshot dialog with Vlad's fork
-
-## Minor changes & fixes in 2.1.2
-
-- [x]  Fix for Vlad's fork compatibility
-
-## Minor changes & fixes in 2.1.1
-
-- [x]  Fix bug for image with special characters in their name (like "+")
-
-## New features in 2.1.0
-
-- [x]  Settings panel for image browser
-    - [x]  Chose default socket port
-    - [x]  Enable/disable auto search for free port
-    - [x]  Enable/disable auto fetch for output folder from a1111 settings
-    - [x]  Add/Remove custom output folder
-
-- [x]  Code has been refactored to use a module builder (Vite). Refactoring is still in progress in the long run. But it should help to stabilize the code base.
-
-## Minor changes & fixes in 2.0.9
-
-- [x] Using the builtin png info to get image generation data in image browser
-- [x] Add error handling and display for image browser
-- [x] Fix : prevent error if a tab button made by an extension does not have inner text
-- [x] Add close button to Cozy Nest update panel
-
-## Minor changes & fixes in 2.0.8
-
-- [x] Remove the "click outside to close" behavior of the settings panel. It was causing some issue with others extensions. 
-
-## Minor changes & fixes in 2.0.7
-
-- [x] Fix : small fix
-
-## Minor changes & fixes in 2.0.5
-
-- [x] Fix for menu and quicksettings size. Should be more consistent now, but still buggy with too many quicksettings.
-
-## Minor changes & fixes in 2.0.4
-
-- [x] Simplify extra network cards/thumb display - should work better. I know that a lots of work still remain to be done on this part but code need a cleanup before.
-
-## Minor changes & fixes in 2.0.3
-
-- [x] "Send to" buttons are opening right side drawer panels rather than swapping tabs #75
-- [x] Fix: tweak of SDAtom-WebUi-client-queue-ext extension. To enable the tweak you have to add `"extensions": ["SDAtom-WebUi-client-queue-ext"]` to your nevyui_settings.json file
-
-## Minor changes & fixes in 2.0.2
-
-- [x] Cozy Nest error popup should now only be displayed if filename contains Cozy Nest
-- [x] Fix image browser crash if metadata are not formatted as expected (although metadata display may display "Error parsing metadata")
-- [x] Fix Download image link hidden on hover
-- [x] Fix selectable options list passing under other elements
-- [x] Fix: Grid image appear in Image browser after batch gen
-- [x] Fix: Wave badly displayed
-- [x] Add setting to disable waves and gradiant bg
-
-## Minor changes & fixes in 2.0.1
-
-- [x] Fix: Some user report a missing scrollbar in Extra network tab
-- [x] Fix: image browser spamming console
-- [x] Fix: Image Browser socket do not always close properly when reloading the UI
-- [x] disable image browser via settings (NOW DISABLED BY DEFAULT)
-- [x] extra network tab fix and perf (a bit)
-
-
-## New features in 2.0.0
-
-- [x]  Fully integrated Image Browser **IN BETA**. Lots of bugs and missing features. Please be kind with Github issues.
-    - [x]  Send to txt2img / img2img / …
-    - [x]  Clean memory for image not visible (unload them / replace with dummy div) clean filteredImages and loadedImage Array
-    - [x]  manage new image generated
-    - [x]  Automatically get image output folder (without grid folder)
-    - [x]  Drag and drop image
-
-## Issues fixed
-
-- [x]  Laggy Extra Network tab opening
-- [x]  crash when loading without setting file saved
-- [x]  Fix Drag and drop image
-
-## Known Issue
-
-- [ ]  Metadata display in image browser may display "Error parsing metadata"
-- [ ]  Partial compatibility with Firefox and Opera GX
-- [ ]  Most tweak will not support a live window resize
-- [ ]  Some user report a missing scrollbar in Extra network tab
-- [ ]  Some user report an crash when attempting to open Extra Network tab

README.md

@@ -109,5 +109,6 @@ Feel free to contribute to this project. I'm sure there are a lot of things that
 I'll try to keep this extension up to date with the latest version of auto1111.
 
 # Credits
+* [DominikDoom](https://github.com/DominikDoom/a1111-sd-webui-tagcomplete) used part of is code to retrieve valid extra networks
 * [anapnoe](https://github.com/anapnoe/stable-diffusion-webui-ux)'s incredible work on its fork of sd-webui
 * [AUTOMATIC1111](https://github.com/AUTOMATIC1111/stable-diffusion-webui)'s work on sd-webui

cozy-nest-client/.env

@@ -1 +1,2 @@
-VITE_CONTEXT=DEV
+VITE_CONTEXT=DEV
+PROMPT_LOGGING=0

cozy-nest-client/.env.production

@@ -1 +1,2 @@
-VITE_CONTEXT=PROD
+VITE_CONTEXT=PROD
+PROMPT_LOGGING=0

cozy-nest-client/chakra/Modal.theme.ts

@@ -18,7 +18,11 @@ export const modalTheme = defineMultiStyleConfig({
             marginLeft: 'auto',
             transform: 'none',
             maxWidth: 'fit-content',
-            background: 'none',
+            border: '1px solid var(--ae-input-border-color)',
+            backgroundColor: 'var(--block-background-fill)',
+            color: 'var(--body-text-color)',
+            borderRadius: '0 !important',
+            fontSize: 'var(--body-text-size)',
           },
         }),
     'nevysha-confirm':

cozy-nest-client/cozy-prompt/App.jsx

@@ -14,7 +14,7 @@ import {Column, Row} from "../main/Utils.jsx";
 import {ButtonWithConfirmDialog} from "../chakra/ButtonWithConfirmDialog.jsx";
 import DOM_IDS from "../main/dom_ids.js";
 import {Range as AceRange} from "ace-builds/src-noconflict/ace";
-import {CozyLogger} from "../main/CozyLogger.js";
+import {CozyLoggerPrompt as CozyLogger} from "../main/CozyLogger.js";
 // ace.config.setModuleUrl(
 //   "ace/mode/json_worker",
 //   'cozy-nest-client/node_modules/ace-builds/src-noconflict/worker-json.js')
@@ -27,7 +27,7 @@ ace.config.setModuleUrl(
 
 const langTools = ace.require("ace/ext/language_tools");
 
-export function App({parentId, containerId, tabId}) {
+export function App({parentId, containerId, tabId, resolve}) {
 
   let savedHeight = localStorage.getItem(`cozy-prompt-height-${containerId}`);
   savedHeight = savedHeight ? parseInt(savedHeight) : 200;
@@ -255,6 +255,10 @@ export function App({parentId, containerId, tabId}) {
       enableBasicAutocompletion: true
     })
 
+    setTimeout(() => {
+      resolve()
+    }, 200);
+
   }
 
   // Helper function to increment the item

cozy-nest-client/cozy-prompt/main.jsx

@@ -4,7 +4,17 @@ import {App} from "./App.jsx";
 import {ChakraProvider} from '@chakra-ui/react'
 import {theme} from "../chakra/chakra-theme.ts";
 
-export default function startCozyPrompt(parentId, containerId, tabId) {
+export default async function startCozyPrompt(parentId, containerId, tabId) {
+  return new Promise((resolve, reject) => {
+    try {
+        _startCozyPrompt(parentId, containerId, tabId, resolve);
+    } catch (e) {
+        reject(e);
+    }
+  });
+}
+
+function _startCozyPrompt(parentId, containerId, tabId, resolve) {
   //
   if (!document.getElementById(parentId)) {
     setTimeout(() => startCozyPrompt(), 200)
@@ -21,7 +31,7 @@ export default function startCozyPrompt(parentId, containerId, tabId) {
   ReactDOM.createRoot(document.getElementById(containerId)).render(
     <React.StrictMode>
       <ChakraProvider theme={theme} >
-        <App containerId={containerId} parentId={parentId} tabId={tabId}/>
+        <App containerId={containerId} parentId={parentId} tabId={tabId} resolve={resolve}/>
       </ChakraProvider >
     </React.StrictMode>,
   )