Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move houdini client code #516

Merged
merged 37 commits into from
Jun 3, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
cef5787
move houdini client code to its dedicated place and update imports
MustafaJafar May 14, 2024
6fdce1f
update ayon_houdini package.py
MustafaJafar May 14, 2024
2768fb7
fix typo in base.py
MustafaJafar May 14, 2024
66bb9aa
add houdini to MOVED_ADDON_MILESTONE_VERSIONS
MustafaJafar May 14, 2024
3f91a29
add settings_category
MustafaJafar May 14, 2024
b62ae6b
add version.py for Houdini addon
MustafaJafar May 14, 2024
c1331a4
update required addons
MustafaJafar May 15, 2024
6c75a29
update addon version
MustafaJafar May 15, 2024
3d04a2c
Merge branch 'develop' into chore/AY-4916_Move-Houdini-client-code
MustafaJafar May 16, 2024
9e86556
add settings_category for plugins with server settings
MustafaJafar May 16, 2024
7ef5d98
Merge branch 'develop' into chore/AY-4916_Move-Houdini-client-code
MustafaJafar May 21, 2024
a34647b
update Houdini package and version
MustafaJafar May 21, 2024
f8b476c
add base class for Houdini loader plugins
MustafaJafar May 21, 2024
606e895
implement base classes for publish plugins
MustafaJafar May 21, 2024
c4ec025
add missing blank line
MustafaJafar May 21, 2024
753fab2
use a constant for settings category
MustafaJafar May 21, 2024
d90fb46
use a constant for settings category
MustafaJafar May 21, 2024
d56628e
remove `app_host_name`
MustafaJafar May 22, 2024
faace02
Merge branch 'develop' into chore/AY-4916_Move-Houdini-client-code
MustafaJafar May 23, 2024
7643fc9
Merge branch 'chore/AY-4916_Move-Houdini-client-code' of https://gith…
MustafaJafar May 23, 2024
3602cb6
Merge branch 'chore/AY-4916_Move-Houdini-client-code' into chore/AY-4…
MustafaJafar May 23, 2024
d48d111
Merge branch 'develop' into chore/AY-4916_Move-Houdini-client-code
MustafaJafar May 23, 2024
84c355e
update required core version inside houdini package
MustafaJafar May 23, 2024
0faea99
Merge branch 'chore/AY-4916_Move-Houdini-client-code' into chore/AY-4…
MustafaJafar May 23, 2024
a47c329
fix imports order
MustafaJafar May 24, 2024
f9f782b
Merge branch 'develop' into chore/AY-4916_Move-Houdini-client-code
MustafaJafar May 27, 2024
e3684c9
Merge branch 'develop' into chore/AY-4916_Move-Houdini-client-code
MustafaJafar May 28, 2024
519dc9f
Merge branch 'chore/AY-4916_Move-Houdini-client-code' of https://gith…
MustafaJafar May 28, 2024
be54645
add missing section in publish settings
MustafaJafar May 28, 2024
78fac68
Merge branch 'chore/AY-4916_Move-Houdini-client-code' into chore/AY-4…
MustafaJafar May 28, 2024
639d3d4
update docstring and add hosts attibute in Houdini plugins base classes
MustafaJafar May 31, 2024
1a51166
remove 'hosts' and 'settings_category' attributes from plugins classes
MustafaJafar May 31, 2024
9074120
implement `HoudiniExtractorPlugin` and use it in all extractor plugins
MustafaJafar May 31, 2024
3658eca
Merge pull request #536 from ynput/chore/AY-4916_Move-Houdini-client-…
MustafaJafar May 31, 2024
c758df4
Merge branch 'develop' into chore/AY-4916_Move-Houdini-client-code
MustafaJafar May 31, 2024
d0c3611
Merge branch 'develop' into chore/AY-4916_Move-Houdini-client-code
MustafaJafar Jun 3, 2024
ade51cb
Merge branch 'develop' into chore/AY-4916_Move-Houdini-client-code
antirotor Jun 3, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion client/ayon_core/addon/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
# - this is used to log the missing addon
MOVED_ADDON_MILESTONE_VERSIONS = {
"applications": VersionInfo(0, 2, 0),
"houdini": VersionInfo(0, 3, 14),
}

# Inherit from `object` for Python 2 hosts
Expand Down Expand Up @@ -1321,7 +1322,7 @@ def __init__(self, settings=None):
self.doubleclick_callback = None

def add_doubleclick_callback(self, addon, callback):
"""Register doubleclick callbacks on tray icon.
"""Register double-click callbacks on tray icon.

Currently, there is no way how to determine which is launched. Name of
callback can be defined with `doubleclick_callback` attribute.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import attr
import hou
from ayon_core.hosts.houdini.api.lib import get_color_management_preferences
from ayon_houdini.api.lib import get_color_management_preferences
from ayon_core.pipeline.colorspace import get_display_view_colorspace_name

@attr.s
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@


