Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-24 12:54:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into chore/remove-muster

Browse source
This commit is contained in:
Ondřej Samohel 2024-01-26 16:19:32 +01:00 • committed by GitHub
commit 5f181507ab
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
139 changed files with 4422 additions and 1533 deletions
Download patch file Download diff file Expand all files Collapse all files

48
server_addon/applications/server/applications.json
View file

@ -307,9 +307,9 @@
]
},
"arguments": {
"windows": [],
"windows": ["--nukeassist"],
"darwin": [],
"linux": []
"linux": ["--nukeassist"]
},
"environment": "{}",
"use_python_2": false
@ -329,9 +329,9 @@
]
},
"arguments": {
"windows": [],
"windows": ["--nukeassist"],
"darwin": [],
"linux": []
"linux": ["--nukeassist"]
},
"environment": "{}",
"use_python_2": false
@ -351,9 +351,9 @@
]
},
"arguments": {
"windows": [],
"windows": ["--nukeassist"],
"darwin": [],
"linux": []
"linux": ["--nukeassist"]
},
"environment": "{}",
"use_python_2": false
@ -382,9 +382,9 @@
]
},
"arguments": {
"windows": [],
"windows": ["--nukex"],
"darwin": [],
"linux": []
"linux": ["--nukex"]
},
"environment": "{}",
"use_python_2": false
@ -404,9 +404,9 @@
]
},
"arguments": {
"windows": [],
"windows": ["--nukex"],
"darwin": [],
"linux": []
"linux": ["--nukex"]
},
"environment": "{}",
"use_python_2": false
@ -426,9 +426,9 @@
]
},
"arguments": {
"windows": [],
"windows": ["--nukex"],
"darwin": [],
"linux": []
"linux": ["--nukex"]
},
"environment": "{}",
"use_python_2": false
@ -457,9 +457,9 @@
]
},
"arguments": {
"windows": [],
"windows": ["--studio"],
"darwin": [],
"linux": []
"linux": ["--studio"]
},
"environment": "{}",
"use_python_2": false
@ -479,9 +479,9 @@
]
},
"arguments": {
"windows": [],
"windows": ["--studio"],
"darwin": [],
"linux": []
"linux": ["--studio"]
},
"environment": "{}",
"use_python_2": false
@ -501,9 +501,9 @@
]
},
"arguments": {
"windows": [],
"windows": ["--studio"],
"darwin": [],
"linux": []
"linux": ["--studio"]
},
"environment": "{}",
"use_python_2": false
@ -532,9 +532,9 @@
]
},
"arguments": {
"windows": [],
"windows": ["--hiero"],
"darwin": [],
"linux": []
"linux": ["--hiero"]
},
"environment": "{}",
"use_python_2": false
@ -554,9 +554,9 @@
]
},
"arguments": {
"windows": [],
"windows": ["--hiero"],
"darwin": [],
"linux": []
"linux": ["--hiero"]
},
"environment": "{}",
"use_python_2": false
@ -576,9 +576,9 @@
]
},
"arguments": {
"windows": [],
"windows": ["--hiero"],
"darwin": [],
"linux": []
"linux": ["--hiero"]
},
"environment": "{}",
"use_python_2": false

2
server_addon/applications/server/version.py
View file

@ -1 +1 @@
__version__ = "0.1.3"
__version__ = "0.1.4"

20
server_addon/core/server/settings/publish_plugins.py
View file

