Commit graph

125 commits

Author SHA1 Message Date
Jakub Trllo
159a2d1dbc use new click_wrap in existing openpype modules 2024-01-22 17:50:35 +01:00
iLLiCiTiT
72e980b1e4 keys in hierarchyContext are always names 2023-12-11 12:58:38 +01:00
Ondřej Samohel
610ed75aaf 🗑️ remove simple unreal texture publishing 2023-12-06 12:02:50 +01:00
Jakub Trllo
f27a25d244 add 'folder' key to template data in harmony collectors 2023-10-30 12:15:27 +01:00
Roy Nieterau
ba6dfc5ead Remove unused variables + tweak logs 2023-09-06 23:28:39 +02:00
Jakub Trllo
d63aa34a76
AYON: 3rd party addon usage (#5300)
* implemented helper functions to get ffmpeg and oiio tool arguments

* modified validation functions to be able to handle list of arguments

* path getters can return a path in AYON mode if one argument is returned

* removed test exception

* modified docstrings

* is_oiio_supported is using new functions to get launch arguments

* new functions are in lib public =

* use new functions all over the place

* renamed 'ffmpeg_path' to 'ffmpeg_args'

* raise 'ToolNotFoundError' if tool argument could not be found

* reraise 'KnownPublishError' in publish plugins

* fix comment

* simplify args start

* ffmpeg and oiio function require tool name and support additional arguments

* renamed 'get_oiio_tools_args' to 'get_oiio_tool_args'

* fix variable name
2023-07-27 10:54:45 +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 Trllo
3d41ee6591
TrayPublisher & StandalonePublisher: Specify version (#5142)
* modified simple creator plugin to be able handle version control

* added 'allow_version_control' to simple creators

* don't remove 'create_context' from pyblish context during publishing

* implemented validator for existing version override

* actually fill version on collected instances

* version can be again changed from standalone publisher

* added comment to collector

* make sure the version is set always to int

* removed unused import

* disable validator if is disabled

* fix filtered instances loop
2023-06-16 16:26:04 +02:00
Roy Nieterau
b05afaa837
Global: Optimize anatomy formatting by only formatting used templates instead (#4784)
* TemplatesDict can create different type of template

* anatomy templates can be formatted on their own

* return objected templates on get item

* '_rootless_path' is public classmethod 'rootless_path_from_result'

* 'AnatomyStringTemplate' expect anatomy templates

* remove key getters

* fix typo 'create_ojected_templates' -> 'create_objected_templates'

* Fix type of argument

* Fix long line

* Optimize formatting to use single template formatting instead of formatting full anatomy

* Optimize formatting to use single template formatting instead of formatting full anatomy

* Optimize formatting to use single template formatting instead of formatting full anatomy

* Optimize formatting to use single template formatting instead of formatting full anatomy

* Optimize formatting to use single template formatting instead of formatting full anatomy

* Optimize formatting to use single template formatting instead of formatting full anatomy

* Optimize formatting to use single template formatting instead of formatting full anatomy

* Use format strict + code cosmetics

* Get template from the formatted data

* Update openpype/plugins/publish/integrate_legacy.py

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

* Cosmetics

* Move template obj definition for path up + rename to `path_template_obj`

* Refactor more cases from `anatomy.format` to template obj `.format_strict`

* Refactor more cases from `anatomy.format` to template obj `.format_strict`

* Refactor more cases from `anatomy.format` to template obj `.format_strict`

---------

Co-authored-by: Jakub Trllo <jakub.trllo@gmail.com>
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2023-04-17 14:53:15 +02:00
Roy Nieterau
74f73969ad
Remove "preview" data from representation (#4759)
* Remove "preview" data from representation

* pop "preview" from component in standalone publisher

---------

Co-authored-by: Jakub Trllo <jakub.trllo@gmail.com>
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2023-03-31 17:08:58 +02:00
Roy Nieterau
3fae1f8521 Just some grammar tweaks 2023-03-30 13:59:22 +02:00
Petr Kalis
492e5bbd03 Merge develop 2022-12-08 11:21:38 +01:00
Derek Severin
ee921e0bd4 Removed class variable and TODOs 2022-12-03 17:04:02 +07:00
Derek
775dc756d1
Merge branch 'pypeclub:develop' into bugfix/sa-validate-texture-workfiles 2022-11-30 14:55:46 +07:00
Jakub Trllo
4d3961e044 changed label of standalone publisher 2022-11-10 11:43:17 +01:00
2-REC
372c6d89c3 Setting from other plugin 2022-11-04 15:26:33 +07:00
Jakub Trllo
12c28fe466 change imports in hosts 2022-11-03 16:27:38 +01:00
Jakub Trllo
c7579fe828
Merge pull request #4017 from pypeclub/feature/global_use_lib_functions_from_lib
General: Import lib functions from lib
2022-10-27 13:35:38 +02:00
Jakub Trllo
c90e8fed53 fix thumbnail publishing from standalone publisher 2022-10-25 11:56:52 +02:00
Jakub Trllo
250cdd32ce import lib functions from 'openpype.lib' 2022-10-21 14:13:36 +02:00
Jakub Trllo
cd4b5ce227 Merge branch 'develop' into feature/OP-3835_Move-publish-utils-to-pipeline 2022-08-30 13:48:02 +02:00
Jakub Trllo
511bf71f61 fix standalone publisher settings 2022-08-26 15:17:28 +02:00
Jakub Trllo
4a35b4bea7 renamed standalonepublisher to addon 2022-08-26 15:13:16 +02:00
Jakub Trllo
2bfa9eea44 renamed 'IHostModule' to 'IHostAddon' 2022-08-26 15:06:50 +02:00
Jakub Trllo
10758ec144 use new source of order variables 2022-08-26 14:51:22 +02:00
Jakub Trllo
7a4cd9c1fa removed 'get_subset_name' and renamed 'get_subset_name_with_asset_doc' to 'get_subset_name' 2022-08-23 19:20:04 +02:00
Jakub Trllo
ce31b9a477 provide more data as arguments during publishing 2022-08-23 19:13:23 +02:00
Jakub Trllo
7e59a577a6 use new import of 'get_subset_name_with_asset_doc' 2022-08-23 19:12:28 +02:00
Jakub Trllo
ab1e6c4e3d removed unused imports 2022-08-22 18:30:27 +02:00
Jakub Trllo
986e4325c2 fix import 2022-08-22 18:26:01 +02:00
Jakub Trllo
9db2eb3cc0 added cli commands for standalone publisher 2022-08-22 18:23:32 +02:00
Jakub Trllo
8c84967087 modified standalone publish action to work also as host module 2022-08-22 18:23:20 +02:00
Jakub Trllo
ffaa0b7adf moved standalonepublish action into standalone publish host 2022-08-22 18:22:24 +02:00
Jakub Jezek
4160713a62
Merge branch 'develop' into feature/OP-3445_tray-publisher-editorial 2022-07-28 17:39:56 +02:00
Jakub Jezek
a3a839181b
global, flame, hiero, resolve, sp: implementing newAssetPublishing 2022-07-27 11:21:20 +02:00
Jakub Jezek
29de28cb53
trayp: editorial publishing wip 2022-07-15 17:57:05 +02:00
Jakub Trllo
ad8a7c86e4 use 'get_current_project_asset' in hosts 2022-07-15 15:57:01 +02:00
Jakub Trllo
26dd1988fa Merge branch 'develop' into bugfix/stpublisher-editorial-hierarchy 2022-06-23 13:58:30 +02:00
Jakub Jezek
2da7261abf
standalone: ensure extension with dot at start 2022-06-16 15:32:37 +02:00
Jakub Jezek
98646b9c0a
standalone: adding rename shot switch and hierarchy switch 2022-06-16 15:32:05 +02:00
Jakub Trllo
c01f65a917 removed unused import 2022-06-13 17:02:34 +02:00
Jakub Trllo
9cb5372d69 use client functions to query data in standalone publisher plugins 2022-06-13 16:29:09 +02:00
Jakub Trllo
42fd8d637d always create new thumbnail representation in standalone publisher no matter what extension source has 2022-05-18 10:41:58 +02:00
Jakub Trllo
235baf4f4c store width and height into thumbnail representation 2022-05-10 14:48:53 +02:00
Petr Kalis
e5f3d28c17 OP-3113 - moved plugins into addon
Plugins were only for specific customer (and not working because of missing psd-tools).
2022-04-26 15:04:08 +02:00
Jakub Trllo
a579cd31c8 Merge branch 'develop' into enhancement/OP-2858_move-AvalonMongoDB-logic 2022-04-25 18:03:38 +02:00
Ondřej Samohel
fca3645a7a
add support for bgeo and vdb
add support for standalone publisher to publish bgeo and vdb sequences
2022-04-20 18:10:05 +02:00
Jakub Trllo
4eb6f09b8d replace avalon imports in standalone publisher 2022-04-14 12:19:56 +02:00
Jakub Trllo
00406a7376 added more information abou app - name and label 2022-04-06 16:13:50 +02:00
Ondrej Samohel
34f5f7d60c
fix validator message 2022-03-31 10:13:13 +02:00