CREATE_SCRIPT = """
from ayon_core.hosts.houdini.api.creator_node_shelves import create_interactive
from ayon_houdini.api.creator_node_shelves import create_interactive
create_interactive("{identifier}", **kwargs)
"""

Expand Down Expand Up @@ -153,7 +153,7 @@ def install():
This function is re-entrant and can be called again to reinstall and
update the node definitions. For example during development it can be
useful to call it manually:
>>> from ayon_core.hosts.houdini.api.creator_node_shelves import install
>>> from ayon_houdini.api.creator_node_shelves import install
>>> install()

Returns:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1027,7 +1027,7 @@ def add_self_publish_button(node):
button_parm = hou.ButtonParmTemplate(
"ayon_self_publish",
"{} Publish".format(label),
script_callback="from ayon_core.hosts.houdini.api.lib import "
script_callback="from ayon_houdini.api.lib import "
"self_publish; self_publish()",
script_callback_language=hou.scriptLanguage.Python,
join_with_next=True
Expand Down Expand Up @@ -1070,7 +1070,7 @@ def sceneview_snapshot(
Example:
This is how the function can be used::

from ayon_core.hosts.houdini.api import lib
from ayon_houdini.api import lib
sceneview = hou.ui.paneTabOfType(hou.paneTabType.SceneViewer)
lib.sceneview_snapshot(sceneview)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@
AYON_CONTAINER_ID,
)
from ayon_core.pipeline.load import any_outdated_containers
from ayon_core.hosts.houdini import HOUDINI_HOST_DIR
from ayon_core.hosts.houdini.api import lib, shelves, creator_node_shelves
from ayon_houdini import HOUDINI_HOST_DIR
from ayon_houdini.api import lib, shelves, creator_node_shelves

from ayon_core.lib import (
register_event_callback,
emit_event,
)


log = logging.getLogger("ayon_core.hosts.houdini")
log = logging.getLogger("ayon_houdini")

AVALON_CONTAINERS = "/obj/AVALON_CONTAINERS"
CONTEXT_CONTAINER = "/obj/OpenPypeContext"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,8 @@ class HoudiniCreator(NewCreator, HoudiniCreatorBase):
settings_name = None
add_publish_button = False

settings_category = "houdini"

def create(self, product_name, instance_data, pre_create_data):
try:
self.selected_nodes = []
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

from .lib import get_current_context_template_data_with_folder_attrs

log = logging.getLogger("ayon_core.hosts.houdini.shelves")
log = logging.getLogger("ayon_houdini.shelves")


def generate_shelves():
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
"""Converter for legacy Houdini products."""
from ayon_core.pipeline.create.creator_plugins import ProductConvertorPlugin
from ayon_core.hosts.houdini.api.lib import imprint
from ayon_houdini.api.lib import imprint


class HoudiniLegacyConvertor(ProductConvertorPlugin):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Creator plugin for creating alembic camera products."""
from ayon_core.hosts.houdini.api import plugin
from ayon_houdini.api import plugin
from ayon_core.pipeline import CreatorError

import hou
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Creator plugin for creating Arnold ASS files."""
from ayon_core.hosts.houdini.api import plugin
from ayon_houdini.api import plugin
from ayon_core.lib import BoolDef


Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from ayon_core.hosts.houdini.api import plugin
from ayon_houdini.api import plugin
from ayon_core.lib import EnumDef, BoolDef


Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Creator plugin for creating pointcache bgeo files."""
from ayon_core.hosts.houdini.api import plugin
from ayon_houdini.api import plugin
from ayon_core.pipeline import CreatorError
import hou
from ayon_core.lib import EnumDef, BoolDef
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Creator plugin for creating composite sequences."""
from ayon_core.hosts.houdini.api import plugin
from ayon_houdini.api import plugin
from ayon_core.pipeline import CreatorError

import hou
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import ayon_api

from ayon_core.pipeline import CreatorError
from ayon_core.hosts.houdini.api import plugin
from ayon_houdini.api import plugin
import hou


Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Creator plugin to create Karma ROP."""
from ayon_core.hosts.houdini.api import plugin
from ayon_houdini.api import plugin
from ayon_core.lib import BoolDef, EnumDef, NumberDef


Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Creator plugin for creating pointcache alembics."""
from ayon_core.hosts.houdini.api import plugin
from ayon_houdini.api import plugin
from ayon_core.lib import BoolDef


Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Creator plugin to create Mantra ROP."""
from ayon_core.hosts.houdini.api import plugin
from ayon_houdini.api import plugin
from ayon_core.lib import EnumDef, BoolDef


Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Creator plugin for creating pointcache alembics."""
from ayon_core.hosts.houdini.api import plugin
from ayon_houdini.api import plugin
from ayon_core.lib import BoolDef

import hou
Expand Down Expand Up @@ -105,7 +105,7 @@ def get_obj_output(self, obj_node):
elif len(outputs) == 1:
return outputs[0]

# if there are more than one, then it have multiple ouput nodes
# if there are more than one, then it have multiple output nodes
# return the one with the minimum 'outputidx'
else:
return min(outputs,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Creator plugin for creating Redshift proxies."""
from ayon_core.hosts.houdini.api import plugin
from ayon_houdini.api import plugin
import hou
from ayon_core.lib import BoolDef

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import hou # noqa

from ayon_core.pipeline import CreatorError
from ayon_core.hosts.houdini.api import plugin
from ayon_houdini.api import plugin
from ayon_core.lib import EnumDef, BoolDef


Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Creator plugin for creating openGL reviews."""
from ayon_core.hosts.houdini.api import lib, plugin
from ayon_houdini.api import lib, plugin
from ayon_core.lib import EnumDef, BoolDef, NumberDef

import os
Expand Down Expand Up @@ -103,7 +103,7 @@ def create(self, product_name, instance_data, pre_create_data):
# cls.review_color_space is an empty string
# when the imageio/workfile setting is disabled or
# when the Review colorspace setting is empty.
from ayon_core.hosts.houdini.api.colorspace import get_default_display_view_colorspace # noqa
from ayon_houdini.api.colorspace import get_default_display_view_colorspace # noqa
self.review_color_space = get_default_display_view_colorspace()

lib.set_review_color_space(instance_node,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Creator for Unreal Static Meshes."""
from ayon_core.hosts.houdini.api import plugin
from ayon_houdini.api import plugin
from ayon_core.lib import BoolDef, EnumDef

import hou
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Creator plugin for creating USDs."""
from ayon_core.hosts.houdini.api import plugin
from ayon_houdini.api import plugin

import hou

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Creator plugin for creating USD renders."""
from ayon_core.hosts.houdini.api import plugin
from ayon_houdini.api import plugin


class CreateUSDRender(plugin.HoudiniCreator):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""Creator plugin for creating VDB Caches."""
from ayon_core.hosts.houdini.api import plugin
from ayon_houdini.api import plugin
from ayon_core.lib import BoolDef

import hou
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"""Creator plugin to create VRay ROP."""
import hou

from ayon_core.hosts.houdini.api import plugin
from ayon_houdini.api import plugin
from ayon_core.pipeline import CreatorError
from ayon_core.lib import EnumDef, BoolDef

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"""Creator plugin for creating workfiles."""
import ayon_api

from ayon_core.hosts.houdini.api import plugin
from ayon_core.hosts.houdini.api.lib import read, imprint
from ayon_core.hosts.houdini.api.pipeline import CONTEXT_CONTAINER
from ayon_houdini.api import plugin
from ayon_houdini.api.lib import read, imprint
from ayon_houdini.api.pipeline import CONTEXT_CONTAINER
from ayon_core.pipeline import CreatedInstance, AutoCreator
import hou

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from ayon_core.pipeline import InventoryAction
from ayon_core.hosts.houdini.api.lib import (
from ayon_houdini.api.lib import (
get_camera_from_container,
set_camera_resolution
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
load,
get_representation_path,
)
from ayon_core.hosts.houdini.api import pipeline
from ayon_houdini.api import pipeline


class AbcLoader(load.LoaderPlugin):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@

import os
from ayon_core.pipeline import (
load,
get_representation_path,
)
from ayon_core.hosts.houdini.api import pipeline
from ayon_houdini.api import pipeline


class AbcArchiveLoader(load.LoaderPlugin):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
load,
get_representation_path,
)
from ayon_core.hosts.houdini.api import pipeline
from ayon_houdini.api import pipeline


class AssLoader(load.LoaderPlugin):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
load,
get_representation_path,
)
from ayon_core.hosts.houdini.api import pipeline
from ayon_houdini.api import pipeline


class BgeoLoader(load.LoaderPlugin):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
load,
get_representation_path,
)
from ayon_core.hosts.houdini.api import pipeline
from ayon_houdini.api import pipeline

from ayon_core.hosts.houdini.api.lib import (
from ayon_houdini.api.lib import (
set_camera_resolution,
get_camera_from_container
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
load,
get_representation_path,
)
from ayon_core.hosts.houdini.api import pipeline
from ayon_houdini.api import pipeline


class FbxLoader(load.LoaderPlugin):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import re

from ayon_core.pipeline import load
from ayon_core.hosts.houdini.api import pipeline
from ayon_houdini.api import pipeline

import hou

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
load,
get_representation_path,
)
from ayon_core.hosts.houdini.api import pipeline
from ayon_houdini.api import pipeline


class HdaLoader(load.LoaderPlugin):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
get_representation_path,
AVALON_CONTAINER_ID,
)
from ayon_core.hosts.houdini.api import lib, pipeline
from ayon_houdini.api import lib, pipeline

import hou

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
load,
get_representation_path,
)
from ayon_core.hosts.houdini.api import pipeline
from ayon_houdini.api import pipeline
from ayon_core.pipeline.load import LoadError

import hou
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
get_representation_path,
AVALON_CONTAINER_ID,
)
from ayon_core.hosts.houdini.api import lib
from ayon_houdini.api import lib


class USDSublayerLoader(load.LoaderPlugin):
Expand Down
Loading
Loading