Merge branch 'develop' into enhancement/147-ay-7047_publishing-compon…

…ent-builder-usd-while-maintaining-hierarchical-structure

client/ayon_houdini/api/pipeline.py

@@ -243,6 +243,7 @@ def containerise(name,
         "namespace": namespace,
         "loader": str(loader),
         "representation": context["representation"]["id"],
+        "project_name": context["project"]["name"]
     }
 
     lib.imprint(container, data)
@@ -285,6 +286,13 @@ def parse_container(container):
                 pass
         data[name] = value
 
+    # Support project name in container as optional attribute
+    for name in ["project_name"]:
+        parm = container.parm(name)
+        if not parm:
+            continue
+        data[name] = parm.eval()
+
     # Backwards compatibility pre-schemas for containers
     data["schema"] = data.get("schema", "openpype:container-1.0")
 

client/ayon_houdini/plugins/create/create_hda.py

@@ -141,6 +141,12 @@ def set_tool_submenu(hda_def,
 # endregion
 
 
+def promote_spare_parameters(node):
+    """Promote spare parameters to HDA node type definition"""
+    ptg = node.parmTemplateGroup()
+    node.type().definition().setParmTemplateGroup(ptg)
+
+
 class CreateHDA(plugin.HoudiniCreator):
     """Publish Houdini Digital Asset file."""
 
@@ -178,12 +184,27 @@ def create_instance_node(
         if pre_create_data is None:
             pre_create_data = {}
 
+        use_promote_spare_parameters = pre_create_data.get(
+            "use_promote_spare_parameters", True)
+
         if self.selected_nodes:
             # if we have `use selection` enabled, and we have some
             # selected nodes ...
-            if self.selected_nodes[0].type().name() == "subnet":
-                to_hda = self.selected_nodes[0]
+            one_node_selected = len(self.selected_nodes) == 1
+            first_selected_node = self.selected_nodes[0]
+
+            # If only an HDA is selected, publish just that node as HDA.
+            if one_node_selected and first_selected_node.type().definition():
+                to_hda = first_selected_node
+                use_promote_spare_parameters = False
+
+            # If only a single subnet is selected, turn that into the HDA.
+            elif one_node_selected and first_selected_node.type().name() == "subnet":
+                to_hda = first_selected_node
                 to_hda.setName("{}_subnet".format(node_name), unique_name=True)
+
+            # Collapse all selected nodes into a subnet and turn that into
+            # the HDA.
             else:
                 parent_node = self.selected_nodes[0].parent()
                 subnet = parent_node.collapseIntoSubnet(
@@ -202,6 +223,7 @@ def create_instance_node(
 
             to_hda = parent_node.createNode(
                 "subnet", node_name="{}_subnet".format(node_name))
+
         if not to_hda.type().definition():
             # if node type has not its definition, it is not user
             # created hda. We test if hda can be created from the node.
@@ -222,8 +244,17 @@ def create_instance_node(
                 name=type_name,
                 description=node_name,
                 hda_file_name="$HIP/{}.hda".format(node_name),
-                ignore_external_references=True
+                ignore_external_references=True,
+                min_num_inputs=0,
+                max_num_inputs=len(to_hda.inputs()) or 1,
             )
+
+            if use_promote_spare_parameters:
+                # Similar to Houdini default behavior, when enabled this will
+                # promote spare parameters to type properties on initial
+                # creation of the HDA.
+                promote_spare_parameters(hda_node)
+
             hda_node.layoutChildren()
         elif self._check_existing(folder_path, node_name):
             raise CreatorError(
@@ -279,6 +310,12 @@ def get_pre_create_attr_defs(self):
                             "'AYON/project_name/your_HDA_name'",
                     default=True,
                     label="Use Project as menu entry"),
+            BoolDef("use_promote_spare_parameters",
+                    tooltip="Similar to Houdini default behavior, when "
+                            "enabled this will promote spare parameters to "
+                            "type properties on initial creation of the HDA.",
+                    default=True,
+                    label="Promote Spare Parameters"),
         ]
 
     def get_dynamic_data(

client/ayon_houdini/plugins/load/load_hda.py

@@ -75,6 +75,16 @@ def update(self, container, context):
             "representation": repre_entity["id"]
         })
 
+        # Move the Extra parameter folder to the back.
+        parm_group = hda_node.parmTemplateGroup()
+        # The name 'Extra' is a hard coded name in AYON.
+        parm_folder = parm_group.findFolder("Extra")
+        # Remove `Extra` AYON parameters
+        parm_group.remove(parm_folder.name())
+        # Add `Extra` AYON parameters back
+        parm_group.append(parm_folder)
+        hda_node.setParmTemplateGroup(parm_group)
+
     def remove(self, container):
         node = container["node"]
         parent = node.parent()

client/ayon_houdini/plugins/publish/extract_hda.py

@@ -1,19 +1,33 @@
 # -*- coding: utf-8 -*-
 import os
-from pprint import pformat
+import contextlib
+
 import hou
 import pyblish.api
+
+from ayon_core.pipeline import PublishError
 from ayon_houdini.api import plugin
 
 
+@contextlib.contextmanager
+def revert_original_parm_template_group(node: "hou.OpNode"):
+    """Restore parm template group after the context"""
+    parm_group = node.parmTemplateGroup()
+    try:
+        yield
+    finally:
+        # Set the original
+        node.setParmTemplateGroup(parm_group)
+
+
 class ExtractHDA(plugin.HoudiniExtractorPlugin):
 
     order = pyblish.api.ExtractorOrder
     label = "Extract HDA"
     families = ["hda"]
 
     def process(self, instance):
-        self.log.info(pformat(instance.data))
+
         hda_node = hou.node(instance.data.get("instance_node"))
         hda_def = hda_node.type().definition()
         hda_options = hda_def.options()
@@ -23,7 +37,26 @@ def process(self, instance):
         self.log.info("setting version: {}".format(next_version))
         hda_def.setVersion(str(next_version))
         hda_def.setOptions(hda_options)
-        hda_def.save(hda_def.libraryFilePath(), hda_node, hda_options)
+
+        with revert_original_parm_template_group(hda_node):
+            # Remove our own custom parameters so that if the HDA definition
+            # has "Save Spare Parameters" enabled, we don't save our custom
+            # attributes
+            # Get our custom `Extra` AYON parameters
+            parm_group = hda_node.parmTemplateGroup()
+            # The name 'Extra' is a hard coded name in AYON.
+            parm_folder = parm_group.findFolder("Extra")
+            if not parm_folder:
+                raise PublishError(
+                    f"Extra parm folder does not exist: {hda_node.path()}"
+                )
+
+            # Remove `Extra` AYON parameters
+            parm_group.remove(parm_folder.name())
+            hda_node.setParmTemplateGroup(parm_group)
+
+            # Save the HDA file
+            hda_def.save(hda_def.libraryFilePath(), hda_node, hda_options)
 
         if "representations" not in instance.data:
             instance.data["representations"] = []

client/ayon_houdini/version.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring AYON addon 'houdini' version."""
-__version__ = "0.4.0+dev"
+__version__ = "0.4.1+dev"

package.py

@@ -1,6 +1,6 @@
 name = "houdini"
 title = "Houdini"
-version = "0.4.0+dev"
+version = "0.4.1+dev"
 app_host_name = "houdini"
 client_dir = "ayon_houdini"