@ -697,13 +697,6 @@ class IntegrateHeroVersionModel(BaseSettingsModel):
optional: bool = Field(False, title="Optional")
active: bool = Field(True, title="Active")
families: list[str] = Field(default_factory=list, title="Families")
# TODO remove when removed from client code
template_name_profiles: list[IntegrateHeroTemplateNameProfileModel] = (
Field(
default_factory=list,
title="Template name profiles"
)
)
class CleanUpModel(BaseSettingsModel):
@ -1049,19 +1042,6 @@ DEFAULT_PUBLISH_VALUES = {
"layout",
"mayaScene",
"simpleUnrealTexture"
],
"template_name_profiles": [
{
"product_types": [
"simpleUnrealTexture"
],
"hosts": [
"standalonepublisher"
],
"task_types": [],
"task_names": [],
"template_name": "simpleUnrealTextureHero"
}
]
},
"CleanUp": {

6
server_addon/deadline/server/settings/publish_plugins.py
View file

@ -87,7 +87,7 @@ class MayaSubmitDeadlineModel(BaseSettingsModel):
title="Disable Strict Error Check profiles"
)
@validator("limit", "scene_patches")
@validator("scene_patches")
def validate_unique_names(cls, value):
ensure_unique_names(value)
return value
@ -161,6 +161,8 @@ class NukeSubmitDeadlineModel(BaseSettingsModel):
group: str = Field(title="Group")
department: str = Field(title="Department")
use_gpu: bool = Field(title="Use GPU")
workfile_dependency: bool = Field(title="Workfile Dependency")
use_published_workfile: bool = Field(title="Use Published Workfile")
env_allowed_keys: list[str] = Field(
default_factory=list,
@ -382,6 +384,8 @@ DEFAULT_DEADLINE_PLUGINS_SETTINGS = {
"group": "",
"department": "",
"use_gpu": True,
"workfile_dependency": True,
"use_published_workfile": True,
"env_allowed_keys": [],
"env_search_replace_values": [],
"limit_groups": []

2
server_addon/deadline/server/version.py
View file

@ -1 +1 @@
__version__ = "0.1.5"
__version__ = "0.1.8"

78
server_addon/fusion/server/settings.py
View file

@ -35,6 +35,14 @@ def _image_format_enum():
]
def _frame_range_options_enum():
return [
{"value": "asset_db", "label": "Current asset context"},
{"value": "render_range", "label": "From render in/out"},
{"value": "comp_range", "label": "From composition timeline"},
]
class CreateSaverPluginModel(BaseSettingsModel):
_isGroup = True
temp_rendering_path_template: str = Field(
@ -49,16 +57,49 @@ class CreateSaverPluginModel(BaseSettingsModel):
enum_resolver=_create_saver_instance_attributes_enum,
title="Instance attributes"
)
image_format: str = Field(
enum_resolver=_image_format_enum,
title="Output Image Format"
output_formats: list[str] = Field(
default_factory=list,
title="Output formats"
)
class HookOptionalModel(BaseSettingsModel):
enabled: bool = Field(
True,
title="Enabled"
)
class HooksModel(BaseSettingsModel):
InstallPySideToFusion: HookOptionalModel = Field(
default_factory=HookOptionalModel,
title="Install PySide2"
)
class CreateSaverModel(CreateSaverPluginModel):
default_frame_range_option: str = Field(
default="asset_db",
enum_resolver=_frame_range_options_enum,
title="Default frame range source"
)
class CreateImageSaverModel(CreateSaverPluginModel):
default_frame: int = Field(
0,
title="Default rendered frame"
)
class CreatPluginsModel(BaseSettingsModel):
CreateSaver: CreateSaverPluginModel = Field(
default_factory=CreateSaverPluginModel,
title="Create Saver"
CreateSaver: CreateSaverModel = Field(
default_factory=CreateSaverModel,
title="Create Saver",
description="Creator for render product type (eg. sequence)"
)
CreateImageSaver: CreateImageSaverModel = Field(
default_factory=CreateImageSaverModel,
title="Create Image Saver",
description="Creator for image product type (eg. single)"
)
@ -71,6 +112,10 @@ class FusionSettings(BaseSettingsModel):
default_factory=CopyFusionSettingsModel,
title="Local Fusion profile settings"
)
hooks: HooksModel = Field(
default_factory=HooksModel,
title="Hooks"
)
create: CreatPluginsModel = Field(
default_factory=CreatPluginsModel,
title="Creator plugins"
@ -93,6 +138,11 @@ DEFAULT_VALUES = {
"copy_status": False,
"force_sync": False
},
"hooks": {
"InstallPySideToFusion": {
"enabled": True
}
},
"create": {
"CreateSaver": {
"temp_rendering_path_template": "{workdir}/renders/fusion/{product[name]}/{product[name]}.{frame}.{ext}",
@ -104,7 +154,21 @@ DEFAULT_VALUES = {
"reviewable",
"farm_rendering"
],
"image_format": "exr"
"image_format": "exr",
"default_frame_range_option": "asset_db"
},
"CreateImageSaver": {
"temp_rendering_path_template": "{workdir}/renders/fusion/{product[name]}/{product[name]}.{ext}",
"default_variants": [
"Main",
"Mask"
],
"instance_attributes": [
"reviewable",
"farm_rendering"
],
"image_format": "exr",
"default_frame": 0
}
}
}

2
server_addon/fusion/server/version.py
View file

@ -1 +1 @@
__version__ = "0.1.1"
__version__ = "0.1.3"

37
server_addon/hiero/server/settings/publish_plugins.py
View file

@ -1,5 +1,7 @@
from pydantic import Field
from ayon_server.settings import BaseSettingsModel
from pydantic import Field, validator
from ayon_server.settings import (
BaseSettingsModel, ensure_unique_names, normalize_name
)
class CollectInstanceVersionModel(BaseSettingsModel):
@ -9,6 +11,30 @@ class CollectInstanceVersionModel(BaseSettingsModel):
)
class CollectClipEffectsDefModel(BaseSettingsModel):
_layout = "expanded"
name: str = Field("", title="Name")
effect_classes: list[str] = Field(
default_factory=list, title="Effect Classes"
)
@validator("name")
def validate_name(cls, value):
"""Ensure name does not contain weird characters"""
return normalize_name(value)
class CollectClipEffectsModel(BaseSettingsModel):
effect_categories: list[CollectClipEffectsDefModel] = Field(
default_factory=list, title="Effect Categories"
)
@validator("effect_categories")
def validate_unique_outputs(cls, value):
ensure_unique_names(value)
return value
class ExtractReviewCutUpVideoModel(BaseSettingsModel):
enabled: bool = Field(
True,
@ -25,6 +51,10 @@ class PublishPuginsModel(BaseSettingsModel):
default_factory=CollectInstanceVersionModel,
title="Collect Instance Version"
)
CollectClipEffects: CollectClipEffectsModel = Field(
default_factory=CollectClipEffectsModel,
title="Collect Clip Effects"
)
"""# TODO: enhance settings with host api:
Rename class name and plugin name
to match title (it makes more sense)
@ -44,5 +74,8 @@ DEFAULT_PUBLISH_PLUGIN_SETTINGS = {
"tags_addition": [
"review"
]
},
"CollectClipEffectsModel": {
"effect_categories": []
}
}

2
server_addon/hiero/server/version.py
View file

@ -1 +1 @@
__version__ = "0.1.1"
__version__ = "0.1.2"

2
server_addon/houdini/server/version.py
View file

@ -1 +1 @@
__version__ = "0.2.10"
__version__ = "0.2.11"

27
server_addon/max/server/settings/main.py
View file

@ -12,6 +12,25 @@ from .publishers import (
)
def unit_scale_enum():
"""Return enumerator for scene unit scale."""
return [
{"label": "mm", "value": "Millimeters"},
{"label": "cm", "value": "Centimeters"},
{"label": "m", "value": "Meters"},
{"label": "km", "value": "Kilometers"}
]
class UnitScaleSettings(BaseSettingsModel):
enabled: bool = Field(True, title="Enabled")
scene_unit_scale: str = Field(
"Centimeters",
title="Scene Unit Scale",
enum_resolver=unit_scale_enum
)
class PRTAttributesModel(BaseSettingsModel):
_layout = "compact"
name: str = Field(title="Name")
@ -24,6 +43,10 @@ class PointCloudSettings(BaseSettingsModel):
class MaxSettings(BaseSettingsModel):
unit_scale_settings: UnitScaleSettings = Field(
default_factory=UnitScaleSettings,
title="Set Unit Scale"
)
imageio: ImageIOSettings = Field(
default_factory=ImageIOSettings,
title="Color Management (ImageIO)"
@ -46,6 +69,10 @@ class MaxSettings(BaseSettingsModel):
DEFAULT_VALUES = {
"unit_scale_settings": {
"enabled": True,
"scene_unit_scale": "Centimeters"
},
"RenderSettings": DEFAULT_RENDER_SETTINGS,
"CreateReview": DEFAULT_CREATE_REVIEW_SETTINGS,
"PointCloud": {

2
server_addon/max/server/version.py
View file

@ -1 +1 @@
__version__ = "0.1.3"
__version__ = "0.1.4"

2
server_addon/maya/server/settings/publish_playblast.py
View file

@ -108,6 +108,7 @@ class ViewportOptionsSetting(BaseSettingsModel):
True, title="Enable Anti-Aliasing", section="Anti-Aliasing"
)
multiSample: int = Field(8, title="Anti Aliasing Samples")
loadTextures: bool = Field(False, title="Load Textures")
useDefaultMaterial: bool = Field(False, title="Use Default Material")
wireframeOnShaded: bool = Field(False, title="Wireframe On Shaded")
xray: bool = Field(False, title="X-Ray")
@ -302,6 +303,7 @@ DEFAULT_PLAYBLAST_SETTING = {
"twoSidedLighting": True,
"lineAAEnable": True,
"multiSample": 8,
"loadTextures": False,
"useDefaultMaterial": False,
"wireframeOnShaded": False,
"xray": False,

10
server_addon/openpype/client/pyproject.toml
View file

@ -7,12 +7,18 @@ python = ">=3.9.1,<3.10"
aiohttp_json_rpc = "*" # TVPaint server
aiohttp-middlewares = "^2.0.0"
wsrpc_aiohttp = "^3.1.1" # websocket server
Click = "^8"
clique = "1.6.*"
jsonschema = "^2.6.0"
pymongo = "^3.11.2"
log4mongo = "^1.7"
pyblish-base = "^1.8.11"
pynput = "^1.7.2" # Timers manager - TODO remove
"Qt.py" = "^1.3.3"
qtawesome = "0.7.3"
speedcopy = "^2.1"
six = "^1.15"
qtawesome = "0.7.3"
[ayon.runtimeDependencies]
OpenTimelineIO = "0.14.1"
opencolorio = "2.2.1"
Pillow = "9.5.0"