BigRoy's comments and add houdini project settings to houdini api

openpype/hosts/houdini/api/__init__.py

@@ -1,7 +1,8 @@
 from .pipeline import (
     HoudiniHost,
     ls,
-    containerise
+    containerise,
+    HoudiniProjectSettings
 )
 
 from .plugin import (
@@ -22,6 +23,7 @@
 
     "ls",
     "containerise",
+    "HoudiniProjectSettings",
 
     "Creator",
 

openpype/hosts/houdini/api/lib.py

@@ -11,7 +11,6 @@
 
 from openpype.lib import StringTemplate
 from openpype.client import get_asset_by_name
-from openpype.settings import get_current_project_settings
 from openpype.pipeline import get_current_project_name, get_current_asset_name
 from openpype.pipeline.context_tools import (
     get_current_context_template_data,
@@ -754,16 +753,13 @@ def get_camera_from_container(container):
     return cameras[0]
 
 
-def validate_job_path():
+def update_job_var_context(job_var_settings):
     """Validate job path to ensure it matches the settings."""
 
-    project_settings = get_current_project_settings()
-
-    if project_settings["houdini"]["general"]["job_path"]["enabled"]:
+    if job_var_settings["enabled"]:
 
         # get and resolve job path template
-        job_path_template = \
-            project_settings["houdini"]["general"]["job_path"]["path"]
+        job_path_template = job_var_settings["job_path"]
         job_path = StringTemplate.format_template(
             job_path_template, get_current_context_template_data()
         )
@@ -778,6 +774,4 @@ def validate_job_path():
         if current_job != job_path:
             hou.hscript("set JOB=" + job_path)
             os.environ["JOB"] = job_path
-            print("  - set $JOB to " + job_path)
-    else:
-        print("  - JOB Path is disabled, Skipping Check...")
+            print("  - update context $JOB to [ {} ]".format(job_path))

openpype/hosts/houdini/api/pipeline.py

@@ -20,6 +20,10 @@
 from openpype.pipeline.load import any_outdated_containers
 from openpype.hosts.houdini import HOUDINI_HOST_DIR
 from openpype.hosts.houdini.api import lib, shelves, creator_node_shelves
+from openpype.settings import (
+    get_current_project_settings,
+    get_project_settings
+)
 
 from openpype.lib import (
     register_event_callback,
@@ -48,6 +52,10 @@ def __init__(self):
         self._op_events = {}
         self._has_been_setup = False
 
+    @property
+    def houdini_project_settings(self):
+        return HoudiniProjectSettings()
+
     def install(self):
         pyblish.api.register_host("houdini")
         pyblish.api.register_host("hython")
@@ -301,7 +309,8 @@ def on_save():
     log.info("Running callback on save..")
 
     # Validate $JOB value
-    lib.validate_job_path()
+    lib.update_job_var_context(
+        HoudiniProjectSettings().general["update_job_var_context"])
 
     nodes = lib.get_id_required_nodes()
     for node, new_id in lib.generate_ids(nodes):
@@ -339,7 +348,8 @@ def on_open():
     log.info("Running callback on open..")
 
     # Validate $JOB value
-    lib.validate_job_path()
+    lib.update_job_var_context(
+        HoudiniProjectSettings().general["update_job_var_context"])
 
     # Validate FPS after update_task_from_path to
     # ensure it is using correct FPS for the asset
@@ -456,3 +466,33 @@ def main_take(no_update=True):
             instance_node.bypass(not new_value)
     except hou.PermissionError as exc:
         log.warning("%s - %s", instance_node.path(), exc)
+
+
+class HoudiniProjectSettings:
+    def __init__(self, project_name=""):
+        if project_name:
+            self.houdini_project_settings = \
+                get_project_settings(project_name).get("houdini")
+        else:
+            self.houdini_project_settings = \
+                get_current_project_settings().get("houdini")
+
+    @property
+    def general(self):
+        return self.houdini_project_settings["general"]
+
+    @property
+    def imageio(self):
+        return self.houdini_project_settings["imageio"]
+
+    @property
+    def shelves(self):
+        return self.houdini_project_settings["shelves"]
+
+    @property
+    def publish(self):
+        return self.houdini_project_settings["publish"]
+
+    @property
+    def create(self):
+        return self.houdini_project_settings["create"]

openpype/settings/defaults/project_settings/houdini.json

@@ -1,8 +1,8 @@
 {
     "general": {
-        "job_path": {
+        "update_job_var_context": {
             "enabled": true,
-            "path": "{root[work]}/{project[name]}/{hierarchy}/{asset}/work/{task[name]}"
+            "job_path": "{root[work]}/{project[name]}/{hierarchy}/{asset}/work/{task[name]}"
         }
     },
     "imageio": {

openpype/settings/entities/schemas/projects_schema/schemas/schema_houdini_general.json

@@ -9,8 +9,8 @@
             "type": "dict",
             "collapsible": true,
             "checkbox_key": "enabled",
-            "key": "job_path",
-            "label": "JOB Path",
+            "key": "update_job_var_context",
+            "label": "Update $JOB on context change",
             "children": [
                 {
                     "type": "boolean",
@@ -19,8 +19,8 @@
                 },
                 {
                     "type": "text",
-                    "key": "path",
-                    "label": "Path"
+                    "key": "job_path",
+                    "label": "JOB Path"
                 }
             ]
         }

server_addon/houdini/server/settings/general.py

@@ -2,21 +2,21 @@
 from ayon_server.settings import BaseSettingsModel
 
 
-class JobPathModel(BaseSettingsModel):
+class UpdateJobVarcontextModel(BaseSettingsModel):
     enabled: bool = Field(title="Enabled")
-    path: str = Field(title="Path")
+    job_path: str = Field(title="JOB Path")
 
 
 class GeneralSettingsModel(BaseSettingsModel):
-    JobPath: JobPathModel = Field(
-        default_factory=JobPathModel,
-        title="JOB Path"
+    update_job_var_context: UpdateJobVarcontextModel = Field(
+        default_factory=UpdateJobVarcontextModel,
+        title="Update $JOB on context change"
     )
 
 
 DEFAULT_GENERAL_SETTINGS = {
-    "JobPath": {
+    "update_job_var_context": {
         "enabled": True,
-        "path": "{root[work]}/{project[name]}/{hierarchy}/{asset}/work/{task[name]}"  # noqa
+        "job_path": "{root[work]}/{project[name]}/{hierarchy}/{asset}/work/{task[name]}"  # noqa
     }
 }