From 5d42a2ec64357e8ffbca439b50c3a59840640738 Mon Sep 17 00:00:00 2001
From: Ondrej Samohel <ondrej.samohel@orbi.tools>
Date: Thu, 15 Jul 2021 12:25:56 +0200
Subject: [PATCH 001/289] add modules for ps enhancements

---
 .gitmodules                    |  8 +++++++-
 tools/build.ps1                | 13 +++++++++----
 vendor/powershell/BurntToast   |  1 +
 vendor/powershell/PSWriteColor |  1 +
 vendor/powershell/README.md    |  0
 5 files changed, 18 insertions(+), 5 deletions(-)
 create mode 160000 vendor/powershell/BurntToast
 create mode 160000 vendor/powershell/PSWriteColor
 create mode 100644 vendor/powershell/README.md

diff --git a/.gitmodules b/.gitmodules
index 52f2fc0750..6c12c76b16 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -9,4 +9,10 @@
 	url = https://bitbucket.org/ftrack/ftrack-python-api.git
 [submodule "openpype/modules/ftrack/python2_vendor/arrow"]
 	path = openpype/modules/ftrack/python2_vendor/arrow
-	url = https://github.com/arrow-py/arrow.git
\ No newline at end of file
+	url = https://github.com/arrow-py/arrow.git
+[submodule "vendor/powershell/BurntToast"]
+    path = vendor/powershell/BurntToast
+    url = https://github.com/Windos/BurntToast.git
+[submodule "vendor/powershell/PSWriteColor"]
+    path = vendor/powershell/PSWriteColor
+    url = "https://github.com/EvotecIT/PSWriteColor.git"
\ No newline at end of file
diff --git a/tools/build.ps1 b/tools/build.ps1
index cc4253fe24..00cec54927 100644
--- a/tools/build.ps1
+++ b/tools/build.ps1
@@ -28,6 +28,13 @@ if($arguments -eq "--no-submodule-update") {
     $disable_submodule_update=$true
 }
 
+$current_dir = Get-Location
+$script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
+$openpype_root = (Get-Item $script_dir).parent.FullName
+
+# Install PSWriteColor to support colorized output to terminal
+$env:PSModulePath = $env:PSModulePath + ";$($openpype_root)\vendor\powershell"
+
 function Start-Progress {
     param([ScriptBlock]$code)
     $scroll = "/-\|/-\|"
@@ -110,10 +117,6 @@ Write-Host $art -ForegroundColor DarkGreen
 # Enable if PS 7.x is needed.
 # Show-PSWarning
 
-$current_dir = Get-Location
-$script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
-$openpype_root = (Get-Item $script_dir).parent.FullName
-
 $env:_INSIDE_OPENPYPE_TOOL = "1"
 
 if (-not (Test-Path 'env:POETRY_HOME')) {
@@ -201,6 +204,8 @@ Write-Host "restoring current directory"
 Set-Location -Path $current_dir
 
 $endTime = [int][double]::Parse((Get-Date -UFormat %s))
+New-BurntToastNotification -AppLogo "$openpype_root/openpype/resources/icons/openpype_icon.png" -Text "OpenPype build complete!", "All done in $($endTime - $startTime) secs. You will find OpenPype and build log in build directory."
+
 Write-Host "*** " -NoNewline -ForegroundColor Cyan
 Write-Host "All done in $($endTime - $startTime) secs. You will find OpenPype and build log in " -NoNewLine
 Write-Host "'.\build'" -NoNewline -ForegroundColor Green
diff --git a/vendor/powershell/BurntToast b/vendor/powershell/BurntToast
new file mode 160000
index 0000000000..ae0acdd870
--- /dev/null
+++ b/vendor/powershell/BurntToast
@@ -0,0 +1 @@
+Subproject commit ae0acdd870a2fd8d9f0d147de22dc36d6c5e399e
diff --git a/vendor/powershell/PSWriteColor b/vendor/powershell/PSWriteColor
new file mode 160000
index 0000000000..12eda384eb
--- /dev/null
+++ b/vendor/powershell/PSWriteColor
@@ -0,0 +1 @@
+Subproject commit 12eda384ebd7a7954e15855e312215c009c97114
diff --git a/vendor/powershell/README.md b/vendor/powershell/README.md
new file mode 100644
index 0000000000..e69de29bb2

From 0e6f4e330daa343b16a4b9bb1f6427eebf7706c0 Mon Sep 17 00:00:00 2001
From: Ondrej Samohel <ondrej.samohel@orbi.tools>
Date: Fri, 16 Jul 2021 17:53:44 +0200
Subject: [PATCH 002/289] PS enhancement I.

---
 tools/build.ps1               | 63 ++++++++++--------------------
 tools/build_win_installer.ps1 | 50 ++++++++++++------------
 tools/create_env.ps1          | 72 ++++++++++++++++-------------------
 3 files changed, 79 insertions(+), 106 deletions(-)

diff --git a/tools/build.ps1 b/tools/build.ps1
index 00cec54927..89d2eac3a4 100644
--- a/tools/build.ps1
+++ b/tools/build.ps1
@@ -79,17 +79,14 @@ function Exit-WithCode($exitcode) {
 
 function Show-PSWarning() {
     if ($PSVersionTable.PSVersion.Major -lt 7) {
-        Write-Host "!!! " -NoNewline -ForegroundColor Red
-        Write-Host "You are using old version of PowerShell. $($PSVersionTable.PSVersion.Major).$($PSVersionTable.PSVersion.Minor)"
-        Write-Host "Please update to at least 7.0 - " -NoNewline -ForegroundColor Gray
-        Write-Host "https://github.com/PowerShell/PowerShell/releases" -ForegroundColor White
+        Write-Color -Text "!!! ", "You are using old version of PowerShell - ",  "$($PSVersionTable.PSVersion.Major).$($PSVersionTable.PSVersion.Minor)" -Color Red, Yellow, White
+        Write-Color -Text "    Please update to at least 7.0 - ", "https://github.com/PowerShell/PowerShell/releases" -Color Yellow, White
         Exit-WithCode 1
     }
 }
 
 function Install-Poetry() {
-    Write-Host ">>> " -NoNewline -ForegroundColor Green
-    Write-Host "Installing Poetry ... "
+    Write-Color -Text ">>> ", "Installing Poetry ... " -Color Green, Gray
     $env:POETRY_HOME="$openpype_root\.poetry"
     (Invoke-WebRequest -Uri https://raw.githubusercontent.com/python-poetry/poetry/master/install-poetry.py -UseBasicParsing).Content | python -
 }
@@ -129,8 +126,7 @@ $version_file = Get-Content -Path "$($openpype_root)\openpype\version.py"
 $result = [regex]::Matches($version_file, '__version__ = "(?<version>\d+\.\d+.\d+.*)"')
 $openpype_version = $result[0].Groups['version'].Value
 if (-not $openpype_version) {
-  Write-Host "!!! " -ForegroundColor yellow -NoNewline
-  Write-Host "Cannot determine OpenPype version."
+  Write-Color -Text "!!! ", "Cannot determine OpenPype version." -Color Yellow, Gray
   Exit-WithCode 1
 }
 
@@ -139,74 +135,57 @@ if (-not (Test-Path -PathType Container -Path "$($openpype_root)\build")) {
     New-Item -ItemType Directory -Force -Path "$($openpype_root)\build"
 }
 
-Write-Host "--- " -NoNewline -ForegroundColor yellow
-Write-Host "Cleaning build directory ..."
+Write-Color -Text "--- ", "Cleaning build directory ..." -Color Yellow, Gray
 try {
     Remove-Item -Recurse -Force "$($openpype_root)\build\*"
 }
 catch {
-    Write-Host "!!! " -NoNewline -ForegroundColor Red
-    Write-Host "Cannot clean build directory, possibly because process is using it."
-    Write-Host $_.Exception.Message
+    Write-Color -Text "!!! ", "Cannot clean build directory, possibly because process is using it." -Color Red, Gray
+    Write-Color -Text $_.Exception.Message -Color Red
     Exit-WithCode 1
 }
 if (-not $disable_submodule_update) {
-    Write-Host ">>> " -NoNewLine -ForegroundColor green
-    Write-Host "Making sure submodules are up-to-date ..."
-    git submodule update --init --recursive
+    Write-Color -Text ">>> ", "Making sure submodules are up-to-date ..." -Color Green, Gray
+    & git submodule update --init --recursive
 } else {
-     Write-Host "*** " -NoNewLine -ForegroundColor yellow
-    Write-Host "Not updating submodules ..."
+    Write-Color -Text "*** ", "Not updating submodules ..." -Color Green, Gray
 }
 
-Write-Host ">>> " -NoNewline -ForegroundColor green
-Write-Host "OpenPype [ " -NoNewline -ForegroundColor white
-Write-host $openpype_version  -NoNewline -ForegroundColor green
-Write-Host " ]" -ForegroundColor white
+Write-Color -Text ">>> ", "OpenPype [ ", $openpype_version, " ]" -Color Green, White, Cyan, White
 
-Write-Host ">>> " -NoNewline -ForegroundColor Green
-Write-Host "Reading Poetry ... " -NoNewline
+Write-Color -Text ">>> ", "Reading Poetry ... " -Color Green, Gray -NoNewline
 if (-not (Test-Path -PathType Container -Path "$($env:POETRY_HOME)\bin")) {
-    Write-Host "NOT FOUND" -ForegroundColor Yellow
-    Write-Host "*** " -NoNewline -ForegroundColor Yellow
-    Write-Host "We need to install Poetry create virtual env first ..."
+    Write-Color -Text "NOT FOUND" -Color Yellow
+    Write-Color -Text "*** ", "We need to install Poetry create virtual env first ..." -Color Yellow, Gray
     & "$openpype_root\tools\create_env.ps1"
 } else {
-    Write-Host "OK" -ForegroundColor Green
+    Write-Color -Text "OK" -Color Green
 }
 
-Write-Host ">>> " -NoNewline -ForegroundColor green
-Write-Host "Cleaning cache files ... " -NoNewline
+Write-Color -Text ">>> ", "Cleaning cache files ... " -Color Green, Gray -NoNewline
 Get-ChildItem $openpype_root -Filter "*.pyc" -Force -Recurse | Where-Object { $_.FullName -inotmatch 'build' } | Remove-Item -Force
 Get-ChildItem $openpype_root -Filter "*.pyo" -Force -Recurse | Where-Object { $_.FullName -inotmatch 'build' } | Remove-Item -Force
 Get-ChildItem $openpype_root -Filter "__pycache__" -Force -Recurse | Where-Object { $_.FullName -inotmatch 'build' } | Remove-Item -Force -Recurse
-Write-Host "OK" -ForegroundColor green
+Write-Color -Text "OK" -Color green
 
-Write-Host ">>> " -NoNewline -ForegroundColor green
-Write-Host "Building OpenPype ..."
+Write-Color -Text ">>> ", "Building OpenPype ..." -Color Green, White
 $startTime = [int][double]::Parse((Get-Date -UFormat %s))
 
 $out = &  "$($env:POETRY_HOME)\bin\poetry" run python setup.py build 2>&1
 Set-Content -Path "$($openpype_root)\build\build.log" -Value $out
 if ($LASTEXITCODE -ne 0)
 {
-    Write-Host "!!! " -NoNewLine -ForegroundColor Red
-    Write-Host "Build failed. Check the log: " -NoNewline
-    Write-Host ".\build\build.log" -ForegroundColor Yellow
+    Write-Color -Text "!!! ", "Build failed. Check the log: ", ".\build\build.log" -Color Red, Yellow, White
     Exit-WithCode $LASTEXITCODE
 }
 
 Set-Content -Path "$($openpype_root)\build\build.log" -Value $out
 & "$($env:POETRY_HOME)\bin\poetry" run python "$($openpype_root)\tools\build_dependencies.py"
 
-Write-Host ">>> " -NoNewline -ForegroundColor green
-Write-Host "restoring current directory"
+Write-Color -Text ">>> ", "Restoring current directory" -Color Green, Gray
 Set-Location -Path $current_dir
 
 $endTime = [int][double]::Parse((Get-Date -UFormat %s))
 New-BurntToastNotification -AppLogo "$openpype_root/openpype/resources/icons/openpype_icon.png" -Text "OpenPype build complete!", "All done in $($endTime - $startTime) secs. You will find OpenPype and build log in build directory."
 
-Write-Host "*** " -NoNewline -ForegroundColor Cyan
-Write-Host "All done in $($endTime - $startTime) secs. You will find OpenPype and build log in " -NoNewLine
-Write-Host "'.\build'" -NoNewline -ForegroundColor Green
-Write-Host " directory."
+Write-Color -Text "*** ", "All done in ", $($endTime - $startTime), " secs. You will find OpenPype and build log in ", "'.\build'", " directory." -Color Green, Gray, White, Gray, White, Gray
diff --git a/tools/build_win_installer.ps1 b/tools/build_win_installer.ps1
index a0832e0135..287e5c751f 100644
--- a/tools/build_win_installer.ps1
+++ b/tools/build_win_installer.ps1
@@ -11,6 +11,12 @@
 PS> .\build_win_installer.ps1
 
 #>
+$current_dir = Get-Location
+$script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
+$openpype_root = (Get-Item $script_dir).parent.FullName
+
+# Install PSWriteColor to support colorized output to terminal
+$env:PSModulePath = $env:PSModulePath + ";$($openpype_root)\vendor\powershell"
 
 function Start-Progress {
     param([ScriptBlock]$code)
@@ -44,7 +50,6 @@ function Start-Progress {
   #>
 }
 
-
 function Exit-WithCode($exitcode) {
    # Only exit this host process if it's a child of another PowerShell parent process...
    $parentPID = (Get-CimInstance -ClassName Win32_Process -Filter "ProcessId=$PID" | Select-Object -Property ParentProcessId).ParentProcessId
@@ -56,10 +61,8 @@ function Exit-WithCode($exitcode) {
 
 function Show-PSWarning() {
     if ($PSVersionTable.PSVersion.Major -lt 7) {
-        Write-Host "!!! " -NoNewline -ForegroundColor Red
-        Write-Host "You are using old version of PowerShell. $($PSVersionTable.PSVersion.Major).$($PSVersionTable.PSVersion.Minor)"
-        Write-Host "Please update to at least 7.0 - " -NoNewline -ForegroundColor Gray
-        Write-Host "https://github.com/PowerShell/PowerShell/releases" -ForegroundColor White
+        Write-Color -Text "!!! ", "You are using old version of PowerShell - ",  "$($PSVersionTable.PSVersion.Major).$($PSVersionTable.PSVersion.Minor)" -Color Red, Yellow, White
+        Write-Color -Text "    Please update to at least 7.0 - ", "https://github.com/PowerShell/PowerShell/releases" -Color Yellow, White
         Exit-WithCode 1
     }
 }
@@ -87,9 +90,6 @@ Write-Host $art -ForegroundColor DarkGreen
 # Enable if PS 7.x is needed.
 # Show-PSWarning
 
-$current_dir = Get-Location
-$script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
-$openpype_root = (Get-Item $script_dir).parent.FullName
 
 Set-Location -Path $openpype_root
 
@@ -97,16 +97,15 @@ $version_file = Get-Content -Path "$($openpype_root)\openpype\version.py"
 $result = [regex]::Matches($version_file, '__version__ = "(?<version>\d+\.\d+.\d+.*)"')
 $openpype_version = $result[0].Groups['version'].Value
 if (-not $openpype_version) {
-  Write-Host "!!! " -ForegroundColor yellow -NoNewline
-  Write-Host "Cannot determine OpenPype version."
+  Write-Color -Text "!!! ", "Cannot determine OpenPype version." -Color Yellow, Gray
   Exit-WithCode 1
 }
+
 $env:BUILD_VERSION = $openpype_version
 
 iscc 
 
-Write-Host ">>> " -NoNewline -ForegroundColor green
-Write-Host "Creating OpenPype installer ... " -ForegroundColor white
+Write-Color -Text ">>> ", "Creating OpenPype installer ... " -Color Green, White
 
 $build_dir_command = @"
 import sys
@@ -115,24 +114,25 @@ print('exe.{}-{}'.format(get_platform(), sys.version[0:3]))
 "@
 
 $build_dir = & python -c $build_dir_command
-Write-Host "Build directory ... ${build_dir}" -ForegroundColor white
+Write-Color -Text "--- ", "Build directory ", "${build_dir}" -Color Green, Gray, White
 $env:BUILD_DIR = $build_dir
 
-if (Get-Command iscc -errorAction SilentlyContinue -ErrorVariable ProcessError)
-{
-  iscc "$openpype_root\inno_setup.iss"
-}else {
-  Write-Host "!!! Cannot find Inno Setup command" -ForegroundColor red
-  Write-Host "!!! You can download it at https://jrsoftware.org/" -ForegroundColor red
+if (-not (Get-Command iscc -errorAction SilentlyContinue -ErrorVariable ProcessError)) {
+  Write-Color -Text "!!! ", "Cannot find Inno Setup command" -Color Red, Yellow
+  Write-Color "!!! You can download it at https://jrsoftware.org/" -ForegroundColor red
   Exit-WithCode 1
 }
 
+& iscc "$openpype_root\inno_setup.iss"
 
-Write-Host ">>> " -NoNewline -ForegroundColor green
-Write-Host "restoring current directory"
+if ($LASTEXITCODE -ne 0) {
+    Write-Color -Text "!!! ", "Creating installer failed." -Color Red, Yellow
+    Exit-WithCode 1
+}
+
+Write-Color -Text ">>> ", "Restoring current directory" -Color Green, Gray
 Set-Location -Path $current_dir
 
-Write-Host "*** " -NoNewline -ForegroundColor Cyan
-Write-Host "All done. You will find OpenPype installer in " -NoNewLine
-Write-Host "'.\build'" -NoNewline -ForegroundColor Green
-Write-Host " directory."
+New-BurntToastNotification -AppLogo "$openpype_root/openpype/resources/icons/openpype_icon.png" -Text "OpenPype build complete!", "All done. You will find You will find OpenPype installer in '.\build' directory."
+
+Write-Color -Text "*** ", "All done. You will find OpenPype installer in ", "'.\build'", " directory." -Color Green, Gray, White, Gray
diff --git a/tools/create_env.ps1 b/tools/create_env.ps1
index 6c8124ccb2..6315b7b27c 100644
--- a/tools/create_env.ps1
+++ b/tools/create_env.ps1
@@ -24,6 +24,13 @@ if($arguments -eq "--verbose") {
     $poetry_verbosity="-vvv"
 }
 
+$current_dir = Get-Location
+$script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
+$openpype_root = (Get-Item $script_dir).parent.FullName
+
+# Install PSWriteColor to support colorized output to terminal
+$env:PSModulePath = $env:PSModulePath + ";$($openpype_root)\vendor\powershell"
+
 function Exit-WithCode($exitcode) {
    # Only exit this host process if it's a child of another PowerShell parent process...
    $parentPID = (Get-CimInstance -ClassName Win32_Process -Filter "ProcessId=$PID" | Select-Object -Property ParentProcessId).ParentProcessId
@@ -36,28 +43,24 @@ function Exit-WithCode($exitcode) {
 
 function Show-PSWarning() {
     if ($PSVersionTable.PSVersion.Major -lt 7) {
-        Write-Host "!!! " -NoNewline -ForegroundColor Red
-        Write-Host "You are using old version of PowerShell. $($PSVersionTable.PSVersion.Major).$($PSVersionTable.PSVersion.Minor)"
-        Write-Host "Please update to at least 7.0 - " -NoNewline -ForegroundColor Gray
-        Write-Host "https://github.com/PowerShell/PowerShell/releases" -ForegroundColor White
+        Write-Color -Text "!!! ", "You are using old version of PowerShell - ",  "$($PSVersionTable.PSVersion.Major).$($PSVersionTable.PSVersion.Minor)" -Color Red, Yellow, White
+        Write-Color -Text "    Please update to at least 7.0 - ", "https://github.com/PowerShell/PowerShell/releases" -Color Yellow, White
         Exit-WithCode 1
     }
 }
 
 
 function Install-Poetry() {
-    Write-Host ">>> " -NoNewline -ForegroundColor Green
-    Write-Host "Installing Poetry ... "
+    Write-Color -Text ">>> ", "Installing Poetry ... " -Color Green, Gray
     $env:POETRY_HOME="$openpype_root\.poetry"
     (Invoke-WebRequest -Uri https://raw.githubusercontent.com/python-poetry/poetry/master/install-poetry.py -UseBasicParsing).Content | python -
 }
 
 
 function Test-Python() {
-    Write-Host ">>> " -NoNewline -ForegroundColor green
-    Write-Host "Detecting host Python ... " -NoNewline
+    Write-Color -Text ">>> ", "Detecting host Python ... " -Color Green, Gray -NoNewline
     if (-not (Get-Command "python" -ErrorAction SilentlyContinue)) {
-        Write-Host "!!! Python not detected" -ForegroundColor red
+        Write-Color -Text "!!! ",  "Python not detected" -Color Red, Yellow
         Set-Location -Path $current_dir
         Exit-WithCode 1
     }
@@ -70,28 +73,24 @@ print('{0}.{1}'.format(sys.version_info[0], sys.version_info[1]))
     $env:PYTHON_VERSION = $p
     $m = $p -match '(\d+)\.(\d+)'
     if(-not $m) {
-      Write-Host "!!! Cannot determine version" -ForegroundColor red
-      Set-Location -Path $current_dir
-      Exit-WithCode 1
+        Write-Color -Text "FAILED " -Color Red
+        Write-Color -Text "!!! ", "Cannot determine version" -Color Red, Yellow
+        Set-Location -Path $current_dir
+        Exit-WithCode 1
     }
     # We are supporting python 3.7 only
     if (($matches[1] -lt 3) -or ($matches[2] -lt 7)) {
-      Write-Host "FAILED Version [ $p ] is old and unsupported" -ForegroundColor red
+      Write-Color -Text "FAILED ", "Version ", "[", $p ,"]",  "is old and unsupported" -Color Red, Yellow, Cyan, White, Cyan, Yellow
       Set-Location -Path $current_dir
       Exit-WithCode 1
     } elseif (($matches[1] -eq 3) -and ($matches[2] -gt 7)) {
-        Write-Host "WARNING Version [ $p ] is unsupported, use at your own risk." -ForegroundColor yellow
-        Write-Host "*** " -NoNewline -ForegroundColor yellow
-        Write-Host "OpenPype supports only Python 3.7" -ForegroundColor white
+        Write-Color -Text "WARNING Version ", "[",  $p, "]",  " is unsupported, use at your own risk." -Color Yellow, Cyan, White, Cyan, Yellow
+        Write-Color -Text "*** ", "OpenPype supports only Python 3.7" -Color Yellow, White
     } else {
-        Write-Host "OK [ $p ]" -ForegroundColor green
+        Write-Color "OK ", "[",  $p, "]" -Color Green, Cyan, White, Cyan
     }
 }
 
-$current_dir = Get-Location
-$script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
-$openpype_root = (Get-Item $script_dir).parent.FullName
-
 if (-not (Test-Path 'env:POETRY_HOME')) {
     $env:POETRY_HOME = "$openpype_root\.poetry"
 }
@@ -129,41 +128,36 @@ $version_file = Get-Content -Path "$($openpype_root)\openpype\version.py"
 $result = [regex]::Matches($version_file, '__version__ = "(?<version>\d+\.\d+.\d+.*)"')
 $openpype_version = $result[0].Groups['version'].Value
 if (-not $openpype_version) {
-  Write-Host "!!! " -ForegroundColor yellow -NoNewline
-  Write-Host "Cannot determine OpenPype version."
+  Write-Color -Text "!!! ", "Cannot determine OpenPype version." -Color Red, Yellow
   Set-Location -Path $current_dir
   Exit-WithCode 1
 }
-Write-Host ">>> " -NoNewline -ForegroundColor Green
-Write-Host "Found OpenPype version " -NoNewline
-Write-Host "[ $($openpype_version) ]" -ForegroundColor Green
+Write-Color -Text ">>> ", "Found OpenPype version ", "[ ", $($openpype_version), " ]" -Color Green, Gray, Cyan, White, Cyan
 
 Test-Python
 
-Write-Host ">>> " -NoNewline -ForegroundColor Green
-Write-Host "Reading Poetry ... " -NoNewline
+Write-Color -Text ">>> ", "Reading Poetry ... " -Color Green, Gray -NoNewline
 if (-not (Test-Path -PathType Container -Path "$($env:POETRY_HOME)\bin")) {
-    Write-Host "NOT FOUND" -ForegroundColor Yellow
+    Write-Color -Text "NOT FOUND" -Color Yellow
     Install-Poetry
-    Write-Host "INSTALLED" -ForegroundColor Cyan
+    Write-Color -Text "INSTALLED" -Color Cyan
 } else {
-    Write-Host "OK" -ForegroundColor Green
+    Write-Color -Text "OK" -Color Green
 }
 
 if (-not (Test-Path -PathType Leaf -Path "$($openpype_root)\poetry.lock")) {
-    Write-Host ">>> " -NoNewline -ForegroundColor green
-    Write-Host "Installing virtual environment and creating lock."
+    Write-Color -Text ">>> ", "Installing virtual environment and creating lock." -Color Green, Gray
 } else {
-    Write-Host ">>> " -NoNewline -ForegroundColor green
-    Write-Host "Installing virtual environment from lock."
+    Write-Color -Text ">>> ", "Installing virtual environment from lock." -Color Green, Gray
 }
 & "$env:POETRY_HOME\bin\poetry" install --no-root $poetry_verbosity --ansi
 if ($LASTEXITCODE -ne 0) {
-    Write-Host "!!! " -ForegroundColor yellow -NoNewline
-    Write-Host "Poetry command failed."
+    Write-Color -Text "!!! ", "Poetry command failed." -Color Red, Yellow
     Set-Location -Path $current_dir
     Exit-WithCode 1
 }
 Set-Location -Path $current_dir
-Write-Host ">>> " -NoNewline -ForegroundColor green
-Write-Host "Virtual environment created."
+
+New-BurntToastNotification -AppLogo "$openpype_root/openpype/resources/icons/openpype_icon.png" -Text "OpenPype", "Virtual environment created."
+
+Write-Color -Text ">>> ", "Virtual environment created." -Color Green, White

From e7e9f461eeed634f0cba4b931fe8ea33814f26b4 Mon Sep 17 00:00:00 2001
From: Ondrej Samohel <ondrej.samohel@orbi.tools>
Date: Thu, 2 Sep 2021 14:55:04 +0200
Subject: [PATCH 003/289] remove submodules

---
 openpype/modules/ftrack/python2_vendor/arrow             | 1 -
 openpype/modules/ftrack/python2_vendor/ftrack-python-api | 1 -
 2 files changed, 2 deletions(-)
 delete mode 160000 openpype/modules/ftrack/python2_vendor/arrow
 delete mode 160000 openpype/modules/ftrack/python2_vendor/ftrack-python-api

diff --git a/openpype/modules/ftrack/python2_vendor/arrow b/openpype/modules/ftrack/python2_vendor/arrow
deleted file mode 160000
index b746fedf72..0000000000
--- a/openpype/modules/ftrack/python2_vendor/arrow
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b746fedf7286c3755a46f07ab72f4c414cd41fc0
diff --git a/openpype/modules/ftrack/python2_vendor/ftrack-python-api b/openpype/modules/ftrack/python2_vendor/ftrack-python-api
deleted file mode 160000
index d277f474ab..0000000000
--- a/openpype/modules/ftrack/python2_vendor/ftrack-python-api
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d277f474ab016e7b53479c36af87cb861d0cc53e

From 757af0d36eee3a35d0f2de5ce131fc4e3a9327c5 Mon Sep 17 00:00:00 2001
From: Ondrej Samohel <ondrej.samohel@orbi.tools>
Date: Thu, 2 Sep 2021 23:31:34 +0200
Subject: [PATCH 004/289] yet more scripts

---
 tools/run_mongo.ps1           | 22 +++++++--------
 tools/run_project_manager.ps1 | 15 +++++-----
 tools/run_settings.ps1        | 15 +++++-----
 tools/run_tests.ps1           | 53 +++++++++++++----------------------
 tools/run_tray.ps1            | 13 +++++----
 5 files changed, 54 insertions(+), 64 deletions(-)

diff --git a/tools/run_mongo.ps1 b/tools/run_mongo.ps1
index 32f6cfed17..0f26e86579 100644
--- a/tools/run_mongo.ps1
+++ b/tools/run_mongo.ps1
@@ -11,6 +11,13 @@ PS> .\run_mongo.ps1
 
 #>
 
+$current_dir = Get-Location
+$script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
+$openpype_root = (Get-Item $script_dir).parent.FullName
+
+# Install PSWriteColor to support colorized output to terminal
+$env:PSModulePath = $env:PSModulePath + ";$($openpype_root)\vendor\powershell"
+
 $art = @"
 
              . .   ..     .    ..
@@ -43,8 +50,7 @@ function Exit-WithCode($exitcode) {
 
 function Find-Mongo ($preferred_version) {
     $defaultPath = "C:\Program Files\MongoDB\Server"
-    Write-Host ">>> " -NoNewLine -ForegroundColor Green
-    Write-Host "Detecting MongoDB ... " -NoNewline
+    Write-Color -Text ">>> ", "Detecting MongoDB ... " -Color Geen, Gray -NoNewline
     if (-not (Get-Command "mongod" -ErrorAction SilentlyContinue)) {
         if(Test-Path "$($defaultPath)\*\bin\mongod.exe" -PathType Leaf) {
         # we have mongo server installed on standard Windows location
@@ -52,17 +58,14 @@ function Find-Mongo ($preferred_version) {
         # $preferred_version.
         $mongoVersions = Get-ChildItem -Directory 'C:\Program Files\MongoDB\Server' | Sort-Object -Property {$_.Name -as [int]}
         if(Test-Path "$($mongoVersions[-1])\bin\mongod.exe" -PathType Leaf) {
-            Write-Host "OK" -ForegroundColor Green
+            Write-Color -Text "OK" -Color Green
             $use_version = $mongoVersions[-1]
             foreach ($v in $mongoVersions) {
-                Write-Host "  - found [ " -NoNewline
-                Write-Host $v -NoNewLine -ForegroundColor Cyan
-                Write-Host " ]" -NoNewLine
-
+                Write-Color -Text "  - found [ ", $v, " ]" - Color Cyan, White, Cyan -NoNewLine
                 $version = Split-Path $v -Leaf
 
                 if ($preferred_version -eq $version) {
-                    Write-Host " *" -ForegroundColor Green
+                    Write-Color -Text " *" -Color Green
                     $use_version = $v
                 } else {
                     Write-Host ""
@@ -104,9 +107,6 @@ function Find-Mongo ($preferred_version) {
   #>
 }
 
-$script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
-$openpype_root = (Get-Item $script_dir).parent.FullName
-
 # mongodb port
 $port = 2707
 
diff --git a/tools/run_project_manager.ps1 b/tools/run_project_manager.ps1
index a9cfbb1e7b..2932358c2a 100644
--- a/tools/run_project_manager.ps1
+++ b/tools/run_project_manager.ps1
@@ -35,6 +35,9 @@ $current_dir = Get-Location
 $script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
 $openpype_root = (Get-Item $script_dir).parent.FullName
 
+# Install PSWriteColor to support colorized output to terminal
+$env:PSModulePath = $env:PSModulePath + ";$($openpype_root)\vendor\powershell"
+
 $env:_INSIDE_OPENPYPE_TOOL = "1"
 
 # make sure Poetry is in PATH
@@ -45,15 +48,13 @@ $env:PATH = "$($env:PATH);$($env:POETRY_HOME)\bin"
 
 Set-Location -Path $openpype_root
 
-Write-Host ">>> " -NoNewline -ForegroundColor Green
-Write-Host "Reading Poetry ... " -NoNewline
+Write-Color -Text ">>> ", "Reading Poetry ... " -Color Green, Gray -NoNewline
 if (-not (Test-Path -PathType Container -Path "$($env:POETRY_HOME)\bin")) {
-    Write-Host "NOT FOUND" -ForegroundColor Yellow
-    Write-Host "*** " -NoNewline -ForegroundColor Yellow
-    Write-Host "We need to install Poetry create virtual env first ..."
-    & "$openpype_root\tools\create_env.ps1"
+    Write-Color -Text "NOT FOUND" -Color Yellow
+    Install-Poetry
+    Write-Color -Text "INSTALLED" -Color Cyan
 } else {
-    Write-Host "OK" -ForegroundColor Green
+    Write-Color -Text "OK" -Color Green
 }
 
 & "$env:POETRY_HOME\bin\poetry" run python "$($openpype_root)\start.py" projectmanager
diff --git a/tools/run_settings.ps1 b/tools/run_settings.ps1
index 1c0aa6e8f3..918ea367ab 100644
--- a/tools/run_settings.ps1
+++ b/tools/run_settings.ps1
@@ -15,6 +15,9 @@ $current_dir = Get-Location
 $script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
 $openpype_root = (Get-Item $script_dir).parent.FullName
 
+# Install PSWriteColor to support colorized output to terminal
+$env:PSModulePath = $env:PSModulePath + ";$($openpype_root)\vendor\powershell"
+
 $env:_INSIDE_OPENPYPE_TOOL = "1"
 
 # make sure Poetry is in PATH
@@ -25,15 +28,13 @@ $env:PATH = "$($env:PATH);$($env:POETRY_HOME)\bin"
 
 Set-Location -Path $openpype_root
 
-Write-Host ">>> " -NoNewline -ForegroundColor Green
-Write-Host "Reading Poetry ... " -NoNewline
+Write-Color -Text ">>> ", "Reading Poetry ... " -Color Green, Gray -NoNewline
 if (-not (Test-Path -PathType Container -Path "$($env:POETRY_HOME)\bin")) {
-    Write-Host "NOT FOUND" -ForegroundColor Yellow
-    Write-Host "*** " -NoNewline -ForegroundColor Yellow
-    Write-Host "We need to install Poetry create virtual env first ..."
-    & "$openpype_root\tools\create_env.ps1"
+    Write-Color -Text "NOT FOUND" -Color Yellow
+    Install-Poetry
+    Write-Color -Text "INSTALLED" -Color Cyan
 } else {
-    Write-Host "OK" -ForegroundColor Green
+    Write-Color -Text "OK" -Color Green
 }
 
 & "$env:POETRY_HOME\bin\poetry" run python "$($openpype_root)\start.py" settings --dev
diff --git a/tools/run_tests.ps1 b/tools/run_tests.ps1
index e631cb72df..7995c6a8e9 100644
--- a/tools/run_tests.ps1
+++ b/tools/run_tests.ps1
@@ -11,6 +11,13 @@ PS> .\run_test.ps1
 
 #>
 
+$current_dir = Get-Location
+$script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
+$openpype_root = (Get-Item $script_dir).parent.FullName
+
+# Install PSWriteColor to support colorized output to terminal
+$env:PSModulePath = $env:PSModulePath + ";$($openpype_root)\vendor\powershell"
+
 function Exit-WithCode($exitcode) {
    # Only exit this host process if it's a child of another PowerShell parent process...
    $parentPID = (Get-CimInstance -ClassName Win32_Process -Filter "ProcessId=$PID" | Select-Object -Property ParentProcessId).ParentProcessId
@@ -22,10 +29,8 @@ function Exit-WithCode($exitcode) {
 
 function Show-PSWarning() {
     if ($PSVersionTable.PSVersion.Major -lt 7) {
-        Write-Host "!!! " -NoNewline -ForegroundColor Red
-        Write-Host "You are using old version of PowerShell. $($PSVersionTable.PSVersion.Major).$($PSVersionTable.PSVersion.Minor)"
-        Write-Host "Please update to at least 7.0 - " -NoNewline -ForegroundColor Gray
-        Write-Host "https://github.com/PowerShell/PowerShell/releases" -ForegroundColor White
+        Write-Color -Text "!!! ", "You are using old version of PowerShell - ",  "$($PSVersionTable.PSVersion.Major).$($PSVersionTable.PSVersion.Minor)" -Color Red, Yellow, White
+        Write-Color -Text "    Please update to at least 7.0 - ", "https://github.com/PowerShell/PowerShell/releases" -Color Yellow, White
         Exit-WithCode 1
     }
 }
@@ -53,10 +58,6 @@ Write-Host $art -ForegroundColor DarkGreen
 # Enable if PS 7.x is needed.
 # Show-PSWarning
 
-$current_dir = Get-Location
-$script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
-$openpype_root = (Get-Item $script_dir).parent.FullName
-
 $env:_INSIDE_OPENPYPE_TOOL = "1"
 
 if (-not (Test-Path 'env:POETRY_HOME')) {
@@ -69,46 +70,32 @@ $version_file = Get-Content -Path "$($openpype_root)\openpype\version.py"
 $result = [regex]::Matches($version_file, '__version__ = "(?<version>\d+\.\d+.\d+.*)"')
 $openpype_version = $result[0].Groups['version'].Value
 if (-not $openpype_version) {
-  Write-Host "!!! " -ForegroundColor yellow -NoNewline
-  Write-Host "Cannot determine OpenPype version."
+  Write-Color -Text "!!! ", "Cannot determine OpenPype version." -Color Yellow, Gray
   Exit-WithCode 1
 }
 
-Write-Host ">>> " -NoNewline -ForegroundColor green
-Write-Host "OpenPype [ " -NoNewline -ForegroundColor white
-Write-host $openpype_version  -NoNewline -ForegroundColor green
-Write-Host " ] ..." -ForegroundColor white
+Write-Color -Text ">>> ", "OpenPype [ ", $openpype_version, " ]" -Color Green, White, Cyan, White
 
-Write-Host ">>> " -NoNewline -ForegroundColor Green
-Write-Host "Reading Poetry ... " -NoNewline
+Write-Color -Text ">>> ", "Reading Poetry ... " -Color Green, Gray -NoNewline
 if (-not (Test-Path -PathType Container -Path "$($env:POETRY_HOME)\bin")) {
-    Write-Host "NOT FOUND" -ForegroundColor Yellow
-    Write-Host "*** " -NoNewline -ForegroundColor Yellow
-    Write-Host "We need to install Poetry create virtual env first ..."
+    Write-Color -Text "NOT FOUND" -Color Yellow
+    Write-Color -Text "*** ", "We need to install Poetry create virtual env first ..." -Color Yellow, Gray
     & "$openpype_root\tools\create_env.ps1"
 } else {
-    Write-Host "OK" -ForegroundColor Green
+    Write-Color -Text "OK" -Color Green
 }
 
-Write-Host ">>> " -NoNewline -ForegroundColor green
-Write-Host "Cleaning cache files ... " -NoNewline
+Write-Color -Text ">>> ", "Cleaning cache files ... " -Color Green, Gray -NoNewline
 Get-ChildItem $openpype_root -Filter "*.pyc" -Force -Recurse | Where-Object { $_.FullName -inotmatch 'build' } | Remove-Item -Force
+Get-ChildItem $openpype_root -Filter "*.pyo" -Force -Recurse | Where-Object { $_.FullName -inotmatch 'build' } | Remove-Item -Force
 Get-ChildItem $openpype_root -Filter "__pycache__" -Force -Recurse | Where-Object { $_.FullName -inotmatch 'build' } | Remove-Item -Force -Recurse
-Write-Host "OK" -ForegroundColor green
+Write-Color -Text "OK" -Color green
 
-Write-Host ">>> " -NoNewline -ForegroundColor green
-Write-Host "Testing OpenPype ..."
+Write-Color -Text ">>> ", "Testing OpenPype ..." -Color Green, White
 $original_pythonpath = $env:PYTHONPATH
 $env:PYTHONPATH="$($openpype_root);$($env:PYTHONPATH)"
 & "$env:POETRY_HOME\bin\poetry" run pytest -x --capture=sys --print -W ignore::DeprecationWarning "$($openpype_root)/tests"
 $env:PYTHONPATH = $original_pythonpath
 
-Write-Host ">>> " -NoNewline -ForegroundColor green
-Write-Host "restoring current directory"
+Write-Color -Text ">>> ", "Restoring current directory" -Color Green, Gray
 Set-Location -Path $current_dir
-
-
-
-
-
-
diff --git a/tools/run_tray.ps1 b/tools/run_tray.ps1
index 872c1524a6..7dee3d0064 100644
--- a/tools/run_tray.ps1
+++ b/tools/run_tray.ps1
@@ -14,6 +14,9 @@ $current_dir = Get-Location
 $script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
 $openpype_root = (Get-Item $script_dir).parent.FullName
 
+# Install PSWriteColor to support colorized output to terminal
+$env:PSModulePath = $env:PSModulePath + ";$($openpype_root)\vendor\powershell"
+
 $env:_INSIDE_OPENPYPE_TOOL = "1"
 
 # make sure Poetry is in PATH
@@ -24,15 +27,13 @@ $env:PATH = "$($env:PATH);$($env:POETRY_HOME)\bin"
 
 Set-Location -Path $openpype_root
 
-Write-Host ">>> " -NoNewline -ForegroundColor Green
-Write-Host "Reading Poetry ... " -NoNewline
+Write-Color -Text ">>> ", "Reading Poetry ... " -Color Green, Gray -NoNewline
 if (-not (Test-Path -PathType Container -Path "$($env:POETRY_HOME)\bin")) {
-    Write-Host "NOT FOUND" -ForegroundColor Yellow
-    Write-Host "*** " -NoNewline -ForegroundColor Yellow
-    Write-Host "We need to install Poetry create virtual env first ..."
+    Write-Color -Text "NOT FOUND" -Color Yellow
+    Write-Color -Text "*** ", "We need to install Poetry create virtual env first ..." -Color Yellow, Gray
     & "$openpype_root\tools\create_env.ps1"
 } else {
-    Write-Host "OK" -ForegroundColor Green
+    Write-Color -Text "OK" -Color Green
 }
 
 & "$($env:POETRY_HOME)\bin\poetry" run python "$($openpype_root)\start.py" tray --debug

From cd468f567331cc8125318b92a62259cf621e48db Mon Sep 17 00:00:00 2001
From: Ondrej Samohel <ondrej.samohel@orbi.tools>
Date: Fri, 3 Sep 2021 12:10:55 +0200
Subject: [PATCH 005/289] rest of the scripts converted

---
 tools/create_zip.ps1            | 40 +++++++++++++++------------------
 tools/fetch_thirdparty_libs.ps1 | 13 ++++++-----
 tools/make_docs.ps1             | 27 ++++++++++++----------
 tools/run_mongo.ps1             | 33 ++++++++-------------------
 4 files changed, 49 insertions(+), 64 deletions(-)

diff --git a/tools/create_zip.ps1 b/tools/create_zip.ps1
index c27857b480..3796186dd0 100644
--- a/tools/create_zip.ps1
+++ b/tools/create_zip.ps1
@@ -19,6 +19,13 @@ PS> .\create_zip.ps1 --path C:\OpenPype
 
 #>
 
+$current_dir = Get-Location
+$script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
+$openpype_root = (Get-Item $script_dir).parent.FullName
+
+# Install PSWriteColor to support colorized output to terminal
+$env:PSModulePath = $env:PSModulePath + ";$($openpype_root)\vendor\powershell"
+
 function Exit-WithCode($exitcode) {
    # Only exit this host process if it's a child of another PowerShell parent process...
    $parentPID = (Get-CimInstance -ClassName Win32_Process -Filter "ProcessId=$PID" | Select-Object -Property ParentProcessId).ParentProcessId
@@ -31,18 +38,12 @@ function Exit-WithCode($exitcode) {
 
 function Show-PSWarning() {
     if ($PSVersionTable.PSVersion.Major -lt 7) {
-        Write-Host "!!! " -NoNewline -ForegroundColor Red
-        Write-Host "You are using old version of PowerShell. $($PSVersionTable.PSVersion.Major).$($PSVersionTable.PSVersion.Minor)"
-        Write-Host "Please update to at least 7.0 - " -NoNewline -ForegroundColor Gray
-        Write-Host "https://github.com/PowerShell/PowerShell/releases" -ForegroundColor White
+        Write-Color -Text "!!! ", "You are using old version of PowerShell - ",  "$($PSVersionTable.PSVersion.Major).$($PSVersionTable.PSVersion.Minor)" -Color Red, Yellow, White
+        Write-Color -Text "    Please update to at least 7.0 - ", "https://github.com/PowerShell/PowerShell/releases" -Color Yellow, White
         Exit-WithCode 1
     }
 }
 
-$current_dir = Get-Location
-$script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
-$openpype_root = (Get-Item $script_dir).parent.FullName
-
 $env:_INSIDE_OPENPYPE_TOOL = "1"
 
 if (-not (Test-Path 'env:POETRY_HOME')) {
@@ -78,31 +79,26 @@ $version_file = Get-Content -Path "$($openpype_root)\openpype\version.py"
 $result = [regex]::Matches($version_file, '__version__ = "(?<version>\d+\.\d+.\d+.*)"')
 $openpype_version = $result[0].Groups['version'].Value
 if (-not $openpype_version) {
-  Write-Host "!!! " -ForegroundColor yellow -NoNewline
-  Write-Host "Cannot determine OpenPype version."
+  Write-Color -Text "!!! ", "Cannot determine OpenPype version." -Color Yellow, Gray
   Exit-WithCode 1
 }
 
-Write-Host ">>> " -NoNewline -ForegroundColor Green
-Write-Host "Reading Poetry ... " -NoNewline
+Write-Color -Text ">>> ", "Reading Poetry ... " -Color Green, Gray -NoNewline
 if (-not (Test-Path -PathType Container -Path "$($env:POETRY_HOME)\bin")) {
-    Write-Host "NOT FOUND" -ForegroundColor Yellow
-    Write-Host "*** " -NoNewline -ForegroundColor Yellow
-    Write-Host "We need to install Poetry create virtual env first ..."
+    Write-Color -Text "NOT FOUND" -Color Yellow
+    Write-Color -Text "*** ", "We need to install Poetry create virtual env first ..." -Color Yellow, Gray
     & "$openpype_root\tools\create_env.ps1"
 } else {
-    Write-Host "OK" -ForegroundColor Green
+    Write-Color -Text "OK" -Color Green
 }
 
-Write-Host ">>> " -NoNewline -ForegroundColor green
-Write-Host "Cleaning cache files ... " -NoNewline
+Write-Color -Text ">>> ", "Cleaning cache files ... " -Color Green, Gray -NoNewline
 Get-ChildItem $openpype_root -Filter "*.pyc" -Force -Recurse | Where-Object { $_.FullName -inotmatch 'build' } | Remove-Item -Force
 Get-ChildItem $openpype_root -Filter "*.pyo" -Force -Recurse | Where-Object { $_.FullName -inotmatch 'build' } | Remove-Item -Force
-Get-ChildItem $openpype_root -Filter "__pycache__" -Force -Recurse|  Where-Object { $_.FullName -inotmatch 'build' } | Remove-Item -Force -Recurse
-Write-Host "OK" -ForegroundColor green
+Get-ChildItem $openpype_root -Filter "__pycache__" -Force -Recurse | Where-Object { $_.FullName -inotmatch 'build' } | Remove-Item -Force -Recurse
+Write-Color -Text "OK" -Color green
 
-Write-Host ">>> " -NoNewline -ForegroundColor green
-Write-Host "Generating zip from current sources ..."
+Write-Color -Text ">>> ", "Generating zip from current sources ..." -Color Green, Gray
 $env:PYTHONPATH="$($openpype_root);$($env:PYTHONPATH)"
 $env:OPENPYPE_ROOT="$($openpype_root)"
 & "$($env:POETRY_HOME)\bin\poetry" run python "$($openpype_root)\tools\create_zip.py" $ARGS
diff --git a/tools/fetch_thirdparty_libs.ps1 b/tools/fetch_thirdparty_libs.ps1
index 16f7b70e7a..0226a35bfb 100644
--- a/tools/fetch_thirdparty_libs.ps1
+++ b/tools/fetch_thirdparty_libs.ps1
@@ -15,6 +15,9 @@ $current_dir = Get-Location
 $script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
 $openpype_root = (Get-Item $script_dir).parent.FullName
 
+# Install PSWriteColor to support colorized output to terminal
+$env:PSModulePath = $env:PSModulePath + ";$($openpype_root)\vendor\powershell"
+
 $env:_INSIDE_OPENPYPE_TOOL = "1"
 
 if (-not (Test-Path 'env:POETRY_HOME')) {
@@ -23,15 +26,13 @@ if (-not (Test-Path 'env:POETRY_HOME')) {
 
 Set-Location -Path $openpype_root
 
-Write-Host ">>> " -NoNewline -ForegroundColor Green
-Write-Host "Reading Poetry ... " -NoNewline
+Write-Color -Text ">>> ", "Reading Poetry ... " -Color Green, Gray -NoNewline
 if (-not (Test-Path -PathType Container -Path "$($env:POETRY_HOME)\bin")) {
-    Write-Host "NOT FOUND" -ForegroundColor Yellow
-    Write-Host "*** " -NoNewline -ForegroundColor Yellow
-    Write-Host "We need to install Poetry create virtual env first ..."
+    Write-Color -Text "NOT FOUND" -Color Yellow
+    Write-Color -Text "*** ", "We need to install Poetry create virtual env first ..." -Color Yellow, Gray
     & "$openpype_root\tools\create_env.ps1"
 } else {
-    Write-Host "OK" -ForegroundColor Green
+    Write-Color -Text "OK" -Color Green
 }
 
 & "$($env:POETRY_HOME)\bin\poetry" run python "$($openpype_root)\tools\fetch_thirdparty_libs.py"
diff --git a/tools/make_docs.ps1 b/tools/make_docs.ps1
index 45a11171ae..d356f081de 100644
--- a/tools/make_docs.ps1
+++ b/tools/make_docs.ps1
@@ -44,27 +44,30 @@ $art = @"
 
 "@
 
+$current_dir = Get-Location
+$script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
+$openpype_root = (Get-Item $script_dir).parent.FullName
+
+# Install PSWriteColor to support colorized output to terminal
+$env:PSModulePath = $env:PSModulePath + ";$($openpype_root)\vendor\powershell"
+
 Write-Host $art -ForegroundColor DarkGreen
 
-Write-Host ">>> " -NoNewline -ForegroundColor Green
-Write-Host "Reading Poetry ... " -NoNewline
+Write-Color -Text ">>> ", "Reading Poetry ... " -Color Green, Gray -NoNewline
 if (-not (Test-Path -PathType Container -Path "$($env:POETRY_HOME)\bin")) {
-    Write-Host "NOT FOUND" -ForegroundColor Yellow
-    Write-Host "*** " -NoNewline -ForegroundColor Yellow
-    Write-Host "We need to install Poetry create virtual env first ..."
-    & "$openpype_root\tools\create_env.ps1"
+    Write-Color -Text "NOT FOUND" -Color Yellow
+    Install-Poetry
+    Write-Color -Text "INSTALLED" -Color Cyan
 } else {
-    Write-Host "OK" -ForegroundColor Green
+    Write-Color -Text "OK" -Color Green
 }
 
-Write-Host "This will not overwrite existing source rst files, only scan and add new."
+Write-Color -Text "... ", "This will not overwrite existing source rst files, only scan and add new." -Color Yellow, Gray
 Set-Location -Path $openpype_root
-Write-Host ">>> " -NoNewline -ForegroundColor green
-Write-Host "Running apidoc ..."
+Write-Color -Text ">>> ", "Running apidoc ..." -Color Green, Gray
 & "$env:POETRY_HOME\bin\poetry" run sphinx-apidoc -M -e -d 10  --ext-intersphinx --ext-todo --ext-coverage --ext-viewcode -o "$($openpype_root)\docs\source" igniter
 & "$env:POETRY_HOME\bin\poetry" run sphinx-apidoc.exe -M -e -d 10 --ext-intersphinx --ext-todo --ext-coverage --ext-viewcode -o "$($openpype_root)\docs\source" openpype vendor, openpype\vendor
 
-Write-Host ">>> " -NoNewline -ForegroundColor green
-Write-Host "Building html ..."
+Write-Color -Text ">>> ", "Building html ..." -Color Green, Gray
 & "$env:POETRY_HOME\bin\poetry" run python "$($openpype_root)\setup.py" build_sphinx
 Set-Location -Path $current_dir
diff --git a/tools/run_mongo.ps1 b/tools/run_mongo.ps1
index 0f26e86579..a840200252 100644
--- a/tools/run_mongo.ps1
+++ b/tools/run_mongo.ps1
@@ -74,27 +74,20 @@ function Find-Mongo ($preferred_version) {
 
             $env:PATH = "$($env:PATH);$($use_version)\bin\"
 
-            Write-Host "  - auto-added from [ " -NoNewline
-            Write-Host "$($use_version)\bin\mongod.exe" -NoNewLine -ForegroundColor Cyan
-            Write-Host " ]"
+            Write-Color -Text "  - auto-added from [ ", "$($use_version)\bin\mongod.exe", " ]" -Color Cyan, White, Cyan
             return "$($use_version)\bin\mongod.exe"
         } else {
-            Write-Host "FAILED " -NoNewLine -ForegroundColor Red
-            Write-Host "MongoDB not detected" -ForegroundColor Yellow
-            Write-Host "Tried to find it on standard location " -NoNewline -ForegroundColor Gray
-            Write-Host " [ " -NoNewline -ForegroundColor Cyan
-            Write-Host "$($mongoVersions[-1])\bin\mongod.exe" -NoNewline -ForegroundColor White
-            Write-Host " ] " -NoNewLine -ForegroundColor Cyan
-            Write-Host "but failed." -ForegroundColor Gray
+            Write-Color -Text "FAILED " -Color Red  -NoNewLine
+            Write-Color -Text "MongoDB not detected" -Color Yellow
+            Write-Color -Text "Tried to find it on standard location ", "[ ", "$($mongoVersions[-1])\bin\mongod.exe", " ]", " but failed." -Color Gray, Cyan, White, Cyan, Gray -NoNewline
             Exit-WithCode 1
         }
     } else {
-        Write-Host "FAILED " -NoNewLine -ForegroundColor Red
-        Write-Host "MongoDB not detected in PATH" -ForegroundColor Yellow
+        Write-Color -Text "FAILED ", "MongoDB not detected in PATH" -Color Red, Yellow
         Exit-WithCode 1
     }
   } else {
-        Write-Host "OK" -ForegroundColor Green
+        Write-Color -Text "OK" -Color Green
         return Get-Command "mongod" -ErrorAction SilentlyContinue
   }
   <#
@@ -116,15 +109,7 @@ $dbpath = (Get-Item $openpype_root).parent.FullName + "\mongo_db_data"
 $preferred_version = "4.0"
 
 $mongoPath = Find-Mongo $preferred_version
-Write-Host ">>> " -NoNewLine -ForegroundColor Green
-Write-Host "Using DB path: " -NoNewLine
-Write-Host " [ " -NoNewline -ForegroundColor Cyan
-Write-Host "$($dbpath)" -NoNewline -ForegroundColor White
-Write-Host " ] "-ForegroundColor Cyan
-Write-Host ">>> " -NoNewLine -ForegroundColor Green
-Write-Host "Port: " -NoNewLine
-Write-Host " [ " -NoNewline -ForegroundColor Cyan
-Write-Host "$($port)" -NoNewline -ForegroundColor White
-Write-Host " ] " -ForegroundColor Cyan
-Start-Process -FilePath $mongopath "--dbpath $($dbpath) --port $($port)" -PassThru | Out-Null
+Write-Color -Text ">>> ", "Using DB path: ", "[ ", "$($dbpath)", " ]" -Color Green, Gray, Cyan, White, Cyan
+Write-Color -Text ">>> ", "Port: ", "[ ", "$($port)", " ]", -Color Green, Gray, Cyan, White, Cyan
 
+Start-Process -FilePath $mongopath "--dbpath $($dbpath) --port $($port)" -PassThru | Out-Null

From e9afd17b296677b1558b83469cdf68cd3cf4e555 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 6 May 2022 10:02:20 +0200
Subject: [PATCH 006/289] converted event to be able create multiple
 independent event systems

---
 openpype/lib/events.py | 76 +++++++++++++++++++++++++++++++++---------
 1 file changed, 61 insertions(+), 15 deletions(-)

diff --git a/openpype/lib/events.py b/openpype/lib/events.py
index 7bec6ee30d..3762cec9f9 100644
--- a/openpype/lib/events.py
+++ b/openpype/lib/events.py
@@ -11,6 +11,10 @@ except Exception:
     from openpype.lib.python_2_comp import WeakMethod
 
 
+class MissingEventSystem(Exception):
+    pass
+
+
 class EventCallback(object):
     """Callback registered to a topic.
 
@@ -179,13 +183,14 @@ class Event(object):
     """
     _data = {}
 
-    def __init__(self, topic, data=None, source=None):
+    def __init__(self, topic, data=None, source=None, event_system=None):
         self._id = str(uuid4())
         self._topic = topic
         if data is None:
             data = {}
         self._data = data
         self._source = source
+        self._event_system = event_system
 
     def __getitem__(self, key):
         return self._data[key]
@@ -211,28 +216,69 @@ class Event(object):
 
     def emit(self):
         """Emit event and trigger callbacks."""
-        StoredCallbacks.emit_event(self)
+        if self._event_system is None:
+            raise MissingEventSystem(
+                "Can't emit event {}. Does not have set event system.".format(
+                    str(repr(self))
+                )
+            )
+        self._event_system.emit_event(self)
 
 
-class StoredCallbacks:
-    _registered_callbacks = []
+class EventSystem(object):
+    def __init__(self):
+        self._registered_callbacks = []
 
-    @classmethod
-    def add_callback(cls, topic, callback):
+    def add_callback(self, topic, callback):
         callback = EventCallback(topic, callback)
-        cls._registered_callbacks.append(callback)
+        self._registered_callbacks.append(callback)
         return callback
 
-    @classmethod
-    def emit_event(cls, event):
+    def create_event(self, topic, data, source):
+        return Event(topic, data, source, self)
+
+    def emit(self, topic, data, source):
+        event = self.create_event(topic, data, source)
+        event.emit()
+        return event
+
+    def emit_event(self, event):
         invalid_callbacks = []
-        for callback in cls._registered_callbacks:
+        for callback in self._registered_callbacks:
             callback.process_event(event)
             if not callback.is_ref_valid:
                 invalid_callbacks.append(callback)
 
         for callback in invalid_callbacks:
-            cls._registered_callbacks.remove(callback)
+            self._registered_callbacks.remove(callback)
+
+
+class GlobalEvent(Event):
+    def __init__(self, topic, data=None, source=None):
+        event_system = GlobalEventSystem.get_global_event_system()
+
+        super(GlobalEvent, self).__init__(topic, data, source, event_system)
+
+
+class GlobalEventSystem:
+    _global_event_system = None
+
+    @classmethod
+    def get_global_event_system(cls):
+        if cls._global_event_system is None:
+            cls._global_event_system = EventSystem()
+        return cls._global_event_system
+
+    @classmethod
+    def add_callback(cls, topic, callback):
+        event_system = cls.get_global_event_system()
+        return event_system.add_callback(topic, callback)
+
+    @classmethod
+    def emit(cls, topic, data, source):
+        event = GlobalEvent(topic, data, source)
+        event.emit()
+        return event
 
 
 def register_event_callback(topic, callback):
@@ -249,7 +295,8 @@ def register_event_callback(topic, callback):
             enable/disable listening to a topic or remove the callback from
             the topic completely.
     """
-    return StoredCallbacks.add_callback(topic, callback)
+
+    return GlobalEventSystem.add_callback(topic, callback)
 
 
 def emit_event(topic, data=None, source=None):
@@ -263,6 +310,5 @@ def emit_event(topic, data=None, source=None):
     Returns:
         Event: Object of event that was emitted.
     """
-    event = Event(topic, data, source)
-    event.emit()
-    return event
+
+    return GlobalEventSystem.emit(topic, data, source)

From dcac9e08a6aae510f024389870a212d0aae1596e Mon Sep 17 00:00:00 2001
From: Ondrej Samohel <ondrej.samohel@orbi.tools>
Date: Tue, 7 Jun 2022 15:53:08 +0200
Subject: [PATCH 007/289] :recycle: few tweaks

---
 tools/create_env.ps1            | 4 +++-
 tools/fetch_thirdparty_libs.ps1 | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/tools/create_env.ps1 b/tools/create_env.ps1
index 9472c75c2f..b1337b5635 100644
--- a/tools/create_env.ps1
+++ b/tools/create_env.ps1
@@ -169,14 +169,16 @@ if (-not (Test-Path -PathType Leaf -Path "$($openpype_root)\poetry.lock")) {
 } else {
     Write-Color -Text ">>> ", "Installing virtual environment from lock." -Color Green, Gray
 }
+$startTime = [int][double]::Parse((Get-Date -UFormat %s))
 & "$env:POETRY_HOME\bin\poetry" install --no-root $poetry_verbosity --ansi
 if ($LASTEXITCODE -ne 0) {
     Write-Color -Text "!!! ", "Poetry command failed." -Color Red, Yellow
     Set-Location -Path $current_dir
     Exit-WithCode 1
 }
+$endTime = [int][double]::Parse((Get-Date -UFormat %s))
 Set-Location -Path $current_dir
 
-New-BurntToastNotification -AppLogo "$openpype_root/openpype/resources/icons/openpype_icon.png" -Text "OpenPype", "Virtual environment created."
+New-BurntToastNotification -AppLogo "$openpype_root/openpype/resources/icons/openpype_icon.png" -Text "OpenPype", "Virtual environment created.", "All done in $($endTime - $startTime) secs."
 
 Write-Color -Text ">>> ", "Virtual environment created." -Color Green, White
diff --git a/tools/fetch_thirdparty_libs.ps1 b/tools/fetch_thirdparty_libs.ps1
index 0226a35bfb..41a3585ff9 100644
--- a/tools/fetch_thirdparty_libs.ps1
+++ b/tools/fetch_thirdparty_libs.ps1
@@ -34,6 +34,8 @@ if (-not (Test-Path -PathType Container -Path "$($env:POETRY_HOME)\bin")) {
 } else {
     Write-Color -Text "OK" -Color Green
 }
-
+$startTime = [int][double]::Parse((Get-Date -UFormat %s))
 & "$($env:POETRY_HOME)\bin\poetry" run python "$($openpype_root)\tools\fetch_thirdparty_libs.py"
+$endTime = [int][double]::Parse((Get-Date -UFormat %s))
 Set-Location -Path $current_dir
+New-BurntToastNotification -AppLogo "$openpype_root/openpype/resources/icons/openpype_icon.png" -Text "OpenPype", "Dependencies downloaded", "All done in $($endTime - $startTime) secs."

From c14b8323dbc40cc4bf41712c52642e75ae391546 Mon Sep 17 00:00:00 2001
From: Ophelie Abbonato <oabbonato@ws142.prs.vfx.int>
Date: Fri, 6 May 2022 17:06:32 +0200
Subject: [PATCH 008/289] Add menu quad in hiero

---
 .../defaults/project_settings/hiero.json      | 32 +++++++++++++++++++
 .../projects_schema/schema_project_hiero.json |  4 +++
 .../common/scriptsmenu/launchfornuke.py       |  2 +-
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/openpype/settings/defaults/project_settings/hiero.json b/openpype/settings/defaults/project_settings/hiero.json
index 1dff3aac51..eb75aff6c0 100644
--- a/openpype/settings/defaults/project_settings/hiero.json
+++ b/openpype/settings/defaults/project_settings/hiero.json
@@ -1,4 +1,36 @@
 {
+    "ext_mapping": {
+        "model": "hrox",
+        "mayaAscii": "hrox",
+        "camera": "hrox",
+        "rig": "hrox",
+        "workfile": "hrox",
+        "yetiRig": "hrox"
+    },
+    "heiro-dirmap": {
+        "enabled": false,
+        "paths": {
+            "source-path": [],
+            "destination-path": []
+        }
+    },
+    "scriptsmenu": {
+        "name": "OpenPype Tools",
+        "definition": [
+            {
+                "type": "action",
+                "command": "import openpype.hosts.hiero.api.commands as hiero; hiero.edit_shader_definitions()",
+                "sourcetype": "python",
+                "title": "Edit shader name definitions",
+                "tooltip": "Edit shader name definitions used in validation and renaming.",
+                "tags": [
+                    "pipeline",
+                    "shader"
+                ]
+            }
+        ]
+    },
+
     "create": {
         "CreateShotClip": {
             "hierarchy": "{folder}/{sequence}",
diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_hiero.json b/openpype/settings/entities/schemas/projects_schema/schema_project_hiero.json
index f717eff7dd..39721c641a 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_hiero.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_hiero.json
@@ -206,6 +206,10 @@
         {
             "type": "schema",
             "name": "schema_publish_gui_filter"
+        },
+        {
+            "type": "schema",
+            "name": "schema_maya_scriptsmenu"
         }
     ]
 }
diff --git a/openpype/vendor/python/common/scriptsmenu/launchfornuke.py b/openpype/vendor/python/common/scriptsmenu/launchfornuke.py
index 72302a79a6..4f65a8e3ae 100644
--- a/openpype/vendor/python/common/scriptsmenu/launchfornuke.py
+++ b/openpype/vendor/python/common/scriptsmenu/launchfornuke.py
@@ -6,7 +6,7 @@ def _nuke_main_window():
     """Return Nuke's main window"""
     for obj in QtWidgets.QApplication.topLevelWidgets():
         if (obj.inherits('QMainWindow') and
-                    obj.metaObject().className() == 'Foundry::UI::DockMainWindow'):
+                obj.metaObject().className() == 'Foundry::UI::DockMainWindow'):
             return obj
     raise RuntimeError('Could not find Nuke MainWindow instance')
 

From 174c04a7f26dbe3c41c8c459222f97135fb4268d Mon Sep 17 00:00:00 2001
From: Ophelie Abbonato <oabbonato@ws142.prs.vfx.int>
Date: Fri, 6 May 2022 17:16:12 +0200
Subject: [PATCH 009/289] menu hiero

---
 .../common/scriptsmenu/launchforhiero.py      | 84 +++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 openpype/vendor/python/common/scriptsmenu/launchforhiero.py

diff --git a/openpype/vendor/python/common/scriptsmenu/launchforhiero.py b/openpype/vendor/python/common/scriptsmenu/launchforhiero.py
new file mode 100644
index 0000000000..8c3aa35126
--- /dev/null
+++ b/openpype/vendor/python/common/scriptsmenu/launchforhiero.py
@@ -0,0 +1,84 @@
+import logging
+
+import scriptsmenu
+from .vendor.Qt import QtWidgets
+
+log = logging.getLogger(__name__)
+
+
+def _hiero_main_window():
+    """Return Nuke's main window"""
+    for obj in QtWidgets.QApplication.topLevelWidgets():
+        if (obj.inherits('QMainWindow') and
+                obj.metaObject().className() == 'Foundry::UI::DockMainWindow'):
+            return obj
+    raise RuntimeError('Could not find HieroWindow instance')
+
+
+def _hiero_main_menubar():
+    """Retrieve the main menubar of the Nuke window"""
+    hiero_window = _hiero_main_window()
+    menubar = [i for i in hiero_window.children() if isinstance(
+        i,
+        QtWidgets.QMenuBar
+    )]
+
+    assert len(menubar) == 1, "Error, could not find menu bar!"
+    return menubar[0]
+
+
+def find_scripts_menu(title, parent):
+    """
+    Check if the menu exists with the given title in the parent
+
+    Args:
+        title (str): the title name of the scripts menu
+
+        parent (QtWidgets.QMenuBar): the menubar to check
+
+    Returns:
+        QtWidgets.QMenu or None
+
+    """
+
+    menu = None
+    search = [i for i in parent.children() if
+              isinstance(i, scriptsmenu.ScriptsMenu)
+              and i.title() == title]
+    if search:
+        assert len(search) < 2, ("Multiple instances of menu '{}' "
+                                 "in menu bar".format(title))
+        menu = search[0]
+
+    return menu
+
+
+def main(title="Scripts", parent=None, objectName=None):
+    """Build the main scripts menu in Maya
+
+    Args:
+        title (str): name of the menu in the application
+
+        parent (QtWidgets.QtMenuBar): the parent object for the menu
+
+        objectName (str): custom objectName for scripts menu
+
+    Returns:
+        scriptsmenu.ScriptsMenu instance
+
+    """
+    hieromainbar = parent or _hiero_main_menubar()
+    try:
+        # check menu already exists
+        menu = find_scripts_menu(title, hieromainbar)
+        if not menu:
+            log.info("Attempting to build menu ...")
+            object_name = objectName or title.lower()
+            menu = scriptsmenu.ScriptsMenu(title=title,
+                                           parent=hieromainbar,
+                                           objectName=object_name)
+    except Exception as e:
+        log.error(e)
+        return
+
+    return menu

From 3ea514f029085653a104b37dcae8b6d2cd6bf9cc Mon Sep 17 00:00:00 2001
From: Ophelie Abbonato <oabbonato@ws142.prs.vfx.int>
Date: Mon, 23 May 2022 15:11:56 +0200
Subject: [PATCH 010/289]  add script menu

---
 openpype/hosts/hiero/api/menu.py | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/openpype/hosts/hiero/api/menu.py b/openpype/hosts/hiero/api/menu.py
index e262abec00..d4e62c9e8a 100644
--- a/openpype/hosts/hiero/api/menu.py
+++ b/openpype/hosts/hiero/api/menu.py
@@ -9,6 +9,7 @@ from openpype.pipeline import legacy_io
 from openpype.tools.utils import host_tools
 
 from . import tags
+from openpype.settings import get_project_settings
 
 log = Logger.get_logger(__name__)
 
@@ -41,6 +42,7 @@ def menu_install():
     Installing menu into Hiero
 
     """
+    print("YOLOOOOOOOOOOOOOOOOOO")
     from Qt import QtGui
     from . import (
         publish, launch_workfiles_app, reload_config,
@@ -138,3 +140,32 @@ def menu_install():
     exeprimental_action.triggered.connect(
         lambda: host_tools.show_experimental_tools_dialog(parent=main_window)
     )
+
+
+def add_scripts_menu():
+    try:
+        from scriptsmenu import launchforhiero
+    except ImportError:
+        log.warning(
+            "Skipping studio.menu install, because "
+            "'scriptsmenu' module seems unavailable."
+        )
+        return
+
+    # load configuration of custom menu
+    project_settings = get_project_settings(os.getenv("AVALON_PROJECT"))
+    config = project_settings["hiero"]["scriptsmenu"]["definition"]
+    _menu = project_settings["hiero"]["scriptsmenu"]["name"]
+
+    if not config:
+        log.warning("Skipping studio menu, no definition found.")
+        return
+
+    # run the launcher for Maya menu
+    studio_menu = launchforhiero.main(title=_menu.title())
+
+    # apply configuration
+    studio_menu.build_from_configuration(studio_menu, config)
+
+
+add_scripts_menu()

From 4c9cd18f1cce331d4e434c531775450cab5b0b71 Mon Sep 17 00:00:00 2001
From: Ophelie Abbonato <oabbonato@ws142.prs.vfx.int>
Date: Mon, 23 May 2022 15:13:36 +0200
Subject: [PATCH 011/289] clen print

---
 openpype/hosts/hiero/api/menu.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/hosts/hiero/api/menu.py b/openpype/hosts/hiero/api/menu.py
index d4e62c9e8a..9e999da2f6 100644
--- a/openpype/hosts/hiero/api/menu.py
+++ b/openpype/hosts/hiero/api/menu.py
@@ -42,7 +42,7 @@ def menu_install():
     Installing menu into Hiero
 
     """
-    print("YOLOOOOOOOOOOOOOOOOOO")
+
     from Qt import QtGui
     from . import (
         publish, launch_workfiles_app, reload_config,

From 0e3607805925eaa1fc7ad9bc0e17f0144081a71d Mon Sep 17 00:00:00 2001
From: Ophelie Abbonato <oabbonato@ws142.prs.vfx.int>
Date: Mon, 23 May 2022 15:47:29 +0200
Subject: [PATCH 012/289] nothing change

---
 openpype/settings/defaults/project_settings/hiero.json      | 2 +-
 openpype/vendor/python/common/scriptsmenu/launchforhiero.py | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/openpype/settings/defaults/project_settings/hiero.json b/openpype/settings/defaults/project_settings/hiero.json
index eb75aff6c0..cec4bca8fd 100644
--- a/openpype/settings/defaults/project_settings/hiero.json
+++ b/openpype/settings/defaults/project_settings/hiero.json
@@ -7,7 +7,7 @@
         "workfile": "hrox",
         "yetiRig": "hrox"
     },
-    "heiro-dirmap": {
+    "hiero-dirmap": {
         "enabled": false,
         "paths": {
             "source-path": [],
diff --git a/openpype/vendor/python/common/scriptsmenu/launchforhiero.py b/openpype/vendor/python/common/scriptsmenu/launchforhiero.py
index 8c3aa35126..3f8e726083 100644
--- a/openpype/vendor/python/common/scriptsmenu/launchforhiero.py
+++ b/openpype/vendor/python/common/scriptsmenu/launchforhiero.py
@@ -7,6 +7,7 @@ log = logging.getLogger(__name__)
 
 
 def _hiero_main_window():
+    print("YEAAAAAAAAAAAAAAAAAAAH")
     """Return Nuke's main window"""
     for obj in QtWidgets.QApplication.topLevelWidgets():
         if (obj.inherits('QMainWindow') and

From 6ee781c8a6b4701f6166a877eda4e43b9a76e454 Mon Sep 17 00:00:00 2001
From: Ophelie Abbonato <oabbonato@ws142.prs.vfx.int>
Date: Tue, 7 Jun 2022 17:00:53 +0200
Subject: [PATCH 013/289] change launcher for api folder

---
 openpype/hosts/hiero/api/launchforhiero.py | 85 ++++++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100644 openpype/hosts/hiero/api/launchforhiero.py

diff --git a/openpype/hosts/hiero/api/launchforhiero.py b/openpype/hosts/hiero/api/launchforhiero.py
new file mode 100644
index 0000000000..3f8e726083
--- /dev/null
+++ b/openpype/hosts/hiero/api/launchforhiero.py
@@ -0,0 +1,85 @@
+import logging
+
+import scriptsmenu
+from .vendor.Qt import QtWidgets
+
+log = logging.getLogger(__name__)
+
+
+def _hiero_main_window():
+    print("YEAAAAAAAAAAAAAAAAAAAH")
+    """Return Nuke's main window"""
+    for obj in QtWidgets.QApplication.topLevelWidgets():
+        if (obj.inherits('QMainWindow') and
+                obj.metaObject().className() == 'Foundry::UI::DockMainWindow'):
+            return obj
+    raise RuntimeError('Could not find HieroWindow instance')
+
+
+def _hiero_main_menubar():
+    """Retrieve the main menubar of the Nuke window"""
+    hiero_window = _hiero_main_window()
+    menubar = [i for i in hiero_window.children() if isinstance(
+        i,
+        QtWidgets.QMenuBar
+    )]
+
+    assert len(menubar) == 1, "Error, could not find menu bar!"
+    return menubar[0]
+
+
+def find_scripts_menu(title, parent):
+    """
+    Check if the menu exists with the given title in the parent
+
+    Args:
+        title (str): the title name of the scripts menu
+
+        parent (QtWidgets.QMenuBar): the menubar to check
+
+    Returns:
+        QtWidgets.QMenu or None
+
+    """
+
+    menu = None
+    search = [i for i in parent.children() if
+              isinstance(i, scriptsmenu.ScriptsMenu)
+              and i.title() == title]
+    if search:
+        assert len(search) < 2, ("Multiple instances of menu '{}' "
+                                 "in menu bar".format(title))
+        menu = search[0]
+
+    return menu
+
+
+def main(title="Scripts", parent=None, objectName=None):
+    """Build the main scripts menu in Maya
+
+    Args:
+        title (str): name of the menu in the application
+
+        parent (QtWidgets.QtMenuBar): the parent object for the menu
+
+        objectName (str): custom objectName for scripts menu
+
+    Returns:
+        scriptsmenu.ScriptsMenu instance
+
+    """
+    hieromainbar = parent or _hiero_main_menubar()
+    try:
+        # check menu already exists
+        menu = find_scripts_menu(title, hieromainbar)
+        if not menu:
+            log.info("Attempting to build menu ...")
+            object_name = objectName or title.lower()
+            menu = scriptsmenu.ScriptsMenu(title=title,
+                                           parent=hieromainbar,
+                                           objectName=object_name)
+    except Exception as e:
+        log.error(e)
+        return
+
+    return menu

From 35a2c7dd13ddd3f0d780c60c0e492de676e92dcc Mon Sep 17 00:00:00 2001
From: Ophelie Abbonato <oabbonato@ws142.prs.vfx.int>
Date: Tue, 7 Jun 2022 17:27:33 +0200
Subject: [PATCH 014/289] revert vendor files

---
 .../common/scriptsmenu/launchforhiero.py      | 85 -------------------
 1 file changed, 85 deletions(-)
 delete mode 100644 openpype/vendor/python/common/scriptsmenu/launchforhiero.py

diff --git a/openpype/vendor/python/common/scriptsmenu/launchforhiero.py b/openpype/vendor/python/common/scriptsmenu/launchforhiero.py
deleted file mode 100644
index 3f8e726083..0000000000
--- a/openpype/vendor/python/common/scriptsmenu/launchforhiero.py
+++ /dev/null
@@ -1,85 +0,0 @@
-import logging
-
-import scriptsmenu
-from .vendor.Qt import QtWidgets
-
-log = logging.getLogger(__name__)
-
-
-def _hiero_main_window():
-    print("YEAAAAAAAAAAAAAAAAAAAH")
-    """Return Nuke's main window"""
-    for obj in QtWidgets.QApplication.topLevelWidgets():
-        if (obj.inherits('QMainWindow') and
-                obj.metaObject().className() == 'Foundry::UI::DockMainWindow'):
-            return obj
-    raise RuntimeError('Could not find HieroWindow instance')
-
-
-def _hiero_main_menubar():
-    """Retrieve the main menubar of the Nuke window"""
-    hiero_window = _hiero_main_window()
-    menubar = [i for i in hiero_window.children() if isinstance(
-        i,
-        QtWidgets.QMenuBar
-    )]
-
-    assert len(menubar) == 1, "Error, could not find menu bar!"
-    return menubar[0]
-
-
-def find_scripts_menu(title, parent):
-    """
-    Check if the menu exists with the given title in the parent
-
-    Args:
-        title (str): the title name of the scripts menu
-
-        parent (QtWidgets.QMenuBar): the menubar to check
-
-    Returns:
-        QtWidgets.QMenu or None
-
-    """
-
-    menu = None
-    search = [i for i in parent.children() if
-              isinstance(i, scriptsmenu.ScriptsMenu)
-              and i.title() == title]
-    if search:
-        assert len(search) < 2, ("Multiple instances of menu '{}' "
-                                 "in menu bar".format(title))
-        menu = search[0]
-
-    return menu
-
-
-def main(title="Scripts", parent=None, objectName=None):
-    """Build the main scripts menu in Maya
-
-    Args:
-        title (str): name of the menu in the application
-
-        parent (QtWidgets.QtMenuBar): the parent object for the menu
-
-        objectName (str): custom objectName for scripts menu
-
-    Returns:
-        scriptsmenu.ScriptsMenu instance
-
-    """
-    hieromainbar = parent or _hiero_main_menubar()
-    try:
-        # check menu already exists
-        menu = find_scripts_menu(title, hieromainbar)
-        if not menu:
-            log.info("Attempting to build menu ...")
-            object_name = objectName or title.lower()
-            menu = scriptsmenu.ScriptsMenu(title=title,
-                                           parent=hieromainbar,
-                                           objectName=object_name)
-    except Exception as e:
-        log.error(e)
-        return
-
-    return menu

From 4cf1edc3c39603be582d4e3a5013687d24718bf2 Mon Sep 17 00:00:00 2001
From: Ophelie Abbonato <oabbonato@ws142.prs.vfx.int>
Date: Tue, 7 Jun 2022 17:31:00 +0200
Subject: [PATCH 015/289] revert vendor files

---
 openpype/vendor/python/common/scriptsmenu/launchfornuke.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/vendor/python/common/scriptsmenu/launchfornuke.py b/openpype/vendor/python/common/scriptsmenu/launchfornuke.py
index 4f65a8e3ae..72302a79a6 100644
--- a/openpype/vendor/python/common/scriptsmenu/launchfornuke.py
+++ b/openpype/vendor/python/common/scriptsmenu/launchfornuke.py
@@ -6,7 +6,7 @@ def _nuke_main_window():
     """Return Nuke's main window"""
     for obj in QtWidgets.QApplication.topLevelWidgets():
         if (obj.inherits('QMainWindow') and
-                obj.metaObject().className() == 'Foundry::UI::DockMainWindow'):
+                    obj.metaObject().className() == 'Foundry::UI::DockMainWindow'):
             return obj
     raise RuntimeError('Could not find Nuke MainWindow instance')
 

From 5b83675a9b0684517d5bf0c0e5b47365bb1e2e67 Mon Sep 17 00:00:00 2001
From: Ophelie Abbonato <oabbonato@ws142.prs.vfx.int>
Date: Tue, 7 Jun 2022 17:54:18 +0200
Subject: [PATCH 016/289] change import in launch script

---
 openpype/hosts/hiero/api/launchforhiero.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/openpype/hosts/hiero/api/launchforhiero.py b/openpype/hosts/hiero/api/launchforhiero.py
index 3f8e726083..3d9328dc34 100644
--- a/openpype/hosts/hiero/api/launchforhiero.py
+++ b/openpype/hosts/hiero/api/launchforhiero.py
@@ -1,14 +1,13 @@
 import logging
 
 import scriptsmenu
-from .vendor.Qt import QtWidgets
+from .api.Qt import QtWidgets
 
 log = logging.getLogger(__name__)
 
 
 def _hiero_main_window():
-    print("YEAAAAAAAAAAAAAAAAAAAH")
-    """Return Nuke's main window"""
+    """Return Hiero's main window"""
     for obj in QtWidgets.QApplication.topLevelWidgets():
         if (obj.inherits('QMainWindow') and
                 obj.metaObject().className() == 'Foundry::UI::DockMainWindow'):
@@ -17,7 +16,7 @@ def _hiero_main_window():
 
 
 def _hiero_main_menubar():
-    """Retrieve the main menubar of the Nuke window"""
+    """Retrieve the main menubar of the Hiero window"""
     hiero_window = _hiero_main_window()
     menubar = [i for i in hiero_window.children() if isinstance(
         i,
@@ -55,7 +54,7 @@ def find_scripts_menu(title, parent):
 
 
 def main(title="Scripts", parent=None, objectName=None):
-    """Build the main scripts menu in Maya
+    """Build the main scripts menu in Hiero
 
     Args:
         title (str): name of the menu in the application

From 6cd20e110f6613b1f8c246eb0b489852f3d9507e Mon Sep 17 00:00:00 2001
From: Ophelie Abbonato <oabbonato@ws142.prs.vfx.int>
Date: Tue, 7 Jun 2022 18:03:05 +0200
Subject: [PATCH 017/289] change path launch script

---
 openpype/hosts/hiero/api/launchforhiero.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/hosts/hiero/api/launchforhiero.py b/openpype/hosts/hiero/api/launchforhiero.py
index 3d9328dc34..8b63b47c10 100644
--- a/openpype/hosts/hiero/api/launchforhiero.py
+++ b/openpype/hosts/hiero/api/launchforhiero.py
@@ -1,7 +1,7 @@
 import logging
 
 import scriptsmenu
-from .api.Qt import QtWidgets
+from .openpype.vendor.python.common.scriptsmenu.vendor.Qt import QtWidgets
 
 log = logging.getLogger(__name__)
 

From 6741b9e6336eb4a1b5d1fc837f021c4d45942b5d Mon Sep 17 00:00:00 2001
From: Ophelie Abbonato <oabbonato@ws142.prs.vfx.int>
Date: Wed, 8 Jun 2022 17:33:10 +0200
Subject: [PATCH 018/289] modif launch menu hiero

---
 openpype/hosts/hiero/api/launchforhiero.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/openpype/hosts/hiero/api/launchforhiero.py b/openpype/hosts/hiero/api/launchforhiero.py
index 8b63b47c10..5c230eb9fe 100644
--- a/openpype/hosts/hiero/api/launchforhiero.py
+++ b/openpype/hosts/hiero/api/launchforhiero.py
@@ -1,7 +1,8 @@
 import logging
 
-import scriptsmenu
-from .openpype.vendor.python.common.scriptsmenu.vendor.Qt import QtWidgets
+from openpype.vendor.python.common.scriptsmenu import scriptsmenu
+from openpype.vendor.python.common.scriptsmenu.vendor.Qt import QtWidgets
+
 
 log = logging.getLogger(__name__)
 

From 373524b9dfd40592be4904694681c2ab508b5653 Mon Sep 17 00:00:00 2001
From: Ophelie Abbonato <oabbonato@ws142.prs.vfx.int>
Date: Wed, 8 Jun 2022 17:33:40 +0200
Subject: [PATCH 019/289] modif menu hiero

---
 openpype/hosts/hiero/api/menu.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openpype/hosts/hiero/api/menu.py b/openpype/hosts/hiero/api/menu.py
index 9e999da2f6..412f08272e 100644
--- a/openpype/hosts/hiero/api/menu.py
+++ b/openpype/hosts/hiero/api/menu.py
@@ -144,8 +144,9 @@ def menu_install():
 
 def add_scripts_menu():
     try:
-        from scriptsmenu import launchforhiero
+        from . import launchforhiero
     except ImportError:
+
         log.warning(
             "Skipping studio.menu install, because "
             "'scriptsmenu' module seems unavailable."

From 1eb3a55cc3610e7f12b1fa28e61deb942ee57cf4 Mon Sep 17 00:00:00 2001
From: Ophelie Abbonato <oabbonato@ws142.prs.vfx.int>
Date: Wed, 15 Jun 2022 09:58:56 +0200
Subject: [PATCH 020/289] change name string

---
 .../entities/schemas/projects_schema/schema_project_hiero.json  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_hiero.json b/openpype/settings/entities/schemas/projects_schema/schema_project_hiero.json
index 39721c641a..3108d2197e 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_hiero.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_hiero.json
@@ -209,7 +209,7 @@
         },
         {
             "type": "schema",
-            "name": "schema_maya_scriptsmenu"
+            "name": "schema_scriptsmenu"
         }
     ]
 }

From 569d7c98fc7eaed14bb20ea86c5ea78c1d2941d2 Mon Sep 17 00:00:00 2001
From: Allan Ihsan <allan.ihsan@gmail.com>
Date: Tue, 21 Jun 2022 16:06:53 +0300
Subject: [PATCH 021/289] Add hardware fog keys to Schema

---
 .../schemas/schema_maya_capture.json          | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
index d6b81c8687..a5e1cb45d9 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
@@ -224,6 +224,42 @@
                             "key": "twoSidedLighting",
                             "label": "Two Sided Lighting"
                         },
+                        {
+                            "type": "splitter"
+                        },
+                        {
+                            "type": "boolean",
+                            "key": "hwFogEnable",
+                            "label": "Enable Hardware Fog"
+                        },
+                        {
+                            "type": "number",
+                            "key": "hwFogStart",
+                            "label": "Hardware Fog Start"
+                        },
+                        {
+                            "type": "number",
+                            "key": "hwFogEnd",
+                            "label": "Hardware Fog End"
+                        },
+                        {
+                            "type": "number",
+                            "key": "hwFogAlpha",
+                            "label": "Hardware Fog Alpha"
+                        },
+                        {
+                            "type": "number",
+                            "key": "hwFogFalloff",
+                            "label": "Hardware Fog Falloff"
+                        },
+                        {
+                            "type": "number",
+                            "key": "hwFogDensity",
+                            "label": "Hardware Fog Density"
+                        },
+                        {
+                            "type": "splitter"
+                        },
                         {
                             "type": "boolean",
                             "key": "ssaoEnable",

From cb6e093ee33be1aa9af97dca37e07cad7387b4af Mon Sep 17 00:00:00 2001
From: Allan Ihsan <allan.ihsan@gmail.com>
Date: Tue, 21 Jun 2022 16:25:11 +0300
Subject: [PATCH 022/289] Add SSAO options to schema

---
 .../schemas/schema_maya_capture.json          | 42 ++++++++++++++++++-
 1 file changed, 40 insertions(+), 2 deletions(-)

diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
index a5e1cb45d9..919c847a9b 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
@@ -227,6 +227,34 @@
                         {
                             "type": "splitter"
                         },
+                        {
+                            "type": "boolean",
+                            "key": "ssaoEnable",
+                            "label": "Screen Space Ambient Occlusion"
+                        },
+                        {
+                            "type": "number",
+                            "key": "ssaoAmount",
+                            "label": "SSAO Amount"
+                        },
+                        {
+                            "type": "number",
+                            "key": "ssaoFilterRadius",
+                            "label": "SSAO Filter Radius"
+                        },
+                        {
+                            "type": "number",
+                            "key": "ssaoRadius",
+                            "label": "SSAO Radius"
+                        },
+                        {
+                            "type": "number",
+                            "key": "ssaoSamples",
+                            "label": "SSAO Samples"
+                        },
+                        {
+                            "type": "splitter"
+                        },
                         {
                             "type": "boolean",
                             "key": "hwFogEnable",
@@ -262,8 +290,18 @@
                         },
                         {
                             "type": "boolean",
-                            "key": "ssaoEnable",
-                            "label": "Screen Space Ambient Occlusion"
+                            "key": "motionBlurEnable",
+                            "label": "Enable Motion Blur"
+                        },
+                        {
+                            "type": "number",
+                            "key": "motionBlurShutterOpenFraction",
+                            "label": "Shutter Open Fraction"
+                        },
+                        {
+                            "type": "number",
+                            "key": "hwFogFalloff",
+                            "label": "Hardware Fog Falloff"
                         },
                         {
                             "type": "splitter"

From 697916c3cdba015b68f0376902422606ac27f9fe Mon Sep 17 00:00:00 2001
From: Allan Ihsan <allan.ihsan@gmail.com>
Date: Tue, 21 Jun 2022 17:03:10 +0300
Subject: [PATCH 023/289] Append enum for fog falloff.

---
 .../schemas/schema_maya_capture.json          | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
index 919c847a9b..caf001f7e1 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
@@ -260,6 +260,16 @@
                             "key": "hwFogEnable",
                             "label": "Enable Hardware Fog"
                         },
+                        {
+                            "type": "enum",
+                            "key": "hwFogFalloff",
+                            "label": "Hardware Fog Falloff",
+                            "enum_items": [
+                                { "0": "Linear"},
+                                { "1": "Exponential"},
+                                { "2": "Exponential Squared"}
+                            ]
+                        },
                         {
                             "type": "number",
                             "key": "hwFogStart",
@@ -275,11 +285,6 @@
                             "key": "hwFogAlpha",
                             "label": "Hardware Fog Alpha"
                         },
-                        {
-                            "type": "number",
-                            "key": "hwFogFalloff",
-                            "label": "Hardware Fog Falloff"
-                        },
                         {
                             "type": "number",
                             "key": "hwFogDensity",
@@ -298,11 +303,6 @@
                             "key": "motionBlurShutterOpenFraction",
                             "label": "Shutter Open Fraction"
                         },
-                        {
-                            "type": "number",
-                            "key": "hwFogFalloff",
-                            "label": "Hardware Fog Falloff"
-                        },
                         {
                             "type": "splitter"
                         },

From ed0ba7e3ab306f1674def5f7cc69666cb96e8dc6 Mon Sep 17 00:00:00 2001
From: Allan Ihsan <allan.ihsan@gmail.com>
Date: Tue, 21 Jun 2022 17:39:46 +0300
Subject: [PATCH 024/289] Append Antialiasing and MotionBlur Sampling

---
 .../schemas/schema_maya_capture.json             | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
index caf001f7e1..fa5be19cda 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
@@ -201,6 +201,14 @@
                             "label": "Texture Clamp Resolution",
                             "decimal": 0
                         },
+                        {
+                            "type": "splitter"
+                        },
+                        {
+                            "type": "boolean",
+                            "key": "lineAAEnable",
+                            "label": "Smooth Wireframe"
+                        },
                         {
                             "type": "number",
                             "key": "multiSample",
@@ -209,6 +217,9 @@
                             "minimum": 0,
                             "maximum": 32
                         },
+                        {
+                            "type": "splitter"
+                        },
                         {
                             "type": "boolean",
                             "key": "shadows",
@@ -303,6 +314,11 @@
                             "key": "motionBlurShutterOpenFraction",
                             "label": "Shutter Open Fraction"
                         },
+                        {
+                            "type": "number",
+                            "key": "motionBlurSampleCount",
+                            "label": "Sample Count"
+                        },
                         {
                             "type": "splitter"
                         },

From de6bd72c2ed1ef40b3cecfa4a7caed9cf93937ea Mon Sep 17 00:00:00 2001
From: Allan Ihsan <allan.ihsan@gmail.com>
Date: Tue, 21 Jun 2022 18:01:49 +0300
Subject: [PATCH 025/289] Appen defaults.

---
 .../settings/defaults/project_settings/maya.json   | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json
index 69fbf5bfdf..6780921001 100644
--- a/openpype/settings/defaults/project_settings/maya.json
+++ b/openpype/settings/defaults/project_settings/maya.json
@@ -491,11 +491,25 @@
                     "override_viewport_options": true,
                     "displayLights": "default",
                     "textureMaxResolution": 1024,
+                    "lineAAEnable": true,
                     "multiSample": 4,
                     "shadows": true,
                     "textures": true,
                     "twoSidedLighting": true,
                     "ssaoEnable": true,
+                    "ssaoAmount": 0,
+                    "ssaoFilterRadius": 0,
+                    "ssaoRadius": 0,
+                    "ssaoSamples": 0,
+                    "hwFogEnable": true,
+                    "hwFogFalloff": "0",
+                    "hwFogStart": 0,
+                    "hwFogEnd": 0,
+                    "hwFogAlpha": 0,
+                    "hwFogDensity": 0,
+                    "motionBlurEnable": true,
+                    "motionBlurShutterOpenFraction": 0,
+                    "motionBlurSampleCount": 0,
                     "cameras": false,
                     "clipGhosts": false,
                     "controlVertices": false,

From 269c752bfc9ff109b8a75e57b3f78349d7bf1b75 Mon Sep 17 00:00:00 2001
From: Allan Ihsan <allan.ihsan@gmail.com>
Date: Tue, 21 Jun 2022 18:01:49 +0300
Subject: [PATCH 026/289] Append settings defaults.

---
 .../settings/defaults/project_settings/maya.json   | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json
index 69fbf5bfdf..6780921001 100644
--- a/openpype/settings/defaults/project_settings/maya.json
+++ b/openpype/settings/defaults/project_settings/maya.json
@@ -491,11 +491,25 @@
                     "override_viewport_options": true,
                     "displayLights": "default",
                     "textureMaxResolution": 1024,
+                    "lineAAEnable": true,
                     "multiSample": 4,
                     "shadows": true,
                     "textures": true,
                     "twoSidedLighting": true,
                     "ssaoEnable": true,
+                    "ssaoAmount": 0,
+                    "ssaoFilterRadius": 0,
+                    "ssaoRadius": 0,
+                    "ssaoSamples": 0,
+                    "hwFogEnable": true,
+                    "hwFogFalloff": "0",
+                    "hwFogStart": 0,
+                    "hwFogEnd": 0,
+                    "hwFogAlpha": 0,
+                    "hwFogDensity": 0,
+                    "motionBlurEnable": true,
+                    "motionBlurShutterOpenFraction": 0,
+                    "motionBlurSampleCount": 0,
                     "cameras": false,
                     "clipGhosts": false,
                     "controlVertices": false,

From 759cea424c30b06960fc7a247055b96c58ab0eea Mon Sep 17 00:00:00 2001
From: Allan Ihsan <allan.ihsan@gmail.com>
Date: Wed, 22 Jun 2022 10:45:14 +0300
Subject: [PATCH 027/289] Start separating "lineAAEnable"

---
 openpype/vendor/python/common/capture.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/openpype/vendor/python/common/capture.py b/openpype/vendor/python/common/capture.py
index 6b4c40a6e8..ae3a0d5cc1 100644
--- a/openpype/vendor/python/common/capture.py
+++ b/openpype/vendor/python/common/capture.py
@@ -361,7 +361,6 @@ Viewport2Options = {
     "floatingPointRTFormat": 1,
     "gammaCorrectionEnable": False,
     "gammaValue": 2.2,
-    "lineAAEnable": False,
     "maxHardwareLights": 8,
     "motionBlurEnable": False,
     "motionBlurSampleCount": 8,
@@ -383,6 +382,10 @@ Viewport2Options = {
     "vertexAnimationCache": 0
 }
 
+Viewport2OAAoption = {
+    "lineAAenable": False,
+}
+
 
 def apply_view(panel, **options):
     """Apply options to panel"""
@@ -496,6 +499,13 @@ def parse_view(panel):
         except ValueError:
             continue
 
+    for key in Viewport2OAAoption.keys():
+        attr = "hardwareRenderingGlobals.{0}".format(key)
+        try:
+            viewport2_options[key] = cmds.getAttr(attr)
+        except ValueError:
+            continue
+
     return {
         "camera": camera,
         "display_options": display_options,

From 277682c03dcdbed093905188def33545f8a9b24a Mon Sep 17 00:00:00 2001
From: Allan Ihsan <allan.ihsan@gmail.com>
Date: Wed, 22 Jun 2022 10:56:49 +0300
Subject: [PATCH 028/289] Revert "Start separating "lineAAEnable""

This reverts commit 759cea424c30b06960fc7a247055b96c58ab0eea.
---
 openpype/vendor/python/common/capture.py | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/openpype/vendor/python/common/capture.py b/openpype/vendor/python/common/capture.py
index ae3a0d5cc1..6b4c40a6e8 100644
--- a/openpype/vendor/python/common/capture.py
+++ b/openpype/vendor/python/common/capture.py
@@ -361,6 +361,7 @@ Viewport2Options = {
     "floatingPointRTFormat": 1,
     "gammaCorrectionEnable": False,
     "gammaValue": 2.2,
+    "lineAAEnable": False,
     "maxHardwareLights": 8,
     "motionBlurEnable": False,
     "motionBlurSampleCount": 8,
@@ -382,10 +383,6 @@ Viewport2Options = {
     "vertexAnimationCache": 0
 }
 
-Viewport2OAAoption = {
-    "lineAAenable": False,
-}
-
 
 def apply_view(panel, **options):
     """Apply options to panel"""
@@ -499,13 +496,6 @@ def parse_view(panel):
         except ValueError:
             continue
 
-    for key in Viewport2OAAoption.keys():
-        attr = "hardwareRenderingGlobals.{0}".format(key)
-        try:
-            viewport2_options[key] = cmds.getAttr(attr)
-        except ValueError:
-            continue
-
     return {
         "camera": camera,
         "display_options": display_options,

From f43042eb169ad9214ad01511a3c4dee5fe469083 Mon Sep 17 00:00:00 2001
From: Allan Ihsan <allan.ihsan@gmail.com>
Date: Wed, 22 Jun 2022 15:12:40 +0300
Subject: [PATCH 029/289] Change hwFogEnable into fogging flag.

---
 .../projects_schema/schemas/schema_maya_capture.json | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
index fa5be19cda..217aa947fc 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
@@ -268,7 +268,7 @@
                         },
                         {
                             "type": "boolean",
-                            "key": "hwFogEnable",
+                            "key": "fogging",
                             "label": "Enable Hardware Fog"
                         },
                         {
@@ -304,21 +304,11 @@
                         {
                             "type": "splitter"
                         },
-                        {
-                            "type": "boolean",
-                            "key": "motionBlurEnable",
-                            "label": "Enable Motion Blur"
-                        },
                         {
                             "type": "number",
                             "key": "motionBlurShutterOpenFraction",
                             "label": "Shutter Open Fraction"
                         },
-                        {
-                            "type": "number",
-                            "key": "motionBlurSampleCount",
-                            "label": "Sample Count"
-                        },
                         {
                             "type": "splitter"
                         },

From 38522154e78c22cd0037dbbe91c2ea1f820b057c Mon Sep 17 00:00:00 2001
From: Allan Ihsan <allan.ihsan@gmail.com>
Date: Wed, 22 Jun 2022 16:45:51 +0300
Subject: [PATCH 030/289] Remove flags

---
 .../defaults/project_settings/maya.json       |  9 +------
 .../schemas/schema_maya_capture.json          | 25 -------------------
 2 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json
index 0f40651c35..f9201286ab 100644
--- a/openpype/settings/defaults/project_settings/maya.json
+++ b/openpype/settings/defaults/project_settings/maya.json
@@ -496,25 +496,18 @@
                     "override_viewport_options": true,
                     "displayLights": "default",
                     "textureMaxResolution": 1024,
-                    "lineAAEnable": true,
                     "multiSample": 4,
                     "shadows": true,
                     "textures": true,
                     "twoSidedLighting": true,
                     "ssaoEnable": true,
-                    "ssaoAmount": 0,
                     "ssaoFilterRadius": 0,
-                    "ssaoRadius": 0,
                     "ssaoSamples": 0,
-                    "hwFogEnable": true,
+                    "fogging": true,
                     "hwFogFalloff": "0",
                     "hwFogStart": 0,
                     "hwFogEnd": 0,
                     "hwFogAlpha": 0,
-                    "hwFogDensity": 0,
-                    "motionBlurEnable": true,
-                    "motionBlurShutterOpenFraction": 0,
-                    "motionBlurSampleCount": 0,
                     "cameras": false,
                     "clipGhosts": false,
                     "controlVertices": false,
diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
index 217aa947fc..c7842e5031 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
@@ -204,11 +204,6 @@
                         {
                             "type": "splitter"
                         },
-                        {
-                            "type": "boolean",
-                            "key": "lineAAEnable",
-                            "label": "Smooth Wireframe"
-                        },
                         {
                             "type": "number",
                             "key": "multiSample",
@@ -243,21 +238,11 @@
                             "key": "ssaoEnable",
                             "label": "Screen Space Ambient Occlusion"
                         },
-                        {
-                            "type": "number",
-                            "key": "ssaoAmount",
-                            "label": "SSAO Amount"
-                        },
                         {
                             "type": "number",
                             "key": "ssaoFilterRadius",
                             "label": "SSAO Filter Radius"
                         },
-                        {
-                            "type": "number",
-                            "key": "ssaoRadius",
-                            "label": "SSAO Radius"
-                        },
                         {
                             "type": "number",
                             "key": "ssaoSamples",
@@ -296,19 +281,9 @@
                             "key": "hwFogAlpha",
                             "label": "Hardware Fog Alpha"
                         },
-                        {
-                            "type": "number",
-                            "key": "hwFogDensity",
-                            "label": "Hardware Fog Density"
-                        },
                         {
                             "type": "splitter"
                         },
-                        {
-                            "type": "number",
-                            "key": "motionBlurShutterOpenFraction",
-                            "label": "Shutter Open Fraction"
-                        },
                         {
                             "type": "splitter"
                         },

From 137ef3e22bbe9495e69a4379c3f85f367f3b4a7d Mon Sep 17 00:00:00 2001
From: Allan Ihsan <allan.ihsan@gmail.com>
Date: Wed, 22 Jun 2022 17:35:51 +0300
Subject: [PATCH 031/289] Remove keys that fail.

---
 .../defaults/project_settings/maya.json       |  6 ---
 .../schemas/schema_maya_capture.json          | 38 -------------------
 2 files changed, 44 deletions(-)

diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json
index f9201286ab..8494989556 100644
--- a/openpype/settings/defaults/project_settings/maya.json
+++ b/openpype/settings/defaults/project_settings/maya.json
@@ -501,13 +501,7 @@
                     "textures": true,
                     "twoSidedLighting": true,
                     "ssaoEnable": true,
-                    "ssaoFilterRadius": 0,
-                    "ssaoSamples": 0,
                     "fogging": true,
-                    "hwFogFalloff": "0",
-                    "hwFogStart": 0,
-                    "hwFogEnd": 0,
-                    "hwFogAlpha": 0,
                     "cameras": false,
                     "clipGhosts": false,
                     "controlVertices": false,
diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
index c7842e5031..ace9fc22da 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
@@ -238,16 +238,6 @@
                             "key": "ssaoEnable",
                             "label": "Screen Space Ambient Occlusion"
                         },
-                        {
-                            "type": "number",
-                            "key": "ssaoFilterRadius",
-                            "label": "SSAO Filter Radius"
-                        },
-                        {
-                            "type": "number",
-                            "key": "ssaoSamples",
-                            "label": "SSAO Samples"
-                        },
                         {
                             "type": "splitter"
                         },
@@ -256,34 +246,6 @@
                             "key": "fogging",
                             "label": "Enable Hardware Fog"
                         },
-                        {
-                            "type": "enum",
-                            "key": "hwFogFalloff",
-                            "label": "Hardware Fog Falloff",
-                            "enum_items": [
-                                { "0": "Linear"},
-                                { "1": "Exponential"},
-                                { "2": "Exponential Squared"}
-                            ]
-                        },
-                        {
-                            "type": "number",
-                            "key": "hwFogStart",
-                            "label": "Hardware Fog Start"
-                        },
-                        {
-                            "type": "number",
-                            "key": "hwFogEnd",
-                            "label": "Hardware Fog End"
-                        },
-                        {
-                            "type": "number",
-                            "key": "hwFogAlpha",
-                            "label": "Hardware Fog Alpha"
-                        },
-                        {
-                            "type": "splitter"
-                        },
                         {
                             "type": "splitter"
                         },

From 5b037244fe4e43c7a738e9fe2ace5c6f1883e72e Mon Sep 17 00:00:00 2001
From: Allan Ihsan <allan.ihsan@gmail.com>
Date: Thu, 23 Jun 2022 11:36:22 +0300
Subject: [PATCH 032/289] Append capture schema.

---
 .../schemas/schema_maya_capture.json          | 71 ++++++++++++++++++-
 1 file changed, 70 insertions(+), 1 deletion(-)

diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
index ace9fc22da..f8dba0be4b 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
@@ -238,14 +238,83 @@
                             "key": "ssaoEnable",
                             "label": "Screen Space Ambient Occlusion"
                         },
+                        {
+                            "type": "number",
+                            "key": "ssaoAmount",
+                            "label": "SSAO Amount"
+                        },
+                        {
+                            "type": "number",
+                            "key": "ssaoRadius",
+                            "label": "SSAO Radius"
+                        },
+                        {
+                            "type": "number",
+                            "key": "ssaoFilterRadius",
+                            "label": "SSAO Filter Radius"
+                        },
+                        {
+                            "type": "number",
+                            "key": "ssaoSamples",
+                            "label": "SSAO Samples",
+                            "decimal": 0,
+                            "minimum": 8,
+                            "maximum": 32
+                        },
                         {
                             "type": "splitter"
                         },
                         {
                             "type": "boolean",
-                            "key": "fogging",
+                            "key": "hwFogEnable",
                             "label": "Enable Hardware Fog"
                         },
+                        {
+                            "type": "enum",
+                            "key": "hwFogFalloff",
+                            "label": "Hardware Falloff",
+                            "enum_items": [
+                                { "0": "Linear"},
+                                { "1": "Exponential"},
+                                { "2": "Exponential Squared"}
+                            ]
+                        },
+                        {
+                            "type": "number",
+                            "key": "hwFogStart",
+                            "label": "Fog Start"
+                        },
+                        {
+                            "type": "number",
+                            "key": "hwFogEnd",
+                            "label": "Fog End"
+                        },
+                        {
+                            "type": "number",
+                            "key": "hwFogAlpha",
+                            "label": "Enable Fog Alpha"
+                        },
+                        {
+                            "type": "splitter"
+                        },
+                        {
+                            "type": "boolean",
+                            "key": "motionBlurEnable",
+                            "label": "Enable Motion Blur"
+                        },
+                        {
+                            "type": "number",
+                            "key": "motionBlurSampleCount",
+                            "label": "Motion Blur Sample Count",
+                            "decimal": 0,
+                            "minimum": 8,
+                            "maximum": 32
+                        },
+                        {
+                            "type": "number",
+                            "key": "motionBlurShutterOpenFraction",
+                            "label": "Shutter Open Fraction"
+                        },
                         {
                             "type": "splitter"
                         },

From 4a521ec081e22b226655f49a41a38dbe31ef8f49 Mon Sep 17 00:00:00 2001
From: Allan Ihsan <allan.ihsan@gmail.com>
Date: Thu, 23 Jun 2022 11:39:23 +0300
Subject: [PATCH 033/289] Adjust

---
 .../settings/defaults/project_settings/maya.json    | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json
index 8494989556..437adbc1f0 100644
--- a/openpype/settings/defaults/project_settings/maya.json
+++ b/openpype/settings/defaults/project_settings/maya.json
@@ -501,7 +501,18 @@
                     "textures": true,
                     "twoSidedLighting": true,
                     "ssaoEnable": true,
-                    "fogging": true,
+                    "ssaoAmount": 0,
+                    "ssaoRadius": 0,
+                    "ssaoFilterRadius": 0,
+                    "ssaoSamples": 8,
+                    "hwFogEnable": true,
+                    "hwFogFalloff": "0",
+                    "hwFogStart": 0,
+                    "hwFogEnd": 0,
+                    "hwFogAlpha": 0,
+                    "motionBlurEnable": true,
+                    "motionBlurSampleCount": 8,
+                    "motionBlurShutterOpenFraction": 0,
                     "cameras": false,
                     "clipGhosts": false,
                     "controlVertices": false,

From ea6b098bb2f86d027815e8e685ff5932a85fcc73 Mon Sep 17 00:00:00 2001
From: Allan Ihsan <allan.ihsan@gmail.com>
Date: Thu, 23 Jun 2022 11:40:01 +0300
Subject: [PATCH 034/289] Adjust `load_capture_preset()` to work with
 additional settings.

---
 openpype/hosts/maya/api/lib.py | 62 +++++++++++++++++++++++++++++++++-
 1 file changed, 61 insertions(+), 1 deletion(-)

diff --git a/openpype/hosts/maya/api/lib.py b/openpype/hosts/maya/api/lib.py
index de9a9da911..bd403ad340 100644
--- a/openpype/hosts/maya/api/lib.py
+++ b/openpype/hosts/maya/api/lib.py
@@ -2525,8 +2525,19 @@ def load_capture_preset(data=None):
         if key == 'ssaoEnable':
             if preset[id][key] is True:
                 temp_options2['ssaoEnable'] = True
+                temp_options2['ssaoSamples'] = preset[id][key]
             else:
                 temp_options2['ssaoEnable'] = False
+                temp_options2['ssaoSamples'] = preset[id][key]
+
+        if key == 'ssaoAmount':
+            temp_options2['ssaoAmount'] = preset[id][key]
+
+        if key == 'ssaoRadius':
+            temp_options2['ssaoRadius'] = preset[id][key]
+
+        if key == 'ssaoFilterRadius':
+            temp_options2['ssaoFilterRadius'] = preset[id][key]
 
         if key == 'alphaCut':
             temp_options2['transparencyAlgorithm'] = 5
@@ -2535,6 +2546,42 @@ def load_capture_preset(data=None):
         if key == 'headsUpDisplay':
             temp_options['headsUpDisplay'] = True
 
+        if key == 'hwFogEnable':
+            if preset[id][key] is True:
+                temp_options2['hwFogEnable'] = True
+            else:
+                temp_options2['hwFogEnable'] = False
+
+        if key == 'hwFogStart':
+            temp_options2['hwFogStart'] = preset[id][key]
+
+        if key == 'hwFogEnd':
+            temp_options2['hwFogEnd'] = preset[id][key]
+
+        if key == 'hwFogAlpha':
+            temp_options2['hwFogAlpha'] = preset[id][key]
+
+        if key == 'hwFogFalloff':
+            temp_options2['hwFogFalloff'] = preset[id][key]
+
+        if key == 'motionBlurEnable':
+            if preset[id][key] is True:
+                temp_options2['motionBlurEnable'] = True
+            else:
+                temp_options2['motionBlurEnable'] = False
+
+        if key == 'motionBlurSampleCount':
+            temp_options2['motionBlurSampleCount'] = preset[id][key]
+
+        if key == 'motionBlurShutterOpenFraction':
+            temp_options2['motionBlurShutterOpenFraction'] = preset[id][key]
+
+        if key == 'lineAAEnable':
+            if preset[id][key] is True:
+                temp_options2['lineAAEnable'] = True
+            else:
+                temp_options2['lineAAEnable'] = False
+
         else:
             temp_options[str(key)] = preset[id][key]
 
@@ -2544,7 +2591,20 @@ def load_capture_preset(data=None):
                 'gpuCacheDisplayFilter',
                 'multiSample',
                 'ssaoEnable',
-                'textureMaxResolution'
+                'ssaoSamples',
+                'ssaoAmount',
+                'ssaoFilterRadius',
+                'ssaoRadius',
+                'hwFogEnable',
+                'hwFogStart',
+                'hwFogEnd',
+                'hwFogAlpha',
+                'hwFogFalloff',
+                'textureMaxResolution',
+                'motionBlurEnable',
+                'motionBlurSampleCount',
+                'motionBlurShutterOpenFraction',
+                'lineAAEnable',
                 ]:
         temp_options.pop(key, None)
 

From f5e3f56981660fd6131cf80d802cb6ed382a6915 Mon Sep 17 00:00:00 2001
From: Allan Ihsan <allan.ihsan@gmail.com>
Date: Thu, 23 Jun 2022 12:31:50 +0300
Subject: [PATCH 035/289] Append AA flag as schema key.

---
 .../schemas/schema_maya_capture.json                | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
index f8dba0be4b..2c5aed8a67 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
@@ -233,6 +233,14 @@
                         {
                             "type": "splitter"
                         },
+                        {
+                            "type": "boolean",
+                            "key": "lineAAEnable",
+                            "label": "Enable Anti-Aliasing"
+                        },
+                        {
+                            "type": "splitter"
+                        },
                         {
                             "type": "boolean",
                             "key": "ssaoEnable",
@@ -313,7 +321,10 @@
                         {
                             "type": "number",
                             "key": "motionBlurShutterOpenFraction",
-                            "label": "Shutter Open Fraction"
+                            "label": "Shutter Open Fraction",
+                            "decimal": 3,
+                            "minimum": 0.01,
+                            "maximum": 32
                         },
                         {
                             "type": "splitter"

From f497956c5fc31657f9798137c303b359004046c9 Mon Sep 17 00:00:00 2001
From: Allan Ihsan <allan.ihsan@gmail.com>
Date: Thu, 23 Jun 2022 12:31:58 +0300
Subject: [PATCH 036/289] Adjust schema defaults.

---
 openpype/settings/defaults/project_settings/maya.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json
index 437adbc1f0..48a34068db 100644
--- a/openpype/settings/defaults/project_settings/maya.json
+++ b/openpype/settings/defaults/project_settings/maya.json
@@ -500,6 +500,7 @@
                     "shadows": true,
                     "textures": true,
                     "twoSidedLighting": true,
+                    "lineAAEnable": true,
                     "ssaoEnable": true,
                     "ssaoAmount": 0,
                     "ssaoRadius": 0,
@@ -512,7 +513,7 @@
                     "hwFogAlpha": 0,
                     "motionBlurEnable": true,
                     "motionBlurSampleCount": 8,
-                    "motionBlurShutterOpenFraction": 0,
+                    "motionBlurShutterOpenFraction": 0.01,
                     "cameras": false,
                     "clipGhosts": false,
                     "controlVertices": false,

From 98b912f0b36634c345faaf0e617385460a402af1 Mon Sep 17 00:00:00 2001
From: Allan Ihsan <allan.ihsan@gmail.com>
Date: Thu, 23 Jun 2022 12:32:15 +0300
Subject: [PATCH 037/289] Change key check placement.

---
 openpype/hosts/maya/api/lib.py | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/openpype/hosts/maya/api/lib.py b/openpype/hosts/maya/api/lib.py
index bd403ad340..12cbac2a32 100644
--- a/openpype/hosts/maya/api/lib.py
+++ b/openpype/hosts/maya/api/lib.py
@@ -2525,10 +2525,11 @@ def load_capture_preset(data=None):
         if key == 'ssaoEnable':
             if preset[id][key] is True:
                 temp_options2['ssaoEnable'] = True
-                temp_options2['ssaoSamples'] = preset[id][key]
             else:
                 temp_options2['ssaoEnable'] = False
-                temp_options2['ssaoSamples'] = preset[id][key]
+
+        if key == 'ssaoSamples':
+            temp_options2['ssaoSamples'] = preset[id][key]
 
         if key == 'ssaoAmount':
             temp_options2['ssaoAmount'] = preset[id][key]
@@ -2549,20 +2550,16 @@ def load_capture_preset(data=None):
         if key == 'hwFogEnable':
             if preset[id][key] is True:
                 temp_options2['hwFogEnable'] = True
+                temp_options2['hwFogStart'] = preset[id][key]
+                temp_options2['hwFogEnd'] = preset[id][key]
+                temp_options2['hwFogAlpha'] = preset[id][key]
+                temp_options2['hwFogFalloff'] = preset[id][key]
             else:
                 temp_options2['hwFogEnable'] = False
-
-        if key == 'hwFogStart':
-            temp_options2['hwFogStart'] = preset[id][key]
-
-        if key == 'hwFogEnd':
-            temp_options2['hwFogEnd'] = preset[id][key]
-
-        if key == 'hwFogAlpha':
-            temp_options2['hwFogAlpha'] = preset[id][key]
-
-        if key == 'hwFogFalloff':
-            temp_options2['hwFogFalloff'] = preset[id][key]
+                temp_options2['hwFogStart'] = preset[id][key]
+                temp_options2['hwFogEnd'] = preset[id][key]
+                temp_options2['hwFogAlpha'] = preset[id][key]
+                temp_options2['hwFogFalloff'] = preset[id][key]
 
         if key == 'motionBlurEnable':
             if preset[id][key] is True:

From ae897ed2901de70da53ff16bfc5a6d3fa1bc1432 Mon Sep 17 00:00:00 2001
From: Allan Ihsan <allan.ihsan@gmail.com>
Date: Thu, 23 Jun 2022 13:07:38 +0300
Subject: [PATCH 038/289] Append Fog Color Key to schema.

---
 .../schemas/projects_schema/schemas/schema_maya_capture.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
index 2c5aed8a67..08207824b1 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
@@ -302,6 +302,11 @@
                             "key": "hwFogAlpha",
                             "label": "Enable Fog Alpha"
                         },
+                        {
+                            "type": "color",
+                            "key": "hwFogColor",
+                            "label": "Fog Color"
+                        },
                         {
                             "type": "splitter"
                         },

From 4c1bba042d69bfbc807f2aea81a004fe27593163 Mon Sep 17 00:00:00 2001
From: Allan Ihsan <allan.ihsan@gmail.com>
Date: Thu, 23 Jun 2022 13:08:13 +0300
Subject: [PATCH 039/289] Append Fog Color to functionk, fix loop bug.

---
 openpype/hosts/maya/api/lib.py | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/openpype/hosts/maya/api/lib.py b/openpype/hosts/maya/api/lib.py
index 12cbac2a32..4b76757e97 100644
--- a/openpype/hosts/maya/api/lib.py
+++ b/openpype/hosts/maya/api/lib.py
@@ -2550,16 +2550,24 @@ def load_capture_preset(data=None):
         if key == 'hwFogEnable':
             if preset[id][key] is True:
                 temp_options2['hwFogEnable'] = True
-                temp_options2['hwFogStart'] = preset[id][key]
-                temp_options2['hwFogEnd'] = preset[id][key]
-                temp_options2['hwFogAlpha'] = preset[id][key]
-                temp_options2['hwFogFalloff'] = preset[id][key]
+
             else:
                 temp_options2['hwFogEnable'] = False
-                temp_options2['hwFogStart'] = preset[id][key]
-                temp_options2['hwFogEnd'] = preset[id][key]
-                temp_options2['hwFogAlpha'] = preset[id][key]
-                temp_options2['hwFogFalloff'] = preset[id][key]
+
+        if key == 'hwFogStart':
+            temp_options2['hwFogStart'] = preset[id][key]
+
+        if key == 'hwFogEnd':
+            temp_options2['hwFogEnd'] = preset[id][key]
+
+        if key == 'hwFogAlpha':
+            temp_options2['hwFogAlpha'] = preset[id][key]
+
+        if key == 'hwFogFalloff':
+            temp_options2['hwFogFalloff'] = int(preset[id][key])
+
+        if key == 'hwFogColor':
+            temp_options2['hwFogColor'] = preset[id][key]
 
         if key == 'motionBlurEnable':
             if preset[id][key] is True:
@@ -2597,6 +2605,7 @@ def load_capture_preset(data=None):
                 'hwFogEnd',
                 'hwFogAlpha',
                 'hwFogFalloff',
+                'hwFogColor',
                 'textureMaxResolution',
                 'motionBlurEnable',
                 'motionBlurSampleCount',

From bb339e0bbd9828a650f213d8839fecf7ca0f3ff7 Mon Sep 17 00:00:00 2001
From: Allan Ihsan <allan.ihsan@gmail.com>
Date: Thu, 23 Jun 2022 13:08:26 +0300
Subject: [PATCH 040/289] Append schema default for color.

---
 openpype/settings/defaults/project_settings/maya.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json
index 48a34068db..874e23400e 100644
--- a/openpype/settings/defaults/project_settings/maya.json
+++ b/openpype/settings/defaults/project_settings/maya.json
@@ -511,6 +511,12 @@
                     "hwFogStart": 0,
                     "hwFogEnd": 0,
                     "hwFogAlpha": 0,
+                    "hwFogColor": [
+                        158,
+                        53,
+                        53,
+                        255
+                    ],
                     "motionBlurEnable": true,
                     "motionBlurSampleCount": 8,
                     "motionBlurShutterOpenFraction": 0.01,

From f2ef34c1a2b5dc531c476f5661a79bd8dfeb7d15 Mon Sep 17 00:00:00 2001
From: "Allan I. A" <76656700+Allan-I@users.noreply.github.com>
Date: Thu, 23 Jun 2022 19:18:28 +0300
Subject: [PATCH 041/289] Update openpype/hosts/maya/api/lib.py
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Simplify key test.

Co-authored-by: Ondřej Samohel <33513211+antirotor@users.noreply.github.com>
---
 openpype/hosts/maya/api/lib.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/openpype/hosts/maya/api/lib.py b/openpype/hosts/maya/api/lib.py
index 4b76757e97..b9f23a2c0e 100644
--- a/openpype/hosts/maya/api/lib.py
+++ b/openpype/hosts/maya/api/lib.py
@@ -2548,11 +2548,7 @@ def load_capture_preset(data=None):
             temp_options['headsUpDisplay'] = True
 
         if key == 'hwFogEnable':
-            if preset[id][key] is True:
-                temp_options2['hwFogEnable'] = True
-
-            else:
-                temp_options2['hwFogEnable'] = False
+            temp_options2['hwFogEnable'] = preset[id][key] or False
 
         if key == 'hwFogStart':
             temp_options2['hwFogStart'] = preset[id][key]

From 3af840f8881432634f776a904655be32536de000 Mon Sep 17 00:00:00 2001
From: Allan Ihsan <allan.ihsan@gmail.com>
Date: Fri, 24 Jun 2022 04:00:33 +0300
Subject: [PATCH 042/289] Add Color Options

---
 openpype/hosts/maya/api/lib.py                | 14 ++++++++---
 .../defaults/project_settings/maya.json       |  9 +++----
 .../schemas/schema_maya_capture.json          | 25 ++++++++++++++++---
 3 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/openpype/hosts/maya/api/lib.py b/openpype/hosts/maya/api/lib.py
index 4b76757e97..c6585f5a8f 100644
--- a/openpype/hosts/maya/api/lib.py
+++ b/openpype/hosts/maya/api/lib.py
@@ -2566,8 +2566,14 @@ def load_capture_preset(data=None):
         if key == 'hwFogFalloff':
             temp_options2['hwFogFalloff'] = int(preset[id][key])
 
-        if key == 'hwFogColor':
-            temp_options2['hwFogColor'] = preset[id][key]
+        if key == 'hwFogColorR':
+            temp_options2['hwFogColorR'] = preset[id][key]
+
+        if key == 'hwFogColorG':
+            temp_options2['hwFogColorG'] = preset[id][key]
+
+        if key == 'hwFogColorB':
+            temp_options2['hwFogColorB'] = preset[id][key]
 
         if key == 'motionBlurEnable':
             if preset[id][key] is True:
@@ -2605,7 +2611,9 @@ def load_capture_preset(data=None):
                 'hwFogEnd',
                 'hwFogAlpha',
                 'hwFogFalloff',
-                'hwFogColor',
+                'hwFogColorR',
+                'hwFogColorG',
+                'hwFogColorB',
                 'textureMaxResolution',
                 'motionBlurEnable',
                 'motionBlurSampleCount',
diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json
index 874e23400e..7057160a40 100644
--- a/openpype/settings/defaults/project_settings/maya.json
+++ b/openpype/settings/defaults/project_settings/maya.json
@@ -511,12 +511,9 @@
                     "hwFogStart": 0,
                     "hwFogEnd": 0,
                     "hwFogAlpha": 0,
-                    "hwFogColor": [
-                        158,
-                        53,
-                        53,
-                        255
-                    ],
+                    "hwFogColorR": 0,
+                    "hwFogColorG": 0,
+                    "hwFogColorB": 0,
                     "motionBlurEnable": true,
                     "motionBlurSampleCount": 8,
                     "motionBlurShutterOpenFraction": 0.01,
diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
index 08207824b1..42685623ce 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
@@ -303,9 +303,28 @@
                             "label": "Enable Fog Alpha"
                         },
                         {
-                            "type": "color",
-                            "key": "hwFogColor",
-                            "label": "Fog Color"
+                            "type": "number",
+                            "key": "hwFogColorR",
+                            "label": "Fog Color R",
+                            "decimal": 2,
+                            "minimum": 0,
+                            "maximum": 1
+                        },
+                        {
+                            "type": "number",
+                            "key": "hwFogColorG",
+                            "label": "Fog Color G",
+                            "decimal": 2,
+                            "minimum": 0,
+                            "maximum": 1
+                        },
+                        {
+                            "type": "number",
+                            "key": "hwFogColorB",
+                            "label": "Fog Color B",
+                            "decimal": 2,
+                            "minimum": 0,
+                            "maximum": 1
                         },
                         {
                             "type": "splitter"

From d0f1f897fcfb67623d21dd87a25e969ab03180a7 Mon Sep 17 00:00:00 2001
From: Allan Ihsan <allan.ihsan@gmail.com>
Date: Fri, 24 Jun 2022 11:18:20 +0300
Subject: [PATCH 043/289] Append SSAO Radius minimum.

---
 .../schemas/projects_schema/schemas/schema_maya_capture.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
index 42685623ce..d9d565943f 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
@@ -259,7 +259,10 @@
                         {
                             "type": "number",
                             "key": "ssaoFilterRadius",
-                            "label": "SSAO Filter Radius"
+                            "label": "SSAO Filter Radius",
+                            "decimal": 0,
+                            "minimum": 1,
+                            "maximum": 32
                         },
                         {
                             "type": "number",

From 54b8056238250d8699b2c59bfafd13947a88ff4d Mon Sep 17 00:00:00 2001
From: Allan Ihsan <allan.ihsan@gmail.com>
Date: Fri, 24 Jun 2022 11:19:25 +0300
Subject: [PATCH 044/289] Adjust defaults.

---
 openpype/settings/defaults/project_settings/maya.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json
index 7057160a40..293648385b 100644
--- a/openpype/settings/defaults/project_settings/maya.json
+++ b/openpype/settings/defaults/project_settings/maya.json
@@ -504,7 +504,7 @@
                     "ssaoEnable": true,
                     "ssaoAmount": 0,
                     "ssaoRadius": 0,
-                    "ssaoFilterRadius": 0,
+                    "ssaoFilterRadius": 1,
                     "ssaoSamples": 8,
                     "hwFogEnable": true,
                     "hwFogFalloff": "0",

From 96fefa32c039fee52bc2120ab3c8c23bb63d8de6 Mon Sep 17 00:00:00 2001
From: Allan Ihsan <allan.ihsan@gmail.com>
Date: Fri, 24 Jun 2022 12:50:20 +0300
Subject: [PATCH 045/289] Add Fog Density

---
 .../projects_schema/schemas/schema_maya_capture.json       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
index d9d565943f..6e5eb43dd0 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
@@ -290,6 +290,11 @@
                                 { "2": "Exponential Squared"}
                             ]
                         },
+                        {
+                            "type": "number",
+                            "key": "hwFogDensity",
+                            "label": "Fog Density"
+                        },
                         {
                             "type": "number",
                             "key": "hwFogStart",
@@ -303,7 +308,7 @@
                         {
                             "type": "number",
                             "key": "hwFogAlpha",
-                            "label": "Enable Fog Alpha"
+                            "label": "Fog Alpha"
                         },
                         {
                             "type": "number",

From 66cce36da5646553e6ffde4ec278433c47aea202 Mon Sep 17 00:00:00 2001
From: Allan Ihsan <allan.ihsan@gmail.com>
Date: Fri, 24 Jun 2022 12:50:30 +0300
Subject: [PATCH 046/289] Adjust defaults to Maya Values

---
 .../defaults/project_settings/maya.json        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json
index 293648385b..bd8d1fecf5 100644
--- a/openpype/settings/defaults/project_settings/maya.json
+++ b/openpype/settings/defaults/project_settings/maya.json
@@ -502,21 +502,21 @@
                     "twoSidedLighting": true,
                     "lineAAEnable": true,
                     "ssaoEnable": true,
-                    "ssaoAmount": 0,
-                    "ssaoRadius": 0,
-                    "ssaoFilterRadius": 1,
-                    "ssaoSamples": 8,
+                    "ssaoAmount": 1,
+                    "ssaoRadius": 16,
+                    "ssaoFilterRadius": 16,
+                    "ssaoSamples": 16,
                     "hwFogEnable": true,
                     "hwFogFalloff": "0",
                     "hwFogStart": 0,
-                    "hwFogEnd": 0,
+                    "hwFogEnd": 100,
                     "hwFogAlpha": 0,
-                    "hwFogColorR": 0,
-                    "hwFogColorG": 0,
-                    "hwFogColorB": 0,
+                    "hwFogColorR": 1.0,
+                    "hwFogColorG": 1.0,
+                    "hwFogColorB": 1.0,
                     "motionBlurEnable": true,
                     "motionBlurSampleCount": 8,
-                    "motionBlurShutterOpenFraction": 0.01,
+                    "motionBlurShutterOpenFraction": 0.2,
                     "cameras": false,
                     "clipGhosts": false,
                     "controlVertices": false,

From 5b9168b421ed91870beb11bccc2dc9bf71136370 Mon Sep 17 00:00:00 2001
From: Allan Ihsan <allan.ihsan@gmail.com>
Date: Fri, 24 Jun 2022 12:51:54 +0300
Subject: [PATCH 047/289] Append density default

---
 openpype/settings/defaults/project_settings/maya.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json
index bd8d1fecf5..bf6c18bb95 100644
--- a/openpype/settings/defaults/project_settings/maya.json
+++ b/openpype/settings/defaults/project_settings/maya.json
@@ -508,6 +508,7 @@
                     "ssaoSamples": 16,
                     "hwFogEnable": true,
                     "hwFogFalloff": "0",
+                    "hwFogDensity": 0,
                     "hwFogStart": 0,
                     "hwFogEnd": 100,
                     "hwFogAlpha": 0,

From 76cf10a61186d38a4dd1f4c3bc33edce7d605e06 Mon Sep 17 00:00:00 2001
From: Allan Ihsan <allan.ihsan@gmail.com>
Date: Fri, 24 Jun 2022 13:08:47 +0300
Subject: [PATCH 048/289] Add missing hwFogDensity key.

---
 openpype/hosts/maya/api/lib.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/openpype/hosts/maya/api/lib.py b/openpype/hosts/maya/api/lib.py
index 166f348319..924dc03729 100644
--- a/openpype/hosts/maya/api/lib.py
+++ b/openpype/hosts/maya/api/lib.py
@@ -2537,6 +2537,9 @@ def load_capture_preset(data=None):
         if key == 'ssaoRadius':
             temp_options2['ssaoRadius'] = preset[id][key]
 
+        if key == 'hwFogDensity':
+            temp_options2['hwFogDensity'] = preset[id][key]
+
         if key == 'ssaoFilterRadius':
             temp_options2['ssaoFilterRadius'] = preset[id][key]
 
@@ -2610,6 +2613,7 @@ def load_capture_preset(data=None):
                 'hwFogColorR',
                 'hwFogColorG',
                 'hwFogColorB',
+                'hwFogDensity',
                 'textureMaxResolution',
                 'motionBlurEnable',
                 'motionBlurSampleCount',

From 0486b99a3438f8b70635e06087a0bbc9f9676b1d Mon Sep 17 00:00:00 2001
From: Allan Ihsan <allan.ihsan@gmail.com>
Date: Fri, 24 Jun 2022 14:14:41 +0300
Subject: [PATCH 049/289] Change hwFogDensity into float key.

---
 .../schemas/projects_schema/schemas/schema_maya_capture.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
index 6e5eb43dd0..a87918878d 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
@@ -293,7 +293,10 @@
                         {
                             "type": "number",
                             "key": "hwFogDensity",
-                            "label": "Fog Density"
+                            "label": "Fog Density",
+                            "decimal": 2,
+                            "minimum": 0,
+                            "maximum": 1
                         },
                         {
                             "type": "number",

From a080eb00ece263ddb645f7f562934fd8f5364073 Mon Sep 17 00:00:00 2001
From: Milan Kolar <milan@pype.club>
Date: Fri, 24 Jun 2022 17:05:45 +0200
Subject: [PATCH 050/289] Convert basic families from old standalone publiser
 to the new one

---
 .../project_settings/traypublisher.json       | 184 +++++++++++++++++-
 1 file changed, 182 insertions(+), 2 deletions(-)

diff --git a/openpype/settings/defaults/project_settings/traypublisher.json b/openpype/settings/defaults/project_settings/traypublisher.json
index 0b54cfd39e..da5fb2e8b5 100644
--- a/openpype/settings/defaults/project_settings/traypublisher.json
+++ b/openpype/settings/defaults/project_settings/traypublisher.json
@@ -8,8 +8,8 @@
             "default_variants": [
                 "Main"
             ],
-            "description": "Publish workfile backup",
-            "detailed_description": "",
+            "description": "Backup of a working scene",
+            "detailed_description": "Workfiles are full scenes from any application that are directly edited by artists. They represent a state of work on a task at a given point and are usually not directly referenced into other scenes.",
             "allow_sequences": true,
             "extensions": [
                 ".ma",
@@ -30,6 +30,186 @@
                 ".psb",
                 ".aep"
             ]
+        },
+        {
+            "family": "model",
+            "identifier": "",
+            "label": "Model",
+            "icon": "fa.cubes",
+            "default_variants": [
+                "Main",
+                "Proxy",
+                "Sculpt"
+            ],
+            "description": "Clean models",
+            "detailed_description": "Models should only contain geometry data, without any extras like cameras, locators or bones. It should be ready to be loaded into other scenes as is.\n",
+            "allow_sequences": false,
+            "extensions": [
+                ".ma",
+                ".mb",
+                ".obj",
+                ".abc",
+                ".fbx",
+                ".bgeo",
+                ".bgeogz",
+                ".bgeosc",
+                ".usd",
+                ".blend"
+            ]
+        },
+        {
+            "family": "pointcache",
+            "identifier": "",
+            "label": "Pointcache",
+            "icon": "fa.gears",
+            "default_variants": [
+                "Main"
+            ],
+            "description": "Geometry Caches",
+            "detailed_description": "Alembic or bgeo cache of animated data",
+            "allow_sequences": true,
+            "extensions": [
+                ".abc",
+                ".bgeo",
+                ".bgeogz",
+                ".bgeosc"
+            ]
+        },
+        {
+            "family": "plate",
+            "identifier": "",
+            "label": "Plate",
+            "icon": "mdi.camera-image",
+            "default_variants": [
+                "Main",
+                "BG",
+                "Animatic",
+                "Reference",
+                "Offline"
+            ],
+            "description": "Footage Plates",
+            "detailed_description": "Any type of image seqeuence coming from outside of the studio. Usually camera footage, but could also be animatics used for reference.",
+            "allow_sequences": true,
+            "extensions": [
+                ".exr",
+                ".png",
+                ".dpx",
+                ".jpg",
+                ".tiff",
+                ".tif",
+                ".mov",
+                ".mp4",
+                ".avi"
+            ]
+        },
+        {
+            "family": "render",
+            "identifier": "",
+            "label": "Render",
+            "icon": "mdi.folder-multiple-image",
+            "default_variants": [],
+            "description": "Rendered images or video",
+            "detailed_description": "Sequence or single file renders",
+            "allow_sequences": true,
+            "extensions": [
+                ".exr",
+                ".png",
+                ".dpx",
+                ".jpg",
+                ".tiff",
+                ".tif",
+                ".mov",
+                ".mp4",
+                ".avi"
+            ]
+        },
+        {
+            "family": "camera",
+            "identifier": "",
+            "label": "Camera",
+            "icon": "fa.video-camera",
+            "default_variants": [],
+            "description": "3d Camera",
+            "detailed_description": "Ideally this should be only camera itself with baked animation, however, it can technically also include helper geometry.",
+            "allow_sequences": false,
+            "extensions": [
+                ".abc",
+                ".ma",
+                ".hip",
+                ".blend",
+                ".fbx",
+                ".usd"
+            ]
+        },
+        {
+            "family": "image",
+            "identifier": "",
+            "label": "Image",
+            "icon": "fa.image",
+            "default_variants": [
+                "Reference",
+                "Texture",
+                "Concept",
+                "Background"
+            ],
+            "description": "Single image",
+            "detailed_description": "Any image data can be published as image family. References, textures, concept art, matte paints. This is a fallback 2d family for everything that doesn't fit more specific family.",
+            "allow_sequences": false,
+            "extensions": [
+                ".exr",
+                ".jpg",
+                ".dpx",
+                ".bmp",
+                ".tif",
+                ".tiff",
+                ".png",
+                ".psb",
+                ".psd"
+            ]
+        },
+        {
+            "family": "vdb",
+            "identifier": "",
+            "label": "VDB Volumes",
+            "icon": "fa.cloud",
+            "default_variants": [],
+            "description": "Sparse volumetric data",
+            "detailed_description": "Hierarchical data structure for the efficient storage and manipulation of sparse volumetric data discretized on three-dimensional grids",
+            "allow_sequences": true,
+            "extensions": [
+                ".vdb"
+            ]
+        },
+        {
+            "family": "matchmove",
+            "identifier": "",
+            "label": "Matchmove",
+            "icon": "fa.empire",
+            "default_variants": [
+                "Camera",
+                "Object",
+                "Mocap"
+            ],
+            "description": "Matchmoving script",
+            "detailed_description": "Script exported from matchmoving application to be later processed into a tracked camera with additional data",
+            "allow_sequences": false,
+            "extensions": []
+        },
+        {
+            "family": "rig",
+            "identifier": "",
+            "label": "Rig",
+            "icon": "fa.wheelchair",
+            "default_variants": [],
+            "description": "CG rig file",
+            "detailed_description": "CG rigged character or prop. Rig should be clean of any extra data and directly loadable into it's respective application\t",
+            "allow_sequences": false,
+            "extensions": [
+                ".ma",
+                ".blend",
+                ".hip",
+                ".hda"
+            ]
         }
     ]
 }
\ No newline at end of file

From 5ec1f8c1ccf094bf11d7f9e9bd722d4606e0d127 Mon Sep 17 00:00:00 2001
From: Milan Kolar <milan@pype.club>
Date: Fri, 24 Jun 2022 17:47:28 +0200
Subject: [PATCH 051/289] add unreal texture and tweak model help

---
 .../defaults/project_settings/traypublisher.json  | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/openpype/settings/defaults/project_settings/traypublisher.json b/openpype/settings/defaults/project_settings/traypublisher.json
index da5fb2e8b5..5afaaee78c 100644
--- a/openpype/settings/defaults/project_settings/traypublisher.json
+++ b/openpype/settings/defaults/project_settings/traypublisher.json
@@ -42,7 +42,7 @@
                 "Sculpt"
             ],
             "description": "Clean models",
-            "detailed_description": "Models should only contain geometry data, without any extras like cameras, locators or bones. It should be ready to be loaded into other scenes as is.\n",
+            "detailed_description": "Models should only contain geometry data, without any extras like cameras, locators or bones.\n\nKeep in mind that models published from tray publisher are not validated for correctness. ",
             "allow_sequences": false,
             "extensions": [
                 ".ma",
@@ -210,6 +210,19 @@
                 ".hip",
                 ".hda"
             ]
+        },
+        {
+            "family": "simpleUnrealTexture",
+            "identifier": "",
+            "label": "Simple UE texture",
+            "icon": "fa.image",
+            "default_variants": [
+                ""
+            ],
+            "description": "Simple Unreal Engine texture",
+            "detailed_description": "Texture files with Unreal Engine naming conventions",
+            "allow_sequences": false,
+            "extensions": []
         }
     ]
 }
\ No newline at end of file

From f25c662c37ced86fde5c22764665c55b9268edea Mon Sep 17 00:00:00 2001
From: Allan Ihsan <allan.ihsan@gmail.com>
Date: Sat, 25 Jun 2022 11:21:25 +0300
Subject: [PATCH 052/289] Replace `hwFogEnable` with `fogging` flag.

---
 openpype/hosts/maya/api/lib.py                               | 5 ++---
 openpype/settings/defaults/project_settings/maya.json        | 2 +-
 .../schemas/projects_schema/schemas/schema_maya_capture.json | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/openpype/hosts/maya/api/lib.py b/openpype/hosts/maya/api/lib.py
index 924dc03729..cd41ba3ffd 100644
--- a/openpype/hosts/maya/api/lib.py
+++ b/openpype/hosts/maya/api/lib.py
@@ -2550,8 +2550,8 @@ def load_capture_preset(data=None):
         if key == 'headsUpDisplay':
             temp_options['headsUpDisplay'] = True
 
-        if key == 'hwFogEnable':
-            temp_options2['hwFogEnable'] = preset[id][key] or False
+        if key == 'fogging':
+            temp_options['fogging'] = preset[id][key] or False
 
         if key == 'hwFogStart':
             temp_options2['hwFogStart'] = preset[id][key]
@@ -2605,7 +2605,6 @@ def load_capture_preset(data=None):
                 'ssaoAmount',
                 'ssaoFilterRadius',
                 'ssaoRadius',
-                'hwFogEnable',
                 'hwFogStart',
                 'hwFogEnd',
                 'hwFogAlpha',
diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json
index bf6c18bb95..77bc8118df 100644
--- a/openpype/settings/defaults/project_settings/maya.json
+++ b/openpype/settings/defaults/project_settings/maya.json
@@ -506,7 +506,7 @@
                     "ssaoRadius": 16,
                     "ssaoFilterRadius": 16,
                     "ssaoSamples": 16,
-                    "hwFogEnable": true,
+                    "fogging": true,
                     "hwFogFalloff": "0",
                     "hwFogDensity": 0,
                     "hwFogStart": 0,
diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
index a87918878d..2323fbaba0 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
@@ -277,7 +277,7 @@
                         },
                         {
                             "type": "boolean",
-                            "key": "hwFogEnable",
+                            "key": "fogging",
                             "label": "Enable Hardware Fog"
                         },
                         {

From b74e144dbb6d9fda8ac701d957d7c9fa98005139 Mon Sep 17 00:00:00 2001
From: "Allan I. A" <76656700+Allan-I@users.noreply.github.com>
Date: Mon, 27 Jun 2022 12:15:13 +0300
Subject: [PATCH 053/289] Update
 openpype/settings/defaults/project_settings/maya.json
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Ondřej Samohel <33513211+antirotor@users.noreply.github.com>
---
 openpype/settings/defaults/project_settings/maya.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json
index 77bc8118df..2f1dca6978 100644
--- a/openpype/settings/defaults/project_settings/maya.json
+++ b/openpype/settings/defaults/project_settings/maya.json
@@ -506,7 +506,7 @@
                     "ssaoRadius": 16,
                     "ssaoFilterRadius": 16,
                     "ssaoSamples": 16,
-                    "fogging": true,
+                    "fogging": false,
                     "hwFogFalloff": "0",
                     "hwFogDensity": 0,
                     "hwFogStart": 0,

From 800a2f90d2baaf59ad662a42a920012fac827931 Mon Sep 17 00:00:00 2001
From: "Allan I. A" <76656700+Allan-I@users.noreply.github.com>
Date: Mon, 27 Jun 2022 12:15:21 +0300
Subject: [PATCH 054/289] Update
 openpype/settings/defaults/project_settings/maya.json
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Ondřej Samohel <33513211+antirotor@users.noreply.github.com>
---
 openpype/settings/defaults/project_settings/maya.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json
index 2f1dca6978..117b260853 100644
--- a/openpype/settings/defaults/project_settings/maya.json
+++ b/openpype/settings/defaults/project_settings/maya.json
@@ -515,7 +515,7 @@
                     "hwFogColorR": 1.0,
                     "hwFogColorG": 1.0,
                     "hwFogColorB": 1.0,
-                    "motionBlurEnable": true,
+                    "motionBlurEnable": false,
                     "motionBlurSampleCount": 8,
                     "motionBlurShutterOpenFraction": 0.2,
                     "cameras": false,

From dd5cef560a44a513ae3395fd84f6c02c1adffff8 Mon Sep 17 00:00:00 2001
From: Allan Ihsan <allan.ihsan@gmail.com>
Date: Tue, 28 Jun 2022 05:56:36 +0300
Subject: [PATCH 055/289] Adjust setting position

---
 .../schemas/schema_maya_capture.json             | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
index 2323fbaba0..0a63315622 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
@@ -204,14 +204,6 @@
                         {
                             "type": "splitter"
                         },
-                        {
-                            "type": "number",
-                            "key": "multiSample",
-                            "label": "Anti Aliasing Samples",
-                            "decimal": 0,
-                            "minimum": 0,
-                            "maximum": 32
-                        },
                         {
                             "type": "splitter"
                         },
@@ -238,6 +230,14 @@
                             "key": "lineAAEnable",
                             "label": "Enable Anti-Aliasing"
                         },
+                        {
+                            "type": "number",
+                            "key": "multiSample",
+                            "label": "Anti Aliasing Samples",
+                            "decimal": 0,
+                            "minimum": 0,
+                            "maximum": 32
+                        },
                         {
                             "type": "splitter"
                         },

From e9f67f8747cad536c591884701fc441f177d3574 Mon Sep 17 00:00:00 2001
From: Allan Ihsan <allan.ihsan@gmail.com>
Date: Tue, 28 Jun 2022 05:56:51 +0300
Subject: [PATCH 056/289] Adjust some defaults.

---
 openpype/settings/defaults/project_settings/maya.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json
index 117b260853..bb7719dc30 100644
--- a/openpype/settings/defaults/project_settings/maya.json
+++ b/openpype/settings/defaults/project_settings/maya.json
@@ -496,19 +496,19 @@
                     "override_viewport_options": true,
                     "displayLights": "default",
                     "textureMaxResolution": 1024,
-                    "multiSample": 4,
                     "shadows": true,
                     "textures": true,
                     "twoSidedLighting": true,
                     "lineAAEnable": true,
-                    "ssaoEnable": true,
+                    "multiSample": 8,
+                    "ssaoEnable": false,
                     "ssaoAmount": 1,
                     "ssaoRadius": 16,
                     "ssaoFilterRadius": 16,
                     "ssaoSamples": 16,
                     "fogging": false,
                     "hwFogFalloff": "0",
-                    "hwFogDensity": 0,
+                    "hwFogDensity": 0.0,
                     "hwFogStart": 0,
                     "hwFogEnd": 100,
                     "hwFogAlpha": 0,

From 05e709ec065e7b7fe422e49225f5c2866028162b Mon Sep 17 00:00:00 2001
From: Thomas Fricard <tfricard@ws114.prs.vfx.int>
Date: Tue, 28 Jun 2022 16:41:13 +0200
Subject: [PATCH 057/289] create default action in custom menu redirecting to
 openpype hiero doc

---
 openpype/settings/defaults/project_settings/hiero.json | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/openpype/settings/defaults/project_settings/hiero.json b/openpype/settings/defaults/project_settings/hiero.json
index cec4bca8fd..3b0127c24a 100644
--- a/openpype/settings/defaults/project_settings/hiero.json
+++ b/openpype/settings/defaults/project_settings/hiero.json
@@ -19,14 +19,10 @@
         "definition": [
             {
                 "type": "action",
-                "command": "import openpype.hosts.hiero.api.commands as hiero; hiero.edit_shader_definitions()",
                 "sourcetype": "python",
-                "title": "Edit shader name definitions",
-                "tooltip": "Edit shader name definitions used in validation and renaming.",
-                "tags": [
-                    "pipeline",
-                    "shader"
-                ]
+                "title": "OpenPype Docs",
+                "command": "import webbrowser;webbrowser.open(url='https://openpype.io/docs/artist_hosts_hiero')",
+                "tooltip": "Open the OpenPype Hiero user doc page"
             }
         ]
     },

From 397a3f7fc4ebfe02ca033f775208301432e9db38 Mon Sep 17 00:00:00 2001
From: Thomas Fricard <tfricard@ws114.prs.vfx.int>
Date: Tue, 28 Jun 2022 17:21:09 +0200
Subject: [PATCH 058/289] add docs for hiero custom menu

---
 website/docs/admin_hosts_hiero.md               |   9 +++++++++
 website/docs/assets/hiero-admin_scriptsmenu.png | Bin 0 -> 23368 bytes
 website/sidebars.js                             |   1 +
 3 files changed, 10 insertions(+)
 create mode 100644 website/docs/admin_hosts_hiero.md
 create mode 100644 website/docs/assets/hiero-admin_scriptsmenu.png

diff --git a/website/docs/admin_hosts_hiero.md b/website/docs/admin_hosts_hiero.md
new file mode 100644
index 0000000000..b75d8dee7d
--- /dev/null
+++ b/website/docs/admin_hosts_hiero.md
@@ -0,0 +1,9 @@
+---
+id: admin_hosts_hiero
+title: Hiero
+sidebar_label: Hiero
+---
+
+## Custom Menu
+You can add your custom tools menu into Hiero by extending definitions in **Hiero -> Scripts Menu Definition**.
+![Custom menu definition](assets/hiero-admin_scriptsmenu.png)
diff --git a/website/docs/assets/hiero-admin_scriptsmenu.png b/website/docs/assets/hiero-admin_scriptsmenu.png
new file mode 100644
index 0000000000000000000000000000000000000000..6de136a434e19f78fe871be147a8e5580f3af552
GIT binary patch
literal 23368
zcmce;1z418yFZG{Ktf?ax}=qslwQI}cXxMp!&sD*NcTcYT4Lw{lx7Htp}V^~&%@f^
zx6k?Z_5J_*#J-M~mlMAEy!Uh8zqp?XRZ@_Af=P;rhKBY;S_-OyhW1At8rr?g$A5rt
z?peGG126Yo#iZ39KYlzpuQ&%jlDNIqa#MA*aPu^FF-Nm>aI`mPbv1P{H+OKga&+6h
z-z0*D_8d(b`bNzwb!*z&NDXz(ySJOh8q-CW#N#V=B24Wo_Q&HtqT6ypG>X5g>;2ZS
zmxXKC+ZqxS*tgYHR$Xh`>%UNgzIk)PgZqbcC#9H2r--&Cr>@0HBMh5j(2ft|{R1zN
z+t>WAJN%Xo-wwTYYEL=JLX#eVYvT}@al-+xXchvk55dda^T$sQ%9?C!){|#4!RKZ<
zQ%+Kh3aq=g7|!>=%j@TC;9oTK|JeLp&D{rbTq5xAyZZ}wgW&Y1-raXkL;l|B-oM$2
zBhL8^i-*o(=f>LF<I5=Kc=lTNx4aN@^Bi{V1|v*CaFln2(oO^yR#vasarGi1!Qtj)
zh>vxJgoM<X+}*Ff4_Ox$6m+0y44)GULLgBcrrPl#-?C_0P4X@-B=U#NZyMy_GUJnZ
z!tpVM18x@V+GEp0%&wksQgnunvjq4QBveGK&oFFlHWZiA%g5~!uJ3_cn{$aECDPH+
z(PUBlS|<}Km51`LcU^t0D<>}x{#G_Q*xFKEX=qr~DZLnj`@;P6jv8v$CmScEq0VK>
ztgQBNaVQ%&6D@5{!<C(32CuMiZFO~ZWs%EQs=JZM?fdThrtt4WeqKg~u1%&1!gZ!!
z>$0$mPX6{v4;dW#8r-nFyxg^ys9Wy1a!5iM<;cD@y4f^|h%$dE!WI;Apg^Eg9KW}R
zYiLMyH~R0AjEd+VPTVRmg^M!dDmxk)y1Ft$l6ozIjLDZzMpye#&xqollsNt-(~1uX
zndgGGaugvrOQ7IldT_}-C9L3e80LYmey~gqPLSfxF~-y*mv<T)XT+Jf`QUiUHZm%1
zZrO4xGlPQy^w;2-G@I8I@UbkBizdY-H9E};rS$4(2poxtO9rnjbq(!Tn0jOHZjEnz
z?k*_g=LIJre&TwW<~eT219y|(RRUia<-Q_`_>?Db7bT4UAL8d<g6`vARVCha9pI2?
zT%;EN%Q$?)kvZ}6jmQa+JgdH@5eL|sqara};@8&SAuIOZh3vna@_!TOa+Z2dE_keZ
z9H;M5r$vpomwdhbsZcDx#^=T!TXavu!@>*>J8eWVMEfo>so$JV*V|kjgU~BsR3#+(
z)grF1pMx)8w*T$ny_*1fdh?u|Wr-|nytIpR@BYXPIlaX1PvtGGwF6N$2uy#lTMsw>
zWU~*pO8(~OW$D?SseIH%yQ*QPl9#vl(#mo|oW^TRDxbL-d`88#w)WJf-?14m23G|e
zqdAttcl@GF-|Ol|Mn`=WBns3v1}7&y&pI)}%#92*g8qD=1t#ZE9#+_Aq=`w^f@#*d
z-%ahtL_>pLy!m!7m`|OH`)7YNim@@X7QSF%aXw1q5M<-`J_)`(iw&XF^6#(RNS>M+
zvVpt&{7~yB(o~fz!p3$Hqgegm!C6iYLtH{eL}cV+9GvxGw}%hTj*pIZreR}d+|%5m
zT+OrnCh+)p&1Y#Z(+X5Up5+jiTW))tU+C6$u)LURs?<3h`n?$LFXg?GdKCGzHxR3L
z;1%S}&-a(7R3e({Tzt&pEQFr!r_a(~jw4plqWWbOKJyWWucjmyYamay>kA5OQ8wlh
zIxfn}UC~(`rr&6<uCE{QZEkOC>*;xv)bYNep6Ts%-zqaV%YN*2HI&!y<?H(trn#~+
zQ_4p!;HQ_PA`ui^fGU`qYyR+UAvJX>lDF4OL=emmxOuk)5kvRM?Cmktx01&F&Vfbf
zGa@qjxkDn>x=`bg{?*$0`Z_5+Jc|zgu(Ss>^Ud$fjf|R&ILdi9e!Jl*TUp^k=ouL&
zCY3wQBO+EQdQXmyQblL8Q8wTz)n(d<@0$`!<SWG|sB37B9uQm1H1M}<#>U5!VM~Bo
z5iRB8dl@dFD(0v6)?8irRW2b&X#(6J*XE%jZcRRE6w=eg$z%?=J!Ko+yrd|tulGIK
z7PN!ebCAZ*l-KNE1&RkpvKnw3(nN=kZSl<pSd#p}i|(?c)azTs2np%0C{;HjUuJ2+
zgS2p9w>%C^=nIO_q5;{H_QZr22RB-Hk2s>;ezGw%g94w5XnTc8*lBOgO9T|RW*)Qd
zg%1jO6flkF-y$RX`ucW;W1-PXR`3a^!mppQm?7VDa(L+JyGBRrOBFZQb3|NoV>?VA
z_%%jFCFCUpS1C$D?^|#gHsfGn?Q9QJRaHWi&CH<s_6V7r?~X!_l(EE9)B2{SSwh21
z@#ccuq(s*55L18g;VSFdRkmvPa9~5qSSC>@0&;HIq0G>b$IDmGIg@(Ci;ME}H4EeL
z^|vrU*^*BzhhwR$qZa!yJ<xF|2do5QzT)G>EI?`UsCVPz)HT#Jz{6qDF8?iFY@vN3
zryN=xr77bgh8idJO`Djw5GiJ3=F%_L@NjcmAs1cW-K}sNUkC|NI)Sl!xOtvF=)>GQ
zJY{|Hf>Nlj?xKBUr0P@a>(H?5+FF!>*TIst$qQOx^-;&Ut7m>9?EKaz#mwbxG<m9d
zSd4CuK(;Eukh5EOK<R}`zGMm;7#?&tZ+Crb#;(0aN4Py!=KBr3z2j|OHr>r(MoLkZ
zUL4q?rZFj8BDp;$Qj>(s3h_tYS&db3iDBs|dhi2x_tWRh;JG~6kqE`Yr*U!VPNtxp
z!>X&Ri&|ciKXn3o=Z-&desz}{89D-9{h=#&SNi{7)%@U4;Rkh9CFhtC_rW17SbF{q
zd|;^ZxF@Ir&Nij=gO(m_7LN6Q6H5HIdD(bk;e*yz<w`VaU;q*$sK=I2>}_^jq<xdX
z6|_Z<<=AAuezsYv<F0FGH@tlG7{mc<a(N9dCFRBjQ(D2u>#{BN&5f@I<puHaRn}|7
zpor<n+uh%MC6!ac9M1><LY_upiX9f);Y#1WQlZ;*U21B>NR>xunAt$@;WL-OakFkg
zeJxd0MnXZ>I`2k3>cT>MH*#WpG6E{H-qpi?_0g5(<-*v{lMcE*bIsAU+9Z;Zl#W8P
zP^eAZ!O3JoT&%{Y;76yMm!~_TMMEcoI$Bk30PtLTtQrK0l^ysZPq#&<#=NMRnOR?O
z{K(HAN2yPY%tWX73b68&H5}MkT56tr4dhLc-`Xlt>LexWqY`nMdP}42b*PskmdQsP
zN!4HPlzGnC&j{k7=T#gLZFb2Z0Wv|+Cz6_(YkInOdu%^OBIbPM?cup!`WwgBy4nce
z)0>m0@++y_G@m0PK#qFB@&fXh{SgIRCn-8!Pfg8bX>C7o?J*1{N@GIIz|6d;C$I0R
zxI4$Dm&11XlssCBu1gxj6sLW(Ly$(Os4lmpuuwNg<!LD{?wqE9hPI9h1P^a%J@Y9B
zmP(=8<p~8F6Vvwgddd_Dh>XOfTsx2X18;9{jo6Ih{QL?XmN3HUY^Ba(4PGIk*6HcA
z{#A@XvG+=UsW1s}Czl_{<QK|XN#R1gy?ybNU0l8)Ac1-#*`xRa>sP-jEDM9(oJ;CT
z;PB$w9Qhn_>U-F^DlbFUhV%Wx+DIWJybWRiR@v(#^mft{i5Z=pcdT~lOgOoQK8GRQ
zuCH4*K}_q_=W?>GRn|!xh8qzFb(oTi;zsvc$jZydO3~e(FBI<m_;PggEQmhHIE0?Y
z<koZl*Z-MYJv?3Mzug2}?-@MsqlD~x3k8uJJZ<3+qQMgk-4d+`M-Y`qnR%(+U%5wP
zVozkt$5-u#xSq_;{!~=t7BsJ}mY&us{U3wE!nWo%A#L_BM+HLuObS}Oz1`be{PXAg
zwCU++i18ytW?o)Y|02FPW~~q%U8jNJ&^QSZ83lwgSA}_tzL?b>`iz7`SyQ)E<>dxh
zf7F1!oLu&wFZTA29lkq~>y_{kTRc2_h>ji<95^N`z@rb1jeS;%+R)3HO3=Kz_V*St
zP*%<dxq297F2)E_g;7w-e<ahGM9s%ISlTsCJHG;5g@+4LQ)6_}JZ7e_qous&=9CLj
zI(jM$&mKG0y(}y#`DxHpnf(o+ACsIsR=Qb@trhY;D~oIOOd1Bu$UzcHLO+$8&TtOo
zZ7a&kk661ueAxC8DJ#Qt^vHB2wesZTX@&Q@kmTg#!afxA?I&L!pF}x^J{%h7_@0!6
zGQaVKzLJv9E^@3O&fNn;<$K6s+jGyUF2i!;OPIORncD&^TX&|>*|_D;(gTAj8%isS
zXhd&&;)ubVZ<e#*B(;`cb#EXIV$&v$tFPB}+AE5W_sEf<#@*vd?qlX>0eGBb`%xIy
zV*A9{m$|>jD;9egT%D!0#apywX}~ioapdc61Nj9l@xf)=W4l*(Z0r9aZ~8~FV>rQG
zo2bLs?Y|>%qXPdwC)D@5^V^~~6E3xd*MS<AH9e7SCV61E*k8U95#gOcPG;r6?Tw6#
zyx=u8Ym*L$oSK?&b8X*Hot%c<8FdN@(x9~xb<fIb`042;I@QAW-=ldH{Zi!#Ea9P{
zLb~e0ebJWYIg%2eP$MHz6?fPHj<hNJ{j87eQ*dxyoeZOo8mcyV=-jdaA*7;;*HLgf
zTf~uQ;P`^IbZvVm!le`1!D;a1$tuXJ2Kgf(5-rk0?Tv&V<qx~J9b`Lt?hM;Vp5IVP
zgS6;<t__13*7l@@P<o%;{Nkby3~VcV6}`UxGQ+Q~&487M^(6~8D9_8k=gB+DIFo#3
zRK)Uf3u|kSbI+3iJ|`@MS2lb*7sG<|CNGP^0&-C{!hUplaQL+IusF_?uI}jE_I4N1
zUKB;IFf6lcU*p$S&C=31)y<+RjgQf>@M?jri>spKr{J7yx}(!m&(ovs<?_<T3tj;x
zF&2-4QpX;H^4}H}p=oIZnA)Z-=Pi<vT-aP*bZ;$X*mtu*vFv%QTI=y<gGs;4@BGsW
z@dLm2GC68Y%Q_U2oiEr}v9PfpV_=Zp#OoAeK7Gpaf~l{oYujpQ3`?Eq?M|1f-#yV+
zuL7j}*%goHX*(``;Mz&+*e&4$`BHSrT#Nvx<~4llo}IPy3VeswbWq+s`1SLbFV7Wm
zjzeg{sMd_gAF6Z=54Q?B7+S!`F)=@PeAm!YQgO>2Hsb`<Y<~CT<b)(5_tV+yI33i$
zxHUTqYhh8by_Kzff>dhouw%pTsgV%_UCmvZxRA8e_BBlg*VV&^ZS>{<fUT0H1Zl2q
zZx$98mKK&W(u9T`{_~{cZI5XNt=;hv#L5N%CwlJoo}N*FbSLb2VM9W1PIXh~0XS{_
z(Hj1P?xz*E!{mwl)m9<^K75+i($f5pBsm5ESha$J`l$B2g=iLD3DMBZ<alZa(bEJO
z69+*sAD)ati4xw7+0nWQ8&N)|8S&UZqo(BtK=w=#OxWgd9&-SvhZMN~=Gz$(uIsnI
zp7@BrYjX6|RMfKCo3nZO5<>#fCB2kA;D+M}Wr*?q9>>FT42Y0Wg4iGT?}L&AAYod`
z>|af8VZqn#e*;uI98BS9ghnBc0E5_b+_UpbV(j)Z-Sjo7yR?A;m|;P?KkWjs!g5BJ
zl&pfhtbnd|TB^{bffYCDGG`Kvmh$XxEmi$OrOsgTw$;P0F&1HIZ34w?t58Zyc2apu
zm0xy^?_fu3p+A@1k0XpTe`16>6ZP@&@KxWzdjaqA=ltGPW71QTLyRtX5z_}yNf2C4
z@<t~3Tpfmjuh$k_n*Na^cQVm;SPNhKUbxLeaeDd;*68rI&n!;khzY>h^q7GhX*0^E
z$K2jPV)8vaJQj;6nZ%@_K`77c5g5F=WLMhuKn!K3CCI#SQSXRbX6+BBqDj8Ho7Ci+
z`a3rgi~f(~#uaAnr{J)OWgPY3<-era#IcEoTT*w3U;JleEckB@w*R$M_21&lf7Q1d
zgR5`PY>~?)Cqz1F^PGZ&VQG{;dyUzxXJ=zp?2b|KBUSI;zn@1fEPQjUKaO8m-~@b{
z9w5C&Url#6E8=hU8q)(aBQvw5RDK~@Vul$WULUbrT3aPpYhE%7v+{Ea^_ak|xb^v_
zx%p^?Ym17$hFo3w?KEyi=3=p0uS<tHq-VquvwOJIIc1IqoTc(xSDUfR$%HG)gfr57
zG;pN)*g8Hwkl&P1s>MRd$pmVaZ8XXx^JS_&Ami@taSBJ@3tV~f4gu%&&d#NaRNrmV
zHs(OgDCrmsOy-d-e~Avu%A(;M{Oap_sj!q@U~4tJej&NZ#dlh%FgZJp(pORvs+qE*
zeC@S2_VZ)M#wM90xwwnWhrB$Wq9}lsoaB?n9*vlOk<kYt+l9xfLa|5e?ryZ3hX;@Z
zj!#eHkW-;+(ZRdyLaHiSTI6K-N$KeaU3t1&D3zhFzr@6oQ*@tF^f{9=$JFN0(Yx8y
zfiE1BGf3ukEz5Ldk<7{LmAC@{+#jx5>J*Q(NV@3gPEttH)3sK4x^0cSesQ&X^l`w7
zlT@A|W}Lfb$_73%f|@ieRF}CVmTM1l=j2q0#jI7KR#Z?pJ6r6}QAs#I<U}!<J7%0{
zDU?VIo&Uann*Q3GiH&#VDlj)UccrI?n<zB9y4th9QT$p!4oui)Iqo=HqJLm$tH?La
zMBmk9a#TuC&Y!{;2Fsh9-+lS=*Sur?zvu@M2&EjArF5Y-qCI^4MGBralQJz9k=e0U
z4mv`?&^86JXs4?zL<luN&Um3-4Uj$qb#+!qT%6|4*ggf&O>?mVKj_z=Zo1WZyAEx;
zbFOB4x>>R5Sw%*L8Ea1*Pd6592ne$o++7`yc?DJs09aDcYoF^c7`N1zSTb@Js(Nyj
zGWlye8<YnQj*b}vRx%+`h2M*qnAqZKYaz<k+UEB5;!1NYNmJ9xG4rpWX7KTBw!vN4
ztuNH=#&0McF~#-dBY#*MPSK4BWLwlJ8#V^Vwl}1L9G`9q3f6~oB9UOXYO~p%RW2dQ
zS%bWPs3S|u>(OhAamioRl$5v!kAY(Gj>MR0@q<EP%352<!9fKml0c^@(kMiH>M#wF
zT3X_+A#I@rP}(?@WL_5azsd25vOG`P?}fFA7c;So)^FDPldQiyajEE9TB0){4l>ua
zw0s45q9vi_X>G}wa<VHb2A!Tpl&B=U5}|0}fV%DI$vZ2L&$%FOOgdk@VA<H%kdaA7
zxUGM)H}s#Jp5~IU1({>Wyqiq|;O<b1hcp}8n?qIt6xu)k;(Ks*`3Sui6YB}39xFXP
zHNSIJOs8}fi2(dhD3Bfc`}1;h8^yCoE>#{Q%j4o!L0JIeZ;lGl`#BRG8yg1*X5is!
zZ)jwslvK#j`UL>8X=!aHjAa!S6)|hD^040Ss>(`uWhF^O`@FtZ5n)R2%HlQwDXAQk
zwYd1+y#UVIdcB>U%}wEK7c*$0ce9F)Mi)o;uzArEsN5V8fInpx6kHsT@yEd!Xj%Dr
zSl8{$-CYjsd@~2EVv%N_jo$i;o65Tvi&0a#Jj($3Su(2!;bvuBD!#X=XLN=k-LuCZ
zKHhI>5kL0vm(?YM@bDUd=NlCniH(_z8XtGR@}fkRlaRbr(Ik3VOGn?9(J9Q+7u8&@
zrlSGDr^x(*w6WcEjm+rjmNTqzO7FE`WiBRH(Jt1=&CB~yR1D}~eyw?`J{Vp-b2&Sc
zl`~s(^z$)8Zn&F%(mwdM8QTO{5{mA3=vU!?Dsu;iZcAzFj`{_*gE2zmBK&tkGQMv8
zf2uDJAKj@LTwz^SbpL_B|Ht&~me#7oWHIcP>>T>wz=sfIWo0Eur?KYa15EYxwKG1O
zgZ`IKtKhalO~_TO1ryr-XK|4O(*=T#ab0G?I8=ot`HbJbcZT%zs72%+Zf@7JU1sUo
zrJ95B)zk>6YG`n2wGpCp-2ay1=O^Ur15b`ru(aHt@eh`8a6;Kz_G=`>YjiH}U<Q86
z&5aBxFCV1u>&v3J0|d)*x_Wzu$Dt9SEX<|Dr<-YMX&s%I(Ckq%86>mMr5i2Z@~W_)
zh{smVpHSYE-qFzxN}{X#e(gKX-vk7>mkHEw0z_OnRaoNR7ZfDVyDxEi!eFys2R|RK
zvhSVyy*C<;F*MLX%?!MOLLkNtB_$^{zkfRggo}f5E=kQlzreu3iIdT%5Z!Q_C@9z{
z!+{72LX_Rz(<Fwh*`4ELR{P{nl?tCQET#*i530n}`}&ygl;DLfo$WWoW`9zUPw29$
zyFM|e&mox4{CRzGgSf;wB%Wy~!hWyx1E@oJibOU7^?=#y(S4nnnGwExdc1iQNh!#!
z-`FUE-LmK9N9EWLIHpL3BGgYr^j}qUUN$xXA)##5Ap+dF(V?Mw&s*b<Gkcvar$p&5
zU$U@7Muf^KDxNP5v07A&4|p{h80zcm>g#VV&`2jzXsWAoWsfH(*FD5qfdIksSyV?&
zZQbWKh2!IhaaqC%J6<sH#i(uVUc=5ho#V}iRPd3^{eTLALQEW_4Rm@6K@UmEw_`Zb
zGWsjMX^WW}>lg0){NBa(+q6%;WCAL{0CKC_-Z@(>Ex*2g#f$lh2i|~>{5Z7$CRlOL
z)X@mizkJ_MgsW_!ku1lC<WJXiuhJ<*-Ca-YpU;bm$diTsuiDL{kNbYA6)2nWMt@Cp
zcY8lQY~*0c?uokk==$aH$Ed+d&yY3+m)fb0jv+JBwe|Ii1j!EQgNNulv#>Kg_1>u>
z>@qDmD5vLX0Al|4{325vC#R6xRo*v*JZ)Uv-uZ|5Uc!V}yn)cEA^M!<k2n~Q_n6rW
zSy=M{p*c8GGPEf`WL0ZUj*OJ~UzU`lJ4kv1Q?5Q`vTTttg5j_?Y~}F00ZDS_@#N(v
z>HoHI2i8cf$+-*79pbo5xE{lPv^YBHnUlxZuMnbMKv3^VwRdpDQu^AqNy})obQD(Y
zONIQZlSA&eRl89Kl-iYe-Z&M04h|y@Vr?>aD*<3Y6w?lLF!Rvo|MizuCo1S(VGbf|
zsDD(K$(<k87-~%HTN{;-@UGvma*ZK~S|nq2C%`#5yRvf1h$C5!Ar#8_-u0&`anSrL
z@f3I0n3EH$(C?+Cj(e%-kmHkM)CdX~aiO8kctn<xwFZtqv>x?XxOTu8jkW-oX727E
z86MVVjei^Fpz>lVfyW5kC!4AV>r^`N7JIvQh{9+S>^3?!wsm~}6_DDoqexUhO$x7R
z{<C=%0?Ftw4WfMWFz~IuzP_|{MFN|C<#wSXsIlaZuULkLhqqQ&7dM!MqkVle-eoKn
z@9d<5bTetV`Q#A}4i7LF??bu0(1a+(p)`znuS8-K5`r}f$$n@B@fE7QkPtF!o{5eK
z2^lk{T8F*DZgEY05kyUs(i^b!_&yM^6Y*5NX>-8#FpWfEL0)DqVNTATA#rowln9Be
zTycC-(r2WksfoCZ?(QUuV~L5K!0V(k+>Lzt1o9-Y7cf>9mND_-$neKpI9f7DCX%4&
zI&Ayw{QNc~vPFAgYHD!dg`Kr^9C8_$m?b5HzkfV0L<yMWJwi}7&+@&t(f|Z)&r_f7
z>)zgP`Y@vJ>fH+q<@<bsyob&2<aQ{@g=Co!XWClv_6`nDo<7CK!1x>*$-VX@vJl{8
zG|kRRVb4t9PONUmL`O3b3Ide#$$UI@(fcCcdaCGX?#rJkDBh8>iJQt{vosA&B_%m1
z9DeMtqYq+Jr&z5pPL`0pQ%bR<B;VG?fyBi~GT6e%=r4FqFQ<|7vwzqNXE^!7|Lg_$
zr`3?FoZ2nANaHLGc%QGwC-qd|F*9@ZqSSqkv>cYlT^Aia><E@E--;=N6SbZX9tZxb
z#x~IP5CUM;zUe>cTxZA4xBQ&V?(pD`K$8I(5k!B@?_nX<yMk7e2|Up{jf{;>XMZa2
zId>3Fa%ZW|G1axRNq{%aC^uHaaPa0`;p2bf?EklP>CT3QyN`_l`ZX8yar{mMoBMY=
zC61{`65mIb3sEX=vCQwE4GG_2!>$S)R*gdUW;>VI=WKFM;^{3zhfR1r-K)lnM%F0-
z<!fHT2&A#JBnll?FCChY#U;vpWcd6CcA~E@&yX-KI0BM~!-$fYLsmPU9ao3-{wFw=
z>f0^45u5rv-)G=jRNH@-5`?C1l|sOtEsOJ{0A%PX7V$DidA?%oDXMAa=uuS^PEJjo
zdl4Ff?YogLsh`c3Fz({x(>?83YDV0Cvv^=GJ2gGcRv{10M%EgxTmO4{2>%&3v*>O3
zb;s|yIWQ$(T90>0KO-PeHZb6)FOHDUS1R#$u{Se|jevs&fa~jB7*|S9jIGV_eH>sn
zwHo~<!)}kd*^gRSSdfm|IE9@d^h%sOJ^6^SEh@Y>N7y~Kr`o)S>)ba_w#HReR5;fI
z?xD@;@GUNUK$*NE4&UKCok=$+)9TqHsjzOo(U6l<GczO3=x6R^FDS{^ZScxeD2zc)
z>rZEUdp`tKr()5RL}XXa_!XqMZZlF}@O0zYM-ut);oGh*3?3eLhM^omaYB~FLN%s9
zv71o*JW|p=Nl8gBA0L6xw<<&l-Q7%Zo#hQCiXU1{lkf!daq9cTi>g;!tD7#0sbfEk
z??Z&II%#o)k6M~;w;f|d7&H7Y*3*T3fBpJpaJI}oDs<49J?Xu(+7B6U?H9eBF3~@`
zKnDSw;_UoBB)=s82^NM(njtYcxt6Xf6$By!-EnYu|Nfp~K<&r=)mhiwG$3-EOw>0{
zt}?~3=~va<G|^`bkYN)LSPl(-jiMCZc_HM%GHOy*Q(w!f^|~~3UI+r@u7K;~J0K*E
zb3J$1e={^WT5Y#(qNs@TafZVTZA6)n`N4w+QaOX5){eohmJDw%ns7v~&a$Ei+4P7h
zA@ds>1xlS!l>Bx6mmZW+r>zrk!1JL;H<!D7yxc{))g|IX^Q)`CE8_ESe96w<Kd@En
zx(XGGuCL#U;G5ODY{iE@qo6<>^a(01FF&!44~YktZnfY0$9tpAk>ZX>O0w-#=-ao#
z7h|SknLkRZcCJO6EP0cH6UJ<r;<{JUeHE6LS~+?g4ZU;n@+`M1o&aSyCW)A6V}sP8
z$^IO89dloruYGYQ7C%%+<%v<(FGemyp}ZPfEDYaP;x%XnH{49h@IC9XRkgHSX8jAh
zk#Q`@30XY+MRQKiczVXXFxE;qyn>~0l<ea27~$_vH0eo*G;<Jt^t*JEs*IM3YWAYe
zrz6UuqBbk5rKRO#h@Zcof#3dHk&N4uNyk<4e(A)t@9S%4$c$TZJko=;tf-p{&8Bjy
z@|$Czj$O178IqC{4Gs-WPE7jv`X;9&i;IgF78VW-4k?n0vf(}s;%0t^IW#ns4%_jL
zmO9$0-(61cgln<1baX8qreAkeG@TziPE1Tt`mAM6I@J45R<Q@i+FdV%g&{1nGX&gi
zz%bG<4rH?zfh@se^QiqHXG)LH$C-|f6nNRA#T+bjkgfUo8PP{8btq;(0LS<Qh6{;)
zC;E#?p%C>o#n)!00o%7CI@*|xjm`Iz@>y7#Lz90XBC^fJxv$x#p4;2Vke1&MEz3BR
zLgyDA1lYypEVgA@-Q7s>58@_^CLcb0z>oP#Ohb9QQ1KiogS_)LT2S&f?6t7tjoo6s
z@v*V9;Mv>skVtaj)VMfxef_krsaF}dc3s^)q=Q9;!zj__+vDTS(9U+9Y4e@5WXK5Y
zd+bJ|fxRx^U?48-j_((O2o%U}g%DvLU>V$?O6l0xX1B)PgB~rXtfWvdeQXLg9U8rF
z)`tQkzXC&ZDYo_MiY9B|MYPl-b{QuQ;)rxg8yXi6508W{3A@_5I$k!Bb}&LAsq}p(
z9u~crbL4|wkBmmArp%fejToO{sxzreN(w4t8+yIM-}4f>#O_$l@aOfyd>_(d(UGv<
zwr6TsKlj~<^K>cAvt**$(J)xTG-IB4W-D}&QRHf`rA!o((NFfwHW4CAuA{39yNJn{
z@;mHp@?DHbF!agK$}-&oglx`-v%(?U?R%juZdjYU`;$n3&>OFYEHz3Rj%R!|rz?$i
zLL^b6C}x6kb7Tb<*AO>F){LU_)*41xOh`yyS}_JTwpQ(d1|Og1$DbT0U)s6Q>f77f
zZ*Fdund7;zTNV!~z4qRlc0@kG#>Q3lyRv)#=X1g^%Z~n%;$l|Tm%8O<7*YMSG_`sn
zCuro@kHlSF54Wplov*wi5oS^q%LL2o>m&{(4yJsQ6B8RdJ1gt!(oolmav51<P{M1b
zdKrCILgdbLJr*YBqhM-KWFdFmcSFKKoA1MhixI~Si;_7i=S!-JfkA=gEWQ`R)|U~n
z<KyEM_;_ZVK(d~MyN>eBZq4m`+l~k&$Htn$b)v{c8qAULKRsD*W`n6j>MVLU&?&7P
zZOMe{|AcC5Yl~j5_XAgBUc`QO&mz=nV4=-(#+wmY&dSPK+H^88XNo>c0wEzdZ^c){
z9XM~t+C|)!jGIv!m{5I9slP;=&e(F3f^LA@vkuWYp9g5o5zQ^gCc{z55G+-5DLrCk
z505I9oQb3J)r497KmTlAj1s*$K(Z^^-*JtP{0qOZ5yZ~ZCc$j)Q&ZoD5m5;_Id!Li
zT2BmF_%-}Pr&ug=jmeEJ0m;{h7?_;goXh+;1qZyFLH0Q=|IVMSZ6W#8&-lwUWE~wx
z-Ecq&HnIt!XHzgC3LA$e>L)VYw}|P~URWu?-LqUn<bzW#(&2`*;t^@`1qw6&4)@>r
z1(zxv!VIKI>JIDR`1{ZnOob>DxXy8%h$P0sFEvtP4jk;cr+{15%*>hGDGC35*W$mx
zloph)Tui;5JL&>Z<9A)_+auWQt^d(WR^wBFMVkv0akRwqf2TkHx9yQm$CN{E)1alX
zV=*+1UWgJ_*8xt#;jK~FW&?kkC?AQ}8kqmHe2FDmr)Q<4k2eJ+Fx>)%FHtB{X=!VV
zCc19JUB?&P=I|WWgZO){j_j0fclDs*{XKwmwY$sx-v72Cd0qrY5~xZVlfu(kcNfbU
z6i_U+WCn|<;ou>r#2I}KpqY;eT-&=LjDH@p{b7)Cy3fYI($WJ-X{gy4fI%BH?nwn~
zP=#+m2ke8)9-N$9{Ji!oy_zWo1U@u$pLV2nJ-61tfD+1W8{dSWV_`9?>;`AzD`Kwq
z$gIy}d|{;#a6@t#mHG205EC>jC4)mkewa!sa`PJCVm|b{>7+V5%J<9a>H((4R|`Jw
zRK{-?7eNC|0I5#>DB04?`X7Tgmt_D%gb}hEdCAGT0<F<F@%*sj872vYLgXv0t7`@i
zauz9Dti;sA5EB-L%vXKrIeU!&_Qo=1QiWE7<7_5KNc>481O#z!-n_Sovsv!eRa_;i
zlgT;ho|!Sw)?W7$QOsHwaC^~V1IHG<`kXERq9$okrc~dkz}BWk>_g~_*ROw6<)#zU
z(0KAy1C^M)X=;BtVK%#8dijuD<h#+R=Ouu73CYRa9$6%=Dq&$VRRR0%ii)KOIw2ah
zydnF^lio7ZTJ0nfxcjlZJZmt{^4L&N8g#)gGv9i(+E+%F*~H`<`LcK3fv?YHmHp+4
zpXpHB8?K&StkvzA3fSR_y$?b}M8qPzrDN|>^vd`;=*b`VazU5S+=NHlqL{wExY2JG
z8qB8{MTNx`2|kxzOwY;%ceDaFi>tpx5D12aey`1m3#k-H)7k=;2>NI0E+lAdtb`od
z_Ye0mFfcA=PBnUZyKx^&_{*rssxm{4k58oO`b;a?<7A#lWZm_6p-^zZ-0%ga-q7J8
z&X9&WEb;qlcf7Hz<m~n=S>6KiW_NM1cS7sq{@`Keor>t9@U+AlF3_k!LSwRh`y=YB
zDEG(@7FlRfgnR7L^77~?U!*WGGAD&7@m0aTS2)6-#$;TUr^EX-00HhRHd9jCs`{RX
zy@#L^n4BK8@V<Xj(Q5JvB2D)d62(azp+ZFTk81d+2{n)j%E)sX;2HaN1+J{DeSaKe
z+-~K>tr3ROUa%7#DJfNCcJ}aakGX5)Q&Lq$e!621HGO&!$PG}m4p+=aP&}_?K$G5q
zVum&-NAc#qmzDJ%J0t;W{`&rIW@F{c;}$W}L;Iqqs;RG|tG&8@efo3;<gu~5i^4vQ
zLiK{n9R#wye6>$qaHowJ2Q*I@jym-Vd#<Dl*|QsKd)&UKMaHu+d;^+@Y91!zem+PF
zC1iIRs$0~&&m4`rt)sAL_MYNy!{HWJzZ}vFOh&eh-~?DxNz|U2B=|J<31Ef)YMA}0
zSM$M6V{-R)4_ycaxMYd@8AJVtfQz9Fxl_QY&~nlKi&~nfa60Wd>o0ot(=F;QJ>FmV
zRS5}&zRb^05xMoNLkHhA-*Yyec>GrEqk-t(*=H{3pC`_ZNJvP~C`{W?28VVM*Gr^y
zc6M&MId<f=pWvRp4{ix;%ONZyBV*uutUg5uz8HPb8fZN<HMqqTr*QfL>{dhlk0!G~
zYc39s=g!Va|9LcCi<sKK{+hc%73TRq2b+@rpj~#mIEqos^}TD(nELk_J25jgEv-7>
z+#IyZ*_I+Cph6<-uU<J17Tf#zn)>-&X&S<MIj}7aQ@^UJY_YHOXEfQM3Y;UUSy{K^
zW^Yb1sc!bteRoJ!sqflZpR@HSJ^GkgTwI)Y_a`{yS4#_p;b6>f0B=V|Mg|9em9tnH
zn&M*ydd|8hT)P_>06o&TL-bMbeiS+AX!v7_<drMIvuAGZ?jt<IVX08tks{@Ml(Dg~
zySw{pU)p4oBNYU3GGR;Qe>4!45pdCy#P$At#V4_W_Uf69t*uz(vZCm9xEg4x+MGTc
z(e*(zR#lbc<uQtiW`ty`tfNz19q)Hg4dG0POb!r1_yq-<jt-Ct3JTaQ4d?AC+uQca
z%F0oq`=5YE<*}6rrNMam#Cx%q?-pSlqf@NG6qmwl|M~N0pQEylPh!UU_S2WJfPOnp
z$EmZEq;FjJ?%i{6C~>^rFOH9o2V^+t;v#;<BCCsA-V!iyhS0nAl4;W#$`Gi+bzNh=
zeZ^mYHCu6O#3tw#YuIP>nQ<b{+sTB5g_+|^U;CZ?XnlKth+`H#UyAYFMR-nD+3WH;
zGJJc8MU*Pwz7fhe>M(nAoGYIai)n6VW(K;(oRy<dHlPdhIZYVq+vsM0y0D;E?oV)=
z+AQ&@sj2$)9%Zcn8^$NZAuc8g$wo?VPjls$&CLno2-dCFHv>*8z$5zd1veC`VxWAp
zQCQk|Ghu6ZwJHjM%)fc_lVExIbjEY{q_k<K!Mg%wA}=q?%EH1;j2#yjCoeB=Z*Q;a
z`wfIJrgL;1PNMv$@jzPzcXxPjUU2K%uU}JL4wj^SGp}tML5NmOI?{d{OVm=tQKZ2O
zg)T3fi|hQ*wy*ctCe6Z1lJl6w33%>-#~k<hBIr?^3~ICx=vE9gK=Ep5l*!-OL`{e{
zmzj2Gi2m@|Br?QR*48G0z^kel=;Q)W0E+cI2*DanpPHJAjU5IS1I1+Zr0kjBO>;9^
zMh9a&HBC_FsDZ!x9y|!cdnuadVc>c2Q_5s6O9eSQmVw8GwCIb6-YonKOl;~v>L&_&
zO?p?)p2|{`f>iz{Uun#cir??Gu<-QkY*Rr&x53x1$zo7fPOic}b%?UG^*U?ylo*&p
z{k^^RQmR5Cj_043g=W4t`FJMzYFZLOa&mJa(YY1kpnbyI7Xn;QP7-;bV*K>fs;sK2
ztFQO=@xdFIDk>Tr%seEa^_lyLE-ohCe!hPX&B%wEO^=L;iAl`{rAx+F02<=kC8($}
z78Xn{7w%V#lS3fq9n~}4-Q80S>$A|K{wR^iurSzdKP+H1%@c6WU~YQn_^Y|b%QlmJ
zD}Vdji%rH19~)2%Pq1)#3%5aD^PUehY&^ZW1R1Wn&4fS6_h9;TMz+86$Ec<D3E%|*
z^9k&Be!f`%AeWh5dWj5NogeDz>N0xrg6Gb3C&T6WVvpV@%GdSXJTDxXW)Ij81N03@
zsrUnuRQ`Y!i8k2iD`J3VKg)Fg6S$^f+Rl5BF|~vmuC}qxU)4KpM|YVu1_Tfg5D>u{
zA89^1IzFZbg<4Pi$M8PsA&`$?KYs<nZYO6Y{O0h$o^kKOAgYT@f9rNNm`;DU^|oXE
zQ@-m_!k?x;;MDKCQBT#Ck3>+dIPLH6(?o}alvh;j*6%h-V_Wwo^Av(E102|ushiso
z-BX~)P~#F=e8<?v^G<r?$jOiK&s{yI{i~JeQjfgYp5~L)8~%YNM{<|0p3Km5iiq4q
z^Vr()>S}6^+LksJsJ+MtI3cOkD;Zj!@n1~?^D4o>$NF%k7llI6M6cbIsig@xAVM;6
zO#J-kex{3HiUVnd5$IqfK?Y}SSlBJtGvx;$mv5)Y1ze*>aYT;hCK%J7e_LByivx^@
ziJe`D<`)X3p817J*v0MgWE)!PwqE`=%#rZ%1Knx|VUMG+FU1U0K6}(*y%*zo83H1m
zbJrXQ1R}#{BfqbNElwt9z-s1vC?nu(4~LADl)~2zI1^Bbw~Ytg%(b<QaDRV*nMx5S
z$uh+PE@z#q888JXGM-hp%8$Q=15BBzI`_ir>eCoSVbnB=RkM@ze*E#KVYL>EynL@f
zT2)CEA$SZ%GN2^r-JYH{;SY@5`n|b3!sX%RF0h6|Q=!nKmSC8d(d`YbWF#FUqiC7O
zHjsJDTL}qSb&jt3Gd4GNy8HSFF+VAm=p$DTi#0YYM6bKzZ|zEozFz^*Riah4aM&*z
z77=mXcG!;(xM0|S(N_MeR09m?^>yoh(bEPgI-k?&Qy0Z0APG23R`m{8?{vlRPTp=o
zkGq;~md{>8pAk~tv?ucjr0tAbW~2#v?nJjp2JC&jJl&mSbdG+ZUcj2dXK8MZ0ONIC
zceAx+Ckne=&G3yhAIG`5_*rE?x#aTpgmqlhu)5C%-gtAdnUiDg?~jO%j*b#3&sCf}
z-KywkU|>iWaA)E>eE^Azk2iR4hy@twV<Os;C&5oCd{)LS6IgXEW|1#BnKsV$7oo8k
z8C2xtLKDi~-i-Bi^&u~q1UB~OTaIQ~=}k>dsQmUakI8s@()dPEz3zL|pxwH!yPM`)
z?9x(<H)H7c@^4?wwZqy}Gz=*5$no$A7OCcLFD{Ooyq5{cY~2%Tan_Hv#=Bit`y%$W
z`!XDd*WI9?c>$M@kavMH<>}kEZ|~o~PZ*X1&q3+0P!bTRD=As=rhtbMI)z_W_6j=u
z`}gm>ZQ5@mBN|D1yy=HP2*>{bsz6Iu3?nlWv&KxB3rIF#I24+xF2Y>5Fsu#ftn#*p
z4E&CpY_WswwAX3eYloG0x&(Li;EuD6Pa|>-M}Z|tJ$pkK)ltDN^4j^THJB>k^?E<e
zoS|Mq^B$XnIlo_&JbKK4m-Sfd-g(0ttmkY2-+?~))15&WxMajnEQm^;00F}v;eUHI
zD%z%?0O~S5J$+JA5@_^|Rnyg#g(49CHt^&Si3Xy-3J$iWybnV{Iu`f68mM(Op3ayJ
z8gX#*fwtyLijJt&v8afs3|8F7ttR_hXX9`<{67^EDB%3TrvxM<B$SjQ?Uopc1b?X%
zhP>e7I@Ck)lU8-)c3G(~#nMvh>gWKC{jS$VXeKp0e19vTi=!uu9r5Cs!N`O((ACNB
zt{7w_W)YEeV8W!5fBd-@1@k+raNpd~gUjR%Ax?Mdp-0<%vsY^!qK(!+KY;ND+RxG+
zXkHHr4sHVZ8+x>v06PW+AYdiQl89aVSNWEx$kh)3HyXQ^7&H7_IQdT3qG|7>6mnaF
zl;q@q%iEg_AjdTN`&wEuLhNVCy<5ndOtq`PGOc6dQ}5io9Ni+qj+KcPkidjb#ug0>
z4B&7cetv!^w^>y0ZsX+fAd;O*#7!z|0Gq$6w$}U9(|2Z~X27J3T-ar4Yh1?Bakoq{
zEiWNYCWlh!4(j3u2LGuTvAItD8^9(YvYa8=o8+J;lgzySH|J_RJKNjWi+LFV>up5A
zu{blPt~Tc8=J~@LrA-$$-MWv^YIgW3|A-iWNNfXUJvt6~!_lGIt~t+@vAp={SgOhi
z1~$OT<RMs2p?Yk$$BqHh0|Wd0QKF4DX(mzfprGRr(dM=vyWJIx=BIxz&}jDh2eiKH
zbh~2}&++)j^K5fJS5zFXu<F_r*ajSB<vk^T-Mn~+hld9=z0kGd2(r_iY2+TUWEb!#
z+ywMN^Vk=O!NEaF->ZG?_wS=2poNK6=$jF!GCwn^0h+CKnirFlM9=6qJY37_zgijx
z!5;S|QA=Cd7<RQlx98OWx^UcwK0E}~))zDz2L#+Kv&d^*H{ah3xH$yE*mUiILZFKF
z!K^MDqgiKg+K~|&ngcnT%IUp|P>y;I(<kH6oI*lVWgSPmymmjv?LNv%aHS(?(08ZK
zu6=hvd5sc18T*JM^uw}0-LPTr*X!z3N@Y*a(-_-Pk>jP9l9G}zLe^wAL61A{0w0Xn
zNf#q<eKboAghL5`$kU@WXV3SABq7Uab2_CfEqY1gbSMZ3PcAk~5&J7CibDHmb9f!p
zrn>}5si`ib`h@}KNJD`Qobg)c^}!rPAiG(_B!##{QUG(t+0L#=B8#LvIJ?(^Y!E1K
z9$H?BDJk`OZ0rKAD;51Bu5QL~ov_b+US2*90AlY3R0C=u|KeG|-e}X!#j;_szsvR)
z3tC!Q*x6nSFb}e`mlmT$NCOml7!J{4=g8UH8(4<l0Y(dlVv#=$4b4~caah2Wv#~LC
zMn6@<{)#*nA&X9Br$q%tf7f`qIaXEv1GGf$*1#m&y~tSIrZY}nwvn>@EFd4Mh(Qfz
z48UD!8){YqIrXPL_Dt=-+YJ-A*5w78zKXS#)!y;(kQKN1$(JGlO`dF88qCLu$4DXr
zBkdD*D!(80le~+tQy-`3Ix`Ck`^l<e!#re9&lCXlS6kz4Z{PBc@Me#L0~dQA4a{Dx
zi~{SmG~jx(^LuCa=kEEuHY@Hb&q~lQ)!x<y8K~$NqD?@~dM)-^rU&@k$RDCRHh?aG
z&v4re@WfB-h06YZP5>{8lKZ~Ji}o+=RFGet!%WjpJMm|cY%MP`%_#U8c+})81u_QK
z!(Y@C5M^&|u)da-MqV;Fr9S1ZU1}M2K6gKBpvG}`2CNk%Bi+b=-4Fp9g6xzMjgR4K
z81L?u5jAW|FuWmvNaqX=R7E_e@g)uU94g|shYN8BE*>}UgC5L~&yfOtYlH16l2H`;
zO##<Lx=pYBH;!5r!Ll5^4>eBuwW$c2<7=PBce^Va7PHvNAr`&Kaj*;Sh|1uly~rMm
zibc4;uGHnkL&?lsanlMNbsKd#xh+G{vqGI>${9ObU1ZqDlDP2Bw;SJ-UT~8}yz6MH
z<je7oXuB<`JOh3f=Htg;{%o9`oq;qO6`Be%!x@#<h8I{J_(UeqWDBnk0ag#1k4)8?
z9+h9#Pe+NIB>Eq=^SiEensHtZUw;v%;}<0D9mwhcIPns-S^zZfJqsSv2<U>zY_AGU
z^jPV0Z0b0f4DXe3$ENEMiwc5-X8;)BMawZ@?crG2S&^6T=cW|un%=>@Mj|3I(QFDk
zRSYx^>O}n-UNtqfsiupYYF>w_9|6}^K&xQ|aYjN+?6&!tfWIR$Vgw1RvhzNRmb^KE
z!5HI7$;f8Urgyi9XoI$>tt-accdWSi`8y~B&RS+~=TA?lg842xfXcNUqxc#64G5!!
zP5yA?@bc>ufF^hAE**l5pKi_G0{eyf+x6vXa9|+fa>h6Q9@6mUz%r}rwb^2ChUjf-
zObkBc+V`+2IQ+q+8o;`bDgO}WDOn8uGpZ_hiH-yN5KO`C4$+(Fal7<i7L51qHVQ}g
z$o_;;lbXkl9iRGDPs3nCYnem6SK*JpCl+q&!x|X_zxB7Y<uZO~XrwK7zY75GUOYZt
zM7V&8z=h5xAs4ZEb|+d-{rJafIU=xHPL2`KoI3zrC;2K~wDCCpnvje}2jov+BjkDt
z#VpdepHJ@w@C813D#FUgA}ZQ+m)P8*7MR}X{foS@*eJix<ORq(C+7+-kPP^M0|Yxh
z9;Ic|B<DOkKU^)<f!lPWx74<bSdA3xTEgB{ihFpR_@7Sm5qzxs5QKA(Ow5}X=UFmU
z>&j>e9}p?Jj*19rKp;jP$2gXz&(6G}*B0&zF`S~)MoX~}hIN^h-x8CMcvrc6vW)3}
zpeS+-?CB+|T?xsznz5SLY+ap+hij%$@+GCzdFI@ahoTd(2NG8~atk;q9jo*V3@#d%
zYl~6AvElxM5{qYr^-l92#=5#XIub%ai7`0ecBHzP$Jwo2O%LVulK&IjYtWVy|IpFV
z5im4C7iD-&^wF1}tINyV(-odJ=+B>F?lx|gNK=XY`jNNG8-YPA(rIflmSsxJz{b}2
z{kzp5>)7p>gzsrd{Vw6>Pi`bI4rS#5z{Hx&+e}^|%OkIqERuUuZa{mD@I?K<t5-S8
zv|A>k{2vvO#N?~6*4xK=D@|=5BP@ewAQ9k-xz0-2`1m{(M#xD!o;HsP+>s@Ik8HYc
z)V{0--dA}U{t|2nps^S5PO!AZeY(y)O<%uJL_{X;&e1$v?bm$qEbri;%5MB?S{ele
z^3px7K&`<4@+2rQs1U`J)m3SH?UT~$fdrJh+%5ml=bc?$<5#<|sG8~};nNvG$DOJ4
zbjptdS~@B+pkc)wC@bgZ=TN#h8PT)3QUEy;4N9q;_wG*gx3Du&v%mdy&;$m9i5NPa
z{hqHp;$~+D+g*JB@xuvR9ce^+f4^d;TEI~h3@lBa5IvZC!U#H7<CxT4Tn^6LB@jPx
z$w?2|Qyg!6hjM@Y5~G>;VcY^(=H%4W)zx9s+WPj*q~R?g6;+eh{@3c6i^VV3T%j*)
zcc##(e54k(u2!3_avF-lfxql;XxL=Hmascf>)H`X@$nJ}k~fuhphO`PxUgN<=6(WJ
z-2i|dsO7{h98|Z58B|xx?2HPjHMcjHlY$eII+K*z73~%kKsH01Y!tfGUajY4M9btL
z{1IfcKFI0mYmf}i{TiE^ZlhpFS$weD%YKnd76yU3iVD{|NE6Sl+vwLeBzjXOMOR)e
z>Nh6-h`*tAa?;m{=wmR#eRE_$VE~}T4&o|<QrKbdY=)4#%lM#q=}pt^=<nY~w*)xW
zQ()_}z8vu?Vv3tlU?k?Rul?BNJs6Z_x1VVM4y+Cx-t~H#XS!a!$DX5cID6iQ4}V-@
zWh$NBPSzjRFzg)R%qikY)s#Mn7AM3l#*m8B(X~Sn7V1|TOl~`DR?VS&8XqhxF~diE
zimK+6af%kSr;ke}unct{2;nL}z;GFJkruCc@Qb8#|I*Y=AT5df58mco@1`qS1&hYR
zp6L0Mt{%T{-?Bhh*xK6gIZSbQOpO^Y7=zfW_vUKp>I$7Q{_ydmwcz9t3D@`e9OF!5
zrihC(zFD+)8BL$Y#L@m_A&ki*4A=Ji__MetA29cN@+kq!om6B3`|8TdpbhN|_)!ka
zzSKwWh$JHJ1SVNoWJ@qkXi3y>X(_?<$7!FCG{4ZXiGiSA;V_+tq>cB*CI#rggX2~7
zSxt1IdFK~uDpsxLd8dudO+LqorG*8to%i5?45P3ZG3sZSis=H<_BO*|?1Lh0bU;&i
zLdF}C`qnz%8U%t-iBqN$F$G00(c{<TeLyDsj)5p`qLiCX9=1T)pf0KWI9!&b*b*wt
zk%Znkse0Bu5pQ>Vfdco9BJ8`bKA8CRy9ji&$_H~d==E3#BA#fMU!O3Bi`qInJC}eI
zAS>%TA4o*VqIWi4=Z^L}Q_W$j#(8V3EHg7RjEHs61|AxU-k-{UAFafp#8%{HY-Z-B
zb07<g(2uS(7S^z`nA!h?wUb>+T3T90X2GQv1LIO5L*QY!opf}CtCEru6#5{lWAYrO
z3AG0uBJ|95_O`+SS7Z~KY&QFJ=#s&cN!2(ElzNq3`+M)^Q~2zGLzm9w$+o|*nvWvm
zb0B~1WVFSY!J=Po2CjOqqgmQSxE1<Vv;byiZ@Rs^+r-HbWT(dz_n98AR&Qr%X-%k^
zB&1YzP|re%5$(HxpeYCoAt8-o1B6=_9-5Q0vo_o%Cn-t$s>+^k&{1i1d1Xapy;oW}
zI@$*Av)CS?Vm*^pCqM*BJ6Q^oH>$H4thHM=38nMabg{BpOP{U}`}{eCQ7gFbsi6CX
z*_(i$;Urvna!D@R6Y#(O`l}yAoaZhjnjYv^Dymc~9C)CZ_ysIOea-o!7~b18(1n^V
z{_)p4xSd6G5A_mDqWPxITWV@*pKcNVi^`baUE!9zuo)p2doD7~7o<-l!ppbxX`=N`
zYwvAnBywBhp@HAbVAZaREl;5UKWOpXRU3#v)ehq-s;c-D`1r)ci7xc!D?Lrcpp_@5
zHn6Vc0Xq7S2d|HpwM39a7Q@6d9Q+K?%hx073#$nUp0k~8d<-=NXjZB@IXNC&HF4Uy
z#>V#yoB6o7Y^@#UU1|Y)&_md`14UR(?b&`=ny@ABwil;w-_~#}&>_qyqgLm4j7@DT
zglIk>mk+#zCcwI~m)f<Q5?LcfT9B8~QeZv8cR~Kzo6ufK+k&+>kZo1D17hwM3<98Q
zmtjlxHSDG#D+}K~^U>u6m@MhSzVYmHLwG*cx-p+SxR_a4&sWCEzI^!tM28q<&LS$l
ziAG6bLOAne7or68e7ChdM6<$ZzQ*w&x_G2BvcOU11u`s}6EGLd=jU5r2L=YBDe3DU
zZn8JwWxY&(Mi@_srlh6x7s>``WE(b{OK~nH+`hi(XvD%kN60sCDAFi2cs1fR;+s3;
z$vMqBflj2x1hh381=inI!^u>ztAWmkFJHVsd$*CiF%nO>5D047zQ)b<CED`@Bv1%*
za_G67@X#ElyS>zIL*VAt1~X%2rm({AFPPaq34uc)C`<SC6T&y?O&Z#lw3z#7KpSms
zKzq*4u2`&5h_cC76Bx7Pa5pe1d(FJbw(pjIl(K$v6EN7&U~E!W(RqGJ)tJHW%8-C0
z2!#Tr9t<|}7idr0sRwAD1nuhjO8*h?r!xARV4^r^W}GC>#1GLHKE1Kk-IT;41dT75
zQf@q~_N|=|u}meVxbpa3man`^^DV(kELunl{kIVj5f{jneJ@eJQ(<=yflbbfL9ZbH
zM<>@A4%Zg72N6P)5S@q;BGGF^4Mu_}5uFjy`ykP~5JV@gJ}xdI`lwNc8xj#CdKtY=
z7>wTAx83_a_t*F9`?a5EW}mb7IcM+vzH6;_t%BNCAb0>QWEJz;-n6B*R{Ze;^|2qo
zgqM(zfasVTVCPo;EH<9_rAjU&z#ni%GCnnBX7PGpcuM8W5UkxMpMihZ8RM5S20`-`
zTepWb^<Te+{eCZRsHaB?0ZyC*94@-<?ddO<SF;@LUa}mKpGF)rp4+<GqAa0HU*6bh
zXlOW;0{N`dMC~eb`FFdjgt#~t7>v!6w>VGYTPC?OU<(|G0l~_TlQQFC47ij1wd&je
zOB<K-=|T;*pOm=TlLC7&xDBDAv2lhGKL-giXevm7P&gj=!JtdE>V<;<;m5-Ec*kKY
zTo*^Qbxa919ZA|6dZqdwS04>GL^&6C!3ny0dpB}|&$u3lA`1!@OJU9S8`O(#kJ>H=
zD@V`deaFts|5Dd1r-u9x5;PMuEFD2!(;^h-%Y0jBmYA#Hjh_Nam1bjanA!DMR%u;s
znr>^+ZQ*LfpIVfW%FXeiX67E|vUk!%fzujf^FDcE1q}6iSIi0SVP&kZ4O)om4n$E^
zRW<0z1$tFX%4LR?j;VXT{e7PTZ*YOTr>Bc!{@85Zy1k171vBm2%ZqamC0ZS_8wXOe
zM^&>rn7tmMAfaY8J4}-SFlB~bN`{`Ll$5$#Xb2WUW3@8HqwBrv9;T{zQ$T*4z1>+*
zv2b<=M13oYbf?Y#5T6&+P-O1gMG$D{+3zI@n=e#;PZ_AQH@7_q4pL*|2e-)<8D`Vx
z3?}rZsa$Q!HLs4BG?GrrOKUl&;Y{Atp#<LH#W?jsP>2DDm&{O>-=Y`0#6(3umD((S
z)~|LN)zjAxtexYsBz?m>Hu6zCVR?<@iJG)&Hv#3Fyd{t0ov5g}xw&9ChUT<O#%b^A
zK(fq@4J14EJLjR?sMRgCyVQ&=OEtmm8f>TFAh2|G#ixr{LGB6*S2Z>^_Vi9*Fm?5{
z)Hf*cczoHS?0r9KM#ihsKmjO~g)Y|6o<%K$XhzQl9wiPC7&5oKT&P<zF*%tLnlhY}
zx}ok*;*Wc3SfW?o&_HsN9g!0VNL4euMI^~ctn4@gcqk!rczlIHY4mP2@PEnPNf4Sl
zJw6^XDA9WmI3J-XpWC<W@y<NR_(3nwvNEpAFhXu?erU#c7i;DqvK|scWK3nC1q(k0
zxabK(fnT{o?*y9#rzwq+jsD8r+mj>da*{LIprNjAHf_e1!)hbS<b*+U=6-gDm9CWh
z3<5edvTKC4i~WUB1DQBnC=m%wB?}83*jA9cNzc-)Xg<WmbfgJzT@L)}5aXLn?L34}
zP%2Mi?B@$R-cxY>JV<%AgE&*$Wn0iNr?o>burN)jXOSV~8%KtQQvBe&PA)+~L5GEh
z1b;R)O>}pw-M>xP9(5}Le$V2LHW_(L)SiiaE}WxkZuc0hgkmkk-tJ*R1wCb?m6gj-
ze}6l}77-z0tmfiIZBcrzB`lrX#>uKww<I|^8Hq%;w6p*&<CkymInY+U#~yRNv60%&
z$zGn6;$A$>`E>+rg~i@DhJ=czA}aQ5auO~jCAI12A@_vgw%mP32bZ{*gvzoqG%Bn2
zu@)E{TW%`jg)akYIR5+A@fJ1?5^Jr&g=T7bf$SS$<)&>_waBR&JE|&TE!{4?5<Mm<
zG1Nre8aSbuq~J6}n;N_CK^;0EgfTZ4q=`;WNqO>Ar&uX(ylJ1DTq8!V*_(C<tF|lY
zJZ|A+ci3^LFg!By;`hCj?&P2*);5<c^}?piKUA|zMja)-eE9-NOiitGo6l#HsV8cm
z+&q)Jdsne^#Jnx2wY+@eM_xzI9}#UL?)e6#a_PWfXsqUPplE67yw2=fXqNdf=dov|
z-UE;^zN0Rk)-|FpS@Udy+R)JO+@_|2^V}vS?d`3ZoPB(&zcl(gu;2hq5N+@Q@!4nG
zOCDdC<FKcjC{yIy)uS=<l%D02;5^|O5J_+3k(89Ux7-;`yF{tn0-eSf1h!-{o1YA>
zr0F^8zj%?<*(Y?YE-He`%?+MOak>*{7GM=->hSXKA(944cKIowQsI>`HFQyFNO)9P
zF<^fXe7<kDHYUY)`<NJ5A3*=om7*L;sj9*s3}TdyPEKtz4MMidAn2o2r(XBww;@Ea
zg1+3~bfe+-;=<w@4u`BUro6j!QdwS34B^eAt>YWj7I}zOYTdz=ZlX?I{rx8kp6*K@
zdOT|9p!G|uG|GGU!GPi19d(ib1>?MKZLkD16=1ytGDMz$op4%gi=%%U)CbA<_>nsm
zCo7HVGcq<kKb<v=T9Z1B6nq*hXpTJkzRyw??2Nd@<t-_g*6eb6uw~N|by)#Bbx`^`
zgTpzFCN<X|mA%~eaVxE?-2B*3v_6h1kcmsQFC{LAovs3~{MmEq_Ve#wzg&%dj^6hf
zH~k2t<k8JH?+PbK4VLG9S`2K^jHVBFM(YHQHjd%Hdvh=CycpUWbpcb;&`^&a1K6;{
zKR9A2jMB6!!fnqPC<H6)v^+a}VW^=EBAOiRj3eXYjfKAv^3s<bRDl5jQJ_X%j!o-P
zwG1dM_*g%u7DWiTfBVD5fZ?BC@q|h|IzZ>};>By+13%)7=Lg3p`$ZLD-zwWKnp{j}
zw@nHL&ZLXO5Ky<Z2)NLmh12lJ;7f2K?3=Y<*p@cp`<_9e->{llh*f?+sxy&%ySap0
zq#WTV?9cyF0c~P+RdWcn5-A5!Rdc__fD&6A+LSBlZzt>Z4~V%s-(76$`LEfw*chwU
z*_@0xKKhu&1{WERy_L|;&Q-A@mRG5FtaG&KRC(XhR2bI)G6x5;;U?=<T{)^~v6bUn
zTo?X3OEcl&;ej_^7PX8ldy$&fyWZP$0HI=7^TA6W+wN?bDmLb#d#@{lGu)4NU2spg
zR;R0Cx%>su?B2CX32|}p;kBE(1^SjQR%~=^IqB()^vq4NvJ1;;=9FYOd~UWN$xwOJ
zhZgTmb0edbY)sAM<YdQJTkqmnv}psNw~VxOVpiCjz~aJ-f5RDbzd3-OEIz-b)Ji+U
zG~l0<7au^7o7sTHW97le=<V&*_@Lpni5baT2O8g64i)m6-{`!eEf^}`OMU$x8Ci#u
za3mI6l)PY>udK*@53A$qT<~23C3#T?JUOx@w;`FCSzt4<O8R?&L<BM2<ep_gqsIQ8
z9&(7+<_yf-0E8M3*0Y_pwY6nrCXX6@cB-Mnk3$7w<1>0mAqWIQQc_Yym<z%x<F}`1
zxiGIBslxe!0ZGsup)bxC<h#}G+a9vA!uSpoQWmkQ#Pep5hIqg0S#pXP5epF^VN)V^
zH=4obmk2kvHLlhHBv@WvRCfFKrDu%~4ti)hmnq(zb9-dk;9Oo&!7O6gc}At+?Bdef
z{j0tf`M4@rq2_^OHlNa`%67ccCX~XHdv~-^*40PlsMtxN{PSlra`LRlo)f_JX0QAU
z;hRn5yU^+GNX9Obm=u!cwQKtrlBiwIkxb*MzktIUn3yP`^i51~*o&i>M*_>6`(y8b
z>3)F6h>d%10WHE<&`$Kbf{xbgY_3Qu5)zWg=ad}mAQS)1;9qLB!jAzan;5ZfyO{y6
z6z+VMjg1YkQKIWN`|Vdaf>dpZXn<zqI@N)IfTnOd#SiB{n7gYTc5OLVdeBp4M`^R{
zeduKmhv=|4ia0+@?(RmeB0+97zl&v|+JF~WRuDzIV5UKGTKYC4a}J#06Fja?PNxCq
zeucWy?t`5-;LjiV?zF|E@khgGL53uV6k<N<R2e|y#Gs`6bbv%!sVLb&tzPQu(}B86
zUK{6BGi{k(sgmLAf>rs%Q^499P!&EBFdpNxHu;%*>81dZ*^@#;St0lo74`*p5sxp~
z0p@bF;Hxvy8ycP-ar9anQI^+N*bt!}`R#%I0@O&bW|X6|eT(15=L=^=+ZyZFkgaXp
zNarf;t5>teH5X7yhG>;qmA}8gSCtb<_G==)P9&V6mW;l7JQf^_>nuuBcJ&V<Xp>~M
z;$0v3C_i~<gw6`cea7;8fMQCYDk=y=&}ejCpIny-ozf?vuXrW)jzxFAU@qx0<vpwG
zQ*v|}>rxAc#9@HxtxI82CN2_pNFcoN>}{TF^qw9+YjAIWh0&{$IKOsBtD}2+p`0%?
zH3355Oe8G;Py@BxlA;xoU_V?H_eA6NUp)HA?>A`DL*q_}gm2VxtJ$LN_po}xStfW8
zGT!E+(=vR9x*#{<?Ce~cHD2|!(f>)dF$c4iK?F7K&6aK#Dim!Bu<qc%3*<dOwg72<
zR_F^1Y`wBjIQp7wru*Xe)f@ew+7$&E8K*0<s=k_%g1q_dHs?0Iz_NB`mXtdvpeL-R
z{jLeey-F7IP)G>w;E*9}BO2K;zthMb9^|$$A+b=aGKM6`*s~+@DmOltjw^EyyJl-)
z#Xu;Wah#8qrl+HeXO{SIKQ{9oMXaXtrp4ta{4Ge!(Skh$yiR(u2(5T6$ktg@*KxS&
zcMou!Ny|3(OD+BWo#N{>36c)#{OBOE{FO(2_)GgblL=~%2aa<r(uo-%Pj^R$OXA3&
zfq`;P_XK(c++PJ94}=lNQ^q^S;RXvefPZ4CdH7@7L%weLcY)v>DKID<(tW9&^SIDy
z)o6`-^+rrgLX0VJuqa#{1549iX7}LY{8f!$K@uk9`Slut=KivaY}HXlHA1nf?UH2f
z8(^7?N?)9{U4H9=0~05bitQ&F{a3x>bSHz5nNh8edthMTXbwNgQ<6B<-F;NxnpD8d
z)bQR`H&;bm2^q)m>Adov{;IEhN#7=1o2tgiB_+!>#>ycm#*5`fc<xBKW&^QF64z6N
zr#@+(9T_{}`Q=!RzogctFHTEae{c~K5}5P1#2gl@)xvl_s8OixI;}#wPjqB;O=%qg
zm9%J+@|-XwAm}UA`#hLDSQ?w<O05*gaKShrcJlKd_)6T~>LLvXxWz=?OkOlUKfjGR
z+3$q;0z}ghikv1M`t<2jqsP7Dy6wuWCTh^}hw!>!IuKRIL=;Aplq!OLH#-2fUbXG`
zux@b)DT=r5BA#?tkobBWCY<p#Oli(7-^%hij1=^;hIlbNSLLTCYEOF=@EWJ|zldoe
z3e-YiGbgjff?xJ^$6;4@P9y*~U;<hz8~^72#tL(|$t-@~=WF=zu-;3Cu&b%Rzx7g%
zh^y%8N(Dxdh^u>Az4j*H0Mos0;XQB6Bo%ZPpCeP;m;UdFd3aGVPl9s;P@EwW*)ciU
z)9HB^^qqch$8dG+)g1r7Eh5!@v8zpLt#!0s^55BcGVtgg-28_m3}0Gs-n)8Lu@Te6
z|Ge~&|Jn#do<V7E?{QHDA(%H##MU;T&IH=>9k0}<Q>t%ZAo<@P0dG=GH2?WyWnE`S
zpnQEj2km29R6%@o9le+sDk8P6JSXL|^07~p136CHBr6NudrX-hYDU>LTzB=LFp#%4
z?C9xK6UG`g9f24IC1fxdK#Rab=iPa)pnBEk2V`CF|7=4piDLR*h015}TnUUJYEUhe
J3MGrM{{f4=o!<Ze

literal 0
HcmV?d00001

diff --git a/website/sidebars.js b/website/sidebars.js
index ee816dd678..460b16947d 100644
--- a/website/sidebars.js
+++ b/website/sidebars.js
@@ -89,6 +89,7 @@ module.exports = {
             label: "Integrations",
             items: [
                 "admin_hosts_blender",
+                "admin_hosts_hiero",
                 "admin_hosts_maya",
                 "admin_hosts_nuke",
                 "admin_hosts_resolve",

From eac2793754505b2e418beb73ff1e75bea4be44fa Mon Sep 17 00:00:00 2001
From: Thomas Fricard <tfricard@ws114.prs.vfx.int>
Date: Tue, 28 Jun 2022 17:26:54 +0200
Subject: [PATCH 059/289] refactor imports

---
 openpype/hosts/hiero/api/launchforhiero.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openpype/hosts/hiero/api/launchforhiero.py b/openpype/hosts/hiero/api/launchforhiero.py
index 5c230eb9fe..5f7dbe23c9 100644
--- a/openpype/hosts/hiero/api/launchforhiero.py
+++ b/openpype/hosts/hiero/api/launchforhiero.py
@@ -1,7 +1,7 @@
 import logging
 
-from openpype.vendor.python.common.scriptsmenu import scriptsmenu
-from openpype.vendor.python.common.scriptsmenu.vendor.Qt import QtWidgets
+from scriptsmenu import scriptsmenu
+from Qt import QtWidgets
 
 
 log = logging.getLogger(__name__)

From 5822275b6c565a9852ce4a4f824befb1c7c5efe1 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 30 Jun 2022 10:34:36 +0200
Subject: [PATCH 060/289] move abstract meta pyblish class into
 openpype.pipeline.publish

---
 openpype/lib/abstract_metaplugins.py         | 35 +++++++++++++++++---
 openpype/pipeline/publish/__init__.py        |  6 ++++
 openpype/pipeline/publish/publish_plugins.py | 14 ++++++++
 3 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/openpype/lib/abstract_metaplugins.py b/openpype/lib/abstract_metaplugins.py
index f8163956ad..6199a96ef1 100644
--- a/openpype/lib/abstract_metaplugins.py
+++ b/openpype/lib/abstract_metaplugins.py
@@ -1,10 +1,35 @@
-from abc import ABCMeta
-from pyblish.plugin import MetaPlugin, ExplicitMetaPlugin
+"""Content was moved to 'openpype.pipeline.farm.abstract_metaplugins'.
+
+Please change your imports as soon as possible.
+
+File will be probably removed in OpenPype 3.14.*
+"""
+
+import warnings
+from openpype.pipeline.publish import (
+    AbstractMetaInstancePlugin,
+    AbstractMetaContextPlugin
+)
 
 
-class AbstractMetaInstancePlugin(ABCMeta, MetaPlugin):
+class MetaPluginsDeprecated(DeprecationWarning):
     pass
 
 
-class AbstractMetaContextPlugin(ABCMeta, ExplicitMetaPlugin):
-    pass
+warnings.simplefilter("always", MetaPluginsDeprecated)
+warnings.warn(
+    (
+        "Content of 'abstract_metaplugins' was moved."
+        "\nUsing deprecated source of 'abstract_metaplugins'. Content was"
+        " moved to 'openpype.pipeline.farm.abstract_metaplugins'."
+        " Please change your imports as soon as possible."
+    ),
+    category=MetaPluginsDeprecated,
+    stacklevel=4
+)
+
+
+__all__ = (
+    "AbstractMetaInstancePlugin",
+    "AbstractMetaContextPlugin",
+)
diff --git a/openpype/pipeline/publish/__init__.py b/openpype/pipeline/publish/__init__.py
index af5d7c4a91..03d730f37a 100644
--- a/openpype/pipeline/publish/__init__.py
+++ b/openpype/pipeline/publish/__init__.py
@@ -1,4 +1,7 @@
 from .publish_plugins import (
+    AbstractMetaInstancePlugin,
+    AbstractMetaContextPlugin,
+
     PublishValidationError,
     PublishXmlValidationError,
     KnownPublishError,
@@ -15,6 +18,9 @@ from .lib import (
 
 
 __all__ = (
+    "AbstractMetaInstancePlugin",
+    "AbstractMetaContextPlugin",
+
     "PublishValidationError",
     "PublishXmlValidationError",
     "KnownPublishError",
diff --git a/openpype/pipeline/publish/publish_plugins.py b/openpype/pipeline/publish/publish_plugins.py
index 2402a005c2..71a2c675b6 100644
--- a/openpype/pipeline/publish/publish_plugins.py
+++ b/openpype/pipeline/publish/publish_plugins.py
@@ -1,7 +1,17 @@
+from abc import ABCMeta
+from pyblish.plugin import MetaPlugin, ExplicitMetaPlugin
 from openpype.lib import BoolDef
 from .lib import load_help_content_from_plugin
 
 
+class AbstractMetaInstancePlugin(ABCMeta, MetaPlugin):
+    pass
+
+
+class AbstractMetaContextPlugin(ABCMeta, ExplicitMetaPlugin):
+    pass
+
+
 class PublishValidationError(Exception):
     """Validation error happened during publishing.
 
@@ -16,6 +26,7 @@ class PublishValidationError(Exception):
         description(str): Detailed description of an error. It is possible
             to use Markdown syntax.
     """
+
     def __init__(self, message, title=None, description=None, detail=None):
         self.message = message
         self.title = title or "< Missing title >"
@@ -49,6 +60,7 @@ class KnownPublishError(Exception):
 
     Message will be shown in UI for artist.
     """
+
     pass
 
 
@@ -92,6 +104,7 @@ class OpenPypePyblishPluginMixin:
         Returns:
             list<AbtractAttrDef>: Attribute definitions for plugin.
         """
+
         return []
 
     @classmethod
@@ -116,6 +129,7 @@ class OpenPypePyblishPluginMixin:
         Args:
             data(dict): Data from instance or context.
         """
+
         return (
             data
             .get("publish_attributes", {})

From 2d8c41cc6e6e53ecc21372f75bfd590397a33a28 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 30 Jun 2022 10:39:05 +0200
Subject: [PATCH 061/289] moved render abstractions to
 openpype.pipeline.publish

---
 .../plugins/publish/collect_render.py         |   6 +-
 .../plugins/publish/collect_farm_render.py    |   8 +-
 openpype/lib/abstract_collect_render.py       | 280 ++----------------
 openpype/lib/abstract_expected_files.py       |  71 ++---
 .../deadline/abstract_submit_deadline.py      |   2 +-
 openpype/pipeline/publish/__init__.py         |  11 +
 .../publish/abstract_collect_render.py        | 268 +++++++++++++++++
 .../publish/abstract_expected_files.py        |  53 ++++
 8 files changed, 386 insertions(+), 313 deletions(-)
 create mode 100644 openpype/pipeline/publish/abstract_collect_render.py
 create mode 100644 openpype/pipeline/publish/abstract_expected_files.py

diff --git a/openpype/hosts/aftereffects/plugins/publish/collect_render.py b/openpype/hosts/aftereffects/plugins/publish/collect_render.py
index 97b3175c57..bb199a61f7 100644
--- a/openpype/hosts/aftereffects/plugins/publish/collect_render.py
+++ b/openpype/hosts/aftereffects/plugins/publish/collect_render.py
@@ -6,8 +6,8 @@ import attr
 import pyblish.api
 
 from openpype.settings import get_project_settings
-from openpype.lib import abstract_collect_render
-from openpype.lib.abstract_collect_render import RenderInstance
+from openpype.pipeline import publish
+from openpype.pipeline.publish import RenderInstance
 
 from openpype.hosts.aftereffects.api import get_stub
 
@@ -25,7 +25,7 @@ class AERenderInstance(RenderInstance):
     file_name = attr.ib(default=None)
 
 
-class CollectAERender(abstract_collect_render.AbstractCollectRender):
+class CollectAERender(publish.AbstractCollectRender):
 
     order = pyblish.api.CollectorOrder + 0.405
     label = "Collect After Effects Render Layers"
diff --git a/openpype/hosts/harmony/plugins/publish/collect_farm_render.py b/openpype/hosts/harmony/plugins/publish/collect_farm_render.py
index 3e9e680efd..f6b26eb3e8 100644
--- a/openpype/hosts/harmony/plugins/publish/collect_farm_render.py
+++ b/openpype/hosts/harmony/plugins/publish/collect_farm_render.py
@@ -4,11 +4,10 @@ from pathlib import Path
 
 import attr
 
-import openpype.lib
-import openpype.lib.abstract_collect_render
-from openpype.lib.abstract_collect_render import RenderInstance
 from openpype.lib import get_formatted_current_time
 from openpype.pipeline import legacy_io
+from openpype.pipeline import publish
+from openpype.pipeline.publish import RenderInstance
 import openpype.hosts.harmony.api as harmony
 
 
@@ -20,8 +19,7 @@ class HarmonyRenderInstance(RenderInstance):
     leadingZeros = attr.ib(default=3)
 
 
-class CollectFarmRender(openpype.lib.abstract_collect_render.
-                        AbstractCollectRender):
+class CollectFarmRender(publish.AbstractCollectRender):
     """Gather all publishable renders."""
 
     # https://docs.toonboom.com/help/harmony-17/premium/reference/node/output/write-node-image-formats.html
diff --git a/openpype/lib/abstract_collect_render.py b/openpype/lib/abstract_collect_render.py
index 3d81f6d794..2cc1c23822 100644
--- a/openpype/lib/abstract_collect_render.py
+++ b/openpype/lib/abstract_collect_render.py
@@ -1,269 +1,33 @@
 # -*- coding: utf-8 -*-
-"""Collect render template.
+"""Content was moved to 'openpype.pipeline.farm.abstract_collect_render'.
 
-TODO: use @dataclass when times come.
+Please change your imports as soon as possible.
 
+File will be probably removed in OpenPype 3.14.*
 """
-from abc import abstractmethod
 
-import attr
-import six
-
-import pyblish.api
-
-from openpype.pipeline import legacy_io
-
-from .abstract_metaplugins import AbstractMetaContextPlugin
+import warnings
+from openpype.pipeline.publish import AbstractCollectRender, RenderInstance
 
 
-@attr.s
-class RenderInstance(object):
-    """Data collected by collectors.
-
-    This data class later on passed to collected instances.
-    Those attributes are required later on.
-
-    """
-
-    # metadata
-    version = attr.ib()  # instance version
-    time = attr.ib()  # time of instance creation (get_formatted_current_time)
-    source = attr.ib()  # path to source scene file
-    label = attr.ib()  # label to show in GUI
-    subset = attr.ib()  # subset name
-    task = attr.ib()  # task name
-    asset = attr.ib()  # asset name (AVALON_ASSET)
-    attachTo = attr.ib()  # subset name to attach render to
-    setMembers = attr.ib()  # list of nodes/members producing render output
-    publish = attr.ib()  # bool, True to publish instance
-    name = attr.ib()  # instance name
-
-    # format settings
-    resolutionWidth = attr.ib()  # resolution width (1920)
-    resolutionHeight = attr.ib()  # resolution height (1080)
-    pixelAspect = attr.ib()  # pixel aspect (1.0)
-
-    # time settings
-    frameStart = attr.ib()  # start frame
-    frameEnd = attr.ib()  # start end
-    frameStep = attr.ib()  # frame step
-
-    handleStart = attr.ib(default=None)  # start frame
-    handleEnd = attr.ib(default=None)  # start frame
-
-    # for software (like Harmony) where frame range cannot be set by DB
-    # handles need to be propagated if exist
-    ignoreFrameHandleCheck = attr.ib(default=False)
-
-    # --------------------
-    # With default values
-    # metadata
-    renderer = attr.ib(default="")  # renderer - can be used in Deadline
-    review = attr.ib(default=False)  # generate review from instance (bool)
-    priority = attr.ib(default=50)  # job priority on farm
-
-    family = attr.ib(default="renderlayer")
-    families = attr.ib(default=["renderlayer"])  # list of families
-
-    # format settings
-    multipartExr = attr.ib(default=False)  # flag for multipart exrs
-    convertToScanline = attr.ib(default=False)  # flag for exr conversion
-
-    tileRendering = attr.ib(default=False)  # bool: treat render as tiles
-    tilesX = attr.ib(default=0)  # number of tiles in X
-    tilesY = attr.ib(default=0)  # number of tiles in Y
-
-    # submit_publish_job
-    toBeRenderedOn = attr.ib(default=None)
-    deadlineSubmissionJob = attr.ib(default=None)
-    anatomyData = attr.ib(default=None)
-    outputDir = attr.ib(default=None)
-    context = attr.ib(default=None)
-
-    @frameStart.validator
-    def check_frame_start(self, _, value):
-        """Validate if frame start is not larger then end."""
-        if value > self.frameEnd:
-            raise ValueError("frameStart must be smaller "
-                             "or equal then frameEnd")
-
-    @frameEnd.validator
-    def check_frame_end(self, _, value):
-        """Validate if frame end is not less then start."""
-        if value < self.frameStart:
-            raise ValueError("frameEnd must be smaller "
-                             "or equal then frameStart")
-
-    @tilesX.validator
-    def check_tiles_x(self, _, value):
-        """Validate if tile x isn't less then 1."""
-        if not self.tileRendering:
-            return
-        if value < 1:
-            raise ValueError("tile X size cannot be less then 1")
-
-        if value == 1 and self.tilesY == 1:
-            raise ValueError("both tiles X a Y sizes are set to 1")
-
-    @tilesY.validator
-    def check_tiles_y(self, _, value):
-        """Validate if tile y isn't less then 1."""
-        if not self.tileRendering:
-            return
-        if value < 1:
-            raise ValueError("tile Y size cannot be less then 1")
-
-        if value == 1 and self.tilesX == 1:
-            raise ValueError("both tiles X a Y sizes are set to 1")
+class CollectRenderDeprecated(DeprecationWarning):
+    pass
 
 
-@six.add_metaclass(AbstractMetaContextPlugin)
-class AbstractCollectRender(pyblish.api.ContextPlugin):
-    """Gather all publishable render layers from renderSetup."""
+warnings.simplefilter("always", CollectRenderDeprecated)
+warnings.warn(
+    (
+        "Content of 'abstract_collect_render' was moved."
+        "\nUsing deprecated source of 'abstract_collect_render'. Content was"
+        " move to 'openpype.pipeline.farm.abstract_collect_render'."
+        " Please change your imports as soon as possible."
+    ),
+    category=CollectRenderDeprecated,
+    stacklevel=4
+)
 
-    order = pyblish.api.CollectorOrder + 0.01
-    label = "Collect Render"
-    sync_workfile_version = False
 
-    def __init__(self, *args, **kwargs):
-        """Constructor."""
-        super(AbstractCollectRender, self).__init__(*args, **kwargs)
-        self._file_path = None
-        self._asset = legacy_io.Session["AVALON_ASSET"]
-        self._context = None
-
-    def process(self, context):
-        """Entry point to collector."""
-        self._context = context
-        for instance in context:
-            # make sure workfile instance publishing is enabled
-            try:
-                if "workfile" in instance.data["families"]:
-                    instance.data["publish"] = True
-                # TODO merge renderFarm and render.farm
-                if ("renderFarm" in instance.data["families"] or
-                        "render.farm" in instance.data["families"]):
-                    instance.data["remove"] = True
-            except KeyError:
-                # be tolerant if 'families' is missing.
-                pass
-
-        self._file_path = context.data["currentFile"].replace("\\", "/")
-
-        render_instances = self.get_instances(context)
-        for render_instance in render_instances:
-            exp_files = self.get_expected_files(render_instance)
-            assert exp_files, "no file names were generated, this is bug"
-
-            # if we want to attach render to subset, check if we have AOV's
-            # in expectedFiles. If so, raise error as we cannot attach AOV
-            # (considered to be subset on its own) to another subset
-            if render_instance.attachTo:
-                assert isinstance(exp_files, list), (
-                    "attaching multiple AOVs or renderable cameras to "
-                    "subset is not supported"
-                )
-
-            frame_start_render = int(render_instance.frameStart)
-            frame_end_render = int(render_instance.frameEnd)
-            if (render_instance.ignoreFrameHandleCheck or
-                    int(context.data['frameStartHandle']) == frame_start_render
-                    and int(context.data['frameEndHandle']) == frame_end_render):  # noqa: W503, E501
-
-                handle_start = context.data['handleStart']
-                handle_end = context.data['handleEnd']
-                frame_start = context.data['frameStart']
-                frame_end = context.data['frameEnd']
-                frame_start_handle = context.data['frameStartHandle']
-                frame_end_handle = context.data['frameEndHandle']
-            else:
-                handle_start = 0
-                handle_end = 0
-                frame_start = frame_start_render
-                frame_end = frame_end_render
-                frame_start_handle = frame_start_render
-                frame_end_handle = frame_end_render
-
-            data = {
-                "handleStart": handle_start,
-                "handleEnd": handle_end,
-                "frameStart": frame_start,
-                "frameEnd": frame_end,
-                "frameStartHandle": frame_start_handle,
-                "frameEndHandle": frame_end_handle,
-                "byFrameStep": int(render_instance.frameStep),
-
-                "author": context.data["user"],
-                # Add source to allow tracing back to the scene from
-                # which was submitted originally
-                "expectedFiles": exp_files,
-            }
-            if self.sync_workfile_version:
-                data["version"] = context.data["version"]
-
-            # add additional data
-            data = self.add_additional_data(data)
-            render_instance_dict = attr.asdict(render_instance)
-
-            instance = context.create_instance(render_instance.name)
-            instance.data["label"] = render_instance.label
-            instance.data.update(render_instance_dict)
-            instance.data.update(data)
-
-        self.post_collecting_action()
-
-    @abstractmethod
-    def get_instances(self, context):
-        """Get all renderable instances and their data.
-
-        Args:
-            context (pyblish.api.Context): Context object.
-
-        Returns:
-            list of :class:`RenderInstance`: All collected renderable instances
-                (like render layers, write nodes, etc.)
-
-        """
-        pass
-
-    @abstractmethod
-    def get_expected_files(self, render_instance):
-        """Get list of expected files.
-
-        Returns:
-            list: expected files. This can be either simple list of files with
-                their paths, or list of dictionaries, where key is name of AOV
-                for example and value is list of files for that AOV.
-
-        Example::
-
-            ['/path/to/file.001.exr', '/path/to/file.002.exr']
-
-            or as dictionary:
-
-            [
-                {
-                    "beauty": ['/path/to/beauty.001.exr', ...],
-                    "mask": ['/path/to/mask.001.exr']
-                }
-            ]
-
-        """
-        pass
-
-    def add_additional_data(self, data):
-        """Add additional data to collected instance.
-
-        This can be overridden by host implementation to add custom
-        additional data.
-
-        """
-        return data
-
-    def post_collecting_action(self):
-        """Execute some code after collection is done.
-
-        This is useful for example for restoring current render layer.
-
-        """
-        pass
+__all__ = (
+    "AbstractCollectRender",
+    "RenderInstance"
+)
diff --git a/openpype/lib/abstract_expected_files.py b/openpype/lib/abstract_expected_files.py
index f9f3c17ef5..bb433a8b11 100644
--- a/openpype/lib/abstract_expected_files.py
+++ b/openpype/lib/abstract_expected_files.py
@@ -1,53 +1,32 @@
 # -*- coding: utf-8 -*-
-"""Abstract ExpectedFile class definition."""
-from abc import ABCMeta, abstractmethod
-import six
+"""Content was moved to 'openpype.pipeline.farm.abstract_expected_files'.
+
+Please change your imports as soon as possible.
+
+File will be probably removed in OpenPype 3.14.*
+"""
+
+import warnings
+from openpype.pipeline.publish import ExpectedFiles
 
 
-@six.add_metaclass(ABCMeta)
-class ExpectedFiles:
-    """Class grouping functionality for all supported renderers.
-
-    Attributes:
-        multipart (bool): Flag if multipart exrs are used.
-
-    """
-
-    multipart = False
-
-    @abstractmethod
-    def get(self, render_instance):
-        """Get expected files for given renderer and render layer.
-
-        This method should return dictionary of all files we are expecting
-        to be rendered from the host. Usually `render_instance` corresponds
-        to *render layer*. Result can be either flat list with the file
-        paths or it can be list of dictionaries. Each key corresponds to
-        for example AOV name or channel, etc.
-
-        Example::
-
-            ['/path/to/file.001.exr', '/path/to/file.002.exr']
-
-            or as dictionary:
-
-            [
-                {
-                    "beauty": ['/path/to/beauty.001.exr', ...],
-                    "mask": ['/path/to/mask.001.exr']
-                }
-            ]
+class ExpectedFilesDeprecated(DeprecationWarning):
+    pass
 
 
-        Args:
-            render_instance (:class:`RenderInstance`): Data passed from
-                collector to determine files. This should be instance of
-                :class:`abstract_collect_render.RenderInstance`
+warnings.simplefilter("always", ExpectedFilesDeprecated)
+warnings.warn(
+    (
+        "Content of 'abstract_expected_files' was moved."
+        "\nUsing deprecated source of 'abstract_expected_files'. Content was"
+        " move to 'openpype.pipeline.farm.abstract_expected_files'."
+        " Please change your imports as soon as possible."
+    ),
+    category=ExpectedFilesDeprecated,
+    stacklevel=4
+)
 
-        Returns:
-            list: Full paths to expected rendered files.
-            list of dict: Path to expected rendered files categorized by
-                AOVs, etc.
 
-        """
-        raise NotImplementedError()
+__all__ = (
+    "ExpectedFiles",
+)
diff --git a/openpype/modules/deadline/abstract_submit_deadline.py b/openpype/modules/deadline/abstract_submit_deadline.py
index 22902d79ea..3f54273a56 100644
--- a/openpype/modules/deadline/abstract_submit_deadline.py
+++ b/openpype/modules/deadline/abstract_submit_deadline.py
@@ -15,7 +15,7 @@ import attr
 import requests
 
 import pyblish.api
-from openpype.lib.abstract_metaplugins import AbstractMetaInstancePlugin
+from openpype.pipeline.publish import AbstractMetaInstancePlugin
 
 
 def requests_post(*args, **kwargs):
diff --git a/openpype/pipeline/publish/__init__.py b/openpype/pipeline/publish/__init__.py
index 03d730f37a..aa7fe0bdbf 100644
--- a/openpype/pipeline/publish/__init__.py
+++ b/openpype/pipeline/publish/__init__.py
@@ -16,6 +16,12 @@ from .lib import (
     load_help_content_from_filepath,
 )
 
+from .abstract_expected_files import ExpectedFiles
+from .abstract_collect_render import (
+    RenderInstance,
+    AbstractCollectRender,
+)
+
 
 __all__ = (
     "AbstractMetaInstancePlugin",
@@ -31,4 +37,9 @@ __all__ = (
     "publish_plugins_discover",
     "load_help_content_from_plugin",
     "load_help_content_from_filepath",
+
+    "ExpectedFiles",
+
+    "RenderInstance",
+    "AbstractCollectRender",
 )
diff --git a/openpype/pipeline/publish/abstract_collect_render.py b/openpype/pipeline/publish/abstract_collect_render.py
new file mode 100644
index 0000000000..2e537227c3
--- /dev/null
+++ b/openpype/pipeline/publish/abstract_collect_render.py
@@ -0,0 +1,268 @@
+# -*- coding: utf-8 -*-
+"""Collect render template.
+
+TODO: use @dataclass when times come.
+
+"""
+from abc import abstractmethod
+
+import attr
+import six
+
+import pyblish.api
+
+from openpype.pipeline import legacy_io
+from .publish_plugins import AbstractMetaContextPlugin
+
+
+@attr.s
+class RenderInstance(object):
+    """Data collected by collectors.
+
+    This data class later on passed to collected instances.
+    Those attributes are required later on.
+
+    """
+
+    # metadata
+    version = attr.ib()  # instance version
+    time = attr.ib()  # time of instance creation (get_formatted_current_time)
+    source = attr.ib()  # path to source scene file
+    label = attr.ib()  # label to show in GUI
+    subset = attr.ib()  # subset name
+    task = attr.ib()  # task name
+    asset = attr.ib()  # asset name (AVALON_ASSET)
+    attachTo = attr.ib()  # subset name to attach render to
+    setMembers = attr.ib()  # list of nodes/members producing render output
+    publish = attr.ib()  # bool, True to publish instance
+    name = attr.ib()  # instance name
+
+    # format settings
+    resolutionWidth = attr.ib()  # resolution width (1920)
+    resolutionHeight = attr.ib()  # resolution height (1080)
+    pixelAspect = attr.ib()  # pixel aspect (1.0)
+
+    # time settings
+    frameStart = attr.ib()  # start frame
+    frameEnd = attr.ib()  # start end
+    frameStep = attr.ib()  # frame step
+
+    handleStart = attr.ib(default=None)  # start frame
+    handleEnd = attr.ib(default=None)  # start frame
+
+    # for software (like Harmony) where frame range cannot be set by DB
+    # handles need to be propagated if exist
+    ignoreFrameHandleCheck = attr.ib(default=False)
+
+    # --------------------
+    # With default values
+    # metadata
+    renderer = attr.ib(default="")  # renderer - can be used in Deadline
+    review = attr.ib(default=False)  # generate review from instance (bool)
+    priority = attr.ib(default=50)  # job priority on farm
+
+    family = attr.ib(default="renderlayer")
+    families = attr.ib(default=["renderlayer"])  # list of families
+
+    # format settings
+    multipartExr = attr.ib(default=False)  # flag for multipart exrs
+    convertToScanline = attr.ib(default=False)  # flag for exr conversion
+
+    tileRendering = attr.ib(default=False)  # bool: treat render as tiles
+    tilesX = attr.ib(default=0)  # number of tiles in X
+    tilesY = attr.ib(default=0)  # number of tiles in Y
+
+    # submit_publish_job
+    toBeRenderedOn = attr.ib(default=None)
+    deadlineSubmissionJob = attr.ib(default=None)
+    anatomyData = attr.ib(default=None)
+    outputDir = attr.ib(default=None)
+    context = attr.ib(default=None)
+
+    @frameStart.validator
+    def check_frame_start(self, _, value):
+        """Validate if frame start is not larger then end."""
+        if value > self.frameEnd:
+            raise ValueError("frameStart must be smaller "
+                             "or equal then frameEnd")
+
+    @frameEnd.validator
+    def check_frame_end(self, _, value):
+        """Validate if frame end is not less then start."""
+        if value < self.frameStart:
+            raise ValueError("frameEnd must be smaller "
+                             "or equal then frameStart")
+
+    @tilesX.validator
+    def check_tiles_x(self, _, value):
+        """Validate if tile x isn't less then 1."""
+        if not self.tileRendering:
+            return
+        if value < 1:
+            raise ValueError("tile X size cannot be less then 1")
+
+        if value == 1 and self.tilesY == 1:
+            raise ValueError("both tiles X a Y sizes are set to 1")
+
+    @tilesY.validator
+    def check_tiles_y(self, _, value):
+        """Validate if tile y isn't less then 1."""
+        if not self.tileRendering:
+            return
+        if value < 1:
+            raise ValueError("tile Y size cannot be less then 1")
+
+        if value == 1 and self.tilesX == 1:
+            raise ValueError("both tiles X a Y sizes are set to 1")
+
+
+@six.add_metaclass(AbstractMetaContextPlugin)
+class AbstractCollectRender(pyblish.api.ContextPlugin):
+    """Gather all publishable render layers from renderSetup."""
+
+    order = pyblish.api.CollectorOrder + 0.01
+    label = "Collect Render"
+    sync_workfile_version = False
+
+    def __init__(self, *args, **kwargs):
+        """Constructor."""
+        super(AbstractCollectRender, self).__init__(*args, **kwargs)
+        self._file_path = None
+        self._asset = legacy_io.Session["AVALON_ASSET"]
+        self._context = None
+
+    def process(self, context):
+        """Entry point to collector."""
+        self._context = context
+        for instance in context:
+            # make sure workfile instance publishing is enabled
+            try:
+                if "workfile" in instance.data["families"]:
+                    instance.data["publish"] = True
+                # TODO merge renderFarm and render.farm
+                if ("renderFarm" in instance.data["families"] or
+                        "render.farm" in instance.data["families"]):
+                    instance.data["remove"] = True
+            except KeyError:
+                # be tolerant if 'families' is missing.
+                pass
+
+        self._file_path = context.data["currentFile"].replace("\\", "/")
+
+        render_instances = self.get_instances(context)
+        for render_instance in render_instances:
+            exp_files = self.get_expected_files(render_instance)
+            assert exp_files, "no file names were generated, this is bug"
+
+            # if we want to attach render to subset, check if we have AOV's
+            # in expectedFiles. If so, raise error as we cannot attach AOV
+            # (considered to be subset on its own) to another subset
+            if render_instance.attachTo:
+                assert isinstance(exp_files, list), (
+                    "attaching multiple AOVs or renderable cameras to "
+                    "subset is not supported"
+                )
+
+            frame_start_render = int(render_instance.frameStart)
+            frame_end_render = int(render_instance.frameEnd)
+            if (render_instance.ignoreFrameHandleCheck or
+                    int(context.data['frameStartHandle']) == frame_start_render
+                    and int(context.data['frameEndHandle']) == frame_end_render):  # noqa: W503, E501
+
+                handle_start = context.data['handleStart']
+                handle_end = context.data['handleEnd']
+                frame_start = context.data['frameStart']
+                frame_end = context.data['frameEnd']
+                frame_start_handle = context.data['frameStartHandle']
+                frame_end_handle = context.data['frameEndHandle']
+            else:
+                handle_start = 0
+                handle_end = 0
+                frame_start = frame_start_render
+                frame_end = frame_end_render
+                frame_start_handle = frame_start_render
+                frame_end_handle = frame_end_render
+
+            data = {
+                "handleStart": handle_start,
+                "handleEnd": handle_end,
+                "frameStart": frame_start,
+                "frameEnd": frame_end,
+                "frameStartHandle": frame_start_handle,
+                "frameEndHandle": frame_end_handle,
+                "byFrameStep": int(render_instance.frameStep),
+
+                "author": context.data["user"],
+                # Add source to allow tracing back to the scene from
+                # which was submitted originally
+                "expectedFiles": exp_files,
+            }
+            if self.sync_workfile_version:
+                data["version"] = context.data["version"]
+
+            # add additional data
+            data = self.add_additional_data(data)
+            render_instance_dict = attr.asdict(render_instance)
+
+            instance = context.create_instance(render_instance.name)
+            instance.data["label"] = render_instance.label
+            instance.data.update(render_instance_dict)
+            instance.data.update(data)
+
+        self.post_collecting_action()
+
+    @abstractmethod
+    def get_instances(self, context):
+        """Get all renderable instances and their data.
+
+        Args:
+            context (pyblish.api.Context): Context object.
+
+        Returns:
+            list of :class:`RenderInstance`: All collected renderable instances
+                (like render layers, write nodes, etc.)
+
+        """
+        pass
+
+    @abstractmethod
+    def get_expected_files(self, render_instance):
+        """Get list of expected files.
+
+        Returns:
+            list: expected files. This can be either simple list of files with
+                their paths, or list of dictionaries, where key is name of AOV
+                for example and value is list of files for that AOV.
+
+        Example::
+
+            ['/path/to/file.001.exr', '/path/to/file.002.exr']
+
+            or as dictionary:
+
+            [
+                {
+                    "beauty": ['/path/to/beauty.001.exr', ...],
+                    "mask": ['/path/to/mask.001.exr']
+                }
+            ]
+
+        """
+        pass
+
+    def add_additional_data(self, data):
+        """Add additional data to collected instance.
+
+        This can be overridden by host implementation to add custom
+        additional data.
+
+        """
+        return data
+
+    def post_collecting_action(self):
+        """Execute some code after collection is done.
+
+        This is useful for example for restoring current render layer.
+
+        """
+        pass
diff --git a/openpype/pipeline/publish/abstract_expected_files.py b/openpype/pipeline/publish/abstract_expected_files.py
new file mode 100644
index 0000000000..f9f3c17ef5
--- /dev/null
+++ b/openpype/pipeline/publish/abstract_expected_files.py
@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+"""Abstract ExpectedFile class definition."""
+from abc import ABCMeta, abstractmethod
+import six
+
+
+@six.add_metaclass(ABCMeta)
+class ExpectedFiles:
+    """Class grouping functionality for all supported renderers.
+
+    Attributes:
+        multipart (bool): Flag if multipart exrs are used.
+
+    """
+
+    multipart = False
+
+    @abstractmethod
+    def get(self, render_instance):
+        """Get expected files for given renderer and render layer.
+
+        This method should return dictionary of all files we are expecting
+        to be rendered from the host. Usually `render_instance` corresponds
+        to *render layer*. Result can be either flat list with the file
+        paths or it can be list of dictionaries. Each key corresponds to
+        for example AOV name or channel, etc.
+
+        Example::
+
+            ['/path/to/file.001.exr', '/path/to/file.002.exr']
+
+            or as dictionary:
+
+            [
+                {
+                    "beauty": ['/path/to/beauty.001.exr', ...],
+                    "mask": ['/path/to/mask.001.exr']
+                }
+            ]
+
+
+        Args:
+            render_instance (:class:`RenderInstance`): Data passed from
+                collector to determine files. This should be instance of
+                :class:`abstract_collect_render.RenderInstance`
+
+        Returns:
+            list: Full paths to expected rendered files.
+            list of dict: Path to expected rendered files categorized by
+                AOVs, etc.
+
+        """
+        raise NotImplementedError()

From a48a7297e2510a6b4f5c872b95ad16c5fa5a93a7 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 30 Jun 2022 10:49:13 +0200
Subject: [PATCH 062/289] fixed imports in docstrings and warning messages

---
 openpype/lib/abstract_collect_render.py | 4 ++--
 openpype/lib/abstract_expected_files.py | 4 ++--
 openpype/lib/abstract_metaplugins.py    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/openpype/lib/abstract_collect_render.py b/openpype/lib/abstract_collect_render.py
index 2cc1c23822..e4ff87aa0f 100644
--- a/openpype/lib/abstract_collect_render.py
+++ b/openpype/lib/abstract_collect_render.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-"""Content was moved to 'openpype.pipeline.farm.abstract_collect_render'.
+"""Content was moved to 'openpype.pipeline.publish.abstract_collect_render'.
 
 Please change your imports as soon as possible.
 
@@ -19,7 +19,7 @@ warnings.warn(
     (
         "Content of 'abstract_collect_render' was moved."
         "\nUsing deprecated source of 'abstract_collect_render'. Content was"
-        " move to 'openpype.pipeline.farm.abstract_collect_render'."
+        " move to 'openpype.pipeline.publish.abstract_collect_render'."
         " Please change your imports as soon as possible."
     ),
     category=CollectRenderDeprecated,
diff --git a/openpype/lib/abstract_expected_files.py b/openpype/lib/abstract_expected_files.py
index bb433a8b11..f24d844fe5 100644
--- a/openpype/lib/abstract_expected_files.py
+++ b/openpype/lib/abstract_expected_files.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-"""Content was moved to 'openpype.pipeline.farm.abstract_expected_files'.
+"""Content was moved to 'openpype.pipeline.publish.abstract_expected_files'.
 
 Please change your imports as soon as possible.
 
@@ -19,7 +19,7 @@ warnings.warn(
     (
         "Content of 'abstract_expected_files' was moved."
         "\nUsing deprecated source of 'abstract_expected_files'. Content was"
-        " move to 'openpype.pipeline.farm.abstract_expected_files'."
+        " move to 'openpype.pipeline.publish.abstract_expected_files'."
         " Please change your imports as soon as possible."
     ),
     category=ExpectedFilesDeprecated,
diff --git a/openpype/lib/abstract_metaplugins.py b/openpype/lib/abstract_metaplugins.py
index 6199a96ef1..346b5d86b3 100644
--- a/openpype/lib/abstract_metaplugins.py
+++ b/openpype/lib/abstract_metaplugins.py
@@ -1,4 +1,4 @@
-"""Content was moved to 'openpype.pipeline.farm.abstract_metaplugins'.
+"""Content was moved to 'openpype.pipeline.publish.publish_plugins'.
 
 Please change your imports as soon as possible.
 
@@ -21,7 +21,7 @@ warnings.warn(
     (
         "Content of 'abstract_metaplugins' was moved."
         "\nUsing deprecated source of 'abstract_metaplugins'. Content was"
-        " moved to 'openpype.pipeline.farm.abstract_metaplugins'."
+        " moved to 'openpype.pipeline.publish.publish_plugins'."
         " Please change your imports as soon as possible."
     ),
     category=MetaPluginsDeprecated,

From 4e7358f73b007d8a53ae55c5a3b255a45b299876 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 30 Jun 2022 14:47:08 +0200
Subject: [PATCH 063/289] removed unused function 'get_hierarchy'

---
 openpype/api.py                               |  2 -
 openpype/lib/__init__.py                      |  2 -
 openpype/lib/avalon_context.py                | 51 -------------------
 .../tests/test_lib_restructuralization.py     |  1 -
 4 files changed, 56 deletions(-)

diff --git a/openpype/api.py b/openpype/api.py
index 9ce745b653..fac2ae572b 100644
--- a/openpype/api.py
+++ b/openpype/api.py
@@ -15,7 +15,6 @@ from .lib import (
     run_subprocess,
     version_up,
     get_asset,
-    get_hierarchy,
     get_workdir_data,
     get_version_from_path,
     get_last_version_from_path,
@@ -101,7 +100,6 @@ __all__ = [
     # get contextual data
     "version_up",
     "get_asset",
-    "get_hierarchy",
     "get_workdir_data",
     "get_version_from_path",
     "get_last_version_from_path",
diff --git a/openpype/lib/__init__.py b/openpype/lib/__init__.py
index 8d4e733b7d..fb52a9aca7 100644
--- a/openpype/lib/__init__.py
+++ b/openpype/lib/__init__.py
@@ -120,7 +120,6 @@ from .avalon_context import (
     is_latest,
     any_outdated,
     get_asset,
-    get_hierarchy,
     get_linked_assets,
     get_latest_version,
     get_system_general_anatomy_data,
@@ -292,7 +291,6 @@ __all__ = [
     "is_latest",
     "any_outdated",
     "get_asset",
-    "get_hierarchy",
     "get_linked_assets",
     "get_latest_version",
     "get_system_general_anatomy_data",
diff --git a/openpype/lib/avalon_context.py b/openpype/lib/avalon_context.py
index a03f066300..ad34e24644 100644
--- a/openpype/lib/avalon_context.py
+++ b/openpype/lib/avalon_context.py
@@ -213,57 +213,6 @@ def get_asset(asset_name=None):
     return asset_document
 
 
-@with_pipeline_io
-def get_hierarchy(asset_name=None):
-    """
-    Obtain asset hierarchy path string from mongo db
-
-    Args:
-        asset_name (str)
-
-    Returns:
-        (string): asset hierarchy path
-
-    """
-    if not asset_name:
-        asset_name = legacy_io.Session.get(
-            "AVALON_ASSET",
-            os.environ["AVALON_ASSET"]
-        )
-
-    asset_entity = legacy_io.find_one({
-        "type": 'asset',
-        "name": asset_name
-    })
-
-    not_set = "PARENTS_NOT_SET"
-    entity_parents = asset_entity.get("data", {}).get("parents", not_set)
-
-    # If entity already have parents then just return joined
-    if entity_parents != not_set:
-        return "/".join(entity_parents)
-
-    # Else query parents through visualParents and store result to entity
-    hierarchy_items = []
-    entity = asset_entity
-    while True:
-        parent_id = entity.get("data", {}).get("visualParent")
-        if not parent_id:
-            break
-        entity = legacy_io.find_one({"_id": parent_id})
-        hierarchy_items.append(entity["name"])
-
-    # Add parents to entity data for next query
-    entity_data = asset_entity.get("data", {})
-    entity_data["parents"] = hierarchy_items
-    legacy_io.update_many(
-        {"_id": asset_entity["_id"]},
-        {"$set": {"data": entity_data}}
-    )
-
-    return "/".join(hierarchy_items)
-
-
 def get_system_general_anatomy_data():
     system_settings = get_system_settings()
     studio_name = system_settings["general"]["studio_name"]
diff --git a/openpype/tests/test_lib_restructuralization.py b/openpype/tests/test_lib_restructuralization.py
index 94080e550d..ccccc76a08 100644
--- a/openpype/tests/test_lib_restructuralization.py
+++ b/openpype/tests/test_lib_restructuralization.py
@@ -21,7 +21,6 @@ def test_backward_compatibility(printer):
         from openpype.lib import is_latest
         from openpype.lib import any_outdated
         from openpype.lib import get_asset
-        from openpype.lib import get_hierarchy
         from openpype.lib import get_linked_assets
         from openpype.lib import get_latest_version
         from openpype.lib import get_ffprobe_streams

From e147cd4132e983e9d70c2be02356a75fd5f70f11 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 30 Jun 2022 16:04:25 +0200
Subject: [PATCH 064/289] added 'get_workfile_info' to openpype.client which
 replace 'get_workfile_doc' in openpype.lib

---
 openpype/client/__init__.py        |  4 ++
 openpype/client/entities.py        | 32 ++++++++++++++++
 openpype/lib/avalon_context.py     | 59 +++++++++++++++++++++++++++---
 openpype/tools/workfiles/window.py | 17 ++++++---
 4 files changed, 100 insertions(+), 12 deletions(-)

diff --git a/openpype/client/__init__.py b/openpype/client/__init__.py
index e3b4ef5132..e1c8ea9f03 100644
--- a/openpype/client/__init__.py
+++ b/openpype/client/__init__.py
@@ -33,6 +33,8 @@ from .entities import (
     get_thumbnail,
     get_thumbnails,
     get_thumbnail_id_from_source,
+
+    get_workfile_info,
 )
 
 __all__ = (
@@ -70,4 +72,6 @@ __all__ = (
     "get_thumbnail",
     "get_thumbnails",
     "get_thumbnail_id_from_source",
+
+    "get_workfile_info",
 )
diff --git a/openpype/client/entities.py b/openpype/client/entities.py
index 28cd994254..9771461d2e 100644
--- a/openpype/client/entities.py
+++ b/openpype/client/entities.py
@@ -1158,6 +1158,38 @@ def get_thumbnail(project_name, thumbnail_id, fields=None):
     return conn.find_one(query_filter, _prepare_fields(fields))
 
 
+def get_workfile_info(
+    project_name, asset_id, task_name, filename, fields=None
+):
+    """Document with workfile information.
+
+    Warning:
+        Query is based on filename and context which does not meant it will
+        find always right expected result. There is a limited amound of usage
+        and is recommended to not expect that all workfiles are stored in
+        database.
+
+    Args:
+        project_name (str): Name of project where to look for queried entities.
+        asset_id (str|ObjectId): Id of asset entity.
+        task_name (str): Task name on asset.
+        fields (list[str]): Fields that should be returned. All fields are
+            returned if 'None' is passed.
+    """
+
+    if not asset_id or not task_name or not filename:
+        return None
+
+    query_filter = {
+        "type": "workfile",
+        "parent": _convert_id(asset_id),
+        "task_name": task_name,
+        "filename": filename
+    }
+    conn = _get_project_connection(project_name)
+    return conn.find_one(query_filter, _prepare_fields(fields))
+
+
 """
 ## Custom data storage:
 - Settings - OP settings overrides and local settings
diff --git a/openpype/lib/avalon_context.py b/openpype/lib/avalon_context.py
index ad34e24644..412d7fa1d3 100644
--- a/openpype/lib/avalon_context.py
+++ b/openpype/lib/avalon_context.py
@@ -9,7 +9,11 @@ import collections
 import functools
 
 from bson.objectid import ObjectId
+import warnings
 
+from openpype.client import (
+    get_workfile_info,
+)
 from openpype.settings import (
     get_project_settings,
     get_system_settings
@@ -36,6 +40,51 @@ PROJECT_NAME_REGEX = re.compile(
 )
 
 
+class AvalonContextDeprecatedWarning(DeprecationWarning):
+    pass
+
+
+def deprecated(new_destination):
+    """Mark functions as deprecated.
+
+    It will result in a warning being emitted when the function is used.
+    """
+
+    func = None
+    if callable(new_destination):
+        func = new_destination
+        new_destination = None
+
+    def _decorator(decorated_func):
+        if new_destination is None:
+            warning_message = (
+                " Please check content of deprecated function to figure out"
+                " possible replacement."
+            )
+        else:
+            warning_message = " Please replace your usage with '{}'.".format(
+                new_destination
+            )
+
+        @functools.wraps(decorated_func)
+        def wrapper(*args, **kwargs):
+            warnings.simplefilter("always", AvalonContextDeprecatedWarning)
+            warnings.warn(
+                (
+                    "Call to deprecated function '{}'"
+                    "\nFunction was moved or removed.{}"
+                ).format(decorated_func.__name__, warning_message),
+                category=AvalonContextDeprecatedWarning,
+                stacklevel=4
+            )
+            return decorated_func(*args, **kwargs)
+        return wrapper
+
+    if func is None:
+        return _decorator
+    return _decorator(func)
+
+
 def create_project(
     project_name, project_code, library_project=False, dbcon=None
 ):
@@ -759,6 +808,7 @@ def update_current_task(task=None, asset=None, app=None, template_key=None):
 
 
 @with_pipeline_io
+@deprecated("openpype.client.get_workfile_info")
 def get_workfile_doc(asset_id, task_name, filename, dbcon=None):
     """Return workfile document for entered context.
 
@@ -775,16 +825,13 @@ def get_workfile_doc(asset_id, task_name, filename, dbcon=None):
     Returns:
         dict: Workfile document or None.
     """
+
     # Use legacy_io if dbcon is not entered
     if not dbcon:
         dbcon = legacy_io
 
-    return dbcon.find_one({
-        "type": "workfile",
-        "parent": asset_id,
-        "task_name": task_name,
-        "filename": filename
-    })
+    project_name = dbcon.active_project()
+    return get_workfile_info(project_name, asset_id, task_name, filename)
 
 
 @with_pipeline_io
diff --git a/openpype/tools/workfiles/window.py b/openpype/tools/workfiles/window.py
index 9f4cea2f8a..c1efe026f2 100644
--- a/openpype/tools/workfiles/window.py
+++ b/openpype/tools/workfiles/window.py
@@ -2,10 +2,13 @@ import os
 import datetime
 from Qt import QtCore, QtWidgets
 
-from openpype.client import get_asset_by_id, get_asset_by_name
+from openpype.client import (
+    get_asset_by_id,
+    get_asset_by_name,
+    get_workfile_info,
+)
 from openpype import style
 from openpype.lib import (
-    get_workfile_doc,
     create_workfile_doc,
     save_workfile_data_to_doc,
 )
@@ -255,8 +258,9 @@ class Window(QtWidgets.QMainWindow):
         workfile_doc = None
         if asset_id and task_name and filepath:
             filename = os.path.split(filepath)[1]
-            workfile_doc = get_workfile_doc(
-                asset_id, task_name, filename, legacy_io
+            project_name = legacy_io.active_project()
+            workfile_doc = get_workfile_info(
+                project_name, asset_id, task_name, filename
             )
         self.side_panel.set_context(
             asset_id, task_name, filepath, workfile_doc
@@ -289,8 +293,9 @@ class Window(QtWidgets.QMainWindow):
             return
 
         filename = os.path.split(filepath)[1]
-        return get_workfile_doc(
-            asset_id, task_name, filename, legacy_io
+        project_name = legacy_io.active_project()
+        return get_workfile_info(
+            project_name, asset_id, task_name, filename
         )
 
     def _create_workfile_doc(self, filepath, force=False):

From 9f29726d98b7e87f608dd70aa512b8e0c56df949 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 30 Jun 2022 16:05:22 +0200
Subject: [PATCH 065/289] modified and moved project doc validation

---
 openpype/lib/avalon_context.py | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/openpype/lib/avalon_context.py b/openpype/lib/avalon_context.py
index 412d7fa1d3..fec87e53d1 100644
--- a/openpype/lib/avalon_context.py
+++ b/openpype/lib/avalon_context.py
@@ -12,6 +12,7 @@ from bson.objectid import ObjectId
 import warnings
 
 from openpype.client import (
+    get_project,
     get_workfile_info,
 )
 from openpype.settings import (
@@ -114,6 +115,11 @@ def create_project(
     from openpype.pipeline import AvalonMongoDB
     from openpype.pipeline.schema import validate
 
+    if get_project(project_name, fields=["name"]):
+        raise ValueError("Project with name \"{}\" already exists".format(
+            project_name
+        ))
+
     if dbcon is None:
         dbcon = AvalonMongoDB()
 
@@ -123,15 +129,6 @@ def create_project(
         ).format(project_name))
 
     database = dbcon.database
-    project_doc = database[project_name].find_one(
-        {"type": "project"},
-        {"name": 1}
-    )
-    if project_doc:
-        raise ValueError("Project with name \"{}\" already exists".format(
-            project_name
-        ))
-
     project_doc = {
         "type": "project",
         "name": project_name,
@@ -154,7 +151,7 @@ def create_project(
         database[project_name].delete_one({"type": "project"})
         raise
 
-    project_doc = database[project_name].find_one({"type": "project"})
+    project_doc = get_project(project_name)
 
     try:
         # Validate created project document

From 5b600b850614b5d67fe6f7eb59c42754b83460b3 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 30 Jun 2022 16:11:54 +0200
Subject: [PATCH 066/289] is_latest use new query functions

---
 openpype/lib/avalon_context.py | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/openpype/lib/avalon_context.py b/openpype/lib/avalon_context.py
index fec87e53d1..02b4cad6f2 100644
--- a/openpype/lib/avalon_context.py
+++ b/openpype/lib/avalon_context.py
@@ -13,6 +13,8 @@ import warnings
 
 from openpype.client import (
     get_project,
+    get_version_by_id,
+    get_last_version_by_subset_id,
     get_workfile_info,
 )
 from openpype.settings import (
@@ -183,23 +185,24 @@ def is_latest(representation):
 
     Returns:
         bool: Whether the representation is of latest version.
-
     """
 
-    version = legacy_io.find_one({"_id": representation['parent']})
+    project_name = legacy_io.active_project()
+    version = get_version_by_id(
+        project_name,
+        representation["parent"],
+        hero=True,
+        fields=["_id", "type", "parent"]
+    )
     if version["type"] == "hero_version":
         return True
 
     # Get highest version under the parent
-    highest_version = legacy_io.find_one({
-        "type": "version",
-        "parent": version["parent"]
-    }, sort=[("name", -1)], projection={"name": True})
+    last_version = get_last_version_by_subset_id(
+        project_name, version["parent"], fields=["_id"]
+    )
 
-    if version['name'] == highest_version['name']:
-        return True
-    else:
-        return False
+    return version["_id"] == last_version["_id"]
 
 
 @with_pipeline_io

From a0bc06c62084f4116c3e0519522b15f7d4bcde0e Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 30 Jun 2022 16:18:12 +0200
Subject: [PATCH 067/289] use query functions for rest of avalon context
 functions

---
 openpype/lib/avalon_context.py | 232 +++++++++++++--------------------
 1 file changed, 90 insertions(+), 142 deletions(-)

diff --git a/openpype/lib/avalon_context.py b/openpype/lib/avalon_context.py
index 02b4cad6f2..7b00032027 100644
--- a/openpype/lib/avalon_context.py
+++ b/openpype/lib/avalon_context.py
@@ -13,8 +13,15 @@ import warnings
 
 from openpype.client import (
     get_project,
+    get_assets,
+    get_asset_by_name,
+    get_subset_by_name,
+    get_subsets,
     get_version_by_id,
+    get_last_versions,
     get_last_version_by_subset_id,
+    get_representations,
+    get_representation_by_id,
     get_workfile_info,
 )
 from openpype.settings import (
@@ -210,6 +217,7 @@ def any_outdated():
     """Return whether the current scene has any outdated content"""
     from openpype.pipeline import registered_host
 
+    project_name = legacy_io.active_project()
     checked = set()
     host = registered_host()
     for container in host.ls():
@@ -217,12 +225,8 @@ def any_outdated():
         if representation in checked:
             continue
 
-        representation_doc = legacy_io.find_one(
-            {
-                "_id": ObjectId(representation),
-                "type": "representation"
-            },
-            projection={"parent": True}
+        representation_doc = get_representation_by_id(
+            project_name, representation, fields=["parent"]
         )
         if representation_doc and not is_latest(representation_doc):
             return True
@@ -240,22 +244,20 @@ def any_outdated():
 def get_asset(asset_name=None):
     """ Returning asset document from database by its name.
 
-        Doesn't count with duplicities on asset names!
+    Doesn't count with duplicities on asset names!
 
-        Args:
-            asset_name (str)
+    Args:
+        asset_name (str)
 
-        Returns:
-            (MongoDB document)
+    Returns:
+        (MongoDB document)
     """
+
+    project_name = legacy_io.active_project()
     if not asset_name:
         asset_name = legacy_io.Session["AVALON_ASSET"]
 
-    asset_document = legacy_io.find_one({
-        "name": asset_name,
-        "type": "asset"
-    })
-
+    asset_document = get_asset_by_name(project_name, asset_name)
     if not asset_document:
         raise TypeError("Entity \"{}\" was not found in DB".format(asset_name))
 
@@ -311,11 +313,13 @@ def get_linked_assets(asset_doc):
     Returns:
         (list) Asset documents of input links for passed asset doc.
     """
+
     link_ids = get_linked_asset_ids(asset_doc)
     if not link_ids:
         return []
 
-    return list(legacy_io.find({"_id": {"$in": link_ids}}))
+    project_name = legacy_io.active_project()
+    return list(get_assets(project_name, link_ids))
 
 
 @with_pipeline_io
@@ -337,20 +341,14 @@ def get_latest_version(asset_name, subset_name, dbcon=None, project_name=None):
         dict: Last version document for entered .
     """
 
-    if not dbcon:
-        log.debug("Using `legacy_io` for query.")
-        dbcon = legacy_io
-        # Make sure is installed
-        dbcon.install()
+    if not project_name:
+        if not dbcon:
+            log.debug("Using `legacy_io` for query.")
+            dbcon = legacy_io
+            # Make sure is installed
+            dbcon.install()
 
-    if project_name and project_name != dbcon.Session.get("AVALON_PROJECT"):
-        # `legacy_io` has only `_database` attribute
-        # but `AvalonMongoDB` has `database`
-        database = getattr(dbcon, "database", dbcon._database)
-        collection = database[project_name]
-    else:
-        project_name = dbcon.Session.get("AVALON_PROJECT")
-        collection = dbcon
+        project_name = dbcon.active_project()
 
     log.debug((
         "Getting latest version for Project: \"{}\" Asset: \"{}\""
@@ -358,19 +356,15 @@ def get_latest_version(asset_name, subset_name, dbcon=None, project_name=None):
     ).format(project_name, asset_name, subset_name))
 
     # Query asset document id by asset name
-    asset_doc = collection.find_one(
-        {"type": "asset", "name": asset_name},
-        {"_id": True}
-    )
+    asset_doc = get_asset_by_name(project_name, asset_name, fields=["_id"])
     if not asset_doc:
         log.info(
             "Asset \"{}\" was not found in Database.".format(asset_name)
         )
         return None
 
-    subset_doc = collection.find_one(
-        {"type": "subset", "name": subset_name, "parent": asset_doc["_id"]},
-        {"_id": True}
+    subset_doc = get_subset_by_name(
+        project_name, subset_name, asset_doc["_id"]
     )
     if not subset_doc:
         log.info(
@@ -378,10 +372,7 @@ def get_latest_version(asset_name, subset_name, dbcon=None, project_name=None):
         )
         return None
 
-    version_doc = collection.find_one(
-        {"type": "version", "parent": subset_doc["_id"]},
-        sort=[("name", -1)],
-    )
+    version_doc = get_last_version_by_subset_id(project_name, subset_doc["_id"])
     if not version_doc:
         log.info(
             "Subset \"{}\" does not have any version yet.".format(subset_name)
@@ -418,28 +409,17 @@ def get_workfile_template_key_from_context(
         ValueError: When both 'dbcon' and 'project_name' were not
             passed.
     """
-    if not dbcon:
-        if not project_name:
+    if not project_name:
+        if not dbcon:
             raise ValueError((
                 "`get_workfile_template_key_from_context` requires to pass"
                 " one of 'dbcon' or 'project_name' arguments."
             ))
-        from openpype.pipeline import AvalonMongoDB
 
-        dbcon = AvalonMongoDB()
-        dbcon.Session["AVALON_PROJECT"] = project_name
+        project_name = dbcon.active_project()
 
-    elif not project_name:
-        project_name = dbcon.Session["AVALON_PROJECT"]
-
-    asset_doc = dbcon.find_one(
-        {
-            "type": "asset",
-            "name": asset_name
-        },
-        {
-            "data.tasks": 1
-        }
+    asset_doc = get_asset_by_name(
+        project_name, asset_name, fields=["data.tasks"]
     )
     asset_tasks = asset_doc.get("data", {}).get("tasks") or {}
     task_info = asset_tasks.get(task_name) or {}
@@ -632,6 +612,7 @@ def get_workdir(
     Returns:
         TemplateResult: Workdir path.
     """
+
     if not anatomy:
         anatomy = Anatomy(project_doc["name"])
 
@@ -659,15 +640,11 @@ def template_data_from_session(session=None):
         session = legacy_io.Session
 
     project_name = session["AVALON_PROJECT"]
-    project_doc = legacy_io.database[project_name].find_one({
-        "type": "project"
-    })
-    asset_doc = legacy_io.database[project_name].find_one({
-        "type": "asset",
-        "name": session["AVALON_ASSET"]
-    })
+    asset_name = session["AVALON_ASSET"]
     task_name = session["AVALON_TASK"]
     host_name = session["AVALON_APP"]
+    project_doc = get_project(project_name)
+    asset_doc = get_asset_by_name(project_name, asset_name)
     return get_workdir_data(project_doc, asset_doc, task_name, host_name)
 
 
@@ -692,8 +669,8 @@ def compute_session_changes(
 
     Returns:
         dict: The required changes in the Session dictionary.
-
     """
+
     changes = dict()
 
     # If no changes, return directly
@@ -711,12 +688,9 @@ def compute_session_changes(
 
     if not asset_document or not asset_tasks:
         # Assume asset name
-        asset_document = legacy_io.find_one(
-            {
-                "name": asset,
-                "type": "asset"
-            },
-            {"data.tasks": True}
+        project_name = session["AVALON_PROJECT"]
+        asset_document = get_asset_by_name(
+            project_name, asset, fields=["data.tasks"]
         )
         assert asset_document, "Asset must exist"
 
@@ -864,12 +838,13 @@ def create_workfile_doc(asset_doc, task_name, filename, workdir, dbcon=None):
     doc_data = copy.deepcopy(doc_filter)
 
     # Prepare project for workdir data
-    project_doc = dbcon.find_one({"type": "project"})
+    project_name = dbcon.active_project()
+    project_doc = get_project(project_name)
     workdir_data = get_workdir_data(
         project_doc, asset_doc, task_name, dbcon.Session["AVALON_APP"]
     )
     # Prepare anatomy
-    anatomy = Anatomy(project_doc["name"])
+    anatomy = Anatomy(project_name)
     # Get workdir path (result is anatomy.TemplateResult)
     template_workdir = get_workdir_with_workdir_data(
         workdir_data, anatomy
@@ -984,12 +959,9 @@ class BuildWorkfile:
         from openpype.pipeline import discover_loader_plugins
 
         # Get current asset name and entity
+        project_name = legacy_io.active_project()
         current_asset_name = legacy_io.Session["AVALON_ASSET"]
-        current_asset_entity = legacy_io.find_one({
-            "type": "asset",
-            "name": current_asset_name
-        })
-
+        current_asset_entity = get_asset_by_name(project_name, current_asset_name)
         # Skip if asset was not found
         if not current_asset_entity:
             print("Asset entity with name `{}` was not found".format(
@@ -1494,7 +1466,7 @@ class BuildWorkfile:
         return loaded_containers
 
     @with_pipeline_io
-    def _collect_last_version_repres(self, asset_entities):
+    def _collect_last_version_repres(self, asset_docs):
         """Collect subsets, versions and representations for asset_entities.
 
         Args:
@@ -1527,64 +1499,56 @@ class BuildWorkfile:
         ```
         """
 
-        if not asset_entities:
-            return {}
+        output = {}
+        if not asset_docs:
+            return output
 
-        asset_entity_by_ids = {asset["_id"]: asset for asset in asset_entities}
+        asset_docs_by_ids = {asset["_id"]: asset for asset in asset_docs}
 
-        subsets = list(legacy_io.find({
-            "type": "subset",
-            "parent": {"$in": list(asset_entity_by_ids.keys())}
-        }))
+        project_name = legacy_io.active_project()
+        subsets = list(get_subsets(
+            project_name, asset_ids=asset_docs_by_ids.keys()
+        ))
         subset_entity_by_ids = {subset["_id"]: subset for subset in subsets}
 
-        sorted_versions = list(legacy_io.find({
-            "type": "version",
-            "parent": {"$in": list(subset_entity_by_ids.keys())}
-        }).sort("name", -1))
+        last_version_by_subset_id = get_last_versions(
+            project_name, subset_entity_by_ids.keys()
+        )
+        last_version_docs_by_id = {
+            version["_id"]: version
+            for version in last_version_by_subset_id.values()
+        }
+        repre_docs = get_representations(
+            project_name, version_ids=last_version_docs_by_id.keys()
+        )
 
-        subset_id_with_latest_version = []
-        last_versions_by_id = {}
-        for version in sorted_versions:
-            subset_id = version["parent"]
-            if subset_id in subset_id_with_latest_version:
-                continue
-            subset_id_with_latest_version.append(subset_id)
-            last_versions_by_id[version["_id"]] = version
+        for repre_doc in repre_docs:
+            version_id = repre_doc["parent"]
+            version_doc = last_version_docs_by_id[version_id]
 
-        repres = legacy_io.find({
-            "type": "representation",
-            "parent": {"$in": list(last_versions_by_id.keys())}
-        })
+            subset_id = version_doc["parent"]
+            subset_doc = subset_entity_by_ids[subset_id]
 
-        output = {}
-        for repre in repres:
-            version_id = repre["parent"]
-            version = last_versions_by_id[version_id]
-
-            subset_id = version["parent"]
-            subset = subset_entity_by_ids[subset_id]
-
-            asset_id = subset["parent"]
-            asset = asset_entity_by_ids[asset_id]
+            asset_id = subset_doc["parent"]
+            asset_doc = asset_docs_by_ids[asset_id]
 
             if asset_id not in output:
                 output[asset_id] = {
-                    "asset_entity": asset,
+                    "asset_entity": asset_doc,
                     "subsets": {}
                 }
 
             if subset_id not in output[asset_id]["subsets"]:
                 output[asset_id]["subsets"][subset_id] = {
-                    "subset_entity": subset,
+                    "subset_entity": subset_doc,
                     "version": {
-                        "version_entity": version,
+                        "version_entity": version_doc,
                         "repres": []
                     }
                 }
 
             output[asset_id]["subsets"][subset_id]["version"]["repres"].append(
-                repre
+                repre_doc
             )
 
         return output
@@ -1790,35 +1754,19 @@ def get_custom_workfile_template_by_string_context(
             context. (Existence of formatted path is not validated.)
     """
 
-    if dbcon is None:
-        from openpype.pipeline import AvalonMongoDB
+    project_name = None
+    if anatomy is not None:
+        project_name = anatomy.project_name
 
-        dbcon = AvalonMongoDB()
+    if not project_name and dbcon is not None:
+        project_name = dbcon.active_project()
 
-    dbcon.install()
+    if not project_name:
+        raise ValueError("Can't determina project")
 
-    if dbcon.Session["AVALON_PROJECT"] != project_name:
-        dbcon.Session["AVALON_PROJECT"] = project_name
-
-    project_doc = dbcon.find_one(
-        {"type": "project"},
-        # All we need is "name" and "data.code" keys
-        {
-            "name": 1,
-            "data.code": 1
-        }
-    )
-    asset_doc = dbcon.find_one(
-        {
-            "type": "asset",
-            "name": asset_name
-        },
-        # All we need is "name" and "data.tasks" keys
-        {
-            "name": 1,
-            "data.tasks": 1
-        }
-    )
+    project_doc = get_project(project_name, fields=["name", "data.code"])
+    asset_doc = get_asset_by_name(
+        project_name, asset_name, fields=["name", "data.tasks"])
 
     return get_custom_workfile_template_by_context(
         template_profiles, project_doc, asset_doc, task_name, anatomy

From 57e0f576c82df6f1510e8954e99db98fb580d1d7 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 30 Jun 2022 16:18:19 +0200
Subject: [PATCH 068/289] removed unused import

---
 openpype/lib/avalon_context.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/openpype/lib/avalon_context.py b/openpype/lib/avalon_context.py
index 7b00032027..9fc632aa27 100644
--- a/openpype/lib/avalon_context.py
+++ b/openpype/lib/avalon_context.py
@@ -7,8 +7,6 @@ import platform
 import logging
 import collections
 import functools
-
-from bson.objectid import ObjectId
 import warnings
 
 from openpype.client import (

From 13123a41277e08fec2345a888834c254e10c8034 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 30 Jun 2022 16:18:34 +0200
Subject: [PATCH 069/289] get_system_general_anatomy_data can accept already
 prepare system settings

---
 openpype/lib/avalon_context.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/openpype/lib/avalon_context.py b/openpype/lib/avalon_context.py
index 9fc632aa27..70a4e59279 100644
--- a/openpype/lib/avalon_context.py
+++ b/openpype/lib/avalon_context.py
@@ -262,8 +262,9 @@ def get_asset(asset_name=None):
     return asset_document
 
 
-def get_system_general_anatomy_data():
-    system_settings = get_system_settings()
+def get_system_general_anatomy_data(system_settings=None):
+    if not system_settings:
+        system_settings = get_system_settings()
     studio_name = system_settings["general"]["studio_name"]
     studio_code = system_settings["general"]["studio_code"]
     return {

From cb62b175719c9df96ca4641c7a93ad3b1f12777c Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 30 Jun 2022 16:29:54 +0200
Subject: [PATCH 070/289] added ability to receive all project documents

---
 openpype/client/__init__.py |  2 ++
 openpype/client/entities.py | 15 +++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/openpype/client/__init__.py b/openpype/client/__init__.py
index e1c8ea9f03..4fee889f18 100644
--- a/openpype/client/__init__.py
+++ b/openpype/client/__init__.py
@@ -1,6 +1,7 @@
 from .entities import (
     get_projects,
     get_project,
+    get_whole_project,
 
     get_asset_by_id,
     get_asset_by_name,
@@ -40,6 +41,7 @@ from .entities import (
 __all__ = (
     "get_projects",
     "get_project",
+    "get_whole_project",
 
     "get_asset_by_id",
     "get_asset_by_name",
diff --git a/openpype/client/entities.py b/openpype/client/entities.py
index 9771461d2e..698fba796d 100644
--- a/openpype/client/entities.py
+++ b/openpype/client/entities.py
@@ -94,6 +94,21 @@ def get_project(project_name, active=True, inactive=False, fields=None):
     return conn.find_one(query_filter, _prepare_fields(fields))
 
 
+def get_whole_project(project_name):
+    """Receive all documents from project.
+
+    Helper that can be used to get all document from whole project. For example
+    for backups etc.
+
+    Returns:
+        Cursor: Query cursor as iterable which returns all documents from
+            project collection.
+    """
+
+    conn = _get_project_connection(project_name)
+    return conn.find({})
+
+
 def get_asset_by_id(project_name, asset_id, fields=None):
     """Receive asset data by it's id.
 

From 7416508e8056bcab5de784b4dda4fea0c9859f92 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 30 Jun 2022 16:33:21 +0200
Subject: [PATCH 071/289] use query functions in project backpack

---
 openpype/lib/project_backpack.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/openpype/lib/project_backpack.py b/openpype/lib/project_backpack.py
index 396479c725..f0188e6765 100644
--- a/openpype/lib/project_backpack.py
+++ b/openpype/lib/project_backpack.py
@@ -24,7 +24,10 @@ from bson.json_util import (
     dumps,
     CANONICAL_JSON_OPTIONS
 )
-
+from openpype.client import (
+    get_project,
+    get_whole_project,
+)
 from openpype.pipeline import AvalonMongoDB
 
 DOCUMENTS_FILE_NAME = "database"
@@ -55,9 +58,7 @@ def pack_project(project_name, destination_dir=None):
     """
     print("Creating package of project \"{}\"".format(project_name))
     # Validate existence of project
-    dbcon = AvalonMongoDB()
-    dbcon.Session["AVALON_PROJECT"] = project_name
-    project_doc = dbcon.find_one({"type": "project"})
+    project_doc = get_project(project_name)
     if not project_doc:
         raise ValueError("Project \"{}\" was not found in database".format(
             project_name
@@ -118,7 +119,7 @@ def pack_project(project_name, destination_dir=None):
         temp_docs_json = s.name
 
     # Query all project documents and store them to temp json
-    docs = list(dbcon.find({}))
+    docs = list(get_whole_project(project_name))
     data = dumps(
         docs, json_options=CANONICAL_JSON_OPTIONS
     )
@@ -147,7 +148,7 @@ def pack_project(project_name, destination_dir=None):
     # Cleanup
     os.remove(temp_docs_json)
     os.remove(temp_metadata_json)
-    dbcon.uninstall()
+
     print("*** Packing finished ***")
 
 
@@ -207,7 +208,7 @@ def unpack_project(path_to_zip, new_root=None):
         print("Using different root path {}".format(new_root))
         root_path = new_root
 
-        project_doc = collection.find_one({"type": "project"})
+        project_doc = get_project(project_name)
         roots = project_doc["config"]["roots"]
         key = tuple(roots.keys())[0]
         update_key = "config.roots.{}.{}".format(key, low_platform)

From 8f46a73ab710ed98a55b475dba44a558213d3a17 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 30 Jun 2022 16:33:25 +0200
Subject: [PATCH 072/289] use query functions in applications

---
 openpype/lib/applications.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/openpype/lib/applications.py b/openpype/lib/applications.py
index a81bdeca0f..6bdf0a237f 100644
--- a/openpype/lib/applications.py
+++ b/openpype/lib/applications.py
@@ -11,6 +11,10 @@ from abc import ABCMeta, abstractmethod
 
 import six
 
+from openpype.client import (
+    get_project,
+    get_asset_by_name,
+)
 from openpype.settings import (
     get_system_settings,
     get_project_settings,
@@ -1313,11 +1317,8 @@ def get_app_environments_for_context(
     dbcon.install()
 
     # Project document
-    project_doc = dbcon.find_one({"type": "project"})
-    asset_doc = dbcon.find_one({
-        "type": "asset",
-        "name": asset_name
-    })
+    project_doc = get_project(project_name)
+    asset_doc = get_asset_by_name(project_name, asset_name)
 
     if modules_manager is None:
         from openpype.modules import ModulesManager

From eed6acd53c36e7c831d0201cb9d45a9dd31768fd Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 30 Jun 2022 16:50:36 +0200
Subject: [PATCH 073/289] use query function in plugin tools

---
 openpype/lib/plugin_tools.py | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/openpype/lib/plugin_tools.py b/openpype/lib/plugin_tools.py
index bcbf06a0e8..1d3c1eec6b 100644
--- a/openpype/lib/plugin_tools.py
+++ b/openpype/lib/plugin_tools.py
@@ -6,10 +6,10 @@ import logging
 import re
 import json
 
-from .profiles_filtering import filter_profiles
-
+from openpype.client import get_asset_by_id
 from openpype.settings import get_project_settings
 
+from .profiles_filtering import filter_profiles
 
 log = logging.getLogger(__name__)
 
@@ -135,24 +135,17 @@ def get_subset_name(
     This is legacy function should be replaced with
     `get_subset_name_with_asset_doc` where asset document is expected.
     """
-    if dbcon is None:
-        from openpype.pipeline import AvalonMongoDB
 
-        dbcon = AvalonMongoDB()
-        dbcon.Session["AVALON_PROJECT"] = project_name
+    if project_name is None:
+        project_name = dbcon.project_name
 
-    dbcon.install()
-
-    asset_doc = dbcon.find_one(
-        {"_id": asset_id},
-        {"data.tasks": True}
-    ) or {}
+    asset_doc = get_asset_by_id(project_name, asset_id, fields=["data.tasks"])
 
     return get_subset_name_with_asset_doc(
         family,
         variant,
         task_name,
-        asset_doc,
+        asset_doc or {},
         project_name,
         host_name,
         default_template,

From 720aba7c44e24cd80cbcb3d498e73ec3cf503659 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 30 Jun 2022 16:53:24 +0200
Subject: [PATCH 074/289] modified usdlib to use query functions and use
 anatomy for formatting

---
 openpype/lib/usdlib.py | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/openpype/lib/usdlib.py b/openpype/lib/usdlib.py
index 86de19b4be..2943f6660a 100644
--- a/openpype/lib/usdlib.py
+++ b/openpype/lib/usdlib.py
@@ -8,10 +8,9 @@ except ImportError:
     # Allow to fall back on Multiverse 6.3.0+ pxr usd library
     from mvpxr import Usd, UsdGeom, Sdf, Kind
 
-from openpype.pipeline import (
-    registered_root,
-    legacy_io,
-)
+from openpype.client import get_project, get_asset_by_name
+from openpype.pipeline import legacy_io
+from openpypa.lib import Anatomy
 
 log = logging.getLogger(__name__)
 
@@ -128,7 +127,8 @@ def create_model(filename, asset, variant_subsets):
 
     """
 
-    asset_doc = legacy_io.find_one({"name": asset, "type": "asset"})
+    project_name = legacy_io.active_project()
+    asset_doc = get_asset_by_name(project_name, asset)
     assert asset_doc, "Asset not found: %s" % asset
 
     variants = []
@@ -178,7 +178,8 @@ def create_shade(filename, asset, variant_subsets):
 
     """
 
-    asset_doc = legacy_io.find_one({"name": asset, "type": "asset"})
+    project_name = legacy_io.active_project()
+    asset_doc = get_asset_by_name(project_name, asset)
     assert asset_doc, "Asset not found: %s" % asset
 
     variants = []
@@ -213,7 +214,8 @@ def create_shade_variation(filename, asset, model_variant, shade_variants):
 
     """
 
-    asset_doc = legacy_io.find_one({"name": asset, "type": "asset"})
+    project_name = legacy_io.active_project()
+    asset_doc = get_asset_by_name(project_name, asset)
     assert asset_doc, "Asset not found: %s" % asset
 
     variants = []
@@ -313,21 +315,25 @@ def get_usd_master_path(asset, subset, representation):
 
     """
 
-    project = legacy_io.find_one(
-        {"type": "project"}, projection={"config.template.publish": True}
+    project_name = legacy_io.active_project()
+    anatomy = Anatomy(project_name)
+    project_doc = get_project(
+        project_name,
+        fields=["name", "data.code"]
     )
-    template = project["config"]["template"]["publish"]
 
     if isinstance(asset, dict) and "name" in asset:
         # Allow explicitly passing asset document
         asset_doc = asset
     else:
-        asset_doc = legacy_io.find_one({"name": asset, "type": "asset"})
+        asset_doc = get_asset_by_name(project_name, asset, fields=["name"])
 
-    path = template.format(
-        **{
-            "root": registered_root(),
-            "project": legacy_io.Session["AVALON_PROJECT"],
+    formatted_result = anatomy.format(
+        {
+            "project": {
+                "name": project_name,
+                "code": project_doc.get("data", {}).get("code")
+            },
             "asset": asset_doc["name"],
             "subset": subset,
             "representation": representation,
@@ -335,6 +341,7 @@ def get_usd_master_path(asset, subset, representation):
         }
     )
 
+    path = formatted_result["publish"]["path"]
     # Remove the version folder
     subset_folder = os.path.dirname(os.path.dirname(path))
     master_folder = os.path.join(subset_folder, "master")

From 2296a56118265962c87b9c44964affff9fabb129 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 30 Jun 2022 16:56:15 +0200
Subject: [PATCH 075/289] fix anatomy import

---
 openpype/lib/usdlib.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/openpype/lib/usdlib.py b/openpype/lib/usdlib.py
index 2943f6660a..20703ee308 100644
--- a/openpype/lib/usdlib.py
+++ b/openpype/lib/usdlib.py
@@ -9,8 +9,7 @@ except ImportError:
     from mvpxr import Usd, UsdGeom, Sdf, Kind
 
 from openpype.client import get_project, get_asset_by_name
-from openpype.pipeline import legacy_io
-from openpypa.lib import Anatomy
+from openpype.pipeline import legacy_io, Anatomy
 
 log = logging.getLogger(__name__)
 

From bdff4d5eb0c03ec2a6687e3baa963f6dc5f50cf4 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 30 Jun 2022 17:05:13 +0200
Subject: [PATCH 076/289] modified docstring

---
 openpype/client/entities.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/openpype/client/entities.py b/openpype/client/entities.py
index 698fba796d..cb20916153 100644
--- a/openpype/client/entities.py
+++ b/openpype/client/entities.py
@@ -1180,9 +1180,8 @@ def get_workfile_info(
 
     Warning:
         Query is based on filename and context which does not meant it will
-        find always right expected result. There is a limited amound of usage
-        and is recommended to not expect that all workfiles are stored in
-        database.
+        find always right and expected result. Information have limited usage
+        and is not recommended to use it as source information about workfile.
 
     Args:
         project_name (str): Name of project where to look for queried entities.

From 49cb5a3e162a40e31c02d66bbbe2b2ad90a2b246 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 30 Jun 2022 17:28:22 +0200
Subject: [PATCH 077/289] hound fixes

---
 openpype/lib/avalon_context.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/openpype/lib/avalon_context.py b/openpype/lib/avalon_context.py
index 70a4e59279..61976f5a5b 100644
--- a/openpype/lib/avalon_context.py
+++ b/openpype/lib/avalon_context.py
@@ -371,7 +371,9 @@ def get_latest_version(asset_name, subset_name, dbcon=None, project_name=None):
         )
         return None
 
-    version_doc = get_last_version_by_subset_id(project_name, subset_doc["_id"])
+    version_doc = get_last_version_by_subset_id(
+        project_name, subset_doc["_id"]
+    )
     if not version_doc:
         log.info(
             "Subset \"{}\" does not have any version yet.".format(subset_name)
@@ -960,7 +962,9 @@ class BuildWorkfile:
         # Get current asset name and entity
         project_name = legacy_io.active_project()
         current_asset_name = legacy_io.Session["AVALON_ASSET"]
-        current_asset_entity = get_asset_by_name(project_name, current_asset_name)
+        current_asset_entity = get_asset_by_name(
+            project_name, current_asset_name
+        )
         # Skip if asset was not found
         if not current_asset_entity:
             print("Asset entity with name `{}` was not found".format(

From a9462ac4ed89db38f0895d6ce14190c44ee77cb4 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Thu, 30 Jun 2022 22:20:02 +0200
Subject: [PATCH 078/289] Nuke: fixing metadata slate TC difference

---
 .../nuke/plugins/publish/extract_slate_frame.py   | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/openpype/hosts/nuke/plugins/publish/extract_slate_frame.py b/openpype/hosts/nuke/plugins/publish/extract_slate_frame.py
index 6d930d358d..6997180c9f 100644
--- a/openpype/hosts/nuke/plugins/publish/extract_slate_frame.py
+++ b/openpype/hosts/nuke/plugins/publish/extract_slate_frame.py
@@ -152,6 +152,7 @@ class ExtractSlateFrame(openpype.api.Extractor):
         self.log.debug("__ first_frame: {}".format(first_frame))
         self.log.debug("__ slate_first_frame: {}".format(slate_first_frame))
 
+        above_slate_node = slate_node.dependencies().pop()
         # fallback if files does not exists
         if self._check_frames_exists(instance):
             # Read node
@@ -164,8 +165,16 @@ class ExtractSlateFrame(openpype.api.Extractor):
             r_node["colorspace"].setValue(instance.data["colorspace"])
             previous_node = r_node
             temporary_nodes = [previous_node]
+
+            # adding copy metadata node for correct frame metadata
+            cm_node = nuke.createNode("CopyMetaData")
+            cm_node.setInput(0, previous_node)
+            cm_node.setInput(1, above_slate_node)
+            previous_node = cm_node
+            temporary_nodes.append(cm_node)
+
         else:
-            previous_node = slate_node.dependencies().pop()
+            previous_node = above_slate_node
             temporary_nodes = []
 
         # only create colorspace baking if toggled on
@@ -221,8 +230,8 @@ class ExtractSlateFrame(openpype.api.Extractor):
             write_node.name(), int(slate_first_frame), int(slate_first_frame))
 
         # Clean up
-        for node in temporary_nodes:
-            nuke.delete(node)
+        # for node in temporary_nodes:
+        #     nuke.delete(node)
 
     def _render_slate_to_sequence(self, instance):
         # set slate frame

From 7dc7bde29334a0debe738af6ef6f07d374f40bcf Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 1 Jul 2022 10:48:33 +0200
Subject: [PATCH 079/289] subset documents can be queried based on combination
 of asset id and subset names

---
 openpype/client/entities.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/openpype/client/entities.py b/openpype/client/entities.py
index 28cd994254..5e242ea180 100644
--- a/openpype/client/entities.py
+++ b/openpype/client/entities.py
@@ -381,6 +381,7 @@ def get_subsets(
     subset_ids=None,
     subset_names=None,
     asset_ids=None,
+    names_by_asset_ids=None,
     archived=False,
     fields=None
 ):
@@ -396,6 +397,9 @@ def get_subsets(
             Filter ignored if 'None' is passed.
         asset_ids (list[str|ObjectId]): Asset ids under which should look for
             the subsets. Filter ignored if 'None' is passed.
+        names_by_asset_ids (dict[ObjectId, list[str]]): Complex filtering
+            using asset ids and list of subset names under the asset.
+        archived (bool): Look for archived subsets too.
         fields (list[str]): Fields that should be returned. All fields are
             returned if 'None' is passed.
 
@@ -429,6 +433,18 @@ def get_subsets(
             return []
         query_filter["name"] = {"$in": list(subset_names)}
 
+    if names_by_asset_ids is not None:
+        or_query = []
+        for asset_id, names in names_by_asset_ids.items():
+            if asset_id and names:
+                or_query.append({
+                    "parent": _convert_id(asset_id),
+                    "name": {"$in": list(names)}
+                })
+        if not or_query:
+            return []
+        query_filter["$or"] = or_query
+
     conn = _get_project_connection(project_name)
     return conn.find(query_filter, _prepare_fields(fields))
 

From de4147ef93c2c45631b72664d067d7c070887f48 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 1 Jul 2022 10:49:06 +0200
Subject: [PATCH 080/289] get last version does not do double query if only
 _id, name or parent are requested

---
 openpype/client/entities.py | 50 ++++++++++++++++++++++++++++++++-----
 1 file changed, 44 insertions(+), 6 deletions(-)

diff --git a/openpype/client/entities.py b/openpype/client/entities.py
index 5e242ea180..aed465c46f 100644
--- a/openpype/client/entities.py
+++ b/openpype/client/entities.py
@@ -755,7 +755,10 @@ def get_last_versions(project_name, subset_ids, fields=None):
     """Latest versions for entered subset_ids.
 
     Args:
+        project_name (str): Name of project where to look for queried entities.
         subset_ids (list): List of subset ids.
+        fields (list[str]): Fields that should be returned. All fields are
+            returned if 'None' is passed.
 
     Returns:
         dict[ObjectId, int]: Key is subset id and value is last version name.
@@ -765,7 +768,34 @@ def get_last_versions(project_name, subset_ids, fields=None):
     if not subset_ids:
         return {}
 
-    _pipeline = [
+    if fields is not None:
+        fields = list(fields)
+        if not fields:
+            return {}
+
+    # Avoid double query if only name and _id are requested
+    name_needed = False
+    limit_query = False
+    if fields:
+        fields_s = set(fields)
+        if "name" in fields_s:
+            name_needed = True
+            fields_s.remove("name")
+
+        for field in ("_id", "parent"):
+            if field in fields_s:
+                fields_s.remove(field)
+        limit_query = len(fields_s) == 0
+
+    group_item = {
+        "_id": "$parent",
+        "_version_id": {"$last": "$_id"}
+    }
+    # Add name if name is needed (only for limit query)
+    if name_needed:
+        group_item["name"] = {"$last": "$name"}
+
+    aggregation_pipeline = [
         # Find all versions of those subsets
         {"$match": {
             "type": "version",
@@ -774,16 +804,24 @@ def get_last_versions(project_name, subset_ids, fields=None):
         # Sorting versions all together
         {"$sort": {"name": 1}},
         # Group them by "parent", but only take the last
-        {"$group": {
-            "_id": "$parent",
-            "_version_id": {"$last": "$_id"}
-        }}
+        {"$group": group_item}
     ]
 
     conn = _get_project_connection(project_name)
+    aggregate_result = conn.aggregate(aggregation_pipeline)
+    if limit_query:
+        output = {}
+        for item in aggregate_result:
+            subset_id = item["_id"]
+            item_data = {"_id": item["_version_id"], "parent": subset_id}
+            if name_needed:
+                item_data["name"] = item["name"]
+            output[subset_id] = item_data
+        return output
+
     version_ids = [
         doc["_version_id"]
-        for doc in conn.aggregate(_pipeline)
+        for doc in aggregate_result
     ]
 
     fields = _prepare_fields(fields, ["parent"])

From f5cceb3e056e71c2204df75b1eb6b87598f161a1 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 1 Jul 2022 10:49:39 +0200
Subject: [PATCH 081/289] use query functions in delete old versions

---
 openpype/plugins/load/delete_old_versions.py | 37 +++++++++-----------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/openpype/plugins/load/delete_old_versions.py b/openpype/plugins/load/delete_old_versions.py
index 7465f53855..039893aa54 100644
--- a/openpype/plugins/load/delete_old_versions.py
+++ b/openpype/plugins/load/delete_old_versions.py
@@ -8,6 +8,7 @@ import ftrack_api
 import qargparse
 from Qt import QtWidgets, QtCore
 
+from openpype.client import get_versions, get_representations
 from openpype import style
 from openpype.pipeline import load, AvalonMongoDB, Anatomy
 from openpype.lib import StringTemplate
@@ -197,18 +198,10 @@ class DeleteOldVersions(load.SubsetLoaderPlugin):
     def get_data(self, context, versions_count):
         subset = context["subset"]
         asset = context["asset"]
-        anatomy = Anatomy(context["project"]["name"])
+        project_name = context["project"]["name"]
+        anatomy = Anatomy(project_name)
 
-        self.dbcon = AvalonMongoDB()
-        self.dbcon.Session["AVALON_PROJECT"] = context["project"]["name"]
-        self.dbcon.install()
-
-        versions = list(
-            self.dbcon.find({
-                "type": "version",
-                "parent": {"$in": [subset["_id"]]}
-            })
-        )
+        versions = list(get_versions(project_name, subset_ids=[subset["_id"]]))
 
         versions_by_parent = collections.defaultdict(list)
         for ent in versions:
@@ -267,10 +260,9 @@ class DeleteOldVersions(load.SubsetLoaderPlugin):
             print(msg)
             return
 
-        repres = list(self.dbcon.find({
-            "type": "representation",
-            "parent": {"$in": version_ids}
-        }))
+        repres = list(get_representations(
+            project_name, version_ids=version_ids
+        ))
 
         self.log.debug(
             "Collected representations to remove ({})".format(len(repres))
@@ -329,7 +321,7 @@ class DeleteOldVersions(load.SubsetLoaderPlugin):
 
         return data
 
-    def main(self, data, remove_publish_folder):
+    def main(self, project_name, data, remove_publish_folder):
         # Size of files.
         size = 0
         if not data:
@@ -366,9 +358,11 @@ class DeleteOldVersions(load.SubsetLoaderPlugin):
             ))
 
         if mongo_changes_bulk:
-            self.dbcon.bulk_write(mongo_changes_bulk)
-
-        self.dbcon.uninstall()
+            dbcon = AvalonMongoDB()
+            dbcon.Session["AVALON_PROJECT"] = project_name
+            dbcon.install()
+            dbcon.bulk_write(mongo_changes_bulk)
+            dbcon.uninstall()
 
         # Set attribute `is_published` to `False` on ftrack AssetVersions
         session = ftrack_api.Session()
@@ -422,7 +416,8 @@ class DeleteOldVersions(load.SubsetLoaderPlugin):
                 if not data:
                     continue
 
-                size += self.main(data, remove_publish_folder)
+                project_name = context["project"]["name"]
+                size += self.main(project_name, data, remove_publish_folder)
                 print("Progressing {}/{}".format(count + 1, len(contexts)))
 
             msg = "Total size of files: " + self.sizeof_fmt(size)
@@ -448,7 +443,7 @@ class CalculateOldVersions(DeleteOldVersions):
         )
     ]
 
-    def main(self, data, remove_publish_folder):
+    def main(self, project_name, data, remove_publish_folder):
         size = 0
 
         if not data:

From bc2f8387fe5eb31f70aa7c39fd3cb67848d23cbf Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 1 Jul 2022 10:50:06 +0200
Subject: [PATCH 082/289] delivery is using guery functions

---
 openpype/plugins/load/delivery.py | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/openpype/plugins/load/delivery.py b/openpype/plugins/load/delivery.py
index 0361ab2be5..7585ea4c59 100644
--- a/openpype/plugins/load/delivery.py
+++ b/openpype/plugins/load/delivery.py
@@ -3,8 +3,9 @@ from collections import defaultdict
 
 from Qt import QtWidgets, QtCore, QtGui
 
+from openpype.client import get_representations
 from openpype.lib import config
-from openpype.pipeline import load, AvalonMongoDB, Anatomy
+from openpype.pipeline import load, Anatomy
 from openpype import resources, style
 
 from openpype.lib.delivery import (
@@ -68,17 +69,13 @@ class DeliveryOptionsDialog(QtWidgets.QDialog):
 
         self.setStyleSheet(style.load_stylesheet())
 
-        project = contexts[0]["project"]["name"]
-        self.anatomy = Anatomy(project)
+        project_name = contexts[0]["project"]["name"]
+        self.anatomy = Anatomy(project_name)
         self._representations = None
         self.log = log
         self.currently_uploaded = 0
 
-        self.dbcon = AvalonMongoDB()
-        self.dbcon.Session["AVALON_PROJECT"] = project
-        self.dbcon.install()
-
-        self._set_representations(contexts)
+        self._set_representations(project_name, contexts)
 
         dropdown = QtWidgets.QComboBox()
         self.templates = self._get_templates(self.anatomy)
@@ -238,13 +235,12 @@ class DeliveryOptionsDialog(QtWidgets.QDialog):
 
         return templates
 
-    def _set_representations(self, contexts):
+    def _set_representations(self, project_name, contexts):
         version_ids = [context["version"]["_id"] for context in contexts]
 
-        repres = list(self.dbcon.find({
-            "type": "representation",
-            "parent": {"$in": version_ids}
-        }))
+        repres = list(get_representations(
+            project_name, version_ids=version_ids
+        ))
 
         self._representations = repres
 

From 3f3ae1fd7dabd3908543ec0fb7d8ab66b0e8f9a3 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 1 Jul 2022 10:58:44 +0200
Subject: [PATCH 083/289] use query functions in collect anatomy instance data

---
 .../publish/collect_anatomy_instance_data.py  | 78 ++++++-------------
 1 file changed, 24 insertions(+), 54 deletions(-)

diff --git a/openpype/plugins/publish/collect_anatomy_instance_data.py b/openpype/plugins/publish/collect_anatomy_instance_data.py
index 6a6ea170b5..c75534cf83 100644
--- a/openpype/plugins/publish/collect_anatomy_instance_data.py
+++ b/openpype/plugins/publish/collect_anatomy_instance_data.py
@@ -27,6 +27,11 @@ import collections
 
 import pyblish.api
 
+from openpype.client import (
+    get_assets,
+    get_subsets,
+    get_last_versions
+)
 from openpype.pipeline import legacy_io
 
 
@@ -44,13 +49,14 @@ class CollectAnatomyInstanceData(pyblish.api.ContextPlugin):
     def process(self, context):
         self.log.info("Collecting anatomy data for all instances.")
 
-        self.fill_missing_asset_docs(context)
-        self.fill_latest_versions(context)
+        project_name = legacy_io.active_project()
+        self.fill_missing_asset_docs(context, project_name)
+        self.fill_latest_versions(context, project_name)
         self.fill_anatomy_data(context)
 
         self.log.info("Anatomy Data collection finished.")
 
-    def fill_missing_asset_docs(self, context):
+    def fill_missing_asset_docs(self, context, project_name):
         self.log.debug("Qeurying asset documents for instances.")
 
         context_asset_doc = context.data.get("assetEntity")
@@ -84,10 +90,8 @@ class CollectAnatomyInstanceData(pyblish.api.ContextPlugin):
         self.log.debug("Querying asset documents with names: {}".format(
             ", ".join(["\"{}\"".format(name) for name in asset_names])
         ))
-        asset_docs = legacy_io.find({
-            "type": "asset",
-            "name": {"$in": asset_names}
-        })
+
+        asset_docs = get_assets(project_name, asset_names=asset_names)
         asset_docs_by_name = {
             asset_doc["name"]: asset_doc
             for asset_doc in asset_docs
@@ -111,7 +115,7 @@ class CollectAnatomyInstanceData(pyblish.api.ContextPlugin):
                 "Not found asset documents with names \"{}\"."
             ).format(joined_asset_names))
 
-    def fill_latest_versions(self, context):
+    def fill_latest_versions(self, context, project_name):
         """Try to find latest version for each instance's subset.
 
         Key "latestVersion" is always set to latest version or `None`.
@@ -126,7 +130,7 @@ class CollectAnatomyInstanceData(pyblish.api.ContextPlugin):
         self.log.debug("Qeurying latest versions for instances.")
 
         hierarchy = {}
-        subset_filters = []
+        names_by_asset_ids = collections.defaultdict(set)
         for instance in context:
             # Make sure `"latestVersion"` key is set
             latest_version = instance.data.get("latestVersion")
@@ -147,67 +151,33 @@ class CollectAnatomyInstanceData(pyblish.api.ContextPlugin):
             if subset_name not in hierarchy[asset_id]:
                 hierarchy[asset_id][subset_name] = []
             hierarchy[asset_id][subset_name].append(instance)
-            subset_filters.append({
-                "parent": asset_id,
-                "name": subset_name
-            })
+            names_by_asset_ids[asset_id].add(subset_name)
 
         subset_docs = []
-        if subset_filters:
-            subset_docs = list(legacy_io.find({
-                "type": "subset",
-                "$or": subset_filters
-            }))
+        if names_by_asset_ids:
+            subset_docs = list(get_subsets(
+                project_name, names_by_asset_ids=names_by_asset_ids
+            ))
 
         subset_ids = [
             subset_doc["_id"]
             for subset_doc in subset_docs
         ]
 
-        last_version_by_subset_id = self._query_last_versions(subset_ids)
+        last_version_docs_by_subset_id = get_last_versions(
+            project_name, subset_ids, fields=["name"]
+        )
         for subset_doc in subset_docs:
             subset_id = subset_doc["_id"]
-            last_version = last_version_by_subset_id.get(subset_id)
-            if last_version is None:
+            last_version_doc = last_version_docs_by_subset_id.get(subset_id)
+            if last_version_docs_by_subset_id is None:
                 continue
 
             asset_id = subset_doc["parent"]
             subset_name = subset_doc["name"]
             _instances = hierarchy[asset_id][subset_name]
             for _instance in _instances:
-                _instance.data["latestVersion"] = last_version
-
-    def _query_last_versions(self, subset_ids):
-        """Retrieve all latest versions for entered subset_ids.
-
-        Args:
-            subset_ids (list): List of subset ids with type `ObjectId`.
-
-        Returns:
-            dict: Key is subset id and value is last version name.
-        """
-        _pipeline = [
-            # Find all versions of those subsets
-            {"$match": {
-                "type": "version",
-                "parent": {"$in": subset_ids}
-            }},
-            # Sorting versions all together
-            {"$sort": {"name": 1}},
-            # Group them by "parent", but only take the last
-            {"$group": {
-                "_id": "$parent",
-                "_version_id": {"$last": "$_id"},
-                "name": {"$last": "$name"}
-            }}
-        ]
-
-        last_version_by_subset_id = {}
-        for doc in legacy_io.aggregate(_pipeline):
-            subset_id = doc["_id"]
-            last_version_by_subset_id[subset_id] = doc["name"]
-
-        return last_version_by_subset_id
+                _instance.data["latestVersion"] = last_version_doc["name"]
 
     def fill_anatomy_data(self, context):
         self.log.debug("Storing anatomy data to instance data.")

From d1e7ae25d4e97abd2734ecf5e86d0ce89f6a09e5 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 1 Jul 2022 11:35:44 +0200
Subject: [PATCH 084/289] added function to receive archived representations

---
 openpype/client/__init__.py |   2 +
 openpype/client/entities.py | 146 +++++++++++++++++++++++++++---------
 2 files changed, 113 insertions(+), 35 deletions(-)

diff --git a/openpype/client/__init__.py b/openpype/client/__init__.py
index e3b4ef5132..6094b4e0ab 100644
--- a/openpype/client/__init__.py
+++ b/openpype/client/__init__.py
@@ -29,6 +29,7 @@ from .entities import (
     get_representations,
     get_representation_parents,
     get_representations_parents,
+    get_archived_representations,
 
     get_thumbnail,
     get_thumbnails,
@@ -66,6 +67,7 @@ __all__ = (
     "get_representations",
     "get_representation_parents",
     "get_representations_parents",
+    "get_archived_representations",
 
     "get_thumbnail",
     "get_thumbnails",
diff --git a/openpype/client/entities.py b/openpype/client/entities.py
index aed465c46f..9d425810b9 100644
--- a/openpype/client/entities.py
+++ b/openpype/client/entities.py
@@ -918,7 +918,7 @@ def get_representation_by_id(project_name, representation_id, fields=None):
     if not representation_id:
         return None
 
-    repre_types = ["representation", "archived_representations"]
+    repre_types = ["representation", "archived_representation"]
     query_filter = {
         "type": {"$in": repre_types}
     }
@@ -962,43 +962,26 @@ def get_representation_by_name(
     return conn.find_one(query_filter, _prepare_fields(fields))
 
 
-def get_representations(
+def _get_representations(
     project_name,
-    representation_ids=None,
-    representation_names=None,
-    version_ids=None,
-    extensions=None,
-    names_by_version_ids=None,
-    archived=False,
-    fields=None
+    representation_ids,
+    representation_names,
+    version_ids,
+    extensions,
+    names_by_version_ids,
+    standard,
+    archived,
+    fields
 ):
-    """Representaion entities data from one project filtered by filters.
-
-    Filters are additive (all conditions must pass to return subset).
-
-    Args:
-        project_name (str): Name of project where to look for queried entities.
-        representation_ids (list[str|ObjectId]): Representation ids used as
-            filter. Filter ignored if 'None' is passed.
-        representation_names (list[str]): Representations names used as filter.
-            Filter ignored if 'None' is passed.
-        version_ids (list[str]): Subset ids used as parent filter. Filter
-            ignored if 'None' is passed.
-        extensions (list[str]): Filter by extension of main representation
-            file (without dot).
-        names_by_version_ids (dict[ObjectId, list[str]]): Complex filtering
-            using version ids and list of names under the version.
-        archived (bool): Output will also contain archived representations.
-        fields (list[str]): Fields that should be returned. All fields are
-            returned if 'None' is passed.
-
-    Returns:
-        Cursor: Iterable cursor yielding all matching representations.
-    """
-
-    repre_types = ["representation"]
+    repre_types = []
+    if standard:
+        repre_types.append("representation")
     if archived:
-        repre_types.append("archived_representations")
+        repre_types.append("archived_representation")
+
+    if not repre_types:
+        return []
+
     if len(repre_types) == 1:
         query_filter = {"type": repre_types[0]}
     else:
@@ -1043,6 +1026,99 @@ def get_representations(
     return conn.find(query_filter, _prepare_fields(fields))
 
 
+def get_representations(
+    project_name,
+    representation_ids=None,
+    representation_names=None,
+    version_ids=None,
+    extensions=None,
+    names_by_version_ids=None,
+    archived=False,
+    standard=True,
+    fields=None
+):
+    """Representaion entities data from one project filtered by filters.
+
+    Filters are additive (all conditions must pass to return subset).
+
+    Args:
+        project_name (str): Name of project where to look for queried entities.
+        representation_ids (list[str|ObjectId]): Representation ids used as
+            filter. Filter ignored if 'None' is passed.
+        representation_names (list[str]): Representations names used as filter.
+            Filter ignored if 'None' is passed.
+        version_ids (list[str]): Subset ids used as parent filter. Filter
+            ignored if 'None' is passed.
+        extensions (list[str]): Filter by extension of main representation
+            file (without dot).
+        names_by_version_ids (dict[ObjectId, list[str]]): Complex filtering
+            using version ids and list of names under the version.
+        archived (bool): Output will also contain archived representations.
+        fields (list[str]): Fields that should be returned. All fields are
+            returned if 'None' is passed.
+
+    Returns:
+        Cursor: Iterable cursor yielding all matching representations.
+    """
+
+    return _get_representations(
+        project_name=project_name,
+        representation_ids=representation_ids,
+        representation_names=representation_names,
+        version_ids=version_ids,
+        extensions=extensions,
+        names_by_version_ids=names_by_version_ids,
+        standard=True,
+        archived=archived,
+        fields=fields
+    )
+
+
+def get_archived_representations(
+    project_name,
+    representation_ids=None,
+    representation_names=None,
+    version_ids=None,
+    extensions=None,
+    names_by_version_ids=None,
+    fields=None
+):
+    """Archived representaion entities data from project with applied filters.
+
+    Filters are additive (all conditions must pass to return subset).
+
+    Args:
+        project_name (str): Name of project where to look for queried entities.
+        representation_ids (list[str|ObjectId]): Representation ids used as
+            filter. Filter ignored if 'None' is passed.
+        representation_names (list[str]): Representations names used as filter.
+            Filter ignored if 'None' is passed.
+        version_ids (list[str]): Subset ids used as parent filter. Filter
+            ignored if 'None' is passed.
+        extensions (list[str]): Filter by extension of main representation
+            file (without dot).
+        names_by_version_ids (dict[ObjectId, list[str]]): Complex filtering
+            using version ids and list of names under the version.
+        fields (list[str]): Fields that should be returned. All fields are
+            returned if 'None' is passed.
+
+    Returns:
+        Cursor: Iterable cursor yielding all matching representations.
+    """
+
+    return _get_representations(
+        project_name=project_name,
+        representation_ids=representation_ids,
+        representation_names=representation_names,
+        version_ids=version_ids,
+        extensions=extensions,
+        names_by_version_ids=names_by_version_ids,
+        standard=False,
+        archived=True,
+        fields=fields
+    )
+
+
 def get_representations_parents(project_name, representations):
     """Prepare parents of representation entities.
 

From 12d23347fc20409900d9ac032852765e38b6a842 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 1 Jul 2022 11:45:52 +0200
Subject: [PATCH 085/289] integrate hero version use query functions

---
 .../plugins/publish/integrate_hero_version.py | 50 +++++++++++--------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/openpype/plugins/publish/integrate_hero_version.py b/openpype/plugins/publish/integrate_hero_version.py
index a706b653c4..5f97a9bd41 100644
--- a/openpype/plugins/publish/integrate_hero_version.py
+++ b/openpype/plugins/publish/integrate_hero_version.py
@@ -8,6 +8,12 @@ from bson.objectid import ObjectId
 from pymongo import InsertOne, ReplaceOne
 import pyblish.api
 
+from openpype.client import (
+    get_version_by_id,
+    get_hero_version_by_subset_id,
+    get_archived_representations,
+    get_representations,
+)
 from openpype.lib import (
     create_hard_link,
     filter_profiles
@@ -85,9 +91,13 @@ class IntegrateHeroVersion(pyblish.api.InstancePlugin):
             hero_template
         ))
 
-        self.integrate_instance(instance, template_key, hero_template)
+        self.integrate_instance(
+            instance, project_name, template_key, hero_template
+        )
 
-    def integrate_instance(self, instance, template_key, hero_template):
+    def integrate_instance(
+        self, instance, project_name, template_key, hero_template
+    ):
         anatomy = instance.context.data["anatomy"]
         published_repres = instance.data["published_representations"]
         hero_publish_dir = self.get_publish_dir(instance, template_key)
@@ -118,8 +128,8 @@ class IntegrateHeroVersion(pyblish.api.InstancePlugin):
                 "Published version entity was not sent in representation data."
                 " Querying entity from database."
             ))
-            src_version_entity = (
-                self.version_from_representations(published_repres)
+            src_version_entity = self.version_from_representations(
+                project_name, published_repres
             )
 
         if not src_version_entity:
@@ -170,8 +180,8 @@ class IntegrateHeroVersion(pyblish.api.InstancePlugin):
             other_file_paths_mapping.append((file_path, dst_filepath))
 
         # Current version
-        old_version, old_repres = (
-            self.current_hero_ents(src_version_entity)
+        old_version, old_repres = self.current_hero_ents(
+            project_name, src_version_entity
         )
 
         old_repres_by_name = {
@@ -223,11 +233,11 @@ class IntegrateHeroVersion(pyblish.api.InstancePlugin):
         if old_repres_by_name:
             old_repres_to_delete = old_repres_by_name
 
-        archived_repres = list(legacy_io.find({
+        archived_repres = list(get_archived_representations(
+            project_name,
             # Check what is type of archived representation
-            "type": "archived_repsentation",
-            "parent": new_version_id
-        }))
+            version_ids=[new_version_id]
+        ))
         archived_repres_by_name = {}
         for repre in archived_repres:
             repre_name_low = repre["name"].lower()
@@ -586,25 +596,23 @@ class IntegrateHeroVersion(pyblish.api.InstancePlugin):
 
         shutil.copy(src_path, dst_path)
 
-    def version_from_representations(self, repres):
+    def version_from_representations(self, project_name, repres):
         for repre in repres:
-            version = legacy_io.find_one({"_id": repre["parent"]})
+            version = get_version_by_id(project_name, repre["parent"])
             if version:
                 return version
 
-    def current_hero_ents(self, version):
-        hero_version = legacy_io.find_one({
-            "parent": version["parent"],
-            "type": "hero_version"
-        })
+    def current_hero_ents(self, project_name, version):
+        hero_version = get_hero_version_by_subset_id(
+            project_name, version["parent"]
+        )
 
         if not hero_version:
             return (None, [])
 
-        hero_repres = list(legacy_io.find({
-            "parent": hero_version["_id"],
-            "type": "representation"
-        }))
+        hero_repres = list(get_representations(
+            project_name, version_ids=[hero_version["_id"]]
+        ))
         return (hero_version, hero_repres)
 
     def _update_path(self, anatomy, path, src_file, dst_file):

From f0f0a87c5d7e81c226dd22fba6589040cf62bfff Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 1 Jul 2022 11:47:01 +0200
Subject: [PATCH 086/289] global plugins are using query functions

---
 .../publish/collect_avalon_entities.py        | 13 +++----
 .../publish/collect_scene_loaded_versions.py  | 33 +++++++++--------
 .../publish/extract_hierarchy_avalon.py       | 36 ++++++++++++-------
 .../plugins/publish/integrate_thumbnail.py    |  3 +-
 .../publish/validate_editorial_asset_name.py  |  7 ++--
 5 files changed, 53 insertions(+), 39 deletions(-)

diff --git a/openpype/plugins/publish/collect_avalon_entities.py b/openpype/plugins/publish/collect_avalon_entities.py
index 3e7843407f..6cd0d136e8 100644
--- a/openpype/plugins/publish/collect_avalon_entities.py
+++ b/openpype/plugins/publish/collect_avalon_entities.py
@@ -10,6 +10,7 @@ Provides:
 
 import pyblish.api
 
+from openpype.client import get_project, get_asset_by_name
 from openpype.pipeline import legacy_io
 
 
@@ -25,10 +26,7 @@ class CollectAvalonEntities(pyblish.api.ContextPlugin):
         asset_name = legacy_io.Session["AVALON_ASSET"]
         task_name = legacy_io.Session["AVALON_TASK"]
 
-        project_entity = legacy_io.find_one({
-            "type": "project",
-            "name": project_name
-        })
+        project_entity = get_project(project_name)
         assert project_entity, (
             "Project '{0}' was not found."
         ).format(project_name)
@@ -39,11 +37,8 @@ class CollectAvalonEntities(pyblish.api.ContextPlugin):
         if not asset_name:
             self.log.info("Context is not set. Can't collect global data.")
             return
-        asset_entity = legacy_io.find_one({
-            "type": "asset",
-            "name": asset_name,
-            "parent": project_entity["_id"]
-        })
+
+        asset_entity = get_asset_by_name(project_name, asset_name)
         assert asset_entity, (
             "No asset found by the name '{0}' in project '{1}'"
         ).format(asset_name, project_name)
diff --git a/openpype/plugins/publish/collect_scene_loaded_versions.py b/openpype/plugins/publish/collect_scene_loaded_versions.py
index bb34e3ce31..5ff2b46e3b 100644
--- a/openpype/plugins/publish/collect_scene_loaded_versions.py
+++ b/openpype/plugins/publish/collect_scene_loaded_versions.py
@@ -1,7 +1,6 @@
-from bson.objectid import ObjectId
-
 import pyblish.api
 
+from openpype.client import get_representations
 from openpype.pipeline import (
     registered_host,
     legacy_io,
@@ -39,23 +38,29 @@ class CollectSceneLoadedVersions(pyblish.api.ContextPlugin):
             return
 
         loaded_versions = []
-        _containers = list(host.ls())
-        _repr_ids = [ObjectId(c["representation"]) for c in _containers]
-        repre_docs = legacy_io.find(
-            {"_id": {"$in": _repr_ids}},
-            projection={"_id": 1, "parent": 1}
+        containers = list(host.ls())
+        repre_ids = {
+            container["representation"]
+            for container in containers
+        }
+
+        project_name = legacy_io.active_project()
+        repre_docs = get_representations(
+            project_name,
+            representation_ids=repre_ids,
+            fields=["_id", "parent"]
         )
-        version_by_repr = {
-            str(doc["_id"]): doc["parent"]
+        repre_doc_by_str_id = {
+            str(doc["_id"]): doc
             for doc in repre_docs
         }
 
         # QUESTION should we add same representation id when loaded multiple
         #   times?
-        for con in _containers:
+        for con in containers:
             repre_id = con["representation"]
-            version_id = version_by_repr.get(repre_id)
-            if version_id is None:
+            repre_doc = repre_doc_by_str_id.get(repre_id)
+            if repre_doc is None:
                 self.log.warning((
                     "Skipping container,"
                     " did not find representation document. {}"
@@ -66,8 +71,8 @@ class CollectSceneLoadedVersions(pyblish.api.ContextPlugin):
             # may have more then one representation that are same version
             version = {
                 "subsetName": con["name"],
-                "representation": ObjectId(repre_id),
-                "version": version_id,
+                "representation": repre_doc["_id"],
+                "version": repre_doc["parent"],
             }
             loaded_versions.append(version)
 
diff --git a/openpype/plugins/publish/extract_hierarchy_avalon.py b/openpype/plugins/publish/extract_hierarchy_avalon.py
index 1f7ce839ed..8d447ba595 100644
--- a/openpype/plugins/publish/extract_hierarchy_avalon.py
+++ b/openpype/plugins/publish/extract_hierarchy_avalon.py
@@ -1,5 +1,11 @@
 from copy import deepcopy
 import pyblish.api
+from openpype.client import (
+    get_project,
+    get_asset_by_id,
+    get_asset_by_name,
+    get_archived_assets
+)
 from openpype.pipeline import legacy_io
 
 
@@ -19,14 +25,14 @@ class ExtractHierarchyToAvalon(pyblish.api.ContextPlugin):
         if not legacy_io.Session:
             legacy_io.install()
 
+        project_name = legacy_io.active_project()
         hierarchy_context = self._get_active_assets(context)
         self.log.debug("__ hierarchy_context: {}".format(hierarchy_context))
 
         self.project = None
-        self.import_to_avalon(hierarchy_context)
+        self.import_to_avalon(project_name, hierarchy_context)
 
-
-    def import_to_avalon(self, input_data, parent=None):
+    def import_to_avalon(self, project_name, input_data, parent=None):
         for name in input_data:
             self.log.info("input_data[name]: {}".format(input_data[name]))
             entity_data = input_data[name]
@@ -62,7 +68,7 @@ class ExtractHierarchyToAvalon(pyblish.api.ContextPlugin):
             update_data = True
             # Process project
             if entity_type.lower() == "project":
-                entity = legacy_io.find_one({"type": "project"})
+                entity = get_project(project_name)
                 # TODO: should be in validator?
                 assert (entity is not None), "Did not find project in DB"
 
@@ -79,7 +85,7 @@ class ExtractHierarchyToAvalon(pyblish.api.ContextPlugin):
                 )
             # Else process assset
             else:
-                entity = legacy_io.find_one({"type": "asset", "name": name})
+                entity = get_asset_by_name(project_name, name)
                 if entity:
                     # Do not override data, only update
                     cur_entity_data = entity.get("data") or {}
@@ -103,10 +109,10 @@ class ExtractHierarchyToAvalon(pyblish.api.ContextPlugin):
                     # Skip updating data
                     update_data = False
 
-                    archived_entities = legacy_io.find({
-                        "type": "archived_asset",
-                        "name": name
-                    })
+                    archived_entities = get_archived_assets(
+                        project_name,
+                        asset_names=[name]
+                    )
                     unarchive_entity = None
                     for archived_entity in archived_entities:
                         archived_parents = (
@@ -120,7 +126,9 @@ class ExtractHierarchyToAvalon(pyblish.api.ContextPlugin):
 
                     if unarchive_entity is None:
                         # Create entity if doesn"t exist
-                        entity = self.create_avalon_asset(name, data)
+                        entity = self.create_avalon_asset(
+                            project_name, name, data
+                        )
                     else:
                         # Unarchive if entity was archived
                         entity = self.unarchive_entity(unarchive_entity, data)
@@ -133,7 +141,9 @@ class ExtractHierarchyToAvalon(pyblish.api.ContextPlugin):
                 )
 
             if "childs" in entity_data:
-                self.import_to_avalon(entity_data["childs"], entity)
+                self.import_to_avalon(
+                    project_name, entity_data["childs"], entity
+                )
 
     def unarchive_entity(self, entity, data):
         # Unarchived asset should not use same data
@@ -151,7 +161,7 @@ class ExtractHierarchyToAvalon(pyblish.api.ContextPlugin):
         )
         return new_entity
 
-    def create_avalon_asset(self, name, data):
+    def create_avalon_asset(self, project_name, name, data):
         item = {
             "schema": "openpype:asset-3.0",
             "name": name,
@@ -162,7 +172,7 @@ class ExtractHierarchyToAvalon(pyblish.api.ContextPlugin):
         self.log.debug("Creating asset: {}".format(item))
         entity_id = legacy_io.insert_one(item).inserted_id
 
-        return legacy_io.find_one({"_id": entity_id})
+        return get_asset_by_id(project_name, entity_id)
 
     def _get_active_assets(self, context):
         """ Returns only asset dictionary.
diff --git a/openpype/plugins/publish/integrate_thumbnail.py b/openpype/plugins/publish/integrate_thumbnail.py
index 5d6fc561ea..fd50858a91 100644
--- a/openpype/plugins/publish/integrate_thumbnail.py
+++ b/openpype/plugins/publish/integrate_thumbnail.py
@@ -8,6 +8,7 @@ import six
 import pyblish.api
 from bson.objectid import ObjectId
 
+from openpype.client import get_version_by_id
 from openpype.pipeline import legacy_io
 
 
@@ -70,7 +71,7 @@ class IntegrateThumbnails(pyblish.api.InstancePlugin):
 
         thumbnail_template = anatomy.templates["publish"]["thumbnail"]
 
-        version = legacy_io.find_one({"_id": thumb_repre["parent"]})
+        version = get_version_by_id(project_name, thumb_repre["parent"])
         if not version:
             raise AssertionError(
                 "There does not exist version with id {}".format(
diff --git a/openpype/plugins/publish/validate_editorial_asset_name.py b/openpype/plugins/publish/validate_editorial_asset_name.py
index f9cdaebf0c..702e87b58d 100644
--- a/openpype/plugins/publish/validate_editorial_asset_name.py
+++ b/openpype/plugins/publish/validate_editorial_asset_name.py
@@ -3,6 +3,7 @@ from pprint import pformat
 import pyblish.api
 
 from openpype.pipeline import legacy_io
+from openpype.client import get_assets
 
 
 class ValidateEditorialAssetName(pyblish.api.ContextPlugin):
@@ -29,8 +30,10 @@ class ValidateEditorialAssetName(pyblish.api.ContextPlugin):
         if not legacy_io.Session:
             legacy_io.install()
 
-        db_assets = list(legacy_io.find(
-            {"type": "asset"}, {"name": 1, "data.parents": 1}))
+        project_name = legacy_io.active_project()
+        db_assets = list(get_assets(
+            project_name, fields=["name", "data.parents"]
+        ))
         self.log.debug("__ db_assets: {}".format(db_assets))
 
         asset_db_docs = {

From 646e9edd9b11fe2d6095d9c511e1e61c096b19c4 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 1 Jul 2022 11:49:28 +0200
Subject: [PATCH 087/289] integrate asset new is using query functions

---
 openpype/plugins/publish/integrate_new.py | 53 +++++++++++------------
 1 file changed, 25 insertions(+), 28 deletions(-)

diff --git a/openpype/plugins/publish/integrate_new.py b/openpype/plugins/publish/integrate_new.py
index 4c14c17dae..c264f0fd59 100644
--- a/openpype/plugins/publish/integrate_new.py
+++ b/openpype/plugins/publish/integrate_new.py
@@ -16,6 +16,14 @@ from pymongo import DeleteOne, InsertOne
 import pyblish.api
 
 import openpype.api
+from openpype.client import (
+    get_asset_by_name,
+    get_subset_by_id,
+    get_version_by_id,
+    get_version_by_name,
+    get_representations,
+    get_archived_representations,
+)
 from openpype.lib.profiles_filtering import filter_profiles
 from openpype.lib import (
     prepare_template_data,
@@ -201,6 +209,7 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
         context = instance.context
 
         project_entity = instance.data["projectEntity"]
+        project_name = project_entity["name"]
 
         context_asset_name = None
         context_asset_doc = context.data.get("assetEntity")
@@ -210,11 +219,7 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
         asset_name = instance.data["asset"]
         asset_entity = instance.data.get("assetEntity")
         if not asset_entity or asset_entity["name"] != context_asset_name:
-            asset_entity = legacy_io.find_one({
-                "type": "asset",
-                "name": asset_name,
-                "parent": project_entity["_id"]
-            })
+            asset_entity = get_asset_by_name(project_name, asset_name)
             assert asset_entity, (
                 "No asset found by the name \"{0}\" in project \"{1}\""
             ).format(asset_name, project_entity["name"])
@@ -270,7 +275,7 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
                 "Establishing staging directory @ {0}".format(stagingdir)
             )
 
-        subset = self.get_subset(asset_entity, instance)
+        subset = self.get_subset(project_name, asset_entity, instance)
         instance.data["subsetEntity"] = subset
 
         version_number = instance.data["version"]
@@ -297,11 +302,9 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
             for _repre in repres
         ]
 
-        existing_version = legacy_io.find_one({
-            'type': 'version',
-            'parent': subset["_id"],
-            'name': version_number
-        })
+        existing_version = get_version_by_name(
+            project_name, version_number, subset["_id"]
+        )
 
         if existing_version is None:
             version_id = legacy_io.insert_one(version).inserted_id
@@ -322,10 +325,9 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
             version_id = existing_version['_id']
 
             # Find representations of existing version and archive them
-            current_repres = list(legacy_io.find({
-                "type": "representation",
-                "parent": version_id
-            }))
+            current_repres = list(get_representations(
+                project_name, version_ids=[version_id]
+            ))
             bulk_writes = []
             for repre in current_repres:
                 if append_repres:
@@ -345,18 +347,17 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
 
             # bulk updates
             if bulk_writes:
-                project_name = legacy_io.Session["AVALON_PROJECT"]
                 legacy_io.database[project_name].bulk_write(
                     bulk_writes
                 )
 
-        version = legacy_io.find_one({"_id": version_id})
+        version = get_version_by_id(project_name, version_id)
         instance.data["versionEntity"] = version
 
-        existing_repres = list(legacy_io.find({
-            "parent": version_id,
-            "type": "archived_representation"
-        }))
+        existing_repres = list(get_archived_representations(
+            project_name,
+            version_ids=[version_id]
+        ))
 
         instance.data['version'] = version['name']
 
@@ -792,13 +793,9 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
 
         create_hard_link(src, dst)
 
-    def get_subset(self, asset, instance):
+    def get_subset(self, project_name, asset, instance):
         subset_name = instance.data["subset"]
-        subset = legacy_io.find_one({
-            "type": "subset",
-            "parent": asset["_id"],
-            "name": subset_name
-        })
+        subset = get_subset_by_name(project_name, subset_name, asset["_id"])
 
         if subset is None:
             self.log.info("Subset '%s' not found, creating ..." % subset_name)
@@ -825,7 +822,7 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
                 "parent": asset["_id"]
             }).inserted_id
 
-            subset = legacy_io.find_one({"_id": _id})
+            subset = get_subset_by_id(project_name, _id)
 
         # QUESTION Why is changing of group and updating it's
         #   families in 'get_subset'?

From 26bdde12d0d81bf3c5bd60ec69659716a904d0e9 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 1 Jul 2022 11:54:17 +0200
Subject: [PATCH 088/289] add missing import

---
 openpype/plugins/publish/integrate_new.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openpype/plugins/publish/integrate_new.py b/openpype/plugins/publish/integrate_new.py
index c264f0fd59..f870220421 100644
--- a/openpype/plugins/publish/integrate_new.py
+++ b/openpype/plugins/publish/integrate_new.py
@@ -19,6 +19,7 @@ import openpype.api
 from openpype.client import (
     get_asset_by_name,
     get_subset_by_id,
+    get_subset_by_name,
     get_version_by_id,
     get_version_by_name,
     get_representations,

From bcdcf5b6af6ebb65c4bf803a30c4ba2afffca5fa Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Sat, 2 Jul 2022 22:16:58 +0200
Subject: [PATCH 089/289] resolve: removing small blockers

---
 openpype/hosts/resolve/api/lib.py             | 13 ++--
 openpype/hosts/resolve/api/plugin.py          |  2 +-
 .../plugins/create/create_shot_clip.py        | 68 ++++++++++---------
 .../hosts/resolve/plugins/load/load_clip.py   |  2 +-
 .../plugins/publish/precollect_workfile.py    |  3 +-
 5 files changed, 45 insertions(+), 43 deletions(-)

diff --git a/openpype/hosts/resolve/api/lib.py b/openpype/hosts/resolve/api/lib.py
index c4717bd370..93ccdaf812 100644
--- a/openpype/hosts/resolve/api/lib.py
+++ b/openpype/hosts/resolve/api/lib.py
@@ -319,14 +319,13 @@ def get_current_timeline_items(
     selected_track_count = timeline.GetTrackCount(track_type)
 
     # loop all tracks and get items
-    _clips = dict()
+    _clips = {}
     for track_index in range(1, (int(selected_track_count) + 1)):
         _track_name = timeline.GetTrackName(track_type, track_index)
 
         # filter out all unmathed track names
-        if track_name:
-            if _track_name not in track_name:
-                continue
+        if track_name and _track_name not in track_name:
+            continue
 
         timeline_items = timeline.GetItemListInTrack(
             track_type, track_index)
@@ -348,12 +347,8 @@ def get_current_timeline_items(
                 "index": clip_index
             }
             ti_color = ti.GetClipColor()
-            if filter is True:
-                if selecting_color in ti_color:
-                    selected_clips.append(data)
-            else:
+            if filter and selecting_color in ti_color or not filter:
                 selected_clips.append(data)
-
     return selected_clips
 
 
diff --git a/openpype/hosts/resolve/api/plugin.py b/openpype/hosts/resolve/api/plugin.py
index 8e1436021c..49b478fb3b 100644
--- a/openpype/hosts/resolve/api/plugin.py
+++ b/openpype/hosts/resolve/api/plugin.py
@@ -506,7 +506,7 @@ class Creator(LegacyCreator):
         super(Creator, self).__init__(*args, **kwargs)
         from openpype.api import get_current_project_settings
         resolve_p_settings = get_current_project_settings().get("resolve")
-        self.presets = dict()
+        self.presets = {}
         if resolve_p_settings:
             self.presets = resolve_p_settings["create"].get(
                 self.__class__.__name__, {})
diff --git a/openpype/hosts/resolve/plugins/create/create_shot_clip.py b/openpype/hosts/resolve/plugins/create/create_shot_clip.py
index 62d5557a50..dbf10c5163 100644
--- a/openpype/hosts/resolve/plugins/create/create_shot_clip.py
+++ b/openpype/hosts/resolve/plugins/create/create_shot_clip.py
@@ -116,12 +116,13 @@ class CreateShotClip(resolve.Creator):
                     "order": 0},
                 "vSyncTrack": {
                     "value": gui_tracks,  # noqa
-                   "type": "QComboBox",
-                   "label": "Hero track",
-                   "target": "ui",
-                   "toolTip": "Select driving track name which should be mastering all others",  # noqa
-                "order": 1}
+                    "type": "QComboBox",
+                    "label": "Hero track",
+                    "target": "ui",
+                    "toolTip": "Select driving track name which should be mastering all others",  # noqa
+                    "order": 1
                 }
+            }
         },
         "publishSettings": {
             "type": "section",
@@ -172,28 +173,31 @@ class CreateShotClip(resolve.Creator):
             "target": "ui",
             "order": 4,
             "value": {
-               "workfileFrameStart": {
-                   "value": 1001,
-                   "type": "QSpinBox",
-                   "label": "Workfiles Start Frame",
-                   "target": "tag",
-                   "toolTip": "Set workfile starting frame number",  # noqa
-                   "order": 0},
-               "handleStart": {
-                   "value": 0,
-                   "type": "QSpinBox",
-                   "label": "Handle start (head)",
-                   "target": "tag",
-                   "toolTip": "Handle at start of clip",  # noqa
-                   "order": 1},
-               "handleEnd": {
-                   "value": 0,
-                   "type": "QSpinBox",
-                   "label": "Handle end (tail)",
-                   "target": "tag",
-                   "toolTip": "Handle at end of clip",  # noqa
-                   "order": 2},
-           }
+                "workfileFrameStart": {
+                    "value": 1001,
+                    "type": "QSpinBox",
+                    "label": "Workfiles Start Frame",
+                    "target": "tag",
+                    "toolTip": "Set workfile starting frame number",  # noqa
+                    "order": 0
+                },
+                "handleStart": {
+                    "value": 0,
+                    "type": "QSpinBox",
+                    "label": "Handle start (head)",
+                    "target": "tag",
+                    "toolTip": "Handle at start of clip",  # noqa
+                    "order": 1
+                },
+                "handleEnd": {
+                    "value": 0,
+                    "type": "QSpinBox",
+                    "label": "Handle end (tail)",
+                    "target": "tag",
+                    "toolTip": "Handle at end of clip",  # noqa
+                    "order": 2
+                }
+            }
         }
     }
 
@@ -229,8 +233,10 @@ class CreateShotClip(resolve.Creator):
         v_sync_track = widget.result["vSyncTrack"]["value"]
 
         # sort selected trackItems by
-        sorted_selected_track_items = list()
-        unsorted_selected_track_items = list()
+        sorted_selected_track_items = []
+        unsorted_selected_track_items = []
+        print("_____ selected ______")
+        print(self.selected)
         for track_item_data in self.selected:
             if track_item_data["track"]["name"] in v_sync_track:
                 sorted_selected_track_items.append(track_item_data)
@@ -253,10 +259,10 @@ class CreateShotClip(resolve.Creator):
             "sq_frame_start": sq_frame_start,
             "sq_markers": sq_markers
         }
-
+        print(kwargs)
         for i, track_item_data in enumerate(sorted_selected_track_items):
             self.rename_index = i
-
+            self.log.info(track_item_data)
             # convert track item to timeline media pool item
             track_item = resolve.PublishClip(
                 self, track_item_data, **kwargs).convert()
diff --git a/openpype/hosts/resolve/plugins/load/load_clip.py b/openpype/hosts/resolve/plugins/load/load_clip.py
index cf88b14e81..567be2be87 100644
--- a/openpype/hosts/resolve/plugins/load/load_clip.py
+++ b/openpype/hosts/resolve/plugins/load/load_clip.py
@@ -19,7 +19,7 @@ class LoadClip(resolve.TimelineItemLoader):
     """
 
     families = ["render2d", "source", "plate", "render", "review"]
-    representations = ["exr", "dpx", "jpg", "jpeg", "png", "h264", ".mov"]
+    representations = ["exr", "dpx", "jpg", "jpeg", "png", "h264", "mov"]
 
     label = "Load as clip"
     order = -10
diff --git a/openpype/hosts/resolve/plugins/publish/precollect_workfile.py b/openpype/hosts/resolve/plugins/publish/precollect_workfile.py
index a58f288770..53e67aee0e 100644
--- a/openpype/hosts/resolve/plugins/publish/precollect_workfile.py
+++ b/openpype/hosts/resolve/plugins/publish/precollect_workfile.py
@@ -30,7 +30,8 @@ class PrecollectWorkfile(pyblish.api.ContextPlugin):
             "asset": asset,
             "subset": "{}{}".format(asset, subset.capitalize()),
             "item": project,
-            "family": "workfile"
+            "family": "workfile",
+            "families": []
         }
 
         # create instance with workfile

From 4781fc56b48b6f66dc33803c35ee7d9be56729ec Mon Sep 17 00:00:00 2001
From: Thomas Fricard <tfricard@ws114.prs.vfx.int>
Date: Mon, 4 Jul 2022 12:50:39 +0200
Subject: [PATCH 090/289] remove the global scope add_scripts_menu call from
 menu.py and add it in the install function of pipeline.py

---
 openpype/hosts/hiero/api/menu.py     | 5 +----
 openpype/hosts/hiero/api/pipeline.py | 1 +
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/openpype/hosts/hiero/api/menu.py b/openpype/hosts/hiero/api/menu.py
index 412f08272e..541a1f1f92 100644
--- a/openpype/hosts/hiero/api/menu.py
+++ b/openpype/hosts/hiero/api/menu.py
@@ -162,11 +162,8 @@ def add_scripts_menu():
         log.warning("Skipping studio menu, no definition found.")
         return
 
-    # run the launcher for Maya menu
+    # run the launcher for Hiero menu
     studio_menu = launchforhiero.main(title=_menu.title())
 
     # apply configuration
     studio_menu.build_from_configuration(studio_menu, config)
-
-
-add_scripts_menu()
diff --git a/openpype/hosts/hiero/api/pipeline.py b/openpype/hosts/hiero/api/pipeline.py
index 9b628ec70b..b243a38b06 100644
--- a/openpype/hosts/hiero/api/pipeline.py
+++ b/openpype/hosts/hiero/api/pipeline.py
@@ -48,6 +48,7 @@ def install():
 
     # install menu
     menu.menu_install()
+    menu.add_scripts_menu()
 
     # register hiero events
     events.register_hiero_events()

From 6c658f7da3fdf9bf716d8adfaf17f69641e78d87 Mon Sep 17 00:00:00 2001
From: Thomas Fricard <tfricard@ws114.prs.vfx.int>
Date: Mon, 4 Jul 2022 14:24:07 +0200
Subject: [PATCH 091/289] fix default json project_settings by setting defaults
 through run_settings UI

---
 .../defaults/project_settings/hiero.json      | 42 ++++++-------------
 1 file changed, 13 insertions(+), 29 deletions(-)

diff --git a/openpype/settings/defaults/project_settings/hiero.json b/openpype/settings/defaults/project_settings/hiero.json
index 3b0127c24a..e9e7199330 100644
--- a/openpype/settings/defaults/project_settings/hiero.json
+++ b/openpype/settings/defaults/project_settings/hiero.json
@@ -1,32 +1,4 @@
 {
-    "ext_mapping": {
-        "model": "hrox",
-        "mayaAscii": "hrox",
-        "camera": "hrox",
-        "rig": "hrox",
-        "workfile": "hrox",
-        "yetiRig": "hrox"
-    },
-    "hiero-dirmap": {
-        "enabled": false,
-        "paths": {
-            "source-path": [],
-            "destination-path": []
-        }
-    },
-    "scriptsmenu": {
-        "name": "OpenPype Tools",
-        "definition": [
-            {
-                "type": "action",
-                "sourcetype": "python",
-                "title": "OpenPype Docs",
-                "command": "import webbrowser;webbrowser.open(url='https://openpype.io/docs/artist_hosts_hiero')",
-                "tooltip": "Open the OpenPype Hiero user doc page"
-            }
-        ]
-    },
-
     "create": {
         "CreateShotClip": {
             "hierarchy": "{folder}/{sequence}",
@@ -79,5 +51,17 @@
             ]
         }
     },
-    "filters": {}
+    "filters": {},
+    "scriptsmenu": {
+        "name": "OpenPype Tools",
+        "definition": [
+            {
+                "type": "action",
+                "sourcetype": "python",
+                "title": "OpenPype Docs",
+                "command": "import webbrowser;webbrowser.open(url='https://openpype.io/docs/artist_hosts_hiero')",
+                "tooltip": "Open the OpenPype Hiero user doc page"
+            }
+        ]
+    }
 }
\ No newline at end of file

From eedc67edcc37dcfeae0254e4e856ec4b7df409cf Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Mon, 4 Jul 2022 16:28:59 +0200
Subject: [PATCH 092/289] use project entity from context instead of requery

---
 .../deadline/plugins/publish/submit_houdini_remote_publish.py   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/modules/deadline/plugins/publish/submit_houdini_remote_publish.py b/openpype/modules/deadline/plugins/publish/submit_houdini_remote_publish.py
index f834ae7e92..fdf67b51bc 100644
--- a/openpype/modules/deadline/plugins/publish/submit_houdini_remote_publish.py
+++ b/openpype/modules/deadline/plugins/publish/submit_houdini_remote_publish.py
@@ -55,7 +55,7 @@ class HoudiniSubmitPublishDeadline(pyblish.api.ContextPlugin):
         scenename = os.path.basename(scene)
 
         # Get project code
-        project = legacy_io.find_one({"type": "project"})
+        project = context.data["projectEntity"]
         code = project["data"].get("code", project["name"])
 
         job_name = "{scene} [PUBLISH]".format(scene=scenename)

From 5ba81e8c284e9ee38ceb84dae2aee25d054f8685 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Mon, 4 Jul 2022 16:37:36 +0200
Subject: [PATCH 093/289] use query function in submit to deadline

---
 .../plugins/publish/submit_publish_job.py     | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/openpype/modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/deadline/plugins/publish/submit_publish_job.py
index 9dd1428a63..b098eaba8e 100644
--- a/openpype/modules/deadline/plugins/publish/submit_publish_job.py
+++ b/openpype/modules/deadline/plugins/publish/submit_publish_job.py
@@ -11,6 +11,7 @@ import clique
 import pyblish.api
 
 import openpype.api
+from openpype.client import get_representations
 from openpype.pipeline import (
     get_representation_path,
     legacy_io,
@@ -18,15 +19,23 @@ from openpype.pipeline import (
 from openpype.pipeline.farm.patterning import match_aov_pattern
 
 
-def get_resources(version, extension=None):
+def get_resources(project_name, version, extension=None):
     """Get the files from the specific version."""
-    query = {"type": "representation", "parent": version["_id"]}
+
+    # TODO this functions seems to be weird
+    #   - it's looking for representation with one extension or first (any)
+    #       representation from a version?
+    #  - not sure how this should work, maybe it does for specific use cases
+    #       but probably can't be used for all resources from 2D workflows
+    extensions = None
     if extension:
-        query["name"] = extension
-
-    representation = legacy_io.find_one(query)
-    assert representation, "This is a bug"
+        extensions = [extension]
+    repre_docs = list(get_representations(
+        project_name, version_ids=[version["_id"]], extensions=extensions
+    ))
+    assert repre_docs, "This is a bug"
 
+    representation = repre_docs[0]
     directory = get_representation_path(representation)
     print("Source: ", directory)
     resources = sorted(
@@ -330,13 +339,16 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
         self.log.info("Preparing to copy ...")
         start = instance.data.get("frameStart")
         end = instance.data.get("frameEnd")
+        project_name = legacy_io.active_project()
 
         # get latest version of subset
         # this will stop if subset wasn't published yet
         version = openpype.api.get_latest_version(instance.data.get("asset"),
                                                   instance.data.get("subset"))
         # get its files based on extension
-        subset_resources = get_resources(version, representation.get("ext"))
+        subset_resources = get_resources(
+            project_name, version, representation.get("ext")
+        )
         r_col, _ = clique.assemble(subset_resources)
 
         # if override remove all frames we are expecting to be rendered

From eb352d0958fda52b2a77ca10bb56a9fb80894e16 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Mon, 4 Jul 2022 16:51:54 +0200
Subject: [PATCH 094/289] fix 'hero' kwargs

---
 openpype/lib/avalon_context.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/openpype/lib/avalon_context.py b/openpype/lib/avalon_context.py
index 9ffa5f2732..76ed6cbbd3 100644
--- a/openpype/lib/avalon_context.py
+++ b/openpype/lib/avalon_context.py
@@ -195,7 +195,6 @@ def is_latest(representation):
     version = get_version_by_id(
         project_name,
         representation["parent"],
-        hero=True,
         fields=["_id", "type", "parent"]
     )
     if version["type"] == "hero_version":

From deaeed3f0b5b7eb602efa0b23a4e34ec1774571a Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Tue, 5 Jul 2022 10:35:42 +0200
Subject: [PATCH 095/289] nuke: make it clean nodes again

---
 openpype/hosts/nuke/plugins/publish/extract_slate_frame.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openpype/hosts/nuke/plugins/publish/extract_slate_frame.py b/openpype/hosts/nuke/plugins/publish/extract_slate_frame.py
index 6997180c9f..99ade4cf9b 100644
--- a/openpype/hosts/nuke/plugins/publish/extract_slate_frame.py
+++ b/openpype/hosts/nuke/plugins/publish/extract_slate_frame.py
@@ -230,8 +230,8 @@ class ExtractSlateFrame(openpype.api.Extractor):
             write_node.name(), int(slate_first_frame), int(slate_first_frame))
 
         # Clean up
-        # for node in temporary_nodes:
-        #     nuke.delete(node)
+        for node in temporary_nodes:
+            nuke.delete(node)
 
     def _render_slate_to_sequence(self, instance):
         # set slate frame

From 6e3fd1122bc9614d124b8bc49edac70c121bb39c Mon Sep 17 00:00:00 2001
From: Kaa Maurice <kaalium@gmail.com>
Date: Tue, 5 Jul 2022 17:13:11 +0200
Subject: [PATCH 096/289] Kitsu bugfix update assets attributes

---
 .../plugins/publish/collect_kitsu_entities.py | 18 ++++---
 openpype/modules/kitsu/utils/sync_service.py  | 32 +++++++-----
 .../modules/kitsu/utils/update_op_with_zou.py | 52 ++++++++++++-------
 3 files changed, 65 insertions(+), 37 deletions(-)

diff --git a/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py b/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py
index 84c400bde9..d28ded06c7 100644
--- a/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py
+++ b/openpype/modules/kitsu/plugins/publish/collect_kitsu_entities.py
@@ -32,11 +32,17 @@ class CollectKitsuEntities(pyblish.api.ContextPlugin):
         context.data["kitsu_project"] = kitsu_project
         self.log.debug("Collect kitsu project: {}".format(kitsu_project))
 
-        kitsu_asset = gazu.asset.get_asset(zou_asset_data["id"])
-        if not kitsu_asset:
-            raise AssertionError("Asset not found in kitsu!")
-        context.data["kitsu_asset"] = kitsu_asset
-        self.log.debug("Collect kitsu asset: {}".format(kitsu_asset))
+        entity_type = zou_asset_data["type"]
+        if entity_type == "Shot":
+            kitsu_entity = gazu.shot.get_shot(zou_asset_data["id"])
+        else:
+            kitsu_entity = gazu.asset.get_asset(zou_asset_data["id"])
+
+        if not kitsu_entity:
+            raise AssertionError(f"{entity_type} not found in kitsu!")
+
+        context.data["kitsu_entity"] = kitsu_entity
+        self.log.debug(f"Collect kitsu {entity_type}: {kitsu_entity}")
 
         if zou_task_data:
             kitsu_task = gazu.task.get_task(zou_task_data["id"])
@@ -57,7 +63,7 @@ class CollectKitsuEntities(pyblish.api.ContextPlugin):
                 )
 
             kitsu_task = gazu.task.get_task_by_name(
-                kitsu_asset, kitsu_task_type
+                kitsu_entity, kitsu_task_type
             )
             if not kitsu_task:
                 raise AssertionError("Task not found in kitsu!")
diff --git a/openpype/modules/kitsu/utils/sync_service.py b/openpype/modules/kitsu/utils/sync_service.py
index 6c003942f8..577050c5af 100644
--- a/openpype/modules/kitsu/utils/sync_service.py
+++ b/openpype/modules/kitsu/utils/sync_service.py
@@ -165,10 +165,12 @@ class Listener:
         zou_ids_and_asset_docs[asset["project_id"]] = project_doc
 
         # Update
-        asset_doc_id, asset_update = update_op_assets(
+        update_op_result = update_op_assets(
             self.dbcon, project_doc, [asset], zou_ids_and_asset_docs
-        )[0]
-        self.dbcon.update_one({"_id": asset_doc_id}, asset_update)
+        )
+        if update_op_result:
+            asset_doc_id, asset_update = update_op_result[0]
+            self.dbcon.update_one({"_id": asset_doc_id}, asset_update)
 
     def _delete_asset(self, data):
         """Delete asset of OP DB."""
@@ -212,10 +214,12 @@ class Listener:
         zou_ids_and_asset_docs[episode["project_id"]] = project_doc
 
         # Update
-        asset_doc_id, asset_update = update_op_assets(
+        update_op_result = update_op_assets(
             self.dbcon, project_doc, [episode], zou_ids_and_asset_docs
-        )[0]
-        self.dbcon.update_one({"_id": asset_doc_id}, asset_update)
+        )
+        if update_op_result:
+            asset_doc_id, asset_update = update_op_result[0]
+            self.dbcon.update_one({"_id": asset_doc_id}, asset_update)
 
     def _delete_episode(self, data):
         """Delete shot of OP DB."""
@@ -260,10 +264,12 @@ class Listener:
         zou_ids_and_asset_docs[sequence["project_id"]] = project_doc
 
         # Update
-        asset_doc_id, asset_update = update_op_assets(
+        update_op_result = update_op_assets(
             self.dbcon, project_doc, [sequence], zou_ids_and_asset_docs
-        )[0]
-        self.dbcon.update_one({"_id": asset_doc_id}, asset_update)
+        )
+        if update_op_result:
+            asset_doc_id, asset_update = update_op_result[0]
+            self.dbcon.update_one({"_id": asset_doc_id}, asset_update)
 
     def _delete_sequence(self, data):
         """Delete sequence of OP DB."""
@@ -308,10 +314,12 @@ class Listener:
         zou_ids_and_asset_docs[shot["project_id"]] = project_doc
 
         # Update
-        asset_doc_id, asset_update = update_op_assets(
+        update_op_result = update_op_assets(
             self.dbcon, project_doc, [shot], zou_ids_and_asset_docs
-        )[0]
-        self.dbcon.update_one({"_id": asset_doc_id}, asset_update)
+        )
+        if update_op_result:
+            asset_doc_id, asset_update = update_op_result[0]
+            self.dbcon.update_one({"_id": asset_doc_id}, asset_update)
 
     def _delete_shot(self, data):
         """Delete shot of OP DB."""
diff --git a/openpype/modules/kitsu/utils/update_op_with_zou.py b/openpype/modules/kitsu/utils/update_op_with_zou.py
index cd98c0d204..f8ee6688d2 100644
--- a/openpype/modules/kitsu/utils/update_op_with_zou.py
+++ b/openpype/modules/kitsu/utils/update_op_with_zou.py
@@ -82,22 +82,37 @@ def update_op_assets(
         item_data["zou"] = item
 
         # == Asset settings ==
-        # Frame in, fallback on 0
-        frame_in = int(item_data.get("frame_in") or 0)
+        # Frame in, fallback to project's value or default value (1001)
+        # TODO: get default from settings/project_anatomy/attributes.json
+        try:
+            frame_in = int(
+                item_data.pop(
+                    "frame_in", project_doc["data"].get("frameStart")
+                )
+            )
+        except (TypeError, ValueError):
+            frame_in = 1001
         item_data["frameStart"] = frame_in
-        item_data.pop("frame_in", None)
-        # Frame out, fallback on frame_in + duration
-        frames_duration = int(item.get("nb_frames") or 1)
-        frame_out = (
-            item_data["frame_out"]
-            if item_data.get("frame_out")
-            else frame_in + frames_duration
-        )
-        item_data["frameEnd"] = int(frame_out)
-        item_data.pop("frame_out", None)
-        # Fps, fallback to project's value when entity fps is deleted
-        if not item_data.get("fps") and item_doc["data"].get("fps"):
-            item_data["fps"] = project_doc["data"]["fps"]
+        # Frames duration, fallback on 0
+        try:
+            frames_duration = int(item_data.pop("nb_frames", 0))
+        except (TypeError, ValueError):
+            frames_duration = 0
+        # Frame out, fallback on frame_in + duration or project's value or 1001
+        frame_out = item_data.pop("frame_out", None)
+        if not frame_out:
+            frame_out = frame_in + frames_duration
+        try:
+            frame_out = int(frame_out)
+        except (TypeError, ValueError):
+            frame_out = 1001
+        item_data["frameEnd"] = frame_out
+        # Fps, fallback to project's value or default value (25.0)
+        try:
+            fps = float(item_data.get("fps", project_doc["data"].get("fps")))
+        except (TypeError, ValueError):
+            fps = 25.0
+        item_data["fps"] = fps
 
         # Tasks
         tasks_list = []
@@ -106,7 +121,6 @@ def update_op_assets(
             tasks_list = all_tasks_for_asset(item)
         elif item_type == "Shot":
             tasks_list = all_tasks_for_shot(item)
-            # TODO frame in and out
         item_data["tasks"] = {
             t["task_type_name"]: {"type": t["task_type_name"]}
             for t in tasks_list
@@ -229,9 +243,9 @@ def write_project_to_op(project: dict, dbcon: AvalonMongoDB) -> UpdateOne:
     project_data.update(
         {
             "code": project_code,
-            "fps": project["fps"],
-            "resolutionWidth": project["resolution"].split("x")[0],
-            "resolutionHeight": project["resolution"].split("x")[1],
+            "fps": float(project["fps"]),
+            "resolutionWidth": int(project["resolution"].split("x")[0]),
+            "resolutionHeight": int(project["resolution"].split("x")[1]),
             "zou_id": project["id"],
         }
     )

From 4ddebd51790b994048667edbbf150b557823a360 Mon Sep 17 00:00:00 2001
From: Kaa Maurice <kaalium@gmail.com>
Date: Wed, 6 Jul 2022 14:49:08 +0200
Subject: [PATCH 097/289] Kitsu update tasks with zou key

---
 openpype/modules/kitsu/utils/update_op_with_zou.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/modules/kitsu/utils/update_op_with_zou.py b/openpype/modules/kitsu/utils/update_op_with_zou.py
index f8ee6688d2..de74b0c677 100644
--- a/openpype/modules/kitsu/utils/update_op_with_zou.py
+++ b/openpype/modules/kitsu/utils/update_op_with_zou.py
@@ -122,7 +122,7 @@ def update_op_assets(
         elif item_type == "Shot":
             tasks_list = all_tasks_for_shot(item)
         item_data["tasks"] = {
-            t["task_type_name"]: {"type": t["task_type_name"]}
+            t["task_type_name"]: {"type": t["task_type_name"], "zou": t}
             for t in tasks_list
         }
 

From f76d84dff177c31f46d369f0ccd97d0a253251a7 Mon Sep 17 00:00:00 2001
From: Allan Ihsan <allan.ihsan@gmail.com>
Date: Wed, 6 Jul 2022 22:57:02 +0300
Subject: [PATCH 098/289] Append "Depth of Field" to plablast options and
 function.

---
 openpype/hosts/maya/api/lib.py                               | 4 ++++
 openpype/settings/defaults/project_settings/maya.json        | 1 +
 .../schemas/projects_schema/schemas/schema_maya_capture.json | 5 +++++
 openpype/vendor/python/common/capture.py                     | 3 ++-
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/openpype/hosts/maya/api/lib.py b/openpype/hosts/maya/api/lib.py
index cd41ba3ffd..a159554b54 100644
--- a/openpype/hosts/maya/api/lib.py
+++ b/openpype/hosts/maya/api/lib.py
@@ -2522,6 +2522,9 @@ def load_capture_preset(data=None):
                 temp_options2['multiSampleEnable'] = False
                 temp_options2['multiSampleCount'] = preset[id][key]
 
+        if key == 'renderDepthOfField':
+            temp_options2['renderDepthOfField'] = preset[id][key]
+
         if key == 'ssaoEnable':
             if preset[id][key] is True:
                 temp_options2['ssaoEnable'] = True
@@ -2618,6 +2621,7 @@ def load_capture_preset(data=None):
                 'motionBlurSampleCount',
                 'motionBlurShutterOpenFraction',
                 'lineAAEnable',
+                'renderDepthOfField'
                 ]:
         temp_options.pop(key, None)
 
diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json
index bb7719dc30..39a8688267 100644
--- a/openpype/settings/defaults/project_settings/maya.json
+++ b/openpype/settings/defaults/project_settings/maya.json
@@ -496,6 +496,7 @@
                     "override_viewport_options": true,
                     "displayLights": "default",
                     "textureMaxResolution": 1024,
+                    "renderDepthOfField": true,
                     "shadows": true,
                     "textures": true,
                     "twoSidedLighting": true,
diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
index 0a63315622..7a40f349cc 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_capture.json
@@ -204,6 +204,11 @@
                         {
                             "type": "splitter"
                         },
+                        {
+                            "type":"boolean",
+                            "key": "renderDepthOfField",
+                            "label": "Depth of Field"
+                        },
                         {
                             "type": "splitter"
                         },
diff --git a/openpype/vendor/python/common/capture.py b/openpype/vendor/python/common/capture.py
index 6b4c40a6e8..4d9e1da3e4 100644
--- a/openpype/vendor/python/common/capture.py
+++ b/openpype/vendor/python/common/capture.py
@@ -380,7 +380,8 @@ Viewport2Options = {
     "transparencyAlgorithm": 1,
     "transparencyQuality": 0.33,
     "useMaximumHardwareLights": True,
-    "vertexAnimationCache": 0
+    "vertexAnimationCache": 0,
+    "renderDepthOfField": 0
 }
 
 

From 5ad1f8ba7e110a8679df6581069c3a00035130df Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Thu, 7 Jul 2022 15:45:57 +0200
Subject: [PATCH 099/289] thumbnails

---
 .../{extract_jpeg_exr.py => extract_thumbnail.py}  | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)
 rename openpype/plugins/publish/{extract_jpeg_exr.py => extract_thumbnail.py} (92%)

diff --git a/openpype/plugins/publish/extract_jpeg_exr.py b/openpype/plugins/publish/extract_thumbnail.py
similarity index 92%
rename from openpype/plugins/publish/extract_jpeg_exr.py
rename to openpype/plugins/publish/extract_thumbnail.py
index 42c4cbe062..7a438ca701 100644
--- a/openpype/plugins/publish/extract_jpeg_exr.py
+++ b/openpype/plugins/publish/extract_thumbnail.py
@@ -71,18 +71,12 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
             if not is_oiio_supported():
                 thumbnail_created = self.create_thumbnail_ffmpeg(full_input_path, full_output_path) # noqa
             else:
-                # Check if the file can be read by OIIO
-                oiio_tool_path = get_oiio_tools_path()
-                args = [
-                    oiio_tool_path, "--info", "-i", full_output_path
-                ]
-                returncode = execute(args, silent=True)
                 # If the input can read by OIIO then use OIIO method for
                 # conversion otherwise use ffmpeg
-                if returncode == 0:
-                    self.log.info("Input can be read by OIIO, converting with oiiotool now.")   # noqa
-                    thumbnail_created = self.create_thumbnail_oiio(full_input_path, full_output_path) # noqa
-                else:
+                self.log.info("Trying to convert with OIIO")   # noqa
+                thumbnail_created = self.create_thumbnail_oiio(full_input_path, full_output_path) # noqa
+
+                if not thumbnail_created:
                     self.log.info("Converting with FFMPEG because input can't be read by OIIO.")    # noqa
                     thumbnail_created = self.create_thumbnail_ffmpeg(full_input_path, full_output_path) # noqa
 

From 0665e5b75963036189fa8dfdae8f91af7e32c174 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 8 Jul 2022 11:14:07 +0200
Subject: [PATCH 100/289] pass create context after settings

---
 openpype/pipeline/create/context.py         | 2 +-
 openpype/pipeline/create/creator_plugins.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/openpype/pipeline/create/context.py b/openpype/pipeline/create/context.py
index 12cd9bbc68..9f387ec676 100644
--- a/openpype/pipeline/create/context.py
+++ b/openpype/pipeline/create/context.py
@@ -873,9 +873,9 @@ class CreateContext:
                 continue
 
             creator = creator_class(
-                self,
                 system_settings,
                 project_settings,
+                self,
                 self.headless
             )
             creators[creator_identifier] = creator
diff --git a/openpype/pipeline/create/creator_plugins.py b/openpype/pipeline/create/creator_plugins.py
index 8006d4f4f8..1d09116fb6 100644
--- a/openpype/pipeline/create/creator_plugins.py
+++ b/openpype/pipeline/create/creator_plugins.py
@@ -70,7 +70,7 @@ class BaseCreator:
     host_name = None
 
     def __init__(
-        self, create_context, system_settings, project_settings, headless=False
+        self, system_settings, project_settings, create_context, headless=False
     ):
         # Reference to CreateContext
         self.create_context = create_context

From 2e8e4f8f54fb026fffbff30e45532056e900f5a5 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 8 Jul 2022 11:30:49 +0200
Subject: [PATCH 101/289] pass project settings before system settings

---
 openpype/pipeline/create/context.py         | 2 +-
 openpype/pipeline/create/creator_plugins.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/openpype/pipeline/create/context.py b/openpype/pipeline/create/context.py
index 9f387ec676..260856286b 100644
--- a/openpype/pipeline/create/context.py
+++ b/openpype/pipeline/create/context.py
@@ -873,8 +873,8 @@ class CreateContext:
                 continue
 
             creator = creator_class(
-                system_settings,
                 project_settings,
+                system_settings,
                 self,
                 self.headless
             )
diff --git a/openpype/pipeline/create/creator_plugins.py b/openpype/pipeline/create/creator_plugins.py
index 1d09116fb6..41847ac322 100644
--- a/openpype/pipeline/create/creator_plugins.py
+++ b/openpype/pipeline/create/creator_plugins.py
@@ -70,7 +70,7 @@ class BaseCreator:
     host_name = None
 
     def __init__(
-        self, system_settings, project_settings, create_context, headless=False
+        self, project_settings, system_settings, create_context, headless=False
     ):
         # Reference to CreateContext
         self.create_context = create_context

From 56764f638fe9283d33a057d7ff22dfb1c055e992 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 8 Jul 2022 11:34:08 +0200
Subject: [PATCH 102/289] modified after effects creator init to use new args
 order

---
 .../hosts/aftereffects/plugins/create/create_render.py     | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/openpype/hosts/aftereffects/plugins/create/create_render.py b/openpype/hosts/aftereffects/plugins/create/create_render.py
index 215c148f37..1019709dd6 100644
--- a/openpype/hosts/aftereffects/plugins/create/create_render.py
+++ b/openpype/hosts/aftereffects/plugins/create/create_render.py
@@ -17,11 +17,8 @@ class RenderCreator(Creator):
 
     create_allow_context_change = True
 
-    def __init__(
-        self, create_context, system_settings, project_settings, headless=False
-    ):
-        super(RenderCreator, self).__init__(create_context, system_settings,
-                                            project_settings, headless)
+    def __init__(self, project_settings, *args, **kwargs):
+        super(RenderCreator, self).__init__(project_settings, *args, **kwargs)
         self._default_variants = (project_settings["aftereffects"]
                                                   ["create"]
                                                   ["RenderCreator"]

From 4e81bd27a7759d2d4aa5aa4741dcf2881a8c1650 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 8 Jul 2022 10:49:35 +0200
Subject: [PATCH 103/289] create plugins have access to project name

---
 openpype/pipeline/create/context.py         | 4 ++++
 openpype/pipeline/create/creator_plugins.py | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/openpype/pipeline/create/context.py b/openpype/pipeline/create/context.py
index 260856286b..9d870a2234 100644
--- a/openpype/pipeline/create/context.py
+++ b/openpype/pipeline/create/context.py
@@ -748,6 +748,10 @@ class CreateContext:
     def host_name(self):
         return os.environ["AVALON_APP"]
 
+    @property
+    def project_name(self):
+        return self.dbcon.active_project()
+
     @property
     def log(self):
         """Dynamic access to logger."""
diff --git a/openpype/pipeline/create/creator_plugins.py b/openpype/pipeline/create/creator_plugins.py
index 41847ac322..b888feb606 100644
--- a/openpype/pipeline/create/creator_plugins.py
+++ b/openpype/pipeline/create/creator_plugins.py
@@ -92,6 +92,12 @@ class BaseCreator:
         """Family that plugin represents."""
         pass
 
+    @property
+    def project_name(self):
+        """Family that plugin represents."""
+
+        self.create_context.project_name
+
     @property
     def log(self):
         if self._log is None:

From bde50a36297ec2c7bc31b3ba64757008d7070ac4 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 8 Jul 2022 11:15:09 +0200
Subject: [PATCH 104/289] use project_name attribute

---
 openpype/pipeline/create/context.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/openpype/pipeline/create/context.py b/openpype/pipeline/create/context.py
index 9d870a2234..7758a660d3 100644
--- a/openpype/pipeline/create/context.py
+++ b/openpype/pipeline/create/context.py
@@ -843,9 +843,8 @@ class CreateContext:
         self.plugins_with_defs = plugins_with_defs
 
         # Prepare settings
-        project_name = self.dbcon.Session["AVALON_PROJECT"]
         system_settings = get_system_settings()
-        project_settings = get_project_settings(project_name)
+        project_settings = get_project_settings(self.project_name)
 
         # Discover and prepare creators
         creators = {}

From 85485f26d8f7d3b387f67f26e31d9ff075ad817d Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 8 Jul 2022 17:15:38 +0200
Subject: [PATCH 105/289] fix return of value

---
 openpype/pipeline/create/creator_plugins.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/pipeline/create/creator_plugins.py b/openpype/pipeline/create/creator_plugins.py
index b888feb606..4c7b9f8d94 100644
--- a/openpype/pipeline/create/creator_plugins.py
+++ b/openpype/pipeline/create/creator_plugins.py
@@ -96,7 +96,7 @@ class BaseCreator:
     def project_name(self):
         """Family that plugin represents."""
 
-        self.create_context.project_name
+        return self.create_context.project_name
 
     @property
     def log(self):

From 68582819812675cd9461be89ceb9a56a7d7f2d1b Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 8 Jul 2022 17:33:52 +0200
Subject: [PATCH 106/289] better handling when context change is not enabled

---
 .../tools/publisher/widgets/create_dialog.py  | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/openpype/tools/publisher/widgets/create_dialog.py b/openpype/tools/publisher/widgets/create_dialog.py
index 3a68835dc7..b5e178b409 100644
--- a/openpype/tools/publisher/widgets/create_dialog.py
+++ b/openpype/tools/publisher/widgets/create_dialog.py
@@ -616,7 +616,7 @@ class CreateDialog(QtWidgets.QDialog):
             prereq_available = False
             creator_btn_tooltips.append("Creator is not selected")
 
-        if self._asset_doc is None:
+        if self._context_change_is_enabled() and self._asset_doc is None:
             # QUESTION how to handle invalid asset?
             prereq_available = False
             creator_btn_tooltips.append("Context is not selected")
@@ -1010,13 +1010,18 @@ class CreateDialog(QtWidgets.QDialog):
         if variant_value is None:
             variant_value = self.variant_input.text()
 
-        self.create_btn.setEnabled(True)
         if not self._compiled_name_pattern.match(variant_value):
             self.create_btn.setEnabled(False)
             self._set_variant_state_property("invalid")
             self.subset_name_input.setText("< Invalid variant >")
             return
 
+        if not self._context_change_is_enabled():
+            self.create_btn.setEnabled(True)
+            self._set_variant_state_property("")
+            self.subset_name_input.setText("< Valid variant >")
+            return
+
         project_name = self.controller.project_name
         task_name = self._get_task_name()
 
@@ -1034,6 +1039,7 @@ class CreateDialog(QtWidgets.QDialog):
 
         self.subset_name_input.setText(subset_name)
 
+        self.create_btn.setEnabled(True)
         self._validate_subset_name(subset_name, variant_value)
 
     def _validate_subset_name(self, subset_name, variant_value):
@@ -1145,10 +1151,17 @@ class CreateDialog(QtWidgets.QDialog):
         creator_label = index.data(QtCore.Qt.DisplayRole)
         creator_identifier = index.data(CREATOR_IDENTIFIER_ROLE)
         family = index.data(FAMILY_ROLE)
-        subset_name = self.subset_name_input.text()
         variant = self.variant_input.text()
-        asset_name = self._get_asset_name()
-        task_name = self._get_task_name()
+        # Care about subset name only if context change is enabled
+        if self._context_change_is_enabled():
+            subset_name = self.subset_name_input.text()
+            asset_name = self._get_asset_name()
+            task_name = self._get_task_name()
+        else:
+            subset_name = variant
+            asset_name = None
+            task_name = None
+
         pre_create_data = self._pre_create_widget.current_value()
         # Where to define these data?
         # - what data show be stored?

From 6bd6c3c17586786e1acb16b01ea5fc55ac6b235a Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 8 Jul 2022 17:35:22 +0200
Subject: [PATCH 107/289] subset name is None when context is not enabled

---
 openpype/tools/publisher/widgets/create_dialog.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/tools/publisher/widgets/create_dialog.py b/openpype/tools/publisher/widgets/create_dialog.py
index b5e178b409..ed2f65114b 100644
--- a/openpype/tools/publisher/widgets/create_dialog.py
+++ b/openpype/tools/publisher/widgets/create_dialog.py
@@ -1158,7 +1158,7 @@ class CreateDialog(QtWidgets.QDialog):
             asset_name = self._get_asset_name()
             task_name = self._get_task_name()
         else:
-            subset_name = variant
+            subset_name = None
             asset_name = None
             task_name = None
 

From 8849e5ac7f2f1707e206cbfc6d8dceca3a3d562c Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 8 Jul 2022 18:54:23 +0200
Subject: [PATCH 108/289] made clear prerequirements checks

---
 openpype/tools/publisher/widgets/create_dialog.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/openpype/tools/publisher/widgets/create_dialog.py b/openpype/tools/publisher/widgets/create_dialog.py
index ed2f65114b..d25b42d04d 100644
--- a/openpype/tools/publisher/widgets/create_dialog.py
+++ b/openpype/tools/publisher/widgets/create_dialog.py
@@ -465,7 +465,7 @@ class CreateDialog(QtWidgets.QDialog):
         desc_width_anim_timer = QtCore.QTimer()
         desc_width_anim_timer.setInterval(10)
 
-        prereq_timer.timeout.connect(self._on_prereq_timer)
+        prereq_timer.timeout.connect(self._invalidate_prereq)
 
         desc_width_anim_timer.timeout.connect(self._on_desc_animation)
 
@@ -600,16 +600,16 @@ class CreateDialog(QtWidgets.QDialog):
         self._tasks_widget.set_asset_name(asset_name)
         self._tasks_widget.select_task_name(task_name)
 
-        self._invalidate_prereq()
+        self._invalidate_prereq_deffered()
 
-    def _invalidate_prereq(self):
+    def _invalidate_prereq_deffered(self):
         self._prereq_timer.start()
 
     def _on_asset_filter_height_change(self, height):
         self._creators_header_widget.setMinimumHeight(height)
         self._creators_header_widget.setMaximumHeight(height)
 
-    def _on_prereq_timer(self):
+    def _invalidate_prereq(self):
         prereq_available = True
         creator_btn_tooltips = []
         if self.creators_model.rowCount() < 1:
@@ -726,11 +726,11 @@ class CreateDialog(QtWidgets.QDialog):
         asset_name = self._assets_widget.get_selected_asset_name()
         self._tasks_widget.set_asset_name(asset_name)
         if self._context_change_is_enabled():
-            self._invalidate_prereq()
+            self._invalidate_prereq_deffered()
 
     def _on_task_change(self):
         if self._context_change_is_enabled():
-            self._invalidate_prereq()
+            self._invalidate_prereq_deffered()
 
     def _on_current_session_context_request(self):
         self._assets_widget.set_current_session_asset()

From 9bec04254732d440f89c91f72da4f61e4cddcc76 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 8 Jul 2022 18:55:00 +0200
Subject: [PATCH 109/289] added sorting for creators

---
 openpype/tools/publisher/widgets/create_dialog.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/openpype/tools/publisher/widgets/create_dialog.py b/openpype/tools/publisher/widgets/create_dialog.py
index d25b42d04d..4cc63f50a8 100644
--- a/openpype/tools/publisher/widgets/create_dialog.py
+++ b/openpype/tools/publisher/widgets/create_dialog.py
@@ -342,7 +342,9 @@ class CreateDialog(QtWidgets.QDialog):
 
         creators_view = QtWidgets.QListView(self)
         creators_model = QtGui.QStandardItemModel()
-        creators_view.setModel(creators_model)
+        creators_sort_model = QtCore.QSortFilterProxyModel()
+        creators_sort_model.setSourceModel(creators_model)
+        creators_view.setModel(creators_sort_model)
 
         variant_widget = VariantInputsWidget(self)
 
@@ -516,6 +518,7 @@ class CreateDialog(QtWidgets.QDialog):
         self.creators_model = creators_model
         self.creators_view = creators_view
         self.create_btn = create_btn
+        self._creators_sort_model = creators_sort_model
 
         self._creator_short_desc_widget = creator_short_desc_widget
         self._pre_create_widget = pre_create_widget
@@ -703,6 +706,7 @@ class CreateDialog(QtWidgets.QDialog):
         if self.creators_model.rowCount() < 1:
             return
 
+        self._creators_sort_model.sort(0)
         # Make sure there is a selection
         indexes = self.creators_view.selectedIndexes()
         if not indexes:

From 231446b012ef84f3492dcbd48ef20f85aa039445 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 8 Jul 2022 18:56:23 +0200
Subject: [PATCH 110/289] disable creators view only if there are not creators

---
 openpype/tools/publisher/widgets/create_dialog.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/openpype/tools/publisher/widgets/create_dialog.py b/openpype/tools/publisher/widgets/create_dialog.py
index 4cc63f50a8..8e43887238 100644
--- a/openpype/tools/publisher/widgets/create_dialog.py
+++ b/openpype/tools/publisher/widgets/create_dialog.py
@@ -615,7 +615,12 @@ class CreateDialog(QtWidgets.QDialog):
     def _invalidate_prereq(self):
         prereq_available = True
         creator_btn_tooltips = []
-        if self.creators_model.rowCount() < 1:
+
+        available_creators = self.creators_model.rowCount() > 0
+        if available_creators != self.creators_view.isEnabled():
+            self.creators_view.setEnabled(available_creators)
+
+        if not available_creators:
             prereq_available = False
             creator_btn_tooltips.append("Creator is not selected")
 
@@ -628,7 +633,6 @@ class CreateDialog(QtWidgets.QDialog):
             self._prereq_available = prereq_available
 
             self.create_btn.setEnabled(prereq_available)
-            self.creators_view.setEnabled(prereq_available)
             self.variant_input.setEnabled(prereq_available)
             self.variant_hints_btn.setEnabled(prereq_available)
 

From 65b089f52ca0f96414f895b815ad22e98714f5a4 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 8 Jul 2022 18:57:06 +0200
Subject: [PATCH 111/289] trigger invalidation of prerequiremets if context
 widget changed enable state

---
 openpype/tools/publisher/widgets/create_dialog.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/openpype/tools/publisher/widgets/create_dialog.py b/openpype/tools/publisher/widgets/create_dialog.py
index 8e43887238..757ee58468 100644
--- a/openpype/tools/publisher/widgets/create_dialog.py
+++ b/openpype/tools/publisher/widgets/create_dialog.py
@@ -576,7 +576,10 @@ class CreateDialog(QtWidgets.QDialog):
     def _set_context_enabled(self, enabled):
         self._assets_widget.set_enabled(enabled)
         self._tasks_widget.set_enabled(enabled)
+        check_prereq = self._context_widget.isEnabled() != enabled
         self._context_widget.setEnabled(enabled)
+        if check_prereq:
+            self._invalidate_prereq()
 
     def refresh(self):
         # Get context before refresh to keep selection of asset and

From e833a0323d970a2b6baee5f91b584357f785c258 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 8 Jul 2022 18:57:26 +0200
Subject: [PATCH 112/289] removed else statement

---
 openpype/tools/publisher/widgets/create_dialog.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/openpype/tools/publisher/widgets/create_dialog.py b/openpype/tools/publisher/widgets/create_dialog.py
index 757ee58468..68c4888ec3 100644
--- a/openpype/tools/publisher/widgets/create_dialog.py
+++ b/openpype/tools/publisher/widgets/create_dialog.py
@@ -1164,14 +1164,13 @@ class CreateDialog(QtWidgets.QDialog):
         family = index.data(FAMILY_ROLE)
         variant = self.variant_input.text()
         # Care about subset name only if context change is enabled
+        subset_name = None
+        asset_name = None
+        task_name = None
         if self._context_change_is_enabled():
             subset_name = self.subset_name_input.text()
             asset_name = self._get_asset_name()
             task_name = self._get_task_name()
-        else:
-            subset_name = None
-            asset_name = None
-            task_name = None
 
         pre_create_data = self._pre_create_widget.current_value()
         # Where to define these data?

From 50d8fc0761424e6053c3529edaa31966277d5527 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 8 Jul 2022 18:58:17 +0200
Subject: [PATCH 113/289] use first index from sorting model instead of
 creators model

---
 openpype/tools/publisher/widgets/create_dialog.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/tools/publisher/widgets/create_dialog.py b/openpype/tools/publisher/widgets/create_dialog.py
index 68c4888ec3..d03b207727 100644
--- a/openpype/tools/publisher/widgets/create_dialog.py
+++ b/openpype/tools/publisher/widgets/create_dialog.py
@@ -717,7 +717,7 @@ class CreateDialog(QtWidgets.QDialog):
         # Make sure there is a selection
         indexes = self.creators_view.selectedIndexes()
         if not indexes:
-            index = self.creators_model.index(0, 0)
+            index = self._creators_sort_model.index(0, 0)
             self.creators_view.setCurrentIndex(index)
         else:
             index = indexes[0]

From bf6868826b88c4215c84a48323403a4d2736eb54 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 8 Jul 2022 18:58:38 +0200
Subject: [PATCH 114/289] converted some attributes to private

---
 .../tools/publisher/widgets/create_dialog.py  | 47 ++++++++++---------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/openpype/tools/publisher/widgets/create_dialog.py b/openpype/tools/publisher/widgets/create_dialog.py
index d03b207727..d4740b2493 100644
--- a/openpype/tools/publisher/widgets/create_dialog.py
+++ b/openpype/tools/publisher/widgets/create_dialog.py
@@ -515,10 +515,10 @@ class CreateDialog(QtWidgets.QDialog):
         self.variant_hints_group = variant_hints_group
 
         self._creators_header_widget = creators_header_widget
-        self.creators_model = creators_model
-        self.creators_view = creators_view
-        self.create_btn = create_btn
+        self._creators_model = creators_model
         self._creators_sort_model = creators_sort_model
+        self._creators_view = creators_view
+        self._create_btn = create_btn
 
         self._creator_short_desc_widget = creator_short_desc_widget
         self._pre_create_widget = pre_create_widget
@@ -619,9 +619,9 @@ class CreateDialog(QtWidgets.QDialog):
         prereq_available = True
         creator_btn_tooltips = []
 
-        available_creators = self.creators_model.rowCount() > 0
-        if available_creators != self.creators_view.isEnabled():
-            self.creators_view.setEnabled(available_creators)
+        available_creators = self._creators_model.rowCount() > 0
+        if available_creators != self._creators_view.isEnabled():
+            self._creators_view.setEnabled(available_creators)
 
         if not available_creators:
             prereq_available = False
@@ -635,14 +635,15 @@ class CreateDialog(QtWidgets.QDialog):
         if prereq_available != self._prereq_available:
             self._prereq_available = prereq_available
 
-            self.create_btn.setEnabled(prereq_available)
+            self._create_btn.setEnabled(prereq_available)
+
             self.variant_input.setEnabled(prereq_available)
             self.variant_hints_btn.setEnabled(prereq_available)
 
         tooltip = ""
         if creator_btn_tooltips:
             tooltip = "\n".join(creator_btn_tooltips)
-        self.create_btn.setToolTip(tooltip)
+        self._create_btn.setToolTip(tooltip)
 
         self._on_variant_change()
 
@@ -680,8 +681,8 @@ class CreateDialog(QtWidgets.QDialog):
         # Refresh creators and add their families to list
         existing_items = {}
         old_creators = set()
-        for row in range(self.creators_model.rowCount()):
-            item = self.creators_model.item(row, 0)
+        for row in range(self._creators_model.rowCount()):
+            item = self._creators_model.item(row, 0)
             identifier = item.data(CREATOR_IDENTIFIER_ROLE)
             existing_items[identifier] = item
             old_creators.add(identifier)
@@ -698,7 +699,7 @@ class CreateDialog(QtWidgets.QDialog):
                 item.setFlags(
                     QtCore.Qt.ItemIsEnabled | QtCore.Qt.ItemIsSelectable
                 )
-                self.creators_model.appendRow(item)
+                self._creators_model.appendRow(item)
 
             label = creator.label or identifier
             item.setData(label, QtCore.Qt.DisplayRole)
@@ -708,17 +709,17 @@ class CreateDialog(QtWidgets.QDialog):
         # Remove families that are no more available
         for identifier in (old_creators - new_creators):
             item = existing_items[identifier]
-            self.creators_model.takeRow(item.row())
+            self._creators_model.takeRow(item.row())
 
-        if self.creators_model.rowCount() < 1:
+        if self._creators_model.rowCount() < 1:
             return
 
         self._creators_sort_model.sort(0)
         # Make sure there is a selection
-        indexes = self.creators_view.selectedIndexes()
+        indexes = self._creators_view.selectedIndexes()
         if not indexes:
             index = self._creators_sort_model.index(0, 0)
-            self.creators_view.setCurrentIndex(index)
+            self._creators_view.setCurrentIndex(index)
         else:
             index = indexes[0]
 
@@ -1022,13 +1023,13 @@ class CreateDialog(QtWidgets.QDialog):
             variant_value = self.variant_input.text()
 
         if not self._compiled_name_pattern.match(variant_value):
-            self.create_btn.setEnabled(False)
+            self._create_btn.setEnabled(False)
             self._set_variant_state_property("invalid")
             self.subset_name_input.setText("< Invalid variant >")
             return
 
         if not self._context_change_is_enabled():
-            self.create_btn.setEnabled(True)
+            self._create_btn.setEnabled(True)
             self._set_variant_state_property("")
             self.subset_name_input.setText("< Valid variant >")
             return
@@ -1043,14 +1044,14 @@ class CreateDialog(QtWidgets.QDialog):
                 variant_value, task_name, asset_doc, project_name
             )
         except TaskNotSetError:
-            self.create_btn.setEnabled(False)
+            self._create_btn.setEnabled(False)
             self._set_variant_state_property("invalid")
             self.subset_name_input.setText("< Missing task >")
             return
 
         self.subset_name_input.setText(subset_name)
 
-        self.create_btn.setEnabled(True)
+        self._create_btn.setEnabled(True)
         self._validate_subset_name(subset_name, variant_value)
 
     def _validate_subset_name(self, subset_name, variant_value):
@@ -1105,8 +1106,8 @@ class CreateDialog(QtWidgets.QDialog):
         self._set_variant_state_property(property_value)
 
         variant_is_valid = variant_value.strip() != ""
-        if variant_is_valid != self.create_btn.isEnabled():
-            self.create_btn.setEnabled(variant_is_valid)
+        if variant_is_valid != self._create_btn.isEnabled():
+            self._create_btn.setEnabled(variant_is_valid)
 
     def _set_variant_state_property(self, state):
         current_value = self.variant_input.property("state")
@@ -1151,11 +1152,11 @@ class CreateDialog(QtWidgets.QDialog):
         self._update_help_btn()
 
     def _on_create(self):
-        indexes = self.creators_view.selectedIndexes()
+        indexes = self._creators_view.selectedIndexes()
         if not indexes or len(indexes) > 1:
             return
 
-        if not self.create_btn.isEnabled():
+        if not self._create_btn.isEnabled():
             return
 
         index = indexes[0]

From a62eeb807d64817920c38f2474d327d4113f9db2 Mon Sep 17 00:00:00 2001
From: OpenPype <info@openpype.io>
Date: Sat, 9 Jul 2022 03:46:02 +0000
Subject: [PATCH 115/289] [Automated] Bump version

---
 CHANGELOG.md        | 41 ++++++++++++++++++-----------------------
 openpype/version.py |  2 +-
 pyproject.toml      |  2 +-
 3 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b43d2fed1..9a0c058f73 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## [3.12.1-nightly.3](https://github.com/pypeclub/OpenPype/tree/HEAD)
+## [3.12.1-nightly.4](https://github.com/pypeclub/OpenPype/tree/HEAD)
 
 [Full Changelog](https://github.com/pypeclub/OpenPype/compare/3.12.0...HEAD)
 
@@ -14,31 +14,43 @@
 
 **🚀 Enhancements**
 
+- General: Creator Plugins have access to project [\#3476](https://github.com/pypeclub/OpenPype/pull/3476)
+- General: Better arguments order in creator init [\#3475](https://github.com/pypeclub/OpenPype/pull/3475)
+- Ftrack: Trigger custom ftrack events on project creation and preparation [\#3465](https://github.com/pypeclub/OpenPype/pull/3465)
 - Windows installer: Clean old files and add version subfolder [\#3445](https://github.com/pypeclub/OpenPype/pull/3445)
 - Blender: Bugfix - Set fps properly on open [\#3426](https://github.com/pypeclub/OpenPype/pull/3426)
+- Hiero: Add custom scripts menu [\#3425](https://github.com/pypeclub/OpenPype/pull/3425)
 - Blender: pre pyside install for all platforms [\#3400](https://github.com/pypeclub/OpenPype/pull/3400)
 - Maya: Ability to set resolution for playblasts from asset, and override through review instance. [\#3360](https://github.com/pypeclub/OpenPype/pull/3360)
 
 **🐛 Bug fixes**
 
+- General: thumbnail extractor fix [\#3474](https://github.com/pypeclub/OpenPype/pull/3474)
+- Kitsu: bugfix with sync-service ans publish plugins [\#3473](https://github.com/pypeclub/OpenPype/pull/3473)
+- Flame: solved problem with multi-selected loading [\#3470](https://github.com/pypeclub/OpenPype/pull/3470)
+- General: Fix query function in update logic [\#3468](https://github.com/pypeclub/OpenPype/pull/3468)
+- Resolve: removed few bugs [\#3464](https://github.com/pypeclub/OpenPype/pull/3464)
+- General: Delete old versions is safer when ftrack is disabled [\#3462](https://github.com/pypeclub/OpenPype/pull/3462)
+- Nuke: fixing metadata slate TC difference [\#3455](https://github.com/pypeclub/OpenPype/pull/3455)
 - Nuke: prerender reviewable fails [\#3450](https://github.com/pypeclub/OpenPype/pull/3450)
 - Maya: fix hashing in Python 3 for tile rendering [\#3447](https://github.com/pypeclub/OpenPype/pull/3447)
 - LogViewer: Escape html characters in log message [\#3443](https://github.com/pypeclub/OpenPype/pull/3443)
 - Nuke: Slate frame is integrated [\#3427](https://github.com/pypeclub/OpenPype/pull/3427)
 - Maya: Camera extra data - additional fix for \#3304 [\#3386](https://github.com/pypeclub/OpenPype/pull/3386)
-- Harmony: added unc path to zifile command in Harmony [\#3372](https://github.com/pypeclub/OpenPype/pull/3372)
 - Maya: Handle excluding `model` family from frame range validator. [\#3370](https://github.com/pypeclub/OpenPype/pull/3370)
 
 **🔀 Refactored code**
 
+- Maya: Merge animation + pointcache extractor logic [\#3461](https://github.com/pypeclub/OpenPype/pull/3461)
 - Maya: Re-use `maintained\_time` from lib [\#3460](https://github.com/pypeclub/OpenPype/pull/3460)
+- General: Use query functions in global plugins [\#3459](https://github.com/pypeclub/OpenPype/pull/3459)
 - Clockify: Use query functions in clockify actions [\#3458](https://github.com/pypeclub/OpenPype/pull/3458)
 - General: Use query functions in rest api calls [\#3457](https://github.com/pypeclub/OpenPype/pull/3457)
 - General: Use query functions in load utils [\#3446](https://github.com/pypeclub/OpenPype/pull/3446)
 - General: Use Anatomy after move to pipeline [\#3436](https://github.com/pypeclub/OpenPype/pull/3436)
 - General: Anatomy moved to pipeline [\#3435](https://github.com/pypeclub/OpenPype/pull/3435)
+- Fusion: Use client query functions [\#3380](https://github.com/pypeclub/OpenPype/pull/3380)
 - Resolve: Use client query functions [\#3379](https://github.com/pypeclub/OpenPype/pull/3379)
-- General: Host implementation defined with class [\#3337](https://github.com/pypeclub/OpenPype/pull/3337)
 
 ## [3.12.0](https://github.com/pypeclub/OpenPype/tree/3.12.0) (2022-06-28)
 
@@ -53,6 +65,7 @@
 
 - Webserver: Added CORS middleware [\#3422](https://github.com/pypeclub/OpenPype/pull/3422)
 - Attribute Defs UI: Files widget show what is allowed to drop in [\#3411](https://github.com/pypeclub/OpenPype/pull/3411)
+- General: Add ability to change user value for templates [\#3366](https://github.com/pypeclub/OpenPype/pull/3366)
 - Hosts: More options for in-host callbacks [\#3357](https://github.com/pypeclub/OpenPype/pull/3357)
 - Multiverse: expose some settings to GUI [\#3350](https://github.com/pypeclub/OpenPype/pull/3350)
 
@@ -68,8 +81,8 @@
 - TVPaint: Make sure exit code is set to not None [\#3382](https://github.com/pypeclub/OpenPype/pull/3382)
 - Maya: vray device aspect ratio fix [\#3381](https://github.com/pypeclub/OpenPype/pull/3381)
 - Flame: bunch of publishing issues [\#3377](https://github.com/pypeclub/OpenPype/pull/3377)
+- Harmony: added unc path to zifile command in Harmony [\#3372](https://github.com/pypeclub/OpenPype/pull/3372)
 - Standalone: settings improvements [\#3355](https://github.com/pypeclub/OpenPype/pull/3355)
-- Nuke: Load full model hierarchy by default [\#3328](https://github.com/pypeclub/OpenPype/pull/3328)
 
 **🔀 Refactored code**
 
@@ -77,16 +90,13 @@
 - General: Move editorial lib to pipeline [\#3419](https://github.com/pypeclub/OpenPype/pull/3419)
 - Kitsu: renaming to plural func sync\_all\_projects [\#3397](https://github.com/pypeclub/OpenPype/pull/3397)
 - Houdini: Use client query functions [\#3395](https://github.com/pypeclub/OpenPype/pull/3395)
+- Hiero: Use client query functions [\#3393](https://github.com/pypeclub/OpenPype/pull/3393)
 - Nuke: Use client query functions [\#3391](https://github.com/pypeclub/OpenPype/pull/3391)
 - Maya: Use client query functions [\#3385](https://github.com/pypeclub/OpenPype/pull/3385)
-- Fusion: Use client query functions [\#3380](https://github.com/pypeclub/OpenPype/pull/3380)
 - Harmony: Use client query functions [\#3378](https://github.com/pypeclub/OpenPype/pull/3378)
 - Celaction: Use client query functions [\#3376](https://github.com/pypeclub/OpenPype/pull/3376)
 - Photoshop: Use client query functions [\#3375](https://github.com/pypeclub/OpenPype/pull/3375)
 - AfterEffects: Use client query functions [\#3374](https://github.com/pypeclub/OpenPype/pull/3374)
-- TVPaint: Use client query functions [\#3340](https://github.com/pypeclub/OpenPype/pull/3340)
-- Ftrack: Use client query functions [\#3339](https://github.com/pypeclub/OpenPype/pull/3339)
-- Standalone Publisher: Use client query functions [\#3330](https://github.com/pypeclub/OpenPype/pull/3330)
 
 **Merged pull requests:**
 
@@ -105,7 +115,6 @@
 **🚀 Enhancements**
 
 - Pyblish Pype: Hiding/Close issues [\#3367](https://github.com/pypeclub/OpenPype/pull/3367)
-- General: Add ability to change user value for templates [\#3366](https://github.com/pypeclub/OpenPype/pull/3366)
 - Ftrack: Removed requirement of pypeclub role from default settings [\#3354](https://github.com/pypeclub/OpenPype/pull/3354)
 - Kitsu: Prevent crash on missing frames information [\#3352](https://github.com/pypeclub/OpenPype/pull/3352)
 
@@ -120,28 +129,14 @@
 - General: Create only one thumbnail per instance [\#3351](https://github.com/pypeclub/OpenPype/pull/3351)
 - nuke: adding extract thumbnail settings 3.10 [\#3347](https://github.com/pypeclub/OpenPype/pull/3347)
 - General: Fix last version function [\#3345](https://github.com/pypeclub/OpenPype/pull/3345)
-- Deadline: added OPENPYPE\_MONGO to filter [\#3336](https://github.com/pypeclub/OpenPype/pull/3336)
-
-**🔀 Refactored code**
-
-- Webpublisher: Use client query functions [\#3333](https://github.com/pypeclub/OpenPype/pull/3333)
 
 ## [3.11.0](https://github.com/pypeclub/OpenPype/tree/3.11.0) (2022-06-17)
 
 [Full Changelog](https://github.com/pypeclub/OpenPype/compare/CI/3.11.0-nightly.4...3.11.0)
 
-**🚀 Enhancements**
-
-- Settings: Settings can be extracted from UI [\#3323](https://github.com/pypeclub/OpenPype/pull/3323)
-
 **🐛 Bug fixes**
 
 - General: Handle empty source key on instance [\#3342](https://github.com/pypeclub/OpenPype/pull/3342)
-- Houdini: Fix Houdini VDB manage update wrong file attribute name [\#3322](https://github.com/pypeclub/OpenPype/pull/3322)
-
-**🔀 Refactored code**
-
-- Blender: Use client query functions [\#3331](https://github.com/pypeclub/OpenPype/pull/3331)
 
 ## [3.10.0](https://github.com/pypeclub/OpenPype/tree/3.10.0) (2022-05-26)
 
diff --git a/openpype/version.py b/openpype/version.py
index 3cb7f4572b..3239b0e2a2 100644
--- a/openpype/version.py
+++ b/openpype/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring Pype version."""
-__version__ = "3.12.1-nightly.3"
+__version__ = "3.12.1-nightly.4"
diff --git a/pyproject.toml b/pyproject.toml
index 4803249923..f5bd7cc946 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "OpenPype"
-version = "3.12.1-nightly.3" # OpenPype
+version = "3.12.1-nightly.4" # OpenPype
 description = "Open VFX and Animation pipeline with support."
 authors = ["OpenPype Team <info@openpype.io>"]
 license = "MIT License"

From 5cf03a43cb5794e1b00a5bd729d62ba8257fb5b4 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Mon, 11 Jul 2022 11:40:24 +0200
Subject: [PATCH 116/289] deffer workfiles tool show using qtimer

---
 openpype/hosts/nuke/api/lib.py | 60 ++++++++++++++++++++++++++++------
 1 file changed, 50 insertions(+), 10 deletions(-)

diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py
index f565ec8546..0929415c00 100644
--- a/openpype/hosts/nuke/api/lib.py
+++ b/openpype/hosts/nuke/api/lib.py
@@ -10,6 +10,7 @@ from collections import OrderedDict
 import clique
 
 import nuke
+from Qt import QtCore, QtWidgets
 
 from openpype.client import (
     get_project,
@@ -27,6 +28,7 @@ from openpype.api import (
     get_current_project_settings,
 )
 from openpype.tools.utils import host_tools
+from openpype.lib import env_value_to_bool
 from openpype.lib.path_tools import HostDirmap
 from openpype.settings import (
     get_project_settings,
@@ -63,7 +65,10 @@ class Context:
     main_window = None
     context_label = None
     project_name = os.getenv("AVALON_PROJECT")
+    # Workfile related code
     workfiles_launched = False
+    workfiles_tool_timer = None
+
     # Seems unused
     _project_doc = None
 
@@ -2384,12 +2389,19 @@ def select_nodes(nodes):
 
 
 def launch_workfiles_app():
-    '''Function letting start workfiles after start of host
-    '''
-    from openpype.lib import (
-        env_value_to_bool
-    )
-    from .pipeline import get_main_window
+    """Show workfiles tool on nuke launch.
+
+    Trigger to show workfiles tool on application launch. Can be executed only
+    once all other calls are ignored.
+
+    Workfiles tool show is deffered after application initialization using
+    QTimer.
+    """
+
+    if Context.workfiles_launched:
+        return
+
+    Context.workfiles_launched = True
 
     # get all imortant settings
     open_at_start = env_value_to_bool(
@@ -2400,10 +2412,38 @@ def launch_workfiles_app():
     if not open_at_start:
         return
 
-    if not Context.workfiles_launched:
-        Context.workfiles_launched = True
-        main_window = get_main_window()
-        host_tools.show_workfiles(parent=main_window)
+    # Show workfiles tool using timer
+    # - this will be probably triggered during initialization in that case
+    #   the application is not be able to show uis so it must be
+    #   deffered using timer
+    # - timer should be processed when initialization ends
+    #       When applications starts to process events.
+    timer = QtCore.QTimer()
+    timer.timeout.connect(_launch_workfile_app)
+    timer.setInterval(100)
+    Context.workfiles_tool_timer = timer
+    timer.start()
+
+
+def _launch_workfile_app():
+    # Safeguard to not show window when application is still starting up
+    #   or is already closing down.
+    closing_down = QtWidgets.QApplication.closingDown()
+    starting_up = QtWidgets.QApplication.startingUp()
+
+    # Stop the timer if application finished start up of is closing down
+    if closing_down or not starting_up:
+        Context.workfiles_tool_timer.stop()
+        Context.workfiles_tool_timer = None
+
+    # Skip if application is starting up or closing down
+    if starting_up or closing_down:
+        return
+
+    from .pipeline import get_main_window
+
+    main_window = get_main_window()
+    host_tools.show_workfiles(parent=main_window)
 
 
 def process_workfile_builder():

From 4dbc094e5980a2453992516e0f32d6cf868ec7f7 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Mon, 11 Jul 2022 11:40:38 +0200
Subject: [PATCH 117/289] trigger launch workfiles app on install

---
 openpype/hosts/nuke/api/pipeline.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openpype/hosts/nuke/api/pipeline.py b/openpype/hosts/nuke/api/pipeline.py
index 2785eb65cd..2e3621ba8f 100644
--- a/openpype/hosts/nuke/api/pipeline.py
+++ b/openpype/hosts/nuke/api/pipeline.py
@@ -120,8 +120,9 @@ def install():
     nuke.addOnCreate(workfile_settings.set_context_settings, nodeClass="Root")
     nuke.addOnCreate(workfile_settings.set_favorites, nodeClass="Root")
     nuke.addOnCreate(process_workfile_builder, nodeClass="Root")
-    nuke.addOnCreate(launch_workfiles_app, nodeClass="Root")
+
     _install_menu()
+    launch_workfiles_app()
 
 
 def uninstall():

From 85e89526d5019a151156a6686dc169708d6e8d4c Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Mon, 11 Jul 2022 17:42:54 +0200
Subject: [PATCH 118/289] added attribute instance label on instance

---
 openpype/pipeline/create/context.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/openpype/pipeline/create/context.py b/openpype/pipeline/create/context.py
index 7758a660d3..61cbe8caff 100644
--- a/openpype/pipeline/create/context.py
+++ b/openpype/pipeline/create/context.py
@@ -496,6 +496,13 @@ class CreatedInstance:
     def subset_name(self):
         return self._data["subset"]
 
+    @property
+    def instance_label(self):
+        label = self._data.get("label")
+        if not label:
+            label = self.subset_name
+        return label
+
     @property
     def creator_identifier(self):
         return self.creator.identifier

From 6feeca860b167785a5fb4306c4a50d30ae996087 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Mon, 11 Jul 2022 17:46:45 +0200
Subject: [PATCH 119/289] use 'label' to display instance in views

---
 openpype/pipeline/create/context.py                   | 2 +-
 openpype/tools/publisher/widgets/card_view_widgets.py | 7 ++++---
 openpype/tools/publisher/widgets/list_view_widgets.py | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/openpype/pipeline/create/context.py b/openpype/pipeline/create/context.py
index 61cbe8caff..7f0341c127 100644
--- a/openpype/pipeline/create/context.py
+++ b/openpype/pipeline/create/context.py
@@ -497,7 +497,7 @@ class CreatedInstance:
         return self._data["subset"]
 
     @property
-    def instance_label(self):
+    def label(self):
         label = self._data.get("label")
         if not label:
             label = self.subset_name
diff --git a/openpype/tools/publisher/widgets/card_view_widgets.py b/openpype/tools/publisher/widgets/card_view_widgets.py
index 086cd5c59c..3c294c9c7c 100644
--- a/openpype/tools/publisher/widgets/card_view_widgets.py
+++ b/openpype/tools/publisher/widgets/card_view_widgets.py
@@ -303,13 +303,14 @@ class InstanceCardWidget(CardWidget):
         self._last_variant = variant
         self._last_subset_name = subset_name
         # Make `variant` bold
-        found_parts = set(re.findall(variant, subset_name, re.IGNORECASE))
+        label = self.instance.label
+        found_parts = set(re.findall(variant, label, re.IGNORECASE))
         if found_parts:
             for part in found_parts:
                 replacement = "<b>{}</b>".format(part)
-                subset_name = subset_name.replace(part, replacement)
+                label = label.replace(part, replacement)
 
-        self._label_widget.setText(subset_name)
+        self._label_widget.setText(label)
         # HTML text will cause that label start catch mouse clicks
         # - disabling with changing interaction flag
         self._label_widget.setTextInteractionFlags(
diff --git a/openpype/tools/publisher/widgets/list_view_widgets.py b/openpype/tools/publisher/widgets/list_view_widgets.py
index 6bddaf66c8..1b1a19599a 100644
--- a/openpype/tools/publisher/widgets/list_view_widgets.py
+++ b/openpype/tools/publisher/widgets/list_view_widgets.py
@@ -113,7 +113,7 @@ class InstanceListItemWidget(QtWidgets.QWidget):
 
         self.instance = instance
 
-        subset_name_label = QtWidgets.QLabel(instance["subset"], self)
+        subset_name_label = QtWidgets.QLabel(instance.label, self)
         subset_name_label.setObjectName("ListViewSubsetName")
 
         active_checkbox = NiceCheckbox(parent=self)

From 74e57f9f49cdbb4812cd6d0c5348c5877f4e61e1 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Mon, 11 Jul 2022 18:15:46 +0200
Subject: [PATCH 120/289] OP-3446 - implemented render_mov_batch in
 TrayPublisher

---
 openpype/hosts/traypublisher/api/batch_lib.py |  61 ++++++
 .../plugins/create/create_mov_batch.py        | 191 ++++++++++++++++++
 .../plugins/publish/collect_mov_batch.py      |  34 ++++
 .../project_settings/traypublisher.json       |  15 +-
 .../schema_project_traypublisher.json         |  71 +++++++
 5 files changed, 371 insertions(+), 1 deletion(-)
 create mode 100644 openpype/hosts/traypublisher/api/batch_lib.py
 create mode 100644 openpype/hosts/traypublisher/plugins/create/create_mov_batch.py
 create mode 100644 openpype/hosts/traypublisher/plugins/publish/collect_mov_batch.py

diff --git a/openpype/hosts/traypublisher/api/batch_lib.py b/openpype/hosts/traypublisher/api/batch_lib.py
new file mode 100644
index 0000000000..2486d405bd
--- /dev/null
+++ b/openpype/hosts/traypublisher/api/batch_lib.py
@@ -0,0 +1,61 @@
+# Helper functions to find matching asset for (multiple) processed source files
+import os
+import collections
+
+from openpype.client import get_assets
+
+
+def get_children_assets_by_name(project_name, top_asset_doc):
+    """ Get all children for 'top_asset_doc' by theirs name
+
+    Args:
+        project_name (str)
+        top_asset_doc (asset doc) (eg dict)
+    Returns:
+        (dict) {"shot1": shot1_asset_doc}
+    """
+    assets_by_parent_id = get_asset_docs_by_parent_id(project_name)
+    _children_docs = get_children_docs(
+        assets_by_parent_id, top_asset_doc
+    )
+    children_docs = {
+        children_doc["name"].lower(): children_doc
+        for children_doc in _children_docs
+    }
+    return children_docs
+
+
+def get_asset_docs_by_parent_id(project_name):
+    """ Query all assets for project and store them by parent's id to list
+
+    Args:
+         project_name (str)
+    Returns:
+        (dict) { _id of parent :[asset_doc1, asset_doc2]}
+    """
+    asset_docs_by_parent_id = collections.defaultdict(list)
+    for asset_doc in get_assets(project_name):
+        parent_id = asset_doc["data"]["visualParent"]
+        asset_docs_by_parent_id[parent_id].append(asset_doc)
+    return asset_docs_by_parent_id
+
+
+def get_children_docs(documents_by_parent_id, parent_doc):
+    """ Recursively find all children in reverse order
+
+    Last children first.
+    Args:
+         documents_by_parent_id (dict)
+         parent_doc (asset doc, eg dict)
+    Returns
+        (list) of asset docs
+    """
+    output = []
+    children = documents_by_parent_id.get(parent_doc["_id"]) or tuple()
+    for child in children:
+        output.extend(
+            get_children_docs(documents_by_parent_id, child)
+        )
+    output.append(parent_doc)
+    return output
+
diff --git a/openpype/hosts/traypublisher/plugins/create/create_mov_batch.py b/openpype/hosts/traypublisher/plugins/create/create_mov_batch.py
new file mode 100644
index 0000000000..5297d73ba9
--- /dev/null
+++ b/openpype/hosts/traypublisher/plugins/create/create_mov_batch.py
@@ -0,0 +1,191 @@
+import copy
+import os
+import re
+
+from openpype.client import get_assets
+from openpype.hosts.traypublisher.api import pipeline
+from openpype.lib import FileDef, TextDef, get_subset_name_with_asset_doc
+from openpype.pipeline import (
+    CreatedInstance
+)
+
+from openpype.hosts.traypublisher.api.plugin import TrayPublishCreator
+
+
+class BatchMovCreator(TrayPublishCreator):
+    """Creates instances from .mov file(s)."""
+    identifier = "render_mov_batch"
+    label = "Batch Mov"
+    family = "render"
+    description = "Publish batch of movs"
+    host_name = "traypublisher"
+
+    create_allow_context_change = False
+    version_regex = re.compile(r"^(.+)_v([0-9]+)$")
+
+    default_tasks = ["Compositing"]
+
+    extensions = [".mov"]
+
+    def __init__(self, project_settings, *args, **kwargs):
+        super(BatchMovCreator, self).__init__(project_settings,
+                                              *args, **kwargs)
+        self._default_variants = (project_settings["traypublisher"]
+                                                  ["BatchMovCreator"]
+                                                  ["default_variants"])
+
+    def get_icon(self):
+        return "fa.file"
+
+    def create(self, subset_name, data, pre_create_data):
+        file_paths = pre_create_data.get("filepath")
+        if not file_paths:
+            return
+
+        for file_info in file_paths:
+            instance_data = copy.deepcopy(data)
+            file_name = file_info["filenames"][0]
+            filepath = os.path.join(file_info["directory"], file_name)
+            instance_data["creator_attributes"] = {"filepath": filepath}
+
+            asset_doc, version = self.get_asset_doc_from_file_name(
+                file_name, self.project_name)
+
+            subset_name, task_name = self._get_subset_and_task(
+                asset_doc, data["variant"], self.project_name)
+
+            instance_data["task"] = task_name
+            instance_data["asset"] = asset_doc["name"]
+
+            # Create new instance
+            new_instance = CreatedInstance(self.family, subset_name,
+                                           instance_data, self)
+            # Host implementation of storing metadata about instance
+            pipeline.HostContext.add_instance(new_instance.data_to_store())
+            # Add instance to current context
+            self._add_instance_to_context(new_instance)
+
+    def get_asset_doc_from_file_name(self, source_filename, project_name):
+        """Try to parse out asset name from file name provided.
+
+        Artists might provide various file name formats.
+        Currently handled:
+            - chair.mov
+            - chair_v001.mov
+            - my_chair_to_upload.mov
+        """
+        version = None
+        asset_name = os.path.splitext(source_filename)[0]
+        # Always first check if source filename is in assets
+        matching_asset_doc = self._get_asset_by_name_case_not_sensitive(
+            project_name, asset_name)
+
+        if matching_asset_doc is None:
+            matching_asset_doc, version = (
+                self._parse_with_version(project_name, asset_name))
+
+        if matching_asset_doc is None:
+            matching_asset_doc = self._parse_containing(project_name,
+                                                        asset_name)
+
+        if matching_asset_doc is None:
+            raise ValueError(
+                "Cannot guess asset name from {}".format(source_filename))
+
+        return matching_asset_doc, version
+
+    def _parse_with_version(self, project_name, asset_name):
+        """Try to parse asset name from a file name containing version too
+
+        Eg. 'chair_v001.mov' >> 'chair', 1
+        """
+        self.log.debug((
+           "Asset doc by \"{}\" was not found, trying version regex."
+        ).format(asset_name))
+
+        matching_asset_doc = version_number = None
+
+        regex_result = self.version_regex.findall(asset_name)
+        if regex_result:
+            _asset_name, _version_number = regex_result[0]
+            matching_asset_doc = self._get_asset_by_name_case_not_sensitive(
+                project_name, _asset_name)
+            if matching_asset_doc:
+                version_number = int(_version_number)
+
+        return matching_asset_doc, version_number
+
+    def _parse_containing(self, project_name, asset_name):
+        """Look if file name contains any existing asset name"""
+        for asset_doc in get_assets(project_name, fields=["name"]):
+            if asset_doc["name"].lower() in asset_name.lower():
+                return get_assets(project_name,
+                                  asset_names=[asset_doc["name"]])
+
+    def _get_subset_and_task(self, asset_doc, variant, project_name):
+        """Create subset name according to standard template process"""
+        task_name = self._get_task_name(asset_doc)
+
+        subset_name = get_subset_name_with_asset_doc(
+            self.family,
+            variant,
+            task_name,
+            asset_doc,
+            project_name
+        )
+
+        return subset_name, task_name
+
+    def _get_task_name(self, asset_doc):
+        """Get applicable task from 'asset_doc' """
+        available_task_names = {}
+        asset_tasks = asset_doc.get("data", {}).get("tasks") or {}
+        for task_name in asset_tasks.keys():
+            available_task_names[task_name.lower()] = task_name
+
+        task_name = None
+        for _task_name in self.default_tasks:
+            _task_name_low = _task_name.lower()
+            if _task_name_low in available_task_names:
+                task_name = available_task_names[_task_name_low]
+                break
+
+        return task_name
+
+    def get_default_variants(self):
+        return self._default_variants
+
+    def get_instance_attr_defs(self):
+        return []
+
+    def get_pre_create_attr_defs(self):
+        # Use same attributes as for instance attributes
+        return [
+            FileDef(
+                "filepath",
+                folders=False,
+                single_item=False,
+                extensions=self.extensions,
+                label="Filepath"
+            )
+        ]
+
+    def get_detail_description(self):
+        return """# Publish batch of .mov to multiple assets.
+        
+        File names must then contain only asset name, or asset name + version.
+        (eg. 'chair.mov', 'chair_v001.mov', not really safe `my_chair_v001.mov`
+        """
+
+    def _get_asset_by_name_case_not_sensitive(self, project_name, asset_name):
+        """Handle more cases in file names"""
+        asset_name = re.compile(asset_name, re.IGNORECASE)
+
+        assets = list(get_assets(project_name, asset_names=[asset_name]))
+        if assets:
+            if len(assets) > 1:
+                self.log.warning("Too many records found for {}".format(
+                    asset_name))
+                return
+
+            return assets.pop()
diff --git a/openpype/hosts/traypublisher/plugins/publish/collect_mov_batch.py b/openpype/hosts/traypublisher/plugins/publish/collect_mov_batch.py
new file mode 100644
index 0000000000..2a5e356684
--- /dev/null
+++ b/openpype/hosts/traypublisher/plugins/publish/collect_mov_batch.py
@@ -0,0 +1,34 @@
+import os
+
+import pyblish.api
+from openpype.pipeline import OpenPypePyblishPluginMixin
+
+
+class CollectMovBatch(
+    pyblish.api.InstancePlugin, OpenPypePyblishPluginMixin
+):
+    """Collect file url for batch mov and create representation."""
+
+    label = "Collect Mov Batch Files"
+    order = pyblish.api.CollectorOrder
+
+    hosts = ["traypublisher"]
+
+    def process(self, instance):
+        if not instance.data.get("creator_identifier") == "render_mov_batch":
+            return
+
+        file_url = instance.data["creator_attributes"]["filepath"]
+        file_name = os.path.basename(file_url)
+        _, ext = os.path.splitext(file_name)
+
+        repre = {
+            "name": ext[1:],
+            "ext": ext[1:],
+            "files": file_name,
+            "stagingDir": os.path.dirname(file_url)
+        }
+
+        instance.data["representations"].append(repre)
+
+        self.log.debug("instance.data {}".format(instance.data))
diff --git a/openpype/settings/defaults/project_settings/traypublisher.json b/openpype/settings/defaults/project_settings/traypublisher.json
index 0b54cfd39e..6d2d32a037 100644
--- a/openpype/settings/defaults/project_settings/traypublisher.json
+++ b/openpype/settings/defaults/project_settings/traypublisher.json
@@ -31,5 +31,18 @@
                 ".aep"
             ]
         }
-    ]
+    ],
+    "BatchMovCreator": {
+        "family": "render_mov_batch",
+        "identifier": "",
+        "label": "Batch Mov",
+        "icon": "fa.file",
+        "default_variants": [],
+        "description": "",
+        "detailed_description": "",
+        "default_tasks": "Compositing",
+        "extensions": [
+            ".mov"
+        ]
+    }
 }
\ No newline at end of file
diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_traypublisher.json b/openpype/settings/entities/schemas/projects_schema/schema_project_traypublisher.json
index 55c1b7b7d7..7cb74d86a7 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_traypublisher.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_traypublisher.json
@@ -78,6 +78,77 @@
                     }
                 ]
             }
+        },
+         {
+            "type": "dict",
+            "collapsible": true,
+            "key": "BatchMovCreator",
+            "label": "Batch Mov Creator",
+            "use_label_wrap": true,
+            "collapsible_key": true,
+            "children": [
+                {
+                    "type": "text",
+                    "key": "family",
+                    "label": "Family"
+                },
+                {
+                    "type": "text",
+                    "key": "identifier",
+                    "label": "Identifier",
+                    "placeholder": "< Use 'Family' >",
+                    "tooltip": "All creators must have unique identifier.\nBy default is used 'family' but if you need to have more creators with same families\nyou have to set identifier too."
+                },
+                {
+                    "type": "text",
+                    "key": "label",
+                    "label": "Label"
+                },
+                {
+                    "type": "text",
+                    "key": "icon",
+                    "label": "Icon"
+                },
+                {
+                    "type": "list",
+                    "key": "default_variants",
+                    "label": "Default variants",
+                    "object_type": {
+                        "type": "text"
+                    }
+                },
+                {
+                    "type": "separator"
+                },
+                {
+                    "type": "text",
+                    "key": "description",
+                    "label": "Description"
+                },
+                {
+                    "type": "text",
+                    "key": "detailed_description",
+                    "label": "Detailed Description",
+                    "multiline": true
+                },
+                {
+                    "type": "separator"
+                },
+                {
+                    "type": "text",
+                    "key": "default_tasks",
+                    "label": "Default task"
+                },
+                {
+                    "type": "list",
+                    "key": "extensions",
+                    "label": "Extensions",
+                    "use_label_wrap": true,
+                    "collapsible_key": true,
+                    "collapsed": false,
+                    "object_type": "text"
+                }
+            ]
         }
     ]
 }

From 620060b7d6a07ef9264429a56ff797b233085a99 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Mon, 11 Jul 2022 18:19:27 +0200
Subject: [PATCH 121/289] use plist.load as plist.readPlist is deprecated

---
 openpype/lib/applications.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/openpype/lib/applications.py b/openpype/lib/applications.py
index 82f77ef9e3..f46197e15f 100644
--- a/openpype/lib/applications.py
+++ b/openpype/lib/applications.py
@@ -665,7 +665,11 @@ class ApplicationExecutable:
             if os.path.exists(plist_filepath):
                 import plistlib
 
-                parsed_plist = plistlib.readPlist(plist_filepath)
+                if hasattr(plistlib, "load"):
+                    with open(plist_filepath, "rb") as stream:
+                        parsed_plist = plistlib.load(stream)
+                else:
+                    parsed_plist = plistlib.readPlist(plist_filepath)
                 executable_filename = parsed_plist.get("CFBundleExecutable")
 
             if executable_filename:

From e0c2499cf95eb0d5d9d591781d9eb1b7618d660c Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Mon, 11 Jul 2022 18:48:42 +0200
Subject: [PATCH 122/289] align creator attributes from top to bottom

---
 openpype/tools/publisher/widgets/widgets.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/openpype/tools/publisher/widgets/widgets.py b/openpype/tools/publisher/widgets/widgets.py
index 7096b9fb50..5a5f8c4c37 100644
--- a/openpype/tools/publisher/widgets/widgets.py
+++ b/openpype/tools/publisher/widgets/widgets.py
@@ -1225,6 +1225,7 @@ class CreatorAttrsWidget(QtWidgets.QWidget):
     different creators. If creator have same (similar) definitions their
     widgets are merged into one (different label does not count).
     """
+
     def __init__(self, controller, parent):
         super(CreatorAttrsWidget, self).__init__(parent)
 
@@ -1275,6 +1276,7 @@ class CreatorAttrsWidget(QtWidgets.QWidget):
         content_layout = QtWidgets.QGridLayout(content_widget)
         content_layout.setColumnStretch(0, 0)
         content_layout.setColumnStretch(1, 1)
+        content_layout.setAlignment(QtCore.Qt.AlignTop)
 
         row = 0
         for attr_def, attr_instances, values in result:

From a7c945f51f484a848401072fd230334710f3b734 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 12 Jul 2022 11:01:52 +0200
Subject: [PATCH 123/289] OP-3446 - fix return type

---
 .../traypublisher/plugins/create/create_mov_batch.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/openpype/hosts/traypublisher/plugins/create/create_mov_batch.py b/openpype/hosts/traypublisher/plugins/create/create_mov_batch.py
index 5297d73ba9..d796b304a3 100644
--- a/openpype/hosts/traypublisher/plugins/create/create_mov_batch.py
+++ b/openpype/hosts/traypublisher/plugins/create/create_mov_batch.py
@@ -2,11 +2,12 @@ import copy
 import os
 import re
 
-from openpype.client import get_assets
+from openpype.client import get_assets, get_asset_by_name
 from openpype.hosts.traypublisher.api import pipeline
-from openpype.lib import FileDef, TextDef, get_subset_name_with_asset_doc
+from openpype.lib import FileDef, get_subset_name_with_asset_doc
 from openpype.pipeline import (
-    CreatedInstance
+    CreatedInstance,
+    CreatorError
 )
 
 from openpype.hosts.traypublisher.api.plugin import TrayPublishCreator
@@ -89,7 +90,7 @@ class BatchMovCreator(TrayPublishCreator):
                                                         asset_name)
 
         if matching_asset_doc is None:
-            raise ValueError(
+            raise CreatorError(
                 "Cannot guess asset name from {}".format(source_filename))
 
         return matching_asset_doc, version
@@ -119,8 +120,7 @@ class BatchMovCreator(TrayPublishCreator):
         """Look if file name contains any existing asset name"""
         for asset_doc in get_assets(project_name, fields=["name"]):
             if asset_doc["name"].lower() in asset_name.lower():
-                return get_assets(project_name,
-                                  asset_names=[asset_doc["name"]])
+                return get_asset_by_name(project_name, asset_doc["name"])
 
     def _get_subset_and_task(self, asset_doc, variant, project_name):
         """Create subset name according to standard template process"""

From c3384c4005132c2eb973d0bda8a191bb3fd6791c Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 12 Jul 2022 11:02:06 +0200
Subject: [PATCH 124/289] OP-3446 - remove obsolete methods

---
 openpype/hosts/traypublisher/api/batch_lib.py | 61 -------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 openpype/hosts/traypublisher/api/batch_lib.py

diff --git a/openpype/hosts/traypublisher/api/batch_lib.py b/openpype/hosts/traypublisher/api/batch_lib.py
deleted file mode 100644
index 2486d405bd..0000000000
--- a/openpype/hosts/traypublisher/api/batch_lib.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# Helper functions to find matching asset for (multiple) processed source files
-import os
-import collections
-
-from openpype.client import get_assets
-
-
-def get_children_assets_by_name(project_name, top_asset_doc):
-    """ Get all children for 'top_asset_doc' by theirs name
-
-    Args:
-        project_name (str)
-        top_asset_doc (asset doc) (eg dict)
-    Returns:
-        (dict) {"shot1": shot1_asset_doc}
-    """
-    assets_by_parent_id = get_asset_docs_by_parent_id(project_name)
-    _children_docs = get_children_docs(
-        assets_by_parent_id, top_asset_doc
-    )
-    children_docs = {
-        children_doc["name"].lower(): children_doc
-        for children_doc in _children_docs
-    }
-    return children_docs
-
-
-def get_asset_docs_by_parent_id(project_name):
-    """ Query all assets for project and store them by parent's id to list
-
-    Args:
-         project_name (str)
-    Returns:
-        (dict) { _id of parent :[asset_doc1, asset_doc2]}
-    """
-    asset_docs_by_parent_id = collections.defaultdict(list)
-    for asset_doc in get_assets(project_name):
-        parent_id = asset_doc["data"]["visualParent"]
-        asset_docs_by_parent_id[parent_id].append(asset_doc)
-    return asset_docs_by_parent_id
-
-
-def get_children_docs(documents_by_parent_id, parent_doc):
-    """ Recursively find all children in reverse order
-
-    Last children first.
-    Args:
-         documents_by_parent_id (dict)
-         parent_doc (asset doc, eg dict)
-    Returns
-        (list) of asset docs
-    """
-    output = []
-    children = documents_by_parent_id.get(parent_doc["_id"]) or tuple()
-    for child in children:
-        output.extend(
-            get_children_docs(documents_by_parent_id, child)
-        )
-    output.append(parent_doc)
-    return output
-

From 24e26ce63a478941dd4334c7558b92c5eb853b95 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 12 Jul 2022 11:05:35 +0200
Subject: [PATCH 125/289] OP-3446 - fill defaults_variant explicitly

No need to overwrite method
---
 .../traypublisher/plugins/create/create_mov_batch.py     | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/openpype/hosts/traypublisher/plugins/create/create_mov_batch.py b/openpype/hosts/traypublisher/plugins/create/create_mov_batch.py
index d796b304a3..1577b622ab 100644
--- a/openpype/hosts/traypublisher/plugins/create/create_mov_batch.py
+++ b/openpype/hosts/traypublisher/plugins/create/create_mov_batch.py
@@ -31,9 +31,9 @@ class BatchMovCreator(TrayPublishCreator):
     def __init__(self, project_settings, *args, **kwargs):
         super(BatchMovCreator, self).__init__(project_settings,
                                               *args, **kwargs)
-        self._default_variants = (project_settings["traypublisher"]
-                                                  ["BatchMovCreator"]
-                                                  ["default_variants"])
+        self.default_variants = (project_settings["traypublisher"]
+                                                 ["BatchMovCreator"]
+                                                 ["default_variants"])
 
     def get_icon(self):
         return "fa.file"
@@ -152,9 +152,6 @@ class BatchMovCreator(TrayPublishCreator):
 
         return task_name
 
-    def get_default_variants(self):
-        return self._default_variants
-
     def get_instance_attr_defs(self):
         return []
 

From 89eddfa63d91eb1de766363b9d9c8c7899d39ad1 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 12 Jul 2022 11:17:55 +0200
Subject: [PATCH 126/289] OP-3446 - fix pulling configuration from Settings

---
 .../traypublisher/plugins/create/create_mov_batch.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/openpype/hosts/traypublisher/plugins/create/create_mov_batch.py b/openpype/hosts/traypublisher/plugins/create/create_mov_batch.py
index 1577b622ab..e54fc44acc 100644
--- a/openpype/hosts/traypublisher/plugins/create/create_mov_batch.py
+++ b/openpype/hosts/traypublisher/plugins/create/create_mov_batch.py
@@ -24,10 +24,6 @@ class BatchMovCreator(TrayPublishCreator):
     create_allow_context_change = False
     version_regex = re.compile(r"^(.+)_v([0-9]+)$")
 
-    default_tasks = ["Compositing"]
-
-    extensions = [".mov"]
-
     def __init__(self, project_settings, *args, **kwargs):
         super(BatchMovCreator, self).__init__(project_settings,
                                               *args, **kwargs)
@@ -35,6 +31,14 @@ class BatchMovCreator(TrayPublishCreator):
                                                  ["BatchMovCreator"]
                                                  ["default_variants"])
 
+        self.default_tasks = (project_settings["traypublisher"]
+                                              ["BatchMovCreator"]
+                                              ["default_tasks"])
+
+        self.extensions = (project_settings["traypublisher"]
+                                           ["BatchMovCreator"]
+                                           ["extensions"])
+
     def get_icon(self):
         return "fa.file"
 

From 1fe8c96c261e9687b5aaca52e53d88897fef540a Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 12 Jul 2022 11:18:31 +0200
Subject: [PATCH 127/289] OP-3446 - modifying Settings to list

---
 .../settings/defaults/project_settings/traypublisher.json  | 4 ++--
 .../projects_schema/schema_project_traypublisher.json      | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/openpype/settings/defaults/project_settings/traypublisher.json b/openpype/settings/defaults/project_settings/traypublisher.json
index 6d2d32a037..36526d01b0 100644
--- a/openpype/settings/defaults/project_settings/traypublisher.json
+++ b/openpype/settings/defaults/project_settings/traypublisher.json
@@ -37,10 +37,10 @@
         "identifier": "",
         "label": "Batch Mov",
         "icon": "fa.file",
-        "default_variants": [],
+        "default_variants": ["Main"],
         "description": "",
         "detailed_description": "",
-        "default_tasks": "Compositing",
+        "default_tasks": ["Compositing"],
         "extensions": [
             ".mov"
         ]
diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_traypublisher.json b/openpype/settings/entities/schemas/projects_schema/schema_project_traypublisher.json
index 7cb74d86a7..308883d46f 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_traypublisher.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_traypublisher.json
@@ -135,9 +135,12 @@
                     "type": "separator"
                 },
                 {
-                    "type": "text",
+                    "type": "list",
                     "key": "default_tasks",
-                    "label": "Default task"
+                    "label": "Default tasks",
+                    "object_type": {
+                        "type": "text"
+                    }
                 },
                 {
                     "type": "list",

From 20b0292af170360db2aecb0483afe3ae13dd3bcd Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 12 Jul 2022 11:19:27 +0200
Subject: [PATCH 128/289] OP-3446 - removed unneeded, comes from class

---
 openpype/hosts/traypublisher/plugins/create/create_mov_batch.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/openpype/hosts/traypublisher/plugins/create/create_mov_batch.py b/openpype/hosts/traypublisher/plugins/create/create_mov_batch.py
index e54fc44acc..fdada96c87 100644
--- a/openpype/hosts/traypublisher/plugins/create/create_mov_batch.py
+++ b/openpype/hosts/traypublisher/plugins/create/create_mov_batch.py
@@ -19,7 +19,6 @@ class BatchMovCreator(TrayPublishCreator):
     label = "Batch Mov"
     family = "render"
     description = "Publish batch of movs"
-    host_name = "traypublisher"
 
     create_allow_context_change = False
     version_regex = re.compile(r"^(.+)_v([0-9]+)$")

From 7abbc26184b054a56118d0a8323b309e10e61179 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 12 Jul 2022 11:36:13 +0200
Subject: [PATCH 129/289] first sequence frame is taken from the input sequence
 instead of output frame

---
 openpype/plugins/publish/extract_review.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/openpype/plugins/publish/extract_review.py b/openpype/plugins/publish/extract_review.py
index b6e5fee1fe..107a0994a3 100644
--- a/openpype/plugins/publish/extract_review.py
+++ b/openpype/plugins/publish/extract_review.py
@@ -446,8 +446,11 @@ class ExtractReview(pyblish.api.InstancePlugin):
             with_audio = False
 
         input_is_sequence = self.input_is_sequence(repre)
+        first_sequence_frame = None
         input_allow_bg = False
         if input_is_sequence and repre["files"]:
+            cols, _ = clique.assemble(repre["files"])
+            first_sequence_frame = list(sorted(cols[0].indexes))[0]
             ext = os.path.splitext(repre["files"][0])[1].replace(".", "")
             if ext in self.alpha_exts:
                 input_allow_bg = True
@@ -467,6 +470,7 @@ class ExtractReview(pyblish.api.InstancePlugin):
             "resolution_height": instance.data.get("resolutionHeight"),
             "origin_repre": repre,
             "input_is_sequence": input_is_sequence,
+            "first_sequence_frame": first_sequence_frame,
             "input_allow_bg": input_allow_bg,
             "with_audio": with_audio,
             "without_handles": without_handles,
@@ -545,9 +549,9 @@ class ExtractReview(pyblish.api.InstancePlugin):
         if temp_data["input_is_sequence"]:
             # Set start frame of input sequence (just frame in filename)
             # - definition of input filepath
-            ffmpeg_input_args.append(
-                "-start_number {}".format(temp_data["output_frame_start"])
-            )
+            ffmpeg_input_args.extend([
+                "-start_number", str(temp_data["first_sequence_frame"])
+            ])
 
             # TODO add fps mapping `{fps: fraction}` ?
             # - e.g.: {

From 0524ce303623074414bdabfd4b15ec41b1e00d9e Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 12 Jul 2022 11:54:39 +0200
Subject: [PATCH 130/289] added some comment related to first frame

---
 openpype/plugins/publish/extract_review.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/openpype/plugins/publish/extract_review.py b/openpype/plugins/publish/extract_review.py
index 107a0994a3..a184f0f3d1 100644
--- a/openpype/plugins/publish/extract_review.py
+++ b/openpype/plugins/publish/extract_review.py
@@ -446,11 +446,17 @@ class ExtractReview(pyblish.api.InstancePlugin):
             with_audio = False
 
         input_is_sequence = self.input_is_sequence(repre)
-        first_sequence_frame = None
         input_allow_bg = False
+        first_sequence_frame = None
         if input_is_sequence and repre["files"]:
+            # Calculate first frame that should be used
             cols, _ = clique.assemble(repre["files"])
-            first_sequence_frame = list(sorted(cols[0].indexes))[0]
+            input_frames = list(sorted(cols[0].indexes))
+            # WARNING: This is an issue as we don't know if first frame
+            #   is with or without handles!
+            # - in theory we should add handle start but how do we know we can?
+            first_sequence_frame = input_frames[0]
+
             ext = os.path.splitext(repre["files"][0])[1].replace(".", "")
             if ext in self.alpha_exts:
                 input_allow_bg = True

From ab24d18f31840bfe0e4e2a95085f9e3d0ca8bdbd Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 12 Jul 2022 12:02:05 +0200
Subject: [PATCH 131/289] try partially solve issue with handles

---
 openpype/plugins/publish/extract_review.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/openpype/plugins/publish/extract_review.py b/openpype/plugins/publish/extract_review.py
index a184f0f3d1..1b6e2a1d61 100644
--- a/openpype/plugins/publish/extract_review.py
+++ b/openpype/plugins/publish/extract_review.py
@@ -452,10 +452,16 @@ class ExtractReview(pyblish.api.InstancePlugin):
             # Calculate first frame that should be used
             cols, _ = clique.assemble(repre["files"])
             input_frames = list(sorted(cols[0].indexes))
+            first_sequence_frame = input_frames[0]
             # WARNING: This is an issue as we don't know if first frame
             #   is with or without handles!
-            # - in theory we should add handle start but how do we know we can?
-            first_sequence_frame = input_frames[0]
+            # - handle start is added but how do not know if we should
+            output_duration = (output_frame_end - output_frame_start) + 1
+            if (
+                without_handles
+                and len(input_frames) - handle_start >= output_duration
+            ):
+                first_sequence_frame += handle_start
 
             ext = os.path.splitext(repre["files"][0])[1].replace(".", "")
             if ext in self.alpha_exts:

From 636206f9d2bab1e22337ebbd09c7db68b99e2fa2 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 12 Jul 2022 12:19:22 +0200
Subject: [PATCH 132/289] Update
 openpype/hosts/traypublisher/plugins/create/create_mov_batch.py

Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
---
 .../plugins/create/create_mov_batch.py          | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/openpype/hosts/traypublisher/plugins/create/create_mov_batch.py b/openpype/hosts/traypublisher/plugins/create/create_mov_batch.py
index fdada96c87..20d3ecbd7c 100644
--- a/openpype/hosts/traypublisher/plugins/create/create_mov_batch.py
+++ b/openpype/hosts/traypublisher/plugins/create/create_mov_batch.py
@@ -26,17 +26,12 @@ class BatchMovCreator(TrayPublishCreator):
     def __init__(self, project_settings, *args, **kwargs):
         super(BatchMovCreator, self).__init__(project_settings,
                                               *args, **kwargs)
-        self.default_variants = (project_settings["traypublisher"]
-                                                 ["BatchMovCreator"]
-                                                 ["default_variants"])
-
-        self.default_tasks = (project_settings["traypublisher"]
-                                              ["BatchMovCreator"]
-                                              ["default_tasks"])
-
-        self.extensions = (project_settings["traypublisher"]
-                                           ["BatchMovCreator"]
-                                           ["extensions"])
+        creator_settings = (
+            project_settings["traypublisher"]["BatchMovCreator"]
+        )
+        self.default_variants = creator_settings["default_variants"]
+        self.default_tasks = creator_settings["default_tasks"]
+        self.extensions = creator_settings["extensions"]
 
     def get_icon(self):
         return "fa.file"

From 6936f836882159e48d81a17272df1249cc11b806 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 12 Jul 2022 12:38:28 +0200
Subject: [PATCH 133/289] fix issue with changing instance label

---
 .../tools/publisher/widgets/list_view_widgets.py     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/openpype/tools/publisher/widgets/list_view_widgets.py b/openpype/tools/publisher/widgets/list_view_widgets.py
index 1b1a19599a..8cc6dc45eb 100644
--- a/openpype/tools/publisher/widgets/list_view_widgets.py
+++ b/openpype/tools/publisher/widgets/list_view_widgets.py
@@ -132,7 +132,7 @@ class InstanceListItemWidget(QtWidgets.QWidget):
 
         active_checkbox.stateChanged.connect(self._on_active_change)
 
-        self._subset_name_label = subset_name_label
+        self._instance_label_widget = subset_name_label
         self._active_checkbox = active_checkbox
 
         self._has_valid_context = None
@@ -146,8 +146,8 @@ class InstanceListItemWidget(QtWidgets.QWidget):
         state = ""
         if not valid:
             state = "invalid"
-        self._subset_name_label.setProperty("state", state)
-        self._subset_name_label.style().polish(self._subset_name_label)
+        self._instance_label_widget.setProperty("state", state)
+        self._instance_label_widget.style().polish(self._instance_label_widget)
 
     def is_active(self):
         """Instance is activated."""
@@ -176,9 +176,9 @@ class InstanceListItemWidget(QtWidgets.QWidget):
     def update_instance_values(self):
         """Update instance data propagated to widgets."""
         # Check subset name
-        subset_name = self.instance["subset"]
-        if subset_name != self._subset_name_label.text():
-            self._subset_name_label.setText(subset_name)
+        label = self.instance.label
+        if label != self._instance_label_widget.text():
+            self._instance_label_widget.setText(label)
         # Check active state
         self.set_active(self.instance["active"])
         # Check valid states

From 64d80f2d05c7639505db50a9c512d01d6e1cf224 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Tue, 12 Jul 2022 13:40:24 +0200
Subject: [PATCH 134/289] nuke: adding retime loading option to clip loader

---
 openpype/hosts/nuke/plugins/load/load_clip.py | 30 ++++++++++++++-----
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/openpype/hosts/nuke/plugins/load/load_clip.py b/openpype/hosts/nuke/plugins/load/load_clip.py
index d177e6ba76..e9530c58c0 100644
--- a/openpype/hosts/nuke/plugins/load/load_clip.py
+++ b/openpype/hosts/nuke/plugins/load/load_clip.py
@@ -55,7 +55,8 @@ class LoadClip(plugin.NukeLoader):
 
     # option gui
     defaults = {
-        "start_at_workfile": True
+        "start_at_workfile": True,
+        "add_retime": True
     }
 
     options = [
@@ -63,6 +64,11 @@ class LoadClip(plugin.NukeLoader):
             "start_at_workfile",
             help="Load at workfile start frame",
             default=True
+        ),
+        qargparse.Boolean(
+            "add_retime",
+            help="Load with retime",
+            default=True
         )
     ]
 
@@ -88,6 +94,9 @@ class LoadClip(plugin.NukeLoader):
         start_at_workfile = options.get(
             "start_at_workfile", self.defaults["start_at_workfile"])
 
+        add_retime = options.get(
+            "add_retime", self.defaults["add_retime"])
+
         version = context['version']
         version_data = version.get("data", {})
         repre_id = repre["_id"]
@@ -151,7 +160,7 @@ class LoadClip(plugin.NukeLoader):
             data_imprint = {}
             for k in add_keys:
                 if k == 'version':
-                    data_imprint.update({k: context["version"]['name']})
+                    data_imprint[k] = context["version"]['name']
                 elif k == 'colorspace':
                     colorspace = repre["data"].get(k)
                     colorspace = colorspace or version_data.get(k)
@@ -159,10 +168,13 @@ class LoadClip(plugin.NukeLoader):
                     if used_colorspace:
                         data_imprint["used_colorspace"] = used_colorspace
                 else:
-                    data_imprint.update(
-                        {k: context["version"]['data'].get(k, str(None))})
+                    data_imprint[k] = context["version"]['data'].get(
+                        k, str(None))
 
-            data_imprint.update({"objectName": read_name})
+            data_imprint["objectName"] = read_name
+
+            if add_retime and version_data.get("retime", None):
+                data_imprint["addRetime"] = True
 
             read_node["tile_color"].setValue(int("0x4ecd25ff", 16))
 
@@ -174,7 +186,7 @@ class LoadClip(plugin.NukeLoader):
                 loader=self.__class__.__name__,
                 data=data_imprint)
 
-        if version_data.get("retime", None):
+        if add_retime and version_data.get("retime", None):
             self._make_retimes(read_node, version_data)
 
         self.set_as_member(read_node)
@@ -200,6 +212,10 @@ class LoadClip(plugin.NukeLoader):
 
         start_at_workfile = bool("start at" in read_node['frame_mode'].value())
 
+        # TODO: find `addRetime` add openpipe data
+        # add_retime = options.get(
+        #     "add_retime", self.defaults["add_retime"])
+
         project_name = legacy_io.active_project()
         version_doc = get_version_by_id(project_name, representation["parent"])
 
@@ -286,7 +302,7 @@ class LoadClip(plugin.NukeLoader):
                 "updated to version: {}".format(version_doc.get("name"))
             )
 
-        if version_data.get("retime", None):
+        if add_retime and version_data.get("retime", None):
             self._make_retimes(read_node, version_data)
         else:
             self.clear_members(read_node)

From 43424e0fa963b5506e7e60e924c750aaa9bbf4a2 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 12 Jul 2022 14:28:40 +0200
Subject: [PATCH 135/289] creator plugin can set group label for ui

---
 openpype/pipeline/create/creator_plugins.py | 45 ++++++++++++++++-----
 1 file changed, 36 insertions(+), 9 deletions(-)

diff --git a/openpype/pipeline/create/creator_plugins.py b/openpype/pipeline/create/creator_plugins.py
index 4c7b9f8d94..8fa7b98efa 100644
--- a/openpype/pipeline/create/creator_plugins.py
+++ b/openpype/pipeline/create/creator_plugins.py
@@ -1,5 +1,4 @@
 import copy
-import logging
 
 from abc import (
     ABCMeta,
@@ -47,6 +46,9 @@ class BaseCreator:
 
     # Label shown in UI
     label = None
+    group_label = None
+    # Cached group label after first call 'get_group_label'
+    _group_label = None
 
     # Variable to store logger
     _log = None
@@ -85,11 +87,13 @@ class BaseCreator:
 
         Default implementation returns plugin's family.
         """
+
         return self.family
 
     @abstractproperty
     def family(self):
         """Family that plugin represents."""
+
         pass
 
     @property
@@ -98,6 +102,16 @@ class BaseCreator:
 
         return self.create_context.project_name
 
+    def get_group_label(self):
+        if self._group_label is None:
+            if self.group_label:
+                self._group_label = self.group_label
+            elif self.label:
+                self._group_label = self.label
+            else:
+                self._group_label = self.identifier
+        return self._group_label
+
     @property
     def log(self):
         if self._log is None:
@@ -121,6 +135,7 @@ class BaseCreator:
         - must expect all data that were passed to init in previous
             implementation
         """
+
         pass
 
     @abstractmethod
@@ -147,6 +162,7 @@ class BaseCreator:
                     self._add_instance_to_context(instance)
         ```
         """
+
         pass
 
     @abstractmethod
@@ -154,9 +170,10 @@ class BaseCreator:
         """Store changes of existing instances so they can be recollected.
 
         Args:
-            update_list(list<UpdateData>): Gets list of tuples. Each item
+            update_list(List[UpdateData]): Gets list of tuples. Each item
                 contain changed instance and it's changes.
         """
+
         pass
 
     @abstractmethod
@@ -167,9 +184,10 @@ class BaseCreator:
         'True' if did so.
 
         Args:
-            instance(list<CreatedInstance>): Instance objects which should be
+            instance(List[CreatedInstance]): Instance objects which should be
                 removed.
         """
+
         pass
 
     def get_icon(self):
@@ -177,6 +195,7 @@ class BaseCreator:
 
         Can return path to image file or awesome icon name.
         """
+
         return self.icon
 
     def get_dynamic_data(
@@ -187,6 +206,7 @@ class BaseCreator:
         These may be get dynamically created based on current context of
         workfile.
         """
+
         return {}
 
     def get_subset_name(
@@ -211,6 +231,7 @@ class BaseCreator:
             project_name(str): Project name.
             host_name(str): Which host creates subset.
         """
+
         dynamic_data = self.get_dynamic_data(
             variant, task_name, asset_doc, project_name, host_name
         )
@@ -237,9 +258,10 @@ class BaseCreator:
         keys/values when plugin attributes change.
 
         Returns:
-            list<AbtractAttrDef>: Attribute definitions that can be tweaked for
+            List[AbtractAttrDef]: Attribute definitions that can be tweaked for
                 created instance.
         """
+
         return self.instance_attr_defs
 
 
@@ -297,6 +319,7 @@ class Creator(BaseCreator):
         Returns:
             str: Short description of family.
         """
+
         return self.description
 
     def get_detail_description(self):
@@ -307,6 +330,7 @@ class Creator(BaseCreator):
         Returns:
             str: Detailed description of family for artist.
         """
+
         return self.detailed_description
 
     def get_default_variants(self):
@@ -318,8 +342,9 @@ class Creator(BaseCreator):
         By default returns `default_variants` value.
 
         Returns:
-            list<str>: Whisper variants for user input.
+            List[str]: Whisper variants for user input.
         """
+
         return copy.deepcopy(self.default_variants)
 
     def get_default_variant(self):
@@ -338,11 +363,13 @@ class Creator(BaseCreator):
         """Plugin attribute definitions needed for creation.
         Attribute definitions of plugin that define how creation will work.
         Values of these definitions are passed to `create` method.
-        NOTE:
-        Convert method should be implemented which should care about updating
-        keys/values when plugin attributes change.
+
+        Note:
+            Convert method should be implemented which should care about
+            updating keys/values when plugin attributes change.
+
         Returns:
-            list<AbtractAttrDef>: Attribute definitions that can be tweaked for
+            List[AbtractAttrDef]: Attribute definitions that can be tweaked for
                 created instance.
         """
         return self.pre_create_attr_defs

From cf23aad3cfcc13b209f683b4e6da81c261c3ebb8 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 12 Jul 2022 14:28:53 +0200
Subject: [PATCH 136/289] instance has group_label attribute which can be used
 in UI

---
 openpype/pipeline/create/context.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/openpype/pipeline/create/context.py b/openpype/pipeline/create/context.py
index 7f0341c127..a6d3282726 100644
--- a/openpype/pipeline/create/context.py
+++ b/openpype/pipeline/create/context.py
@@ -503,6 +503,13 @@ class CreatedInstance:
             label = self.subset_name
         return label
 
+    @property
+    def group_label(self):
+        label = self._data.get("group_label")
+        if label:
+            return label
+        return self.creator.get_group_label()
+
     @property
     def creator_identifier(self):
         return self.creator.identifier

From b29973f9cc3562ec0fdf11cf704e025ea5ff7687 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 12 Jul 2022 14:41:30 +0200
Subject: [PATCH 137/289] added some docstrings

---
 openpype/pipeline/create/creator_plugins.py | 47 ++++++++++++++++++---
 1 file changed, 42 insertions(+), 5 deletions(-)

diff --git a/openpype/pipeline/create/creator_plugins.py b/openpype/pipeline/create/creator_plugins.py
index 8fa7b98efa..49d928ded1 100644
--- a/openpype/pipeline/create/creator_plugins.py
+++ b/openpype/pipeline/create/creator_plugins.py
@@ -103,17 +103,34 @@ class BaseCreator:
         return self.create_context.project_name
 
     def get_group_label(self):
+        """Group label under which are instances grouped in UI.
+
+        Default implementation use attributes in this order:
+            - 'group_label' -> 'label' -> 'identifier'
+                Keep in mind that 'identifier' use 'family' by default.
+
+        Returns:
+            str: Group label that can be used for grouping of instances in UI.
+                Group label can be overriden by instance itself.
+        """
+
         if self._group_label is None:
+            label = self.identifier
             if self.group_label:
-                self._group_label = self.group_label
+                label = self.group_label
             elif self.label:
-                self._group_label = self.label
-            else:
-                self._group_label = self.identifier
+                label = self.label
+            self._group_label = label
         return self._group_label
 
     @property
     def log(self):
+        """Logger of the plugin.
+
+        Returns:
+            logging.Logger: Logger with name of the plugin.
+        """
+
         if self._log is None:
             from openpype.api import Logger
 
@@ -121,10 +138,30 @@ class BaseCreator:
         return self._log
 
     def _add_instance_to_context(self, instance):
-        """Helper method to ad d"""
+        """Helper method to add instance to create context.
+
+        Instances should be stored to DCC workfile metadata to be able reload
+        them and also stored to CreateContext in which is creator plugin
+        existing at the moment to be able use it without refresh of
+        CreateContext.
+
+        Args:
+            instance (CreatedInstance): New created instance.
+        """
+
         self.create_context.creator_adds_instance(instance)
 
     def _remove_instance_from_context(self, instance):
+        """Helper method to remove instance from create context.
+
+        Instances must be removed from DCC workfile metadat aand from create
+        context in which plugin is existing at the moment of removement to
+        propagate the change without restarting create context.
+
+        Args:
+            instance (CreatedInstance): Instance which should be removed.
+        """
+
         self.create_context.creator_removed_instance(instance)
 
     @abstractmethod

From d8497b4be4c554e245641856425baf98bcb68974 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 12 Jul 2022 14:43:50 +0200
Subject: [PATCH 138/289] use group label in UI

---
 openpype/tools/publisher/widgets/card_view_widgets.py | 2 +-
 openpype/tools/publisher/widgets/list_view_widgets.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/openpype/tools/publisher/widgets/card_view_widgets.py b/openpype/tools/publisher/widgets/card_view_widgets.py
index 3c294c9c7c..b6fcee7edb 100644
--- a/openpype/tools/publisher/widgets/card_view_widgets.py
+++ b/openpype/tools/publisher/widgets/card_view_widgets.py
@@ -436,7 +436,7 @@ class InstanceCardView(AbstractInstanceView):
         instances_by_group = collections.defaultdict(list)
         identifiers_by_group = collections.defaultdict(set)
         for instance in self.controller.instances:
-            group_name = instance.creator_label
+            group_name = instance.group_label
             instances_by_group[group_name].append(instance)
             identifiers_by_group[group_name].add(
                 instance.creator_identifier
diff --git a/openpype/tools/publisher/widgets/list_view_widgets.py b/openpype/tools/publisher/widgets/list_view_widgets.py
index 1b1a19599a..2701413c7a 100644
--- a/openpype/tools/publisher/widgets/list_view_widgets.py
+++ b/openpype/tools/publisher/widgets/list_view_widgets.py
@@ -519,7 +519,7 @@ class InstanceListView(AbstractInstanceView):
         instances_by_group_name = collections.defaultdict(list)
         group_names = set()
         for instance in self.controller.instances:
-            group_label = instance.creator_label
+            group_label = instance.group_label
             group_names.add(group_label)
             instances_by_group_name[group_label].append(instance)
 

From 2e94247180b6cff6449f79dc3b6c3e8208ae4144 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 12 Jul 2022 14:46:29 +0200
Subject: [PATCH 139/289] changed attribute name '_group_label' ->
 '_cached_group_label'

---
 openpype/pipeline/create/creator_plugins.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/openpype/pipeline/create/creator_plugins.py b/openpype/pipeline/create/creator_plugins.py
index 49d928ded1..91b9d80234 100644
--- a/openpype/pipeline/create/creator_plugins.py
+++ b/openpype/pipeline/create/creator_plugins.py
@@ -48,7 +48,7 @@ class BaseCreator:
     label = None
     group_label = None
     # Cached group label after first call 'get_group_label'
-    _group_label = None
+    _cached_group_label = None
 
     # Variable to store logger
     _log = None
@@ -114,14 +114,14 @@ class BaseCreator:
                 Group label can be overriden by instance itself.
         """
 
-        if self._group_label is None:
+        if self._cached_group_label is None:
             label = self.identifier
             if self.group_label:
                 label = self.group_label
             elif self.label:
                 label = self.label
-            self._group_label = label
-        return self._group_label
+            self._cached_group_label = label
+        return self._cached_group_label
 
     @property
     def log(self):

From dfb041d8524fe8b1cc415a5be86a49cb0148f529 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 12 Jul 2022 15:06:46 +0200
Subject: [PATCH 140/289] timers manager is using client query functions

---
 .../modules/timers_manager/timers_manager.py  | 25 ++++++-------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/openpype/modules/timers_manager/timers_manager.py b/openpype/modules/timers_manager/timers_manager.py
index 3cf1614316..3453e4bc4c 100644
--- a/openpype/modules/timers_manager/timers_manager.py
+++ b/openpype/modules/timers_manager/timers_manager.py
@@ -2,13 +2,13 @@ import os
 import platform
 
 
+from openpype.client import get_asset_by_name
 from openpype.modules import OpenPypeModule
 from openpype_interfaces import (
     ITrayService,
     ILaunchHookPaths
 )
 from openpype.lib.events import register_event_callback
-from openpype.pipeline import AvalonMongoDB
 
 from .exceptions import InvalidContextError
 
@@ -197,22 +197,13 @@ class TimersManager(OpenPypeModule, ITrayService, ILaunchHookPaths):
                 " Project: \"{}\" Asset: \"{}\" Task: \"{}\""
             ).format(str(project_name), str(asset_name), str(task_name)))
 
-        dbconn = AvalonMongoDB()
-        dbconn.install()
-        dbconn.Session["AVALON_PROJECT"] = project_name
-
-        asset_doc = dbconn.find_one(
-            {
-                "type": "asset",
-                "name": asset_name
-            },
-            {
-                "data.tasks": True,
-                "data.parents": True
-            }
+        asset_doc = get_asset_by_name(
+            project_name,
+            asset_name,
+            fields=["_id", "name", "data.tasks", "data.parents"]
         )
+
         if not asset_doc:
-            dbconn.uninstall()
             raise InvalidContextError((
                 "Asset \"{}\" not found in project \"{}\""
             ).format(asset_name, project_name))
@@ -220,7 +211,6 @@ class TimersManager(OpenPypeModule, ITrayService, ILaunchHookPaths):
         asset_data = asset_doc.get("data") or {}
         asset_tasks = asset_data.get("tasks") or {}
         if task_name not in asset_tasks:
-            dbconn.uninstall()
             raise InvalidContextError((
                 "Task \"{}\" not found on asset \"{}\" in project \"{}\""
             ).format(task_name, asset_name, project_name))
@@ -238,9 +228,10 @@ class TimersManager(OpenPypeModule, ITrayService, ILaunchHookPaths):
         hierarchy_items = asset_data.get("parents") or []
         hierarchy_items.append(asset_name)
 
-        dbconn.uninstall()
         return {
             "project_name": project_name,
+            "asset_id": str(asset_doc["_id"]),
+            "asset_name": asset_doc["name"],
             "task_name": task_name,
             "task_type": task_type,
             "hierarchy": hierarchy_items

From 48e33db9224460f1ab72aa80a6bc775684a02ab4 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Tue, 12 Jul 2022 16:02:13 +0200
Subject: [PATCH 141/289] Use group key

---
 openpype/pipeline/create/context.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/pipeline/create/context.py b/openpype/pipeline/create/context.py
index a6d3282726..aecdb04635 100644
--- a/openpype/pipeline/create/context.py
+++ b/openpype/pipeline/create/context.py
@@ -505,7 +505,7 @@ class CreatedInstance:
 
     @property
     def group_label(self):
-        label = self._data.get("group_label")
+        label = self._data.get("group")
         if label:
             return label
         return self.creator.get_group_label()

From dada2f4831045370265037a8b1c01c43f4dd2f92 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 12 Jul 2022 16:06:35 +0200
Subject: [PATCH 142/289] added function which extract project name based on
 project id

---
 .../modules/kitsu/utils/update_op_with_zou.py | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/openpype/modules/kitsu/utils/update_op_with_zou.py b/openpype/modules/kitsu/utils/update_op_with_zou.py
index de74b0c677..c39d1c5e36 100644
--- a/openpype/modules/kitsu/utils/update_op_with_zou.py
+++ b/openpype/modules/kitsu/utils/update_op_with_zou.py
@@ -33,6 +33,20 @@ def create_op_asset(gazu_entity: dict) -> dict:
     }
 
 
+def get_kitsu_project_name(project_id: str):
+    """Get project name based on project id in kitsu.
+
+    Args:
+        project_id (str): Id of project in Kitsu.
+
+    Returns:
+        str: Project name which has project in Kitsu.
+    """
+
+    project = gazu.project.get_project(project_id)
+    return project["name"]
+
+
 def set_op_project(dbcon: AvalonMongoDB, project_id: str):
     """Set project context.
 
@@ -40,9 +54,8 @@ def set_op_project(dbcon: AvalonMongoDB, project_id: str):
         dbcon (AvalonMongoDB): Connection to DB
         project_id (str): Project zou ID
     """
-    project = gazu.project.get_project(project_id)
-    project_name = project["name"]
-    dbcon.Session["AVALON_PROJECT"] = project_name
+
+    dbcon.Session["AVALON_PROJECT"] = get_kitsu_project_name(project_id)
 
 
 def update_op_assets(

From b4d11d4ae709fc65f41ec9c09cbf5e52a183677c Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 12 Jul 2022 16:07:10 +0200
Subject: [PATCH 143/289] use project name function to drop project collection

---
 openpype/modules/kitsu/utils/sync_service.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/openpype/modules/kitsu/utils/sync_service.py b/openpype/modules/kitsu/utils/sync_service.py
index 577050c5af..677d269bca 100644
--- a/openpype/modules/kitsu/utils/sync_service.py
+++ b/openpype/modules/kitsu/utils/sync_service.py
@@ -7,6 +7,7 @@ from .credentials import validate_credentials
 from .update_op_with_zou import (
     create_op_asset,
     set_op_project,
+    get_kitsu_project_name,
     write_project_to_op,
     update_op_assets,
 )
@@ -124,12 +125,11 @@ class Listener:
 
     def _delete_project(self, data):
         """Delete project."""
-        project_doc = self.dbcon.find_one(
-            {"type": "project", "data.zou_id": data["project_id"]}
-        )
+
+        project_name = get_kitsu_project_name(data["project_id"])
 
         # Delete project collection
-        self.dbcon.database[project_doc["name"]].drop()
+        self.dbcon.database[project_name].drop()
 
     # == Asset ==
 

From ee370cb7a315237608f3b60a6b6778d3fc900852 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 12 Jul 2022 16:07:40 +0200
Subject: [PATCH 144/289] change project in session instead of replacing
 AvalonMongoDB with pymongo.Collection

---
 openpype/modules/kitsu/utils/sync_service.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/modules/kitsu/utils/sync_service.py b/openpype/modules/kitsu/utils/sync_service.py
index 677d269bca..d93197a4bc 100644
--- a/openpype/modules/kitsu/utils/sync_service.py
+++ b/openpype/modules/kitsu/utils/sync_service.py
@@ -120,7 +120,7 @@ class Listener:
 
         # Write into DB
         if update_project:
-            self.dbcon = self.dbcon.database[project_name]
+            self.dbcon.Session["AVALON_PROJECT"] = project_name
             self.dbcon.bulk_write([update_project])
 
     def _delete_project(self, data):

From e2920ffdb53df5dd8d68b8800436f19edca2ff9c Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 12 Jul 2022 16:08:15 +0200
Subject: [PATCH 145/289] use query functions in sync service

---
 openpype/modules/kitsu/utils/sync_service.py | 29 +++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/openpype/modules/kitsu/utils/sync_service.py b/openpype/modules/kitsu/utils/sync_service.py
index d93197a4bc..38c1176df9 100644
--- a/openpype/modules/kitsu/utils/sync_service.py
+++ b/openpype/modules/kitsu/utils/sync_service.py
@@ -2,6 +2,10 @@ import os
 
 import gazu
 
+from openpype.client import (
+    get_project,
+    get_assets
+)
 from openpype.pipeline import AvalonMongoDB
 from .credentials import validate_credentials
 from .update_op_with_zou import (
@@ -150,7 +154,8 @@ class Listener:
     def _update_asset(self, data):
         """Update asset into OP DB."""
         set_op_project(self.dbcon, data["project_id"])
-        project_doc = self.dbcon.find_one({"type": "project"})
+        project_name = self.dbcon.active_project()
+        project_doc = get_project(project_name)
 
         # Get gazu entity
         asset = gazu.asset.get_asset(data["asset_id"])
@@ -159,7 +164,7 @@ class Listener:
         # Query all assets of the local project
         zou_ids_and_asset_docs = {
             asset_doc["data"]["zou"]["id"]: asset_doc
-            for asset_doc in self.dbcon.find({"type": "asset"})
+            for asset_doc in get_assets(project_name)
             if asset_doc["data"].get("zou", {}).get("id")
         }
         zou_ids_and_asset_docs[asset["project_id"]] = project_doc
@@ -199,7 +204,8 @@ class Listener:
     def _update_episode(self, data):
         """Update episode into OP DB."""
         set_op_project(self.dbcon, data["project_id"])
-        project_doc = self.dbcon.find_one({"type": "project"})
+        project_name = self.dbcon.active_project()
+        project_doc = get_project(project_name)
 
         # Get gazu entity
         episode = gazu.shot.get_episode(data["episode_id"])
@@ -208,7 +214,7 @@ class Listener:
         # Query all assets of the local project
         zou_ids_and_asset_docs = {
             asset_doc["data"]["zou"]["id"]: asset_doc
-            for asset_doc in self.dbcon.find({"type": "asset"})
+            for asset_doc in get_assets(project_name)
             if asset_doc["data"].get("zou", {}).get("id")
         }
         zou_ids_and_asset_docs[episode["project_id"]] = project_doc
@@ -249,7 +255,8 @@ class Listener:
     def _update_sequence(self, data):
         """Update sequence into OP DB."""
         set_op_project(self.dbcon, data["project_id"])
-        project_doc = self.dbcon.find_one({"type": "project"})
+        project_name = self.dbcon.active_project()
+        project_doc = get_project(project_name)
 
         # Get gazu entity
         sequence = gazu.shot.get_sequence(data["sequence_id"])
@@ -258,7 +265,7 @@ class Listener:
         # Query all assets of the local project
         zou_ids_and_asset_docs = {
             asset_doc["data"]["zou"]["id"]: asset_doc
-            for asset_doc in self.dbcon.find({"type": "asset"})
+            for asset_doc in get_assets(project_name)
             if asset_doc["data"].get("zou", {}).get("id")
         }
         zou_ids_and_asset_docs[sequence["project_id"]] = project_doc
@@ -299,7 +306,8 @@ class Listener:
     def _update_shot(self, data):
         """Update shot into OP DB."""
         set_op_project(self.dbcon, data["project_id"])
-        project_doc = self.dbcon.find_one({"type": "project"})
+        project_name = self.dbcon.active_project()
+        project_doc = get_project(project_name)
 
         # Get gazu entity
         shot = gazu.shot.get_shot(data["shot_id"])
@@ -308,7 +316,7 @@ class Listener:
         # Query all assets of the local project
         zou_ids_and_asset_docs = {
             asset_doc["data"]["zou"]["id"]: asset_doc
-            for asset_doc in self.dbcon.find({"type": "asset"})
+            for asset_doc in get_assets(project_name)
             if asset_doc["data"].get("zou", {}).get("id")
         }
         zou_ids_and_asset_docs[shot["project_id"]] = project_doc
@@ -359,10 +367,11 @@ class Listener:
 
     def _delete_task(self, data):
         """Delete task of OP DB."""
-        set_op_project(self.dbcon, data["project_id"])
 
+        set_op_project(self.dbcon, data["project_id"])
+        project_name = self.dbcon.active_project()
         # Find asset doc
-        asset_docs = [doc for doc in self.dbcon.find({"type": "asset"})]
+        asset_docs = list(get_assets(project_name))
         for doc in asset_docs:
             # Match task
             for name, task in doc["data"]["tasks"].items():

From d393d6c8956af8365afe5309780762740ff0205c Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 12 Jul 2022 16:09:30 +0200
Subject: [PATCH 146/289] a little bit more complicated way how to get asset
 matching zou id

---
 openpype/modules/kitsu/utils/sync_service.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/openpype/modules/kitsu/utils/sync_service.py b/openpype/modules/kitsu/utils/sync_service.py
index 38c1176df9..3848eda7ae 100644
--- a/openpype/modules/kitsu/utils/sync_service.py
+++ b/openpype/modules/kitsu/utils/sync_service.py
@@ -343,14 +343,25 @@ class Listener:
         """Create new task into OP DB."""
         # Get project entity
         set_op_project(self.dbcon, data["project_id"])
+        project_name = self.dbcon.active_project()
 
         # Get gazu entity
         task = gazu.task.get_task(data["task_id"])
 
         # Find asset doc
-        asset_doc = self.dbcon.find_one(
-            {"type": "asset", "data.zou.id": task["entity"]["id"]}
+        parent_name = task["entity"]["name"]
+        parent_zou_id = task["entity"]["id"]
+        asset_docs = get_assets(
+            project_name,
+            asset_names=[parent_name],
+            fields=["_id", "data.zou.id", "data.tasks"]
         )
+        asset_doc = None
+        for _asset_doc in asset_docs:
+            doc_zou_id = _asset_doc.get("data", {}).get("zou", {}).get("id")
+            if doc_zou_id == parent_zou_id:
+                asset_doc = _asset_doc
+                break
 
         # Update asset tasks with new one
         asset_tasks = asset_doc["data"].get("tasks")

From 20c2cedf75436e463cc6799ab1f3bcb579116abc Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 12 Jul 2022 16:09:47 +0200
Subject: [PATCH 147/289] use query functions in op to zou sync

---
 openpype/modules/kitsu/utils/update_zou_with_op.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/openpype/modules/kitsu/utils/update_zou_with_op.py b/openpype/modules/kitsu/utils/update_zou_with_op.py
index 81d421206f..b7bc418c98 100644
--- a/openpype/modules/kitsu/utils/update_zou_with_op.py
+++ b/openpype/modules/kitsu/utils/update_zou_with_op.py
@@ -6,6 +6,7 @@ from typing import List
 import gazu
 from pymongo import UpdateOne
 
+from openpype.client import get_project
 from openpype.pipeline import AvalonMongoDB
 from openpype.api import get_project_settings
 from openpype.modules.kitsu.utils.credentials import validate_credentials
@@ -53,9 +54,7 @@ def sync_zou_from_op_project(
     """
     # Get project doc if not provided
     if not project_doc:
-        project_doc = dbcon.database[project_name].find_one(
-            {"type": "project"}
-        )
+        project_doc = get_project(project_name)
 
     # Get all entities from zou
     print(f"Synchronizing {project_name}...")
@@ -96,7 +95,7 @@ def sync_zou_from_op_project(
     dbcon.Session["AVALON_PROJECT"] = project_name
     asset_docs = {
         asset_doc["_id"]: asset_doc
-        for asset_doc in dbcon.find({"type": "asset"})
+        for asset_doc in get_assets(project_name)
     }
 
     # Create new assets

From 96863fa8aed63dee0b72f6a38e532525f5b6863d Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 12 Jul 2022 16:10:37 +0200
Subject: [PATCH 148/289] use query functions in zou to op sync

---
 .../modules/kitsu/utils/update_op_with_zou.py | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/openpype/modules/kitsu/utils/update_op_with_zou.py b/openpype/modules/kitsu/utils/update_op_with_zou.py
index c39d1c5e36..86dee3ce65 100644
--- a/openpype/modules/kitsu/utils/update_op_with_zou.py
+++ b/openpype/modules/kitsu/utils/update_op_with_zou.py
@@ -10,6 +10,12 @@ from gazu.task import (
     all_tasks_for_shot,
 )
 
+from openpype.client import (
+    get_project,
+    get_assets,
+    get_asset_by_id,
+    get_asset_by_name
+)
 from openpype.pipeline import AvalonMongoDB
 from openpype.api import get_project_settings
 from openpype.lib import create_project
@@ -85,9 +91,7 @@ def update_op_assets(
         if not item_doc:  # Create asset
             op_asset = create_op_asset(item)
             insert_result = dbcon.insert_one(op_asset)
-            item_doc = dbcon.find_one(
-                {"type": "asset", "_id": insert_result.inserted_id}
-            )
+            item_doc = get_asset_by_id(project_name, insert_result.inserted_id)
 
         # Update asset
         item_data = deepcopy(item_doc["data"])
@@ -235,7 +239,7 @@ def write_project_to_op(project: dict, dbcon: AvalonMongoDB) -> UpdateOne:
         UpdateOne: Update instance for the project
     """
     project_name = project["name"]
-    project_doc = dbcon.database[project_name].find_one({"type": "project"})
+    project_doc = get_project(project_name)
     if not project_doc:
         print(f"Creating project '{project_name}'")
         project_doc = create_project(project_name, project_name, dbcon=dbcon)
@@ -332,19 +336,20 @@ def sync_project_from_kitsu(dbcon: AvalonMongoDB, project: dict):
     bulk_writes.append(write_project_to_op(project, dbcon))
 
     # Try to find project document
-    dbcon.Session["AVALON_PROJECT"] = project["name"]
-    project_doc = dbcon.find_one({"type": "project"})
+    project_name = project["name"]
+    dbcon.Session["AVALON_PROJECT"] = project_name
+    project_doc = get_project(project_name)
 
     # Query all assets of the local project
     zou_ids_and_asset_docs = {
         asset_doc["data"]["zou"]["id"]: asset_doc
-        for asset_doc in dbcon.find({"type": "asset"})
+        for asset_doc in get_assets(project_name)
         if asset_doc["data"].get("zou", {}).get("id")
     }
     zou_ids_and_asset_docs[project["id"]] = project_doc
 
     # Create entities root folders
-    project_module_settings = get_project_settings(project["name"])["kitsu"]
+    project_module_settings = get_project_settings(project_name)["kitsu"]
     for entity_type, root in project_module_settings["entities_root"].items():
         parent_folders = root.split("/")
         direct_parent_doc = None
@@ -384,7 +389,7 @@ def sync_project_from_kitsu(dbcon: AvalonMongoDB, project: dict):
         zou_ids_and_asset_docs.update(
             {
                 asset_doc["data"]["zou"]["id"]: asset_doc
-                for asset_doc in dbcon.find({"type": "asset"})
+                for asset_doc in get_assets(projec_name)
                 if asset_doc["data"].get("zou")
             }
         )

From 767dc3dbaba27063289c6853c306acdda8493869 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 12 Jul 2022 16:11:26 +0200
Subject: [PATCH 149/289] a little bit more complicated queries using zou id

---
 .../modules/kitsu/utils/update_op_with_zou.py | 53 +++++++++++++++----
 1 file changed, 44 insertions(+), 9 deletions(-)

diff --git a/openpype/modules/kitsu/utils/update_op_with_zou.py b/openpype/modules/kitsu/utils/update_op_with_zou.py
index 86dee3ce65..bf3705447c 100644
--- a/openpype/modules/kitsu/utils/update_op_with_zou.py
+++ b/openpype/modules/kitsu/utils/update_op_with_zou.py
@@ -179,14 +179,32 @@ def update_op_assets(
         )
         if visual_parent_doc_id is None:
             # Find root folder doc
-            root_folder_doc = dbcon.find_one(
-                {
-                    "type": "asset",
-                    "name": entity_parent_folders[-1],
-                    "data.root_of": substitute_item_type,
-                },
-                ["_id"],
+            root_folder_docs = get_assets(
+                project_name,
+                asset_name=[entity_parent_folders[-1]],
+                fields=["_id", "data.root_of"]
             )
+            # NOTE: Not sure why it's checking for entity type?
+            #   OP3 does not support multiple assets with same names so type
+            #       filtering is irelevant.
+            # This way mimics previous implementation:
+            # ```
+            # root_folder_doc = dbcon.find_one(
+            #     {
+            #         "type": "asset",
+            #         "name": entity_parent_folders[-1],
+            #         "data.root_of": substitute_item_type,
+            #     },
+            #     ["_id"],
+            # )
+            # ```
+            root_folder_doc = None
+            for folder_doc in root_folder_docs:
+                root_of = folder_doc.get("data", {}).get("root_of")
+                if root_of == substitute_item_type:
+                    root_folder_doc = folder_doc
+                    break
+
             if root_folder_doc:
                 visual_parent_doc_id = root_folder_doc["_id"]
 
@@ -354,9 +372,26 @@ def sync_project_from_kitsu(dbcon: AvalonMongoDB, project: dict):
         parent_folders = root.split("/")
         direct_parent_doc = None
         for i, folder in enumerate(parent_folders, 1):
-            parent_doc = dbcon.find_one(
-                {"type": "asset", "name": folder, "data.root_of": entity_type}
+            parent_doc = get_asset_by_name(
+                project_name, folder, fields=["_id", "data.root_of"]
             )
+            # NOTE: Not sure why it's checking for entity type?
+            #   OP3 does not support multiple assets with same names so type
+            #       filtering is irelevant.
+            #   Also all of the entities could find be queried at once using
+            #       'get_assets'.
+            # This way mimics previous implementation:
+            # ```
+            # parent_doc = dbcon.find_one(
+            #   {"type": "asset", "name": folder, "data.root_of": entity_type}
+            # )
+            # ```
+            if (
+                parent_doc
+                and parent_doc.get("data", {}).get("root_of") != entity_type
+            ):
+                parent_doc = None
+
             if not parent_doc:
                 direct_parent_doc = dbcon.insert_one(
                     {

From 498ed608ebce7d639fcc091da979307f0f21da62 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Tue, 12 Jul 2022 16:24:22 +0200
Subject: [PATCH 150/289] nuke: setting loader option defaults from settings

---
 openpype/hosts/nuke/plugins/load/load_clip.py | 36 ++++++++-------
 .../defaults/project_settings/nuke.json       |  6 ++-
 .../schemas/schema_nuke_load.json             | 46 ++++++++++++++++++-
 3 files changed, 68 insertions(+), 20 deletions(-)

diff --git a/openpype/hosts/nuke/plugins/load/load_clip.py b/openpype/hosts/nuke/plugins/load/load_clip.py
index e9530c58c0..43dd5a66eb 100644
--- a/openpype/hosts/nuke/plugins/load/load_clip.py
+++ b/openpype/hosts/nuke/plugins/load/load_clip.py
@@ -54,26 +54,28 @@ class LoadClip(plugin.NukeLoader):
     script_start = int(nuke.root()["first_frame"].value())
 
     # option gui
-    defaults = {
+    options_defaults = {
         "start_at_workfile": True,
         "add_retime": True
     }
 
-    options = [
-        qargparse.Boolean(
-            "start_at_workfile",
-            help="Load at workfile start frame",
-            default=True
-        ),
-        qargparse.Boolean(
-            "add_retime",
-            help="Load with retime",
-            default=True
-        )
-    ]
-
     node_name_template = "{class_name}_{ext}"
 
+    @classmethod
+    def get_options(cls, *args):
+        return [
+            qargparse.Boolean(
+                "start_at_workfile",
+                help="Load at workfile start frame",
+                default=cls.options_defaults["start_at_workfile"]
+            ),
+            qargparse.Boolean(
+                "add_retime",
+                help="Load with retime",
+                default=cls.options_defaults["add_retime"]
+            )
+        ]
+
     @classmethod
     def get_representations(cls):
         return (
@@ -92,10 +94,10 @@ class LoadClip(plugin.NukeLoader):
         file = self.fname.replace("\\", "/")
 
         start_at_workfile = options.get(
-            "start_at_workfile", self.defaults["start_at_workfile"])
+            "start_at_workfile", self.options_defaults["start_at_workfile"])
 
         add_retime = options.get(
-            "add_retime", self.defaults["add_retime"])
+            "add_retime", self.options_defaults["add_retime"])
 
         version = context['version']
         version_data = version.get("data", {})
@@ -214,7 +216,7 @@ class LoadClip(plugin.NukeLoader):
 
         # TODO: find `addRetime` add openpipe data
         # add_retime = options.get(
-        #     "add_retime", self.defaults["add_retime"])
+        #     "add_retime", self.options_defaults["add_retime"])
 
         project_name = legacy_io.active_project()
         version_doc = get_version_by_id(project_name, representation["parent"])
diff --git a/openpype/settings/defaults/project_settings/nuke.json b/openpype/settings/defaults/project_settings/nuke.json
index 6c45e2a9c1..3e29122074 100644
--- a/openpype/settings/defaults/project_settings/nuke.json
+++ b/openpype/settings/defaults/project_settings/nuke.json
@@ -287,7 +287,11 @@
         "LoadClip": {
             "enabled": true,
             "_representations": [],
-            "node_name_template": "{class_name}_{ext}"
+            "node_name_template": "{class_name}_{ext}",
+            "options_defaults": {
+                "start_at_workfile": true,
+                "add_retime": true
+            }
         }
     },
     "workfile_builder": {
diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_load.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_load.json
index 5bd8337e4c..805424c632 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_load.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_load.json
@@ -11,10 +11,52 @@
                 {
                     "key": "LoadImage",
                     "label": "Image Loader"
+                }
+            ]
+        },
+        {
+            "type": "dict",
+            "collapsible": true,
+            "key": "LoadClip",
+            "label": "Clip Loader",
+            "checkbox_key": "enabled",
+            "children": [
+                {
+                    "type": "boolean",
+                    "key": "enabled",
+                    "label": "Enabled"
                 },
                 {
-                    "key": "LoadClip",
-                    "label": "Clip Loader"
+                    "type": "list",
+                    "key": "_representations",
+                    "label": "Representations",
+                    "object_type": "text"
+                },
+                {
+                    "type": "text",
+                    "key": "node_name_template",
+                    "label": "Node name template"
+                },
+                {
+                    "type": "splitter"
+                },
+                {
+                    "type": "dict",
+                    "collapsible": false,
+                    "key": "options_defaults",
+                    "label": "Loader option defaults",
+                    "children": [
+                        {
+                            "type": "boolean",
+                            "key": "start_at_workfile",
+                            "label": "Start at worfile beggining"
+                        },
+                        {
+                            "type": "boolean",
+                            "key": "add_retime",
+                            "label": "Add retime"
+                        }
+                    ]
                 }
             ]
         }

From d04e95e28f9a206c4a7390a7a1c82f418736b7c9 Mon Sep 17 00:00:00 2001
From: Jakub Jezek <jakubjezek001@gmail.com>
Date: Tue, 12 Jul 2022 16:48:39 +0200
Subject: [PATCH 151/289] nuke: updating clip with retime options

---
 openpype/hosts/nuke/plugins/load/load_clip.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/openpype/hosts/nuke/plugins/load/load_clip.py b/openpype/hosts/nuke/plugins/load/load_clip.py
index 43dd5a66eb..b2dc4a52d7 100644
--- a/openpype/hosts/nuke/plugins/load/load_clip.py
+++ b/openpype/hosts/nuke/plugins/load/load_clip.py
@@ -212,11 +212,12 @@ class LoadClip(plugin.NukeLoader):
         read_node = nuke.toNode(container['objectName'])
         file = get_representation_path(representation).replace("\\", "/")
 
-        start_at_workfile = bool("start at" in read_node['frame_mode'].value())
+        start_at_workfile = "start at" in read_node['frame_mode'].value()
 
-        # TODO: find `addRetime` add openpipe data
-        # add_retime = options.get(
-        #     "add_retime", self.options_defaults["add_retime"])
+        add_retime = [
+            key for key in read_node.knobs().keys()
+            if "addRetime" in key
+        ]
 
         project_name = legacy_io.active_project()
         version_doc = get_version_by_id(project_name, representation["parent"])

From 2988af04ffcd1a42a4ca40fe4a2dbe80f163ffff Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 12 Jul 2022 16:57:49 +0200
Subject: [PATCH 152/289] added missing import

---
 openpype/modules/kitsu/utils/update_zou_with_op.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/modules/kitsu/utils/update_zou_with_op.py b/openpype/modules/kitsu/utils/update_zou_with_op.py
index b7bc418c98..57d7094e95 100644
--- a/openpype/modules/kitsu/utils/update_zou_with_op.py
+++ b/openpype/modules/kitsu/utils/update_zou_with_op.py
@@ -6,7 +6,7 @@ from typing import List
 import gazu
 from pymongo import UpdateOne
 
-from openpype.client import get_project
+from openpype.client import get_project, get_assets
 from openpype.pipeline import AvalonMongoDB
 from openpype.api import get_project_settings
 from openpype.modules.kitsu.utils.credentials import validate_credentials

From 5e14a54d8248b7ddb3f02b778d89ca4a391f15c8 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 12 Jul 2022 17:02:54 +0200
Subject: [PATCH 153/289] fix typo

---
 openpype/modules/kitsu/utils/update_op_with_zou.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/modules/kitsu/utils/update_op_with_zou.py b/openpype/modules/kitsu/utils/update_op_with_zou.py
index bf3705447c..f56a131b8e 100644
--- a/openpype/modules/kitsu/utils/update_op_with_zou.py
+++ b/openpype/modules/kitsu/utils/update_op_with_zou.py
@@ -424,7 +424,7 @@ def sync_project_from_kitsu(dbcon: AvalonMongoDB, project: dict):
         zou_ids_and_asset_docs.update(
             {
                 asset_doc["data"]["zou"]["id"]: asset_doc
-                for asset_doc in get_assets(projec_name)
+                for asset_doc in get_assets(project_name)
                 if asset_doc["data"].get("zou")
             }
         )

From 9d4d8873358bcb6fde08e46817f47a09d858c68d Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 12 Jul 2022 17:13:50 +0200
Subject: [PATCH 154/289] keep mismatch target plugins in report

---
 openpype/pipeline/create/context.py | 10 ++++++++++
 openpype/tools/publisher/control.py | 15 +++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/openpype/pipeline/create/context.py b/openpype/pipeline/create/context.py
index 7f0341c127..ac345ea47b 100644
--- a/openpype/pipeline/create/context.py
+++ b/openpype/pipeline/create/context.py
@@ -709,6 +709,7 @@ class CreateContext:
         self.manual_creators = {}
 
         self.publish_discover_result = None
+        self.publish_plugins_mismatch_targets = []
         self.publish_plugins = []
         self.plugins_with_defs = []
         self._attr_plugins_by_family = {}
@@ -831,6 +832,7 @@ class CreateContext:
         discover_result = DiscoverResult()
         plugins_with_defs = []
         plugins_by_targets = []
+        plugins_mismatch_targets = []
         if discover_publish_plugins:
             discover_result = publish_plugins_discover()
             publish_plugins = discover_result.plugins
@@ -840,11 +842,19 @@ class CreateContext:
             plugins_by_targets = pyblish.logic.plugins_by_targets(
                 publish_plugins, list(targets)
             )
+
             # Collect plugins that can have attribute definitions
             for plugin in publish_plugins:
                 if OpenPypePyblishPluginMixin in inspect.getmro(plugin):
                     plugins_with_defs.append(plugin)
 
+            plugins_mismatch_targets = [
+                plugin
+                for plugin in publish_plugins
+                if plugin not in plugins_by_targets
+            ]
+
+        self.publish_plugins_mismatch_targets = plugins_mismatch_targets
         self.publish_discover_result = discover_result
         self.publish_plugins = plugins_by_targets
         self.plugins_with_defs = plugins_with_defs
diff --git a/openpype/tools/publisher/control.py b/openpype/tools/publisher/control.py
index 915fb7f32e..f692bb4000 100644
--- a/openpype/tools/publisher/control.py
+++ b/openpype/tools/publisher/control.py
@@ -154,15 +154,20 @@ class PublishReport:
         self._all_instances_by_id = {}
         self._current_context = None
 
-    def reset(self, context, publish_discover_result=None):
+    def reset(self, context, create_context):
         """Reset report and clear all data."""
-        self._publish_discover_result = publish_discover_result
+
+        self._publish_discover_result = create_context.publish_discover_result
         self._plugin_data = []
         self._plugin_data_with_plugin = []
         self._current_plugin_data = {}
         self._all_instances_by_id = {}
         self._current_context = context
 
+        for plugin in create_context.publish_plugins_mismatch_targets:
+            plugin_data = self._add_plugin_data_item(plugin)
+            plugin_data["skipped"] = True
+
     def add_plugin_iter(self, plugin, context):
         """Add report about single iteration of plugin."""
         for instance in context:
@@ -205,6 +210,7 @@ class PublishReport:
             "name": plugin.__name__,
             "label": label,
             "order": plugin.order,
+            "targets": list(plugin.targets),
             "instances_data": [],
             "actions_data": [],
             "skipped": False,
@@ -777,10 +783,7 @@ class PublisherController:
         # - pop the key after first collector using it would be safest option?
         self._publish_context.data["create_context"] = self.create_context
 
-        self._publish_report.reset(
-            self._publish_context,
-            self.create_context.publish_discover_result
-        )
+        self._publish_report.reset(self._publish_context, self.create_context)
         self._publish_validation_errors = []
         self._publish_current_plugin_validation_errors = None
         self._publish_error = None

From 8a951ee60f837dbce81442574f922691707ce614 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 12 Jul 2022 17:27:47 +0200
Subject: [PATCH 155/289] removed GlobalEvent

---
 openpype/lib/events.py | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/openpype/lib/events.py b/openpype/lib/events.py
index 3762cec9f9..4a7d648a7e 100644
--- a/openpype/lib/events.py
+++ b/openpype/lib/events.py
@@ -253,13 +253,6 @@ class EventSystem(object):
             self._registered_callbacks.remove(callback)
 
 
-class GlobalEvent(Event):
-    def __init__(self, topic, data=None, source=None):
-        event_system = GlobalEventSystem.get_global_event_system()
-
-        super(GlobalEvent, self).__init__(topic, data, source, event_system)
-
-
 class GlobalEventSystem:
     _global_event_system = None
 
@@ -276,7 +269,7 @@ class GlobalEventSystem:
 
     @classmethod
     def emit(cls, topic, data, source):
-        event = GlobalEvent(topic, data, source)
+        event = Event(topic, data, source, cls.get_global_event_system())
         event.emit()
         return event
 

From 8ab6b41db5689312c39e07426fda869d9c2cc421 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 12 Jul 2022 17:34:51 +0200
Subject: [PATCH 156/289] simplified global event emit

---
 openpype/lib/events.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/openpype/lib/events.py b/openpype/lib/events.py
index 4a7d648a7e..215e36bc4e 100644
--- a/openpype/lib/events.py
+++ b/openpype/lib/events.py
@@ -180,7 +180,10 @@ class Event(object):
         topic (str): Identifier of event.
         data (Any): Data specific for event. Dictionary is recommended.
         source (str): Identifier of source.
+        event_system (EventSystem): Event system in which can be event
+            triggered.
     """
+
     _data = {}
 
     def __init__(self, topic, data=None, source=None, event_system=None):
@@ -269,9 +272,8 @@ class GlobalEventSystem:
 
     @classmethod
     def emit(cls, topic, data, source):
-        event = Event(topic, data, source, cls.get_global_event_system())
-        event.emit()
-        return event
+        event_system = cls.get_global_event_system()
+        return event_system.emit(topic, data, source)
 
 
 def register_event_callback(topic, callback):

From 804bb9b3382970088581f07f2a3492f0fa59bfe7 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 12 Jul 2022 17:48:55 +0200
Subject: [PATCH 157/289] fix group accessing

---
 openpype/tools/publisher/widgets/card_view_widgets.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/openpype/tools/publisher/widgets/card_view_widgets.py b/openpype/tools/publisher/widgets/card_view_widgets.py
index b6fcee7edb..fc8bb2af10 100644
--- a/openpype/tools/publisher/widgets/card_view_widgets.py
+++ b/openpype/tools/publisher/widgets/card_view_widgets.py
@@ -98,6 +98,7 @@ class GroupWidget(QtWidgets.QWidget):
             instances(list<CreatedInstance>): List of instances in
                 CreateContext.
         """
+    
         # Store instances by id and by subset name
         instances_by_id = {}
         instances_by_subset_name = collections.defaultdict(list)
@@ -142,6 +143,7 @@ class GroupWidget(QtWidgets.QWidget):
 
 class CardWidget(BaseClickableFrame):
     """Clickable card used as bigger button."""
+
     selected = QtCore.Signal(str, str)
     # Group identifier of card
     # - this must be set because if send when mouse is released with card id
@@ -178,6 +180,7 @@ class ContextCardWidget(CardWidget):
 
     Is not visually under group widget and is always at the top of card view.
     """
+
     def __init__(self, parent):
         super(ContextCardWidget, self).__init__(parent)
 
@@ -204,13 +207,14 @@ class ContextCardWidget(CardWidget):
 
 class InstanceCardWidget(CardWidget):
     """Card widget representing instance."""
+
     active_changed = QtCore.Signal()
 
     def __init__(self, instance, group_icon, parent):
         super(InstanceCardWidget, self).__init__(parent)
 
         self._id = instance.id
-        self._group_identifier = instance.creator_label
+        self._group_identifier = instance.group_label
         self._group_icon = group_icon
 
         self.instance = instance

From fde803e6ef4de6c33503e6dc8cc785ae2a9d9649 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 12 Jul 2022 17:49:10 +0200
Subject: [PATCH 158/289] set line edit on comboboxes

---
 openpype/widgets/attribute_defs/widgets.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/openpype/widgets/attribute_defs/widgets.py b/openpype/widgets/attribute_defs/widgets.py
index b6493b80a8..63d40e2df1 100644
--- a/openpype/widgets/attribute_defs/widgets.py
+++ b/openpype/widgets/attribute_defs/widgets.py
@@ -374,6 +374,10 @@ class EnumAttrWidget(_BaseAttrDefWidget):
         combo_delegate = QtWidgets.QStyledItemDelegate(input_widget)
         input_widget.setItemDelegate(combo_delegate)
 
+        line_edit = QtWidgets.QLineEdit(input_widget)
+        line_edit.setReadOnly(True)
+        input_widget.setLineEdit(line_edit)
+
         if self.attr_def.tooltip:
             input_widget.setToolTip(self.attr_def.tooltip)
 
@@ -408,7 +412,8 @@ class EnumAttrWidget(_BaseAttrDefWidget):
                 self._input_widget.setCurrentIndex(idx)
 
         else:
-            self._input_widget.lineEdit().setText("Multiselection")
+            line_edit = self._input_widget.lineEdit()
+            line_edit.setText("Multiselection")
 
 
 class UnknownAttrWidget(_BaseAttrDefWidget):

From bfd565e29d40f0daca2ddbdb01d036d9dc6b543a Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 12 Jul 2022 17:57:07 +0200
Subject: [PATCH 159/289] OP-3446 - add traypublisher to host enum

---
 openpype/settings/entities/enum_entity.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openpype/settings/entities/enum_entity.py b/openpype/settings/entities/enum_entity.py
index 92a397afba..03998677ce 100644
--- a/openpype/settings/entities/enum_entity.py
+++ b/openpype/settings/entities/enum_entity.py
@@ -169,6 +169,7 @@ class HostsEnumEntity(BaseEnumEntity):
         "tvpaint",
         "unreal",
         "standalonepublisher",
+        "traypublisher",
         "webpublisher"
     ]
 

From 4fe4ac163e96d7a08cce31d30a8d8fdb85b35cc1 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 12 Jul 2022 17:57:47 +0200
Subject: [PATCH 160/289] OP-3446 - add traypublisher ftrack setting

---
 .../defaults/project_settings/ftrack.json     | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/openpype/settings/defaults/project_settings/ftrack.json b/openpype/settings/defaults/project_settings/ftrack.json
index 831c34835e..eb90778353 100644
--- a/openpype/settings/defaults/project_settings/ftrack.json
+++ b/openpype/settings/defaults/project_settings/ftrack.json
@@ -268,6 +268,49 @@
                         }
                     ]
                 },
+                {
+                    "hosts": [
+                        "traypublisher"
+                    ],
+                    "families": [],
+                    "task_types": [],
+                    "tasks": [],
+                    "add_ftrack_family": true,
+                    "advanced_filtering": []
+                },
+                {
+                    "hosts": [
+                        "traypublisher"
+                    ],
+                    "families": [
+                        "matchmove",
+                        "shot"
+                    ],
+                    "task_types": [],
+                    "tasks": [],
+                    "add_ftrack_family": false,
+                    "advanced_filtering": []
+                },
+                {
+                    "hosts": [
+                        "traypublisher"
+                    ],
+                    "families": [
+                        "plate"
+                    ],
+                    "task_types": [],
+                    "tasks": [],
+                    "add_ftrack_family": false,
+                    "advanced_filtering": [
+                        {
+                            "families": [
+                                "clip",
+                                "review"
+                            ],
+                            "add_ftrack_family": true
+                        }
+                    ]
+                },
                 {
                     "hosts": [
                         "maya"

From cec639cf7ed62ed28b37c4839752e72d0e845e9b Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 12 Jul 2022 18:04:55 +0200
Subject: [PATCH 161/289] OP-3446 - updated settings for TrayPublisher

---
 .../project_settings/traypublisher.json       |  6 ---
 .../schema_project_traypublisher.json         | 39 -------------------
 2 files changed, 45 deletions(-)

diff --git a/openpype/settings/defaults/project_settings/traypublisher.json b/openpype/settings/defaults/project_settings/traypublisher.json
index 36526d01b0..cb3d3d1d1a 100644
--- a/openpype/settings/defaults/project_settings/traypublisher.json
+++ b/openpype/settings/defaults/project_settings/traypublisher.json
@@ -33,13 +33,7 @@
         }
     ],
     "BatchMovCreator": {
-        "family": "render_mov_batch",
-        "identifier": "",
-        "label": "Batch Mov",
-        "icon": "fa.file",
         "default_variants": ["Main"],
-        "description": "",
-        "detailed_description": "",
         "default_tasks": ["Compositing"],
         "extensions": [
             ".mov"
diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_traypublisher.json b/openpype/settings/entities/schemas/projects_schema/schema_project_traypublisher.json
index 308883d46f..d4ad57767a 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_traypublisher.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_traypublisher.json
@@ -87,28 +87,6 @@
             "use_label_wrap": true,
             "collapsible_key": true,
             "children": [
-                {
-                    "type": "text",
-                    "key": "family",
-                    "label": "Family"
-                },
-                {
-                    "type": "text",
-                    "key": "identifier",
-                    "label": "Identifier",
-                    "placeholder": "< Use 'Family' >",
-                    "tooltip": "All creators must have unique identifier.\nBy default is used 'family' but if you need to have more creators with same families\nyou have to set identifier too."
-                },
-                {
-                    "type": "text",
-                    "key": "label",
-                    "label": "Label"
-                },
-                {
-                    "type": "text",
-                    "key": "icon",
-                    "label": "Icon"
-                },
                 {
                     "type": "list",
                     "key": "default_variants",
@@ -117,23 +95,6 @@
                         "type": "text"
                     }
                 },
-                {
-                    "type": "separator"
-                },
-                {
-                    "type": "text",
-                    "key": "description",
-                    "label": "Description"
-                },
-                {
-                    "type": "text",
-                    "key": "detailed_description",
-                    "label": "Detailed Description",
-                    "multiline": true
-                },
-                {
-                    "type": "separator"
-                },
                 {
                     "type": "list",
                     "key": "default_tasks",

From 018896f9239f3fb3a036512a892a8f48593dca85 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 12 Jul 2022 18:28:03 +0200
Subject: [PATCH 162/289] added docstrings

---
 openpype/lib/events.py | 57 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/openpype/lib/events.py b/openpype/lib/events.py
index 215e36bc4e..301d62e2a6 100644
--- a/openpype/lib/events.py
+++ b/openpype/lib/events.py
@@ -229,23 +229,74 @@ class Event(object):
 
 
 class EventSystem(object):
+    """Encapsulate event handling into an object.
+
+    System wraps registered callbacks and triggered events into single object
+    so it is possible to create mutltiple independent systems that have their
+    topics and callbacks.
+
+
+    """
+
     def __init__(self):
         self._registered_callbacks = []
 
     def add_callback(self, topic, callback):
+        """Register callback in event system.
+
+        Args:
+            topic (str): Topic for EventCallback.
+            callback (Callable): Function or method that will be called
+                when topic is triggered.
+
+        Returns:
+            EventCallback: Created callback object which can be used to
+                stop listening.
+        """
+
         callback = EventCallback(topic, callback)
         self._registered_callbacks.append(callback)
         return callback
 
     def create_event(self, topic, data, source):
+        """Create new event which is bound to event system.
+
+        Args:
+            topic (str): Event topic.
+            data (dict): Data related to event.
+            source (str): Source of event.
+
+        Returns:
+            Event: Object of event.
+        """
+
         return Event(topic, data, source, self)
 
     def emit(self, topic, data, source):
+        """Create event based on passed data and emit it.
+
+        This is easiest way how to trigger event in an event system.
+
+        Args:
+            topic (str): Event topic.
+            data (dict): Data related to event.
+            source (str): Source of event.
+
+        Returns:
+            Event: Created and emitted event.
+        """
+
         event = self.create_event(topic, data, source)
         event.emit()
         return event
 
     def emit_event(self, event):
+        """Emit event object.
+
+        Args:
+            event (Event): Prepared event with topic and data.
+        """
+
         invalid_callbacks = []
         for callback in self._registered_callbacks:
             callback.process_event(event)
@@ -257,6 +308,12 @@ class EventSystem(object):
 
 
 class GlobalEventSystem:
+    """Event system living in global scope of process.
+
+    This is primarily used in host implementation to trigger events
+    related to DCC changes or changes of context in the host implementation.
+    """
+
     _global_event_system = None
 
     @classmethod

From e8f30eea9a8914ed09360d56bcd7b2a60d8367fc Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Tue, 12 Jul 2022 18:30:46 +0200
Subject: [PATCH 163/289] Added typing notation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Félix David <felixg.david@gmail.com>
---
 openpype/modules/kitsu/utils/update_op_with_zou.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/modules/kitsu/utils/update_op_with_zou.py b/openpype/modules/kitsu/utils/update_op_with_zou.py
index f56a131b8e..a68d6d31c3 100644
--- a/openpype/modules/kitsu/utils/update_op_with_zou.py
+++ b/openpype/modules/kitsu/utils/update_op_with_zou.py
@@ -39,7 +39,7 @@ def create_op_asset(gazu_entity: dict) -> dict:
     }
 
 
-def get_kitsu_project_name(project_id: str):
+def get_kitsu_project_name(project_id: str)->str:
     """Get project name based on project id in kitsu.
 
     Args:

From 77ffca938a7cd4a3600dd8167bf4e2f346c11fd7 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Tue, 12 Jul 2022 18:53:58 +0200
Subject: [PATCH 164/289] make enum line edit transparent for mouse

---
 openpype/widgets/attribute_defs/widgets.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openpype/widgets/attribute_defs/widgets.py b/openpype/widgets/attribute_defs/widgets.py
index 63d40e2df1..7a7035317b 100644
--- a/openpype/widgets/attribute_defs/widgets.py
+++ b/openpype/widgets/attribute_defs/widgets.py
@@ -376,6 +376,7 @@ class EnumAttrWidget(_BaseAttrDefWidget):
 
         line_edit = QtWidgets.QLineEdit(input_widget)
         line_edit.setReadOnly(True)
+        line_edit.setAttribute(QtCore.Qt.WA_TransparentForMouseEvents)
         input_widget.setLineEdit(line_edit)
 
         if self.attr_def.tooltip:
@@ -413,7 +414,7 @@ class EnumAttrWidget(_BaseAttrDefWidget):
 
         else:
             line_edit = self._input_widget.lineEdit()
-            line_edit.setText("Multiselection")
+            line_edit.setText("< Multiselection> ")
 
 
 class UnknownAttrWidget(_BaseAttrDefWidget):

From 81469cbc54126487a1d3e35d78d36294a966ed14 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Tue, 12 Jul 2022 23:25:44 +0200
Subject: [PATCH 165/289] implemented combobox that can have custom text

---
 openpype/tools/utils/__init__.py |  2 ++
 openpype/tools/utils/widgets.py  | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/openpype/tools/utils/__init__.py b/openpype/tools/utils/__init__.py
index 0f367510bd..5ccc1b40b3 100644
--- a/openpype/tools/utils/__init__.py
+++ b/openpype/tools/utils/__init__.py
@@ -1,4 +1,5 @@
 from .widgets import (
+    CustomTextComboBox,
     PlaceholderLineEdit,
     BaseClickableFrame,
     ClickableFrame,
@@ -28,6 +29,7 @@ from .overlay_messages import (
 
 
 __all__ = (
+    "CustomTextComboBox",
     "PlaceholderLineEdit",
     "BaseClickableFrame",
     "ClickableFrame",
diff --git a/openpype/tools/utils/widgets.py b/openpype/tools/utils/widgets.py
index d5ae909be8..df0d349822 100644
--- a/openpype/tools/utils/widgets.py
+++ b/openpype/tools/utils/widgets.py
@@ -11,6 +11,28 @@ from openpype.style import (
 log = logging.getLogger(__name__)
 
 
+class CustomTextComboBox(QtWidgets.QComboBox):
+    """Combobox which can have different text showed."""
+
+    def __init__(self, *args, **kwargs):
+        self._custom_text = None
+        super(CustomTextComboBox, self).__init__(*args, **kwargs)
+
+    def set_custom_text(self, text=None):
+        if self._custom_text != text:
+            self._custom_text = text
+            self.repaint()
+
+    def paintEvent(self, event):
+        painter = QtWidgets.QStylePainter(self)
+        option = QtWidgets.QStyleOptionComboBox()
+        self.initStyleOption(option)
+        if self._custom_text is not None:
+            option.currentText = self._custom_text
+        painter.drawComplexControl(QtWidgets.QStyle.CC_ComboBox, option)
+        painter.drawControl(QtWidgets.QStyle.CE_ComboBoxLabel, option)
+
+
 class PlaceholderLineEdit(QtWidgets.QLineEdit):
     """Set placeholder color of QLineEdit in Qt 5.12 and higher."""
     def __init__(self, *args, **kwargs):

From cc893a64b44a297f218050e816a37bd6e1d9f583 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Tue, 12 Jul 2022 23:26:09 +0200
Subject: [PATCH 166/289] use combobox with custom text in EnumAttrWidget

---
 openpype/widgets/attribute_defs/widgets.py | 24 ++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/openpype/widgets/attribute_defs/widgets.py b/openpype/widgets/attribute_defs/widgets.py
index 7a7035317b..e4c4aba170 100644
--- a/openpype/widgets/attribute_defs/widgets.py
+++ b/openpype/widgets/attribute_defs/widgets.py
@@ -15,6 +15,7 @@ from openpype.lib.attribute_definitions import (
     UISeparatorDef,
     UILabelDef
 )
+from openpype.tools.utils import CustomTextComboBox
 from openpype.widgets.nice_checkbox import NiceCheckbox
 
 from .files_widget import FilesWidget
@@ -369,8 +370,12 @@ class BoolAttrWidget(_BaseAttrDefWidget):
 
 
 class EnumAttrWidget(_BaseAttrDefWidget):
+    def __init__(self, *args, **kwargs):
+        self._multivalue = False
+        super(EnumAttrWidget, self).__init__(*args, **kwargs)
+
     def _ui_init(self):
-        input_widget = QtWidgets.QComboBox(self)
+        input_widget = CustomTextComboBox(self)
         combo_delegate = QtWidgets.QStyledItemDelegate(input_widget)
         input_widget.setItemDelegate(combo_delegate)
 
@@ -399,6 +404,9 @@ class EnumAttrWidget(_BaseAttrDefWidget):
 
     def _on_value_change(self):
         new_value = self.current_value()
+        if self._multivalue:
+            self._multivalue = False
+            self._input_widget.set_custom_text(None)
         self.value_changed.emit(new_value, self.attr_def.id)
 
     def current_value(self):
@@ -406,15 +414,23 @@ class EnumAttrWidget(_BaseAttrDefWidget):
         return self._input_widget.itemData(idx)
 
     def set_value(self, value, multivalue=False):
+        if multivalue:
+            set_value = set(value)
+            if len(set_value) == 1:
+                multivalue = False
+                value = tuple(set_value)[0]
+
         if not multivalue:
             idx = self._input_widget.findData(value)
             cur_idx = self._input_widget.currentIndex()
             if idx != cur_idx and idx >= 0:
                 self._input_widget.setCurrentIndex(idx)
 
-        else:
-            line_edit = self._input_widget.lineEdit()
-            line_edit.setText("< Multiselection> ")
+        custom_text = None
+        if multivalue:
+            custom_text = "< Multiselection >"
+        self._input_widget.set_custom_text(custom_text)
+        self._multivalue = multivalue
 
 
 class UnknownAttrWidget(_BaseAttrDefWidget):

From 9811e8a1d5dc586e7b3e7786e03bc5c0ef2f3974 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Tue, 12 Jul 2022 23:37:51 +0200
Subject: [PATCH 167/289] fix empty line

---
 openpype/tools/publisher/widgets/card_view_widgets.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/tools/publisher/widgets/card_view_widgets.py b/openpype/tools/publisher/widgets/card_view_widgets.py
index fc8bb2af10..04df85b0fb 100644
--- a/openpype/tools/publisher/widgets/card_view_widgets.py
+++ b/openpype/tools/publisher/widgets/card_view_widgets.py
@@ -98,7 +98,7 @@ class GroupWidget(QtWidgets.QWidget):
             instances(list<CreatedInstance>): List of instances in
                 CreateContext.
         """
-    
+
         # Store instances by id and by subset name
         instances_by_id = {}
         instances_by_subset_name = collections.defaultdict(list)

From 0222a1518d1131e31d586f47dbf4f11b1c1ebbd0 Mon Sep 17 00:00:00 2001
From: OpenPype <info@openpype.io>
Date: Wed, 13 Jul 2022 03:57:50 +0000
Subject: [PATCH 168/289] [Automated] Bump version

---
 CHANGELOG.md        | 30 +++++++++++-------------------
 openpype/version.py |  2 +-
 pyproject.toml      |  2 +-
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a0c058f73..55ee51b38a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## [3.12.1-nightly.4](https://github.com/pypeclub/OpenPype/tree/HEAD)
+## [3.12.1-nightly.5](https://github.com/pypeclub/OpenPype/tree/HEAD)
 
 [Full Changelog](https://github.com/pypeclub/OpenPype/compare/3.12.0...HEAD)
 
@@ -14,6 +14,9 @@
 
 **🚀 Enhancements**
 
+- TrayPublisher: Added more options for grouping of instances [\#3494](https://github.com/pypeclub/OpenPype/pull/3494)
+- NewPublisher: Align creator attributes from top to bottom [\#3487](https://github.com/pypeclub/OpenPype/pull/3487)
+- NewPublisher: Added ability to use label of instance [\#3484](https://github.com/pypeclub/OpenPype/pull/3484)
 - General: Creator Plugins have access to project [\#3476](https://github.com/pypeclub/OpenPype/pull/3476)
 - General: Better arguments order in creator init [\#3475](https://github.com/pypeclub/OpenPype/pull/3475)
 - Ftrack: Trigger custom ftrack events on project creation and preparation [\#3465](https://github.com/pypeclub/OpenPype/pull/3465)
@@ -25,6 +28,11 @@
 
 **🐛 Bug fixes**
 
+- TrayPublisher: Keep use instance label in list view [\#3493](https://github.com/pypeclub/OpenPype/pull/3493)
+- General: Extract review use first frame of input sequence [\#3491](https://github.com/pypeclub/OpenPype/pull/3491)
+- General: Fix Plist loading for application launch [\#3485](https://github.com/pypeclub/OpenPype/pull/3485)
+- Nuke: Workfile tools open on start [\#3479](https://github.com/pypeclub/OpenPype/pull/3479)
+- New Publisher: Disabled context change allows creation [\#3478](https://github.com/pypeclub/OpenPype/pull/3478)
 - General: thumbnail extractor fix [\#3474](https://github.com/pypeclub/OpenPype/pull/3474)
 - Kitsu: bugfix with sync-service ans publish plugins [\#3473](https://github.com/pypeclub/OpenPype/pull/3473)
 - Flame: solved problem with multi-selected loading [\#3470](https://github.com/pypeclub/OpenPype/pull/3470)
@@ -46,7 +54,9 @@
 - General: Use query functions in global plugins [\#3459](https://github.com/pypeclub/OpenPype/pull/3459)
 - Clockify: Use query functions in clockify actions [\#3458](https://github.com/pypeclub/OpenPype/pull/3458)
 - General: Use query functions in rest api calls [\#3457](https://github.com/pypeclub/OpenPype/pull/3457)
+- General: Use query functions in openpype lib functions [\#3454](https://github.com/pypeclub/OpenPype/pull/3454)
 - General: Use query functions in load utils [\#3446](https://github.com/pypeclub/OpenPype/pull/3446)
+- General: Move publish plugin and publish render abstractions [\#3442](https://github.com/pypeclub/OpenPype/pull/3442)
 - General: Use Anatomy after move to pipeline [\#3436](https://github.com/pypeclub/OpenPype/pull/3436)
 - General: Anatomy moved to pipeline [\#3435](https://github.com/pypeclub/OpenPype/pull/3435)
 - Fusion: Use client query functions [\#3380](https://github.com/pypeclub/OpenPype/pull/3380)
@@ -66,8 +76,6 @@
 - Webserver: Added CORS middleware [\#3422](https://github.com/pypeclub/OpenPype/pull/3422)
 - Attribute Defs UI: Files widget show what is allowed to drop in [\#3411](https://github.com/pypeclub/OpenPype/pull/3411)
 - General: Add ability to change user value for templates [\#3366](https://github.com/pypeclub/OpenPype/pull/3366)
-- Hosts: More options for in-host callbacks [\#3357](https://github.com/pypeclub/OpenPype/pull/3357)
-- Multiverse: expose some settings to GUI [\#3350](https://github.com/pypeclub/OpenPype/pull/3350)
 
 **🐛 Bug fixes**
 
@@ -82,7 +90,6 @@
 - Maya: vray device aspect ratio fix [\#3381](https://github.com/pypeclub/OpenPype/pull/3381)
 - Flame: bunch of publishing issues [\#3377](https://github.com/pypeclub/OpenPype/pull/3377)
 - Harmony: added unc path to zifile command in Harmony [\#3372](https://github.com/pypeclub/OpenPype/pull/3372)
-- Standalone: settings improvements [\#3355](https://github.com/pypeclub/OpenPype/pull/3355)
 
 **🔀 Refactored code**
 
@@ -107,16 +114,9 @@
 
 [Full Changelog](https://github.com/pypeclub/OpenPype/compare/CI/3.11.1-nightly.1...3.11.1)
 
-**🆕 New features**
-
-- Flame: custom export temp folder [\#3346](https://github.com/pypeclub/OpenPype/pull/3346)
-- Nuke: removing third-party plugins   [\#3344](https://github.com/pypeclub/OpenPype/pull/3344)
-
 **🚀 Enhancements**
 
 - Pyblish Pype: Hiding/Close issues [\#3367](https://github.com/pypeclub/OpenPype/pull/3367)
-- Ftrack: Removed requirement of pypeclub role from default settings [\#3354](https://github.com/pypeclub/OpenPype/pull/3354)
-- Kitsu: Prevent crash on missing frames information [\#3352](https://github.com/pypeclub/OpenPype/pull/3352)
 
 **🐛 Bug fixes**
 
@@ -125,19 +125,11 @@
 - Nuke: Fix missing variable in extract thumbnail [\#3363](https://github.com/pypeclub/OpenPype/pull/3363)
 - Nuke: Fix precollect writes [\#3361](https://github.com/pypeclub/OpenPype/pull/3361)
 - AE- fix validate\_scene\_settings and renderLocal [\#3358](https://github.com/pypeclub/OpenPype/pull/3358)
-- deadline: fixing misidentification of revieables [\#3356](https://github.com/pypeclub/OpenPype/pull/3356)
-- General: Create only one thumbnail per instance [\#3351](https://github.com/pypeclub/OpenPype/pull/3351)
-- nuke: adding extract thumbnail settings 3.10 [\#3347](https://github.com/pypeclub/OpenPype/pull/3347)
-- General: Fix last version function [\#3345](https://github.com/pypeclub/OpenPype/pull/3345)
 
 ## [3.11.0](https://github.com/pypeclub/OpenPype/tree/3.11.0) (2022-06-17)
 
 [Full Changelog](https://github.com/pypeclub/OpenPype/compare/CI/3.11.0-nightly.4...3.11.0)
 
-**🐛 Bug fixes**
-
-- General: Handle empty source key on instance [\#3342](https://github.com/pypeclub/OpenPype/pull/3342)
-
 ## [3.10.0](https://github.com/pypeclub/OpenPype/tree/3.10.0) (2022-05-26)
 
 [Full Changelog](https://github.com/pypeclub/OpenPype/compare/CI/3.10.0-nightly.6...3.10.0)
diff --git a/openpype/version.py b/openpype/version.py
index 3239b0e2a2..08bb4706cc 100644
--- a/openpype/version.py
+++ b/openpype/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring Pype version."""
-__version__ = "3.12.1-nightly.4"
+__version__ = "3.12.1-nightly.5"
diff --git a/pyproject.toml b/pyproject.toml
index f5bd7cc946..1251299612 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "OpenPype"
-version = "3.12.1-nightly.4" # OpenPype
+version = "3.12.1-nightly.5" # OpenPype
 description = "Open VFX and Animation pipeline with support."
 authors = ["OpenPype Team <info@openpype.io>"]
 license = "MIT License"

From 8bbf693a92a247894a10ef531ac433b3740ac154 Mon Sep 17 00:00:00 2001
From: Milan Kolar <milan@pype.club>
Date: Wed, 13 Jul 2022 09:03:41 +0200
Subject: [PATCH 169/289] add unpack and pack tools

---
 tools/pack_project.ps1 | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 tools/pack_project.ps1

diff --git a/tools/pack_project.ps1 b/tools/pack_project.ps1
new file mode 100644
index 0000000000..36ec3cb96b
--- /dev/null
+++ b/tools/pack_project.ps1
@@ -0,0 +1,39 @@
+<#
+.SYNOPSIS
+  Helper script OpenPype Packing project.
+
+.DESCRIPTION
+  Once you are happy with the project and want to preserve it for future work, just change the project name on line 38 and copy the file into .\OpenPype\tools. Then use the cmd form .EXAMPLE
+
+.EXAMPLE
+
+PS> .\tools\run_pack_project.ps1
+
+#>
+$current_dir = Get-Location
+$script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
+$openpype_root = (Get-Item $script_dir).parent.FullName
+
+$env:_INSIDE_OPENPYPE_TOOL = "1"
+
+# make sure Poetry is in PATH
+if (-not (Test-Path 'env:POETRY_HOME')) {
+    $env:POETRY_HOME = "$openpype_root\.poetry"
+}
+$env:PATH = "$($env:PATH);$($env:POETRY_HOME)\bin"
+
+Set-Location -Path $openpype_root
+
+Write-Host ">>> " -NoNewline -ForegroundColor Green
+Write-Host "Reading Poetry ... " -NoNewline
+if (-not (Test-Path -PathType Container -Path "$($env:POETRY_HOME)\bin")) {
+    Write-Host "NOT FOUND" -ForegroundColor Yellow
+    Write-Host "*** " -NoNewline -ForegroundColor Yellow
+    Write-Host "We need to install Poetry create virtual env first ..."
+    & "$openpype_root\tools\create_env.ps1"
+} else {
+    Write-Host "OK" -ForegroundColor Green
+}
+
+& "$($env:POETRY_HOME)\bin\poetry" run python "$($openpype_root)\start.py" pack-project --project "OP02_VFX_demo"
+Set-Location -Path $current_dir
\ No newline at end of file

From 9a3a01c9ed6afeec9015b3dd06c5ef2e2438cc60 Mon Sep 17 00:00:00 2001
From: Milan Kolar <milan@pype.club>
Date: Wed, 13 Jul 2022 09:03:50 +0200
Subject: [PATCH 170/289] add unpack tool

---
 tools/unpack_project.ps1.lnk | Bin 0 -> 1426 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 tools/unpack_project.ps1.lnk

diff --git a/tools/unpack_project.ps1.lnk b/tools/unpack_project.ps1.lnk
new file mode 100644
index 0000000000000000000000000000000000000000..56eee50ca235b0ea76eca52ed0040137a07f9786
GIT binary patch
literal 1426
zcma)6Nla5w6ulruP?QphqQQWe7!+DM$QVq(Dv(G@^%ueVBh=p-3T^+VzX+HpPPi}<
z7aBAqCImFPkOeN(2ohYVi6aX&xO0fcpsBdf6%x;T9cXYNuerk;{<-&^d;4mLC@w7?
znrMP+svM<6%7TA?w)yjnZYplvb~woFi%o7mzn%~}7#A{8?TAmKOzZpF$*k#8w`OoE
zk#hC=tLrG=Tq;Hn%{!fB;1gB&J(5aws>`pElaeTbevCibt8J2OIf4!+%G}GLS42N7
z<zB|mKU7C5xyTPqR1V#YnFl`;8A%5$=I4<XGXoVvOgNWD)^ObYwznrW<aK)-J}L{x
zWw}J+Zv4h*S;nKytHEPI@{$|K4)Sq4OBk<D2s$(*$xathX&BGBXL4Aw74v(fbTHnQ
z&O>qUUdjQINJh5!4B6SkXoqYGs)lM6m(SXzU~5Mh(IWUNBwId5JhPHPj4i0c>6^(^
zOA7FOxN8^ph|;6?mTVJt4FzP`qeky-5duJ+urt0t*ps0d=dq)*dyWFgQ^w61-)Z38
zNURmucUe?tu~wLOA2;Z%0?N8CoGsgn;0jeNQDZD9d{e_5wIfpnd`i?xjqv=4(t`XY
zMATufa!xXEx)s7KLt=ItgpC$RI%ElCef3bG2DaYqbIKhmq5F7qiM-SzE07rBRpc~?
z?LNgJwKgh#xy2;~bc%{AY(Z!piP7SS|Bx!i5F#$>64_)%Yltz8E5<a_Vq;ZMHdS#P
z0WI$UT`sgw7Q~OnJc5~u7&0$BBR13mjl9LYSYJpnJ6((R(1YeiWLO2w+A(z2h?40c
z1}X#}M-f3md`2)@c_0V&7lai9f6;*pJ)VQvtD36%=cY|-@3g6GuL**}3^c&9!Rw&)
zIFx{_u=)7w)ZP>Ik8ApZ@ehW+<h=TNcI#d0|DJm4+4Fa|9vVLVZ~rMUl7Qa>YY?o$
z$8!ypV>QL*(b?4(H(&9-bYq=AS($M1AOhY51Ee7QHn3R%#E4g-kYBZg?-fxItRC-1
z5rmPTMaQw1q!_ajoYiwAJ#6SLBdms!7+K@pIozvM->5FvUEAJyegoE<Ayf^yy^G#l
Tev)XpG&3T%)ph5x^~m@O1(Yc!

literal 0
HcmV?d00001


From 60940c0af657af62713b22956837af3e958d0816 Mon Sep 17 00:00:00 2001
From: Milan Kolar <milan@pype.club>
Date: Wed, 13 Jul 2022 09:19:34 +0200
Subject: [PATCH 171/289] fix forgotten variables

---
 openpype/lib/project_backpack.py |   2 +-
 tools/pack_project.ps1           |   2 +-
 tools/unpack_project.ps1         |  39 +++++++++++++++++++++++++++++++
 tools/unpack_project.ps1.lnk     | Bin 1426 -> 0 bytes
 4 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 tools/unpack_project.ps1
 delete mode 100644 tools/unpack_project.ps1.lnk

diff --git a/openpype/lib/project_backpack.py b/openpype/lib/project_backpack.py
index f0188e6765..ff2f1d4b88 100644
--- a/openpype/lib/project_backpack.py
+++ b/openpype/lib/project_backpack.py
@@ -53,7 +53,7 @@ def pack_project(project_name, destination_dir=None):
 
     Args:
         project_name(str): Project that should be packaged.
-        destination_dir(str): Optinal path where zip will be stored. Project's
+        destination_dir(str): Optional path where zip will be stored. Project's
             root is used if not passed.
     """
     print("Creating package of project \"{}\"".format(project_name))
diff --git a/tools/pack_project.ps1 b/tools/pack_project.ps1
index 36ec3cb96b..856247f7ca 100644
--- a/tools/pack_project.ps1
+++ b/tools/pack_project.ps1
@@ -35,5 +35,5 @@ if (-not (Test-Path -PathType Container -Path "$($env:POETRY_HOME)\bin")) {
     Write-Host "OK" -ForegroundColor Green
 }
 
-& "$($env:POETRY_HOME)\bin\poetry" run python "$($openpype_root)\start.py" pack-project --project "OP02_VFX_demo"
+& "$($env:POETRY_HOME)\bin\poetry" run python "$($openpype_root)\start.py" pack-project --project $ARGS
 Set-Location -Path $current_dir
\ No newline at end of file
diff --git a/tools/unpack_project.ps1 b/tools/unpack_project.ps1
new file mode 100644
index 0000000000..e7b9e87a7f
--- /dev/null
+++ b/tools/unpack_project.ps1
@@ -0,0 +1,39 @@
+<#
+.SYNOPSIS
+  Helper script OpenPype Unpacking project.
+
+.DESCRIPTION
+  Make sure you had dropped the project from your db and removed the poject data in case you were having them previously. Then on line 38 change the <Path to zip> to any path where the zip with project is - usually we are having it here https://drive.google.com/drive/u/0/folders/0AKE4mxImOsAGUk9PVA . Copy the file into .\OpenPype\tools. Then use the cmd form .EXAMPLE
+
+.EXAMPLE
+
+PS> .\tools\run_unpack_project.ps1
+
+#>
+$current_dir = Get-Location
+$script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
+$openpype_root = (Get-Item $script_dir).parent.FullName
+
+$env:_INSIDE_OPENPYPE_TOOL = "1"
+
+# make sure Poetry is in PATH
+if (-not (Test-Path 'env:POETRY_HOME')) {
+    $env:POETRY_HOME = "$openpype_root\.poetry"
+}
+$env:PATH = "$($env:PATH);$($env:POETRY_HOME)\bin"
+
+Set-Location -Path $openpype_root
+
+Write-Host ">>> " -NoNewline -ForegroundColor Green
+Write-Host "Reading Poetry ... " -NoNewline
+if (-not (Test-Path -PathType Container -Path "$($env:POETRY_HOME)\bin")) {
+    Write-Host "NOT FOUND" -ForegroundColor Yellow
+    Write-Host "*** " -NoNewline -ForegroundColor Yellow
+    Write-Host "We need to install Poetry create virtual env first ..."
+    & "$openpype_root\tools\create_env.ps1"
+} else {
+    Write-Host "OK" -ForegroundColor Green
+}
+
+& "$($env:POETRY_HOME)\bin\poetry" run python "$($openpype_root)\start.py" unpack-project --zipfile $ARGS
+Set-Location -Path $current_dir
\ No newline at end of file
diff --git a/tools/unpack_project.ps1.lnk b/tools/unpack_project.ps1.lnk
deleted file mode 100644
index 56eee50ca235b0ea76eca52ed0040137a07f9786..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1426
zcma)6Nla5w6ulruP?QphqQQWe7!+DM$QVq(Dv(G@^%ueVBh=p-3T^+VzX+HpPPi}<
z7aBAqCImFPkOeN(2ohYVi6aX&xO0fcpsBdf6%x;T9cXYNuerk;{<-&^d;4mLC@w7?
znrMP+svM<6%7TA?w)yjnZYplvb~woFi%o7mzn%~}7#A{8?TAmKOzZpF$*k#8w`OoE
zk#hC=tLrG=Tq;Hn%{!fB;1gB&J(5aws>`pElaeTbevCibt8J2OIf4!+%G}GLS42N7
z<zB|mKU7C5xyTPqR1V#YnFl`;8A%5$=I4<XGXoVvOgNWD)^ObYwznrW<aK)-J}L{x
zWw}J+Zv4h*S;nKytHEPI@{$|K4)Sq4OBk<D2s$(*$xathX&BGBXL4Aw74v(fbTHnQ
z&O>qUUdjQINJh5!4B6SkXoqYGs)lM6m(SXzU~5Mh(IWUNBwId5JhPHPj4i0c>6^(^
zOA7FOxN8^ph|;6?mTVJt4FzP`qeky-5duJ+urt0t*ps0d=dq)*dyWFgQ^w61-)Z38
zNURmucUe?tu~wLOA2;Z%0?N8CoGsgn;0jeNQDZD9d{e_5wIfpnd`i?xjqv=4(t`XY
zMATufa!xXEx)s7KLt=ItgpC$RI%ElCef3bG2DaYqbIKhmq5F7qiM-SzE07rBRpc~?
z?LNgJwKgh#xy2;~bc%{AY(Z!piP7SS|Bx!i5F#$>64_)%Yltz8E5<a_Vq;ZMHdS#P
z0WI$UT`sgw7Q~OnJc5~u7&0$BBR13mjl9LYSYJpnJ6((R(1YeiWLO2w+A(z2h?40c
z1}X#}M-f3md`2)@c_0V&7lai9f6;*pJ)VQvtD36%=cY|-@3g6GuL**}3^c&9!Rw&)
zIFx{_u=)7w)ZP>Ik8ApZ@ehW+<h=TNcI#d0|DJm4+4Fa|9vVLVZ~rMUl7Qa>YY?o$
z$8!ypV>QL*(b?4(H(&9-bYq=AS($M1AOhY51Ee7QHn3R%#E4g-kYBZg?-fxItRC-1
z5rmPTMaQw1q!_ajoYiwAJ#6SLBdms!7+K@pIozvM->5FvUEAJyegoE<Ayf^yy^G#l
Tev)XpG&3T%)ph5x^~m@O1(Yc!


From cda2c37b9548f90e63f34f04e2873169e167c3f9 Mon Sep 17 00:00:00 2001
From: OpenPype <info@openpype.io>
Date: Wed, 13 Jul 2022 07:26:22 +0000
Subject: [PATCH 172/289] [Automated] Bump version

---
 CHANGELOG.md        | 15 +++++----------
 openpype/version.py |  2 +-
 pyproject.toml      |  2 +-
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55ee51b38a..59c51396e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,9 @@
 # Changelog
 
-## [3.12.1-nightly.5](https://github.com/pypeclub/OpenPype/tree/HEAD)
+## [3.12.1-nightly.6](https://github.com/pypeclub/OpenPype/tree/HEAD)
 
 [Full Changelog](https://github.com/pypeclub/OpenPype/compare/3.12.0...HEAD)
 
-### 📖 Documentation
-
-- Docs: Added minimal permissions for MongoDB [\#3441](https://github.com/pypeclub/OpenPype/pull/3441)
-
 **🆕 New features**
 
 - Maya: Add VDB to Arnold loader [\#3433](https://github.com/pypeclub/OpenPype/pull/3433)
@@ -24,7 +20,7 @@
 - Blender: Bugfix - Set fps properly on open [\#3426](https://github.com/pypeclub/OpenPype/pull/3426)
 - Hiero: Add custom scripts menu [\#3425](https://github.com/pypeclub/OpenPype/pull/3425)
 - Blender: pre pyside install for all platforms [\#3400](https://github.com/pypeclub/OpenPype/pull/3400)
-- Maya: Ability to set resolution for playblasts from asset, and override through review instance. [\#3360](https://github.com/pypeclub/OpenPype/pull/3360)
+- Maya: Add additional playblast options to review Extractor. [\#3384](https://github.com/pypeclub/OpenPype/pull/3384)
 
 **🐛 Bug fixes**
 
@@ -40,7 +36,6 @@
 - Resolve: removed few bugs [\#3464](https://github.com/pypeclub/OpenPype/pull/3464)
 - General: Delete old versions is safer when ftrack is disabled [\#3462](https://github.com/pypeclub/OpenPype/pull/3462)
 - Nuke: fixing metadata slate TC difference [\#3455](https://github.com/pypeclub/OpenPype/pull/3455)
-- Nuke: prerender reviewable fails [\#3450](https://github.com/pypeclub/OpenPype/pull/3450)
 - Maya: fix hashing in Python 3 for tile rendering [\#3447](https://github.com/pypeclub/OpenPype/pull/3447)
 - LogViewer: Escape html characters in log message [\#3443](https://github.com/pypeclub/OpenPype/pull/3443)
 - Nuke: Slate frame is integrated [\#3427](https://github.com/pypeclub/OpenPype/pull/3427)
@@ -59,8 +54,8 @@
 - General: Move publish plugin and publish render abstractions [\#3442](https://github.com/pypeclub/OpenPype/pull/3442)
 - General: Use Anatomy after move to pipeline [\#3436](https://github.com/pypeclub/OpenPype/pull/3436)
 - General: Anatomy moved to pipeline [\#3435](https://github.com/pypeclub/OpenPype/pull/3435)
-- Fusion: Use client query functions [\#3380](https://github.com/pypeclub/OpenPype/pull/3380)
 - Resolve: Use client query functions [\#3379](https://github.com/pypeclub/OpenPype/pull/3379)
+- Photoshop: Use client query functions [\#3375](https://github.com/pypeclub/OpenPype/pull/3375)
 
 ## [3.12.0](https://github.com/pypeclub/OpenPype/tree/3.12.0) (2022-06-28)
 
@@ -68,6 +63,7 @@
 
 ### 📖 Documentation
 
+- Docs: Added minimal permissions for MongoDB [\#3441](https://github.com/pypeclub/OpenPype/pull/3441)
 - Fix typo in documentation: pyenv on mac [\#3417](https://github.com/pypeclub/OpenPype/pull/3417)
 - Linux: update OIIO package [\#3401](https://github.com/pypeclub/OpenPype/pull/3401)
 
@@ -100,9 +96,9 @@
 - Hiero: Use client query functions [\#3393](https://github.com/pypeclub/OpenPype/pull/3393)
 - Nuke: Use client query functions [\#3391](https://github.com/pypeclub/OpenPype/pull/3391)
 - Maya: Use client query functions [\#3385](https://github.com/pypeclub/OpenPype/pull/3385)
+- Fusion: Use client query functions [\#3380](https://github.com/pypeclub/OpenPype/pull/3380)
 - Harmony: Use client query functions [\#3378](https://github.com/pypeclub/OpenPype/pull/3378)
 - Celaction: Use client query functions [\#3376](https://github.com/pypeclub/OpenPype/pull/3376)
-- Photoshop: Use client query functions [\#3375](https://github.com/pypeclub/OpenPype/pull/3375)
 - AfterEffects: Use client query functions [\#3374](https://github.com/pypeclub/OpenPype/pull/3374)
 
 **Merged pull requests:**
@@ -124,7 +120,6 @@
 - Harmony: audio validator has wrong logic [\#3364](https://github.com/pypeclub/OpenPype/pull/3364)
 - Nuke: Fix missing variable in extract thumbnail [\#3363](https://github.com/pypeclub/OpenPype/pull/3363)
 - Nuke: Fix precollect writes [\#3361](https://github.com/pypeclub/OpenPype/pull/3361)
-- AE- fix validate\_scene\_settings and renderLocal [\#3358](https://github.com/pypeclub/OpenPype/pull/3358)
 
 ## [3.11.0](https://github.com/pypeclub/OpenPype/tree/3.11.0) (2022-06-17)
 
diff --git a/openpype/version.py b/openpype/version.py
index 08bb4706cc..26c7e4fa34 100644
--- a/openpype/version.py
+++ b/openpype/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring Pype version."""
-__version__ = "3.12.1-nightly.5"
+__version__ = "3.12.1-nightly.6"
diff --git a/pyproject.toml b/pyproject.toml
index 1251299612..ed7799a7ba 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "OpenPype"
-version = "3.12.1-nightly.5" # OpenPype
+version = "3.12.1-nightly.6" # OpenPype
 description = "Open VFX and Animation pipeline with support."
 authors = ["OpenPype Team <info@openpype.io>"]
 license = "MIT License"

From f9b23a27d20b07b549fcf43277bfc796d73e6da8 Mon Sep 17 00:00:00 2001
From: OpenPype <info@openpype.io>
Date: Wed, 13 Jul 2022 07:43:12 +0000
Subject: [PATCH 173/289] [Automated] Release

---
 CHANGELOG.md        | 16 ++++++++++------
 openpype/version.py |  2 +-
 pyproject.toml      |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 59c51396e3..cc5bf39a29 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Changelog
 
-## [3.12.1-nightly.6](https://github.com/pypeclub/OpenPype/tree/HEAD)
+## [3.12.1](https://github.com/pypeclub/OpenPype/tree/3.12.1) (2022-07-13)
 
-[Full Changelog](https://github.com/pypeclub/OpenPype/compare/3.12.0...HEAD)
+[Full Changelog](https://github.com/pypeclub/OpenPype/compare/3.12.0...3.12.1)
+
+### 📖 Documentation
+
+- Docs: Added minimal permissions for MongoDB [\#3441](https://github.com/pypeclub/OpenPype/pull/3441)
 
 **🆕 New features**
 
@@ -36,11 +40,13 @@
 - Resolve: removed few bugs [\#3464](https://github.com/pypeclub/OpenPype/pull/3464)
 - General: Delete old versions is safer when ftrack is disabled [\#3462](https://github.com/pypeclub/OpenPype/pull/3462)
 - Nuke: fixing metadata slate TC difference [\#3455](https://github.com/pypeclub/OpenPype/pull/3455)
+- Nuke: prerender reviewable fails [\#3450](https://github.com/pypeclub/OpenPype/pull/3450)
 - Maya: fix hashing in Python 3 for tile rendering [\#3447](https://github.com/pypeclub/OpenPype/pull/3447)
 - LogViewer: Escape html characters in log message [\#3443](https://github.com/pypeclub/OpenPype/pull/3443)
 - Nuke: Slate frame is integrated [\#3427](https://github.com/pypeclub/OpenPype/pull/3427)
 - Maya: Camera extra data - additional fix for \#3304 [\#3386](https://github.com/pypeclub/OpenPype/pull/3386)
 - Maya: Handle excluding `model` family from frame range validator. [\#3370](https://github.com/pypeclub/OpenPype/pull/3370)
+- Harmony: audio validator has wrong logic [\#3364](https://github.com/pypeclub/OpenPype/pull/3364)
 
 **🔀 Refactored code**
 
@@ -54,8 +60,8 @@
 - General: Move publish plugin and publish render abstractions [\#3442](https://github.com/pypeclub/OpenPype/pull/3442)
 - General: Use Anatomy after move to pipeline [\#3436](https://github.com/pypeclub/OpenPype/pull/3436)
 - General: Anatomy moved to pipeline [\#3435](https://github.com/pypeclub/OpenPype/pull/3435)
+- Fusion: Use client query functions [\#3380](https://github.com/pypeclub/OpenPype/pull/3380)
 - Resolve: Use client query functions [\#3379](https://github.com/pypeclub/OpenPype/pull/3379)
-- Photoshop: Use client query functions [\#3375](https://github.com/pypeclub/OpenPype/pull/3375)
 
 ## [3.12.0](https://github.com/pypeclub/OpenPype/tree/3.12.0) (2022-06-28)
 
@@ -63,7 +69,6 @@
 
 ### 📖 Documentation
 
-- Docs: Added minimal permissions for MongoDB [\#3441](https://github.com/pypeclub/OpenPype/pull/3441)
 - Fix typo in documentation: pyenv on mac [\#3417](https://github.com/pypeclub/OpenPype/pull/3417)
 - Linux: update OIIO package [\#3401](https://github.com/pypeclub/OpenPype/pull/3401)
 
@@ -96,9 +101,9 @@
 - Hiero: Use client query functions [\#3393](https://github.com/pypeclub/OpenPype/pull/3393)
 - Nuke: Use client query functions [\#3391](https://github.com/pypeclub/OpenPype/pull/3391)
 - Maya: Use client query functions [\#3385](https://github.com/pypeclub/OpenPype/pull/3385)
-- Fusion: Use client query functions [\#3380](https://github.com/pypeclub/OpenPype/pull/3380)
 - Harmony: Use client query functions [\#3378](https://github.com/pypeclub/OpenPype/pull/3378)
 - Celaction: Use client query functions [\#3376](https://github.com/pypeclub/OpenPype/pull/3376)
+- Photoshop: Use client query functions [\#3375](https://github.com/pypeclub/OpenPype/pull/3375)
 - AfterEffects: Use client query functions [\#3374](https://github.com/pypeclub/OpenPype/pull/3374)
 
 **Merged pull requests:**
@@ -117,7 +122,6 @@
 **🐛 Bug fixes**
 
 - Nuke: bake streams with slate on farm [\#3368](https://github.com/pypeclub/OpenPype/pull/3368)
-- Harmony: audio validator has wrong logic [\#3364](https://github.com/pypeclub/OpenPype/pull/3364)
 - Nuke: Fix missing variable in extract thumbnail [\#3363](https://github.com/pypeclub/OpenPype/pull/3363)
 - Nuke: Fix precollect writes [\#3361](https://github.com/pypeclub/OpenPype/pull/3361)
 
diff --git a/openpype/version.py b/openpype/version.py
index 26c7e4fa34..c7b0de0381 100644
--- a/openpype/version.py
+++ b/openpype/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring Pype version."""
-__version__ = "3.12.1-nightly.6"
+__version__ = "3.12.1"
diff --git a/pyproject.toml b/pyproject.toml
index ed7799a7ba..4bdaaab4ed 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "OpenPype"
-version = "3.12.1-nightly.6" # OpenPype
+version = "3.12.1" # OpenPype
 description = "Open VFX and Animation pipeline with support."
 authors = ["OpenPype Team <info@openpype.io>"]
 license = "MIT License"

From c9e714a7afc37f98c9cb4792fa42b53b1b2272c3 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 13 Jul 2022 12:00:21 +0200
Subject: [PATCH 174/289] implemented tray publisher host using HostBase

---
 openpype/hosts/traypublisher/api/__init__.py | 16 +-----
 openpype/hosts/traypublisher/api/pipeline.py | 60 ++++++++++----------
 openpype/tools/traypublisher/window.py       | 13 +++--
 3 files changed, 41 insertions(+), 48 deletions(-)

diff --git a/openpype/hosts/traypublisher/api/__init__.py b/openpype/hosts/traypublisher/api/__init__.py
index c461c0c526..4e7284b09a 100644
--- a/openpype/hosts/traypublisher/api/__init__.py
+++ b/openpype/hosts/traypublisher/api/__init__.py
@@ -1,20 +1,8 @@
 from .pipeline import (
-    install,
-    ls,
-
-    set_project_name,
-    get_context_title,
-    get_context_data,
-    update_context_data,
+    TrayPublisherHost,
 )
 
 
 __all__ = (
-    "install",
-    "ls",
-
-    "set_project_name",
-    "get_context_title",
-    "get_context_data",
-    "update_context_data",
+    "TrayPublisherHost",
 )
diff --git a/openpype/hosts/traypublisher/api/pipeline.py b/openpype/hosts/traypublisher/api/pipeline.py
index 954a0bae47..2d9db7801e 100644
--- a/openpype/hosts/traypublisher/api/pipeline.py
+++ b/openpype/hosts/traypublisher/api/pipeline.py
@@ -9,6 +9,8 @@ from openpype.pipeline import (
     register_creator_plugin_path,
     legacy_io,
 )
+from openpype.host import HostBase, INewPublisher
+
 
 ROOT_DIR = os.path.dirname(os.path.dirname(
     os.path.abspath(__file__)
@@ -17,6 +19,35 @@ PUBLISH_PATH = os.path.join(ROOT_DIR, "plugins", "publish")
 CREATE_PATH = os.path.join(ROOT_DIR, "plugins", "create")
 
 
+class TrayPublisherHost(HostBase, INewPublisher):
+    name = "traypublisher"
+
+    def install(self):
+        os.environ["AVALON_APP"] = self.name
+        legacy_io.Session["AVALON_APP"] = self.name
+
+        pyblish.api.register_host("traypublisher")
+        pyblish.api.register_plugin_path(PUBLISH_PATH)
+        register_creator_plugin_path(CREATE_PATH)
+
+    def get_context_title(self):
+        return HostContext.get_project_name()
+
+    def get_context_data(self):
+        return HostContext.get_context_data()
+
+    def update_context_data(self, data, changes):
+        HostContext.save_context_data(data, changes)
+
+    def set_project_name(self, project_name):
+        # TODO Deregister project specific plugins and register new project
+        #   plugins
+        os.environ["AVALON_PROJECT"] = project_name
+        legacy_io.Session["AVALON_PROJECT"] = project_name
+        legacy_io.install()
+        HostContext.set_project_name(project_name)
+
+
 class HostContext:
     _context_json_path = None
 
@@ -150,32 +181,3 @@ def get_context_data():
 
 def update_context_data(data, changes):
     HostContext.save_context_data(data)
-
-
-def get_context_title():
-    return HostContext.get_project_name()
-
-
-def ls():
-    """Probably will never return loaded containers."""
-    return []
-
-
-def install():
-    """This is called before a project is known.
-
-    Project is defined with 'set_project_name'.
-    """
-    os.environ["AVALON_APP"] = "traypublisher"
-
-    pyblish.api.register_host("traypublisher")
-    pyblish.api.register_plugin_path(PUBLISH_PATH)
-    register_creator_plugin_path(CREATE_PATH)
-
-
-def set_project_name(project_name):
-    # TODO Deregister project specific plugins and register new project plugins
-    os.environ["AVALON_PROJECT"] = project_name
-    legacy_io.Session["AVALON_PROJECT"] = project_name
-    legacy_io.install()
-    HostContext.set_project_name(project_name)
diff --git a/openpype/tools/traypublisher/window.py b/openpype/tools/traypublisher/window.py
index 5934c4aa8a..cc33287091 100644
--- a/openpype/tools/traypublisher/window.py
+++ b/openpype/tools/traypublisher/window.py
@@ -12,9 +12,7 @@ from openpype.pipeline import (
     install_host,
     AvalonMongoDB,
 )
-from openpype.hosts.traypublisher import (
-    api as traypublisher
-)
+from openpype.hosts.traypublisher.api import TrayPublisherHost
 from openpype.tools.publisher import PublisherWindow
 from openpype.tools.utils.constants import PROJECT_NAME_ROLE
 from openpype.tools.utils.models import (
@@ -111,9 +109,13 @@ class StandaloneOverlayWidget(QtWidgets.QFrame):
         if project_name:
             self._set_project(project_name)
 
+    @property
+    def host(self):
+        return self._publisher_window.controller.host
+
     def _set_project(self, project_name):
         self._project_name = project_name
-        traypublisher.set_project_name(project_name)
+        self.host.set_project_name(project_name)
         self.setVisible(False)
         self.project_selected.emit(project_name)
 
@@ -190,7 +192,8 @@ class TrayPublishWindow(PublisherWindow):
 
 
 def main():
-    install_host(traypublisher)
+    host = TrayPublisherHost()
+    install_host(host)
     app = QtWidgets.QApplication([])
     window = TrayPublishWindow()
     window.show()

From 74cd74f053023324a9a6c46e67cfd5023147cda6 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 13 Jul 2022 12:00:29 +0200
Subject: [PATCH 175/289] creatos have access to host

---
 openpype/pipeline/create/creator_plugins.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/openpype/pipeline/create/creator_plugins.py b/openpype/pipeline/create/creator_plugins.py
index 91b9d80234..52c76db5ef 100644
--- a/openpype/pipeline/create/creator_plugins.py
+++ b/openpype/pipeline/create/creator_plugins.py
@@ -102,6 +102,10 @@ class BaseCreator:
 
         return self.create_context.project_name
 
+    @property
+    def host(self):
+        return self.create_context.host
+
     def get_group_label(self):
         """Group label under which are instances grouped in UI.
 

From 2fbe33750df3c25b1089208bf093326720fec21e Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 13 Jul 2022 12:01:55 +0200
Subject: [PATCH 176/289] implemented helper method to store new instance

---
 openpype/hosts/traypublisher/api/plugin.py | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/openpype/hosts/traypublisher/api/plugin.py b/openpype/hosts/traypublisher/api/plugin.py
index 202664cfc6..cc93d7c157 100644
--- a/openpype/hosts/traypublisher/api/plugin.py
+++ b/openpype/hosts/traypublisher/api/plugin.py
@@ -37,6 +37,21 @@ class TrayPublishCreator(Creator):
         # Use same attributes as for instance attrobites
         return self.get_instance_attr_defs()
 
+    def _store_new_instance(self, new_instance):
+        """Tray publisher specific method to store instance.
+
+        Instance is stored into "workfile" of traypublisher and also add it
+        to CreateContext.
+
+        Args:
+            new_instance (CreatedInstance): Instance that should be stored.
+        """
+
+        # Host implementation of storing metadata about instance
+        HostContext.add_instance(new_instance.data_to_store())
+        # Add instance to current context
+        self._add_instance_to_context(new_instance)
+
 
 class SettingsCreator(TrayPublishCreator):
     create_allow_context_change = True
@@ -58,10 +73,8 @@ class SettingsCreator(TrayPublishCreator):
         data["settings_creator"] = True
         # Create new instance
         new_instance = CreatedInstance(self.family, subset_name, data, self)
-        # Host implementation of storing metadata about instance
-        HostContext.add_instance(new_instance.data_to_store())
-        # Add instance to current context
-        self._add_instance_to_context(new_instance)
+
+        self._store_new_instance(new_instance)
 
     def get_instance_attr_defs(self):
         return [

From 9d6eb0d5c2efdbfbee8b40aac3e19cef87f9973e Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 13 Jul 2022 12:30:09 +0200
Subject: [PATCH 177/289] added extract to file action to project list context
 actions

---
 openpype/tools/settings/settings/categories.py | 3 +++
 openpype/tools/settings/settings/widgets.py    | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/openpype/tools/settings/settings/categories.py b/openpype/tools/settings/settings/categories.py
index 764f42f1a3..f42027d9e2 100644
--- a/openpype/tools/settings/settings/categories.py
+++ b/openpype/tools/settings/settings/categories.py
@@ -854,6 +854,9 @@ class ProjectWidget(SettingsCategoryWidget):
         project_list_widget.version_change_requested.connect(
             self._on_source_version_change
         )
+        project_list_widget.extract_to_file_requested.connect(
+            self._on_extract_to_file
+        )
 
         self.project_list_widget = project_list_widget
 
diff --git a/openpype/tools/settings/settings/widgets.py b/openpype/tools/settings/settings/widgets.py
index 45c21d5685..1d94094897 100644
--- a/openpype/tools/settings/settings/widgets.py
+++ b/openpype/tools/settings/settings/widgets.py
@@ -1008,6 +1008,7 @@ class ProjectSortFilterProxy(QtCore.QSortFilterProxyModel):
 class ProjectListWidget(QtWidgets.QWidget):
     project_changed = QtCore.Signal()
     version_change_requested = QtCore.Signal(str)
+    extract_to_file_requested = QtCore.Signal()
 
     def __init__(self, parent, only_active=False):
         self._parent = parent
@@ -1099,6 +1100,10 @@ class ProjectListWidget(QtWidgets.QWidget):
                 self.version_change_requested
             )
             submenu.addAction(action)
+
+        extract_action = QtWidgets.QAction("Extract to file", menu)
+        extract_action.triggered.connect(self.extract_to_file_requested)
+
         menu.addMenu(submenu)
         menu.exec_(QtGui.QCursor.pos())
 

From 4e137c1f4bd88ad35b4df733a72f26d590c80284 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 13 Jul 2022 12:33:31 +0200
Subject: [PATCH 178/289] add action to menu

---
 openpype/tools/settings/settings/widgets.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openpype/tools/settings/settings/widgets.py b/openpype/tools/settings/settings/widgets.py
index 1d94094897..88d923c16a 100644
--- a/openpype/tools/settings/settings/widgets.py
+++ b/openpype/tools/settings/settings/widgets.py
@@ -1105,6 +1105,7 @@ class ProjectListWidget(QtWidgets.QWidget):
         extract_action.triggered.connect(self.extract_to_file_requested)
 
         menu.addMenu(submenu)
+        menu.addAction(extract_action)
         menu.exec_(QtGui.QCursor.pos())
 
     def on_item_clicked(self, new_index):

From f6129b5f5b84d03816e17cfd6489df4d4d300116 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 13 Jul 2022 12:41:15 +0200
Subject: [PATCH 179/289] trigger 'openpype.project.structure.created' topic on
 finish of create project structure action

---
 .../event_handlers_user/action_create_project_structure.py   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/openpype/modules/ftrack/event_handlers_user/action_create_project_structure.py b/openpype/modules/ftrack/event_handlers_user/action_create_project_structure.py
index ebea8872f9..df914de854 100644
--- a/openpype/modules/ftrack/event_handlers_user/action_create_project_structure.py
+++ b/openpype/modules/ftrack/event_handlers_user/action_create_project_structure.py
@@ -84,6 +84,11 @@ class CreateProjectFolders(BaseAction):
             create_project_folders(basic_paths, project_name)
             self.create_ftrack_entities(basic_paths, project_entity)
 
+            self.trigger_event(
+                "openpype.project.structure.created",
+                {"project_name": project_name}
+            )
+
         except Exception as exc:
             self.log.warning("Creating of structure crashed.", exc_info=True)
             session.rollback()

From 927674be1afa804225b1a407b02de0b5ff5146e9 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Wed, 13 Jul 2022 15:11:58 +0200
Subject: [PATCH 180/289] OP-3446 - store source file as a 'source'

This will be stored in DB in version.
Potentially it could be used to populate Ftrack Note.
---
 .../hosts/traypublisher/plugins/publish/collect_mov_batch.py    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/openpype/hosts/traypublisher/plugins/publish/collect_mov_batch.py b/openpype/hosts/traypublisher/plugins/publish/collect_mov_batch.py
index 2a5e356684..c81d1f77a5 100644
--- a/openpype/hosts/traypublisher/plugins/publish/collect_mov_batch.py
+++ b/openpype/hosts/traypublisher/plugins/publish/collect_mov_batch.py
@@ -31,4 +31,6 @@ class CollectMovBatch(
 
         instance.data["representations"].append(repre)
 
+        instance.data["source"] = file_url
+
         self.log.debug("instance.data {}".format(instance.data))

From 450a20dcca1b74d01c23beebdd170b356a8ccb34 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Wed, 13 Jul 2022 15:28:01 +0200
Subject: [PATCH 181/289] OP-3481 - add source key to Note formatting

Allows to fill value from instance.data["source"] as a {source} in Ftrack Note.
---
 openpype/modules/ftrack/plugins/publish/integrate_ftrack_note.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openpype/modules/ftrack/plugins/publish/integrate_ftrack_note.py b/openpype/modules/ftrack/plugins/publish/integrate_ftrack_note.py
index 952b21546d..77a7ebdfcf 100644
--- a/openpype/modules/ftrack/plugins/publish/integrate_ftrack_note.py
+++ b/openpype/modules/ftrack/plugins/publish/integrate_ftrack_note.py
@@ -116,6 +116,7 @@ class IntegrateFtrackNote(pyblish.api.InstancePlugin):
                 "app_name": app_name,
                 "app_label": app_label,
                 "published_paths": "<br/>".join(sorted(published_paths)),
+                "source": instance.data.get("source", '')
             }
             comment = template.format(**format_data)
             if not comment:

From 5d0e68385e13f8f69397a8f78c4c179307ffe1fe Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Wed, 13 Jul 2022 15:28:15 +0200
Subject: [PATCH 182/289] OP-3481 - add source key to Note formatting

Allows to fill value from instance.data["source"] as a {source} in Ftrack Note.
---
 .../entities/schemas/projects_schema/schema_project_ftrack.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_ftrack.json b/openpype/settings/entities/schemas/projects_schema/schema_project_ftrack.json
index f8f9d5093d..c0069dcdab 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_ftrack.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_ftrack.json
@@ -822,7 +822,7 @@
                         },
                         {
                             "type": "label",
-                            "label": "Template may contain formatting keys <b>intent</b>, <b>comment</b>, <b>host_name</b>, <b>app_name</b>, <b>app_label</b> and <b>published_paths</b>."
+                            "label": "Template may contain formatting keys <b>intent</b>, <b>comment</b>, <b>host_name</b>, <b>app_name</b>, <b>app_label</b>, <b>published_paths</b> and <b>source</b>."
                         },
                         {
                             "type": "text",

From 0047ca458c3e6febe9b9826fd8938bea4c05339d Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Wed, 13 Jul 2022 15:30:10 +0200
Subject: [PATCH 183/289] OP-3481 - simple creators fill 'source' key

Source filepats used to fill source value used later in Ftrack note or version in DB.
---
 .../traypublisher/plugins/publish/collect_simple_instances.py   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py b/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
index b2be43c701..2fb6fcf3ce 100644
--- a/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
+++ b/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
@@ -45,6 +45,8 @@ class CollectSettingsSimpleInstances(pyblish.api.InstancePlugin):
             "files": filenames
         })
 
+        instance.data["source"] = filepaths
+
         self.log.debug("Created Simple Settings instance {}".format(
             instance.data
         ))

From dbcf9097d38d8d7a4b094e161291859905ef3a3d Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Wed, 13 Jul 2022 15:43:22 +0200
Subject: [PATCH 184/289] OP-3481 - fix source, must be string

---
 .../traypublisher/plugins/publish/collect_simple_instances.py   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py b/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
index 2fb6fcf3ce..1f473ff71c 100644
--- a/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
+++ b/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
@@ -45,7 +45,7 @@ class CollectSettingsSimpleInstances(pyblish.api.InstancePlugin):
             "files": filenames
         })
 
-        instance.data["source"] = filepaths
+        instance.data["source"] = "\n".join(filepaths)
 
         self.log.debug("Created Simple Settings instance {}".format(
             instance.data

From d294ad51748fa5ba02c6ca387f1c3af7ec1ba855 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 13 Jul 2022 16:10:01 +0200
Subject: [PATCH 185/289] add also default values of missing attribute
 definitions

---
 openpype/pipeline/create/context.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/openpype/pipeline/create/context.py b/openpype/pipeline/create/context.py
index aecdb04635..a7a8eba383 100644
--- a/openpype/pipeline/create/context.py
+++ b/openpype/pipeline/create/context.py
@@ -29,6 +29,7 @@ UpdateData = collections.namedtuple("UpdateData", ["instance", "changes"])
 
 class ImmutableKeyError(TypeError):
     """Accessed key is immutable so does not allow changes or removements."""
+
     def __init__(self, key, msg=None):
         self.immutable_key = key
         if not msg:
@@ -40,6 +41,7 @@ class ImmutableKeyError(TypeError):
 
 class HostMissRequiredMethod(Exception):
     """Host does not have implemented required functions for creation."""
+
     def __init__(self, host, missing_methods):
         self.missing_methods = missing_methods
         self.host = host
@@ -66,6 +68,7 @@ class InstanceMember:
     TODO:
     Implement and use!
     """
+
     def __init__(self, instance, name):
         self.instance = instance
 
@@ -94,6 +97,7 @@ class AttributeValues:
         values(dict): Values after possible conversion.
         origin_data(dict): Values loaded from host before conversion.
     """
+
     def __init__(self, attr_defs, values, origin_data=None):
         from openpype.lib.attribute_definitions import UnknownDef
 
@@ -174,6 +178,10 @@ class AttributeValues:
         output = {}
         for key in self._data:
             output[key] = self[key]
+
+        for key, attr_def in self._attr_defs_by_key.items():
+            if key not in output:
+                output[key] = attr_def.default
         return output
 
     @staticmethod
@@ -196,6 +204,7 @@ class CreatorAttributeValues(AttributeValues):
     Args:
         instance (CreatedInstance): Instance for which are values hold.
     """
+
     def __init__(self, instance, *args, **kwargs):
         self.instance = instance
         super(CreatorAttributeValues, self).__init__(*args, **kwargs)
@@ -211,6 +220,7 @@ class PublishAttributeValues(AttributeValues):
         publish_attributes(PublishAttributes): Wrapper for multiple publish
             attributes is used as parent object.
     """
+
     def __init__(self, publish_attributes, *args, **kwargs):
         self.publish_attributes = publish_attributes
         super(PublishAttributeValues, self).__init__(*args, **kwargs)
@@ -232,6 +242,7 @@ class PublishAttributes:
         attr_plugins(list): List of publish plugins that may have defined
             attribute definitions.
     """
+
     def __init__(self, parent, origin_data, attr_plugins=None):
         self.parent = parent
         self._origin_data = copy.deepcopy(origin_data)
@@ -270,6 +281,7 @@ class PublishAttributes:
             key(str): Plugin name.
             default: Default value if plugin was not found.
         """
+
         if key not in self._data:
             return default
 
@@ -287,11 +299,13 @@ class PublishAttributes:
 
     def plugin_names_order(self):
         """Plugin names order by their 'order' attribute."""
+
         for name in self._plugin_names_order:
             yield name
 
     def data_to_store(self):
         """Convert attribute values to "data to store"."""
+
         output = {}
         for key, attr_value in self._data.items():
             output[key] = attr_value.data_to_store()
@@ -299,6 +313,7 @@ class PublishAttributes:
 
     def changes(self):
         """Return changes per each key."""
+
         changes = {}
         for key, attr_val in self._data.items():
             attr_changes = attr_val.changes()
@@ -314,6 +329,7 @@ class PublishAttributes:
 
     def set_publish_plugins(self, attr_plugins):
         """Set publish plugins attribute definitions."""
+
         self._plugin_names_order = []
         self._missing_plugins = []
         self.attr_plugins = attr_plugins or []
@@ -365,6 +381,7 @@ class CreatedInstance:
             `openpype.pipeline.registered_host`.
         new(bool): Is instance new.
     """
+
     # Keys that can't be changed or removed from data after loading using
     #   creator.
     # - 'creator_attributes' and 'publish_attributes' can change values of
@@ -566,6 +583,7 @@ class CreatedInstance:
     @property
     def id(self):
         """Instance identifier."""
+
         return self._data["instance_id"]
 
     @property
@@ -574,10 +592,12 @@ class CreatedInstance:
 
         Access to data is needed to modify values.
         """
+
         return self
 
     def changes(self):
         """Calculate and return changes."""
+
         changes = {}
         new_keys = set()
         for key, new_value in self._data.items():

From ba6afb8be5107affa0179a1ac4f7c64241ba35a3 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 13 Jul 2022 16:10:22 +0200
Subject: [PATCH 186/289] added jpeg extension to default settings

---
 openpype/settings/defaults/project_settings/traypublisher.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/openpype/settings/defaults/project_settings/traypublisher.json b/openpype/settings/defaults/project_settings/traypublisher.json
index 5afaaee78c..d3e8028cdb 100644
--- a/openpype/settings/defaults/project_settings/traypublisher.json
+++ b/openpype/settings/defaults/project_settings/traypublisher.json
@@ -116,6 +116,7 @@
                 ".png",
                 ".dpx",
                 ".jpg",
+                ".jpeg",
                 ".tiff",
                 ".tif",
                 ".mov",
@@ -158,6 +159,7 @@
             "extensions": [
                 ".exr",
                 ".jpg",
+                ".jpeg",
                 ".dpx",
                 ".bmp",
                 ".tif",

From ac118ddefd8d2d0d576de43115d914e2e403f925 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 13 Jul 2022 16:10:42 +0200
Subject: [PATCH 187/289] fill "source" in simple instances

---
 .../plugins/publish/collect_simple_instances.py        | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py b/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
index b2be43c701..bbd0221c88 100644
--- a/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
+++ b/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
@@ -1,4 +1,6 @@
 import os
+
+import clique
 import pyblish.api
 
 
@@ -29,6 +31,14 @@ class CollectSettingsSimpleInstances(pyblish.api.InstancePlugin):
             for filename in filepath_item["filenames"]
         ]
 
+        cols, rems = clique.assemble(filepaths)
+        source = None
+        if cols:
+            source = cols[0].format("{head}{padding}{tail}")
+        elif rems:
+            source = rems[0]
+
+        instance.data["source"] = source
         instance.data["sourceFilepaths"] = filepaths
         instance.data["stagingDir"] = filepath_item["directory"]
 

From 5592b4fb83ad0f3f4b5e222ed0f8361d0ebee346 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 13 Jul 2022 16:10:59 +0200
Subject: [PATCH 188/289] fill representation in instance data update

---
 openpype/plugins/publish/collect_from_create_context.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/openpype/plugins/publish/collect_from_create_context.py b/openpype/plugins/publish/collect_from_create_context.py
index f6ead98809..d2be633cbe 100644
--- a/openpype/plugins/publish/collect_from_create_context.py
+++ b/openpype/plugins/publish/collect_from_create_context.py
@@ -47,12 +47,11 @@ class CollectFromCreateContext(pyblish.api.ContextPlugin):
             "label": subset,
             "name": subset,
             "family": in_data["family"],
-            "families": instance_families
+            "families": instance_families,
+            "representations": []
         })
         for key, value in in_data.items():
             if key not in instance.data:
                 instance.data[key] = value
         self.log.info("collected instance: {}".format(instance.data))
         self.log.info("parsing data: {}".format(in_data))
-
-        instance.data["representations"] = list()

From be4ac5b56b9c815a268696ff23f072d14b029192 Mon Sep 17 00:00:00 2001
From: Milan Kolar <milan@pype.club>
Date: Wed, 13 Jul 2022 17:25:51 +0200
Subject: [PATCH 189/289] add multiple items and review boolean to tray creator
 settings

---
 openpype/hosts/traypublisher/api/plugin.py    |  7 +++++-
 .../project_settings/traypublisher.json       | 24 ++++++++++++++++++-
 .../schema_project_traypublisher.json         | 10 ++++++++
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/openpype/hosts/traypublisher/api/plugin.py b/openpype/hosts/traypublisher/api/plugin.py
index 202664cfc6..a5d08c2967 100644
--- a/openpype/hosts/traypublisher/api/plugin.py
+++ b/openpype/hosts/traypublisher/api/plugin.py
@@ -1,3 +1,4 @@
+from openpype.lib.attribute_definitions import BoolDef
 from openpype.pipeline import (
     Creator,
     CreatedInstance
@@ -70,8 +71,10 @@ class SettingsCreator(TrayPublishCreator):
                 folders=False,
                 extensions=self.extensions,
                 allow_sequences=self.allow_sequences,
+                single_item=not self.allow_multiple_items,
                 label="Filepath",
-            )
+            ),
+            BoolDef("allow_review", label="Reviewable", default=True)
         ]
 
     @classmethod
@@ -92,6 +95,8 @@ class SettingsCreator(TrayPublishCreator):
                 "detailed_description": item_data["detailed_description"],
                 "extensions": item_data["extensions"],
                 "allow_sequences": item_data["allow_sequences"],
+                "allow_multiple_items": item_data["allow_multiple_items"],
+                "allow_review": item_data["allow_review"],
                 "default_variants": item_data["default_variants"]
             }
         )
diff --git a/openpype/settings/defaults/project_settings/traypublisher.json b/openpype/settings/defaults/project_settings/traypublisher.json
index d3e8028cdb..e59200a13b 100644
--- a/openpype/settings/defaults/project_settings/traypublisher.json
+++ b/openpype/settings/defaults/project_settings/traypublisher.json
@@ -10,7 +10,9 @@
             ],
             "description": "Backup of a working scene",
             "detailed_description": "Workfiles are full scenes from any application that are directly edited by artists. They represent a state of work on a task at a given point and are usually not directly referenced into other scenes.",
-            "allow_sequences": true,
+            "allow_sequences": false,
+            "allow_multiple_items": false,
+            "allow_review": false,
             "extensions": [
                 ".ma",
                 ".mb",
@@ -44,6 +46,8 @@
             "description": "Clean models",
             "detailed_description": "Models should only contain geometry data, without any extras like cameras, locators or bones.\n\nKeep in mind that models published from tray publisher are not validated for correctness. ",
             "allow_sequences": false,
+            "allow_multiple_items": true,
+            "allow_review": false,
             "extensions": [
                 ".ma",
                 ".mb",
@@ -68,6 +72,8 @@
             "description": "Geometry Caches",
             "detailed_description": "Alembic or bgeo cache of animated data",
             "allow_sequences": true,
+            "allow_multiple_items": true,
+            "allow_review": false,
             "extensions": [
                 ".abc",
                 ".bgeo",
@@ -90,6 +96,8 @@
             "description": "Footage Plates",
             "detailed_description": "Any type of image seqeuence coming from outside of the studio. Usually camera footage, but could also be animatics used for reference.",
             "allow_sequences": true,
+            "allow_multiple_items": true,
+            "allow_review": true,
             "extensions": [
                 ".exr",
                 ".png",
@@ -111,6 +119,8 @@
             "description": "Rendered images or video",
             "detailed_description": "Sequence or single file renders",
             "allow_sequences": true,
+            "allow_multiple_items": true,
+            "allow_review": true,
             "extensions": [
                 ".exr",
                 ".png",
@@ -133,6 +143,8 @@
             "description": "3d Camera",
             "detailed_description": "Ideally this should be only camera itself with baked animation, however, it can technically also include helper geometry.",
             "allow_sequences": false,
+            "allow_multiple_items": true,
+            "allow_review": false,
             "extensions": [
                 ".abc",
                 ".ma",
@@ -156,6 +168,8 @@
             "description": "Single image",
             "detailed_description": "Any image data can be published as image family. References, textures, concept art, matte paints. This is a fallback 2d family for everything that doesn't fit more specific family.",
             "allow_sequences": false,
+            "allow_multiple_items": true,
+            "allow_review": true,
             "extensions": [
                 ".exr",
                 ".jpg",
@@ -178,6 +192,8 @@
             "description": "Sparse volumetric data",
             "detailed_description": "Hierarchical data structure for the efficient storage and manipulation of sparse volumetric data discretized on three-dimensional grids",
             "allow_sequences": true,
+            "allow_multiple_items": true,
+            "allow_review": false,
             "extensions": [
                 ".vdb"
             ]
@@ -195,6 +211,8 @@
             "description": "Matchmoving script",
             "detailed_description": "Script exported from matchmoving application to be later processed into a tracked camera with additional data",
             "allow_sequences": false,
+            "allow_multiple_items": true,
+            "allow_review": false,
             "extensions": []
         },
         {
@@ -206,6 +224,8 @@
             "description": "CG rig file",
             "detailed_description": "CG rigged character or prop. Rig should be clean of any extra data and directly loadable into it's respective application\t",
             "allow_sequences": false,
+            "allow_multiple_items": false,
+            "allow_review": false,
             "extensions": [
                 ".ma",
                 ".blend",
@@ -224,6 +244,8 @@
             "description": "Simple Unreal Engine texture",
             "detailed_description": "Texture files with Unreal Engine naming conventions",
             "allow_sequences": false,
+            "allow_multiple_items": true,
+            "allow_review": false,
             "extensions": []
         }
     ]
diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_traypublisher.json b/openpype/settings/entities/schemas/projects_schema/schema_project_traypublisher.json
index 55c1b7b7d7..08c95609c0 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_traypublisher.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_traypublisher.json
@@ -67,6 +67,16 @@
                         "label": "Allow sequences",
                         "type": "boolean"
                     },
+                    {
+                        "key": "allow_multiple_items",
+                        "label": "Allow multiple items",
+                        "type": "boolean"
+                    },
+                    {
+                        "key": "allow_review",
+                        "label": "Allow review",
+                        "type": "boolean"
+                    },
                     {
                         "type": "list",
                         "key": "extensions",

From 654b0fb1eb8883815c8493ddf665d824d9830bdb Mon Sep 17 00:00:00 2001
From: Milan Kolar <milan@pype.club>
Date: Wed, 13 Jul 2022 17:26:07 +0200
Subject: [PATCH 190/289] delete obsolete create_review_family plugin

---
 .../plugins/publish/collect_review_family.py  | 31 -------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 openpype/hosts/traypublisher/plugins/publish/collect_review_family.py

diff --git a/openpype/hosts/traypublisher/plugins/publish/collect_review_family.py b/openpype/hosts/traypublisher/plugins/publish/collect_review_family.py
deleted file mode 100644
index 965e251527..0000000000
--- a/openpype/hosts/traypublisher/plugins/publish/collect_review_family.py
+++ /dev/null
@@ -1,31 +0,0 @@
-import pyblish.api
-from openpype.lib import BoolDef
-from openpype.pipeline import OpenPypePyblishPluginMixin
-
-
-class CollectReviewFamily(
-    pyblish.api.InstancePlugin, OpenPypePyblishPluginMixin
-):
-    """Add review family."""
-
-    label = "Collect Review Family"
-    order = pyblish.api.CollectorOrder - 0.49
-
-    hosts = ["traypublisher"]
-    families = [
-        "image",
-        "render",
-        "plate",
-        "review"
-    ]
-
-    def process(self, instance):
-        values = self.get_attr_values_from_data(instance.data)
-        if values.get("add_review_family"):
-            instance.data["families"].append("review")
-
-    @classmethod
-    def get_attribute_defs(cls):
-        return [
-            BoolDef("add_review_family", label="Review", default=True)
-        ]

From 540e94e72680d9899689b18592deb09267e9ac3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= <ondrej.samohel@pype.club>
Date: Wed, 13 Jul 2022 17:44:29 +0200
Subject: [PATCH 191/289] :bug: fix git submodules weirdness

---
 .../UE_5.0/Content/Python/__init__.py => .gitmodules           | 3 ++-
 openpype/hosts/unreal/integration/UE_5.0/Content/__init__.py   | 0
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename openpype/hosts/unreal/integration/UE_5.0/Content/Python/__init__.py => .gitmodules (79%)
 delete mode 100644 openpype/hosts/unreal/integration/UE_5.0/Content/__init__.py

diff --git a/openpype/hosts/unreal/integration/UE_5.0/Content/Python/__init__.py b/.gitmodules
similarity index 79%
rename from openpype/hosts/unreal/integration/UE_5.0/Content/Python/__init__.py
rename to .gitmodules
index 1e3eb5e792..b515851c81 100644
--- a/openpype/hosts/unreal/integration/UE_5.0/Content/Python/__init__.py
+++ b/.gitmodules
@@ -1,6 +1,7 @@
 [submodule "vendor/powershell/BurntToast"]
     path = vendor/powershell/BurntToast
     url = https://github.com/Windos/BurntToast.git
+
 [submodule "vendor/powershell/PSWriteColor"]
     path = vendor/powershell/PSWriteColor
-    url = https://github.com/EvotecIT/PSWriteColor.git
\ No newline at end of file
+    url = https://github.com/EvotecIT/PSWriteColor.git
diff --git a/openpype/hosts/unreal/integration/UE_5.0/Content/__init__.py b/openpype/hosts/unreal/integration/UE_5.0/Content/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000

From 2d2bf24c454d828a732f12a1dc628e1bfb375595 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= <ondrej.samohel@pype.club>
Date: Wed, 13 Jul 2022 18:06:03 +0200
Subject: [PATCH 192/289] :bug: init submodules first

---
 tools/create_env.ps1 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/create_env.ps1 b/tools/create_env.ps1
index b1337b5635..387bdf919c 100644
--- a/tools/create_env.ps1
+++ b/tools/create_env.ps1
@@ -28,9 +28,11 @@ $current_dir = Get-Location
 $script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
 $openpype_root = (Get-Item $script_dir).parent.FullName
 
+& git submodule update --init --recursive
 # Install PSWriteColor to support colorized output to terminal
 $env:PSModulePath = $env:PSModulePath + ";$($openpype_root)\vendor\powershell"
 
+
 function Exit-WithCode($exitcode) {
    # Only exit this host process if it's a child of another PowerShell parent process...
    $parentPID = (Get-CimInstance -ClassName Win32_Process -Filter "ProcessId=$PID" | Select-Object -Property ParentProcessId).ParentProcessId

From a427648abd8cb24a6ba906d5eb1ef7eb8212f96b Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 13 Jul 2022 19:05:23 +0200
Subject: [PATCH 193/289] implemented internal drag and drop and disabled
 sorting

---
 .../widgets/attribute_defs/files_widget.py    | 62 ++++++++++++++++++-
 1 file changed, 60 insertions(+), 2 deletions(-)

diff --git a/openpype/widgets/attribute_defs/files_widget.py b/openpype/widgets/attribute_defs/files_widget.py
index 698a91a1a5..4652e12ab1 100644
--- a/openpype/widgets/attribute_defs/files_widget.py
+++ b/openpype/widgets/attribute_defs/files_widget.py
@@ -1,6 +1,7 @@
 import os
 import collections
 import uuid
+import json
 
 from Qt import QtWidgets, QtCore, QtGui
 
@@ -245,6 +246,62 @@ class FilesModel(QtGui.QStandardItemModel):
 
         return item_id, item
 
+    def mimeData(self, indexes):
+        item_ids = [
+            index.data(ITEM_ID_ROLE)
+            for index in indexes
+        ]
+        encoded_data = QtCore.QByteArray()
+        stream = QtCore.QDataStream(encoded_data, QtCore.QIODevice.WriteOnly)
+        stream.writeQString(json.dumps(item_ids))
+        mime_data = super(FilesModel, self).mimeData(indexes)
+        mime_data.setData("files_widget/internal_move", encoded_data)
+        return mime_data
+
+    def dropMimeData(self, mime_data, action, row, col, index):
+        internal_move_data = mime_data.data("files_widget/internal_move")
+        if isinstance(internal_move_data, QtCore.QByteArray):
+            # Raw data are already QByteArrat and we don't have to load them
+            encoded_data = internal_move_data
+        else:
+            encoded_data = QtCore.QByteArray.fromRawData(internal_move_data)
+        stream = QtCore.QDataStream(encoded_data, QtCore.QIODevice.ReadOnly)
+        text = stream.readQString()
+        try:
+            item_ids = json.loads(text)
+        except Exception:
+            return False
+
+        # Find matching item after which will be items moved
+        #   - store item before moved items are removed
+        root = self.invisibleRootItem()
+        if row >= 0:
+            src_item = self.item(row)
+        else:
+            src_item_id = index.data(ITEM_ID_ROLE)
+            src_item = self._items_by_id.get(src_item_id)
+
+        # Take out items that should be moved
+        items = []
+        for item_id in item_ids:
+            item = self._items_by_id.get(item_id)
+            if item:
+                self.takeRow(item.row())
+                items.append(item)
+
+        # Skip if there are not items that can be moved
+        if not items:
+            return False
+
+        # Calculate row where items should be inserted
+        if src_item:
+            src_row = src_item.row()
+        else:
+            src_row = root.rowCount()
+
+        root.insertRow(src_row, items)
+        return True
+
 
 class FilesProxyModel(QtCore.QSortFilterProxyModel):
     def __init__(self, *args, **kwargs):
@@ -428,6 +485,9 @@ class FilesView(QtWidgets.QListView):
             QtWidgets.QAbstractItemView.ExtendedSelection
         )
         self.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
+        self.setAcceptDrops(True)
+        self.setDragEnabled(True)
+        self.setDragDropMode(self.InternalMove)
 
         remove_btn = InViewButton(self)
         pix_enabled = paint_image_with_color(
@@ -637,8 +697,6 @@ class FilesWidget(QtWidgets.QFrame):
             )
             self._widgets_by_id[item_id] = widget
 
-        self._files_proxy_model.sort(0)
-
         if not self._in_set_value:
             self.value_changed.emit()
 

From 2fbc1aa00676d542b7765773f376f3eee677c348 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 13 Jul 2022 19:06:03 +0200
Subject: [PATCH 194/289] make drop available

---
 openpype/widgets/attribute_defs/files_widget.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/openpype/widgets/attribute_defs/files_widget.py b/openpype/widgets/attribute_defs/files_widget.py
index 4652e12ab1..eeb8f2d6dc 100644
--- a/openpype/widgets/attribute_defs/files_widget.py
+++ b/openpype/widgets/attribute_defs/files_widget.py
@@ -805,8 +805,12 @@ class FilesWidget(QtWidgets.QFrame):
         event.accept()
 
     def dropEvent(self, event):
+        if self._multivalue:
+            return
+
         mime_data = event.mimeData()
-        if not self._multivalue and mime_data.hasUrls():
+        if mime_data.hasUrls():
+            event.accept()
             filepaths = []
             for url in mime_data.urls():
                 filepath = url.toLocalFile()
@@ -817,7 +821,8 @@ class FilesWidget(QtWidgets.QFrame):
             filepaths = self._files_proxy_model.filter_valid_files(filepaths)
             if filepaths:
                 self._add_filepaths(filepaths)
-        event.accept()
+
+        super(FilesWidget, self).dropEvent(event)
 
     def _add_filepaths(self, filepaths):
         self._files_model.add_filepaths(filepaths)

From 08a9613c660f06d1158b2c8d9a2ffc5303a92e23 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 13 Jul 2022 19:32:44 +0200
Subject: [PATCH 195/289] fix label height in files widget

---
 .../widgets/attribute_defs/files_widget.py    | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/openpype/widgets/attribute_defs/files_widget.py b/openpype/widgets/attribute_defs/files_widget.py
index eeb8f2d6dc..0b3a81e903 100644
--- a/openpype/widgets/attribute_defs/files_widget.py
+++ b/openpype/widgets/attribute_defs/files_widget.py
@@ -62,6 +62,14 @@ class DropEmpty(QtWidgets.QWidget):
             widget.setAlignment(QtCore.Qt.AlignCenter)
             widget.setAttribute(QtCore.Qt.WA_TranslucentBackground)
 
+        update_size_timer = QtCore.QTimer()
+        update_size_timer.setInterval(10)
+        update_size_timer.setSingleShot(True)
+
+        update_size_timer.timeout.connect(self._on_update_size_timer)
+
+        self._update_size_timer = update_size_timer
+
         self._single_item = single_item
         self._allow_sequences = allow_sequences
         self._allowed_extensions = set()
@@ -130,7 +138,28 @@ class DropEmpty(QtWidgets.QWidget):
                 ", ".join(sorted(self._allowed_extensions))
             )
 
+        if self._items_label_widget.text() == items_label:
+            return
+
         self._items_label_widget.setText(items_label)
+        self._update_size_timer.start()
+
+    def resizeEvent(self, event):
+        super(DropEmpty, self).resizeEvent(event)
+        self._update_size_timer.start()
+
+    def _on_update_size_timer(self):
+        """Recalculate height of label with extensions.
+
+        Dynamic QLabel with word wrap does not handle properly it's sizeHint
+        calculations on show. This way it is recalculated. It is good practice
+        to trigger this method with small offset using '_update_size_timer'.
+        """
+
+        width = self._items_label_widget.width()
+        height = self._items_label_widget.heightForWidth(width)
+        self._items_label_widget.setMinimumHeight(height)
+        self._items_label_widget.updateGeometry()
 
     def paintEvent(self, event):
         super(DropEmpty, self).paintEvent(event)
@@ -613,6 +642,7 @@ class FilesWidget(QtWidgets.QFrame):
         files_view.context_menu_requested.connect(
             self._on_context_menu_requested
         )
+
         self._in_set_value = False
         self._single_item = single_item
         self._multivalue = False

From 731aecd71c58153dc45586ff67bc362d37e9f281 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Wed, 13 Jul 2022 21:48:50 +0200
Subject: [PATCH 196/289] sort plugins separatelly and don't count on order
 from report

---
 .../publisher/publish_report_viewer/report_items.py    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/openpype/tools/publisher/publish_report_viewer/report_items.py b/openpype/tools/publisher/publish_report_viewer/report_items.py
index b47d14da25..8a01569723 100644
--- a/openpype/tools/publisher/publish_report_viewer/report_items.py
+++ b/openpype/tools/publisher/publish_report_viewer/report_items.py
@@ -83,10 +83,8 @@ class PublishReport:
 
         logs = []
         plugins_items_by_id = {}
-        plugins_id_order = []
         for plugin_data in data["plugins_data"]:
             item = PluginItem(plugin_data)
-            plugins_id_order.append(item.id)
             plugins_items_by_id[item.id] = item
             for instance_data_item in plugin_data["instances_data"]:
                 instance_id = instance_data_item["id"]
@@ -95,6 +93,14 @@ class PublishReport:
                         copy.deepcopy(log_item_data), item.id, instance_id
                     )
                     logs.append(log_item)
+        sorted_plugins = sorted(
+            plugins_items_by_id.values(),
+            key=lambda item: item.order
+        )
+        plugins_id_order = [
+            plugin_item.id
+            for plugin_item in sorted_plugins
+        ]
 
         logs_by_instance_id = collections.defaultdict(list)
         for log_item in logs:

From 84068bdd50a2a5bd5547d969d5f2fb74068067a5 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 14 Jul 2022 11:32:29 +0200
Subject: [PATCH 197/289] added ability to zoom text in report

---
 .../publish_report_viewer/widgets.py          | 67 ++++++++++++++++++-
 1 file changed, 65 insertions(+), 2 deletions(-)

diff --git a/openpype/tools/publisher/publish_report_viewer/widgets.py b/openpype/tools/publisher/publish_report_viewer/widgets.py
index fd226ea0e4..61eb814a56 100644
--- a/openpype/tools/publisher/publish_report_viewer/widgets.py
+++ b/openpype/tools/publisher/publish_report_viewer/widgets.py
@@ -1,3 +1,4 @@
+from math import ceil
 from Qt import QtWidgets, QtCore, QtGui
 
 from openpype.widgets.nice_checkbox import NiceCheckbox
@@ -137,13 +138,75 @@ class PluginLoadReportWidget(QtWidgets.QWidget):
         self._model.set_report(report)
 
 
+class ZoomPlainText(QtWidgets.QPlainTextEdit):
+    def __init__(self, *args, **kwargs):
+        super(ZoomPlainText, self).__init__(*args, **kwargs)
+
+        anim_timer = QtCore.QTimer()
+        anim_timer.setInterval(20)
+
+        anim_timer.timeout.connect(self._scaling_callback)
+
+        self._anim_timer = anim_timer
+        self._zoom_enabled = False
+        self._scheduled_scalings = 0
+        self._point_size = None
+
+    def wheelEvent(self, event):
+        if not self._zoom_enabled:
+            super(ZoomPlainText, self).wheelEvent(event)
+            return
+
+        degrees = float(event.delta()) / 8
+        steps = int(ceil(degrees / 5))
+        self._scheduled_scalings += steps
+        if (self._scheduled_scalings * steps < 0):
+            self._scheduled_scalings = steps
+
+        self._anim_timer.start()
+
+    def _scaling_callback(self):
+        if self._scheduled_scalings == 0:
+            self._anim_timer.stop()
+            return
+
+        factor = 1.0 + (self._scheduled_scalings / 300)
+        font = self.font()
+        if self._point_size is None:
+            self._point_size = font.pointSizeF()
+
+        self._point_size *= factor
+        if self._point_size < 1:
+            self._point_size = 1.0
+
+        font.setPointSizeF(self._point_size)
+        # Using 'self.setFont(font)' would not be propagated when stylesheets
+        #   are applied on this widget
+        self.setStyleSheet("font-size: {}pt".format(font.pointSize()))
+
+        if self._scheduled_scalings > 0:
+            self._scheduled_scalings -= 1
+        else:
+            self._scheduled_scalings += 1
+
+    def keyPressEvent(self, event):
+        if event.key() == QtCore.Qt.Key_Control:
+            self._zoom_enabled = True
+        super(ZoomPlainText, self).keyPressEvent(event)
+
+    def keyReleaseEvent(self, event):
+        if event.key() == QtCore.Qt.Key_Control:
+            self._zoom_enabled = False
+        super(ZoomPlainText, self).keyReleaseEvent(event)
+
+
 class DetailsWidget(QtWidgets.QWidget):
     def __init__(self, parent):
         super(DetailsWidget, self).__init__(parent)
 
-        output_widget = QtWidgets.QPlainTextEdit(self)
-        output_widget.setTextInteractionFlags(QtCore.Qt.TextBrowserInteraction)
+        output_widget = ZoomPlainText(self)
         output_widget.setObjectName("PublishLogConsole")
+        output_widget.setTextInteractionFlags(QtCore.Qt.TextBrowserInteraction)
 
         layout = QtWidgets.QVBoxLayout(self)
         layout.setContentsMargins(0, 0, 0, 0)

From c16a2d6ed53caa68d44b986c1aec375fda8e34f0 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 14 Jul 2022 12:17:19 +0200
Subject: [PATCH 198/289] moved collect cleanup keys earlier

---
 openpype/plugins/publish/collect_cleanup_keys.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/plugins/publish/collect_cleanup_keys.py b/openpype/plugins/publish/collect_cleanup_keys.py
index 635b038387..b9cd1a9fc9 100644
--- a/openpype/plugins/publish/collect_cleanup_keys.py
+++ b/openpype/plugins/publish/collect_cleanup_keys.py
@@ -14,7 +14,7 @@ class CollectCleanupKeys(pyblish.api.ContextPlugin):
     """Prepare keys for 'ExplicitCleanUp' plugin."""
 
     label = "Collect Cleanup Keys"
-    order = pyblish.api.CollectorOrder
+    order = pyblish.api.CollectorOrder - 0.5
 
     def process(self, context):
         context.data["cleanupFullPaths"] = []

From 43d744b24b54f21ca2f7e622ca491af91833e689 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 14 Jul 2022 12:17:43 +0200
Subject: [PATCH 199/289] instance data is filled with instance asset specific
 values if are not already available on instance

---
 .../publish/collect_anatomy_instance_data.py   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/openpype/plugins/publish/collect_anatomy_instance_data.py b/openpype/plugins/publish/collect_anatomy_instance_data.py
index c75534cf83..f67d3373d9 100644
--- a/openpype/plugins/publish/collect_anatomy_instance_data.py
+++ b/openpype/plugins/publish/collect_anatomy_instance_data.py
@@ -51,6 +51,7 @@ class CollectAnatomyInstanceData(pyblish.api.ContextPlugin):
 
         project_name = legacy_io.active_project()
         self.fill_missing_asset_docs(context, project_name)
+        self.fill_instance_data_from_asset(context)
         self.fill_latest_versions(context, project_name)
         self.fill_anatomy_data(context)
 
@@ -115,6 +116,23 @@ class CollectAnatomyInstanceData(pyblish.api.ContextPlugin):
                 "Not found asset documents with names \"{}\"."
             ).format(joined_asset_names))
 
+    def fill_instance_data_from_asset(self, context):
+        for instance in context:
+            asset_doc = instance.data.get("assetEntity")
+            if not asset_doc:
+                continue
+
+            asset_data = asset_doc["data"]
+            for key in (
+                "fps",
+                "frameStart",
+                "frameEnd",
+                "handleStart",
+                "handleEnd",
+            ):
+                if key not in instance.data and key in asset_data:
+                    instance.data[key] = asset_data[key]
+
     def fill_latest_versions(self, context, project_name):
         """Try to find latest version for each instance's subset.
 

From 4f133d26b4312bcba7b3b2ddbcac19131667d590 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 14 Jul 2022 12:29:13 +0200
Subject: [PATCH 200/289] changed allow_review to reviewable which affect
 default value of reviewable on instances

---
 openpype/hosts/traypublisher/api/plugin.py    |  8 +++++--
 .../project_settings/traypublisher.json       | 22 +++++++++----------
 .../schema_project_traypublisher.json         |  4 ++--
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/openpype/hosts/traypublisher/api/plugin.py b/openpype/hosts/traypublisher/api/plugin.py
index 3877d33055..6966935091 100644
--- a/openpype/hosts/traypublisher/api/plugin.py
+++ b/openpype/hosts/traypublisher/api/plugin.py
@@ -87,7 +87,11 @@ class SettingsCreator(TrayPublishCreator):
                 single_item=not self.allow_multiple_items,
                 label="Filepath",
             ),
-            BoolDef("allow_review", label="Reviewable", default=True)
+            BoolDef(
+                "reviewable",
+                label="Reviewable",
+                default=self.reviewable
+            )
         ]
 
     @classmethod
@@ -109,7 +113,7 @@ class SettingsCreator(TrayPublishCreator):
                 "extensions": item_data["extensions"],
                 "allow_sequences": item_data["allow_sequences"],
                 "allow_multiple_items": item_data["allow_multiple_items"],
-                "allow_review": item_data["allow_review"],
+                "reviewable": item_data["reviewable"],
                 "default_variants": item_data["default_variants"]
             }
         )
diff --git a/openpype/settings/defaults/project_settings/traypublisher.json b/openpype/settings/defaults/project_settings/traypublisher.json
index e59200a13b..619d54dbaf 100644
--- a/openpype/settings/defaults/project_settings/traypublisher.json
+++ b/openpype/settings/defaults/project_settings/traypublisher.json
@@ -12,7 +12,7 @@
             "detailed_description": "Workfiles are full scenes from any application that are directly edited by artists. They represent a state of work on a task at a given point and are usually not directly referenced into other scenes.",
             "allow_sequences": false,
             "allow_multiple_items": false,
-            "allow_review": false,
+            "reviewable": false,
             "extensions": [
                 ".ma",
                 ".mb",
@@ -47,7 +47,7 @@
             "detailed_description": "Models should only contain geometry data, without any extras like cameras, locators or bones.\n\nKeep in mind that models published from tray publisher are not validated for correctness. ",
             "allow_sequences": false,
             "allow_multiple_items": true,
-            "allow_review": false,
+            "reviewable": false,
             "extensions": [
                 ".ma",
                 ".mb",
@@ -73,7 +73,7 @@
             "detailed_description": "Alembic or bgeo cache of animated data",
             "allow_sequences": true,
             "allow_multiple_items": true,
-            "allow_review": false,
+            "reviewable": false,
             "extensions": [
                 ".abc",
                 ".bgeo",
@@ -97,7 +97,7 @@
             "detailed_description": "Any type of image seqeuence coming from outside of the studio. Usually camera footage, but could also be animatics used for reference.",
             "allow_sequences": true,
             "allow_multiple_items": true,
-            "allow_review": true,
+            "reviewable": true,
             "extensions": [
                 ".exr",
                 ".png",
@@ -120,7 +120,7 @@
             "detailed_description": "Sequence or single file renders",
             "allow_sequences": true,
             "allow_multiple_items": true,
-            "allow_review": true,
+            "reviewable": true,
             "extensions": [
                 ".exr",
                 ".png",
@@ -144,7 +144,7 @@
             "detailed_description": "Ideally this should be only camera itself with baked animation, however, it can technically also include helper geometry.",
             "allow_sequences": false,
             "allow_multiple_items": true,
-            "allow_review": false,
+            "reviewable": false,
             "extensions": [
                 ".abc",
                 ".ma",
@@ -169,7 +169,7 @@
             "detailed_description": "Any image data can be published as image family. References, textures, concept art, matte paints. This is a fallback 2d family for everything that doesn't fit more specific family.",
             "allow_sequences": false,
             "allow_multiple_items": true,
-            "allow_review": true,
+            "reviewable": true,
             "extensions": [
                 ".exr",
                 ".jpg",
@@ -193,7 +193,7 @@
             "detailed_description": "Hierarchical data structure for the efficient storage and manipulation of sparse volumetric data discretized on three-dimensional grids",
             "allow_sequences": true,
             "allow_multiple_items": true,
-            "allow_review": false,
+            "reviewable": false,
             "extensions": [
                 ".vdb"
             ]
@@ -212,7 +212,7 @@
             "detailed_description": "Script exported from matchmoving application to be later processed into a tracked camera with additional data",
             "allow_sequences": false,
             "allow_multiple_items": true,
-            "allow_review": false,
+            "reviewable": false,
             "extensions": []
         },
         {
@@ -225,7 +225,7 @@
             "detailed_description": "CG rigged character or prop. Rig should be clean of any extra data and directly loadable into it's respective application\t",
             "allow_sequences": false,
             "allow_multiple_items": false,
-            "allow_review": false,
+            "reviewable": false,
             "extensions": [
                 ".ma",
                 ".blend",
@@ -245,7 +245,7 @@
             "detailed_description": "Texture files with Unreal Engine naming conventions",
             "allow_sequences": false,
             "allow_multiple_items": true,
-            "allow_review": false,
+            "reviewable": false,
             "extensions": []
         }
     ]
diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_traypublisher.json b/openpype/settings/entities/schemas/projects_schema/schema_project_traypublisher.json
index 08c95609c0..269b47459c 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_traypublisher.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_traypublisher.json
@@ -73,8 +73,8 @@
                         "type": "boolean"
                     },
                     {
-                        "key": "allow_review",
-                        "label": "Allow review",
+                        "key": "reviewable",
+                        "label": "Reviewable",
                         "type": "boolean"
                     },
                     {

From 1eceb7296df14e914a3c1de2c76dd1dcb84ab6ad Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 14 Jul 2022 12:29:43 +0200
Subject: [PATCH 201/289] define some extensions for which reviewable could
 work

---
 .../publish/collect_simple_instances.py       | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py b/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
index f76306cf05..4992d0a8be 100644
--- a/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
+++ b/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
@@ -12,6 +12,28 @@ class CollectSettingsSimpleInstances(pyblish.api.InstancePlugin):
 
     hosts = ["traypublisher"]
 
+    _image_extensions = [
+        ".ani", ".anim", ".apng", ".art", ".bmp", ".bpg", ".bsave", ".cal",
+        ".cin", ".cpc", ".cpt", ".dds", ".dpx", ".ecw", ".exr", ".fits",
+        ".flic", ".flif", ".fpx", ".gif", ".hdri", ".hevc", ".icer",
+        ".icns", ".ico", ".cur", ".ics", ".ilbm", ".jbig", ".jbig2",
+        ".jng", ".jpeg", ".jpeg-ls", ".jpeg", ".2000", ".jpg", ".xr",
+        ".jpeg", ".xt", ".jpeg-hdr", ".kra", ".mng", ".miff", ".nrrd",
+        ".ora", ".pam", ".pbm", ".pgm", ".ppm", ".pnm", ".pcx", ".pgf",
+        ".pictor", ".png", ".psb", ".psp", ".qtvr", ".ras",
+        ".rgbe", ".logluv", ".tiff", ".sgi", ".tga", ".tiff", ".tiff/ep",
+        ".tiff/it", ".ufo", ".ufp", ".wbmp", ".webp", ".xbm", ".xcf",
+        ".xpm", ".xwd"
+    ]
+    _video_extensions = [
+        ".3g2", ".3gp", ".amv", ".asf", ".avi", ".drc", ".f4a", ".f4b",
+        ".f4p", ".f4v", ".flv", ".gif", ".gifv", ".m2v", ".m4p", ".m4v",
+        ".mkv", ".mng", ".mov", ".mp2", ".mp4", ".mpe", ".mpeg", ".mpg",
+        ".mpv", ".mxf", ".nsv", ".ogg", ".ogv", ".qt", ".rm", ".rmvb",
+        ".roq", ".svi", ".vob", ".webm", ".wmv", ".yuv"
+    ]
+    _review_extensions = _image_extensions + _video_extensions
+
     def process(self, instance):
         if not instance.data.get("settings_creator"):
             return

From a2a83623ff8f3f9ddece29227b60428721e5b56c Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 14 Jul 2022 12:30:40 +0200
Subject: [PATCH 202/289] instance staging dir lead to temp

---
 .../plugins/publish/collect_simple_instances.py     | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py b/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
index 4992d0a8be..6a583b2e50 100644
--- a/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
+++ b/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
@@ -38,11 +38,15 @@ class CollectSettingsSimpleInstances(pyblish.api.InstancePlugin):
         if not instance.data.get("settings_creator"):
             return
 
-        if "families" not in instance.data:
-            instance.data["families"] = []
+        # Create instance's staging dir in temp
+        tmp_folder = tempfile.mkdtemp(prefix="traypublisher_")
+        instance.data["stagingDir"] = tmp_folder
+        instance.context.data["cleanupFullPaths"].append(tmp_folder)
+
+        self.log.debug(
+            "Created temp staging directory for instance {}".format(tmp_folder)
+        )
 
-        if "representations" not in instance.data:
-            instance.data["representations"] = []
         repres = instance.data["representations"]
 
         creator_attributes = instance.data["creator_attributes"]
@@ -62,7 +66,6 @@ class CollectSettingsSimpleInstances(pyblish.api.InstancePlugin):
 
         instance.data["source"] = source
         instance.data["sourceFilepaths"] = filepaths
-        instance.data["stagingDir"] = filepath_item["directory"]
 
         filenames = filepath_item["filenames"]
         _, ext = os.path.splitext(filenames[0])

From a088db2db9db034c752d7dd299614c3a8e739357 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 14 Jul 2022 12:46:57 +0200
Subject: [PATCH 203/289] modified validator if not existing paths as there is
 a chance that filepaths are not filled at all

---
 .../plugins/publish/validate_filepaths.py     | 29 ++++++++++++++++---
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/openpype/hosts/traypublisher/plugins/publish/validate_filepaths.py b/openpype/hosts/traypublisher/plugins/publish/validate_filepaths.py
index c7302b1005..e02116e10b 100644
--- a/openpype/hosts/traypublisher/plugins/publish/validate_filepaths.py
+++ b/openpype/hosts/traypublisher/plugins/publish/validate_filepaths.py
@@ -3,8 +3,17 @@ import pyblish.api
 from openpype.pipeline import PublishValidationError
 
 
-class ValidateWorkfilePath(pyblish.api.InstancePlugin):
-    """Validate existence of workfile instance existence."""
+class ValidateFilePath(pyblish.api.InstancePlugin):
+    """Validate existence of source filepaths on instance.
+
+    Plugins looks into key 'sourceFilepaths' and validate if paths there
+    actually exist on disk.
+
+    Also validate if the key is filled but is empty. In that case also
+    crashes so do not fill the key if unfilled value should not cause error.
+
+    This is primarily created for Simple Creator instances.
+    """
 
     label = "Validate Workfile"
     order = pyblish.api.ValidatorOrder - 0.49
@@ -14,12 +23,24 @@ class ValidateWorkfilePath(pyblish.api.InstancePlugin):
     def process(self, instance):
         if "sourceFilepaths" not in instance.data:
             self.log.info((
-                "Can't validate source filepaths existence."
+                "Skipped validation of source filepaths existence."
                 " Instance does not have collected 'sourceFilepaths'"
             ))
             return
 
-        filepaths = instance.data.get("sourceFilepaths")
+        filepaths = instance.data["sourceFilepaths"]
+        if not filepaths:
+            raise PublishValidationError(
+                (
+                    "Source filepaths of '{}' instance \"{}\" are not filled"
+                ).format(instance.data["family"], instance.data["name"]),
+                "File not filled",
+                (
+                    "## Files were not filled"
+                    "\nThis could mean that you didn't enter files into file"
+                    "input."
+                )
+            )
 
         not_found_files = [
             filepath

From bc09a92d52be3782015337c436f89f9ef832a3cd Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 14 Jul 2022 12:47:22 +0200
Subject: [PATCH 204/289] modified simple instance collector to be able handle
 multivalue of fileitems

---
 .../publish/collect_simple_instances.py       | 121 ++++++++++++++----
 1 file changed, 93 insertions(+), 28 deletions(-)

diff --git a/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py b/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
index 6a583b2e50..1b2129f48e 100644
--- a/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
+++ b/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
@@ -1,4 +1,6 @@
 import os
+import json
+import tempfile
 
 import clique
 import pyblish.api
@@ -38,50 +40,113 @@ class CollectSettingsSimpleInstances(pyblish.api.InstancePlugin):
         if not instance.data.get("settings_creator"):
             return
 
+        instance_label = instance.data["name"]
         # Create instance's staging dir in temp
         tmp_folder = tempfile.mkdtemp(prefix="traypublisher_")
         instance.data["stagingDir"] = tmp_folder
         instance.context.data["cleanupFullPaths"].append(tmp_folder)
 
-        self.log.debug(
-            "Created temp staging directory for instance {}".format(tmp_folder)
-        )
+        self.log.debug((
+            "Created temp staging directory for instance {}. {}"
+        ).format(instance_label, tmp_folder))
 
         repres = instance.data["representations"]
 
         creator_attributes = instance.data["creator_attributes"]
-        filepath_item = creator_attributes["filepath"]
-        self.log.info(filepath_item)
-        filepaths = [
-            os.path.join(filepath_item["directory"], filename)
-            for filename in filepath_item["filenames"]
-        ]
+        self.log.info(json.dumps(creator_attributes))
+        filepath_items = creator_attributes["filepath"]
+        if not isinstance(filepath_items, list):
+            filepath_items = [filepath_items]
 
-        cols, rems = clique.assemble(filepaths)
+        # Last found representation is used as source for instance
         source = None
+        # Check if review is enabled and should be created
+        reviewable = creator_attributes.get("reviewable")
+        # Store review representation - first found that can be used for
+        #   review is stored
+        review_representation = None
+        review_path = None
+
+        # Make sure there are no representations with same name
+        repre_names_counter = {}
+        # Store created names for logging
+        _repre_names = []
+        # Store filepaths for validation of their existence
+        source_filepaths = []
+
+        # Create representations
+        for filepath_item in filepath_items:
+            filepaths = [
+                os.path.join(filepath_item["directory"], filename)
+                for filename in filepath_item["filenames"]
+            ]
+            source_filepaths.extend(filepaths)
+
+            source = self._calculate_source(filepaths)
+            filenames = filepath_item["filenames"]
+            _, ext = os.path.splitext(filenames[0])
+            if len(filenames) == 1:
+                filenames = filenames[0]
+
+            repre_name = repre_ext = ext[1:]
+            if repre_name not in repre_names_counter:
+                repre_names_counter[repre_name] = 2
+            else:
+                counter = repre_names_counter[repre_name]
+                repre_names_counter[repre_name] += 1
+                repre_name = "{}_{}".format(repre_name, counter)
+
+            _repre_names.append('"{}"'.format(repre_name))
+            representation = {
+                "ext": repre_ext,
+                "name": repre_name,
+                "stagingDir": filepath_item["directory"],
+                "files": filenames,
+                "tags": []
+            }
+            repres.append(representation)
+
+            if (
+                reviewable
+                and review_representation is None
+                and ext in self._review_extensions
+            ):
+                review_representation = representation
+                review_path = source
+
+        instance.data["source"] = source
+        instance.data["sourceFilepaths"] = source_filepaths
+
+        if reviewable:
+            self._prepare_review(instance, review_representation, review_path)
+
+        self.log.debug((
+            "Created Simple Settings instance \"{}\""
+            " with {} representations: {}"
+        ).format(instance_label, len(repres), ", ".join(_repre_names)))
+
+    def _calculate_source(self, filepaths):
+        if not filepaths:
+            return None
+        cols, rems = clique.assemble(filepaths)
         if cols:
             source = cols[0].format("{head}{padding}{tail}")
         elif rems:
             source = rems[0]
+        return source
 
-        instance.data["source"] = source
-        instance.data["sourceFilepaths"] = filepaths
+    def _prepare_review(self, instance, review_representation, review_path):
+        if not review_representation:
+            self.log.waring((
+                "Didn't find any representation"
+                " that could be used as source for review"
+            ))
+            return
 
-        filenames = filepath_item["filenames"]
-        _, ext = os.path.splitext(filenames[0])
-        ext = ext[1:]
-        if len(filenames) == 1:
-            filenames = filenames[0]
+        if "review" not in instance.data["families"]:
+            instance.data["families"].append("review")
 
-        repres.append({
-            "ext": ext,
-            "name": ext,
-            "stagingDir": filepath_item["directory"],
-            "files": filenames
-        })
-
-        instance.data["source"] = "\n".join(filepaths)
-
-        self.log.debug("Created Simple Settings instance {}".format(
-            instance.data
+        review_representation["tags"].append("review")
+        self.log.debug("Representation {} was marked for review. {}".format(
+            review_representation["name"], review_path
         ))

From b51c44d6f203a9cf0958bbc83504e4202ec1b98f Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 14 Jul 2022 12:52:35 +0200
Subject: [PATCH 205/289] modified error message

---
 .../plugins/publish/validate_filepaths.py      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/openpype/hosts/traypublisher/plugins/publish/validate_filepaths.py b/openpype/hosts/traypublisher/plugins/publish/validate_filepaths.py
index e02116e10b..749199fbd3 100644
--- a/openpype/hosts/traypublisher/plugins/publish/validate_filepaths.py
+++ b/openpype/hosts/traypublisher/plugins/publish/validate_filepaths.py
@@ -28,18 +28,22 @@ class ValidateFilePath(pyblish.api.InstancePlugin):
             ))
             return
 
+        family = instance.data["family"]
+        label = instance.data["name"]
         filepaths = instance.data["sourceFilepaths"]
         if not filepaths:
             raise PublishValidationError(
                 (
                     "Source filepaths of '{}' instance \"{}\" are not filled"
-                ).format(instance.data["family"], instance.data["name"]),
+                ).format(family, label),
                 "File not filled",
                 (
                     "## Files were not filled"
-                    "\nThis could mean that you didn't enter files into file"
-                    "input."
-                )
+                    "\nThis mean that you didn't enter any files into required"
+                    " file input."
+                    "\n- Please refresh publishing and check instance"
+                    " <b>{}</b>"
+                ).format(label)
             )
 
         not_found_files = [
@@ -55,11 +59,7 @@ class ValidateFilePath(pyblish.api.InstancePlugin):
             raise PublishValidationError(
                 (
                     "Filepath of '{}' instance \"{}\" does not exist:\n{}"
-                ).format(
-                    instance.data["family"],
-                    instance.data["name"],
-                    joined_paths
-                ),
+                ).format(family, label, joined_paths),
                 "File not found",
                 (
                     "## Files were not found\nFiles\n{}"

From 465c506162cba6b55981f56fba382b38c79ffc11 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 14 Jul 2022 12:52:41 +0200
Subject: [PATCH 206/289] fix typo

---
 .../traypublisher/plugins/publish/collect_simple_instances.py   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py b/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
index 1b2129f48e..8dd2964252 100644
--- a/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
+++ b/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
@@ -137,7 +137,7 @@ class CollectSettingsSimpleInstances(pyblish.api.InstancePlugin):
 
     def _prepare_review(self, instance, review_representation, review_path):
         if not review_representation:
-            self.log.waring((
+            self.log.warning((
                 "Didn't find any representation"
                 " that could be used as source for review"
             ))

From 9c1dd8b5ca4df655bf533ac23773926caee1afd6 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 14 Jul 2022 12:59:45 +0200
Subject: [PATCH 207/289] save changes before reset

---
 openpype/tools/publisher/control.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/openpype/tools/publisher/control.py b/openpype/tools/publisher/control.py
index f692bb4000..b48bb61386 100644
--- a/openpype/tools/publisher/control.py
+++ b/openpype/tools/publisher/control.py
@@ -575,6 +575,8 @@ class PublisherController:
         # Stop publishing
         self.stop_publish()
 
+        self.save_changes()
+
         # Reset avalon context
         self.create_context.reset_avalon_context()
 

From 36ae9ff49cff8a460bcd46ef49e7c43c440874a7 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 14 Jul 2022 13:38:40 +0200
Subject: [PATCH 208/289] added some docstring to plugin

---
 .../plugins/publish/collect_simple_instances.py  | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py b/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
index 8dd2964252..424cf7d88d 100644
--- a/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
+++ b/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
@@ -7,7 +7,21 @@ import pyblish.api
 
 
 class CollectSettingsSimpleInstances(pyblish.api.InstancePlugin):
-    """Collect data for instances created by settings creators."""
+    """Collect data for instances created by settings creators.
+
+    Plugin create representations based on 'filepath' attribute stored
+    on instance.
+
+    Representations can be marked for review and in that case is also added
+    'review' family to instance families. For review can be marked only one
+    representation so **first** representation that has extension available
+    in '_review_extensions' is used for review.
+
+    For 'source' on instance is used path from last created representation.
+
+    Set staging directory on instance. That is probably never used because
+    each created representation has it's own staging dir.
+    """
 
     label = "Collect Settings Simple Instances"
     order = pyblish.api.CollectorOrder - 0.49

From 8083c1ed0aea6b0d9185d86c18d4b2e3c552ea50 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 14 Jul 2022 13:42:30 +0200
Subject: [PATCH 209/289] remove not relevant lines

---
 .../traypublisher/plugins/publish/collect_simple_instances.py   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py b/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
index 424cf7d88d..e8e1c1013c 100644
--- a/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
+++ b/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
@@ -140,8 +140,6 @@ class CollectSettingsSimpleInstances(pyblish.api.InstancePlugin):
         ).format(instance_label, len(repres), ", ".join(_repre_names)))
 
     def _calculate_source(self, filepaths):
-        if not filepaths:
-            return None
         cols, rems = clique.assemble(filepaths)
         if cols:
             source = cols[0].format("{head}{padding}{tail}")

From b5fa8b524e6fa13669e8f755c97d75f3ea217158 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 14 Jul 2022 13:51:20 +0200
Subject: [PATCH 210/289] unify imports

---
 openpype/hosts/traypublisher/api/plugin.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/openpype/hosts/traypublisher/api/plugin.py b/openpype/hosts/traypublisher/api/plugin.py
index 6966935091..46fb4fdb51 100644
--- a/openpype/hosts/traypublisher/api/plugin.py
+++ b/openpype/hosts/traypublisher/api/plugin.py
@@ -1,9 +1,8 @@
-from openpype.lib.attribute_definitions import BoolDef
+from openpype.lib.attribute_definitions import BoolDef, FileDef
 from openpype.pipeline import (
     Creator,
     CreatedInstance
 )
-from openpype.lib import FileDef
 
 from .pipeline import (
     list_instances,

From 7729d53921659abe7751cd007cda78156681afc1 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 14 Jul 2022 14:34:50 +0200
Subject: [PATCH 211/289] files item can have custom extensions label

---
 openpype/lib/attribute_definitions.py         | 13 +++++++---
 .../widgets/attribute_defs/files_widget.py    | 26 ++++++++++++++-----
 openpype/widgets/attribute_defs/widgets.py    |  5 +++-
 3 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/openpype/lib/attribute_definitions.py b/openpype/lib/attribute_definitions.py
index a1f7c1e0f4..17658eef93 100644
--- a/openpype/lib/attribute_definitions.py
+++ b/openpype/lib/attribute_definitions.py
@@ -14,6 +14,7 @@ class AbstractAttrDefMeta(ABCMeta):
 
     Each object of `AbtractAttrDef` mus have defined 'key' attribute.
     """
+
     def __call__(self, *args, **kwargs):
         obj = super(AbstractAttrDefMeta, self).__call__(*args, **kwargs)
         init_class = getattr(obj, "__init__class__", None)
@@ -45,6 +46,7 @@ class AbtractAttrDef:
         is_label_horizontal(bool): UI specific argument. Specify if label is
             next to value input or ahead.
     """
+
     is_value_def = True
 
     def __init__(
@@ -77,6 +79,7 @@ class AbtractAttrDef:
         Convert passed value to a valid type. Use default if value can't be
         converted.
         """
+
         pass
 
 
@@ -113,6 +116,7 @@ class UnknownDef(AbtractAttrDef):
     This attribute can be used to keep existing data unchanged but does not
     have known definition of type.
     """
+
     def __init__(self, key, default=None, **kwargs):
         kwargs["default"] = default
         super(UnknownDef, self).__init__(key, **kwargs)
@@ -204,6 +208,7 @@ class TextDef(AbtractAttrDef):
         placeholder(str): UI placeholder for attribute.
         default(str, None): Default value. Empty string used when not defined.
     """
+
     def __init__(
         self, key, multiline=None, regex=None, placeholder=None, default=None,
         **kwargs
@@ -531,14 +536,15 @@ class FileDef(AbtractAttrDef):
     Args:
         single_item(bool): Allow only single path item.
         folders(bool): Allow folder paths.
-        extensions(list<str>): Allow files with extensions. Empty list will
+        extensions(List[str]): Allow files with extensions. Empty list will
             allow all extensions and None will disable files completely.
-        default(str, list<str>): Defautl value.
+        extensions_label(str): Custom label shown instead of extensions in UI.
+        default(str, List[str]): Default value.
     """
 
     def __init__(
         self, key, single_item=True, folders=None, extensions=None,
-        allow_sequences=True, default=None, **kwargs
+        allow_sequences=True, extensions_label=None, default=None, **kwargs
     ):
         if folders is None and extensions is None:
             folders = True
@@ -578,6 +584,7 @@ class FileDef(AbtractAttrDef):
         self.folders = folders
         self.extensions = set(extensions)
         self.allow_sequences = allow_sequences
+        self.extensions_label = extensions_label
         super(FileDef, self).__init__(key, default=default, **kwargs)
 
     def __eq__(self, other):
diff --git a/openpype/widgets/attribute_defs/files_widget.py b/openpype/widgets/attribute_defs/files_widget.py
index 0b3a81e903..508da4893b 100644
--- a/openpype/widgets/attribute_defs/files_widget.py
+++ b/openpype/widgets/attribute_defs/files_widget.py
@@ -34,7 +34,7 @@ class SupportLabel(QtWidgets.QLabel):
 class DropEmpty(QtWidgets.QWidget):
     _empty_extensions = "Any file"
 
-    def __init__(self, single_item, allow_sequences, parent):
+    def __init__(self, single_item, allow_sequences, extensions_label, parent):
         super(DropEmpty, self).__init__(parent)
 
         drop_label_widget = QtWidgets.QLabel("Drag & Drop files here", self)
@@ -70,7 +70,11 @@ class DropEmpty(QtWidgets.QWidget):
 
         self._update_size_timer = update_size_timer
 
+        if extensions_label and not extensions_label.startswith(" "):
+            extensions_label = " " + extensions_label
+
         self._single_item = single_item
+        self._extensions_label = extensions_label
         self._allow_sequences = allow_sequences
         self._allowed_extensions = set()
         self._allow_folders = None
@@ -123,24 +127,32 @@ class DropEmpty(QtWidgets.QWidget):
             items_label = "Single "
 
         if len(allowed_items) == 1:
-            allowed_items_label = allowed_items[0]
+            extensions_label = allowed_items[0]
         elif len(allowed_items) == 2:
-            allowed_items_label = " or ".join(allowed_items)
+            extensions_label = " or ".join(allowed_items)
         else:
             last_item = allowed_items.pop(-1)
             new_last_item = " or ".join(last_item, allowed_items.pop(-1))
             allowed_items.append(new_last_item)
-            allowed_items_label = ", ".join(allowed_items)
+            extensions_label = ", ".join(allowed_items)
+
+        allowed_items_label = extensions_label
 
         items_label += allowed_items_label
+        label_tooltip = None
         if self._allowed_extensions:
             items_label += " of\n{}".format(
                 ", ".join(sorted(self._allowed_extensions))
             )
 
+        if self._extensions_label:
+            label_tooltip = items_label
+            items_label = self._extensions_label
+
         if self._items_label_widget.text() == items_label:
             return
 
+        self._items_label_widget.setToolTip(label_tooltip)
         self._items_label_widget.setText(items_label)
         self._update_size_timer.start()
 
@@ -618,11 +630,13 @@ class FilesView(QtWidgets.QListView):
 class FilesWidget(QtWidgets.QFrame):
     value_changed = QtCore.Signal()
 
-    def __init__(self, single_item, allow_sequences, parent):
+    def __init__(self, single_item, allow_sequences, extensions_label, parent):
         super(FilesWidget, self).__init__(parent)
         self.setAcceptDrops(True)
 
-        empty_widget = DropEmpty(single_item, allow_sequences, self)
+        empty_widget = DropEmpty(
+            single_item, allow_sequences, extensions_label, self
+        )
 
         files_model = FilesModel(single_item, allow_sequences)
         files_proxy_model = FilesProxyModel()
diff --git a/openpype/widgets/attribute_defs/widgets.py b/openpype/widgets/attribute_defs/widgets.py
index b6493b80a8..975b2df955 100644
--- a/openpype/widgets/attribute_defs/widgets.py
+++ b/openpype/widgets/attribute_defs/widgets.py
@@ -443,7 +443,10 @@ class UnknownAttrWidget(_BaseAttrDefWidget):
 class FileAttrWidget(_BaseAttrDefWidget):
     def _ui_init(self):
         input_widget = FilesWidget(
-            self.attr_def.single_item, self.attr_def.allow_sequences, self
+            self.attr_def.single_item,
+            self.attr_def.allow_sequences,
+            self.attr_def.extensions_label,
+            self
         )
 
         if self.attr_def.tooltip:

From 1baf0457baac213c2f443d02c217bcedfb5870f5 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 14 Jul 2022 14:35:31 +0200
Subject: [PATCH 212/289] added second file input for reviewables

---
 openpype/hosts/traypublisher/api/plugin.py | 38 ++++++++++++++++++----
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/openpype/hosts/traypublisher/api/plugin.py b/openpype/hosts/traypublisher/api/plugin.py
index 46fb4fdb51..cb02a5600e 100644
--- a/openpype/hosts/traypublisher/api/plugin.py
+++ b/openpype/hosts/traypublisher/api/plugin.py
@@ -1,4 +1,4 @@
-from openpype.lib.attribute_definitions import BoolDef, FileDef
+from openpype.lib.attribute_definitions import FileDef
 from openpype.pipeline import (
     Creator,
     CreatedInstance
@@ -12,6 +12,29 @@ from .pipeline import (
 )
 
 
+IMAGE_EXTENSIONS = [
+    ".ani", ".anim", ".apng", ".art", ".bmp", ".bpg", ".bsave", ".cal",
+    ".cin", ".cpc", ".cpt", ".dds", ".dpx", ".ecw", ".exr", ".fits",
+    ".flic", ".flif", ".fpx", ".gif", ".hdri", ".hevc", ".icer",
+    ".icns", ".ico", ".cur", ".ics", ".ilbm", ".jbig", ".jbig2",
+    ".jng", ".jpeg", ".jpeg-ls", ".jpeg", ".2000", ".jpg", ".xr",
+    ".jpeg", ".xt", ".jpeg-hdr", ".kra", ".mng", ".miff", ".nrrd",
+    ".ora", ".pam", ".pbm", ".pgm", ".ppm", ".pnm", ".pcx", ".pgf",
+    ".pictor", ".png", ".psb", ".psp", ".qtvr", ".ras",
+    ".rgbe", ".logluv", ".tiff", ".sgi", ".tga", ".tiff", ".tiff/ep",
+    ".tiff/it", ".ufo", ".ufp", ".wbmp", ".webp", ".xbm", ".xcf",
+    ".xpm", ".xwd"
+]
+VIDEO_EXTENSIONS = [
+    ".3g2", ".3gp", ".amv", ".asf", ".avi", ".drc", ".f4a", ".f4b",
+    ".f4p", ".f4v", ".flv", ".gif", ".gifv", ".m2v", ".m4p", ".m4v",
+    ".mkv", ".mng", ".mov", ".mp2", ".mp4", ".mpe", ".mpeg", ".mpg",
+    ".mpv", ".mxf", ".nsv", ".ogg", ".ogv", ".qt", ".rm", ".rmvb",
+    ".roq", ".svi", ".vob", ".webm", ".wmv", ".yuv"
+]
+REVIEW_EXTENSIONS = IMAGE_EXTENSIONS + VIDEO_EXTENSIONS
+
+
 class TrayPublishCreator(Creator):
     create_allow_context_change = True
     host_name = "traypublisher"
@@ -84,12 +107,16 @@ class SettingsCreator(TrayPublishCreator):
                 extensions=self.extensions,
                 allow_sequences=self.allow_sequences,
                 single_item=not self.allow_multiple_items,
-                label="Filepath",
+                label="Representations",
             ),
-            BoolDef(
+            FileDef(
                 "reviewable",
-                label="Reviewable",
-                default=self.reviewable
+                folders=False,
+                extensions=REVIEW_EXTENSIONS,
+                allow_sequences=True,
+                single_item=True,
+                label="Reviewable representations",
+                extensions_label="Single reviewable item"
             )
         ]
 
@@ -112,7 +139,6 @@ class SettingsCreator(TrayPublishCreator):
                 "extensions": item_data["extensions"],
                 "allow_sequences": item_data["allow_sequences"],
                 "allow_multiple_items": item_data["allow_multiple_items"],
-                "reviewable": item_data["reviewable"],
                 "default_variants": item_data["default_variants"]
             }
         )

From 8a6ee91ec2251939a9e9c8f5624765ad2c37b826 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 14 Jul 2022 14:36:00 +0200
Subject: [PATCH 213/289] removed reviewable key from settings (unused)

---
 .../defaults/project_settings/traypublisher.json  | 15 +--------------
 .../schema_project_traypublisher.json             |  5 -----
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/openpype/settings/defaults/project_settings/traypublisher.json b/openpype/settings/defaults/project_settings/traypublisher.json
index 619d54dbaf..80c4a6bed1 100644
--- a/openpype/settings/defaults/project_settings/traypublisher.json
+++ b/openpype/settings/defaults/project_settings/traypublisher.json
@@ -12,7 +12,6 @@
             "detailed_description": "Workfiles are full scenes from any application that are directly edited by artists. They represent a state of work on a task at a given point and are usually not directly referenced into other scenes.",
             "allow_sequences": false,
             "allow_multiple_items": false,
-            "reviewable": false,
             "extensions": [
                 ".ma",
                 ".mb",
@@ -47,7 +46,6 @@
             "detailed_description": "Models should only contain geometry data, without any extras like cameras, locators or bones.\n\nKeep in mind that models published from tray publisher are not validated for correctness. ",
             "allow_sequences": false,
             "allow_multiple_items": true,
-            "reviewable": false,
             "extensions": [
                 ".ma",
                 ".mb",
@@ -73,7 +71,6 @@
             "detailed_description": "Alembic or bgeo cache of animated data",
             "allow_sequences": true,
             "allow_multiple_items": true,
-            "reviewable": false,
             "extensions": [
                 ".abc",
                 ".bgeo",
@@ -97,7 +94,6 @@
             "detailed_description": "Any type of image seqeuence coming from outside of the studio. Usually camera footage, but could also be animatics used for reference.",
             "allow_sequences": true,
             "allow_multiple_items": true,
-            "reviewable": true,
             "extensions": [
                 ".exr",
                 ".png",
@@ -120,7 +116,6 @@
             "detailed_description": "Sequence or single file renders",
             "allow_sequences": true,
             "allow_multiple_items": true,
-            "reviewable": true,
             "extensions": [
                 ".exr",
                 ".png",
@@ -144,7 +139,6 @@
             "detailed_description": "Ideally this should be only camera itself with baked animation, however, it can technically also include helper geometry.",
             "allow_sequences": false,
             "allow_multiple_items": true,
-            "reviewable": false,
             "extensions": [
                 ".abc",
                 ".ma",
@@ -169,7 +163,6 @@
             "detailed_description": "Any image data can be published as image family. References, textures, concept art, matte paints. This is a fallback 2d family for everything that doesn't fit more specific family.",
             "allow_sequences": false,
             "allow_multiple_items": true,
-            "reviewable": true,
             "extensions": [
                 ".exr",
                 ".jpg",
@@ -193,7 +186,6 @@
             "detailed_description": "Hierarchical data structure for the efficient storage and manipulation of sparse volumetric data discretized on three-dimensional grids",
             "allow_sequences": true,
             "allow_multiple_items": true,
-            "reviewable": false,
             "extensions": [
                 ".vdb"
             ]
@@ -212,7 +204,6 @@
             "detailed_description": "Script exported from matchmoving application to be later processed into a tracked camera with additional data",
             "allow_sequences": false,
             "allow_multiple_items": true,
-            "reviewable": false,
             "extensions": []
         },
         {
@@ -225,7 +216,6 @@
             "detailed_description": "CG rigged character or prop. Rig should be clean of any extra data and directly loadable into it's respective application\t",
             "allow_sequences": false,
             "allow_multiple_items": false,
-            "reviewable": false,
             "extensions": [
                 ".ma",
                 ".blend",
@@ -238,14 +228,11 @@
             "identifier": "",
             "label": "Simple UE texture",
             "icon": "fa.image",
-            "default_variants": [
-                ""
-            ],
+            "default_variants": [],
             "description": "Simple Unreal Engine texture",
             "detailed_description": "Texture files with Unreal Engine naming conventions",
             "allow_sequences": false,
             "allow_multiple_items": true,
-            "reviewable": false,
             "extensions": []
         }
     ]
diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_traypublisher.json b/openpype/settings/entities/schemas/projects_schema/schema_project_traypublisher.json
index 269b47459c..f11621c76e 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_traypublisher.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_traypublisher.json
@@ -72,11 +72,6 @@
                         "label": "Allow multiple items",
                         "type": "boolean"
                     },
-                    {
-                        "key": "reviewable",
-                        "label": "Reviewable",
-                        "type": "boolean"
-                    },
                     {
                         "type": "list",
                         "key": "extensions",

From 64b4bdaf880a8b639e921045c4c14a2d6b0cd95b Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 14 Jul 2022 15:19:25 +0200
Subject: [PATCH 214/289] handle review representations using reviewable file
 input

---
 .../publish/collect_simple_instances.py       | 249 +++++++++++-------
 1 file changed, 154 insertions(+), 95 deletions(-)

diff --git a/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py b/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
index e8e1c1013c..b4328d948c 100644
--- a/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
+++ b/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
@@ -1,5 +1,4 @@
 import os
-import json
 import tempfile
 
 import clique
@@ -28,28 +27,6 @@ class CollectSettingsSimpleInstances(pyblish.api.InstancePlugin):
 
     hosts = ["traypublisher"]
 
-    _image_extensions = [
-        ".ani", ".anim", ".apng", ".art", ".bmp", ".bpg", ".bsave", ".cal",
-        ".cin", ".cpc", ".cpt", ".dds", ".dpx", ".ecw", ".exr", ".fits",
-        ".flic", ".flif", ".fpx", ".gif", ".hdri", ".hevc", ".icer",
-        ".icns", ".ico", ".cur", ".ics", ".ilbm", ".jbig", ".jbig2",
-        ".jng", ".jpeg", ".jpeg-ls", ".jpeg", ".2000", ".jpg", ".xr",
-        ".jpeg", ".xt", ".jpeg-hdr", ".kra", ".mng", ".miff", ".nrrd",
-        ".ora", ".pam", ".pbm", ".pgm", ".ppm", ".pnm", ".pcx", ".pgf",
-        ".pictor", ".png", ".psb", ".psp", ".qtvr", ".ras",
-        ".rgbe", ".logluv", ".tiff", ".sgi", ".tga", ".tiff", ".tiff/ep",
-        ".tiff/it", ".ufo", ".ufp", ".wbmp", ".webp", ".xbm", ".xcf",
-        ".xpm", ".xwd"
-    ]
-    _video_extensions = [
-        ".3g2", ".3gp", ".amv", ".asf", ".avi", ".drc", ".f4a", ".f4b",
-        ".f4p", ".f4v", ".flv", ".gif", ".gifv", ".m2v", ".m4p", ".m4v",
-        ".mkv", ".mng", ".mov", ".mp2", ".mp4", ".mpe", ".mpeg", ".mpg",
-        ".mpv", ".mxf", ".nsv", ".ogg", ".ogv", ".qt", ".rm", ".rmvb",
-        ".roq", ".svi", ".vob", ".webm", ".wmv", ".yuv"
-    ]
-    _review_extensions = _image_extensions + _video_extensions
-
     def process(self, instance):
         if not instance.data.get("settings_creator"):
             return
@@ -64,97 +41,133 @@ class CollectSettingsSimpleInstances(pyblish.api.InstancePlugin):
             "Created temp staging directory for instance {}. {}"
         ).format(instance_label, tmp_folder))
 
-        repres = instance.data["representations"]
+        # Store filepaths for validation of their existence
+        source_filepaths = []
+        # Make sure there are no representations with same name
+        repre_names_counter = {}
+        # Store created names for logging
+        repre_names = []
+        # Store set of filepaths per each representation
+        representation_files_mapping = []
+        source = self._create_main_representations(
+            instance,
+            source_filepaths,
+            repre_names_counter,
+            repre_names,
+            representation_files_mapping
+        )
 
+        self._create_review_representation(
+            instance,
+            source_filepaths,
+            repre_names_counter,
+            repre_names,
+            representation_files_mapping
+        )
+
+        instance.data["source"] = source
+        instance.data["sourceFilepaths"] = list(set(source_filepaths))
+
+        self.log.debug(
+            (
+                "Created Simple Settings instance \"{}\""
+                " with {} representations: {}"
+            ).format(
+                instance_label,
+                len(instance.data["representations"]),
+                ", ".join(repre_names)
+            )
+        )
+
+    def _create_main_representations(
+        self,
+        instance,
+        source_filepaths,
+        repre_names_counter,
+        repre_names,
+        representation_files_mapping
+    ):
         creator_attributes = instance.data["creator_attributes"]
-        self.log.info(json.dumps(creator_attributes))
         filepath_items = creator_attributes["filepath"]
         if not isinstance(filepath_items, list):
             filepath_items = [filepath_items]
 
-        # Last found representation is used as source for instance
         source = None
-        # Check if review is enabled and should be created
-        reviewable = creator_attributes.get("reviewable")
-        # Store review representation - first found that can be used for
-        #   review is stored
-        review_representation = None
-        review_path = None
-
-        # Make sure there are no representations with same name
-        repre_names_counter = {}
-        # Store created names for logging
-        _repre_names = []
-        # Store filepaths for validation of their existence
-        source_filepaths = []
-
-        # Create representations
         for filepath_item in filepath_items:
-            filepaths = [
+            # Skip if filepath item does not have filenames
+            if not filepath_item["filenames"]:
+                continue
+
+            filepaths = {
                 os.path.join(filepath_item["directory"], filename)
                 for filename in filepath_item["filenames"]
-            ]
+            }
             source_filepaths.extend(filepaths)
 
             source = self._calculate_source(filepaths)
-            filenames = filepath_item["filenames"]
-            _, ext = os.path.splitext(filenames[0])
-            if len(filenames) == 1:
-                filenames = filenames[0]
-
-            repre_name = repre_ext = ext[1:]
-            if repre_name not in repre_names_counter:
-                repre_names_counter[repre_name] = 2
-            else:
-                counter = repre_names_counter[repre_name]
-                repre_names_counter[repre_name] += 1
-                repre_name = "{}_{}".format(repre_name, counter)
-
-            _repre_names.append('"{}"'.format(repre_name))
-            representation = {
-                "ext": repre_ext,
-                "name": repre_name,
-                "stagingDir": filepath_item["directory"],
-                "files": filenames,
-                "tags": []
-            }
-            repres.append(representation)
-
-            if (
-                reviewable
-                and review_representation is None
-                and ext in self._review_extensions
-            ):
-                review_representation = representation
-                review_path = source
-
-        instance.data["source"] = source
-        instance.data["sourceFilepaths"] = source_filepaths
-
-        if reviewable:
-            self._prepare_review(instance, review_representation, review_path)
-
-        self.log.debug((
-            "Created Simple Settings instance \"{}\""
-            " with {} representations: {}"
-        ).format(instance_label, len(repres), ", ".join(_repre_names)))
-
-    def _calculate_source(self, filepaths):
-        cols, rems = clique.assemble(filepaths)
-        if cols:
-            source = cols[0].format("{head}{padding}{tail}")
-        elif rems:
-            source = rems[0]
+            representation = self._create_representation_data(
+                filepath_item, repre_names_counter, repre_names
+            )
+            instance.data["representations"].append(representation)
+            representation_files_mapping.append(
+                (filepaths, representation, source)
+            )
         return source
 
-    def _prepare_review(self, instance, review_representation, review_path):
-        if not review_representation:
+    def _create_review_representation(
+        self,
+        instance,
+        source_filepaths,
+        repre_names_counter,
+        repre_names,
+        representation_files_mapping
+    ):
+        # Skip review representation creation if there are no representations
+        #   created for "main" part
+        #   - review representation must not be created in that case so
+        #       validation can care about it
+        if not representation_files_mapping:
             self.log.warning((
-                "Didn't find any representation"
-                " that could be used as source for review"
+                "There are missing source representations."
+                " Creation of review representation was skipped."
             ))
             return
 
+        creator_attributes = instance.data["creator_attributes"]
+        review_file_item = creator_attributes["reviewable"]
+        filenames = review_file_item.get("filenames")
+        if not filenames:
+            self.log.debug((
+                "Filepath for review is not defined."
+                " Skipping review representation creation."
+            ))
+            return
+
+        filepaths = {
+            os.path.join(review_file_item["directory"], filename)
+            for filename in filenames
+        }
+        source_filepaths.extend(filepaths)
+        # First try to find out representation with same filepaths
+        #   so it's not needed to create new representation just for review
+        review_representation = None
+        # Review path (only for logging)
+        review_path = None
+        for item in representation_files_mapping:
+            _filepaths, representation, repre_path = item
+            if _filepaths == filepaths:
+                review_representation = representation
+                review_path = repre_path
+                break
+
+        if review_representation is None:
+            self.log.debug("Creating new review representation")
+            review_path = self._calculate_source(filepaths)
+            review_representation = self._create_representation_data(
+                review_file_item, repre_names_counter, repre_names
+            )
+            instance.data["representations"].append(review_representation)
+
         if "review" not in instance.data["families"]:
             instance.data["families"].append("review")
 
@@ -162,3 +175,49 @@ class CollectSettingsSimpleInstances(pyblish.api.InstancePlugin):
         self.log.debug("Representation {} was marked for review. {}".format(
             review_representation["name"], review_path
         ))
+
+    def _create_representation_data(
+        self, filepath_item, repre_names_counter, repre_names
+    ):
+        """Create new representation data based on file item.
+
+        Args:
+            filepath_item (Dict[str, Any]): Item with information about
+                representation paths.
+            repre_names_counter (Dict[str, int]): Store count of representation
+                names.
+            repre_names (List[str]): All used representation names. For
+                logging purposes.
+
+        Returns:
+            Dict: Prepared base representation data.
+        """
+
+        filenames = filepath_item["filenames"]
+        _, ext = os.path.splitext(filenames[0])
+        if len(filenames) == 1:
+            filenames = filenames[0]
+
+        repre_name = repre_ext = ext[1:]
+        if repre_name not in repre_names_counter:
+            repre_names_counter[repre_name] = 2
+        else:
+            counter = repre_names_counter[repre_name]
+            repre_names_counter[repre_name] += 1
+            repre_name = "{}_{}".format(repre_name, counter)
+        repre_names.append(repre_names)
+        return {
+            "ext": repre_ext,
+            "name": repre_name,
+            "stagingDir": filepath_item["directory"],
+            "files": filenames,
+            "tags": []
+        }
+
+    def _calculate_source(self, filepaths):
+        cols, rems = clique.assemble(filepaths)
+        if cols:
+            source = cols[0].format("{head}{padding}{tail}")
+        elif rems:
+            source = rems[0]
+        return source

From 1561a4790661dbfe1411b31fe58dcf77cb4bacf7 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 14 Jul 2022 15:19:45 +0200
Subject: [PATCH 215/289] changed key 'filepath' to 'representation_files'

---
 openpype/hosts/traypublisher/api/plugin.py                      | 2 +-
 .../traypublisher/plugins/publish/collect_simple_instances.py   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/openpype/hosts/traypublisher/api/plugin.py b/openpype/hosts/traypublisher/api/plugin.py
index cb02a5600e..9b9425855e 100644
--- a/openpype/hosts/traypublisher/api/plugin.py
+++ b/openpype/hosts/traypublisher/api/plugin.py
@@ -102,7 +102,7 @@ class SettingsCreator(TrayPublishCreator):
     def get_instance_attr_defs(self):
         return [
             FileDef(
-                "filepath",
+                "representation_files",
                 folders=False,
                 extensions=self.extensions,
                 allow_sequences=self.allow_sequences,
diff --git a/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py b/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
index b4328d948c..15dac9a4c0 100644
--- a/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
+++ b/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
@@ -88,7 +88,7 @@ class CollectSettingsSimpleInstances(pyblish.api.InstancePlugin):
         representation_files_mapping
     ):
         creator_attributes = instance.data["creator_attributes"]
-        filepath_items = creator_attributes["filepath"]
+        filepath_items = creator_attributes["representation_files"]
         if not isinstance(filepath_items, list):
             filepath_items = [filepath_items]
 

From 2b1654a1e24d70c215cbfcc4e8d0922dcb663a9f Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 14 Jul 2022 15:22:19 +0200
Subject: [PATCH 216/289] fix variable usage

---
 .../traypublisher/plugins/publish/collect_simple_instances.py   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py b/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
index 15dac9a4c0..a5b95138bd 100644
--- a/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
+++ b/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
@@ -205,7 +205,7 @@ class CollectSettingsSimpleInstances(pyblish.api.InstancePlugin):
             counter = repre_names_counter[repre_name]
             repre_names_counter[repre_name] += 1
             repre_name = "{}_{}".format(repre_name, counter)
-        repre_names.append(repre_names)
+        repre_names.append(repre_name)
         return {
             "ext": repre_ext,
             "name": repre_name,

From 97492867cbcbc528499dc7c0c4490fafa4e945c3 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 14 Jul 2022 16:11:01 +0200
Subject: [PATCH 217/289] modified docstring

---
 .../plugins/publish/collect_simple_instances.py       | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py b/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
index a5b95138bd..c0ae694c3c 100644
--- a/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
+++ b/openpype/hosts/traypublisher/plugins/publish/collect_simple_instances.py
@@ -8,15 +8,20 @@ import pyblish.api
 class CollectSettingsSimpleInstances(pyblish.api.InstancePlugin):
     """Collect data for instances created by settings creators.
 
-    Plugin create representations based on 'filepath' attribute stored
-    on instance.
+    Plugin create representations for simple instances based
+    on 'representation_files' attribute stored on instance data.
+
+    There is also possibility to have reviewable representation which can be
+    stored under 'reviewable' attribute stored on instance data. If there was
+    already created representation with the same files as 'revieable' containes
 
     Representations can be marked for review and in that case is also added
     'review' family to instance families. For review can be marked only one
     representation so **first** representation that has extension available
     in '_review_extensions' is used for review.
 
-    For 'source' on instance is used path from last created representation.
+    For instance 'source' is used path from last representation created
+    from 'representation_files'.
 
     Set staging directory on instance. That is probably never used because
     each created representation has it's own staging dir.

From c3649e0a571048cb0660656ce9dcf10176399b5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= <ondrej.samohel@pype.club>
Date: Thu, 14 Jul 2022 16:31:32 +0200
Subject: [PATCH 218/289] :bug: fix rfm api context for getting displays and
 multipart flag

---
 openpype/hosts/maya/api/lib_renderproducts.py | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/openpype/hosts/maya/api/lib_renderproducts.py b/openpype/hosts/maya/api/lib_renderproducts.py
index 2d3bda5245..a8337ccf4d 100644
--- a/openpype/hosts/maya/api/lib_renderproducts.py
+++ b/openpype/hosts/maya/api/lib_renderproducts.py
@@ -1087,7 +1087,7 @@ class RenderProductsRenderman(ARenderProducts):
             "d_tiff": "tif"
         }
 
-        displays = get_displays()["displays"]
+        displays = get_displays(override_dst="render")["displays"]
         for name, display in displays.items():
             enabled = display["params"]["enable"]["value"]
             if not enabled:
@@ -1106,9 +1106,16 @@ class RenderProductsRenderman(ARenderProducts):
                 display["driverNode"]["type"], "exr")
 
             for camera in cameras:
-                product = RenderProduct(productName=aov_name,
-                                        ext=extensions,
-                                        camera=camera)
+                # Create render product and set it as multipart only on
+                # display types supporting it. In all other cases, Renderman
+                # will create separate output per channel.
+                product = RenderProduct(
+                    productName=aov_name,
+                    ext=extensions,
+                    camera=camera,
+                    multipart=display["driverNode"]["type"] in ["d_openexr", "d_deepexr", "d_tiff"]  # noqa
+                )
+
                 products.append(product)
 
         return products

From fbd239299f70105486db3276c218adfcccdf1e82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= <ondrej.samohel@pype.club>
Date: Thu, 14 Jul 2022 17:00:26 +0200
Subject: [PATCH 219/289] :recycle: comment on non-multipart code and raise
 exception

---
 openpype/hosts/maya/api/lib_renderproducts.py | 32 +++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/openpype/hosts/maya/api/lib_renderproducts.py b/openpype/hosts/maya/api/lib_renderproducts.py
index a8337ccf4d..0bc8682290 100644
--- a/openpype/hosts/maya/api/lib_renderproducts.py
+++ b/openpype/hosts/maya/api/lib_renderproducts.py
@@ -1109,12 +1109,28 @@ class RenderProductsRenderman(ARenderProducts):
                 # Create render product and set it as multipart only on
                 # display types supporting it. In all other cases, Renderman
                 # will create separate output per channel.
-                product = RenderProduct(
-                    productName=aov_name,
-                    ext=extensions,
-                    camera=camera,
-                    multipart=display["driverNode"]["type"] in ["d_openexr", "d_deepexr", "d_tiff"]  # noqa
-                )
+                if display["driverNode"]["type"] in ["d_openexr", "d_deepexr", "d_tiff"]:  # noqa
+                    product = RenderProduct(
+                        productName=aov_name,
+                        ext=extensions,
+                        camera=camera,
+                        multipart=True
+                    )
+                else:
+                    # this code should handle the case where no multipart
+                    # capable format is selected. But since it involves
+                    # shady logic to determine what channel become what
+                    # lets not do that as all productions will use exr anyway.
+                    """
+                    for channel in display['params']['displayChannels']['value']:  # noqa
+                        product = RenderProduct(
+                            productName="{}_{}".format(aov_name, channel),
+                            ext=extensions,
+                            camera=camera,
+                            multipart=False
+                        )
+                    """
+                    raise UnsupportedImageFormatException("Only exr, deep exr and tiff formats are supported.")
 
                 products.append(product)
 
@@ -1208,3 +1224,7 @@ class UnsupportedRendererException(Exception):
 
     Raised when requesting data from unsupported renderer.
     """
+
+
+class UnsupportedImageFormatException(Exception):
+    """Custom exception to report unsupported output image format."""

From ef5b571ea6dbfae4df12a18f8412a4e90a88cf1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= <ondrej.samohel@pype.club>
Date: Thu, 14 Jul 2022 17:17:25 +0200
Subject: [PATCH 220/289] :dog: hound fix

---
 openpype/hosts/maya/api/lib_renderproducts.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openpype/hosts/maya/api/lib_renderproducts.py b/openpype/hosts/maya/api/lib_renderproducts.py
index 0bc8682290..123b934428 100644
--- a/openpype/hosts/maya/api/lib_renderproducts.py
+++ b/openpype/hosts/maya/api/lib_renderproducts.py
@@ -1130,7 +1130,8 @@ class RenderProductsRenderman(ARenderProducts):
                             multipart=False
                         )
                     """
-                    raise UnsupportedImageFormatException("Only exr, deep exr and tiff formats are supported.")
+                    raise UnsupportedImageFormatException(
+                        "Only exr, deep exr and tiff formats are supported.")
 
                 products.append(product)
 

From f346fb8cfd3b59d85b961cba5026cd8e0f66e21a Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 14 Jul 2022 17:38:01 +0200
Subject: [PATCH 221/289] implemented helper function for loading of internal
 data

---
 .../widgets/attribute_defs/files_widget.py    | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/openpype/widgets/attribute_defs/files_widget.py b/openpype/widgets/attribute_defs/files_widget.py
index 508da4893b..9b4b1d6dc7 100644
--- a/openpype/widgets/attribute_defs/files_widget.py
+++ b/openpype/widgets/attribute_defs/files_widget.py
@@ -27,6 +27,20 @@ IS_SEQUENCE_ROLE = QtCore.Qt.UserRole + 7
 EXT_ROLE = QtCore.Qt.UserRole + 8
 
 
+def convert_bytes_to_json(bytes_value):
+    if isinstance(bytes_value, QtCore.QByteArray):
+        # Raw data are already QByteArray and we don't have to load them
+        encoded_data = bytes_value
+    else:
+        encoded_data = QtCore.QByteArray.fromRawData(bytes_value)
+    stream = QtCore.QDataStream(encoded_data, QtCore.QIODevice.ReadOnly)
+    text = stream.readQString()
+    try:
+        return json.loads(text)
+    except Exception:
+        return None
+
+
 class SupportLabel(QtWidgets.QLabel):
     pass
 
@@ -300,17 +314,10 @@ class FilesModel(QtGui.QStandardItemModel):
         return mime_data
 
     def dropMimeData(self, mime_data, action, row, col, index):
-        internal_move_data = mime_data.data("files_widget/internal_move")
-        if isinstance(internal_move_data, QtCore.QByteArray):
-            # Raw data are already QByteArrat and we don't have to load them
-            encoded_data = internal_move_data
-        else:
-            encoded_data = QtCore.QByteArray.fromRawData(internal_move_data)
-        stream = QtCore.QDataStream(encoded_data, QtCore.QIODevice.ReadOnly)
-        text = stream.readQString()
-        try:
-            item_ids = json.loads(text)
-        except Exception:
+        item_ids = convert_bytes_to_json(
+            mime_data.data("files_widget/internal_move")
+        )
+        if item_ids is None:
             return False
 
         # Find matching item after which will be items moved

From ef515039a0a356f2ad5571f20d20976ae799563a Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 14 Jul 2022 17:40:01 +0200
Subject: [PATCH 222/289] added helper method for conversion of data to bytes

---
 openpype/widgets/attribute_defs/files_widget.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/openpype/widgets/attribute_defs/files_widget.py b/openpype/widgets/attribute_defs/files_widget.py
index 9b4b1d6dc7..26398020ed 100644
--- a/openpype/widgets/attribute_defs/files_widget.py
+++ b/openpype/widgets/attribute_defs/files_widget.py
@@ -41,6 +41,13 @@ def convert_bytes_to_json(bytes_value):
         return None
 
 
+def convert_data_to_bytes(data):
+    bytes_value = QtCore.QByteArray()
+    stream = QtCore.QDataStream(bytes_value, QtCore.QIODevice.WriteOnly)
+    stream.writeQString(json.dumps(data))
+    return bytes_value
+
+
 class SupportLabel(QtWidgets.QLabel):
     pass
 
@@ -306,11 +313,10 @@ class FilesModel(QtGui.QStandardItemModel):
             index.data(ITEM_ID_ROLE)
             for index in indexes
         ]
-        encoded_data = QtCore.QByteArray()
-        stream = QtCore.QDataStream(encoded_data, QtCore.QIODevice.WriteOnly)
-        stream.writeQString(json.dumps(item_ids))
-        mime_data = super(FilesModel, self).mimeData(indexes)
-        mime_data.setData("files_widget/internal_move", encoded_data)
+
+        item_ids_data = convert_data_to_bytes(item_ids)
+        mime_data = QtCore.QMimeData()
+        mime_data.setData("files_widget/internal_move", item_ids_data)
         return mime_data
 
     def dropMimeData(self, mime_data, action, row, col, index):

From 53dd6cf11159b7732ce81ff05a533dd7e4affaa0 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 14 Jul 2022 17:45:39 +0200
Subject: [PATCH 223/289] it is possible to move file items across widgets

---
 .../widgets/attribute_defs/files_widget.py    | 65 ++++++++++++++++++-
 1 file changed, 64 insertions(+), 1 deletion(-)

diff --git a/openpype/widgets/attribute_defs/files_widget.py b/openpype/widgets/attribute_defs/files_widget.py
index 26398020ed..98f1d2738a 100644
--- a/openpype/widgets/attribute_defs/files_widget.py
+++ b/openpype/widgets/attribute_defs/files_widget.py
@@ -225,6 +225,7 @@ class FilesModel(QtGui.QStandardItemModel):
     def __init__(self, single_item, allow_sequences):
         super(FilesModel, self).__init__()
 
+        self._id = str(uuid.uuid4())
         self._single_item = single_item
         self._multivalue = False
         self._allow_sequences = allow_sequences
@@ -234,6 +235,10 @@ class FilesModel(QtGui.QStandardItemModel):
         self._filenames_by_dirpath = collections.defaultdict(set)
         self._items_by_dirpath = collections.defaultdict(list)
 
+    @property
+    def id(self):
+        return self._id
+
     def set_multivalue(self, multivalue):
         """Disable filtering."""
 
@@ -315,8 +320,20 @@ class FilesModel(QtGui.QStandardItemModel):
         ]
 
         item_ids_data = convert_data_to_bytes(item_ids)
-        mime_data = QtCore.QMimeData()
+        mime_data = super(FilesModel, self).mimeData(indexes)
         mime_data.setData("files_widget/internal_move", item_ids_data)
+
+        file_items = []
+        for item_id in item_ids:
+            file_item = self.get_file_item_by_id(item_id)
+            if file_item:
+                file_items.append(file_item.to_dict())
+
+        full_item_data = convert_data_to_bytes({
+            "items": file_items,
+            "id": self._id
+        })
+        mime_data.setData("files_widget/full_data", full_item_data)
         return mime_data
 
     def dropMimeData(self, mime_data, action, row, col, index):
@@ -858,6 +875,11 @@ class FilesWidget(QtWidgets.QFrame):
                 event.setDropAction(QtCore.Qt.CopyAction)
                 event.accept()
 
+        full_data_value = mime_data.data("files_widget/full_data")
+        if self._handle_full_data_drag(full_data_value):
+            event.setDropAction(QtCore.Qt.CopyAction)
+            event.accept()
+
     def dragLeaveEvent(self, event):
         event.accept()
 
@@ -868,6 +890,7 @@ class FilesWidget(QtWidgets.QFrame):
         mime_data = event.mimeData()
         if mime_data.hasUrls():
             event.accept()
+            # event.setDropAction(QtCore.Qt.CopyAction)
             filepaths = []
             for url in mime_data.urls():
                 filepath = url.toLocalFile()
@@ -879,8 +902,48 @@ class FilesWidget(QtWidgets.QFrame):
             if filepaths:
                 self._add_filepaths(filepaths)
 
+        if self._handle_full_data_drop(
+            mime_data.data("files_widget/full_data")
+        ):
+            event.accept()
+            event.setDropAction(QtCore.Qt.CopyAction)
+
+        # print(self._files_model.id, event)
         super(FilesWidget, self).dropEvent(event)
 
+    def _handle_full_data_drag(self, value):
+        if value is None:
+            return False
+
+        full_data = convert_bytes_to_json(value)
+        if full_data is None:
+            return False
+
+        if full_data["id"] == self._files_model.id:
+            return False
+        return True
+
+    def _handle_full_data_drop(self, value):
+        if value is None:
+            return False
+
+        full_data = convert_bytes_to_json(value)
+        if full_data is None:
+            return False
+
+        if full_data["id"] == self._files_model.id:
+            return False
+
+        for item in full_data["items"]:
+            filepaths = [
+                os.path.join(item["directory"], filename)
+                for filename in item["filenames"]
+            ]
+            filepaths = self._files_proxy_model.filter_valid_files(filepaths)
+            if filepaths:
+                self._add_filepaths(filepaths)
+        return True
+
     def _add_filepaths(self, filepaths):
         self._files_model.add_filepaths(filepaths)
         self._update_visibility()

From 9a83b83bb53837ffc84fb72f347a5c8875d9f6c1 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 14 Jul 2022 17:50:24 +0200
Subject: [PATCH 224/289] it is possible to copy file items

---
 openpype/widgets/attribute_defs/files_widget.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/openpype/widgets/attribute_defs/files_widget.py b/openpype/widgets/attribute_defs/files_widget.py
index 98f1d2738a..d29aa1b607 100644
--- a/openpype/widgets/attribute_defs/files_widget.py
+++ b/openpype/widgets/attribute_defs/files_widget.py
@@ -905,10 +905,9 @@ class FilesWidget(QtWidgets.QFrame):
         if self._handle_full_data_drop(
             mime_data.data("files_widget/full_data")
         ):
-            event.accept()
             event.setDropAction(QtCore.Qt.CopyAction)
+            event.accept()
 
-        # print(self._files_model.id, event)
         super(FilesWidget, self).dropEvent(event)
 
     def _handle_full_data_drag(self, value):
@@ -942,8 +941,19 @@ class FilesWidget(QtWidgets.QFrame):
             filepaths = self._files_proxy_model.filter_valid_files(filepaths)
             if filepaths:
                 self._add_filepaths(filepaths)
+
+        if self._copy_modifiers_enabled():
+            return False
         return True
 
+    def _copy_modifiers_enabled(self):
+        if (
+            QtWidgets.QApplication.keyboardModifiers()
+            & QtCore.Qt.ControlModifier
+        ):
+            return True
+        return False
+
     def _add_filepaths(self, filepaths):
         self._files_model.add_filepaths(filepaths)
         self._update_visibility()

From e0fe2e84b5225a47e9c64472a91d74691d46f5dc Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 14 Jul 2022 18:22:48 +0200
Subject: [PATCH 225/289] remove unnecessary line edit

---
 openpype/widgets/attribute_defs/widgets.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/openpype/widgets/attribute_defs/widgets.py b/openpype/widgets/attribute_defs/widgets.py
index e4c4aba170..d0ba8814c7 100644
--- a/openpype/widgets/attribute_defs/widgets.py
+++ b/openpype/widgets/attribute_defs/widgets.py
@@ -379,11 +379,6 @@ class EnumAttrWidget(_BaseAttrDefWidget):
         combo_delegate = QtWidgets.QStyledItemDelegate(input_widget)
         input_widget.setItemDelegate(combo_delegate)
 
-        line_edit = QtWidgets.QLineEdit(input_widget)
-        line_edit.setReadOnly(True)
-        line_edit.setAttribute(QtCore.Qt.WA_TransparentForMouseEvents)
-        input_widget.setLineEdit(line_edit)
-
         if self.attr_def.tooltip:
             input_widget.setToolTip(self.attr_def.tooltip)
 

From a6c029d9fb1462054ca74817393beaebf32c7346 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 15 Jul 2022 10:13:32 +0200
Subject: [PATCH 226/289] skip validation of zou id

---
 openpype/modules/kitsu/utils/sync_service.py | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/openpype/modules/kitsu/utils/sync_service.py b/openpype/modules/kitsu/utils/sync_service.py
index 3848eda7ae..441b95a7ec 100644
--- a/openpype/modules/kitsu/utils/sync_service.py
+++ b/openpype/modules/kitsu/utils/sync_service.py
@@ -4,7 +4,8 @@ import gazu
 
 from openpype.client import (
     get_project,
-    get_assets
+    get_assets,
+    get_asset_by_name
 )
 from openpype.pipeline import AvalonMongoDB
 from .credentials import validate_credentials
@@ -350,18 +351,8 @@ class Listener:
 
         # Find asset doc
         parent_name = task["entity"]["name"]
-        parent_zou_id = task["entity"]["id"]
-        asset_docs = get_assets(
-            project_name,
-            asset_names=[parent_name],
-            fields=["_id", "data.zou.id", "data.tasks"]
-        )
-        asset_doc = None
-        for _asset_doc in asset_docs:
-            doc_zou_id = _asset_doc.get("data", {}).get("zou", {}).get("id")
-            if doc_zou_id == parent_zou_id:
-                asset_doc = _asset_doc
-                break
+
+        asset_doc = get_asset_by_name(project_name, parent_name)
 
         # Update asset tasks with new one
         asset_tasks = asset_doc["data"].get("tasks")

From c210c93b325aaef0aac5f90fddbe5253a4702166 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 15 Jul 2022 10:15:32 +0200
Subject: [PATCH 227/289] changes from comments

---
 openpype/modules/kitsu/utils/update_op_with_zou.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/openpype/modules/kitsu/utils/update_op_with_zou.py b/openpype/modules/kitsu/utils/update_op_with_zou.py
index a68d6d31c3..4695a49159 100644
--- a/openpype/modules/kitsu/utils/update_op_with_zou.py
+++ b/openpype/modules/kitsu/utils/update_op_with_zou.py
@@ -39,14 +39,14 @@ def create_op_asset(gazu_entity: dict) -> dict:
     }
 
 
-def get_kitsu_project_name(project_id: str)->str:
+def get_kitsu_project_name(project_id: str) -> str:
     """Get project name based on project id in kitsu.
 
     Args:
-        project_id (str): Id of project in Kitsu.
+        project_id (str): UUID of project in Kitsu.
 
     Returns:
-        str: Project name which has project in Kitsu.
+        str: Name of Kitsu project.
     """
 
     project = gazu.project.get_project(project_id)
@@ -178,7 +178,7 @@ def update_op_assets(
             asset_doc_ids[parent_zou_id]["_id"] if parent_zou_id else None
         )
         if visual_parent_doc_id is None:
-            # Find root folder doc
+            # Find root folder docs
             root_folder_docs = get_assets(
                 project_name,
                 asset_name=[entity_parent_folders[-1]],

From baa1256b380630b0d23f4a57ed34431e947d4c85 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 15 Jul 2022 11:22:22 +0200
Subject: [PATCH 228/289] added settings to define when cycle review session
 creation happens

---
 .../defaults/project_settings/ftrack.json     |  5 ++++
 .../schema_project_ftrack.json                | 25 +++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/openpype/settings/defaults/project_settings/ftrack.json b/openpype/settings/defaults/project_settings/ftrack.json
index 831c34835e..b102b340be 100644
--- a/openpype/settings/defaults/project_settings/ftrack.json
+++ b/openpype/settings/defaults/project_settings/ftrack.json
@@ -124,6 +124,11 @@
                 "Project Manager"
             ],
             "cycle_enabled": false,
+            "cycle_hour_start": [
+                0,
+                0,
+                0
+            ],
             "review_session_template": "{yy}{mm}{dd}"
         }
     },
diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_ftrack.json b/openpype/settings/entities/schemas/projects_schema/schema_project_ftrack.json
index c0069dcdab..4119184ca9 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_ftrack.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_ftrack.json
@@ -412,6 +412,31 @@
                             "key": "cycle_enabled",
                             "label": "Create daily review session"
                         },
+                        {
+                            "type": "list-strict",
+                            "key": "cycle_hour_start",
+                            "label": "Create daily review session at",
+                            "tooltip": "This may take affect on next day",
+                            "object_types": [
+                                {
+                                    "label": "HMS",
+                                    "type": "number",
+                                    "minimum": 0,
+                                    "maximum": 23,
+                                    "decimal": 0
+                                }, {
+                                    "type": "number",
+                                    "minimum": 0,
+                                    "maximum": 59,
+                                    "decimal": 0
+                                }, {
+                                    "type": "number",
+                                    "minimum": 0,
+                                    "maximum": 59,
+                                    "decimal": 0
+                                }
+                            ]
+                        },
                         {
                             "type": "separator"
                         },

From beb53f7ccb513cd37a54a19b366ecccf120b8605 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 15 Jul 2022 11:23:07 +0200
Subject: [PATCH 229/289] use time settings to determine when to trigger
 creation

---
 .../action_create_review_session.py           | 63 ++++++++++++-------
 1 file changed, 42 insertions(+), 21 deletions(-)

diff --git a/openpype/modules/ftrack/event_handlers_server/action_create_review_session.py b/openpype/modules/ftrack/event_handlers_server/action_create_review_session.py
index 8a8e86e7b9..68d498a83a 100644
--- a/openpype/modules/ftrack/event_handlers_server/action_create_review_session.py
+++ b/openpype/modules/ftrack/event_handlers_server/action_create_review_session.py
@@ -6,7 +6,10 @@ import collections
 import ftrack_api
 
 from openpype.lib import get_datetime_data
-from openpype.api import get_project_settings
+from openpype.settings.lib import (
+    get_project_settings,
+    get_default_project_settings
+)
 from openpype_modules.ftrack.lib import ServerAction
 
 
@@ -79,6 +82,35 @@ class CreateDailyReviewSessionServerAction(ServerAction):
         )
         return True
 
+    def _calculate_next_cycle_delta(self):
+        studio_default_settings = get_default_project_settings()
+        action_settings = (
+            studio_default_settings
+            ["ftrack"]
+            [self.settings_frack_subkey]
+            [self.settings_key]
+        )
+        cycle_hour_start = action_settings.get("cycle_hour_start")
+        if not cycle_hour_start:
+            h = m = s = 0
+        else:
+            h, m, s = cycle_hour_start
+
+        # Create threading timer which will trigger creation of report
+        #   at the 00:00:01 of next day
+        # - callback will trigger another timer which will have 1 day offset
+        now = datetime.datetime.now()
+        # Create object of today morning
+        expected_next_trigger = datetime.datetime(
+            now.year, now.month, now.day, h, m, s
+        )
+        if expected_next_trigger > now:
+            seconds = (expected_next_trigger - now).total_seconds()
+        else:
+            expected_next_trigger += self._day_delta
+            seconds = (expected_next_trigger - now).total_seconds()
+        return seconds, expected_next_trigger
+
     def register(self, *args, **kwargs):
         """Override register to be able trigger """
         # Register server action as would be normally
@@ -86,22 +118,12 @@ class CreateDailyReviewSessionServerAction(ServerAction):
             *args, **kwargs
         )
 
-        # Create threading timer which will trigger creation of report
-        #   at the 00:00:01 of next day
-        # - callback will trigger another timer which will have 1 day offset
-        now = datetime.datetime.now()
-        # Create object of today morning
-        today_morning = datetime.datetime(
-            now.year, now.month, now.day, 0, 0, 1
-        )
-        # Add a day delta (to calculate next day date)
-        next_day_morning = today_morning + self._day_delta
-        # Calculate first delta in seconds for first threading timer
-        first_delta = (next_day_morning - now).total_seconds()
+        seconds_delta, cycle_time = self._calculate_next_cycle_delta()
+
         # Store cycle time which will be used to create next timer
-        self._last_cyle_time = next_day_morning
+        self._last_cyle_time = cycle_time
         # Create timer thread
-        self._cycle_timer = threading.Timer(first_delta, self._timer_callback)
+        self._cycle_timer = threading.Timer(seconds_delta, self._timer_callback)
         self._cycle_timer.start()
 
         self._check_review_session()
@@ -111,13 +133,12 @@ class CreateDailyReviewSessionServerAction(ServerAction):
             self._cycle_timer is not None
             and self._last_cyle_time is not None
         ):
-            now = datetime.datetime.now()
-            while self._last_cyle_time < now:
-                self._last_cyle_time = self._last_cyle_time + self._day_delta
+            seconds_delta, cycle_time = self._calculate_next_cycle_delta()
+            self._last_cyle_time = cycle_time
 
-            delay = (self._last_cyle_time - now).total_seconds()
-
-            self._cycle_timer = threading.Timer(delay, self._timer_callback)
+            self._cycle_timer = threading.Timer(
+                seconds_delta, self._timer_callback
+            )
             self._cycle_timer.start()
         self._check_review_session()
 

From e74f526def58d48fe5d77c44ea5b3615d595da4b Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 15 Jul 2022 11:42:48 +0200
Subject: [PATCH 230/289] modified labels

---
 .../projects_schema/schema_project_ftrack.json      | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_ftrack.json b/openpype/settings/entities/schemas/projects_schema/schema_project_ftrack.json
index 4119184ca9..e008fd85ee 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_ftrack.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_ftrack.json
@@ -410,7 +410,10 @@
                         {
                             "type": "boolean",
                             "key": "cycle_enabled",
-                            "label": "Create daily review session"
+                            "label": "Run automatically every day"
+                        },
+                        {
+                            "type": "separator"
                         },
                         {
                             "type": "list-strict",
@@ -419,17 +422,19 @@
                             "tooltip": "This may take affect on next day",
                             "object_types": [
                                 {
-                                    "label": "HMS",
+                                    "label": "H:",
                                     "type": "number",
                                     "minimum": 0,
                                     "maximum": 23,
                                     "decimal": 0
                                 }, {
+                                    "label": "M:",
                                     "type": "number",
                                     "minimum": 0,
                                     "maximum": 59,
                                     "decimal": 0
                                 }, {
+                                    "label": "S:",
                                     "type": "number",
                                     "minimum": 0,
                                     "maximum": 59,
@@ -437,6 +442,10 @@
                                 }
                             ]
                         },
+                        {
+                            "type": "label",
+                            "label": "This can't be overriden per project and any change will take effect on the next day or on restart of event server."
+                        },
                         {
                             "type": "separator"
                         },

From af06e1a8511979ccc1398f1fda9887c98289f0ee Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 15 Jul 2022 12:02:19 +0200
Subject: [PATCH 231/289] fix too long line

---
 .../event_handlers_server/action_create_review_session.py     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/openpype/modules/ftrack/event_handlers_server/action_create_review_session.py b/openpype/modules/ftrack/event_handlers_server/action_create_review_session.py
index 68d498a83a..21382007a0 100644
--- a/openpype/modules/ftrack/event_handlers_server/action_create_review_session.py
+++ b/openpype/modules/ftrack/event_handlers_server/action_create_review_session.py
@@ -123,7 +123,9 @@ class CreateDailyReviewSessionServerAction(ServerAction):
         # Store cycle time which will be used to create next timer
         self._last_cyle_time = cycle_time
         # Create timer thread
-        self._cycle_timer = threading.Timer(seconds_delta, self._timer_callback)
+        self._cycle_timer = threading.Timer(
+            seconds_delta, self._timer_callback
+        )
         self._cycle_timer.start()
 
         self._check_review_session()

From 9f2bbbbe386d874cee06fb8b684d377cfb5cd339 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Fri, 15 Jul 2022 13:12:09 +0200
Subject: [PATCH 232/289] OP-3589 - added thumbnail extract to traypublisher

Added check if thumbnail representation is not present, created by different plugin by any chance.
ExtractThumbnailSP should be removed when SP is removed, no need to copy and have 2 plugins.
---
 openpype/plugins/publish/extract_thumbnail.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/openpype/plugins/publish/extract_thumbnail.py b/openpype/plugins/publish/extract_thumbnail.py
index 7a438ca701..e6df5b3ee0 100644
--- a/openpype/plugins/publish/extract_thumbnail.py
+++ b/openpype/plugins/publish/extract_thumbnail.py
@@ -22,7 +22,7 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
         "imagesequence", "render", "render2d", "prerender",
         "source", "plate", "take"
     ]
-    hosts = ["shell", "fusion", "resolve"]
+    hosts = ["shell", "fusion", "resolve", "traypublisher"]
     enabled = False
 
     # presetable attribute
@@ -46,6 +46,10 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
             self.log.info("Skipping - no review set on instance.")
             return
 
+        if self._has_thumbnail_already(instance):
+            self.log.info("Thumbnail representation already present.")
+            return
+
         filtered_repres = self._get_filtered_repres(instance)
         for repre in filtered_repres:
             repre_files = repre["files"]
@@ -102,6 +106,14 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
             # There is no need to create more then one thumbnail
             break
 
+    def _has_thumbnail_already(self, instance):
+        for repre in instance.data.get("representations", []):
+            self.log.info("repre {}".format(repre))
+            if repre["name"] == "thumbnail":
+                return True
+
+        return False
+
     def _get_filtered_repres(self, instance):
         filtered_repres = []
         src_repres = instance.data.get("representations") or []

From a8c219211d5f2dddaf6b4dd31fd59d1137bbd0c1 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Fri, 15 Jul 2022 13:25:42 +0200
Subject: [PATCH 233/289] OP-3589 - copied ValidateFrameRange from SP

SP will be removed in the future, copied this to TrayPublisher to keep functionality.
---
 .../publish/help/validate_frame_ranges.xml    | 15 ++++
 .../plugins/publish/validate_frame_ranges.py  | 72 +++++++++++++++++++
 2 files changed, 87 insertions(+)
 create mode 100644 openpype/hosts/traypublisher/plugins/publish/help/validate_frame_ranges.xml
 create mode 100644 openpype/hosts/traypublisher/plugins/publish/validate_frame_ranges.py

diff --git a/openpype/hosts/traypublisher/plugins/publish/help/validate_frame_ranges.xml b/openpype/hosts/traypublisher/plugins/publish/help/validate_frame_ranges.xml
new file mode 100644
index 0000000000..933df1c7c5
--- /dev/null
+++ b/openpype/hosts/traypublisher/plugins/publish/help/validate_frame_ranges.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<root>
+<error id="main">
+<title>Invalid frame range</title>
+<description>
+## Invalid frame range
+
+Expected duration or '{duration}' frames set in database, workfile contains only '{found}' frames.
+
+### How to repair?
+
+Modify configuration in the database or tweak frame range in the workfile.
+</description>
+</error>
+</root>
\ No newline at end of file
diff --git a/openpype/hosts/traypublisher/plugins/publish/validate_frame_ranges.py b/openpype/hosts/traypublisher/plugins/publish/validate_frame_ranges.py
new file mode 100644
index 0000000000..89289fc6d4
--- /dev/null
+++ b/openpype/hosts/traypublisher/plugins/publish/validate_frame_ranges.py
@@ -0,0 +1,72 @@
+import re
+
+import pyblish.api
+
+import openpype.api
+from openpype import lib
+from openpype.pipeline import (
+    PublishXmlValidationError,
+    OptionalPyblishPluginMixin
+)
+
+
+class ValidateFrameRange(OptionalPyblishPluginMixin,
+                         pyblish.api.InstancePlugin):
+    """Validating frame range of rendered files against state in DB."""
+
+    label = "Validate Frame Range"
+    hosts = ["traypublisher"]
+    families = ["render"]
+    order = openpype.api.ValidateContentsOrder
+
+    optional = True
+    # published data might be sequence (.mov, .mp4) in that counting files
+    # doesnt make sense
+    check_extensions = ["exr", "dpx", "jpg", "jpeg", "png", "tiff", "tga",
+                        "gif", "svg"]
+    skip_timelines_check = []  # skip for specific task names (regex)
+
+    def process(self, instance):
+        # Skip the instance if is not active by data on the instance
+        if not self.is_active(instance.data):
+            return
+
+        if any(re.search(pattern, instance.data["task"])
+               for pattern in self.skip_timelines_check):
+            self.log.info("Skipping for {} task".format(instance.data["task"]))
+
+        asset_data = lib.get_asset(instance.data["asset"])["data"]
+        frame_start = asset_data["frameStart"]
+        frame_end = asset_data["frameEnd"]
+        handle_start = asset_data["handleStart"]
+        handle_end = asset_data["handleEnd"]
+        duration = (frame_end - frame_start + 1) + handle_start + handle_end
+
+        repre = instance.data.get("representations", [None])
+        if not repre:
+            self.log.info("No representations, skipping.")
+            return
+
+        ext = repre[0]['ext'].replace(".", '')
+
+        if not ext or ext.lower() not in self.check_extensions:
+            self.log.warning("Cannot check for extension {}".format(ext))
+            return
+
+        files = instance.data.get("representations", [None])[0]["files"]
+        if isinstance(files, str):
+            files = [files]
+        frames = len(files)
+
+        msg = "Frame duration from DB:'{}' ". format(int(duration)) +\
+              " doesn't match number of files:'{}'".format(frames) +\
+              " Please change frame range for Asset or limit no. of files"
+
+        formatting_data = {"duration": duration,
+                           "found": frames}
+        if frames != duration:
+            raise PublishXmlValidationError(self, msg,
+                                            formatting_data=formatting_data)
+
+        self.log.debug("Valid ranges expected '{}' - found '{}'".
+                       format(int(duration), frames))

From 870cc2bc0607b36328f03c2b75be4c5b12e39d6e Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 15 Jul 2022 13:34:26 +0200
Subject: [PATCH 234/289] fix hash of oiio centos file

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 4bdaaab4ed..078503a284 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -135,7 +135,7 @@ hash = "b9950f5d2fa3720b52b8be55bacf5f56d33f9e029d38ee86534995f3d8d253d2"
 
 [openpype.thirdparty.oiio.linux]
 url = "https://distribute.openpype.io/thirdparty/oiio_tools-2.2.20-linux-centos7.tgz"
-hash = "be1abf8a50e9da5913298447421af0a17829d83ed6252ae1d40da7fa36a78787"
+hash = "3894dec7e4e521463891a869586850e8605f5fd604858b674c87323bf33e273d"
 
 [openpype.thirdparty.oiio.darwin]
 url = "https://distribute.openpype.io/thirdparty/oiio-2.2.0-darwin.tgz"

From 0111f4ae0f70b48e1098f8e28ed50ac969f1a8f3 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 15 Jul 2022 14:38:59 +0200
Subject: [PATCH 235/289] added option to launch openpype with interactive
 console

---
 openpype/cli.py           | 16 +++++++++++++++-
 openpype/pype_commands.py |  2 +-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/openpype/cli.py b/openpype/cli.py
index 2aa4a46929..d6970f2509 100644
--- a/openpype/cli.py
+++ b/openpype/cli.py
@@ -2,7 +2,7 @@
 """Package for handling pype command line arguments."""
 import os
 import sys
-
+import code
 import click
 
 # import sys
@@ -424,3 +424,17 @@ def pack_project(project, dirpath):
 def unpack_project(zipfile, root):
     """Create a package of project with all files and database dump."""
     PypeCommands().unpack_project(zipfile, root)
+
+
+@main.command()
+def interactive():
+    """Interative (Python like) console.
+
+    Helpfull command not only for development to directly work with python
+    interpreter.
+
+    Warning:
+        Executable 'openpype_gui' on windows won't work.
+    """
+
+    code.interact()
diff --git a/openpype/pype_commands.py b/openpype/pype_commands.py
index 90c582a319..124eacbe39 100644
--- a/openpype/pype_commands.py
+++ b/openpype/pype_commands.py
@@ -7,7 +7,7 @@ import time
 
 from openpype.lib import PypeLogger
 from openpype.api import get_app_environments_for_context
-from openpype.lib.plugin_tools import parse_json, get_batch_asset_task_info
+from openpype.lib.plugin_tools import get_batch_asset_task_info
 from openpype.lib.remote_publish import (
     get_webpublish_conn,
     start_webpublish_log,

From b60acdd6d77d488464ffdfad871b076926d94896 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 15 Jul 2022 14:45:32 +0200
Subject: [PATCH 236/289] added banner to interpreter

---
 openpype/cli.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/openpype/cli.py b/openpype/cli.py
index d6970f2509..9a2dfaa141 100644
--- a/openpype/cli.py
+++ b/openpype/cli.py
@@ -437,4 +437,9 @@ def interactive():
         Executable 'openpype_gui' on windows won't work.
     """
 
-    code.interact()
+    from openpype.version import __version__
+
+    banner = "OpenPype {}\nPython {} on {}".format(
+        __version__, sys.version, sys.platform
+    )
+    code.interact(banner)

From a395a85b67065e34c445e2b522afedb8d0f6cf42 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Fri, 15 Jul 2022 15:07:11 +0200
Subject: [PATCH 237/289] OP-3446 - explicitly adding review

Creator now should handle adding review on instance and on applicable representation tags.
---
 .../plugins/create/create_mov_batch.py          | 15 +++++++++++++--
 .../plugins/publish/collect_mov_batch.py        | 17 +++++++++++++++--
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/openpype/hosts/traypublisher/plugins/create/create_mov_batch.py b/openpype/hosts/traypublisher/plugins/create/create_mov_batch.py
index 20d3ecbd7c..67f8848e05 100644
--- a/openpype/hosts/traypublisher/plugins/create/create_mov_batch.py
+++ b/openpype/hosts/traypublisher/plugins/create/create_mov_batch.py
@@ -4,7 +4,7 @@ import re
 
 from openpype.client import get_assets, get_asset_by_name
 from openpype.hosts.traypublisher.api import pipeline
-from openpype.lib import FileDef, get_subset_name_with_asset_doc
+from openpype.lib import FileDef, BoolDef, get_subset_name_with_asset_doc
 from openpype.pipeline import (
     CreatedInstance,
     CreatorError
@@ -151,7 +151,13 @@ class BatchMovCreator(TrayPublishCreator):
         return task_name
 
     def get_instance_attr_defs(self):
-        return []
+        return [
+            BoolDef(
+                "add_review_family",
+                default=True,
+                label="Review"
+            )
+        ]
 
     def get_pre_create_attr_defs(self):
         # Use same attributes as for instance attributes
@@ -162,6 +168,11 @@ class BatchMovCreator(TrayPublishCreator):
                 single_item=False,
                 extensions=self.extensions,
                 label="Filepath"
+            ),
+            BoolDef(
+                "add_review_family",
+                default=True,
+                label="Review"
             )
         ]
 
diff --git a/openpype/hosts/traypublisher/plugins/publish/collect_mov_batch.py b/openpype/hosts/traypublisher/plugins/publish/collect_mov_batch.py
index c81d1f77a5..e4011d0003 100644
--- a/openpype/hosts/traypublisher/plugins/publish/collect_mov_batch.py
+++ b/openpype/hosts/traypublisher/plugins/publish/collect_mov_batch.py
@@ -2,12 +2,17 @@ import os
 
 import pyblish.api
 from openpype.pipeline import OpenPypePyblishPluginMixin
+from openpype.lib import BoolDef
 
 
 class CollectMovBatch(
     pyblish.api.InstancePlugin, OpenPypePyblishPluginMixin
 ):
-    """Collect file url for batch mov and create representation."""
+    """Collect file url for batch mov and create representation.
+
+    Adds review on instance and to repre.tags based on value of toggle button
+    on creator.
+    """
 
     label = "Collect Mov Batch Files"
     order = pyblish.api.CollectorOrder
@@ -18,7 +23,9 @@ class CollectMovBatch(
         if not instance.data.get("creator_identifier") == "render_mov_batch":
             return
 
-        file_url = instance.data["creator_attributes"]["filepath"]
+        creator_attributes = instance.data["creator_attributes"]
+
+        file_url = creator_attributes["filepath"]
         file_name = os.path.basename(file_url)
         _, ext = os.path.splitext(file_name)
 
@@ -29,6 +36,12 @@ class CollectMovBatch(
             "stagingDir": os.path.dirname(file_url)
         }
 
+        if creator_attributes["add_review_family"]:
+            if not repre.get("tags"):
+                repre["tags"] = []
+            repre["tags"].append("review")
+            instance.data["families"].append("review")
+
         instance.data["representations"].append(repre)
 
         instance.data["source"] = file_url

From a1b93b1d4812cd44dc20f8f69e5f6953d91e7d52 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Fri, 15 Jul 2022 15:08:16 +0200
Subject: [PATCH 238/289] OP-3446 - Hound

---
 .../hosts/traypublisher/plugins/publish/collect_mov_batch.py     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/openpype/hosts/traypublisher/plugins/publish/collect_mov_batch.py b/openpype/hosts/traypublisher/plugins/publish/collect_mov_batch.py
index e4011d0003..99065d2408 100644
--- a/openpype/hosts/traypublisher/plugins/publish/collect_mov_batch.py
+++ b/openpype/hosts/traypublisher/plugins/publish/collect_mov_batch.py
@@ -2,7 +2,6 @@ import os
 
 import pyblish.api
 from openpype.pipeline import OpenPypePyblishPluginMixin
-from openpype.lib import BoolDef
 
 
 class CollectMovBatch(

From a081a0f3e1e21f6ced4ff4ee3b74d40cd97e788e Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Fri, 15 Jul 2022 17:43:05 +0200
Subject: [PATCH 239/289] Added wrapper around cmds.setAttr

Logs and captures exception when attribute is not possible to set (when locked)
---
 openpype/vendor/python/common/capture.py | 32 ++++++++++++++++--------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/openpype/vendor/python/common/capture.py b/openpype/vendor/python/common/capture.py
index 4d9e1da3e4..71b86a5f1a 100644
--- a/openpype/vendor/python/common/capture.py
+++ b/openpype/vendor/python/common/capture.py
@@ -403,7 +403,7 @@ def apply_view(panel, **options):
     camera_options = options.get("camera_options", {})
     _iteritems = getattr(camera_options, "iteritems", camera_options.items)
     for key, value in _iteritems:
-        cmds.setAttr("{0}.{1}".format(camera, key), value)
+        _safe_setAttr("{0}.{1}".format(camera, key), value)
 
     # Viewport options
     viewport_options = options.get("viewport_options", {})
@@ -417,7 +417,7 @@ def apply_view(panel, **options):
     )
     for key, value in _iteritems():
         attr = "hardwareRenderingGlobals.{0}".format(key)
-        cmds.setAttr(attr, value)
+        _safe_setAttr(attr, value)
 
 
 def parse_active_panel():
@@ -551,10 +551,10 @@ def apply_scene(**options):
         cmds.playbackOptions(maxTime=options["end_frame"])
 
     if "width" in options:
-        cmds.setAttr("defaultResolution.width", options["width"])
+        _safe_setAttr("defaultResolution.width", options["width"])
 
     if "height" in options:
-        cmds.setAttr("defaultResolution.height", options["height"])
+        _safe_setAttr("defaultResolution.height", options["height"])
 
     if "compression" in options:
         cmds.optionVar(
@@ -665,7 +665,7 @@ def _applied_camera_options(options, panel):
 
     _iteritems = getattr(options, "iteritems", options.items)
     for opt, value in _iteritems():
-        cmds.setAttr(camera + "." + opt, value)
+        _safe_setAttr(camera + "." + opt, value)
 
     try:
         yield
@@ -673,7 +673,7 @@ def _applied_camera_options(options, panel):
         if old_options:
             _iteritems = getattr(old_options, "iteritems", old_options.items)
             for opt, value in _iteritems():
-                cmds.setAttr(camera + "." + opt, value)
+                _safe_setAttr(camera + "." + opt, value)
 
 
 @contextlib.contextmanager
@@ -760,7 +760,7 @@ def _applied_viewport2_options(options):
     # Apply settings
     _iteritems = getattr(options, "iteritems", options.items)
     for opt, value in _iteritems():
-        cmds.setAttr("hardwareRenderingGlobals." + opt, value)
+        _safe_setAttr("hardwareRenderingGlobals." + opt, value)
 
     try:
         yield
@@ -768,7 +768,7 @@ def _applied_viewport2_options(options):
         # Restore previous settings
         _iteritems = getattr(original, "iteritems", original.items)
         for opt, value in _iteritems():
-            cmds.setAttr("hardwareRenderingGlobals." + opt, value)
+            _safe_setAttr("hardwareRenderingGlobals." + opt, value)
 
 
 @contextlib.contextmanager
@@ -802,14 +802,14 @@ def _maintain_camera(panel, camera):
     else:
         state = dict((camera, cmds.getAttr(camera + ".rnd"))
                      for camera in cmds.ls(type="camera"))
-        cmds.setAttr(camera + ".rnd", True)
+        _safe_setAttr(camera + ".rnd", True)
 
     try:
         yield
     finally:
         _iteritems = getattr(state, "iteritems", state.items)
         for camera, renderable in _iteritems():
-            cmds.setAttr(camera + ".rnd", renderable)
+            _safe_setAttr(camera + ".rnd", renderable)
 
 
 @contextlib.contextmanager
@@ -846,6 +846,18 @@ def _in_standalone():
     return not hasattr(cmds, "about") or cmds.about(batch=True)
 
 
+def _safe_setAttr(*args, **kwargs):
+    """Wrapper to handle failures when attribute is locked.
+
+    Temporary hotfix until better approach (store value, unlock, set new,
+    return old, lock again) is implemented.
+    """
+    try:
+        cmds.setAttr(*args, **kwargs)
+    except RuntimeError:
+        print("Cannot setAttr {}!".format(args))
+
+
 # --------------------------------
 #
 # Apply version specific settings

From 1f18e5c9d35606276b1325f741662cd49e131a64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= <ondrej.samohel@pype.club>
Date: Fri, 15 Jul 2022 18:06:37 +0200
Subject: [PATCH 240/289] :recycle: move submodules

---
 .gitmodules                    | 8 ++++----
 vendor/powershell/BurntToast   | 1 -
 vendor/powershell/PSWriteColor | 1 -
 vendor/powershell/README.md    | 0
 4 files changed, 4 insertions(+), 6 deletions(-)
 delete mode 160000 vendor/powershell/BurntToast
 delete mode 160000 vendor/powershell/PSWriteColor
 delete mode 100644 vendor/powershell/README.md

diff --git a/.gitmodules b/.gitmodules
index b515851c81..6a5d29ec02 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,7 @@
-[submodule "vendor/powershell/BurntToast"]
-    path = vendor/powershell/BurntToast
+[submodule "tools/modules/powershell/BurntToast"]
+    path = tools/modules/powershell/PSWriteColor
     url = https://github.com/Windos/BurntToast.git
 
-[submodule "vendor/powershell/PSWriteColor"]
-    path = vendor/powershell/PSWriteColor
+[submodule "tools/modules/powershell/PSWriteColor"]
+    path = tools/modules/powershell/PSWriteColor
     url = https://github.com/EvotecIT/PSWriteColor.git
diff --git a/vendor/powershell/BurntToast b/vendor/powershell/BurntToast
deleted file mode 160000
index ae0acdd870..0000000000
--- a/vendor/powershell/BurntToast
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ae0acdd870a2fd8d9f0d147de22dc36d6c5e399e
diff --git a/vendor/powershell/PSWriteColor b/vendor/powershell/PSWriteColor
deleted file mode 160000
index 12eda384eb..0000000000
--- a/vendor/powershell/PSWriteColor
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 12eda384ebd7a7954e15855e312215c009c97114
diff --git a/vendor/powershell/README.md b/vendor/powershell/README.md
deleted file mode 100644
index e69de29bb2..0000000000

From 47079516f892a3bf2e550746c87a73e2ff389524 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= <ondrej.samohel@pype.club>
Date: Fri, 15 Jul 2022 18:14:38 +0200
Subject: [PATCH 241/289] :truck: set scripts to new path

---
 .gitmodules                         | 2 +-
 tools/build.ps1                     | 2 +-
 tools/build_win_installer.ps1       | 2 +-
 tools/create_env.ps1                | 2 +-
 tools/create_zip.ps1                | 2 +-
 tools/fetch_thirdparty_libs.ps1     | 2 +-
 tools/make_docs.ps1                 | 2 +-
 tools/modules/powershell/BurntToast | 1 +
 tools/run_mongo.ps1                 | 2 +-
 tools/run_project_manager.ps1       | 2 +-
 tools/run_settings.ps1              | 2 +-
 tools/run_tests.ps1                 | 2 +-
 tools/run_tray.ps1                  | 2 +-
 13 files changed, 13 insertions(+), 12 deletions(-)
 create mode 160000 tools/modules/powershell/BurntToast

diff --git a/.gitmodules b/.gitmodules
index 6a5d29ec02..dfd89cdb3c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,5 +1,5 @@
 [submodule "tools/modules/powershell/BurntToast"]
-    path = tools/modules/powershell/PSWriteColor
+    path = tools/modules/powershell/BurntToast
     url = https://github.com/Windos/BurntToast.git
 
 [submodule "tools/modules/powershell/PSWriteColor"]
diff --git a/tools/build.ps1 b/tools/build.ps1
index efb41e6c1b..442328b8dc 100644
--- a/tools/build.ps1
+++ b/tools/build.ps1
@@ -33,7 +33,7 @@ $script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
 $openpype_root = (Get-Item $script_dir).parent.FullName
 
 # Install PSWriteColor to support colorized output to terminal
-$env:PSModulePath = $env:PSModulePath + ";$($openpype_root)\vendor\powershell"
+$env:PSModulePath = $env:PSModulePath + ";$($openpype_root)\tools\modules\powershell"
 
 function Start-Progress {
     param([ScriptBlock]$code)
diff --git a/tools/build_win_installer.ps1 b/tools/build_win_installer.ps1
index 8024a5a3b2..d7325edfc4 100644
--- a/tools/build_win_installer.ps1
+++ b/tools/build_win_installer.ps1
@@ -16,7 +16,7 @@ $script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
 $openpype_root = (Get-Item $script_dir).parent.FullName
 
 # Install PSWriteColor to support colorized output to terminal
-$env:PSModulePath = $env:PSModulePath + ";$($openpype_root)\vendor\powershell"
+$env:PSModulePath = $env:PSModulePath + ";$($openpype_root)\tools\modules\powershell"
 
 function Start-Progress {
     param([ScriptBlock]$code)
diff --git a/tools/create_env.ps1 b/tools/create_env.ps1
index c0cbe9775b..2b2f0c3904 100644
--- a/tools/create_env.ps1
+++ b/tools/create_env.ps1
@@ -30,7 +30,7 @@ $openpype_root = (Get-Item $script_dir).parent.FullName
 
 & git submodule update --init --recursive
 # Install PSWriteColor to support colorized output to terminal
-$env:PSModulePath = $env:PSModulePath + ";$($openpype_root)\vendor\powershell"
+$env:PSModulePath = $env:PSModulePath + ";$($openpype_root)\tools\modules\powershell"
 
 
 function Exit-WithCode($exitcode) {
diff --git a/tools/create_zip.ps1 b/tools/create_zip.ps1
index b4b66424ca..7b852b7c54 100644
--- a/tools/create_zip.ps1
+++ b/tools/create_zip.ps1
@@ -24,7 +24,7 @@ $script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
 $openpype_root = (Get-Item $script_dir).parent.FullName
 
 # Install PSWriteColor to support colorized output to terminal
-$env:PSModulePath = $env:PSModulePath + ";$($openpype_root)\vendor\powershell"
+$env:PSModulePath = $env:PSModulePath + ";$($openpype_root)\tools\modules\powershell"
 
 function Exit-WithCode($exitcode) {
    # Only exit this host process if it's a child of another PowerShell parent process...
diff --git a/tools/fetch_thirdparty_libs.ps1 b/tools/fetch_thirdparty_libs.ps1
index 41a3585ff9..05eb073fdd 100644
--- a/tools/fetch_thirdparty_libs.ps1
+++ b/tools/fetch_thirdparty_libs.ps1
@@ -16,7 +16,7 @@ $script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
 $openpype_root = (Get-Item $script_dir).parent.FullName
 
 # Install PSWriteColor to support colorized output to terminal
-$env:PSModulePath = $env:PSModulePath + ";$($openpype_root)\vendor\powershell"
+$env:PSModulePath = $env:PSModulePath + ";$($openpype_root)\tools\modules\powershell"
 
 $env:_INSIDE_OPENPYPE_TOOL = "1"
 
diff --git a/tools/make_docs.ps1 b/tools/make_docs.ps1
index d356f081de..43ecd0c09c 100644
--- a/tools/make_docs.ps1
+++ b/tools/make_docs.ps1
@@ -49,7 +49,7 @@ $script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
 $openpype_root = (Get-Item $script_dir).parent.FullName
 
 # Install PSWriteColor to support colorized output to terminal
-$env:PSModulePath = $env:PSModulePath + ";$($openpype_root)\vendor\powershell"
+$env:PSModulePath = $env:PSModulePath + ";$($openpype_root)\tools\modules\powershell"
 
 Write-Host $art -ForegroundColor DarkGreen
 
diff --git a/tools/modules/powershell/BurntToast b/tools/modules/powershell/BurntToast
new file mode 160000
index 0000000000..f58c9a26d6
--- /dev/null
+++ b/tools/modules/powershell/BurntToast
@@ -0,0 +1 @@
+Subproject commit f58c9a26d6ede30ecc7998e92b26974887e945fe
diff --git a/tools/run_mongo.ps1 b/tools/run_mongo.ps1
index 934ce67181..b6b091a9d1 100644
--- a/tools/run_mongo.ps1
+++ b/tools/run_mongo.ps1
@@ -16,7 +16,7 @@ $script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
 $openpype_root = (Get-Item $script_dir).parent.FullName
 
 # Install PSWriteColor to support colorized output to terminal
-$env:PSModulePath = $env:PSModulePath + ";$($openpype_root)\vendor\powershell"
+$env:PSModulePath = $env:PSModulePath + ";$($openpype_root)\tools\modules\powershell"
 
 $art = @"
 
diff --git a/tools/run_project_manager.ps1 b/tools/run_project_manager.ps1
index 2932358c2a..c1813e4ed9 100644
--- a/tools/run_project_manager.ps1
+++ b/tools/run_project_manager.ps1
@@ -36,7 +36,7 @@ $script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
 $openpype_root = (Get-Item $script_dir).parent.FullName
 
 # Install PSWriteColor to support colorized output to terminal
-$env:PSModulePath = $env:PSModulePath + ";$($openpype_root)\vendor\powershell"
+$env:PSModulePath = $env:PSModulePath + ";$($openpype_root)\tools\modules\powershell"
 
 $env:_INSIDE_OPENPYPE_TOOL = "1"
 
diff --git a/tools/run_settings.ps1 b/tools/run_settings.ps1
index 918ea367ab..c74ae1ea3a 100644
--- a/tools/run_settings.ps1
+++ b/tools/run_settings.ps1
@@ -16,7 +16,7 @@ $script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
 $openpype_root = (Get-Item $script_dir).parent.FullName
 
 # Install PSWriteColor to support colorized output to terminal
-$env:PSModulePath = $env:PSModulePath + ";$($openpype_root)\vendor\powershell"
+$env:PSModulePath = $env:PSModulePath + ";$($openpype_root)\tools\modules\powershell"
 
 $env:_INSIDE_OPENPYPE_TOOL = "1"
 
diff --git a/tools/run_tests.ps1 b/tools/run_tests.ps1
index 7995c6a8e9..4fa598c413 100644
--- a/tools/run_tests.ps1
+++ b/tools/run_tests.ps1
@@ -16,7 +16,7 @@ $script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
 $openpype_root = (Get-Item $script_dir).parent.FullName
 
 # Install PSWriteColor to support colorized output to terminal
-$env:PSModulePath = $env:PSModulePath + ";$($openpype_root)\vendor\powershell"
+$env:PSModulePath = $env:PSModulePath + ";$($openpype_root)\tools\modules\powershell"
 
 function Exit-WithCode($exitcode) {
    # Only exit this host process if it's a child of another PowerShell parent process...
diff --git a/tools/run_tray.ps1 b/tools/run_tray.ps1
index 7dee3d0064..40157c4e81 100644
--- a/tools/run_tray.ps1
+++ b/tools/run_tray.ps1
@@ -15,7 +15,7 @@ $script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
 $openpype_root = (Get-Item $script_dir).parent.FullName
 
 # Install PSWriteColor to support colorized output to terminal
-$env:PSModulePath = $env:PSModulePath + ";$($openpype_root)\vendor\powershell"
+$env:PSModulePath = $env:PSModulePath + ";$($openpype_root)\tools\modules\powershell"
 
 $env:_INSIDE_OPENPYPE_TOOL = "1"
 

From fce30b519f7c6df3a59a2c8328d314c2cf7b2aa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= <ondrej.samohel@pype.club>
Date: Fri, 15 Jul 2022 18:15:31 +0200
Subject: [PATCH 242/289] :heavy_plus_sign: add PSWriteColor to right place

---
 tools/modules/powershell/PSWriteColor | 1 +
 1 file changed, 1 insertion(+)
 create mode 160000 tools/modules/powershell/PSWriteColor

diff --git a/tools/modules/powershell/PSWriteColor b/tools/modules/powershell/PSWriteColor
new file mode 160000
index 0000000000..12eda384eb
--- /dev/null
+++ b/tools/modules/powershell/PSWriteColor
@@ -0,0 +1 @@
+Subproject commit 12eda384ebd7a7954e15855e312215c009c97114

From 623e5d18c0d2290d68104e64656b9a6cd1d48602 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= <ondrej.samohel@pype.club>
Date: Fri, 15 Jul 2022 18:19:21 +0200
Subject: [PATCH 243/289] :hammer: catch exception for toasts

---
 tools/build.ps1                 | 6 ++++--
 tools/build_win_installer.ps1   | 6 +++---
 tools/create_env.ps1            | 7 ++++---
 tools/fetch_thirdparty_libs.ps1 | 5 ++++-
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/tools/build.ps1 b/tools/build.ps1
index 442328b8dc..195b2dc75e 100644
--- a/tools/build.ps1
+++ b/tools/build.ps1
@@ -189,6 +189,8 @@ Write-Color -Text ">>> ", "Restoring current directory" -Color Green, Gray
 Set-Location -Path $current_dir
 
 $endTime = [int][double]::Parse((Get-Date -UFormat %s))
-New-BurntToastNotification -AppLogo "$openpype_root/openpype/resources/icons/openpype_icon.png" -Text "OpenPype build complete!", "All done in $($endTime - $startTime) secs. You will find OpenPype and build log in build directory."
-
+try
+{
+    New-BurntToastNotification -AppLogo "$openpype_root/openpype/resources/icons/openpype_icon.png" -Text "OpenPype build complete!", "All done in $( $endTime - $startTime ) secs. You will find OpenPype and build log in build directory."
+} catch {}
 Write-Color -Text "*** ", "All done in ", $($endTime - $startTime), " secs. You will find OpenPype and build log in ", "'.\build'", " directory." -Color Green, Gray, White, Gray, White, Gray
diff --git a/tools/build_win_installer.ps1 b/tools/build_win_installer.ps1
index d7325edfc4..b9d1ca2d3f 100644
--- a/tools/build_win_installer.ps1
+++ b/tools/build_win_installer.ps1
@@ -171,7 +171,7 @@ if ($LASTEXITCODE -ne 0) {
 
 Write-Color -Text ">>> ", "Restoring current directory" -Color Green, Gray
 Set-Location -Path $current_dir
-
-New-BurntToastNotification -AppLogo "$openpype_root/openpype/resources/icons/openpype_icon.png" -Text "OpenPype build complete!", "All done. You will find You will find OpenPype installer in '.\build' directory."
-
+try {
+    New-BurntToastNotification -AppLogo "$openpype_root/openpype/resources/icons/openpype_icon.png" -Text "OpenPype build complete!", "All done. You will find You will find OpenPype installer in '.\build' directory."
+} catch {}
 Write-Color -Text "*** ", "All done. You will find OpenPype installer in ", "'.\build'", " directory." -Color Green, Gray, White, Gray
diff --git a/tools/create_env.ps1 b/tools/create_env.ps1
index 2b2f0c3904..3f956e5c6a 100644
--- a/tools/create_env.ps1
+++ b/tools/create_env.ps1
@@ -180,7 +180,8 @@ if ($LASTEXITCODE -ne 0) {
 }
 $endTime = [int][double]::Parse((Get-Date -UFormat %s))
 Set-Location -Path $current_dir
-
-New-BurntToastNotification -AppLogo "$openpype_root/openpype/resources/icons/openpype_icon.png" -Text "OpenPype", "Virtual environment created.", "All done in $($endTime - $startTime) secs."
-
+try
+{
+    New-BurntToastNotification -AppLogo "$openpype_root/openpype/resources/icons/openpype_icon.png" -Text "OpenPype", "Virtual environment created.", "All done in $( $endTime - $startTime ) secs."
+} catch {}
 Write-Color -Text ">>> ", "Virtual environment created." -Color Green, White
diff --git a/tools/fetch_thirdparty_libs.ps1 b/tools/fetch_thirdparty_libs.ps1
index 05eb073fdd..4df007ad67 100644
--- a/tools/fetch_thirdparty_libs.ps1
+++ b/tools/fetch_thirdparty_libs.ps1
@@ -38,4 +38,7 @@ $startTime = [int][double]::Parse((Get-Date -UFormat %s))
 & "$($env:POETRY_HOME)\bin\poetry" run python "$($openpype_root)\tools\fetch_thirdparty_libs.py"
 $endTime = [int][double]::Parse((Get-Date -UFormat %s))
 Set-Location -Path $current_dir
-New-BurntToastNotification -AppLogo "$openpype_root/openpype/resources/icons/openpype_icon.png" -Text "OpenPype", "Dependencies downloaded", "All done in $($endTime - $startTime) secs."
+try
+{
+    New-BurntToastNotification -AppLogo "$openpype_root/openpype/resources/icons/openpype_icon.png" -Text "OpenPype", "Dependencies downloaded", "All done in $( $endTime - $startTime ) secs."
+} catch {}
\ No newline at end of file

From 1c71fe206d2a531fbd921fd49368a74a966e3426 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Fri, 15 Jul 2022 18:20:01 +0200
Subject: [PATCH 244/289] added interactive command to documentation

---
 website/docs/admin_openpype_commands.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/website/docs/admin_openpype_commands.md b/website/docs/admin_openpype_commands.md
index 53b4799d6e..53fc12410f 100644
--- a/website/docs/admin_openpype_commands.md
+++ b/website/docs/admin_openpype_commands.md
@@ -45,6 +45,7 @@ For more information [see here](admin_use.md#run-openpype).
 | publish | Pype takes JSON from provided path and use it to publish data in it. | [📑](#publish-arguments) |
 | extractenvironments | Extract environment variables for entered context to a json file. | [📑](#extractenvironments-arguments) |
 | run | Execute given python script within OpenPype environment. | [📑](#run-arguments) |
+| interactive | Start python like interactive console session. | |
 | projectmanager | Launch Project Manager UI | [📑](#projectmanager-arguments) |
 | settings | Open Settings UI | [📑](#settings-arguments) |
 | standalonepublisher | Open Standalone Publisher UI | [📑](#standalonepublisher-arguments) |

From 188556a7253837838e6ae60c72cd2d73b5bd6da5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Samohel?=
 <33513211+antirotor@users.noreply.github.com>
Date: Fri, 15 Jul 2022 18:34:43 +0200
Subject: [PATCH 245/289] :pencil2: fix typos in arguments

---
 tools/run_mongo.ps1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/run_mongo.ps1 b/tools/run_mongo.ps1
index b6b091a9d1..c64ff75969 100644
--- a/tools/run_mongo.ps1
+++ b/tools/run_mongo.ps1
@@ -50,7 +50,7 @@ function Exit-WithCode($exitcode) {
 
 function Find-Mongo ($preferred_version) {
     $defaultPath = "C:\Program Files\MongoDB\Server"
-    Write-Color -Text ">>> ", "Detecting MongoDB ... " -Color Geen, Gray -NoNewline
+    Write-Color -Text ">>> ", "Detecting MongoDB ... " -Color Green, Gray -NoNewline
     if (-not (Get-Command "mongod" -ErrorAction SilentlyContinue)) {
         if(Test-Path "$($defaultPath)\*\bin\mongod.exe" -PathType Leaf) {
         # we have mongo server installed on standard Windows location
@@ -61,7 +61,7 @@ function Find-Mongo ($preferred_version) {
             Write-Color -Text "OK" -Color Green
             $use_version = $mongoVersions[-1]
             foreach ($v in $mongoVersions) {
-                Write-Color -Text "  - found [ ", $v, " ]" - Color Cyan, White, Cyan -NoNewLine
+                Write-Color -Text "  - found [ ", $v, " ]" -Color Cyan, White, Cyan -NoNewLine
                 $version = Split-Path $v -Leaf
 
                 if ($preferred_version -eq $version) {
@@ -110,6 +110,6 @@ $preferred_version = "5.0"
 
 $mongoPath = Find-Mongo $preferred_version
 Write-Color -Text ">>> ", "Using DB path: ", "[ ", "$($dbpath)", " ]" -Color Green, Gray, Cyan, White, Cyan
-Write-Color -Text ">>> ", "Port: ", "[ ", "$($port)", " ]", -Color Green, Gray, Cyan, White, Cyan
+Write-Color -Text ">>> ", "Port: ", "[ ", "$($port)", " ]" -Color Green, Gray, Cyan, White, Cyan
 
 Start-Process -FilePath $mongopath "--dbpath $($dbpath) --port $($port)" -PassThru | Out-Null

From ace2bf4ecb1ac6eb43205090f9c670a9332d3927 Mon Sep 17 00:00:00 2001
From: OpenPype <info@openpype.io>
Date: Sat, 16 Jul 2022 03:49:48 +0000
Subject: [PATCH 246/289] [Automated] Bump version

---
 CHANGELOG.md        | 54 +++++++++++++++++++++++----------------------
 openpype/version.py |  2 +-
 pyproject.toml      |  2 +-
 3 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc5bf39a29..95427e9ea9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,35 @@
 # Changelog
 
+## [3.12.2-nightly.1](https://github.com/pypeclub/OpenPype/tree/HEAD)
+
+[Full Changelog](https://github.com/pypeclub/OpenPype/compare/3.12.1...HEAD)
+
+**🚀 Enhancements**
+
+- Ftrack: Automatic daily review session creation can define trigger hour [\#3516](https://github.com/pypeclub/OpenPype/pull/3516)
+- Ftrack: add source into Note [\#3509](https://github.com/pypeclub/OpenPype/pull/3509)
+- Ftrack: Trigger custom ftrack topic of project structure creation [\#3506](https://github.com/pypeclub/OpenPype/pull/3506)
+- Settings UI: Add extract to file action on project view [\#3505](https://github.com/pypeclub/OpenPype/pull/3505)
+- General: Event system [\#3499](https://github.com/pypeclub/OpenPype/pull/3499)
+- NewPublisher: Keep plugins with mismatch target in report [\#3498](https://github.com/pypeclub/OpenPype/pull/3498)
+- Nuke: load clip with options from settings [\#3497](https://github.com/pypeclub/OpenPype/pull/3497)
+- Migrate basic families to the new Tray Publisher [\#3469](https://github.com/pypeclub/OpenPype/pull/3469)
+
+**🐛 Bug fixes**
+
+- General: Fix hash of centos oiio archive [\#3519](https://github.com/pypeclub/OpenPype/pull/3519)
+- TrayPublisher: Simple creation enhancements and fixes [\#3513](https://github.com/pypeclub/OpenPype/pull/3513)
+- NewPublisher: Publish attributes are properly collected [\#3510](https://github.com/pypeclub/OpenPype/pull/3510)
+- TrayPublisher: Make sure host name is filled [\#3504](https://github.com/pypeclub/OpenPype/pull/3504)
+- NewPublisher: Groups work and enum multivalue [\#3501](https://github.com/pypeclub/OpenPype/pull/3501)
+
+**🔀 Refactored code**
+
+- TimersManager: Use query functions [\#3495](https://github.com/pypeclub/OpenPype/pull/3495)
+
 ## [3.12.1](https://github.com/pypeclub/OpenPype/tree/3.12.1) (2022-07-13)
 
-[Full Changelog](https://github.com/pypeclub/OpenPype/compare/3.12.0...3.12.1)
+[Full Changelog](https://github.com/pypeclub/OpenPype/compare/CI/3.12.1-nightly.6...3.12.1)
 
 ### 📖 Documentation
 
@@ -45,8 +72,6 @@
 - LogViewer: Escape html characters in log message [\#3443](https://github.com/pypeclub/OpenPype/pull/3443)
 - Nuke: Slate frame is integrated [\#3427](https://github.com/pypeclub/OpenPype/pull/3427)
 - Maya: Camera extra data - additional fix for \#3304 [\#3386](https://github.com/pypeclub/OpenPype/pull/3386)
-- Maya: Handle excluding `model` family from frame range validator. [\#3370](https://github.com/pypeclub/OpenPype/pull/3370)
-- Harmony: audio validator has wrong logic [\#3364](https://github.com/pypeclub/OpenPype/pull/3364)
 
 **🔀 Refactored code**
 
@@ -76,7 +101,6 @@
 
 - Webserver: Added CORS middleware [\#3422](https://github.com/pypeclub/OpenPype/pull/3422)
 - Attribute Defs UI: Files widget show what is allowed to drop in [\#3411](https://github.com/pypeclub/OpenPype/pull/3411)
-- General: Add ability to change user value for templates [\#3366](https://github.com/pypeclub/OpenPype/pull/3366)
 
 **🐛 Bug fixes**
 
@@ -87,10 +111,7 @@
 - Nuke: Collect representation files based on Write [\#3407](https://github.com/pypeclub/OpenPype/pull/3407)
 - General: Filter representations before integration start [\#3398](https://github.com/pypeclub/OpenPype/pull/3398)
 - Maya: look collector typo [\#3392](https://github.com/pypeclub/OpenPype/pull/3392)
-- TVPaint: Make sure exit code is set to not None [\#3382](https://github.com/pypeclub/OpenPype/pull/3382)
 - Maya: vray device aspect ratio fix [\#3381](https://github.com/pypeclub/OpenPype/pull/3381)
-- Flame: bunch of publishing issues [\#3377](https://github.com/pypeclub/OpenPype/pull/3377)
-- Harmony: added unc path to zifile command in Harmony [\#3372](https://github.com/pypeclub/OpenPype/pull/3372)
 
 **🔀 Refactored code**
 
@@ -101,30 +122,11 @@
 - Hiero: Use client query functions [\#3393](https://github.com/pypeclub/OpenPype/pull/3393)
 - Nuke: Use client query functions [\#3391](https://github.com/pypeclub/OpenPype/pull/3391)
 - Maya: Use client query functions [\#3385](https://github.com/pypeclub/OpenPype/pull/3385)
-- Harmony: Use client query functions [\#3378](https://github.com/pypeclub/OpenPype/pull/3378)
-- Celaction: Use client query functions [\#3376](https://github.com/pypeclub/OpenPype/pull/3376)
-- Photoshop: Use client query functions [\#3375](https://github.com/pypeclub/OpenPype/pull/3375)
-- AfterEffects: Use client query functions [\#3374](https://github.com/pypeclub/OpenPype/pull/3374)
-
-**Merged pull requests:**
-
-- Sync Queue: Added far future value for null values for dates [\#3371](https://github.com/pypeclub/OpenPype/pull/3371)
-- Maya - added support for single frame playblast review [\#3369](https://github.com/pypeclub/OpenPype/pull/3369)
 
 ## [3.11.1](https://github.com/pypeclub/OpenPype/tree/3.11.1) (2022-06-20)
 
 [Full Changelog](https://github.com/pypeclub/OpenPype/compare/CI/3.11.1-nightly.1...3.11.1)
 
-**🚀 Enhancements**
-
-- Pyblish Pype: Hiding/Close issues [\#3367](https://github.com/pypeclub/OpenPype/pull/3367)
-
-**🐛 Bug fixes**
-
-- Nuke: bake streams with slate on farm [\#3368](https://github.com/pypeclub/OpenPype/pull/3368)
-- Nuke: Fix missing variable in extract thumbnail [\#3363](https://github.com/pypeclub/OpenPype/pull/3363)
-- Nuke: Fix precollect writes [\#3361](https://github.com/pypeclub/OpenPype/pull/3361)
-
 ## [3.11.0](https://github.com/pypeclub/OpenPype/tree/3.11.0) (2022-06-17)
 
 [Full Changelog](https://github.com/pypeclub/OpenPype/compare/CI/3.11.0-nightly.4...3.11.0)
diff --git a/openpype/version.py b/openpype/version.py
index c7b0de0381..e9206379e1 100644
--- a/openpype/version.py
+++ b/openpype/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring Pype version."""
-__version__ = "3.12.1"
+__version__ = "3.12.2-nightly.1"
diff --git a/pyproject.toml b/pyproject.toml
index 078503a284..19d65b50f9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "OpenPype"
-version = "3.12.1" # OpenPype
+version = "3.12.2-nightly.1" # OpenPype
 description = "Open VFX and Animation pipeline with support."
 authors = ["OpenPype Team <info@openpype.io>"]
 license = "MIT License"

From 971aef4342e8353a83fc2fe9bf2500a48069aa3d Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Mon, 18 Jul 2022 10:35:56 +0200
Subject: [PATCH 247/289] Removed query list from python file

---
 openpype/client/entities.py | 604 ------------------------------------
 1 file changed, 604 deletions(-)

diff --git a/openpype/client/entities.py b/openpype/client/entities.py
index 9d65355d1b..38552d9a56 100644
--- a/openpype/client/entities.py
+++ b/openpype/client/entities.py
@@ -1348,622 +1348,18 @@ def get_workfile_info(
     - openpype/hosts/maya/api/shader_definition_editor.py
     - openpype/hosts/maya/plugins/publish/validate_model_name.py
 
-## Global launch hooks
-- openpype/hooks/pre_global_host_data.py
-    Query:
-    - project
-    - asset
-
-## Global load plugins
-- openpype/plugins/load/delete_old_versions.py
-    Query:
-    - versions
-    - representations
-- openpype/plugins/load/delivery.py
-    Query:
-    - representations
-
 ## Global publish plugins
-- openpype/plugins/publish/collect_avalon_entities.py
-    Query:
-    - asset
-    - project
-- openpype/plugins/publish/collect_anatomy_instance_data.py
-    Query:
-    - assets
-    - subsets
-    - last version
-- openpype/plugins/publish/collect_scene_loaded_versions.py
-    Query:
-    - representations
 - openpype/plugins/publish/extract_hierarchy_avalon.py
-    Query:
-    - asset
-    - assets
-    - project
     Create:
     - asset
     Update:
     - asset
-- openpype/plugins/publish/integrate_hero_version.py
-    Query:
-    - version
-    - hero version
-    - representations
-- openpype/plugins/publish/integrate_new.py
-    Query:
-    - asset
-    - subset
-    - version
-    - representations
-- openpype/plugins/publish/integrate_thumbnail.py
-    Query:
-    - version
-- openpype/plugins/publish/validate_editorial_asset_name.py
-    Query:
-    - assets
 
 ## Lib
-- openpype/lib/applications.py
-    Query:
-    - project
-    - asset
 - openpype/lib/avalon_context.py
-    Query:
-    - project
-    - asset
-    - linked assets (new function get_linked_assets?)
-    - subset
-    - subsets
-    - version
-    - versions
-    - last version
-    - representations
-    - linked representations (new function get_linked_ids_for_representations)
     Update:
     - workfile data
-- openpype/lib/plugin_tools.py
-    Query:
-    - asset
 - openpype/lib/project_backpack.py
-    Query:
-    - project
-    - everything from mongo
     Update:
     - project
-- openpype/lib/usdlib.py
-    Query:
-    - project
-    - asset
-
-## Pipeline
-- openpype/pipeline/load/utils.py
-    Query:
-    - project
-    - assets
-    - subsets
-    - version
-    - versions
-    - representation
-    - representations
-- openpype/pipeline/mongodb.py
-    Query:
-    - project
-- openpype/pipeline/thumbnail.py
-    Query:
-    - project
-
-## Hosts
-### Aftereffects
-- openpype/hosts/aftereffects/plugins/create/workfile_creator.py
-    Query:
-    - asset
-
-### Blender
-- openpype/hosts/blender/api/pipeline.py
-    Query:
-    - asset
-- openpype/hosts/blender/plugins/publish/extract_layout.py
-    Query:
-    - representation
-
-### Celaction
-- openpype/hosts/celaction/plugins/publish/collect_audio.py
-    Query:
-    - subsets
-    - last versions
-    - representations
-
-### Fusion
-- openpype/hosts/fusion/api/lib.py
-    Query:
-    - asset
-    - subset
-    - version
-    - representation
-- openpype/hosts/fusion/plugins/load/load_sequence.py
-    Query:
-    - version
-- openpype/hosts/fusion/scripts/fusion_switch_shot.py
-    Query:
-    - project
-    - asset
-    - versions
-- openpype/hosts/fusion/utility_scripts/switch_ui.py
-    Query:
-    - assets
-
-### Harmony
-- openpype/hosts/harmony/api/pipeline.py
-    Query:
-    - representation
-
-### Hiero
-- openpype/hosts/hiero/api/lib.py
-    Query:
-    - project
-    - version
-    - versions
-    - representation
-- openpype/hosts/hiero/api/tags.py
-    Query:
-    - task types
-    - assets
-- openpype/hosts/hiero/plugins/load/load_clip.py
-    Query:
-    - version
-    - versions
-- openpype/hosts/hiero/plugins/publish_old_workflow/collect_assetbuilds.py
-    Query:
-    - assets
-
-### Houdini
-- openpype/hosts/houdini/api/lib.py
-    Query:
-    - asset
-- openpype/hosts/houdini/api/usd.py
-    Query:
-    - asset
-- openpype/hosts/houdini/plugins/create/create_hda.py
-    Query:
-    - asset
-    - subsets
-- openpype/hosts/houdini/plugins/publish/collect_usd_bootstrap.py
-    Query:
-    - asset
-    - subset
-- openpype/hosts/houdini/plugins/publish/extract_usd_layered.py
-    Query:
-    - asset
-    - subset
-    - version
-    - representation
-- openpype/hosts/houdini/plugins/publish/validate_usd_shade_model_exists.py
-    Query:
-    - asset
-    - subset
-- openpype/hosts/houdini/vendor/husdoutputprocessors/avalon_uri_processor.py
-    Query:
-    - project
-    - asset
-
-### Maya
-- openpype/hosts/maya/api/action.py
-    Query:
-    - asset
-- openpype/hosts/maya/api/commands.py
-    Query:
-    - asset
-    - project
-- openpype/hosts/maya/api/lib.py
-    Query:
-    - project
-    - asset
-    - subset
-    - subsets
-    - version
-    - representation
-- openpype/hosts/maya/api/setdress.py
-    Query:
-    - version
-    - representation
-- openpype/hosts/maya/plugins/inventory/import_modelrender.py
-    Query:
-    - representation
-- openpype/hosts/maya/plugins/load/load_audio.py
-    Query:
-    - asset
-    - subset
-    - version
-- openpype/hosts/maya/plugins/load/load_image_plane.py
-    Query:
-    - asset
-    - subset
-    - version
-- openpype/hosts/maya/plugins/load/load_look.py
-    Query:
-    - representation
-- openpype/hosts/maya/plugins/load/load_vrayproxy.py
-    Query:
-    - representation
-- openpype/hosts/maya/plugins/load/load_yeti_cache.py
-    Query:
-    - representation
-- openpype/hosts/maya/plugins/publish/collect_review.py
-    Query:
-    - subsets
-- openpype/hosts/maya/plugins/publish/validate_node_ids_in_database.py
-    Query:
-    - assets
-- openpype/hosts/maya/plugins/publish/validate_node_ids_related.py
-    Query:
-    - asset
-- openpype/hosts/maya/plugins/publish/validate_renderlayer_aovs.py
-    Query:
-    - asset
-    - subset
-
-### Nuke
-- openpype/hosts/nuke/api/command.py
-    Query:
-    - project
-    - asset
-- openpype/hosts/nuke/api/lib.py
-    Query:
-    - project
-    - asset
-    - version
-    - versions
-    - representation
-- openpype/hosts/nuke/plugins/load/load_backdrop.py
-    Query:
-    - version
-    - versions
-- openpype/hosts/nuke/plugins/load/load_camera_abc.py
-    Query:
-    - version
-    - versions
-- openpype/hosts/nuke/plugins/load/load_clip.py
-    Query:
-    - version
-    - versions
-- openpype/hosts/nuke/plugins/load/load_effects_ip.py
-    Query:
-    - version
-    - versions
-- openpype/hosts/nuke/plugins/load/load_effects.py
-    Query:
-    - version
-    - versions
-- openpype/hosts/nuke/plugins/load/load_gizmo_ip.py
-    Query:
-    - version
-    - versions
-- openpype/hosts/nuke/plugins/load/load_gizmo.py
-    Query:
-    - version
-    - versions
-- openpype/hosts/nuke/plugins/load/load_image.py
-    Query:
-    - version
-    - versions
-- openpype/hosts/nuke/plugins/load/load_model.py
-    Query:
-    - version
-    - versions
-- openpype/hosts/nuke/plugins/load/load_script_precomp.py
-    Query:
-    - version
-    - versions
-- openpype/hosts/nuke/plugins/publish/collect_reads.py
-    Query:
-    - asset
-- openpype/hosts/nuke/plugins/publish/precollect_instances.py
-    Query:
-    - asset
-- openpype/hosts/nuke/plugins/publish/precollect_writes.py
-    Query:
-    - representation
-- openpype/hosts/nuke/plugins/publish/validate_script.py
-    Query:
-    - asset
-    - project
-
-### Photoshop
-- openpype/hosts/photoshop/plugins/create/workfile_creator.py
-    Query:
-    - asset
-
-### Resolve
-- openpype/hosts/resolve/plugins/load/load_clip.py
-    Query:
-    - version
-    - versions
-
-### Standalone publisher
-- openpype/hosts/standalonepublisher/plugins/publish/collect_bulk_mov_instances.py
-    Query:
-    - asset
-- openpype/hosts/standalonepublisher/plugins/publish/collect_matching_asset.py
-    Query:
-    - assets
-- openpype/hosts/standalonepublisher/plugins/publish/collect_hierarchy.py
-    Query:
-    - project
-    - asset
-- openpype/hosts/standalonepublisher/plugins/publish/validate_task_existence.py
-    Query:
-    - assets
-
-### TVPaint
-- openpype/hosts/tvpaint/api/pipeline.py
-    Query:
-    - project
-    - asset
-- openpype/hosts/tvpaint/plugins/load/load_workfile.py
-    Query:
-    - project
-    - asset
-- openpype/hosts/tvpaint/plugins/publish/collect_instances.py
-    Query:
-    - asset
-- openpype/hosts/tvpaint/plugins/publish/collect_scene_render.py
-    Query:
-    - asset
-- openpype/hosts/tvpaint/plugins/publish/collect_workfile.py
-    Query:
-    - asset
-
-### Unreal
-- openpype/hosts/unreal/plugins/load/load_camera.py
-    Query:
-    - asset
-    - assets
-- openpype/hosts/unreal/plugins/load/load_layout.py
-    Query:
-    - asset
-    - assets
-- openpype/hosts/unreal/plugins/publish/extract_layout.py
-    Query:
-    - representation
-
-### Webpublisher
-- openpype/hosts/webpublisher/webserver_service/webpublish_routes.py
-    Query:
-    - assets
-- openpype/hosts/webpublisher/plugins/publish/collect_published_files.py
-    Query:
-    - last versions
-
-## Tools
-openpype/tools/assetlinks/widgets.py
-- SimpleLinkView
-    Query:
-    - get_versions
-    - get_subsets
-    - get_assets
-    - get_output_link_versions
-
-openpype/tools/creator/window.py
-- CreatorWindow
-    Query:
-    - get_asset_by_name
-    - get_subsets
-
-openpype/tools/launcher/models.py
-- LauncherModel
-    Query:
-    - get_project
-    - get_assets
-
-openpype/tools/libraryloader/app.py
-- LibraryLoaderWindow
-    Query:
-    - get_project
-
-openpype/tools/loader/app.py
-- LoaderWindow
-    Query:
-    - get_project
-- show
-    Query:
-    - get_projects
-
-openpype/tools/loader/model.py
-- SubsetsModel
-    Query:
-    - get_assets
-    - get_subsets
-    - get_last_versions
-    - get_versions
-    - get_hero_versions
-    - get_version_by_name
-- RepresentationModel
-    Query:
-    - get_representations
-    - sync server specific queries (separated into multiple functions?)
-        - NOT REPLACED
-
-openpype/tools/loader/widgets.py
-- FamilyModel
-    Query:
-    - get_subset_families
-- VersionTextEdit
-    Query:
-    - get_subset_by_id
-    - get_version_by_id
-- SubsetWidget
-    Query:
-    - get_subsets
-    - get_representations
-    Update:
-    - Subset groups (combination of asset id and subset names)
-- RepresentationWidget
-    Query:
-    - get_subsets
-    - get_versions
-    - get_representations
-- ThumbnailWidget
-    Query:
-    - get_thumbnail_id_from_source
-    - get_thumbnail
-
-openpype/tools/mayalookassigner/app.py
-- MayaLookAssignerWindow
-    Query:
-    - get_last_version_by_subset_id
-
-openpype/tools/mayalookassigner/commands.py
-- create_items_from_nodes
-    Query:
-    - get_asset_by_id
-
-openpype/tools/mayalookassigner/vray_proxies.py
-- get_look_relationships
-    Query:
-    - get_representation_by_name
-- load_look
-    Query:
-    - get_representation_by_name
-- vrayproxy_assign_look
-    Query:
-    - get_last_version_by_subset_name
-
-openpype/tools/project_manager/project_manager/model.py
-- HierarchyModel
-    Query:
-    - get_asset_ids_with_subsets
-    - get_project
-    - get_assets
-
-openpype/tools/project_manager/project_manager/view.py
-- ProjectDocCache
-    Query:
-    - get_project
-
-openpype/tools/project_manager/project_manager/widgets.py
-- CreateProjectDialog
-    Query:
-    - get_projects
-
-openpype/tools/publisher/widgets/create_dialog.py
-- CreateDialog
-    Query:
-    - get_asset_by_name
-    - get_subsets
-
-openpype/tools/publisher/control.py
-- AssetDocsCache
-    Query:
-    - get_assets
-
-openpype/tools/sceneinventory/model.py
-- InventoryModel
-    Query:
-    - get_asset_by_id
-    - get_subset_by_id
-    - get_version_by_id
-    - get_last_version_by_subset_id
-    - get_representation
-
-openpype/tools/sceneinventory/switch_dialog.py
-- SwitchAssetDialog
-    Query:
-    - get_asset_by_name
-    - get_assets
-    - get_subset_by_name
-    - get_subsets
-    - get_versions
-    - get_hero_versions
-    - get_last_versions
-    - get_representations
-
-openpype/tools/sceneinventory/view.py
-- SceneInventoryView
-    Query:
-    - get_version_by_id
-    - get_versions
-    - get_hero_versions
-    - get_representation_by_id
-    - get_representations
-
-openpype/tools/standalonepublish/widgets/model_asset.py
-- AssetModel
-    Query:
-    - get_assets
-
-openpype/tools/standalonepublish/widgets/widget_asset.py
-- AssetWidget
-    Query:
-    - get_project
-    - get_asset_by_id
-
-openpype/tools/standalonepublish/widgets/widget_family.py
-- FamilyWidget
-    Query:
-    - get_asset_by_name
-    - get_subset_by_name
-    - get_subsets
-    - get_last_version_by_subset_id
-
-openpype/tools/standalonepublish/app.py
-- Window
-    Query:
-    - get_asset_by_id
-
-openpype/tools/texture_copy/app.py
-- TextureCopy
-    Query:
-    - get_project
-    - get_asset_by_name
-
-openpype/tools/workfiles/files_widget.py
-- FilesWidget
-    Query:
-    - get_asset_by_id
-
-openpype/tools/workfiles/model.py
-- PublishFilesModel
-    Query:
-    - get_subsets
-    - get_versions
-    - get_representations
-
-openpype/tools/workfiles/save_as_dialog.py
-- build_workfile_data
-    Query:
-    - get_project
-    - get_asset_by_name
-
-openpype/tools/workfiles/window.py
-- Window
-    Query:
-    - get_asset_by_id
-    - get_asset_by_name
-
-openpype/tools/utils/assets_widget.py
-- AssetModel
-    Query:
-    - get_project
-    - get_assets
-
-openpype/tools/utils/delegates.py
-- VersionDelegate
-    Query:
-    - get_versions
-    - get_hero_versions
-
-openpype/tools/utils/lib.py
-- GroupsConfig
-    Query:
-    - get_project
-- FamilyConfigCache
-    Query:
-    - get_asset_by_name
-
-openpype/tools/utils/tasks_widget.py
-- TasksModel
-    Query:
-    - get_project
-    - get_asset_by_id
 """

From 44611981d40b02065c0a03509b7d45c25900fe66 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Mon, 18 Jul 2022 10:37:16 +0200
Subject: [PATCH 248/289] modified return types in docstrings

---
 openpype/client/entities.py | 176 +++++++++++++++++++-----------------
 1 file changed, 91 insertions(+), 85 deletions(-)

diff --git a/openpype/client/entities.py b/openpype/client/entities.py
index 38552d9a56..ebd9b4821d 100644
--- a/openpype/client/entities.py
+++ b/openpype/client/entities.py
@@ -117,8 +117,8 @@ def get_asset_by_id(project_name, asset_id, fields=None):
 
     Args:
         project_name (str): Name of project where to look for queried entities.
-        asset_id (str|ObjectId): Asset's id.
-        fields (list[str]): Fields that should be returned. All fields are
+        asset_id (Union[str, ObjectId]): Asset's id.
+        fields (Iterable[str]): Fields that should be returned. All fields are
             returned if 'None' is passed.
 
     Returns:
@@ -141,7 +141,7 @@ def get_asset_by_name(project_name, asset_name, fields=None):
     Args:
         project_name (str): Name of project where to look for queried entities.
         asset_name (str): Asset's name.
-        fields (list[str]): Fields that should be returned. All fields are
+        fields (Iterable[str]): Fields that should be returned. All fields are
             returned if 'None' is passed.
 
     Returns:
@@ -178,12 +178,13 @@ def _get_assets(
 
     Args:
         project_name (str): Name of project where to look for queried entities.
-        asset_ids (list[str|ObjectId]): Asset ids that should be found.
-        asset_names (list[str]): Name assets that should be found.
-        parent_ids (list[str|ObjectId]): Parent asset ids.
+        asset_ids (Iterable[Union[str, ObjectId]]): Asset ids that should
+            be found.
+        asset_names (Iterable[str]): Name assets that should be found.
+        parent_ids (Iterable[Union[str, ObjectId]]): Parent asset ids.
         standard (bool): Query standart assets (type 'asset').
         archived (bool): Query archived assets (type 'archived_asset').
-        fields (list[str]): Fields that should be returned. All fields are
+        fields (Iterable[str]): Fields that should be returned. All fields are
             returned if 'None' is passed.
 
     Returns:
@@ -244,11 +245,12 @@ def get_assets(
 
     Args:
         project_name (str): Name of project where to look for queried entities.
-        asset_ids (list[str|ObjectId]): Asset ids that should be found.
-        asset_names (list[str]): Name assets that should be found.
-        parent_ids (list[str|ObjectId]): Parent asset ids.
+        asset_ids (Iterable[Union[str, ObjectId]]): Asset ids that should
+            be found.
+        asset_names (Iterable[str]): Name assets that should be found.
+        parent_ids (Iterable[Union[str, ObjectId]]): Parent asset ids.
         archived (bool): Add also archived assets.
-        fields (list[str]): Fields that should be returned. All fields are
+        fields (Iterable[str]): Fields that should be returned. All fields are
             returned if 'None' is passed.
 
     Returns:
@@ -283,10 +285,11 @@ def get_archived_assets(
 
     Args:
         project_name (str): Name of project where to look for queried entities.
-        asset_ids (list[str|ObjectId]): Asset ids that should be found.
-        asset_names (list[str]): Name assets that should be found.
-        parent_ids (list[str|ObjectId]): Parent asset ids.
-        fields (list[str]): Fields that should be returned. All fields are
+        asset_ids (Iterable[Union[str, ObjectId]]): Asset ids that should
+            be found.
+        asset_names (Iterable[str]): Name assets that should be found.
+        parent_ids (Iterable[Union[str, ObjectId]]): Parent asset ids.
+        fields (Iterable[str]): Fields that should be returned. All fields are
             returned if 'None' is passed.
 
     Returns:
@@ -304,10 +307,11 @@ def get_asset_ids_with_subsets(project_name, asset_ids=None):
 
     Args:
         project_name (str): Name of project where to look for queried entities.
-        asset_ids (list[str|ObjectId]): Look only for entered asset ids.
+        asset_ids (Iterable[Union[str, ObjectId]]): Look only for entered
+            asset ids.
 
     Returns:
-        List[ObjectId]: Asset ids that have existing subsets.
+        Iterable[ObjectId]: Asset ids that have existing subsets.
     """
 
     subset_query = {
@@ -345,8 +349,8 @@ def get_subset_by_id(project_name, subset_id, fields=None):
 
     Args:
         project_name (str): Name of project where to look for queried entities.
-        subset_id (str|ObjectId): Id of subset which should be found.
-        fields (list[str]): Fields that should be returned. All fields are
+        subset_id (Union[str, ObjectId]): Id of subset which should be found.
+        fields (Iterable[str]): Fields that should be returned. All fields are
             returned if 'None' is passed.
 
     Returns:
@@ -369,8 +373,8 @@ def get_subset_by_name(project_name, subset_name, asset_id, fields=None):
     Args:
         project_name (str): Name of project where to look for queried entities.
         subset_name (str): Name of subset.
-        asset_id (str|ObjectId): Id of parent asset.
-        fields (list[str]): Fields that should be returned. All fields are
+        asset_id (Union[str, ObjectId]): Id of parent asset.
+        fields (Iterable[str]): Fields that should be returned. All fields are
             returned if 'None' is passed.
 
     Returns:
@@ -409,16 +413,16 @@ def get_subsets(
 
     Args:
         project_name (str): Name of project where to look for queried entities.
-        subset_ids (list[str|ObjectId]): Subset ids that should be queried.
+        subset_ids (Iterable[Union[str, ObjectId]]): Subset ids that should be
+            queried. Filter ignored if 'None' is passed.
+        subset_names (Iterable[str]): Subset names that should be queried.
             Filter ignored if 'None' is passed.
-        subset_names (list[str]): Subset names that should be queried.
-            Filter ignored if 'None' is passed.
-        asset_ids (list[str|ObjectId]): Asset ids under which should look for
-            the subsets. Filter ignored if 'None' is passed.
-        names_by_asset_ids (dict[ObjectId, list[str]]): Complex filtering
+        asset_ids (Iterable[Union[str, ObjectId]]): Asset ids under which should
+            look for the subsets. Filter ignored if 'None' is passed.
+        names_by_asset_ids (dict[ObjectId, List[str]]): Complex filtering
             using asset ids and list of subset names under the asset.
         archived (bool): Look for archived subsets too.
-        fields (list[str]): Fields that should be returned. All fields are
+        fields (Iterable[str]): Fields that should be returned. All fields are
             returned if 'None' is passed.
 
     Returns:
@@ -472,8 +476,8 @@ def get_subset_families(project_name, subset_ids=None):
 
     Args:
         project_name (str): Name of project where to look for queried entities.
-        subset_ids (list[str|ObjectId]): Subset ids that should be queried.
-            All subsets from project are used if 'None' is passed.
+        subset_ids (Iterable[Union[str, ObjectId]]): Subset ids that should
+            be queried. All subsets from project are used if 'None' is passed.
 
     Returns:
          set[str]: Main families of matching subsets.
@@ -508,8 +512,8 @@ def get_version_by_id(project_name, version_id, fields=None):
 
     Args:
         project_name (str): Name of project where to look for queried entities.
-        version_id (str|ObjectId): Id of version which should be found.
-        fields (list[str]): Fields that should be returned. All fields are
+        version_id (Union[str, ObjectId]): Id of version which should be found.
+        fields (Iterable[str]): Fields that should be returned. All fields are
             returned if 'None' is passed.
 
     Returns:
@@ -535,8 +539,8 @@ def get_version_by_name(project_name, version, subset_id, fields=None):
     Args:
         project_name (str): Name of project where to look for queried entities.
         version (int): name of version entity (it's version).
-        subset_id (str|ObjectId): Id of version which should be found.
-        fields (list[str]): Fields that should be returned. All fields are
+        subset_id (Union[str, ObjectId]): Id of version which should be found.
+        fields (Iterable[str]): Fields that should be returned. All fields are
             returned if 'None' is passed.
 
     Returns:
@@ -621,14 +625,14 @@ def get_versions(
 
     Args:
         project_name (str): Name of project where to look for queried entities.
-        version_ids (list[str|ObjectId]): Version ids that will be queried.
+        version_ids (Iterable[Union[str, ObjectId]]): Version ids that will
+            be queried. Filter ignored if 'None' is passed.
+        subset_ids (Iterable[str]): Subset ids that will be queried.
             Filter ignored if 'None' is passed.
-        subset_ids (list[str]): Subset ids that will be queried.
-            Filter ignored if 'None' is passed.
-        versions (list[int]): Version names (as integers).
+        versions (Iterable[int]): Version names (as integers).
             Filter ignored if 'None' is passed.
         hero (bool): Look also for hero versions.
-        fields (list[str]): Fields that should be returned. All fields are
+        fields (Iterable[str]): Fields that should be returned. All fields are
             returned if 'None' is passed.
 
     Returns:
@@ -651,8 +655,9 @@ def get_hero_version_by_subset_id(project_name, subset_id, fields=None):
 
     Args:
         project_name (str): Name of project where to look for queried entities.
-        subset_id (str|ObjectId): Subset id under which is hero version.
-        fields (list[str]): Fields that should be returned. All fields are
+        subset_id (Union[str, ObjectId]): Subset id under which
+            is hero version.
+        fields (Iterable[str]): Fields that should be returned. All fields are
             returned if 'None' is passed.
 
     Returns:
@@ -681,8 +686,8 @@ def get_hero_version_by_id(project_name, version_id, fields=None):
 
     Args:
         project_name (str): Name of project where to look for queried entities.
-        version_id (str|ObjectId): Hero version id.
-        fields (list[str]): Fields that should be returned. All fields are
+        version_id (Union[str, ObjectId]): Hero version id.
+        fields (Iterable[str]): Fields that should be returned. All fields are
             returned if 'None' is passed.
 
     Returns:
@@ -716,11 +721,11 @@ def get_hero_versions(
 
     Args:
         project_name (str): Name of project where to look for queried entities.
-        subset_ids (list[str|ObjectId]): Subset ids for which should look for
-            hero versions. Filter ignored if 'None' is passed.
-        version_ids (list[str|ObjectId]): Hero version ids. Filter ignored if
-            'None' is passed.
-        fields (list[str]): Fields that should be returned. All fields are
+        subset_ids (Iterable[Union[str, ObjectId]]): Subset ids for which
+            should look for hero versions. Filter ignored if 'None' is passed.
+        version_ids (Iterable[Union[str, ObjectId]]): Hero version ids. Filter
+            ignored if 'None' is passed.
+        fields (Iterable[str]): Fields that should be returned. All fields are
             returned if 'None' is passed.
 
     Returns:
@@ -746,13 +751,13 @@ def get_output_link_versions(project_name, version_id, fields=None):
 
     Args:
         project_name (str): Name of project where to look for queried entities.
-        version_id (str|ObjectId): Version id which can be used as input link
-            for other versions.
-        fields (list[str]): Fields that should be returned. All fields are
+        version_id (Union[str, ObjectId]): Version id which can be used
+            as input link for other versions.
+        fields (Iterable[str]): Fields that should be returned. All fields are
             returned if 'None' is passed.
 
     Returns:
-        Cursor|list: Iterable cursor yielding versions that are used as input
+        Iterable: Iterable cursor yielding versions that are used as input
             links for passed version.
     """
 
@@ -774,8 +779,8 @@ def get_last_versions(project_name, subset_ids, fields=None):
 
     Args:
         project_name (str): Name of project where to look for queried entities.
-        subset_ids (list): List of subset ids.
-        fields (list[str]): Fields that should be returned. All fields are
+        subset_ids (Iterable[Union[str, ObjectId]]): List of subset ids.
+        fields (Iterable[str]): Fields that should be returned. All fields are
             returned if 'None' is passed.
 
     Returns:
@@ -859,8 +864,8 @@ def get_last_version_by_subset_id(project_name, subset_id, fields=None):
 
     Args:
         project_name (str): Name of project where to look for queried entities.
-        subset_id (str|ObjectId): Id of version which should be found.
-        fields (list[str]): Fields that should be returned. All fields are
+        subset_id (Union[str, ObjectId]): Id of version which should be found.
+        fields (Iterable[str]): Fields that should be returned. All fields are
             returned if 'None' is passed.
 
     Returns:
@@ -889,10 +894,10 @@ def get_last_version_by_subset_name(
     Args:
         project_name (str): Name of project where to look for queried entities.
         subset_name (str): Name of subset.
-        asset_id (str|ObjectId): Asset id which is parent of passed
+        asset_id (Union[str, ObjectId]): Asset id which is parent of passed
             subset name.
         asset_name (str): Asset name which is parent of passed subset name.
-        fields (list[str]): Fields that should be returned. All fields are
+        fields (Iterable[str]): Fields that should be returned. All fields are
             returned if 'None' is passed.
 
     Returns:
@@ -923,8 +928,8 @@ def get_representation_by_id(project_name, representation_id, fields=None):
 
     Args:
         project_name (str): Name of project where to look for queried entities.
-        representation_id (str|ObjectId): Representation id.
-        fields (list[str]): Fields that should be returned. All fields are
+        representation_id (Union[str, ObjectId]): Representation id.
+        fields (Iterable[str]): Fields that should be returned. All fields are
             returned if 'None' is passed.
 
     Returns:
@@ -956,8 +961,8 @@ def get_representation_by_name(
     Args:
         project_name (str): Name of project where to look for queried entities.
         representation_name (str): Representation name.
-        version_id (str|ObjectId): Id of parent version entity.
-        fields (list[str]): Fields that should be returned. All fields are
+        version_id (Union[str, ObjectId]): Id of parent version entity.
+        fields (Iterable[str]): Fields that should be returned. All fields are
             returned if 'None' is passed.
 
     Returns:
@@ -1061,18 +1066,18 @@ def get_representations(
 
     Args:
         project_name (str): Name of project where to look for queried entities.
-        representation_ids (list[str|ObjectId]): Representation ids used as
-            filter. Filter ignored if 'None' is passed.
-        representation_names (list[str]): Representations names used as filter.
-            Filter ignored if 'None' is passed.
-        version_ids (list[str]): Subset ids used as parent filter. Filter
+        representation_ids (Iterable[Union[str, ObjectId]]): Representation ids
+            used as filter. Filter ignored if 'None' is passed.
+        representation_names (Iterable[str]): Representations names used
+            as filter. Filter ignored if 'None' is passed.
+        version_ids (Iterable[str]): Subset ids used as parent filter. Filter
             ignored if 'None' is passed.
-        extensions (list[str]): Filter by extension of main representation
+        extensions (Iterable[str]): Filter by extension of main representation
             file (without dot).
         names_by_version_ids (dict[ObjectId, list[str]]): Complex filtering
             using version ids and list of names under the version.
         archived (bool): Output will also contain archived representations.
-        fields (list[str]): Fields that should be returned. All fields are
+        fields (Iterable[str]): Fields that should be returned. All fields are
             returned if 'None' is passed.
 
     Returns:
@@ -1107,17 +1112,17 @@ def get_archived_representations(
 
     Args:
         project_name (str): Name of project where to look for queried entities.
-        representation_ids (list[str|ObjectId]): Representation ids used as
-            filter. Filter ignored if 'None' is passed.
-        representation_names (list[str]): Representations names used as filter.
-            Filter ignored if 'None' is passed.
-        version_ids (list[str]): Subset ids used as parent filter. Filter
+        representation_ids (Iterable[Union[str, ObjectId]]): Representation ids
+            used as filter. Filter ignored if 'None' is passed.
+        representation_names (Iterable[str]): Representations names used
+            as filter. Filter ignored if 'None' is passed.
+        version_ids (Iterable[str]): Subset ids used as parent filter. Filter
             ignored if 'None' is passed.
-        extensions (list[str]): Filter by extension of main representation
+        extensions (Iterable[str]): Filter by extension of main representation
             file (without dot).
-        names_by_version_ids (dict[ObjectId, list[str]]): Complex filtering
+        names_by_version_ids (dict[ObjectId, List[str]]): Complex filtering
             using version ids and list of names under the version.
-        fields (list[str]): Fields that should be returned. All fields are
+        fields (Iterable[str]): Fields that should be returned. All fields are
             returned if 'None' is passed.
 
     Returns:
@@ -1145,7 +1150,7 @@ def get_representations_parents(project_name, representations):
 
     Args:
         project_name (str): Name of project where to look for queried entities.
-        representations (list[dict]): Representation entities with at least
+        representations (List[dict]): Representation entities with at least
             '_id' and 'parent' keys.
 
     Returns:
@@ -1238,7 +1243,7 @@ def get_thumbnail_id_from_source(project_name, src_type, src_id):
     Args:
         project_name (str): Name of project where to look for queried entities.
         src_type (str): Type of source entity ('asset', 'version').
-        src_id (str|objectId): Id of source entity.
+        src_id (Union[str, ObjectId]): Id of source entity.
 
     Returns:
         ObjectId: Thumbnail id assigned to entity.
@@ -1265,8 +1270,9 @@ def get_thumbnails(project_name, thumbnail_ids, fields=None):
 
     Args:
         project_name (str): Name of project where to look for queried entities.
-        thumbnail_ids (list[str|ObjectId]): Ids of thumbnail entities.
-        fields (list[str]): Fields that should be returned. All fields are
+        thumbnail_ids (Iterable[Union[str, ObjectId]]): Ids of thumbnail
+            entities.
+        fields (Iterable[str]): Fields that should be returned. All fields are
             returned if 'None' is passed.
 
     Returns:
@@ -1291,8 +1297,8 @@ def get_thumbnail(project_name, thumbnail_id, fields=None):
 
     Args:
         project_name (str): Name of project where to look for queried entities.
-        thumbnail_id (str|ObjectId): Id of thumbnail entity.
-        fields (list[str]): Fields that should be returned. All fields are
+        thumbnail_id (Union[str, ObjectId]): Id of thumbnail entity.
+        fields (Iterable[str]): Fields that should be returned. All fields are
             returned if 'None' is passed.
 
     Returns:
@@ -1319,9 +1325,9 @@ def get_workfile_info(
 
     Args:
         project_name (str): Name of project where to look for queried entities.
-        asset_id (str|ObjectId): Id of asset entity.
+        asset_id (Union[str, ObjectId]): Id of asset entity.
         task_name (str): Task name on asset.
-        fields (list[str]): Fields that should be returned. All fields are
+        fields (Iterable[str]): Fields that should be returned. All fields are
             returned if 'None' is passed.
     """
 

From 340c20e64ca1e9239b9dc1d067fbdefac053be5e Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Mon, 18 Jul 2022 10:43:20 +0200
Subject: [PATCH 249/289] fix line length

---
 openpype/client/entities.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openpype/client/entities.py b/openpype/client/entities.py
index ebd9b4821d..e7eeadcf48 100644
--- a/openpype/client/entities.py
+++ b/openpype/client/entities.py
@@ -417,8 +417,8 @@ def get_subsets(
             queried. Filter ignored if 'None' is passed.
         subset_names (Iterable[str]): Subset names that should be queried.
             Filter ignored if 'None' is passed.
-        asset_ids (Iterable[Union[str, ObjectId]]): Asset ids under which should
-            look for the subsets. Filter ignored if 'None' is passed.
+        asset_ids (Iterable[Union[str, ObjectId]]): Asset ids under which
+            should look for the subsets. Filter ignored if 'None' is passed.
         names_by_asset_ids (dict[ObjectId, List[str]]): Complex filtering
             using asset ids and list of subset names under the asset.
         archived (bool): Look for archived subsets too.

From eed26c09fc0385a907703622ddfb6f29339b6860 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Mon, 18 Jul 2022 10:53:48 +0200
Subject: [PATCH 250/289] OP-3589 - renamed method

---
 openpype/plugins/publish/extract_thumbnail.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openpype/plugins/publish/extract_thumbnail.py b/openpype/plugins/publish/extract_thumbnail.py
index e6df5b3ee0..7933595b89 100644
--- a/openpype/plugins/publish/extract_thumbnail.py
+++ b/openpype/plugins/publish/extract_thumbnail.py
@@ -46,7 +46,7 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
             self.log.info("Skipping - no review set on instance.")
             return
 
-        if self._has_thumbnail_already(instance):
+        if self._already_has_thumbnail(instance):
             self.log.info("Thumbnail representation already present.")
             return
 
@@ -106,7 +106,7 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
             # There is no need to create more then one thumbnail
             break
 
-    def _has_thumbnail_already(self, instance):
+    def _already_has_thumbnail(self, instance):
         for repre in instance.data.get("representations", []):
             self.log.info("repre {}".format(repre))
             if repre["name"] == "thumbnail":

From 247db779fe416c663d0b8e4ae100284fe9977476 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Mon, 18 Jul 2022 10:56:08 +0200
Subject: [PATCH 251/289] Update
 openpype/hosts/traypublisher/plugins/publish/validate_frame_ranges.py

Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
---
 .../traypublisher/plugins/publish/validate_frame_ranges.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/openpype/hosts/traypublisher/plugins/publish/validate_frame_ranges.py b/openpype/hosts/traypublisher/plugins/publish/validate_frame_ranges.py
index 89289fc6d4..bb6b906e8d 100644
--- a/openpype/hosts/traypublisher/plugins/publish/validate_frame_ranges.py
+++ b/openpype/hosts/traypublisher/plugins/publish/validate_frame_ranges.py
@@ -58,9 +58,10 @@ class ValidateFrameRange(OptionalPyblishPluginMixin,
             files = [files]
         frames = len(files)
 
-        msg = "Frame duration from DB:'{}' ". format(int(duration)) +\
-              " doesn't match number of files:'{}'".format(frames) +\
-              " Please change frame range for Asset or limit no. of files"
+        msg = (
+            "Frame duration from DB:'{}' doesn't match number of files:'{}'"
+            " Please change frame range for Asset or limit no. of files"
+        ). format(int(duration), frames)
 
         formatting_data = {"duration": duration,
                            "found": frames}

From cdabfbe6f9d0ea90df1a44525bf0ae88a45c825d Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Mon, 18 Jul 2022 10:56:25 +0200
Subject: [PATCH 252/289] Update
 openpype/hosts/traypublisher/plugins/publish/validate_frame_ranges.py

Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
---
 .../traypublisher/plugins/publish/validate_frame_ranges.py     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openpype/hosts/traypublisher/plugins/publish/validate_frame_ranges.py b/openpype/hosts/traypublisher/plugins/publish/validate_frame_ranges.py
index bb6b906e8d..0d7081139d 100644
--- a/openpype/hosts/traypublisher/plugins/publish/validate_frame_ranges.py
+++ b/openpype/hosts/traypublisher/plugins/publish/validate_frame_ranges.py
@@ -35,7 +35,8 @@ class ValidateFrameRange(OptionalPyblishPluginMixin,
                for pattern in self.skip_timelines_check):
             self.log.info("Skipping for {} task".format(instance.data["task"]))
 
-        asset_data = lib.get_asset(instance.data["asset"])["data"]
+        asset_doc = instance.data["assetEntity"]
+        asset_data = asset_doc["data"]
         frame_start = asset_data["frameStart"]
         frame_end = asset_data["frameEnd"]
         handle_start = asset_data["handleStart"]

From ef2284e507cd43db6b14518244333d10db1091b6 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Mon, 18 Jul 2022 10:57:01 +0200
Subject: [PATCH 253/289] Update
 openpype/hosts/traypublisher/plugins/publish/validate_frame_ranges.py

Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
---
 .../plugins/publish/validate_frame_ranges.py          | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/openpype/hosts/traypublisher/plugins/publish/validate_frame_ranges.py b/openpype/hosts/traypublisher/plugins/publish/validate_frame_ranges.py
index 0d7081139d..6d48e8352c 100644
--- a/openpype/hosts/traypublisher/plugins/publish/validate_frame_ranges.py
+++ b/openpype/hosts/traypublisher/plugins/publish/validate_frame_ranges.py
@@ -43,18 +43,19 @@ class ValidateFrameRange(OptionalPyblishPluginMixin,
         handle_end = asset_data["handleEnd"]
         duration = (frame_end - frame_start + 1) + handle_start + handle_end
 
-        repre = instance.data.get("representations", [None])
-        if not repre:
+        repres = instance.data.get("representations")
+        if not repres:
             self.log.info("No representations, skipping.")
             return
-
-        ext = repre[0]['ext'].replace(".", '')
+            
+        first_repre = repres[0]
+        ext = first_repre['ext'].replace(".", '')
 
         if not ext or ext.lower() not in self.check_extensions:
             self.log.warning("Cannot check for extension {}".format(ext))
             return
 
-        files = instance.data.get("representations", [None])[0]["files"]
+        files = first_repre["files"]
         if isinstance(files, str):
             files = [files]
         frames = len(files)

From 247eaf792bb21fd294bf95bb64423965834a4b00 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Mon, 18 Jul 2022 11:01:30 +0200
Subject: [PATCH 254/289] Check only if skip_timelines_check is filled

---
 .../traypublisher/plugins/publish/validate_frame_ranges.py   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/openpype/hosts/traypublisher/plugins/publish/validate_frame_ranges.py b/openpype/hosts/traypublisher/plugins/publish/validate_frame_ranges.py
index 6d48e8352c..65b6128cbe 100644
--- a/openpype/hosts/traypublisher/plugins/publish/validate_frame_ranges.py
+++ b/openpype/hosts/traypublisher/plugins/publish/validate_frame_ranges.py
@@ -31,8 +31,9 @@ class ValidateFrameRange(OptionalPyblishPluginMixin,
         if not self.is_active(instance.data):
             return
 
-        if any(re.search(pattern, instance.data["task"])
-               for pattern in self.skip_timelines_check):
+        if (self.skip_timelines_check and
+            any(re.search(pattern, instance.data["task"])
+                for pattern in self.skip_timelines_check)):
             self.log.info("Skipping for {} task".format(instance.data["task"]))
 
         asset_doc = instance.data["assetEntity"]

From e21338424ed92c4b59422f487de6de501d756c3c Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Mon, 18 Jul 2022 11:02:50 +0200
Subject: [PATCH 255/289] Hound

---
 .../traypublisher/plugins/publish/validate_frame_ranges.py     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/openpype/hosts/traypublisher/plugins/publish/validate_frame_ranges.py b/openpype/hosts/traypublisher/plugins/publish/validate_frame_ranges.py
index 65b6128cbe..947624100a 100644
--- a/openpype/hosts/traypublisher/plugins/publish/validate_frame_ranges.py
+++ b/openpype/hosts/traypublisher/plugins/publish/validate_frame_ranges.py
@@ -3,7 +3,6 @@ import re
 import pyblish.api
 
 import openpype.api
-from openpype import lib
 from openpype.pipeline import (
     PublishXmlValidationError,
     OptionalPyblishPluginMixin
@@ -48,7 +47,7 @@ class ValidateFrameRange(OptionalPyblishPluginMixin,
         if not repres:
             self.log.info("No representations, skipping.")
             return
-            
+
         first_repre = repres[0]
         ext = first_repre['ext'].replace(".", '')
 

From 4f6646d6c7b712e8ad6678a410da41772642e868 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Mon, 18 Jul 2022 11:11:08 +0200
Subject: [PATCH 256/289] Update
 openpype/hosts/traypublisher/plugins/publish/collect_mov_batch.py

Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
---
 .../hosts/traypublisher/plugins/publish/collect_mov_batch.py    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/hosts/traypublisher/plugins/publish/collect_mov_batch.py b/openpype/hosts/traypublisher/plugins/publish/collect_mov_batch.py
index 99065d2408..d24659aa8b 100644
--- a/openpype/hosts/traypublisher/plugins/publish/collect_mov_batch.py
+++ b/openpype/hosts/traypublisher/plugins/publish/collect_mov_batch.py
@@ -19,7 +19,7 @@ class CollectMovBatch(
     hosts = ["traypublisher"]
 
     def process(self, instance):
-        if not instance.data.get("creator_identifier") == "render_mov_batch":
+        if instance.data.get("creator_identifier") != "render_mov_batch":
             return
 
         creator_attributes = instance.data["creator_attributes"]

From ca2f554a1c4b167d444bbdde1c962f4f9bd7198d Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Mon, 18 Jul 2022 17:27:49 +0200
Subject: [PATCH 257/289] escape html chars from label in widgets

---
 openpype/tools/publisher/publish_report_viewer/model.py | 4 +++-
 openpype/tools/publisher/widgets/card_view_widgets.py   | 3 ++-
 openpype/tools/publisher/widgets/list_view_widgets.py   | 7 +++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/openpype/tools/publisher/publish_report_viewer/model.py b/openpype/tools/publisher/publish_report_viewer/model.py
index a88129a358..bd03376c55 100644
--- a/openpype/tools/publisher/publish_report_viewer/model.py
+++ b/openpype/tools/publisher/publish_report_viewer/model.py
@@ -1,4 +1,5 @@
 import uuid
+import html
 from Qt import QtCore, QtGui
 
 import pyblish.api
@@ -45,7 +46,8 @@ class InstancesModel(QtGui.QStandardItemModel):
             all_removed = True
             for instance_item in instance_items:
                 item = QtGui.QStandardItem(instance_item.label)
-                item.setData(instance_item.label, ITEM_LABEL_ROLE)
+                instance_label = html.escape(instance_item.label)
+                item.setData(instance_label, ITEM_LABEL_ROLE)
                 item.setData(instance_item.errored, ITEM_ERRORED_ROLE)
                 item.setData(instance_item.id, ITEM_ID_ROLE)
                 item.setData(instance_item.removed, INSTANCE_REMOVED_ROLE)
diff --git a/openpype/tools/publisher/widgets/card_view_widgets.py b/openpype/tools/publisher/widgets/card_view_widgets.py
index b6fcee7edb..5a6878ddca 100644
--- a/openpype/tools/publisher/widgets/card_view_widgets.py
+++ b/openpype/tools/publisher/widgets/card_view_widgets.py
@@ -22,6 +22,7 @@ Only one item can be selected at a time.
 
 import re
 import collections
+import html
 
 from Qt import QtWidgets, QtCore
 
@@ -303,7 +304,7 @@ class InstanceCardWidget(CardWidget):
         self._last_variant = variant
         self._last_subset_name = subset_name
         # Make `variant` bold
-        label = self.instance.label
+        label = html.escape(self.instance.label)
         found_parts = set(re.findall(variant, label, re.IGNORECASE))
         if found_parts:
             for part in found_parts:
diff --git a/openpype/tools/publisher/widgets/list_view_widgets.py b/openpype/tools/publisher/widgets/list_view_widgets.py
index 3476ee487e..3e4fd5b72d 100644
--- a/openpype/tools/publisher/widgets/list_view_widgets.py
+++ b/openpype/tools/publisher/widgets/list_view_widgets.py
@@ -23,6 +23,7 @@ selection can be enabled disabled using checkbox or keyboard key presses:
 ```
 """
 import collections
+import html
 
 from Qt import QtWidgets, QtCore, QtGui
 
@@ -113,7 +114,9 @@ class InstanceListItemWidget(QtWidgets.QWidget):
 
         self.instance = instance
 
-        subset_name_label = QtWidgets.QLabel(instance.label, self)
+        instance_label = html.escape(instance.label)
+
+        subset_name_label = QtWidgets.QLabel(instance_label, self)
         subset_name_label.setObjectName("ListViewSubsetName")
 
         active_checkbox = NiceCheckbox(parent=self)
@@ -178,7 +181,7 @@ class InstanceListItemWidget(QtWidgets.QWidget):
         # Check subset name
         label = self.instance.label
         if label != self._instance_label_widget.text():
-            self._instance_label_widget.setText(label)
+            self._instance_label_widget.setText(html.escape(label))
         # Check active state
         self.set_active(self.instance["active"])
         # Check valid states

From ddf07d790886a54e21eb3af0358102bbfc693643 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Mon, 18 Jul 2022 17:30:02 +0200
Subject: [PATCH 258/289] handle cases when task is not set and subset name
 requires it

---
 .../plugins/create/create_mov_batch.py        | 37 ++++++++++++++-----
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/openpype/hosts/traypublisher/plugins/create/create_mov_batch.py b/openpype/hosts/traypublisher/plugins/create/create_mov_batch.py
index 67f8848e05..840b0647f9 100644
--- a/openpype/hosts/traypublisher/plugins/create/create_mov_batch.py
+++ b/openpype/hosts/traypublisher/plugins/create/create_mov_batch.py
@@ -4,7 +4,12 @@ import re
 
 from openpype.client import get_assets, get_asset_by_name
 from openpype.hosts.traypublisher.api import pipeline
-from openpype.lib import FileDef, BoolDef, get_subset_name_with_asset_doc
+from openpype.lib import (
+    FileDef,
+    BoolDef,
+    get_subset_name_with_asset_doc,
+    TaskNotSetError,
+)
 from openpype.pipeline import (
     CreatedInstance,
     CreatorError
@@ -124,13 +129,27 @@ class BatchMovCreator(TrayPublishCreator):
         """Create subset name according to standard template process"""
         task_name = self._get_task_name(asset_doc)
 
-        subset_name = get_subset_name_with_asset_doc(
-            self.family,
-            variant,
-            task_name,
-            asset_doc,
-            project_name
-        )
+        try:
+            subset_name = get_subset_name_with_asset_doc(
+                self.family,
+                variant,
+                task_name,
+                asset_doc,
+                project_name
+            )
+        except TaskNotSetError:
+            # Create instance with fake task
+            # - instance will be marked as invalid so it can't be published
+            #   but user have ability to change it
+            # NOTE: This expect that there is not task 'Undefined' on asset
+            task_name = "Undefined"
+            subset_name = get_subset_name_with_asset_doc(
+                self.family,
+                variant,
+                task_name,
+                asset_doc,
+                project_name
+            )
 
         return subset_name, task_name
 
@@ -178,7 +197,7 @@ class BatchMovCreator(TrayPublishCreator):
 
     def get_detail_description(self):
         return """# Publish batch of .mov to multiple assets.
-        
+
         File names must then contain only asset name, or asset name + version.
         (eg. 'chair.mov', 'chair_v001.mov', not really safe `my_chair_v001.mov`
         """

From 508b3e7d8eccb554b5a6ed9f1660d611b780633d Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 19 Jul 2022 10:47:10 +0200
Subject: [PATCH 259/289] Update
 openpype/hosts/traypublisher/plugins/publish/collect_mov_batch.py

Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
---
 .../hosts/traypublisher/plugins/publish/collect_mov_batch.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/openpype/hosts/traypublisher/plugins/publish/collect_mov_batch.py b/openpype/hosts/traypublisher/plugins/publish/collect_mov_batch.py
index d24659aa8b..e6f33bc619 100644
--- a/openpype/hosts/traypublisher/plugins/publish/collect_mov_batch.py
+++ b/openpype/hosts/traypublisher/plugins/publish/collect_mov_batch.py
@@ -32,12 +32,11 @@ class CollectMovBatch(
             "name": ext[1:],
             "ext": ext[1:],
             "files": file_name,
-            "stagingDir": os.path.dirname(file_url)
+            "stagingDir": os.path.dirname(file_url),
+            "tags": []
         }
 
         if creator_attributes["add_review_family"]:
-            if not repre.get("tags"):
-                repre["tags"] = []
             repre["tags"].append("review")
             instance.data["families"].append("review")
 

From fa10d36f589d1961f9dcb425129a0a4a69399b86 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 19 Jul 2022 10:47:43 +0200
Subject: [PATCH 260/289] Better creation of instance

Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
---
 .../hosts/traypublisher/plugins/create/create_mov_batch.py   | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/openpype/hosts/traypublisher/plugins/create/create_mov_batch.py b/openpype/hosts/traypublisher/plugins/create/create_mov_batch.py
index 840b0647f9..bbabd73415 100644
--- a/openpype/hosts/traypublisher/plugins/create/create_mov_batch.py
+++ b/openpype/hosts/traypublisher/plugins/create/create_mov_batch.py
@@ -64,10 +64,7 @@ class BatchMovCreator(TrayPublishCreator):
             # Create new instance
             new_instance = CreatedInstance(self.family, subset_name,
                                            instance_data, self)
-            # Host implementation of storing metadata about instance
-            pipeline.HostContext.add_instance(new_instance.data_to_store())
-            # Add instance to current context
-            self._add_instance_to_context(new_instance)
+            self._store_new_instance(new_instance)
 
     def get_asset_doc_from_file_name(self, source_filename, project_name):
         """Try to parse out asset name from file name provided.

From b4bd2542ff86dea9ce0a480ca6d1524900d6847f Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 19 Jul 2022 10:57:30 +0200
Subject: [PATCH 261/289] OP-3446 - renamed from mov to movie

Workflow should handle not only .mov, but .mp4s or any movie format.
---
 ...eate_mov_batch.py => create_movie_batch.py} | 18 +++++++++++-------
 ...ect_mov_batch.py => collect_movie_batch.py} |  4 ++--
 .../project_settings/traypublisher.json        |  2 +-
 .../schema_project_traypublisher.json          |  4 ++--
 4 files changed, 16 insertions(+), 12 deletions(-)
 rename openpype/hosts/traypublisher/plugins/create/{create_mov_batch.py => create_movie_batch.py} (94%)
 rename openpype/hosts/traypublisher/plugins/publish/{collect_mov_batch.py => collect_movie_batch.py} (97%)

diff --git a/openpype/hosts/traypublisher/plugins/create/create_mov_batch.py b/openpype/hosts/traypublisher/plugins/create/create_movie_batch.py
similarity index 94%
rename from openpype/hosts/traypublisher/plugins/create/create_mov_batch.py
rename to openpype/hosts/traypublisher/plugins/create/create_movie_batch.py
index bbabd73415..63b9b2ef28 100644
--- a/openpype/hosts/traypublisher/plugins/create/create_mov_batch.py
+++ b/openpype/hosts/traypublisher/plugins/create/create_movie_batch.py
@@ -18,21 +18,25 @@ from openpype.pipeline import (
 from openpype.hosts.traypublisher.api.plugin import TrayPublishCreator
 
 
-class BatchMovCreator(TrayPublishCreator):
-    """Creates instances from .mov file(s)."""
-    identifier = "render_mov_batch"
-    label = "Batch Mov"
+class BatchMovieCreator(TrayPublishCreator):
+    """Creates instances from movie file(s).
+
+    Intended for .mov files, but should work for any video file.
+    Doesn't handle image sequences though.
+    """
+    identifier = "render_movie_batch"
+    label = "Batch Movies"
     family = "render"
-    description = "Publish batch of movs"
+    description = "Publish batch of video files"
 
     create_allow_context_change = False
     version_regex = re.compile(r"^(.+)_v([0-9]+)$")
 
     def __init__(self, project_settings, *args, **kwargs):
-        super(BatchMovCreator, self).__init__(project_settings,
+        super(BatchMovieCreator, self).__init__(project_settings,
                                               *args, **kwargs)
         creator_settings = (
-            project_settings["traypublisher"]["BatchMovCreator"]
+            project_settings["traypublisher"]["BatchMovieCreator"]
         )
         self.default_variants = creator_settings["default_variants"]
         self.default_tasks = creator_settings["default_tasks"]
diff --git a/openpype/hosts/traypublisher/plugins/publish/collect_mov_batch.py b/openpype/hosts/traypublisher/plugins/publish/collect_movie_batch.py
similarity index 97%
rename from openpype/hosts/traypublisher/plugins/publish/collect_mov_batch.py
rename to openpype/hosts/traypublisher/plugins/publish/collect_movie_batch.py
index e6f33bc619..45ccbd92d4 100644
--- a/openpype/hosts/traypublisher/plugins/publish/collect_mov_batch.py
+++ b/openpype/hosts/traypublisher/plugins/publish/collect_movie_batch.py
@@ -4,7 +4,7 @@ import pyblish.api
 from openpype.pipeline import OpenPypePyblishPluginMixin
 
 
-class CollectMovBatch(
+class CollectMovieBatch(
     pyblish.api.InstancePlugin, OpenPypePyblishPluginMixin
 ):
     """Collect file url for batch mov and create representation.
@@ -19,7 +19,7 @@ class CollectMovBatch(
     hosts = ["traypublisher"]
 
     def process(self, instance):
-        if instance.data.get("creator_identifier") != "render_mov_batch":
+        if instance.data.get("creator_identifier") != "render_movie_batch":
             return
 
         creator_attributes = instance.data["creator_attributes"]
diff --git a/openpype/settings/defaults/project_settings/traypublisher.json b/openpype/settings/defaults/project_settings/traypublisher.json
index cbe58f49d6..8bf3e3b306 100644
--- a/openpype/settings/defaults/project_settings/traypublisher.json
+++ b/openpype/settings/defaults/project_settings/traypublisher.json
@@ -236,7 +236,7 @@
             "extensions": []
         }
     ],
-    "BatchMovCreator": {
+    "BatchMovieCreator": {
         "default_variants": ["Main"],
         "default_tasks": ["Compositing"],
         "extensions": [
diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_traypublisher.json b/openpype/settings/entities/schemas/projects_schema/schema_project_traypublisher.json
index 50ba246c97..e38aa64e04 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_traypublisher.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_traypublisher.json
@@ -87,8 +87,8 @@
          {
             "type": "dict",
             "collapsible": true,
-            "key": "BatchMovCreator",
-            "label": "Batch Mov Creator",
+            "key": "BatchMovieCreator",
+            "label": "Batch Movie Creator",
             "use_label_wrap": true,
             "collapsible_key": true,
             "children": [

From 96be94c0c2b3aa2657bfe832b28904fbaec8ff53 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 19 Jul 2022 11:27:16 +0200
Subject: [PATCH 262/289] OP-3446 - added label to Settings

Updated label for collector
---
 .../traypublisher/plugins/publish/collect_movie_batch.py     | 4 ++--
 .../projects_schema/schema_project_traypublisher.json        | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/openpype/hosts/traypublisher/plugins/publish/collect_movie_batch.py b/openpype/hosts/traypublisher/plugins/publish/collect_movie_batch.py
index 45ccbd92d4..f37e04d1c9 100644
--- a/openpype/hosts/traypublisher/plugins/publish/collect_movie_batch.py
+++ b/openpype/hosts/traypublisher/plugins/publish/collect_movie_batch.py
@@ -7,13 +7,13 @@ from openpype.pipeline import OpenPypePyblishPluginMixin
 class CollectMovieBatch(
     pyblish.api.InstancePlugin, OpenPypePyblishPluginMixin
 ):
-    """Collect file url for batch mov and create representation.
+    """Collect file url for batch movies and create representation.
 
     Adds review on instance and to repre.tags based on value of toggle button
     on creator.
     """
 
-    label = "Collect Mov Batch Files"
+    label = "Collect Movie Batch Files"
     order = pyblish.api.CollectorOrder
 
     hosts = ["traypublisher"]
diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_traypublisher.json b/openpype/settings/entities/schemas/projects_schema/schema_project_traypublisher.json
index e38aa64e04..8f0f864dc2 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_traypublisher.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_traypublisher.json
@@ -89,9 +89,12 @@
             "collapsible": true,
             "key": "BatchMovieCreator",
             "label": "Batch Movie Creator",
-            "use_label_wrap": true,
             "collapsible_key": true,
             "children": [
+                {
+                    "type": "label",
+                    "label": "Allows to publish multiple video files in one go. <br />Name of matching asset is parsed from file names ('asset.mov', 'asset_v001.mov', 'my_asset_to_publish.mov')"
+                },
                 {
                     "type": "list",
                     "key": "default_variants",

From 505b42ace2a7e07bfff9cb191e0f5f873d6af181 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 19 Jul 2022 11:29:34 +0200
Subject: [PATCH 263/289] OP-3446 - Hound

---
 .../hosts/traypublisher/plugins/create/create_movie_batch.py   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/openpype/hosts/traypublisher/plugins/create/create_movie_batch.py b/openpype/hosts/traypublisher/plugins/create/create_movie_batch.py
index 63b9b2ef28..c5f0d6b75e 100644
--- a/openpype/hosts/traypublisher/plugins/create/create_movie_batch.py
+++ b/openpype/hosts/traypublisher/plugins/create/create_movie_batch.py
@@ -3,7 +3,6 @@ import os
 import re
 
 from openpype.client import get_assets, get_asset_by_name
-from openpype.hosts.traypublisher.api import pipeline
 from openpype.lib import (
     FileDef,
     BoolDef,
@@ -34,7 +33,7 @@ class BatchMovieCreator(TrayPublishCreator):
 
     def __init__(self, project_settings, *args, **kwargs):
         super(BatchMovieCreator, self).__init__(project_settings,
-                                              *args, **kwargs)
+                                                *args, **kwargs)
         creator_settings = (
             project_settings["traypublisher"]["BatchMovieCreator"]
         )

From c59a9cb05f641ccf8ec3638d69b1cf764cee9262 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20David?= <felixg.david@gmail.com>
Date: Tue, 19 Jul 2022 14:40:01 +0200
Subject: [PATCH 264/289] Fix: shot duplicate name using shot's hierarchy (ep,
 seq)

---
 openpype/modules/kitsu/utils/update_op_with_zou.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/openpype/modules/kitsu/utils/update_op_with_zou.py b/openpype/modules/kitsu/utils/update_op_with_zou.py
index 4695a49159..f43bf07e25 100644
--- a/openpype/modules/kitsu/utils/update_op_with_zou.py
+++ b/openpype/modules/kitsu/utils/update_op_with_zou.py
@@ -181,7 +181,7 @@ def update_op_assets(
             # Find root folder docs
             root_folder_docs = get_assets(
                 project_name,
-                asset_name=[entity_parent_folders[-1]],
+                asset_names=[entity_parent_folders[-1]],
                 fields=["_id", "data.root_of"]
             )
             # NOTE: Not sure why it's checking for entity type?
@@ -221,6 +221,14 @@ def update_op_assets(
             parent_entity = parent_doc["data"]["zou"]
             parent_zou_id = parent_entity["parent_id"]
 
+        # Item name
+        if item_type == "Asset":
+            item_name = item_doc["name"]
+        elif item_type == "Shot":  
+            # Name with parents hierarchy "({episode}_){sequence}_{shot}"
+            # to avoid duplicate name issue
+            item_name = "_".join(item_data["parents"] + [item_doc["name"]])
+
         # Set root folders parents
         item_data["parents"] = entity_parent_folders + item_data["parents"]
 
@@ -234,7 +242,7 @@ def update_op_assets(
                     item_doc["_id"],
                     {
                         "$set": {
-                            "name": item["name"],
+                            "name": item_name,
                             "data": item_data,
                             "parent": asset_doc_ids[item["project_id"]]["_id"],
                         }

From 9f41a512cb4ab27884ee2ad0465c23837f8ccad3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20David?= <felixg.david@gmail.com>
Date: Tue, 19 Jul 2022 14:44:25 +0200
Subject: [PATCH 265/289] black

---
 openpype/modules/kitsu/utils/update_op_with_zou.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openpype/modules/kitsu/utils/update_op_with_zou.py b/openpype/modules/kitsu/utils/update_op_with_zou.py
index f43bf07e25..9a5dd7db61 100644
--- a/openpype/modules/kitsu/utils/update_op_with_zou.py
+++ b/openpype/modules/kitsu/utils/update_op_with_zou.py
@@ -14,7 +14,7 @@ from openpype.client import (
     get_project,
     get_assets,
     get_asset_by_id,
-    get_asset_by_name
+    get_asset_by_name,
 )
 from openpype.pipeline import AvalonMongoDB
 from openpype.api import get_project_settings
@@ -182,7 +182,7 @@ def update_op_assets(
             root_folder_docs = get_assets(
                 project_name,
                 asset_names=[entity_parent_folders[-1]],
-                fields=["_id", "data.root_of"]
+                fields=["_id", "data.root_of"],
             )
             # NOTE: Not sure why it's checking for entity type?
             #   OP3 does not support multiple assets with same names so type
@@ -224,7 +224,7 @@ def update_op_assets(
         # Item name
         if item_type == "Asset":
             item_name = item_doc["name"]
-        elif item_type == "Shot":  
+        elif item_type == "Shot":
             # Name with parents hierarchy "({episode}_){sequence}_{shot}"
             # to avoid duplicate name issue
             item_name = "_".join(item_data["parents"] + [item_doc["name"]])

From 2bf3cf1b3094bb7402e7e3a8de55267fd4440edf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20David?= <felixg.david@gmail.com>
Date: Tue, 19 Jul 2022 14:54:36 +0200
Subject: [PATCH 266/289] Fix wrong name for sequence

---
 openpype/modules/kitsu/utils/update_op_with_zou.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/openpype/modules/kitsu/utils/update_op_with_zou.py b/openpype/modules/kitsu/utils/update_op_with_zou.py
index 9a5dd7db61..b2f0caf52b 100644
--- a/openpype/modules/kitsu/utils/update_op_with_zou.py
+++ b/openpype/modules/kitsu/utils/update_op_with_zou.py
@@ -221,13 +221,12 @@ def update_op_assets(
             parent_entity = parent_doc["data"]["zou"]
             parent_zou_id = parent_entity["parent_id"]
 
-        # Item name
-        if item_type == "Asset":
-            item_name = item_doc["name"]
-        elif item_type == "Shot":
+        if item_type in ["Shot", "Sequence"]:
             # Name with parents hierarchy "({episode}_){sequence}_{shot}"
             # to avoid duplicate name issue
             item_name = "_".join(item_data["parents"] + [item_doc["name"]])
+        else:
+            item_name = item_doc["name"]
 
         # Set root folders parents
         item_data["parents"] = entity_parent_folders + item_data["parents"]

From 5940fd0937941ba0fea391be0889bfa86bedc806 Mon Sep 17 00:00:00 2001
From: OpenPype <info@openpype.io>
Date: Wed, 20 Jul 2022 03:58:48 +0000
Subject: [PATCH 267/289] [Automated] Bump version

---
 CHANGELOG.md        | 15 ++++++++-------
 openpype/version.py |  2 +-
 pyproject.toml      |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95427e9ea9..e8da885473 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,23 +1,29 @@
 # Changelog
 
-## [3.12.2-nightly.1](https://github.com/pypeclub/OpenPype/tree/HEAD)
+## [3.12.2-nightly.2](https://github.com/pypeclub/OpenPype/tree/HEAD)
 
 [Full Changelog](https://github.com/pypeclub/OpenPype/compare/3.12.1...HEAD)
 
 **🚀 Enhancements**
 
+- General: Interactive console in cli [\#3526](https://github.com/pypeclub/OpenPype/pull/3526)
 - Ftrack: Automatic daily review session creation can define trigger hour [\#3516](https://github.com/pypeclub/OpenPype/pull/3516)
 - Ftrack: add source into Note [\#3509](https://github.com/pypeclub/OpenPype/pull/3509)
 - Ftrack: Trigger custom ftrack topic of project structure creation [\#3506](https://github.com/pypeclub/OpenPype/pull/3506)
 - Settings UI: Add extract to file action on project view [\#3505](https://github.com/pypeclub/OpenPype/pull/3505)
+- Add pack and unpack convenience scripts [\#3502](https://github.com/pypeclub/OpenPype/pull/3502)
 - General: Event system [\#3499](https://github.com/pypeclub/OpenPype/pull/3499)
 - NewPublisher: Keep plugins with mismatch target in report [\#3498](https://github.com/pypeclub/OpenPype/pull/3498)
 - Nuke: load clip with options from settings [\#3497](https://github.com/pypeclub/OpenPype/pull/3497)
+- TrayPublisher: implemented render\_mov\_batch  [\#3486](https://github.com/pypeclub/OpenPype/pull/3486)
 - Migrate basic families to the new Tray Publisher [\#3469](https://github.com/pypeclub/OpenPype/pull/3469)
 
 **🐛 Bug fixes**
 
+- Additional fixes for powershell scripts [\#3525](https://github.com/pypeclub/OpenPype/pull/3525)
+- Maya: Added wrapper around cmds.setAttr [\#3523](https://github.com/pypeclub/OpenPype/pull/3523)
 - General: Fix hash of centos oiio archive [\#3519](https://github.com/pypeclub/OpenPype/pull/3519)
+- Maya: Renderman display output fix [\#3514](https://github.com/pypeclub/OpenPype/pull/3514)
 - TrayPublisher: Simple creation enhancements and fixes [\#3513](https://github.com/pypeclub/OpenPype/pull/3513)
 - NewPublisher: Publish attributes are properly collected [\#3510](https://github.com/pypeclub/OpenPype/pull/3510)
 - TrayPublisher: Make sure host name is filled [\#3504](https://github.com/pypeclub/OpenPype/pull/3504)
@@ -25,6 +31,7 @@
 
 **🔀 Refactored code**
 
+- General: Client docstrings cleanup [\#3529](https://github.com/pypeclub/OpenPype/pull/3529)
 - TimersManager: Use query functions [\#3495](https://github.com/pypeclub/OpenPype/pull/3495)
 
 ## [3.12.1](https://github.com/pypeclub/OpenPype/tree/3.12.1) (2022-07-13)
@@ -51,7 +58,6 @@
 - Blender: Bugfix - Set fps properly on open [\#3426](https://github.com/pypeclub/OpenPype/pull/3426)
 - Hiero: Add custom scripts menu [\#3425](https://github.com/pypeclub/OpenPype/pull/3425)
 - Blender: pre pyside install for all platforms [\#3400](https://github.com/pypeclub/OpenPype/pull/3400)
-- Maya: Add additional playblast options to review Extractor. [\#3384](https://github.com/pypeclub/OpenPype/pull/3384)
 
 **🐛 Bug fixes**
 
@@ -71,7 +77,6 @@
 - Maya: fix hashing in Python 3 for tile rendering [\#3447](https://github.com/pypeclub/OpenPype/pull/3447)
 - LogViewer: Escape html characters in log message [\#3443](https://github.com/pypeclub/OpenPype/pull/3443)
 - Nuke: Slate frame is integrated [\#3427](https://github.com/pypeclub/OpenPype/pull/3427)
-- Maya: Camera extra data - additional fix for \#3304 [\#3386](https://github.com/pypeclub/OpenPype/pull/3386)
 
 **🔀 Refactored code**
 
@@ -85,8 +90,6 @@
 - General: Move publish plugin and publish render abstractions [\#3442](https://github.com/pypeclub/OpenPype/pull/3442)
 - General: Use Anatomy after move to pipeline [\#3436](https://github.com/pypeclub/OpenPype/pull/3436)
 - General: Anatomy moved to pipeline [\#3435](https://github.com/pypeclub/OpenPype/pull/3435)
-- Fusion: Use client query functions [\#3380](https://github.com/pypeclub/OpenPype/pull/3380)
-- Resolve: Use client query functions [\#3379](https://github.com/pypeclub/OpenPype/pull/3379)
 
 ## [3.12.0](https://github.com/pypeclub/OpenPype/tree/3.12.0) (2022-06-28)
 
@@ -111,7 +114,6 @@
 - Nuke: Collect representation files based on Write [\#3407](https://github.com/pypeclub/OpenPype/pull/3407)
 - General: Filter representations before integration start [\#3398](https://github.com/pypeclub/OpenPype/pull/3398)
 - Maya: look collector typo [\#3392](https://github.com/pypeclub/OpenPype/pull/3392)
-- Maya: vray device aspect ratio fix [\#3381](https://github.com/pypeclub/OpenPype/pull/3381)
 
 **🔀 Refactored code**
 
@@ -121,7 +123,6 @@
 - Houdini: Use client query functions [\#3395](https://github.com/pypeclub/OpenPype/pull/3395)
 - Hiero: Use client query functions [\#3393](https://github.com/pypeclub/OpenPype/pull/3393)
 - Nuke: Use client query functions [\#3391](https://github.com/pypeclub/OpenPype/pull/3391)
-- Maya: Use client query functions [\#3385](https://github.com/pypeclub/OpenPype/pull/3385)
 
 ## [3.11.1](https://github.com/pypeclub/OpenPype/tree/3.11.1) (2022-06-20)
 
diff --git a/openpype/version.py b/openpype/version.py
index e9206379e1..dd5ad97449 100644
--- a/openpype/version.py
+++ b/openpype/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring Pype version."""
-__version__ = "3.12.2-nightly.1"
+__version__ = "3.12.2-nightly.2"
diff --git a/pyproject.toml b/pyproject.toml
index 19d65b50f9..9552242694 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "OpenPype"
-version = "3.12.2-nightly.1" # OpenPype
+version = "3.12.2-nightly.2" # OpenPype
 description = "Open VFX and Animation pipeline with support."
 authors = ["OpenPype Team <info@openpype.io>"]
 license = "MIT License"

From fca8030092e9e9fd165d2bdf2039b662be218499 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 20 Jul 2022 09:47:54 +0200
Subject: [PATCH 268/289] normalize path from get_workdir where needed

---
 .../hosts/flame/plugins/publish/integrate_batch_group.py    | 6 ++++--
 openpype/lib/applications.py                                | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/openpype/hosts/flame/plugins/publish/integrate_batch_group.py b/openpype/hosts/flame/plugins/publish/integrate_batch_group.py
index da9553cc2a..032de99540 100644
--- a/openpype/hosts/flame/plugins/publish/integrate_batch_group.py
+++ b/openpype/hosts/flame/plugins/publish/integrate_batch_group.py
@@ -324,5 +324,7 @@ class IntegrateBatchGroup(pyblish.api.InstancePlugin):
         project_doc = instance.data["projectEntity"]
         asset_entity = instance.data["assetEntity"]
 
-        return get_workdir(
-            project_doc, asset_entity, task_data["name"], "flame")
+        workdir = get_workdir(
+            project_doc, asset_entity, task_data["name"], "flame"
+        )
+        return os.path.normpath(workdir)
diff --git a/openpype/lib/applications.py b/openpype/lib/applications.py
index f46197e15f..dafc3b479b 100644
--- a/openpype/lib/applications.py
+++ b/openpype/lib/applications.py
@@ -1638,6 +1638,7 @@ def prepare_context_environments(data, env_group=None):
             "Error in anatomy.format: {}".format(str(exc))
         )
 
+    workdir = os.path.normpath(workdir)
     if not os.path.exists(workdir):
         log.debug(
             "Creating workdir folder: \"{}\"".format(workdir)

From 37a02fe8e19e4faeaa2a63e3cced19efe5aa1fce Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 20 Jul 2022 09:48:21 +0200
Subject: [PATCH 269/289] 'get_workdir_with_workdir_data' returns
 'TemplateResult'

---
 openpype/lib/avalon_context.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/openpype/lib/avalon_context.py b/openpype/lib/avalon_context.py
index 76ed6cbbd3..605ebb0b99 100644
--- a/openpype/lib/avalon_context.py
+++ b/openpype/lib/avalon_context.py
@@ -582,10 +582,7 @@ def get_workdir_with_workdir_data(
 
     anatomy_filled = anatomy.format(workdir_data)
     # Output is TemplateResult object which contain useful data
-    path = anatomy_filled[template_key]["folder"]
-    if path:
-        path = os.path.normpath(path)
-    return path
+    return anatomy_filled[template_key]["folder"]
 
 
 def get_workdir(

From afd26a82e376a6445177d63d7769394c22b5efa6 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 20 Jul 2022 09:48:42 +0200
Subject: [PATCH 270/289] pass anatomy to 'get_workdir' in flame integrator

---
 openpype/hosts/flame/plugins/publish/integrate_batch_group.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openpype/hosts/flame/plugins/publish/integrate_batch_group.py b/openpype/hosts/flame/plugins/publish/integrate_batch_group.py
index 032de99540..bf6e81523d 100644
--- a/openpype/hosts/flame/plugins/publish/integrate_batch_group.py
+++ b/openpype/hosts/flame/plugins/publish/integrate_batch_group.py
@@ -323,8 +323,9 @@ class IntegrateBatchGroup(pyblish.api.InstancePlugin):
     def _get_shot_task_dir_path(self, instance, task_data):
         project_doc = instance.data["projectEntity"]
         asset_entity = instance.data["assetEntity"]
+        anatomy = instance.context.data["anatomy"]
 
         workdir = get_workdir(
-            project_doc, asset_entity, task_data["name"], "flame"
+            project_doc, asset_entity, task_data["name"], "flame", anatomy
         )
         return os.path.normpath(workdir)

From 5963066a7e1ba2849092215697470e7e0ae734bd Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 20 Jul 2022 10:11:56 +0200
Subject: [PATCH 271/289] TemplateResult has 'normalized' method

---
 openpype/lib/path_templates.py | 13 +++++++++++++
 openpype/pipeline/anatomy.py   | 13 +++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/openpype/lib/path_templates.py b/openpype/lib/path_templates.py
index 5c40aa4549..c1282016ef 100644
--- a/openpype/lib/path_templates.py
+++ b/openpype/lib/path_templates.py
@@ -409,6 +409,19 @@ class TemplateResult(str):
             self.invalid_types
         )
 
+    def normalized(self):
+        """Convert to normalized path."""
+
+        cls = self.__class__
+        return cls(
+            os.path.normpath(self),
+            self.template,
+            self.solved,
+            self.used_values,
+            self.missing_keys,
+            self.invalid_types
+        )
+
 
 class TemplatesResultDict(dict):
     """Holds and wrap TemplateResults for easy bug report."""
diff --git a/openpype/pipeline/anatomy.py b/openpype/pipeline/anatomy.py
index 73081f18fb..08db4749b3 100644
--- a/openpype/pipeline/anatomy.py
+++ b/openpype/pipeline/anatomy.py
@@ -380,6 +380,19 @@ class AnatomyTemplateResult(TemplateResult):
         )
         return self.__class__(tmp, self.rootless)
 
+    def normalized(self):
+        """Convert to normalized path."""
+
+        tmp = TemplateResult(
+            os.path.normpath(self),
+            self.template,
+            self.solved,
+            self.used_values,
+            self.missing_keys,
+            self.invalid_types
+        )
+        return self.__class__(tmp, self.rootless)
+
 
 class AnatomyTemplates(TemplatesDict):
     inner_key_pattern = re.compile(r"(\{@.*?[^{}0]*\})")

From ab34b6f1cf1b1e56b770dcac4191ca69c3a58a5b Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 20 Jul 2022 10:12:56 +0200
Subject: [PATCH 272/289] use normalized 'TemplateResult' output in
 'get_workdir_with_workdir_data'

---
 .../hosts/flame/plugins/publish/integrate_batch_group.py     | 3 +--
 openpype/lib/applications.py                                 | 1 -
 openpype/lib/avalon_context.py                               | 5 ++++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/openpype/hosts/flame/plugins/publish/integrate_batch_group.py b/openpype/hosts/flame/plugins/publish/integrate_batch_group.py
index bf6e81523d..b59107f155 100644
--- a/openpype/hosts/flame/plugins/publish/integrate_batch_group.py
+++ b/openpype/hosts/flame/plugins/publish/integrate_batch_group.py
@@ -325,7 +325,6 @@ class IntegrateBatchGroup(pyblish.api.InstancePlugin):
         asset_entity = instance.data["assetEntity"]
         anatomy = instance.context.data["anatomy"]
 
-        workdir = get_workdir(
+        return get_workdir(
             project_doc, asset_entity, task_data["name"], "flame", anatomy
         )
-        return os.path.normpath(workdir)
diff --git a/openpype/lib/applications.py b/openpype/lib/applications.py
index dafc3b479b..f46197e15f 100644
--- a/openpype/lib/applications.py
+++ b/openpype/lib/applications.py
@@ -1638,7 +1638,6 @@ def prepare_context_environments(data, env_group=None):
             "Error in anatomy.format: {}".format(str(exc))
         )
 
-    workdir = os.path.normpath(workdir)
     if not os.path.exists(workdir):
         log.debug(
             "Creating workdir folder: \"{}\"".format(workdir)
diff --git a/openpype/lib/avalon_context.py b/openpype/lib/avalon_context.py
index 605ebb0b99..2944b2506e 100644
--- a/openpype/lib/avalon_context.py
+++ b/openpype/lib/avalon_context.py
@@ -582,7 +582,10 @@ def get_workdir_with_workdir_data(
 
     anatomy_filled = anatomy.format(workdir_data)
     # Output is TemplateResult object which contain useful data
-    return anatomy_filled[template_key]["folder"]
+    output = anatomy_filled[template_key]["folder"]
+    if output:
+        return output.normalized()
+    return output
 
 
 def get_workdir(

From 6ed18c6250e083a827be395cfc9746ffe7bdd2fa Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 20 Jul 2022 13:13:23 +0200
Subject: [PATCH 273/289] stop context timer when context is set

---
 openpype/tools/workfiles/window.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openpype/tools/workfiles/window.py b/openpype/tools/workfiles/window.py
index c1efe026f2..f5edff2fa5 100644
--- a/openpype/tools/workfiles/window.py
+++ b/openpype/tools/workfiles/window.py
@@ -331,6 +331,7 @@ class Window(QtWidgets.QMainWindow):
         if self.assets_widget.refreshing:
             return
 
+        self._set_context_timer.stop()
         self._context_to_set, context = None, self._context_to_set
         if "asset" in context:
             asset_doc = get_asset_by_name(

From 58611f89bda27a745defb77a54fe27ff3555ffb7 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 20 Jul 2022 13:15:12 +0200
Subject: [PATCH 274/289] global function 'show_workfiles' just pass args and
 kwargs

---
 openpype/tools/utils/host_tools.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openpype/tools/utils/host_tools.py b/openpype/tools/utils/host_tools.py
index ae23e4d089..41c4478d57 100644
--- a/openpype/tools/utils/host_tools.py
+++ b/openpype/tools/utils/host_tools.py
@@ -395,9 +395,9 @@ def show_tool_by_name(tool_name, parent=None, *args, **kwargs):
     _SingletonPoint.show_tool_by_name(tool_name, parent, *args, **kwargs)
 
 
-def show_workfiles(parent=None, use_context=None, save=None):
+def show_workfiles(*args, **kwargs):
     _SingletonPoint.show_tool_by_name(
-        "workfiles", parent, use_context=use_context, save=save
+        "workfiles", *args, **kwargs
     )
 
 

From 8e4627b44dd6e1a667b742415c6d00946dba3220 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 20 Jul 2022 13:15:37 +0200
Subject: [PATCH 275/289] set icon of workfiles tool

---
 openpype/tools/workfiles/window.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openpype/tools/workfiles/window.py b/openpype/tools/workfiles/window.py
index f5edff2fa5..e86b716765 100644
--- a/openpype/tools/workfiles/window.py
+++ b/openpype/tools/workfiles/window.py
@@ -1,6 +1,6 @@
 import os
 import datetime
-from Qt import QtCore, QtWidgets
+from Qt import QtCore, QtWidgets, QtGui
 
 from openpype.client import (
     get_asset_by_id,
@@ -8,6 +8,7 @@ from openpype.client import (
     get_workfile_info,
 )
 from openpype import style
+from openpype import resources
 from openpype.lib import (
     create_workfile_doc,
     save_workfile_data_to_doc,
@@ -153,6 +154,8 @@ class Window(QtWidgets.QMainWindow):
         if not parent:
             window_flags |= QtCore.Qt.WindowStaysOnTopHint
         self.setWindowFlags(window_flags)
+        icon = QtGui.QIcon(resources.get_openpype_icon_filepath())
+        self.setWindowIcon(icon)
 
         # Create pages widget and set it as central widget
         pages_widget = QtWidgets.QStackedWidget(self)

From 55ff302d21a49b13281972129a944adcb998bf89 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 20 Jul 2022 13:15:58 +0200
Subject: [PATCH 276/289] changed workfiles window to QWidget

---
 openpype/tools/workfiles/window.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/openpype/tools/workfiles/window.py b/openpype/tools/workfiles/window.py
index e86b716765..588daf069f 100644
--- a/openpype/tools/workfiles/window.py
+++ b/openpype/tools/workfiles/window.py
@@ -143,23 +143,19 @@ class SidePanelWidget(QtWidgets.QWidget):
         return self._workfile_doc, data
 
 
-class Window(QtWidgets.QMainWindow):
+class Window(QtWidgets.QWidget):
     """Work Files Window"""
     title = "Work Files"
 
     def __init__(self, parent=None):
         super(Window, self).__init__(parent=parent)
         self.setWindowTitle(self.title)
-        window_flags = QtCore.Qt.Window | QtCore.Qt.WindowCloseButtonHint
-        if not parent:
-            window_flags |= QtCore.Qt.WindowStaysOnTopHint
-        self.setWindowFlags(window_flags)
         icon = QtGui.QIcon(resources.get_openpype_icon_filepath())
         self.setWindowIcon(icon)
+        self.setWindowFlags(self.windowFlags() | QtCore.Qt.Window)
 
         # Create pages widget and set it as central widget
         pages_widget = QtWidgets.QStackedWidget(self)
-        self.setCentralWidget(pages_widget)
 
         home_page_widget = QtWidgets.QWidget(pages_widget)
         home_body_widget = QtWidgets.QWidget(home_page_widget)
@@ -194,6 +190,9 @@ class Window(QtWidgets.QMainWindow):
         # the files widget has a filter field which tasks does not.
         tasks_widget.setContentsMargins(0, 32, 0, 0)
 
+        main_layout = QtWidgets.QHBoxLayout(self)
+        main_layout.addWidget(pages_widget, 1)
+
         # Set context after asset widget is refreshed
         # - to do so it is necessary to wait until refresh is done
         set_context_timer = QtCore.QTimer()

From 3fac738361abb9446424fcb244d9768c2706f070 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 20 Jul 2022 13:16:15 +0200
Subject: [PATCH 277/289] show workfile just calls ensure visible on workfiles
 tool

---
 openpype/tools/utils/host_tools.py | 25 +++--------------
 openpype/tools/workfiles/window.py | 43 ++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/openpype/tools/utils/host_tools.py b/openpype/tools/utils/host_tools.py
index 41c4478d57..52d15a59f7 100644
--- a/openpype/tools/utils/host_tools.py
+++ b/openpype/tools/utils/host_tools.py
@@ -60,31 +60,14 @@ class HostToolsHelper:
 
         return self._workfiles_tool
 
-    def show_workfiles(self, parent=None, use_context=None, save=None):
+    def show_workfiles(
+        self, parent=None, use_context=None, save=None, on_top=None
+    ):
         """Workfiles tool for changing context and saving workfiles."""
-        if use_context is None:
-            use_context = True
-
-        if save is None:
-            save = True
 
         with qt_app_context():
             workfiles_tool = self.get_workfiles_tool(parent)
-            workfiles_tool.set_save_enabled(save)
-
-            if not workfiles_tool.isVisible():
-                workfiles_tool.show()
-
-                if use_context:
-                    context = {
-                        "asset": legacy_io.Session["AVALON_ASSET"],
-                        "task": legacy_io.Session["AVALON_TASK"]
-                    }
-                    workfiles_tool.set_context(context)
-
-            # Pull window to the front.
-            workfiles_tool.raise_()
-            workfiles_tool.activateWindow()
+            workfiles_tool.ensure_visible(use_context, save, on_top)
 
     def get_loader_tool(self, parent):
         """Create, cache and return loader tool window."""
diff --git a/openpype/tools/workfiles/window.py b/openpype/tools/workfiles/window.py
index 588daf069f..0b0d67e589 100644
--- a/openpype/tools/workfiles/window.py
+++ b/openpype/tools/workfiles/window.py
@@ -229,6 +229,49 @@ class Window(QtWidgets.QWidget):
         self._first_show = True
         self._context_to_set = None
 
+    def ensure_visible(
+        self, use_context=None, save=None, on_top=None
+    ):
+        if save is None:
+            save = True
+
+        self.set_save_enabled(save)
+
+        if self.isVisible():
+            use_context = False
+        elif use_context is None:
+            use_context = True
+
+        if on_top is None and self._first_show:
+            on_top = self.parent() is None
+
+        window_flags = self.windowFlags()
+        new_window_flags = window_flags
+        if on_top is True:
+            new_window_flags = window_flags | QtCore.Qt.WindowStaysOnTopHint
+        elif on_top is False:
+            new_window_flags = window_flags & ~QtCore.Qt.WindowStaysOnTopHint
+
+        if new_window_flags != window_flags:
+            # Note this is not propagated after initialization of widget in
+            #   some Qt builds
+            self.setWindowFlags(new_window_flags)
+            self.show()
+
+        elif not self.isVisible():
+            self.show()
+
+        if use_context is None or use_context is True:
+            context = {
+                "asset": legacy_io.Session["AVALON_ASSET"],
+                "task": legacy_io.Session["AVALON_TASK"]
+            }
+            self.set_context(context)
+
+        # Pull window to the front.
+        self.raise_()
+        self.activateWindow()
+
     @property
     def project_name(self):
         return legacy_io.Session["AVALON_PROJECT"]

From b128e98c8f6269a779ec87a66d35cf8b4d8bf6d1 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Wed, 20 Jul 2022 13:16:57 +0200
Subject: [PATCH 278/289] nuke does not pass parent widget for workfiles tool
 and tell it to change on top flag

---
 openpype/hosts/nuke/api/lib.py      | 10 ++++++----
 openpype/hosts/nuke/api/pipeline.py | 10 +++++++++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/openpype/hosts/nuke/api/lib.py b/openpype/hosts/nuke/api/lib.py
index 0929415c00..9b24c9fb38 100644
--- a/openpype/hosts/nuke/api/lib.py
+++ b/openpype/hosts/nuke/api/lib.py
@@ -2440,10 +2440,12 @@ def _launch_workfile_app():
     if starting_up or closing_down:
         return
 
-    from .pipeline import get_main_window
-
-    main_window = get_main_window()
-    host_tools.show_workfiles(parent=main_window)
+    # Make sure on top is enabled on first show so the window is not hidden
+    #   under main nuke window
+    #   - this happened on Centos 7 and it is because the focus of nuke
+    #       changes to the main window after showing because of initialization
+    #       which moves workfiles tool under it
+    host_tools.show_workfiles(parent=None, on_top=True)
 
 
 def process_workfile_builder():
diff --git a/openpype/hosts/nuke/api/pipeline.py b/openpype/hosts/nuke/api/pipeline.py
index 2e3621ba8f..0afc56d2f7 100644
--- a/openpype/hosts/nuke/api/pipeline.py
+++ b/openpype/hosts/nuke/api/pipeline.py
@@ -142,6 +142,14 @@ def uninstall():
     _uninstall_menu()
 
 
+def _show_workfiles():
+    # Make sure parent is not set
+    # - this makes Workfiles tool as separated window which
+    #   avoid issues with reopening
+    # - it is possible to explicitly change on top flag of the tool
+    host_tools.show_workfiles(parent=None, on_top=False)
+
+
 def _install_menu():
     # uninstall original avalon menu
     main_window = get_main_window()
@@ -158,7 +166,7 @@ def _install_menu():
     menu.addSeparator()
     menu.addCommand(
         "Work Files...",
-        lambda: host_tools.show_workfiles(parent=main_window)
+        _show_workfiles
     )
 
     menu.addSeparator()

From bedca7eaf98212d1a5450b097029d25dfdaf4d02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= <ondrej.samohel@pype.club>
Date: Wed, 20 Jul 2022 16:30:03 +0200
Subject: [PATCH 279/289] :wrench: add relevant Maya validators to Settings

add missing validators and add ability to set them optional if needed
---
 .../validate_review_subset_uniqueness.py      |   4 +-
 .../plugins/publish/validate_setdress_root.py |   3 +-
 .../defaults/project_settings/maya.json       | 178 +++++++++++++++++-
 .../schemas/schema_maya_publish.json          | 155 +++++++++++++++
 4 files changed, 329 insertions(+), 11 deletions(-)

diff --git a/openpype/hosts/maya/plugins/publish/validate_review_subset_uniqueness.py b/openpype/hosts/maya/plugins/publish/validate_review_subset_uniqueness.py
index d70096ee45..04cc9ab5fb 100644
--- a/openpype/hosts/maya/plugins/publish/validate_review_subset_uniqueness.py
+++ b/openpype/hosts/maya/plugins/publish/validate_review_subset_uniqueness.py
@@ -6,7 +6,7 @@ from openpype.pipeline import PublishXmlValidationError
 
 
 class ValidateReviewSubsetUniqueness(pyblish.api.ContextPlugin):
-    """Validates that nodes has common root."""
+    """Validates that review subset has unique name."""
 
     order = openpype.api.ValidateContentsOrder
     hosts = ["maya"]
@@ -17,7 +17,7 @@ class ValidateReviewSubsetUniqueness(pyblish.api.ContextPlugin):
         subset_names = []
 
         for instance in context:
-            self.log.info("instance:: {}".format(instance.data))
+            self.log.debug("Instance: {}".format(instance.data))
             if instance.data.get('publish'):
                 subset_names.append(instance.data.get('subset'))
 
diff --git a/openpype/hosts/maya/plugins/publish/validate_setdress_root.py b/openpype/hosts/maya/plugins/publish/validate_setdress_root.py
index 0b4842d208..8e23a7c04f 100644
--- a/openpype/hosts/maya/plugins/publish/validate_setdress_root.py
+++ b/openpype/hosts/maya/plugins/publish/validate_setdress_root.py
@@ -4,8 +4,7 @@ import openpype.api
 
 
 class ValidateSetdressRoot(pyblish.api.InstancePlugin):
-    """
-    """
+    """Validate if set dress top root node is published."""
 
     order = openpype.api.ValidateContentsOrder
     label = "SetDress Root"
diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json
index 5976c6a823..c96acbff6d 100644
--- a/openpype/settings/defaults/project_settings/maya.json
+++ b/openpype/settings/defaults/project_settings/maya.json
@@ -205,10 +205,15 @@
             "enabled": true,
             "optional": true,
             "active": true,
-            "exclude_families": ["model", "rig", "staticMesh"]
+            "exclude_families": [
+                "model",
+                "rig",
+                "staticMesh"
+            ]
         },
         "ValidateShaderName": {
             "enabled": false,
+            "optional": true,
             "regex": "(?P<asset>.*)_(.*)_SHD"
         },
         "ValidateShadingEngine": {
@@ -222,6 +227,7 @@
         },
         "ValidateLoadedPlugin": {
             "enabled": false,
+            "optional": true,
             "whitelist_native_plugins": false,
             "authorized_plugins": []
         },
@@ -236,6 +242,7 @@
         },
         "ValidateUnrealStaticMeshName": {
             "enabled": true,
+            "optional": true,
             "validate_mesh": false,
             "validate_collision": true
         },
@@ -252,6 +259,81 @@
             "redshift_render_attributes": [],
             "renderman_render_attributes": []
         },
+        "ValidateCurrentRenderLayerIsRenderable": {
+            "enabled": true,
+            "optional": false,
+            "active": true
+        },
+        "ValidateRenderImageRule": {
+            "enabled": true,
+            "optional": false,
+            "active": true
+        },
+        "ValidateRenderNoDefaultCameras": {
+            "enabled": true,
+            "optional": false,
+            "active": true
+        },
+        "ValidateRenderSingleCamera": {
+            "enabled": true,
+            "optional": false,
+            "active": true
+        },
+        "ValidateRenderLayerAOVs": {
+            "enabled": true,
+            "optional": false,
+            "active": true
+        },
+        "ValidateStepSize": {
+            "enabled": true,
+            "optional": false,
+            "active": true
+        },
+        "ValidateVRayDistributedRendering": {
+            "enabled": true,
+            "optional": false,
+            "active": true
+        },
+        "ValidateVrayReferencedAOVs": {
+            "enabled": true,
+            "optional": false,
+            "active": true
+        },
+        "ValidateVRayTranslatorEnabled": {
+            "enabled": true,
+            "optional": false,
+            "active": true
+        },
+        "ValidateVrayProxy": {
+            "enabled": true,
+            "optional": false,
+            "active": true
+        },
+        "ValidateVrayProxyMembers": {
+            "enabled": true,
+            "optional": false,
+            "active": true
+        },
+        "ValidateYetiRenderScriptCallbacks": {
+            "enabled": true,
+            "optional": false,
+            "active": true
+        },
+        "ValidateYetiRigCacheState": {
+            "enabled": true,
+            "optional": false,
+            "active": true
+        },
+        "ValidateYetiRigInputShapesInInstance": {
+            "enabled": true,
+            "optional": false,
+            "active": true
+        },
+        "ValidateYetiRigSettings": {
+            "enabled": true,
+            "optional": false,
+            "active": true
+        },
         "ValidateModelName": {
             "enabled": false,
             "database": true,
@@ -270,6 +352,7 @@
         },
         "ValidateTransformNamingSuffix": {
             "enabled": true,
+            "optional": true,
             "SUFFIX_NAMING_TABLE": {
                 "mesh": [
                     "_GEO",
@@ -293,7 +376,7 @@
             "ALLOW_IF_NOT_IN_SUFFIX_TABLE": true
         },
         "ValidateColorSets": {
-            "enabled": false,
+            "enabled": true,
             "optional": true,
             "active": true
         },
@@ -337,6 +420,16 @@
             "optional": true,
             "active": true
         },
+        "ValidateMeshNoNegativeScale": {
+            "enabled": true,
+            "optional": false,
+            "active": true
+        },
+        "ValidateMeshNonZeroEdgeLength": {
+            "enabled": true,
+            "optional": true,
+            "active": true
+        },
         "ValidateMeshNormalsUnlocked": {
             "enabled": false,
             "optional": true,
@@ -359,22 +452,22 @@
         },
         "ValidateNoNamespace": {
             "enabled": true,
-            "optional": true,
+            "optional": false,
             "active": true
         },
         "ValidateNoNullTransforms": {
             "enabled": true,
-            "optional": true,
+            "optional": false,
             "active": true
         },
         "ValidateNoUnknownNodes": {
             "enabled": true,
-            "optional": true,
+            "optional": false,
             "active": true
         },
         "ValidateNodeNoGhosting": {
             "enabled": false,
-            "optional": true,
+            "optional": false,
             "active": true
         },
         "ValidateShapeDefaultNames": {
@@ -402,6 +495,21 @@
             "optional": true,
             "active": true
         },
+        "ValidateNoVRayMesh": {
+            "enabled": true,
+            "optional": false,
+            "active": true
+        },
+        "ValidateUnrealMeshTriangulated": {
+            "enabled": false,
+            "optional": true,
+            "active": true
+        },
+        "ValidateAlembicVisibleOnly": {
+            "enabled": true,
+            "optional": false,
+            "active": true
+        },
         "ExtractAlembic": {
             "enabled": true,
             "families": [
@@ -425,8 +533,34 @@
             "optional": true,
             "active": true
         },
+        "ValidateAnimationContent": {
+            "enabled": true,
+            "optional": false,
+            "active": true
+        },
+        "ValidateOutRelatedNodeIds": {
+            "enabled": true,
+            "optional": false,
+            "active": true
+        },
+        "ValidateRigControllersArnoldAttributes": {
+            "enabled": true,
+            "optional": false,
+            "active": true
+        },
+        "ValidateSkeletalMeshHierarchy": {
+            "enabled": true,
+            "optional": false,
+            "active": true
+        },
+        "ValidateSkinclusterDeformerSet": {
+            "enabled": true,
+            "optional": false,
+            "active": true
+        },
         "ValidateRigOutSetNodeIds": {
             "enabled": true,
+            "optional": false,
             "allow_history_only": false
         },
         "ValidateCameraAttributes": {
@@ -439,14 +573,44 @@
             "optional": true,
             "active": true
         },
+        "ValidateAssemblyNamespaces": {
+            "enabled": true,
+            "optional": false,
+            "active": true
+        },
+        "ValidateAssemblyModelTransforms": {
+            "enabled": true,
+            "optional": false,
+            "active": true
+        },
         "ValidateAssRelativePaths": {
             "enabled": true,
+            "optional": false,
+            "active": true
+        },
+        "ValidateInstancerContent": {
+            "enabled": true,
+            "optional": false,
+            "active": true
+        },
+        "ValidateInstancerFrameRanges": {
+            "enabled": true,
+            "optional": false,
+            "active": true
+        },
+        "ValidateNoDefaultCameras": {
+            "enabled": true,
+            "optional": false,
+            "active": true
+        },
+        "ValidateUnrealUpAxis": {
+            "enabled": false,
             "optional": true,
             "active": true
         },
         "ValidateCameraContents": {
             "enabled": true,
-            "optional": true,
+            "optional": false,
             "validate_shapes": true
         },
         "ExtractPlayblast": {
diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json
index 84182973a1..53247f6bd4 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json
@@ -107,6 +107,11 @@
                     "key": "enabled",
                     "label": "Enabled"
                 },
+                {
+                    "type": "boolean",
+                    "key": "optional",
+                    "label": "Optional"
+                },
                 {
                     "type": "label",
                     "label": "Shader name regex can use named capture group <b>asset</b> to validate against current asset name.<p><b>Example:</b><br/><code>^.*(?P=&lt;asset&gt;.+)_SHD</code></p>"
@@ -159,6 +164,11 @@
                     "key": "enabled",
                     "label": "Enabled"
                 },
+                {
+                    "type": "boolean",
+                    "key": "optional",
+                    "label": "Optional"
+                },
                 {
                     "type": "boolean",
                     "key": "whitelist_native_plugins",
@@ -246,6 +256,11 @@
                     "key": "enabled",
                     "label": "Enabled"
                 },
+                {
+                    "type": "boolean",
+                    "key": "optional",
+                    "label": "Optional"
+                },
                 {
                     "type": "boolean",
                     "key": "validate_mesh",
@@ -332,6 +347,72 @@
                 }
             ]
         },
+        {
+            "type": "schema_template",
+            "name": "template_publish_plugin",
+            "template_data": [
+                {
+                    "key": "ValidateCurrentRenderLayerIsRenderable",
+                    "label": "Validate Current Render Layer Has Renderable Camera"
+                },
+                {
+                    "key": "ValidateRenderImageRule",
+                    "label": "Validate Images File Rule (Workspace)"
+                },
+                {
+                    "key": "ValidateRenderNoDefaultCameras",
+                    "label": "Validate No Default Cameras Renderable"
+                },
+                {
+                    "key": "ValidateRenderSingleCamera",
+                    "label": "Validate Render Single Camera"
+                },
+                {
+                    "key": "ValidateRenderLayerAOVs",
+                    "label": "Validate Render Passes / AOVs Are Registered"
+                },
+                {
+                    "key": "ValidateStepSize",
+                    "label": "Validate Step Size"
+                },
+                {
+                    "key": "ValidateVRayDistributedRendering",
+                    "label": "VRay Distributed Rendering"
+                },
+                {
+                    "key": "ValidateVrayReferencedAOVs",
+                    "label": "VRay Referenced AOVs"
+                },
+                {
+                    "key": "ValidateVRayTranslatorEnabled",
+                    "label": "VRay Translator Settings"
+                },
+                {
+                    "key": "ValidateVrayProxy",
+                    "label": "VRay Proxy Settings"
+                },
+                {
+                    "key": "ValidateVrayProxyMembers",
+                    "label": "VRay Proxy Members"
+                },
+                {
+                    "key": "ValidateYetiRenderScriptCallbacks",
+                    "label": "Yeti Render Script Callbacks"
+                },
+                {
+                    "key": "ValidateYetiRigCacheState",
+                    "label": "Yeti Rig Cache State"
+                },
+                {
+                    "key": "ValidateYetiRigInputShapesInInstance",
+                    "label": "Yeti Rig Input Shapes In Instance"
+                },
+                {
+                    "key": "ValidateYetiRigSettings",
+                    "label": "Yeti Rig Settings"
+                }
+            ]
+        },
         {
             "type": "collapsible-wrap",
             "label": "Model",
@@ -416,6 +497,11 @@
                             "key": "enabled",
                             "label": "Enabled"
                         },
+                        {
+                            "type": "boolean",
+                            "key": "optional",
+                            "label": "Optional"
+                        },
                         {
                             "type": "label",
                             "label": "Validates transform suffix based on the type of its children shapes."
@@ -472,6 +558,14 @@
                             "key": "ValidateMeshNonManifold",
                             "label": "ValidateMeshNonManifold"
                         },
+                        {
+                            "key": "ValidateMeshNoNegativeScale",
+                            "label": "Validate Mesh No Negative Scale"
+                        },
+                        {
+                            "key": "ValidateMeshNonZeroEdgeLength",
+                            "label": "Validate Mesh Edge Length Non Zero"
+                        },
                         {
                             "key": "ValidateMeshNormalsUnlocked",
                             "label": "ValidateMeshNormalsUnlocked"
@@ -525,6 +619,18 @@
                         {
                             "key": "ValidateUniqueNames",
                             "label": "ValidateUniqueNames"
+                        },
+                        {
+                            "key": "ValidateNoVRayMesh",
+                            "label": "Validate No V-Ray Proxies (VRayMesh)"
+                        },
+                        {
+                            "key": "ValidateUnrealMeshTriangulated",
+                            "label": "Validate if Mesh is Triangulated"
+                        },
+                        {
+                            "key": "ValidateAlembicVisibleOnly",
+                            "label": "Validate Alembic visible node"
                         }
                     ]
                 },
@@ -573,6 +679,26 @@
                         {
                             "key": "ValidateRigControllers",
                             "label": "Validate Rig Controllers"
+                        },
+                        {
+                            "key": "ValidateAnimationContent",
+                            "label": "Validate Animation Content"
+                        },
+                        {
+                            "key": "ValidateOutRelatedNodeIds",
+                            "label": "Validate Animation Out Set Related Node Ids"
+                        },
+                        {
+                            "key": "ValidateRigControllersArnoldAttributes",
+                            "label": "Validate Rig Controllers (Arnold Attributes)"
+                        },
+                        {
+                            "key": "ValidateSkeletalMeshHierarchy",
+                            "label": "Validate Skeletal Mesh Top Node"
+                        },
+                         {
+                            "key": "ValidateSkinclusterDeformerSet",
+                            "label": "Validate Skincluster Deformer Relationships"
                         }
                     ]
                 },
@@ -589,6 +715,11 @@
                             "key": "enabled",
                             "label": "Enabled"
                         },
+                        {
+                            "type": "boolean",
+                            "key": "optional",
+                            "label": "Optional"
+                        },
                         {
                             "type": "boolean",
                             "key": "allow_history_only",
@@ -611,9 +742,33 @@
                     "key": "ValidateAssemblyName",
                     "label": "Validate Assembly Name"
                 },
+                {
+                    "key": "ValidateAssemblyNamespaces",
+                    "label": "Validate Assembly Namespaces"
+                },
+                {
+                    "key": "ValidateAssemblyModelTransforms",
+                    "label": "Validate Assembly Model Transforms"
+                },
                 {
                     "key": "ValidateAssRelativePaths",
                     "label": "ValidateAssRelativePaths"
+                },
+                {
+                    "key": "ValidateInstancerContent",
+                    "label": "Validate Instancer Content"
+                },
+                {
+                    "key": "ValidateInstancerFrameRanges",
+                    "label": "Validate Instancer Cache Frame Ranges"
+                },
+                {
+                    "key": "ValidateNoDefaultCameras",
+                    "label": "Validate No Default Cameras"
+                },
+                {
+                    "key": "ValidateUnrealUpAxis",
+                    "label": "Validate Unreal Up-Axis check"
                 }
             ]
         },

From 59395883170cac8ec8c11ca7b66ccd40d499cbc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20David?= <felixg.david@gmail.com>
Date: Wed, 20 Jul 2022 17:30:40 +0200
Subject: [PATCH 280/289] Change: Asset is put under an AssetType folder

---
 .../modules/kitsu/utils/update_op_with_zou.py | 60 ++++++++++++-------
 1 file changed, 37 insertions(+), 23 deletions(-)

diff --git a/openpype/modules/kitsu/utils/update_op_with_zou.py b/openpype/modules/kitsu/utils/update_op_with_zou.py
index 4695a49159..e0ff87adf7 100644
--- a/openpype/modules/kitsu/utils/update_op_with_zou.py
+++ b/openpype/modules/kitsu/utils/update_op_with_zou.py
@@ -14,7 +14,7 @@ from openpype.client import (
     get_project,
     get_assets,
     get_asset_by_id,
-    get_asset_by_name
+    get_asset_by_name,
 )
 from openpype.pipeline import AvalonMongoDB
 from openpype.api import get_project_settings
@@ -154,17 +154,23 @@ def update_op_assets(
             parent_zou_id = substitute_parent_item["parent_id"]
         else:
             parent_zou_id = (
-                item.get("parent_id")
+                # For Asset, put under asset type directory
+                item.get("entity_type_id")
+                if item_type == "Asset"
+                else None
+                # Else, fallback on usual hierarchy
+                or item.get("parent_id")
                 or item.get("episode_id")
                 or item.get("source_id")
-            )  # TODO check consistency
+            )
 
-        # Substitute Episode and Sequence by Shot
-        substitute_item_type = (
-            "shots"
-            if item_type in ["Episode", "Sequence"]
-            else f"{item_type.lower()}s"
-        )
+        # Substitute item type for general classification (assets or shots)
+        if item_type in ["Asset", "AssetType"]:
+            substitute_item_type = "assets"
+        elif item_type in ["Episode", "Sequence"]:
+            substitute_item_type = "shots"
+        else:
+            substitute_item_type = f"{item_type.lower()}s"
         entity_parent_folders = [
             f
             for f in project_module_settings["entities_root"]
@@ -181,8 +187,8 @@ def update_op_assets(
             # Find root folder docs
             root_folder_docs = get_assets(
                 project_name,
-                asset_name=[entity_parent_folders[-1]],
-                fields=["_id", "data.root_of"]
+                asset_names=[entity_parent_folders[-1]],
+                fields=["_id", "data.root_of"],
             )
             # NOTE: Not sure why it's checking for entity type?
             #   OP3 does not support multiple assets with same names so type
@@ -219,7 +225,7 @@ def update_op_assets(
 
             # Get parent entity
             parent_entity = parent_doc["data"]["zou"]
-            parent_zou_id = parent_entity["parent_id"]
+            parent_zou_id = parent_entity.get("parent_id")
 
         # Set root folders parents
         item_data["parents"] = entity_parent_folders + item_data["parents"]
@@ -236,7 +242,7 @@ def update_op_assets(
                         "$set": {
                             "name": item["name"],
                             "data": item_data,
-                            "parent": asset_doc_ids[item["project_id"]]["_id"],
+                            "parent": project_doc["_id"],
                         }
                     },
                 )
@@ -327,6 +333,10 @@ def sync_all_projects(login: str, password: str):
 def sync_project_from_kitsu(dbcon: AvalonMongoDB, project: dict):
     """Update OP project in DB with Zou data.
 
+    `root_of` is meant to sort entities by type for a better readability in the data tree. It
+    puts all shot like (Shot and Episode and Sequence) and asset entities under two different root
+    folders or hierarchy, defined in settings.
+
     Args:
         dbcon (AvalonMongoDB): MongoDB connection
         project (dict): Project dict got using gazu.
@@ -341,12 +351,17 @@ def sync_project_from_kitsu(dbcon: AvalonMongoDB, project: dict):
 
     # Get all assets from zou
     all_assets = gazu.asset.all_assets_for_project(project)
+    all_asset_types = gazu.asset.all_asset_types_for_project(project)
     all_episodes = gazu.shot.all_episodes_for_project(project)
     all_seqs = gazu.shot.all_sequences_for_project(project)
     all_shots = gazu.shot.all_shots_for_project(project)
     all_entities = [
         item
-        for item in all_assets + all_episodes + all_seqs + all_shots
+        for item in all_assets
+        + all_asset_types
+        + all_episodes
+        + all_seqs
+        + all_shots
         if naming_pattern.match(item["name"])
     ]
 
@@ -401,21 +416,20 @@ def sync_project_from_kitsu(dbcon: AvalonMongoDB, project: dict):
                         "data": {
                             "root_of": entity_type,
                             "parents": parent_folders[:i],
-                            "visualParent": direct_parent_doc,
+                            "visualParent": direct_parent_doc.inserted_id
+                            if direct_parent_doc
+                            else None,
                             "tasks": {},
                         },
                     }
                 )
 
     # Create
-    to_insert = []
-    to_insert.extend(
-        [
-            create_op_asset(item)
-            for item in all_entities
-            if item["id"] not in zou_ids_and_asset_docs.keys()
-        ]
-    )
+    to_insert = [
+        create_op_asset(item)
+        for item in all_entities
+        if item["id"] not in zou_ids_and_asset_docs.keys()
+    ]
     if to_insert:
         # Insert doc in DB
         dbcon.insert_many(to_insert)

From 02cc2166c1ee165b48d697c876675302c8cb77db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20David?= <felixg.david@gmail.com>
Date: Wed, 20 Jul 2022 17:37:19 +0200
Subject: [PATCH 281/289] docstring linting line length

---
 openpype/modules/kitsu/utils/update_op_with_zou.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openpype/modules/kitsu/utils/update_op_with_zou.py b/openpype/modules/kitsu/utils/update_op_with_zou.py
index e0ff87adf7..cabf4e4d18 100644
--- a/openpype/modules/kitsu/utils/update_op_with_zou.py
+++ b/openpype/modules/kitsu/utils/update_op_with_zou.py
@@ -333,9 +333,9 @@ def sync_all_projects(login: str, password: str):
 def sync_project_from_kitsu(dbcon: AvalonMongoDB, project: dict):
     """Update OP project in DB with Zou data.
 
-    `root_of` is meant to sort entities by type for a better readability in the data tree. It
-    puts all shot like (Shot and Episode and Sequence) and asset entities under two different root
-    folders or hierarchy, defined in settings.
+    `root_of` is meant to sort entities by type for a better readability in 
+    the data tree. It puts all shot like (Shot and Episode and Sequence) and
+    asset entities under two different root folders or hierarchy, defined in settings.
 
     Args:
         dbcon (AvalonMongoDB): MongoDB connection

From a3144c9d75e3372e1d7a3008f54e2695c81a51d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20David?= <felixg.david@gmail.com>
Date: Wed, 20 Jul 2022 17:40:16 +0200
Subject: [PATCH 282/289] docstring linting line length

---
 openpype/modules/kitsu/utils/update_op_with_zou.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/modules/kitsu/utils/update_op_with_zou.py b/openpype/modules/kitsu/utils/update_op_with_zou.py
index cabf4e4d18..46e0fa38f3 100644
--- a/openpype/modules/kitsu/utils/update_op_with_zou.py
+++ b/openpype/modules/kitsu/utils/update_op_with_zou.py
@@ -333,7 +333,7 @@ def sync_all_projects(login: str, password: str):
 def sync_project_from_kitsu(dbcon: AvalonMongoDB, project: dict):
     """Update OP project in DB with Zou data.
 
-    `root_of` is meant to sort entities by type for a better readability in 
+    `root_of` is meant to sort entities by type for a better readability in
     the data tree. It puts all shot like (Shot and Episode and Sequence) and
     asset entities under two different root folders or hierarchy, defined in settings.
 

From af45aff844ab2ff28ccc76ec99d3e5a9803c92e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20David?= <felixg.david@gmail.com>
Date: Wed, 20 Jul 2022 17:56:37 +0200
Subject: [PATCH 283/289] docstring linting line length

---
 openpype/modules/kitsu/utils/update_op_with_zou.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openpype/modules/kitsu/utils/update_op_with_zou.py b/openpype/modules/kitsu/utils/update_op_with_zou.py
index 46e0fa38f3..7262d2ee1a 100644
--- a/openpype/modules/kitsu/utils/update_op_with_zou.py
+++ b/openpype/modules/kitsu/utils/update_op_with_zou.py
@@ -335,7 +335,8 @@ def sync_project_from_kitsu(dbcon: AvalonMongoDB, project: dict):
 
     `root_of` is meant to sort entities by type for a better readability in
     the data tree. It puts all shot like (Shot and Episode and Sequence) and
-    asset entities under two different root folders or hierarchy, defined in settings.
+    asset entities under two different root folders or hierarchy, defined in 
+    settings.
 
     Args:
         dbcon (AvalonMongoDB): MongoDB connection

From 480d1968124ccf4fe2bc70b109145b016292fe25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20David?= <felixg.david@gmail.com>
Date: Wed, 20 Jul 2022 17:56:55 +0200
Subject: [PATCH 284/289] docstring linting line length

---
 openpype/modules/kitsu/utils/update_op_with_zou.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/modules/kitsu/utils/update_op_with_zou.py b/openpype/modules/kitsu/utils/update_op_with_zou.py
index 7262d2ee1a..7bfbd42f6a 100644
--- a/openpype/modules/kitsu/utils/update_op_with_zou.py
+++ b/openpype/modules/kitsu/utils/update_op_with_zou.py
@@ -335,7 +335,7 @@ def sync_project_from_kitsu(dbcon: AvalonMongoDB, project: dict):
 
     `root_of` is meant to sort entities by type for a better readability in
     the data tree. It puts all shot like (Shot and Episode and Sequence) and
-    asset entities under two different root folders or hierarchy, defined in 
+    asset entities under two different root folders or hierarchy, defined in
     settings.
 
     Args:

From 92b611d76aabb35fefb3f34430a9679b5c9b28da Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 21 Jul 2022 09:58:17 +0200
Subject: [PATCH 285/289] Raise AttributeError instead of ImportError on
 missing attribute in 'openpype_interfaces'

---
 openpype/modules/base.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/openpype/modules/base.py b/openpype/modules/base.py
index b9ccec13cc..1bd343fd07 100644
--- a/openpype/modules/base.py
+++ b/openpype/modules/base.py
@@ -49,6 +49,7 @@ class _ModuleClass(object):
     Object of this class can be stored to `sys.modules` and used for storing
     dynamically imported modules.
     """
+
     def __init__(self, name):
         # Call setattr on super class
         super(_ModuleClass, self).__setattr__("name", name)
@@ -116,12 +117,13 @@ class _InterfacesClass(_ModuleClass):
     - this is because interfaces must be available even if are missing
         implementation
     """
+
     def __getattr__(self, attr_name):
         if attr_name not in self.__attributes__:
             if attr_name in ("__path__", "__file__"):
                 return None
 
-            raise ImportError((
+            raise AttributeError((
                 "cannot import name '{}' from 'openpype_interfaces'"
             ).format(attr_name))
 

From 635164b00c6573396096c72268e71a4a062688ff Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 21 Jul 2022 10:40:39 +0200
Subject: [PATCH 286/289] added HiddenCreator description

---
 website/docs/dev_publishing.md | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/website/docs/dev_publishing.md b/website/docs/dev_publishing.md
index 8ee3b7e85f..c949fa8570 100644
--- a/website/docs/dev_publishing.md
+++ b/website/docs/dev_publishing.md
@@ -66,7 +66,7 @@ Another optional function is **get_current_context**. This function is handy in
 Main responsibility of create plugin is to create, update, collect and remove instance metadata and propagate changes to create context. Has access to **CreateContext** (`self.create_context`) that discovered the plugin so has also access to other creators and instances. Create plugins have a lot of responsibility so it is recommended to implement common code per host.
 
 #### *BaseCreator*
-Base implementation of creator plugin. It is not recommended to use this class as base for production plugins but rather use one of **AutoCreator** and **Creator** variants.
+Base implementation of creator plugin. It is not recommended to use this class as base for production plugins but rather use one of **HiddenCreator**, **AutoCreator** and **Creator** variants.
 
 **Abstractions**
 - **`family`** (class attr) - Tells what kind of instance will be created.
@@ -92,7 +92,7 @@ def collect_instances(self):
             self._add_instance_to_context(instance)
 ```
 
-- **`create`** (method) - Create a new object of **CreatedInstance** store its metadata to the workfile and add the instance into the created context. Failed Creating should raise **CreatorError** if an error happens that artists can fix or give them some useful information. Triggers and implementation differs for **Creator** and **AutoCreator**.
+- **`create`** (method) - Create a new object of **CreatedInstance** store its metadata to the workfile and add the instance into the created context. Failed Creating should raise **CreatorError** if an error happens that artists can fix or give them some useful information. Triggers and implementation differs for **Creator**, **HiddenCreator** and **AutoCreator**.
 
 - **`update_instances`** (method) - Update data of instances. Receives tuple with **instance** and **changes**.
 ```python
@@ -199,6 +199,20 @@ class RenderLayerCreator(Creator):
 - **`get_dynamic_data`** (method) - Can be used to extend data for subset templates which may be required in some cases.
 
 
+#### *HiddenCreator*
+Creator which is not showed in UI so artist can't trigger it directly but is available for other creators. This creator is primarily meant for cases when creation should create different types of instances. For example during editorial publishing where input is single edl file but should create 2 or more kind of instances each with different family, attributes and abilities. Arguments for creation were limited to `instance_data` and `source_data`. Data of `instance_data` should follow what is sent to other creators and `source_data` can be used to send custom data defined by main creator. It is expected that `HiddenCreator` has specific main or "parent" creator.
+
+```python
+def create(self, instance_data, source_data):
+    variant = instance_data["variant"]
+    task_name = instance_data["task"]
+    asset_name = instance_data["asset"]
+    asset_doc = get_asset_by_name(self.project_name, asset_name)
+    self.get_subset_name(
+        variant, task_name, asset_doc, self.project_name, self.host_name)
+```
+
+
 #### *AutoCreator*
 Creator that is triggered on reset of create context. Can be used for families that are expected to be created automatically without artist interaction (e.g. **workfile**). Method `create` is triggered after collecting all creators.
 

From a8d99a6f91d8fc44bda465a6a5f3f5425931eb75 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 21 Jul 2022 10:41:56 +0200
Subject: [PATCH 287/289] changed imports of 'attribute_deffinitions'

---
 website/docs/dev_publishing.md | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/website/docs/dev_publishing.md b/website/docs/dev_publishing.md
index c949fa8570..5266ece72c 100644
--- a/website/docs/dev_publishing.md
+++ b/website/docs/dev_publishing.md
@@ -172,11 +172,11 @@ class RenderLayerCreator(Creator):
     icon = "fa5.building"
 ```
 
-- **`get_instance_attr_defs`** (method) - Attribute definitions of instance. Creator can define attribute values with default values for each instance. These attributes may affect how instances will be instance processed during publishing. Attribute defiitions can be used from `openpype.pipeline.lib.attribute_definitions` (NOTE: Will be moved to `openpype.lib.attribute_definitions` soon). Attribute definitions define basic types of values for different cases e.g. boolean, number, string, enumerator, etc. Default implementation returns **instance_attr_defs**.
+- **`get_instance_attr_defs`** (method) - Attribute definitions of instance. Creator can define attribute values with default values for each instance. These attributes may affect how instances will be instance processed during publishing. Attribute defiitions can be used from `openpype.lib.attribute_definitions`. Attribute definitions define basic types of values for different cases e.g. boolean, number, string, enumerator, etc. Default implementation returns **instance_attr_defs**.
 - **`instance_attr_defs`** (attr) - Attribute for default implementation of **get_instance_attr_defs**.
 
 ```python
-from openpype.pipeline import attribute_definitions
+from openpype.lib import attribute_definitions
 
 
 class RenderLayerCreator(Creator):
@@ -311,7 +311,8 @@ class BulkRenderCreator(Creator):
 - **`pre_create_attr_defs`** (attr) - Attribute for default implementation of **get_pre_create_attr_defs**.
 
 ```python
-from openpype.pipeline import Creator, attribute_definitions
+from openpype.lib import attribute_definitions
+from openpype.pipeline.create import Creator
 
 
 class CreateRender(Creator):
@@ -484,10 +485,8 @@ Possible attribute definitions can be found in `openpype/pipeline/lib/attribute_
 
 ```python
 import pyblish.api
-from openpype.pipeline import (
-    OpenPypePyblishPluginMixin,
-    attribute_definitions,
-)
+from openpype.lib import attribute_definitions
+from openpype.pipeline import OpenPypePyblishPluginMixin
 
 
 # Example context plugin

From 6d093b92d9db498ab40dbc2b5bdc7a93f7581ebb Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 21 Jul 2022 10:42:12 +0200
Subject: [PATCH 288/289] changed queries and access to current session

---
 website/docs/dev_publishing.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/website/docs/dev_publishing.md b/website/docs/dev_publishing.md
index 5266ece72c..f11a2c3047 100644
--- a/website/docs/dev_publishing.md
+++ b/website/docs/dev_publishing.md
@@ -248,14 +248,14 @@ def create(self):
     # - variant can be filled from settings
     variant = self._variant_name
     # Only place where we can look for current context
-    project_name = io.Session["AVALON_PROJECT"]
-    asset_name = io.Session["AVALON_ASSET"]
-    task_name = io.Session["AVALON_TASK"]
-    host_name = io.Session["AVALON_APP"]
+    project_name = self.project_name
+    asset_name = legacy_io.Session["AVALON_ASSET"]
+    task_name = legacy_io.Session["AVALON_TASK"]
+    host_name = legacy_io.Session["AVALON_APP"]
 
     # Create new instance if does not exist yet
     if existing_instance is None:
-        asset_doc = io.find_one({"type": "asset", "name": asset_name})
+        asset_doc = get_asset_by_name(project_name, asset_name)
         subset_name = self.get_subset_name(
             variant, task_name, asset_doc, project_name, host_name
         )
@@ -278,7 +278,7 @@ def create(self):
         existing_instance["asset"] != asset_name
         or existing_instance["task"] != task_name
     ):
-        asset_doc = io.find_one({"type": "asset", "name": asset_name})
+        asset_doc = get_asset_by_name(project_name, asset_name)
         subset_name = self.get_subset_name(
             variant, task_name, asset_doc, project_name, host_name
         )

From dfa6328d74fbbd806769d3689ccc1b2f85dc757e Mon Sep 17 00:00:00 2001
From: Jakub Trllo <jakub.trllo@gmail.com>
Date: Thu, 21 Jul 2022 11:58:42 +0200
Subject: [PATCH 289/289] remove metadata from default environment values

---
 openpype/settings/defaults/system_settings/general.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/openpype/settings/defaults/system_settings/general.json b/openpype/settings/defaults/system_settings/general.json
index a06947ba77..909ffc1ee4 100644
--- a/openpype/settings/defaults/system_settings/general.json
+++ b/openpype/settings/defaults/system_settings/general.json
@@ -2,11 +2,7 @@
     "studio_name": "Studio name",
     "studio_code": "stu",
     "admin_password": "",
-    "environment": {
-        "__environment_keys__": {
-            "global": []
-        }
-    },
+    "environment": {},
     "log_to_server": true,
     "disk_mapping": {
         "windows": [],