Commit graph

128 commits

Author SHA1 Message Date
Jakub Trllo
a8fa44c3fd
AYON: Ignore separated modules (#5619)
* ayon mode explicitly ignores addons that have own repository

* change warning message of missing addon directory to debug

* Better log message
2023-09-19 16:52:51 +02:00
sjt-rvx
b83a409313
have the addons loading respect a custom AYON_ADDONS_DIR (#5539)
* have the addons loading respect a custom AYON_ADDONS_DIR

* Update openpype/modules/base.py

Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>

---------

Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2023-08-30 15:12:03 +02:00
Jakub Trllo
326cdacc11
change 'ayon' to 'AYON' and 'ynput' to 'Ynput' in appdirs (#5298) 2023-07-14 09:57:48 +02:00
Jakub Trllo
2791aa84bb AYON: Bundle distribution (#5209)
* modified distribution to use bundles

* use bundles in modules discovery logic

* removed unused import

* added support for bundle settings getter

* added script launch mechanism to ayon start script

* show login UI through subprocess

* removed silent mode

* removed unused variable

* match env variables to ayon launcher

* moved ui lib function to ayon common

* raise custom exception on missing bundle name

* implemented missing bundle window to show issues with bundles

* implemented helper function to show dialog about issues with bundle

* handle issues with bundles

* removed unused import

* dont convert passed addons infor

* access keys only in server getters

* fix accessed attribute

* fix test

* fixed missing 'message' variable

* removed duplicated data

* removed unnecessary 'sha256' variable

* use lstrip instead of replacement

* use f-string

* move import to the top of file

* added some dosctrings

* change type

* use f-string

* fix grammar

* set default settings variant in global connection creation

* reuse new function

* added init file

* safe access to optional keys

* removed unnecessary condition

* modified print messages on issues with bundles

* Changed message in missing bundle window

* updated ayon_api to 0.3.2
2023-07-11 18:13:53 +02:00
Jakub Trllo
5b4e474f4d AYON: Staging versions can be used (#4992)
* enhanced AddonInfo to be able get info about staging or any version

* AyonDistribution is checking for use staging value

* removed unused function

* addons in modules manager use right versions

* use right variant for settings

* added temporary staging icons

* fix 'is_running_staging' for ayon mode
2023-07-11 18:13:49 +02:00
Jakub Trllo
47473a8a23 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>
2023-07-11 17:50:50 +02:00
Roy Nieterau
359d685644 Draft to allow "inventory" actions to be supplied by a Module or Addon. 2023-06-15 14:35:47 +02:00
Toke Jepsen
ab357eb03e
Addons directory (#4893)
* Add addons directory

* add addons dir to modules dirs automatically

---------

Co-authored-by: iLLiCiTiT <jakub.trllo@gmail.com>
2023-05-12 16:44:44 +02:00
Roy Nieterau
d4e79f97d0
Update openpype/modules/base.py
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2023-03-30 22:41:22 +02:00
Roy Nieterau
3fae1f8521 Just some grammar tweaks 2023-03-30 13:59:22 +02:00
Jakub Trllo
27cb6512cf added more collectors of plugin types and use them on openpype plugin installation 2022-12-08 12:19:30 +01:00
Jakub Trllo
b716eb18cf added deprecation warning 2022-11-03 16:36:59 +01:00
Jakub Trllo
a0c3eb6f80 removed unnecessary lines 2022-08-26 16:32:34 +02:00
Jakub Trllo
2bfa9eea44 renamed 'IHostModule' to 'IHostAddon' 2022-08-26 15:06:50 +02:00
Jakub Trllo
d0245ee23f
Merge pull request #3731 from pypeclub/feature/module_interfaces_cleanup
General: Module interfaces cleanup
2022-08-26 11:33:00 +02:00
Jakub Trllo
7356fc666d moved collection of launch hooks from modules into applications logic 2022-08-25 12:31:47 +02:00
Jakub Trllo
5372c016ea moved 'OpenPypeInterface' into interfaces.py 2022-08-25 12:19:47 +02:00
Jakub Trllo
840fbaa380 cleanup imports in modules 2022-08-24 16:21:17 +02:00
Jakub Trllo
882e00baef use Logger instead of PypeLogger 2022-08-24 15:52:47 +02:00
Jakub Trllo
265d67f1fc added helper getters to modules manager 2022-08-23 17:19:48 +02:00
Jakub Trllo
32176ba234 modules does not have to inherit from ILaunchHookPaths and application is passed to 'collect_launch_hook_paths 2022-08-11 13:29:06 +02:00
Jakub Trllo
5736b9133c added helper methods to be able get host module by host name 2022-08-11 12:40:32 +02:00
Jakub Trllo
c86ab4fecf added ability to inmport host modules on load modules 2022-08-11 12:40:08 +02:00
Jakub Trllo
92b611d76a Raise AttributeError instead of ImportError on missing attribute in 'openpype_interfaces' 2022-07-21 09:58:17 +02:00
Jakub Trllo
94f9d63098 modules have method that can be called on host installation 2022-06-16 17:05:26 +02:00
Milan Kolar
548f2a679e
Merge pull request #2650 from Tilix4/mod_kitsu 2022-06-07 12:13:53 +01:00
Jakub Trllo
6fc240734c ftrack module modify application launch environments in module instead of in prelaunch hook 2022-05-20 18:10:40 +02:00
Jakub Trllo
c3e13a9e19 modules have ability to modify environments before launch 2022-05-20 18:07:26 +02:00
Jakub Trllo
d2afd26ff6 implemented collecting of creator plugins for host 2022-05-13 11:29:19 +02:00
Félix David
4907ce1362 Moved up module 'base' changes 2022-05-04 17:57:53 +02:00
Jakub Trllo
0b306e2e77
fix typo
Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>
2022-05-03 14:04:49 +02:00
Jakub Trllo
317c27eeaf
modified log message
Co-authored-by: Roy Nieterau <roy_nieterau@hotmail.com>
2022-05-03 14:04:40 +02:00
Jakub Trllo
16af1a2347 moved validation much earlier 2022-05-03 12:41:17 +02:00
Jakub Trllo
80c7d177a6 simplified modules file validations and imports 2022-05-03 12:33:26 +02:00
Roy Nieterau
445fc679f1 And fix the other typo in comment 2022-05-02 22:32:47 +02:00
Roy Nieterau
4fc8617bd1 Fix typo in comment 2022-05-02 22:32:23 +02:00
Roy Nieterau
80494c91c1 Fix typo 2022-05-02 22:29:38 +02:00
Jakub Trllo
062b584ecb added default_modules subfolder into ignored filenames 2022-04-06 13:41:31 +02:00
Jakub Trllo
02afd4b915 subfolder of module must have init file 2022-04-06 13:31:46 +02:00
Jakub Trllo
840daefb9f added example_addons into ignored filenames 2022-04-06 13:31:20 +02:00
iLLiCiTiT
0bf019a00a default modules are loaded dynamically by skipping known files 2022-03-20 11:18:31 +01:00
iLLiCiTiT
225698d006 don't add default_modules dir if does not exists 2022-03-20 11:18:06 +01:00
Jakub Trllo
ee71d3b658 fix getattr clalback on dynamic module 2022-03-09 10:13:51 +01:00
Jakub Trllo
68cf09d61c Merge branch 'develop' into feature/OP-2267_Standalone-publisher-using-new-publisher 2022-02-24 10:38:04 +01:00
Ondřej Samohel
646651a62f
rename module 2022-02-23 16:37:58 +01:00
Jakub Trllo
e8b7e648df
Merge pull request #2789 from pypeclub/feature/move_deadline_module
Deadline: Move module one hierarchy level higher
2022-02-23 13:50:22 +01:00
Jakub Trllo
e179b1d22f
Merge pull request #2790 from pypeclub/feature/move_royal_render
Royal render: Move module one hierarchy level higher
2022-02-23 12:31:53 +01:00
Jakub Trllo
dea0ebe933
Merge pull request #2792 from pypeclub/feature/move_ftrack_module
Ftrack: Moved module one hierarchy level higher
2022-02-23 12:11:01 +01:00
Jakub Trllo
4306a618a0 moved ftrack module one hierarchy level higher 2022-02-22 15:18:12 +01:00
Jakub Trllo
efee466761 moved sync server module one hierarchy level higher 2022-02-22 15:05:04 +01:00