Commit graph

71 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
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
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
Ember Light
17b36407ac
Merge branch 'develop' into enhancement/fusion-work-with-pathmaps 2023-10-02 13:49:17 +02:00
Roy Nieterau
b56d4633e1
Merge branch 'develop' into enhancement/publish_instances_uuid_from_host 2023-09-13 22:51:31 +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
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
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
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
Jakub Jezek
a68aa029e4
Renaming attribute to make more sense in Fusion context 2023-05-23 11:52:09 +02:00
Jakub Jezek
497a97b70d
pr comment 2023-05-17 14:40:47 +02:00
Jakub Jezek
a6059afe86
pr comments
also renamed start_handle as it is easily confusable with handles
2023-05-17 14:37:37 +02:00
Jakub Jezek
2d6919297c
fusion: adding comp range option 2023-05-16 11:40:00 +02:00
Jakub Jezek
10b953f8bf
fusion: converting frame range source to enum 2023-05-16 11:34:54 +02:00
Jakub Jezek
478c85d7cc
Fusion: renaming confusing attribute name and label 2023-05-15 22:09:18 +02:00
Jakub Jezek
37827f63ba
Merge branch 'develop' into feature/OP-5548_Fusion-Deadline-and-publish 2023-05-15 21:29:18 +02:00
Jakub Jezek
02279a51c8
pr comments
https://github.com/ynput/OpenPype/pull/4955#discussion_r1192264433
https://github.com/ynput/OpenPype/pull/4955#discussion_r1192267231
2023-05-12 14:19:13 +02:00
Jakub Ježek
233c7b3454
Update openpype/hosts/fusion/plugins/create/create_saver.py
Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>
2023-05-12 14:12:40 +02:00
Jakub Jezek
c80842f5a9
fusion: improving custom frame range 2023-05-12 13:19:33 +02:00
Jakub Jezek
801b904aea
rewriting logic for frame ranges 2023-05-12 11:29:29 +02:00
Jakub Jezek
bf2e02699a
returning important condition 2023-05-11 12:20:56 +02:00
Jakub Jezek
9f1bdda8b3
fusion: removing obsolete code 2023-05-11 12:18:36 +02:00
Jakub Jezek
f5215f323b
hound 2023-05-10 16:39:29 +02:00
Jakub Jezek
dfea365474
moving instnance id so it is imprinted once created
addressing issue form here https://github.com/ynput/OpenPype/pull/4943#issuecomment-1542241467
2023-05-10 16:38:17 +02:00
Jakub Jezek
27ac1b4590
Removing unmanaged compatibility
This fixes issue https://github.com/ynput/OpenPype/pull/4943#pullrequestreview-1420557288
2023-05-10 16:16:50 +02:00
Jakub Jezek
1a48ddefe4
normalizing path 2023-05-10 15:37:19 +02:00
Jakub Jezek
95237c43c7
adding todo for later renaming 2023-05-10 13:00:53 +02:00
Jakub Jezek
a08f9176b0
fusion: removing path making during creation 2023-05-10 12:55:30 +02:00
Jakub Jezek
98d27fa5a4
fusion: frame padding from anatomy templates 2023-05-10 12:54:30 +02:00
Jakub Jezek
55bebf8642
pr comments 2023-05-10 12:33:38 +02:00
Jakub Jezek
c73772919a
fixing path slashes 2023-05-05 17:42:38 +02:00
Jakub Jezek
d637fed33d
implementing settings
also adding temp rendering path attribute with with support for tempates
2023-05-05 17:23:27 +02:00
Roy Nieterau
5595762164
Fusion: Simplify creator icons code (#4899)
* Simplify setting creator icons

* Use font-awesome 5 explicitly
2023-04-24 17:47:33 +02:00
Jacob Danell
ea7390d1d3 Added create and instance attr to Create plugin
Where they get it from should be moved into another folder so other plugins can get the same data.
2023-03-13 17:50:56 +01:00
Roy Nieterau
9c9c134a79 Use passthrough state of saver tool to store and load the active state 2023-03-07 17:39:05 +01:00
Roy Nieterau
a4ae05086c Allow to enable/disable review per saver instance
+ Don't create a copy of representation for review but just mark representation as review
+ Change Collect instances into InstancePlugin to just collect instance data per instance
2023-03-07 14:41:16 +01:00
Roy Nieterau
70611ee884 Make sure to add the comp transient data for new instances 2023-03-07 11:36:12 +01:00
Roy Nieterau
52fac29164 Cleanup unused import 2023-03-06 17:07:15 +01:00
Roy Nieterau
6d9084b144 Match workfile creator logic more with the one from After Effects 2023-03-06 16:58:17 +01:00
Roy Nieterau
99637875ef Do not secretly pop data that OP generates by default 2023-03-06 16:31:09 +01:00
Roy Nieterau
b513bb437d Set subset in a more correct OpenPype way 2023-03-06 16:28:37 +01:00
Roy Nieterau
37591de291 Change workfile Creator data key so it doesn't interfere with global comp context data in any way
(Fusion allows to access nested dicts (lua tables) using the dot notation)
2023-03-05 10:40:56 +01:00
Roy Nieterau
406bc798c4 Tweak creator updates to newer style updates 2023-03-05 10:39:57 +01:00
Jacob Danell
f5a40056ab Pass "data" to get_dynamic_data() was missing 2023-02-23 19:21:00 +01:00
Jacob Danell
f840347f4e Import get_current_comp from API directly 2023-02-23 19:20:20 +01:00
Jacob Danell
8afd6f4f35 Change render depth to Auto instead of forcing int16 as it was 2023-02-23 19:19:52 +01:00
Jacob Danell
4d3442db70 Add subset to instance_data 2023-02-23 19:19:24 +01:00