Commit graph

427 commits

Author SHA1 Message Date
Jakub Trllo
e2ce1db898
Merge pull request #5329 from EmberLightVFX/enhancement/fusion-work-with-pathmaps
Fusion: Work with pathmaps
2023-10-13 16:14:29 +02:00
Ember Light
c5b9667aa2
Place get_frame_path import on one row
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2023-10-03 10:36:17 +02:00
Ember Light
a5b85d36f0
Removed double space in end of file
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2023-10-03 10:35:50 +02:00
Jacob Danell
bd31dbaf35 Get the comp from render_instance instead of get_current_comp() 2023-10-02 16:12:20 +02:00
Jacob Danell
441bb73afc hound 2023-10-02 15:10:46 +02:00
Jacob Danell
73a122b79a Restore formatting of non-modified code 2023-10-02 15:09:30 +02:00
Roy Nieterau
f12dc3f4b3 Merge remote-tracking branch 'EmberLightVFX/enhancement/fusion-work-with-pathmaps' into enhancement/fusion-work-with-pathmaps 2023-10-02 14:24:24 +02:00
Roy Nieterau
333c282eba Don't query comp again 2023-10-02 14:24:02 +02:00
Ember Light
17b36407ac
Merge branch 'develop' into enhancement/fusion-work-with-pathmaps 2023-10-02 13:49:17 +02:00
Roy Nieterau
1eab27d710
Merge branch 'develop' into enhancement/publish_instances_uuid_from_host 2023-10-02 11:57:43 +02:00
Milan Kolar
9624887096
Merge pull request #5617 from BigRoy/chore/fusion_remove_unused_functions 2023-09-21 21:06:23 +02:00
Petr Kalis
67abbaad3c
Fussion: added support for Fusion 17 (#5614)
* OP-6780 - vendorized necessary libraries for Python 3.6

* OP-6780 - better resolution of app_version

* Update openpype/hosts/fusion/addon.py

Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>

* OP-6780 - add vendorized libraries even before menu creation

This should help when version of Fusion > 17, but it is still using 3.6

* OP-6780 - added todo message to remember to remove this

* OP-6780 - move injection of PYTHONPATH much sooner

At previous position it was too late.

* OP-6780 - better capture of broken imports

* OP-6780 - SyntaxError is thrown only if directly importing

* OP-6780 - remove unnecessary imports

Only urllib3 and attrs are actually needed

* OP-6780 - vendorize even directly in Fusion if Python < 3.7

* OP-6780 - remove update of PYTHONPATH in addon

More important and required is check directly in interpreter in Fusion, it doesn't make sense to pollute addon and have it on two places. It might get removed altogether in next-minor.

* OP-6780 - added comment

---------

Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>
2023-09-15 11:02:37 +02:00
Roy Nieterau
b56d4633e1
Merge branch 'develop' into enhancement/publish_instances_uuid_from_host 2023-09-13 22:51:31 +02:00
Roy Nieterau
54a62348d0 Remove unused functions from Fusion integration 2023-09-13 22:16:14 +02:00
Roy Nieterau
d36b2f1514 Merge remote-tracking branch 'upstream/develop' into enhancement/tweak_logging
# Conflicts:
#	openpype/plugins/publish/extract_hierarchy_to_ayon.py
2023-09-05 12:06:43 +02:00
Jakub Trllo
8aee7d0ca4
Merge pull request #5569 from ynput/enhancement/fusion-code-refactor
Fusion: Code updates
2023-09-05 12:00:45 +02:00
Jakub Trllo
bde5a560a2 Removed ';OpenPype:Scripts' from prefs file 2023-09-05 11:28:25 +02:00
Jakub Trllo
2b8ec005fc removed remaining scripts after discussion with @BigRoy 2023-09-05 11:27:31 +02:00
Jakub Trllo
d46f610e4d removed switch_ui script from fusion with related script in 'scripts' 2023-09-05 11:21:46 +02:00
Jakub Ježek
b16adc958b
Merge branch 'develop' into enhancement/fusion-work-with-pathmaps 2023-09-04 16:40:03 +02:00
Jakub Trllo
09d31e81ef removed duplicated attribute 2023-09-01 17:10:26 +02:00
Jakub Trllo
cb3ef02fc3 fusion creator does not expect system settings 2023-09-01 17:10:07 +02:00
Roy Nieterau
2ba42fe376 Tweak logging level 2023-08-30 10:14:53 +02:00
Jakub Jezek
93f897c780
deadline: adding collect farm target and removing redundant key 2023-08-24 13:59:34 +02:00
Roy Nieterau
6da94d4f27 Allow to duplicate publish instances in Fusion, by not relying on instance_id data but have the unique identifier be the node's name. 2023-08-23 22:41:25 +02:00
Jakub Trllo
3ae020f064
Applications: Launch hooks cleanup (#5395)
* ApplicationManager can have more granular way how applications are launched

* executable is optional to be able create ApplicationLaunchContext

* launch context can run prelaunch hooks without launching application

* 'get_app_environments_for_context' is using launch context to prepare environments

* added 'launch_type' as one of filtering options for LaunchHook

* added 'local' launch type filter to existing launch hooks

* define 'automated' launch type in remote publish function

* modified publish and extract environments cli commands

* launch types are only for local by default

* fix import

* fix launch types of global host data

* change order or kwargs

* change unreal filter attribute

* use set instead of list

* removed '__init__' from celaction hooks

* use 'CELACTION_ROOT_DIR' in pre setup

* use full import from applications
2023-08-03 12:24:23 +02:00
Jakub Trllo
7e9f42b447
Applications: Use prelaunch hooks to extract environments (#5387)
* ApplicationManager can have more granular way how applications are launched

* executable is optional to be able create ApplicationLaunchContext

* launch context can run prelaunch hooks without launching application

* 'get_app_environments_for_context' is using launch context to prepare environments

* added 'launch_type' as one of filtering options for LaunchHook

* added 'local' launch type filter to existing launch hooks

* define 'automated' launch type in remote publish function

* modified publish and extract environments cli commands

* launch types are only for local by default

* fix import

* fix launch types of global host data

* change order or kwargs

* change unreal filter attribute
2023-08-03 10:04:15 +02:00
Jacob Danell
811f54763e Black formatting 2023-07-20 17:08:42 +02:00
Jacob Danell
0cd2095af3 Added MapPath and ReverseMapPath to all Fusion paths 2023-07-20 17:08:30 +02:00
Jacob Danell
db0e004b9e Black formatting 2023-07-20 15:54:02 +02:00
Jacob Danell
c385f748de Set tool as active
This makes the node-flow show the selected node + you'll see the nodes controls in the inspector
2023-07-20 15:53:54 +02:00
Jakub Trllo
9e5720953f fix loader filepath access 2023-07-11 18:13:51 +02:00
Jakub Trllo
c10781a662 General: Reduce usage of legacy io (#4723)
* General: Connect to AYON server (base) (#3924)

* implemented 'get_workfile_info' in entities

* removed 'prepare_asset_update_data' which is not used

* disable settings and project manager if in v4 mode

* prepared conversion helper functions for v4 entities

* prepared conversion functions for hero versions

* fix hero versions

* implemented get_archived_representations

* fix get latest versions

* return prepared changes

* handle archived representation

* raise exception on failed json conversion

* map archived to active properly

* make sure default fields are added

* fix conversion of hero version entity

* fix conversion of archived representations

* fix some conversions of representations and versions

* changed active behavior in queries

* fixed hero versions

* implemented basic thumbnail caching

* added raw variants of crud methods

* implemented methods to get and create thumbnail

* fix from flat dict

* implemented some basic folder conversion for updates

* fix thumbnail updates for version

* implemented v4 thumbnail integrator

* simplified data mapping

* 'get_thumbnail' function also expect entity type and entity id for which is the thumbnail received

* implemented 'get_thumbnail' for server

* fix how thumbnail id is received from entity

* removed unnecessary method 'get_thumbnail_id_from_source'

* implemented thumbnail resolver for v4

* removed unnecessary print

* move create and delete project directly to server api

* disable local settings action too on v4

* OP-3521 - added method to check and download updated addons from v4 server

* OP-3521 - added more descriptive error message for missing source

* OP-3521 - added default implementation of addon downloader to import

* OP-3521 - added check for dependency package zips

WIP - server doesn't contain required endpoint. Testing only with mockup data for now.

* OP-3521 - fixed parsing of DependencyItem

Added Server Url type and ServerAddonDownloader - v4 server doesn't know its own DNS for static files so it is sending unique name and url must be created during runtime.

* OP-3521 - fixed creation of targed directories

* change nev keys to look for and don't set them automatically

* fix task type conversion

* implemented base of loading v4 addons in v3

* Refactored argument name in Downloaders

* Updated parsing to DependencyItem according to current schema

* Implemented downloading of package from server

* Updated resolving of failures

Uses Enum items.

* Introduced passing of authorization token

Better to inject it than to have it from env var.

* Remove weird parsing of server_url

Not necessary, endpoints have same prefix.

* Fix doubling asset version name in addons folder

Zip file should already contain `addonName_addonVersion` as first subfolder

* Fix doubling asset version name in addons folder

Zip file should already contain `addonName_addonVersion` as first subfolder

* Made server_endpoint optional

Argument should be better for testing, but for calling from separate methods it would be better to encapsulate it.

Removed unwanted temporary productionPackage value

* Use existing method to pull addon info from Server to load v4 version of addon

* Raise exception when server doesn't have any production dependency package

* added ability to specify v3 alias of addon name

* expect v3_alias as uppered constant

* Re-implemented method to get addon info

Previous implementation wouldn't work in Python2 hosts.
Will be refactored in the future.

* fix '__getattr__'

* added ayon api to pyproject.toml and lock file

* use ayon api in common connection

* added mapping for label

* use ayon_api in client codebase

* separated clearing cache of url and username

* bump ayon api version

* rename env 'OP4_TEST' to 'USE_AYON_SERVER'

* Move and renamend get_addons_info to get_addons_info_as_dict in addon_distribution

Should be moved to ayon_api later

* Replaced requests calls with ayon_api

* Replaced OP4_TEST_ENABLED with AYON_SERVER_ENABLED

fixed endpoints

* Hound

* Hound

* OP-3521 - fix wrong key in get_representation_parents

parents overloads parents

* OP-3521 - changes for v4 of SiteSync addon

* OP-3521 - fix names

* OP-3521 - remove storing project_name

It should be safer to go thorug self.dbcon apparently

* OP-3521 - remove unwanted

"context["folder"]" can be only in dummy test data

* OP-3521 - move site sync loaders to addon

* Use only project instead of self.project

* OP-3521 - added missed get_progress_for_repre

* base of settings conversion script

* simplified ayon functions in start.py

* added loading of settings from ayon server

* added a note about colors

* fix global and local settings functions

* AvalonMongoDB is not using mongo connection on ayon server enabled

* 'get_dynamic_modules_dirs' is not checking system settings for paths in setting

* log viewer is disabled when ayon server is enabled

* basic logic of enabling/disabled addons

* don't use mongo logging if ayon server is enabled

* update ayon api

* bump ayon api again

* use ayon_api to get addons info in modules/base

* update ayon api

* moved helper functions to get addons and dependencies dir to common functions

* Initialization of AddonInfo is not crashing on unkonwn sources

* renamed 'DependencyDownloader' to 'AyonServerDownloader'

* renamed function 'default_addon_downloader' to 'get_default_addon_downloader'

* Added ability to convert 'WebAddonSource' to 'ServerResourceSorce'

* missing dependency package on server won't cause crash

* data sent to downloaders don't contain ayon specific headers

* modified addon distribution to not duplicate 'ayon_api' functionality

* fix doubled function defintioin

* unzip client file to addon destination

* formatting - unify quotes

* disable usage of mongo connection if in ayon mode

* renamed window.py to login_window.py

* added webpublisher settings conversion

* added maya conversion function

* reuse variable

* reuse variable (similar to previous commit)

* fix ayon addons loading

* fix typo 'AyonSettingsCahe' -> 'AyonSettingsCache'

* fix enabled state changes

* fix rr_path in royal render conversion

* avoid mongo calls in AYON state

* implemented custom AYON start script

* fix formatting (after black)

* ayon_start cleanup

* 'get_addons_dir' and 'get_dependencies_dir' store value to environment variable

* add docstrings to local dir functions

* addon info has full name

* fix modules enabled states

* removed unused 'run_disk_mapping_commands'

* removed ayon logic from 'start.py'

* fix warning message

* renamed 'openpype_common' to 'ayon_common'

* removed unused import

* don't import igniter

* removed startup validations of third parties

* change what's shown in version info

* fix which keys are applied from ayon values

* fix method name

* get applications from attribs

* Implemented UI basics to be able change user or logout

* merged server.py and credentials.py

* add more metadata to urls

* implemented change token

* implemented change user ui functionality

* implemented change user ui

* modify window to handle username and token value

* pass username to add server

* fix show UI cases

* added loggin action to tray

* update ayon api

* added missing dependency

* convert applications to config in a right way

* initial implementation of 'nuke' settings conversion

* removed few nuke comments

* implemented hiero conversion

* added imageio conversion

* added run ayon tray script

* fix few settings conversions

* Renamed class of source classes as they are not just for addons

* implemented objec to track source transfer progress

* Implemented distribution item with multiple sources

* Implemented ayon distribution wrapper to care about multiple things during distribution

* added 'cleanup' method for downlaoders

* download gets tranfer progress object

* Change UploadState enum

* added missing imports

* use AyonDistribution in ayon_start.py

* removed unused functions

* removed implemented TODOs

* fix import

* fix key used for Web source

* removed temp development fix

* formatting fix

* keep information if source require distribution

* handle 'require_distribution' attribute in distribution process

* added path attribute to server source

* added option to pass addons infor to ayon distribution

* fix tests

* fix formatting

* Fix typo

* Fix typo

* remove '_try_convert_to_server_source'

* renamed attributes and methods to match their content

* it is possible to pass dependency package info to AyonDistribution

* fix called methods in tests

* added public properties for error message and error detail

* Added filename to WebSourceInfo

Useful for GDrive sharable links where target file name is unknown/unparsable, it should be provided explicitly.

* unify source conversion by adding 'convert_source' function

* Fix error message

Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>

* added docstring for 'transfer_progress'

* don't create metadata file on read

* added few docstrings

* add default folder fields to folder/task queries

* fix generators

* add dependencies when runnign from code

* add sys paths from distribution to pythonpath env

* fix missing applications

* added missing conversions for maya renderers

* fix formatting

* update ayon api

* fix hashes in lock file

* Use better exception

Co-authored-by: Ondřej Samohel <33513211+antirotor@users.noreply.github.com>

* Use Python 3 syntax

Co-authored-by: Ondřej Samohel <33513211+antirotor@users.noreply.github.com>

* apply some of sugested changes in ayon_start

* added some docstrings and suggested modifications

* copy create env from develop

* fix rendersettings conversion

* change code by suggestions

* added missing args to docstring

* added missing docstrings

* separated downloader and download factory

* fix ayon settings

* added some basic file docstring to ayon_settings

* join else conditions

* fix project settings conversion

* fix created at conversion

* fix workfile info query

* fix publisher UI

* added utils function 'get_ayon_appdirs'

* fix 'get_all_current_info'

* fix server url assignment when url is set

* updated ayon api

* added utils functions to create local site id for ayon

* added helper functions to create global connection

* create global connection in ayon start to start use site id

* use ayon site id in ayon mode

* formatting cleanup

* added header docstring

* fixes after ayon_api update

* load addons from ynput appdirs

* fix function call

* added docstring

* update ayon pyton api

* fix settings access

* use ayon_api to get root overrides in Anatomy

* bumbayon version to 0.1.13

* nuke: fixing settings keys from settings

* fix burnins definitions

* change v4 to AYON in thumbnail integrate

* fix one more v4 information

* Fixes after rebase

* fix extract burnin conversion

* additional fix of extract burnin

* SiteSync:added missed loaders or v3 compatibility (#4587)

* Added site sync loaders for v3 compatibility

* Fix get_progress_for_repre

* use 'files.name' instead of 'files.baseName'

* update ayon api to 0.1.14

* add common to include files

* change arguments for hero version creation

* skip shotgrid settings conversion if different ayon addon is used

* added ayon icons

* fix labels of application variants

* added option to show login window always on top

* login window on invalid credentials is always on top

* update ayon api

* update ayon api

* add entityType to project and folders

* AYON: Editorial hierarchy creation (#4699)

* disable extract hierarchy avalon when ayon mode is enabled

* implemented extract hierarchy to AYON

---------

Co-authored-by: Petr Kalis <petr.kalis@gmail.com>
Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>
Co-authored-by: Ondřej Samohel <33513211+antirotor@users.noreply.github.com>
Co-authored-by: Jakub Jezek <jakubjezek001@gmail.com>

* replace 'legacy_io' with context functions in load plugins

* added 'get_global_context' to pipeline init

* use context getters instead of legacy_io in publish plugins

* use data on context instead of  'legacy_io' in submit publish job

* skip query of asset docs in collect nuke reads

* use context functions on other places

* 'list_looks' expects project name

* remove 'get_context_title'

* don't pass AvalonMongoDB to prelaunch hooks

* change how context is calculated in hiero

* implemented function 'get_fps_for_current_context' for maya

* initialize '_image_dir' and '_image_prefixes' in init

* legacy creator is using 'get_current_project_name'

* fill docstrings

* use context functions in workfile builders

* hound fixes

* 'create_workspace_mel' can expect project settings

* swapped order of arguments

* use information from instance/context data

* Use self.project_name in workfiles tool

Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>

* Remove outdated todo

Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>

* don't query project document in nuke lib

* Fix access to context data

* Use right function to get project name

Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>

* fix submit max deadline and swap order of arguments

* added 'get_context_label' to nuke

* fix import

* fix typo 'curent_context' -> 'current_context'

* fix project_setting variable

* fix submit publish job environments

* use task from context

* Removed unused import

---------

Co-authored-by: Petr Kalis <petr.kalis@gmail.com>
Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>
Co-authored-by: Ondřej Samohel <33513211+antirotor@users.noreply.github.com>
Co-authored-by: Jakub Jezek <jakubjezek001@gmail.com>
2023-07-11 18:11:07 +02:00
Roy Nieterau
f58994d59c Loader: Remove context argument from Loader.__init__() (#4602)
* Remove Loader `context` argument to __init__

* Add backwards compatibility for Loader.load by still setting `.fname` attr

* Refactor/remove usage of `self.fname` in loaders

* Fix some refactoring

* Fix some refactoring

* Hound

* Revert invalid refactor

* Fix refactor

* Fix playblast panel collection

* Refactor missing method

* Fix typo

* Use the correct `context`

---------

Co-authored-by: Toke Stuart Jepsen <tokejepsen@gmail.com>
Co-authored-by: Kayla Man <64118225+moonyuet@users.noreply.github.com>
Co-authored-by: Jakub Trllo <jakub.trllo@gmail.com>
2023-07-11 17:48:33 +02:00
Roy Nieterau
2b23b42da6
RepairAction and SelectInvalidAction actually filter to instances that failed on the exact plugin - not on "any failure" (#5240) 2023-07-05 14:11:20 +02:00
Jakub Jezek
e0f7e106b8
Merge remote-tracking branch 'origin/enhancement/allow_nested_settings_templates' into feature/OP-5207_Global-host-color-management-activation 2023-05-24 14:23:23 +02:00
Roy Nieterau
17a38c32a4
Enhancement: Improve logging levels and messages for artist facing publish reports (#5018)
* Tweak log levels and message to be more informative to artist in report page

* Tweak levels and clarity of logs

* Tweak levels and clarity of logs + tweak grammar

* Cosmetics

* Improve logging

* Simplify logging

* Convert to debug log if it's skipping thumbnail integration if there's no thumbnail whatsoever to integrate

* Tweak to debug since they only show representation ids hardly understandable to the artist

* Match logging message across hosts + include filepath for full clarity

* Tweak message to clarify it only starts checking and not that it requires filling + to debug log

* Tweak to debug log if there's basically no thumbnail to integrate at the end

* Tweak log levels

- Artist doesn't care what's prepared, especially since afterwards it's logged what gets written to the database anyway

* Log clearly it's processing a legacy instance

* Cosmetics
2023-05-24 10:54:31 +02:00
Jakub Ježek
2c31dc1f21
Merge branch 'develop' into feature/OP-5207_Global-host-color-management-activation 2023-05-24 10:25:24 +02:00
Roy Nieterau
409929c3b8 Cosmetics 2023-05-23 17:57:23 +02:00
Roy Nieterau
b70051b768 Preserve comp frame range after rendering 2023-05-23 17:55:54 +02:00
Jakub Jezek
81d41bb0ed
fixing frame range data passing from instance 2023-05-23 16:18:58 +02:00
Roy Nieterau
af6ce0bf9f Fix docstring 2023-05-23 14:21:38 +02:00
Roy Nieterau
4f24356139 Add validator for instance frame range to be within comp global in/out 2023-05-23 14:20:30 +02:00
Roy Nieterau
1b3b7b1a73 Render instances with their explicit frame ranges 2023-05-23 12:41:33 +02:00
Jakub Jezek
a68aa029e4
Renaming attribute to make more sense in Fusion context 2023-05-23 11:52:09 +02:00
Jakub Jezek
a762b310e8
inverting logic for ignoreFrameHandleCheck
this was ignoring settings in frame range target.
2023-05-23 11:51:23 +02:00
Jakub Ježek
8ff3ba95c3
Merge branch 'develop' into feature/OP-5548_Fusion-Deadline-and-publish 2023-05-22 15:00:57 +02:00
Jakub Jezek
41fbe3031f
fusion: asset_db is collecting by default. 2023-05-22 14:59:58 +02:00
Ember Light
e178244d46
Fusion - Loader plugins updates (#4920)
* Added get_bmd_library to acces BMD's internal python library

* Added the option to import image and online families. + black formatted

* Added workfile loader

To import the content of another workfile into your current comp

* Fixed wrong family and extension in workfile loader

* black formatting

* Added missing formats to fbx importer

Fusions fbx importer can import a bunch of different formats other then fbx (confusing I know but it's how it is)

* Update openpype/hosts/fusion/plugins/load/load_workfile.py

Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>

---------

Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>
2023-05-22 10:43:11 +02:00
Jakub Jezek
25832ed496
collect frame range simplification 2023-05-17 15:07:10 +02:00