griptape-nodes 0.61.0__py3-none-any.whl → 0.62.0__py3-none-any.whl

griptape_nodes/common/macro_parser/core.py

@@ -42,9 +42,9 @@ class ParsedMacro:
             segments.append(ParsedStaticValue(text=""))
         self.segments = segments
 
-    def get_variables(self) -> list[VariableInfo]:
+    def get_variables(self) -> set[VariableInfo]:
         """Extract all VariableInfo from parsed segments."""
-        return [seg.info for seg in self.segments if isinstance(seg, ParsedVariable)]
+        return {seg.info for seg in self.segments if isinstance(seg, ParsedVariable)}
 
     def resolve(
         self,
@@ -58,8 +58,8 @@ class ParsedMacro:
         # Check if fully resolved
         if not partial.is_fully_resolved():
             unresolved = partial.get_unresolved_variables()
-            unresolved_names = [var.info.name for var in unresolved]
-            msg = f"Cannot fully resolve macro - missing required variables: {', '.join(unresolved_names)}"
+            unresolved_names = {var.info.name for var in unresolved}
+            msg = f"Cannot fully resolve macro - missing required variables: {', '.join(sorted(unresolved_names))}"
             raise MacroResolutionError(
                 msg,
                 failure_reason=MacroResolutionFailureReason.MISSING_REQUIRED_VARIABLES,

griptape_nodes/common/macro_parser/exceptions.py

@@ -47,7 +47,7 @@ class MacroResolutionError(Exception):
         message: str,
         failure_reason: MacroResolutionFailureReason | None = None,
         variable_name: str | None = None,
-        missing_variables: list[str] | None = None,
+        missing_variables: set[str] | None = None,
     ) -> None:
         """Initialize MacroResolutionError with optional structured fields.
 
@@ -55,7 +55,7 @@ class MacroResolutionError(Exception):
             message: Human-readable error message
             failure_reason: Specific reason for the resolution error
             variable_name: Name of the problematic variable (if applicable)
-            missing_variables: List of missing variable names (for MISSING_REQUIRED_VARIABLES)
+            missing_variables: Set of missing variable names (for MISSING_REQUIRED_VARIABLES)
         """
         super().__init__(message)
         self.failure_reason = failure_reason
@@ -118,5 +118,5 @@ class MacroResolutionFailure:
 
     failure_reason: MacroResolutionFailureReason
     variable_name: str | None
-    missing_variables: list[str] | None
+    missing_variables: set[str] | None
     error_details: str

griptape_nodes/common/macro_parser/resolution.py

@@ -32,7 +32,7 @@ class PartiallyResolvedMacro:
         """Convert to string (only valid if fully resolved)."""
         if not self.is_fully_resolved():
             unresolved = self.get_unresolved_variables()
-            unresolved_names = [var.info.name for var in unresolved]
+            unresolved_names = {var.info.name for var in unresolved}
             msg = "Cannot convert partially resolved macro to string - unresolved variables remain"
             raise MacroResolutionError(
                 msg,
@@ -135,7 +135,7 @@ def resolve_variable(
                 msg,
                 failure_reason=MacroResolutionFailureReason.MISSING_REQUIRED_VARIABLES,
                 variable_name=variable_name,
-                missing_variables=[variable_name],
+                missing_variables={variable_name},
             )
         # Optional variable not provided, return None to signal it should be skipped
         return None

griptape_nodes/common/project_templates/default_project_template.py

@@ -16,26 +16,25 @@ DEFAULT_PROJECT_TEMPLATE = ProjectTemplate(
     directories={
         "inputs": DirectoryDefinition(
             name="inputs",
-            path_schema="inputs",
+            path_macro="inputs",
         ),
         "outputs": DirectoryDefinition(
             name="outputs",
-            path_schema="outputs",
+            path_macro="outputs",
         ),
         "temp": DirectoryDefinition(
             name="temp",
-            path_schema="temp",
+            path_macro="temp",
         ),
         "previews": DirectoryDefinition(
             name="previews",
-            path_schema="previews",
+            path_macro="previews",
         ),
     },
     environment={},
     situations={
         "save_file": SituationTemplate(
             name="save_file",
-            situation_template_schema_version="0.1.0",
             description="Generic file save operation",
             macro="{file_name_base}{_index?:03}.{file_extension}",
             policy=SituationPolicy(
@@ -46,7 +45,6 @@ DEFAULT_PROJECT_TEMPLATE = ProjectTemplate(
         ),
         "copy_external_file": SituationTemplate(
             name="copy_external_file",
-            situation_template_schema_version="0.1.0",
             description="User copies external file to project",
             macro="{inputs}/{node_name?:_}{parameter_name?:_}{file_name_base}{_index?:03}.{file_extension}",
             policy=SituationPolicy(
@@ -57,7 +55,6 @@ DEFAULT_PROJECT_TEMPLATE = ProjectTemplate(
         ),
         "download_url": SituationTemplate(
             name="download_url",
-            situation_template_schema_version="0.1.0",
             description="Download file from URL",
             macro="{inputs}/{sanitized_url}",
             policy=SituationPolicy(
@@ -68,9 +65,8 @@ DEFAULT_PROJECT_TEMPLATE = ProjectTemplate(
         ),
         "save_node_output": SituationTemplate(
             name="save_node_output",
-            situation_template_schema_version="0.1.0",
             description="Node generates and saves output",
-            macro="{outputs}/{node_name?:_}{file_name_base}{_index?:03}.{file_extension}",
+            macro="{outputs}/{sub_dirs?:/}{node_name?:_}{file_name_base}{_index?:03}.{file_extension}",
             policy=SituationPolicy(
                 on_collision=SituationFilePolicy.CREATE_NEW,
                 create_dirs=True,
@@ -79,7 +75,6 @@ DEFAULT_PROJECT_TEMPLATE = ProjectTemplate(
         ),
         "save_preview": SituationTemplate(
             name="save_preview",
-            situation_template_schema_version="0.1.0",
             description="Generate preview/thumbnail",
             macro="{previews}/{original_file_path}",
             policy=SituationPolicy(

griptape_nodes/common/project_templates/directory.py

@@ -15,7 +15,7 @@ class DirectoryDefinition(BaseModel):
     """Definition of a logical directory in the project."""
 
     name: str = Field(description="Logical name (e.g., 'inputs', 'outputs')")
-    path_schema: str = Field(description="Path string (may contain macros/env vars)")
+    path_macro: str = Field(description="Path string (may contain macros/env vars)")
 
     @staticmethod
     def merge(
@@ -28,7 +28,7 @@ class DirectoryDefinition(BaseModel):
         """Merge overlay fields onto base directory.
 
         Field-level merge behavior:
-        - path_schema: Use overlay if present, else base
+        - path_macro: Use overlay if present, else base
 
         Args:
             base: Complete base directory
@@ -41,11 +41,11 @@ class DirectoryDefinition(BaseModel):
             New merged DirectoryDefinition
         """
         # Start with base fields
-        merged_data = {"name": base.name, "path_schema": base.path_schema}
+        merged_data = {"name": base.name, "path_macro": base.path_macro}
 
         # Apply overlay if present
-        if "path_schema" in overlay_data:
-            merged_data["path_schema"] = overlay_data["path_schema"]
+        if "path_macro" in overlay_data:
+            merged_data["path_macro"] = overlay_data["path_macro"]
 
         try:
             return DirectoryDefinition.model_validate(merged_data)

griptape_nodes/common/project_templates/loader.py

@@ -152,11 +152,8 @@ def load_project_template_from_yaml(  # noqa: C901
     Returns:
         ProjectTemplate on success, None if fatal errors prevent construction
     """
-    # Import here to avoid circular dependency:
-    # - loader.py defines YAMLLineInfo
-    # - project.py imports YAMLLineInfo for type hints
-    # - loader.py needs ProjectTemplate at runtime
-    # TYPE_CHECKING import at top is for type hints only, this is for runtime
+    # Lazy import required: circular dependency between this module and project.py
+    # project.py imports ProjectOverlayData from this file, and we need ProjectTemplate from project.py
     from griptape_nodes.common.project_templates.project import ProjectTemplate
 
     # Pass 1: Load YAML with line tracking
@@ -208,9 +205,13 @@ def load_project_template_from_yaml(  # noqa: C901
     else:
         # Add warnings for schema version mismatches
         if template.project_template_schema_version != ProjectTemplate.LATEST_SCHEMA_VERSION:
+            message = (
+                f"Schema version '{template.project_template_schema_version}' "
+                f"differs from latest '{ProjectTemplate.LATEST_SCHEMA_VERSION}'"
+            )
             validation_info.add_warning(
                 field_path=FIELD_PROJECT_TEMPLATE_SCHEMA_VERSION,
-                message=f"Schema version '{template.project_template_schema_version}' differs from latest '{ProjectTemplate.LATEST_SCHEMA_VERSION}'",
+                message=message,
                 line_number=line_info.get_line(FIELD_PROJECT_TEMPLATE_SCHEMA_VERSION),
             )
 
@@ -230,7 +231,7 @@ def load_partial_project_template(
 
     Does NOT:
     - Construct full SituationTemplate/DirectoryDefinition objects
-    - Validate situation schemas or policy values
+    - Validate situation macros or policy values
     - Check directory references
 
     Use this for loading user overlay templates before merge.

griptape_nodes/common/project_templates/project.py

@@ -29,7 +29,7 @@ class ProjectTemplate(BaseModel):
     name: str = Field(description="Name of the project")
     situations: dict[str, SituationTemplate] = Field(description="Situation templates (situation_name -> template)")
     directories: dict[str, DirectoryDefinition] = Field(
-        description="Directory definitions (logical_name -> definition)"
+        description="Directory definitions (logical_name -> definition)",
     )
     environment: dict[str, str] = Field(default_factory=dict, description="Custom environment variables")
     description: str | None = Field(default=None, description="Description of the project")

griptape_nodes/common/project_templates/situation.py

@@ -21,7 +21,7 @@ class SituationFilePolicy(StrEnum):
     triggers user interaction before determining final policy.
     """
 
-    CREATE_NEW = "create_new"  # Increment {_index} in schema
+    CREATE_NEW = "create_new"  # Increment {_index} in macro
     OVERWRITE = "overwrite"  # Maps to ExistingFilePolicy.OVERWRITE
     FAIL = "fail"  # Maps to ExistingFilePolicy.FAIL
     PROMPT = "prompt"  # Special UI handling
@@ -42,10 +42,7 @@ class SituationTemplate(BaseModel):
     model_config = ConfigDict(populate_by_name=True)
 
     name: str = Field(description="Name of the situation")
-    situation_template_schema_version: str = Field(description="Schema version for this situation template")
-    macro: str = Field(
-        description="Macro template for file path", serialization_alias="schema", validation_alias="schema"
-    )
+    macro: str = Field(description="Macro template for file path")
     policy: SituationPolicy = Field(description="Policy for file operations")
     fallback: str | None = Field(default=None, description="Name of fallback situation")
     description: str | None = Field(default=None, description="Description of the situation")
@@ -61,11 +58,6 @@ class SituationTemplate(BaseModel):
             raise ValueError(msg) from e
         return v
 
-    @property
-    def schema(self) -> str:
-        """Alias for macro to maintain YAML compatibility (schema field in YAML)."""
-        return self.macro
-
     @staticmethod
     def merge(
         base: SituationTemplate,
@@ -77,11 +69,10 @@ class SituationTemplate(BaseModel):
         """Merge overlay fields onto base situation.
 
         Field-level merge behavior:
-        - schema: Use overlay if present, else base
+        - macro: Use overlay if present, else base
         - description: Use overlay if present, else base
         - fallback: Use overlay if present, else base
         - policy: Use overlay if present (must be complete), else base
-        - situation_template_schema_version: Use overlay if present, else base
 
         Policy validation:
         - If policy provided in overlay, must contain both on_collision and create_dirs
@@ -101,8 +92,8 @@ class SituationTemplate(BaseModel):
         merged_data = base.model_dump()
 
         # Apply overlay fields if present
-        if "schema" in overlay_data:
-            merged_data["schema"] = overlay_data["schema"]
+        if "macro" in overlay_data:
+            merged_data["macro"] = overlay_data["macro"]
 
         if "description" in overlay_data:
             merged_data["description"] = overlay_data["description"]
@@ -110,9 +101,6 @@ class SituationTemplate(BaseModel):
         if "fallback" in overlay_data:
             merged_data["fallback"] = overlay_data["fallback"]
 
-        if "situation_template_schema_version" in overlay_data:
-            merged_data["situation_template_schema_version"] = overlay_data["situation_template_schema_version"]
-
         # Policy must be complete if provided
         if "policy" in overlay_data:
             policy = overlay_data["policy"]

griptape_nodes/common/project_templates/validation.py

@@ -46,7 +46,7 @@ class ProjectValidationProblem:
     """Single validation problem with context."""
 
     line_number: int | None
-    field_path: str  # e.g., "situations.copy_external_file.schema"
+    field_path: str  # e.g., "situations.copy_external_file.macro"
     message: str
     severity: ProjectValidationProblemSeverity
 
@@ -92,7 +92,7 @@ class ProjectValidationInfo:
                 field_path=field_path,
                 message=message,
                 severity=ProjectValidationProblemSeverity.ERROR,
-            )
+            ),
         )
         self.status = ProjectValidationStatus.UNUSABLE
 
@@ -112,7 +112,7 @@ class ProjectValidationInfo:
                 field_path=field_path,
                 message=message,
                 severity=ProjectValidationProblemSeverity.WARNING,
-            )
+            ),
         )
 
         if self.status == ProjectValidationStatus.GOOD:

griptape_nodes/node_library/workflow_registry.py

@@ -45,7 +45,7 @@ class WorkflowShape(BaseModel):
 
 
 class WorkflowMetadata(BaseModel):
-    LATEST_SCHEMA_VERSION: ClassVar[str] = "0.11.0"
+    LATEST_SCHEMA_VERSION: ClassVar[str] = "0.12.0"
 
     name: str
     schema_version: str