Added Directory node (#1921)

backend/src/nodes/properties/inputs/file_inputs.py

@@ -116,6 +116,7 @@ def __init__(
         label: str = "Base Directory",
         has_handle: bool = False,
         must_exist: bool = True,
+        hide_label: bool = False,
     ):
         super().__init__("Directory", label, kind="directory", has_handle=has_handle)
 
@@ -127,9 +128,16 @@ def __init__(
         """
 
         self.must_exist: bool = must_exist
+        self.hide_label: bool = hide_label
 
         self.associated_type = str
 
+    def toDict(self):
+        return {
+            **super().toDict(),
+            "hideLabel": self.hide_label,
+        }
+
     def enforce(self, value):
         assert isinstance(value, str)
         if self.must_exist:

backend/src/nodes/properties/outputs/file_outputs.py

@@ -7,13 +7,18 @@
 class DirectoryOutput(BaseOutput):
     """Output for saving to a directory"""
 
-    def __init__(self, label: str = "Directory", of_input: int | None = None):
+    def __init__(
+        self,
+        label: str = "Directory",
+        of_input: int | None = None,
+        output_type: str = "Directory",
+    ):
         directory_type = (
             "Directory"
             if of_input is None
             else f"splitFilePath(Input{of_input}.path).dir"
         )
-
+        directory_type = navi.intersect(directory_type, output_type)
         super().__init__(directory_type, label, associated_type=str)
 
     def get_broadcast_type(self, value: str):

backend/src/packages/chaiNNer_standard/utility/value/directory.py

@@ -0,0 +1,22 @@
+from __future__ import annotations
+
+from nodes.properties.inputs import DirectoryInput
+from nodes.properties.outputs import DirectoryOutput
+
+from .. import value_group
+
+
+@value_group.register(
+    schema_id="chainner:utility:directory",
+    name="Directory",
+    description="Outputs the given directory.",
+    icon="BsFolder",
+    inputs=[
+        DirectoryInput("Directory", must_exist=False, hide_label=True, has_handle=True),
+    ],
+    outputs=[
+        DirectoryOutput("Directory", output_type="Input0"),
+    ],
+)
+def directory_node(directory: str) -> str:
+    return directory

src/common/common-types.ts

@@ -79,6 +79,7 @@ export interface FileInput extends InputBase {
 }
 export interface DirectoryInput extends InputBase {
     readonly kind: 'directory';
+    readonly hideLabel: boolean;
 }
 export interface TextInput extends InputBase {
     readonly kind: 'text';

src/renderer/components/inputs/DirectoryInput.tsx

@@ -18,7 +18,7 @@ import { ipcRenderer } from '../../../common/safeIpc';
 import { useContextMenu } from '../../hooks/useContextMenu';
 import { useLastDirectory } from '../../hooks/useLastDirectory';
 import { CopyOverrideIdSection } from './elements/CopyOverrideIdSection';
-import { WithLabel } from './InputContainer';
+import { MaybeLabel } from './InputContainer';
 import { InputProps } from './props';
 
 const getDirectoryPath = (type: Type): string | undefined => {
@@ -106,7 +106,7 @@ export const DirectoryInput = memo(
         ));
 
         return (
-            <WithLabel input={input}>
+            <MaybeLabel input={input}>
                 <Tooltip
                     borderRadius={8}
                     label={displayDirectory}
@@ -140,7 +140,7 @@ export const DirectoryInput = memo(
                         />
                     </InputGroup>
                 </Tooltip>
-            </WithLabel>
+            </MaybeLabel>
         );
     }
 );