Commit graph

144 commits

Author SHA1 Message Date
Jakub Ježek
a49b4265c6
Merge pull request #5291 from ynput/release/next-minor 2023-07-13 15:43:02 +03: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
Kayla Man
36a62eaa01 Merge branch 'develop' into enhancement/OP-6227_3dsMax-delete-from-container 2023-07-06 16:32:39 +08:00
Kayla Man
d78d1e0c25 remove redundency line 2023-07-06 16:31:56 +08:00
Milan Kolar
5f17223c27
Merge pull request #5202 from ynput/bugfix/OP-6245_Bug-3dsmax--Publisher-Instances-dont-hold-its-EnabledDisabled-states-when-Publisher-reopened-again 2023-07-06 09:50:51 +02:00
Kayla Man
5771941bee Merge branch 'develop' into enhancement/OP-6227_3dsMax-delete-from-container 2023-07-05 19:18:49 +08:00
Kayla Man
4a3c9ce4b6 filter the container 2023-07-05 19:18:03 +08:00
Milan Kolar
1aff00fe9c
Merge pull request #5192 from ynput/enhancement/OP-6225_3dsMax-node-references-to-check-for-duplicates 2023-07-05 10:16:33 +02:00
Kayla Man
31fbe2a72e Merge branch 'develop' into enhancement/OP-6227_3dsMax-delete-from-container 2023-07-03 19:56:42 +08:00
Kayla Man
32873bdc22 add functions for filtering in dailog in custom attr maxscript 2023-07-03 19:30:08 +08:00
Kayla Man
04ec401343 roy's comment 2023-06-28 15:52:37 +08:00
Kayla Man
3c4c922b4f restore the plugin.py 2023-06-28 13:23:22 +08:00
Kayla Man
eb63b4bae1 remove unnecessary debug check 2023-06-28 13:22:35 +08:00
Kayla Man
5a228d4d51 maxscript's conversion of bool to python 2023-06-28 13:21:37 +08:00
Kayla Man
53dac8b0a8 maxscript's conversion of bool to python 2023-06-28 13:12:34 +08:00
Kayla Man
06ba35fb6c roy's comment 2023-06-26 22:00:54 +08:00
Kayla Man
1442bddbcc no duplicates in node reference in OpenpypeData 2023-06-26 21:33:02 +08:00
Kayla Man
c00f1b6449 remove hardcoded part from thumbnail extractor and add timeline validator for max review 2023-06-24 13:54:10 +08:00
Kayla Man
a1ac05986d remove contextmanager 2023-06-24 13:38:46 +08:00
Kayla Man
24f4fd8c23 fix the reset frame range not setting up the right timeline in max 2023-06-24 13:30:30 +08:00
Kayla Man
5210d9bde3 hound fix 2023-06-22 22:55:24 +08:00
Kayla Man
45f02e8db3 roy's comment 2023-06-22 22:54:15 +08:00
Kayla Man
582bdb51a2 Merge branch 'develop' into feature/OP-5871_Max-Review-feature 2023-06-22 21:17:07 +08:00
Ondrej Samohel
9cc2293979
♻️ make code compatible with 3dsmax 2022
python 3.7 in 3dsmax 2022 is not supporting walrus operator
2023-06-20 14:04:17 +02:00
Kayla Man
7938389156 refactor collector 2023-06-20 19:50:08 +08:00
Ondřej Samohel
b365fc7534
Update openpype/hosts/max/api/plugin.py
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2023-06-19 18:37:33 +02:00
Kayla Man
a0947de6cf Merge branch 'develop' into feature/OP-5871_Max-Review-feature 2023-06-19 14:30:34 +08:00
Ondrej Samohel
b736c8c632
♻️ remove debug prints 2023-06-14 10:06:45 +02:00
Kayla Man
bfde7cba51 fix the bug of not deleting instance with delete button lasted in Openpype attribute 2023-06-14 14:02:01 +08:00
Kayla Man
fc4c4668d0 removing the node references successfully in the parameter 2023-06-13 20:50:24 +08:00
Kayla Man
15dd1e13b6 removing the node references successfully in the parameter 2023-06-13 19:00:37 +08:00
Kayla Man
0a0c374ee1 removing the node references successfully in the parameter 2023-06-13 18:26:31 +08:00
Ondrej Samohel
e9d60c96f5
🐛 handle cancelled dialog 2023-06-12 12:44:12 +02:00
Kayla Man
fa0664d967 Merge branch 'develop' into enhancement/3dsmax-use-custom-modifier-attributes 2023-06-08 22:39:57 +08:00
Ondřej Samohel
29a66eddf0
♻️ Move from deprecated interface (#5117)
`INewPublisher` is deprecated, using `IPublishHost` instead
2023-06-08 15:12:44 +02:00
Kayla Man
e295b19149 Merge branch 'develop' into feature/OP-5871_Max-Review-feature 2023-06-08 17:29:44 +08:00
Kayla Man
1fcfb414f7 resolve the conflict 2023-06-06 21:28:54 +08:00
Ondřej Samohel
826fcf07cb
Merge branch 'develop' into feature/OP-4247_Data-Exchange-proxies 2023-06-01 13:10:25 +02:00
Ondrej Samohel
aeaad018c1
🚨 make peace with the hound 🐶 2023-05-31 18:12:48 +02:00
Ondrej Samohel
04e6f5f4bb
🐛 fix support for separate AOVs and some style issues 2023-05-30 17:16:18 +02:00
Milan Kolar
fd07632068
Merge branch 'develop' into feature/OP-4247_Data-Exchange-proxies 2023-05-29 23:26:20 +02:00
Kayla Man
5f763a4e8e dont add separate aov as instance data 2023-05-29 20:36:38 +08:00
Kayla Man
9d9eebfe09 using current file to render and add validator for deadline publish in max hosts 2023-05-29 19:25:49 +08:00
Kayla Man
44c0f1cf8a hound 2023-05-29 12:51:26 +08:00
Kayla Man
f030ca17d8 hound 2023-05-29 12:50:36 +08:00
Kayla Man
b89bb229a0 hound 2023-05-29 12:48:09 +08:00
Kayla Man
f85051863c hound fix 2023-05-29 12:44:22 +08:00
Kayla Man
56642ac175 getting the filename from render settings and add save_scene before all the extractors running 2023-05-29 12:37:25 +08:00
Kayla Man
4303b281aa hound fix 2023-05-26 19:38:05 +08:00
Kayla Man
2d3ba2af05 add _beauty to subset name 2023-05-26 19:36:14 +08:00