Merge branch 'develop' into enhancement/OP-7072_Validate-Loaded-Plugins

server_addon/blender/server/settings/publish_plugins.py

@@ -61,26 +61,20 @@ class PublishPuginsModel(BaseSettingsModel):
     ValidateCameraZeroKeyframe: ValidatePluginModel = Field(
         default_factory=ValidatePluginModel,
         title="Validate Camera Zero Keyframe",
-        section="Validators"
+        section="General Validators"
     )
     ValidateFileSaved: ValidateFileSavedModel = Field(
         default_factory=ValidateFileSavedModel,
         title="Validate File Saved",
-        section="Validators"
     )
-    ValidateRenderCameraIsSet: ValidatePluginModel = Field(
+    ValidateInstanceEmpty: ValidatePluginModel = Field(
         default_factory=ValidatePluginModel,
-        title="Validate Render Camera Is Set",
-        section="Validators"
-    )
-    ValidateDeadlinePublish: ValidatePluginModel = Field(
-        default_factory=ValidatePluginModel,
-        title="Validate Render Output for Deadline",
-        section="Validators"
+        title="Validate Instance is not Empty"
     )
     ValidateMeshHasUvs: ValidatePluginModel = Field(
         default_factory=ValidatePluginModel,
-        title="Validate Mesh Has Uvs"
+        title="Validate Mesh Has Uvs",
+        section="Model Validators"
     )
     ValidateMeshNoNegativeScale: ValidatePluginModel = Field(
         default_factory=ValidatePluginModel,
@@ -94,6 +88,15 @@ class PublishPuginsModel(BaseSettingsModel):
         default_factory=ValidatePluginModel,
         title="Validate No Colons In Name"
     )
+    ValidateRenderCameraIsSet: ValidatePluginModel = Field(
+        default_factory=ValidatePluginModel,
+        title="Validate Render Camera Is Set",
+        section="Render Validators"
+    )
+    ValidateDeadlinePublish: ValidatePluginModel = Field(
+        default_factory=ValidatePluginModel,
+        title="Validate Render Output for Deadline",
+    )
     ExtractBlend: ExtractBlendModel = Field(
         default_factory=ExtractBlendModel,
         title="Extract Blend",
@@ -179,6 +182,11 @@ DEFAULT_BLENDER_PUBLISH_SETTINGS = {
         "optional": False,
         "active": True
     },
+    "ValidateInstanceEmpty": {
+        "enabled": True,
+        "optional": False,
+        "active": True
+    },
     "ExtractBlend": {
         "enabled": True,
         "optional": True,

server_addon/blender/server/version.py

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

server_addon/houdini/server/settings/create.py

@@ -26,7 +26,7 @@ class CreateStaticMeshModel(BaseSettingsModel):
         default_factory=list,
         title="Default Products"
     )
-    static_mesh_prefixes: str = Field("S", title="Static Mesh Prefix")
+    static_mesh_prefix: str = Field("S", title="Static Mesh Prefix")
     collision_prefixes: list[str] = Field(
         default_factory=list,
         title="Collision Prefixes"

server_addon/houdini/server/settings/publish.py

@@ -33,9 +33,9 @@ class BasicValidateModel(BaseSettingsModel):
 
 
 class PublishPluginsModel(BaseSettingsModel):
-    CollectRopFrameRange: CollectRopFrameRangeModel = Field(
-        default_factory=CollectRopFrameRangeModel,
-        title="Collect Rop Frame Range.",
+    CollectAssetHandles: CollectAssetHandlesModel = Field(
+        default_factory=CollectAssetHandlesModel,
+        title="Collect Asset Handles.",
         section="Collectors"
     )
     ValidateContainers: BasicValidateModel = Field(
@@ -60,7 +60,7 @@ class PublishPluginsModel(BaseSettingsModel):
 
 
 DEFAULT_HOUDINI_PUBLISH_SETTINGS = {
-    "CollectRopFrameRange": {
+    "CollectAssetHandles": {
         "use_asset_handles": True
     },
     "ValidateContainers": {

server_addon/houdini/server/version.py

@@ -1 +1 @@
-__version__ = "0.2.8"
+__version__ = "0.2.9"

server_addon/max/server/settings/create_review_settings.py

@@ -0,0 +1,93 @@
+from pydantic import Field
+
+from ayon_server.settings import BaseSettingsModel
+
+
+def image_format_enum():
+    """Return enumerator for image output formats."""
+    return [
+        {"label": "exr", "value": "exr"},
+        {"label": "jpg", "value": "jpg"},
+        {"label": "png", "value": "png"},
+        {"label": "tga", "value": "tga"}
+    ]
+
+
+def visual_style_enum():
+    """Return enumerator for viewport visual style."""
+    return [
+        {"label": "Realistic", "value": "Realistic"},
+        {"label": "Shaded", "value": "Shaded"},
+        {"label": "Facets", "value": "Facets"},
+        {"label": "ConsistentColors",
+         "value": "ConsistentColors"},
+        {"label": "Wireframe", "value": "Wireframe"},
+        {"label": "BoundingBox", "value": "BoundingBox"},
+        {"label": "Ink", "value": "Ink"},
+        {"label": "ColorInk", "value": "ColorInk"},
+        {"label": "Acrylic", "value": "Acrylic"},
+        {"label": "Tech", "value": "Tech"},
+        {"label": "Graphite", "value": "Graphite"},
+        {"label": "ColorPencil", "value": "ColorPencil"},
+        {"label": "Pastel", "value": "Pastel"},
+        {"label": "Clay", "value": "Clay"},
+        {"label": "ModelAssist", "value": "ModelAssist"}
+    ]
+
+
+def preview_preset_enum():
+    """Return enumerator for viewport visual preset."""
+    return [
+        {"label": "Quality", "value": "Quality"},
+        {"label": "Standard", "value": "Standard"},
+        {"label": "Performance", "value": "Performance"},
+        {"label": "DXMode", "value": "DXMode"},
+        {"label": "Customize", "value": "Customize"},
+    ]
+
+
+def anti_aliasing_enum():
+    """Return enumerator for viewport anti-aliasing."""
+    return [
+        {"label": "None", "value": "None"},
+        {"label": "2X", "value": "2X"},
+        {"label": "4X", "value": "4X"},
+        {"label": "8X", "value": "8X"}
+    ]
+
+
+class CreateReviewModel(BaseSettingsModel):
+    review_width: int = Field(1920, title="Review Width")
+    review_height: int = Field(1080, title="Review Height")
+    percentSize: float = Field(100.0, title="Percent of Output")
+    keep_images: bool = Field(False, title="Keep Image Sequences")
+    image_format: str = Field(
+        enum_resolver=image_format_enum,
+        title="Image Format Options"
+    )
+    visual_style: str = Field(
+        enum_resolver=visual_style_enum,
+        title="Preference"
+    )
+    viewport_preset: str = Field(
+        enum_resolver=preview_preset_enum,
+        title="Preview Preset"
+    )
+    anti_aliasing: str = Field(
+        enum_resolver=anti_aliasing_enum,
+        title="Anti-aliasing Quality"
+    )
+    vp_texture: bool = Field(True, title="Viewport Texture")
+
+
+DEFAULT_CREATE_REVIEW_SETTINGS = {
+    "review_width": 1920,
+    "review_height": 1080,
+    "percentSize": 100.0,
+    "keep_images": False,
+    "image_format": "png",
+    "visual_style": "Realistic",
+    "viewport_preset": "Quality",
+    "anti_aliasing": "None",
+    "vp_texture": True
+}

server_addon/max/server/settings/main.py

@@ -4,6 +4,9 @@ from .imageio import ImageIOSettings
 from .render_settings import (
     RenderSettingsModel, DEFAULT_RENDER_SETTINGS
 )
+from .create_review_settings import (
+    CreateReviewModel, DEFAULT_CREATE_REVIEW_SETTINGS
+)
 from .publishers import (
     PublishersModel, DEFAULT_PUBLISH_SETTINGS
 )
@@ -29,6 +32,10 @@ class MaxSettings(BaseSettingsModel):
         default_factory=RenderSettingsModel,
         title="Render Settings"
     )
+    CreateReview: CreateReviewModel = Field(
+        default_factory=CreateReviewModel,
+        title="Create Review"
+    )
     PointCloud: PointCloudSettings = Field(
         default_factory=PointCloudSettings,
         title="Point Cloud"
@@ -40,6 +47,7 @@ class MaxSettings(BaseSettingsModel):
 
 DEFAULT_VALUES = {
     "RenderSettings": DEFAULT_RENDER_SETTINGS,
+    "CreateReview": DEFAULT_CREATE_REVIEW_SETTINGS,
     "PointCloud": {
         "attribute": [
             {"name": "Age", "value": "age"},

server_addon/max/server/version.py

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

server_addon/maya/server/settings/creators.py

@@ -27,7 +27,7 @@ class CreateUnrealStaticMeshModel(BaseSettingsModel):
         default_factory=list,
         title="Default Products"
     )
-    static_mesh_prefixes: str = Field("S", title="Static Mesh Prefix")
+    static_mesh_prefix: str = Field("S", title="Static Mesh Prefix")
     collision_prefixes: list[str] = Field(
         default_factory=list,
         title="Collision Prefixes"

server_addon/maya/server/version.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring addon version."""
-__version__ = "0.1.5"
+__version__ = "0.1.6"