Commit graph

44 commits

Author SHA1 Message Date
Roy Nieterau
ba6dfc5ead Remove unused variables + tweak logs 2023-09-06 23:28:39 +02:00
Petr Kalis
1b8d8e68f2
Harmony: refresh code for current Deadline (#5493)
* Explicitly set Python3 for Harmony OP plugin

* Fix method call

Without it it would always return True

* Explicitly set render instance to farm

* Added Harmony 22 executable

This plugin might not be necessary anymore for current Harmonies (at least for 22 works original Harmony plugin in DL)

* Removed logging

* fix - remove explicit disabling of review

instance.data["review"] could be False only if review shouldn't be explicitly done. This is not possible in old publisher.
TODO must be implemented in NP.
2023-09-01 18:23:45 +02:00
Jakub Jezek
93f897c780
deadline: adding collect farm target and removing redundant key 2023-08-24 13:59:34 +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
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
Petr Kalis
91740ea356
Harmony: render what is in timeline in Harmony locally (#4741)
* OP-5466 - render what is in timeline in Harmony locally

* OP-5466 - validate according to scene start in timeline

scene start is denoted by small black triangle in the left on the timeline

* OP-5466 - do not force settings from DB

Added separate menu item to set frames and resolution from DB to scene.

* OP-5466 - added logging details to validator
2023-03-30 17:50:09 +02:00
Petr Kalis
0765602ce3 simpler set initialization 2023-02-28 11:30:39 +01:00
Petr Kalis
956fbb780b change Harmony loader to use extensions 2023-02-28 11:30:39 +01:00
Jakub Trllo
c5c91183c3 fix other places where decoding of ffmpeg happens 2023-02-10 11:35:01 +01:00
Jakub Trllo
4790846519 Use new import source of Extractor 2022-09-01 12:03:27 +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
10758ec144 use new source of order variables 2022-08-26 14:51:22 +02:00
Jakub Trllo
27517897ab use new imports of 'get_errored_plugins_from_context' and 'get_errored_instances_from_context' 2022-08-26 12:07:26 +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
Petr Kalis
a96bfc45ad Fix - method expects dict not id 2022-07-25 13:49:15 +02:00
Jakub Trllo
33464794be Merge branch 'develop' into feature/OP-3593_Move-load-functions-into-pipeline 2022-07-25 10:35:33 +02:00
Jakub Trllo
c8d18dafa1 'is_latest' moved to pipeline as 'is_representation_from_latest' 2022-07-15 17:46:21 +02:00
Jakub Trllo
e8b4a3389e added comment do harmony plugin 2022-07-15 16:33:47 +02:00
Jakub Trllo
2d8c41cc6e moved render abstractions to openpype.pipeline.publish 2022-06-30 10:39:05 +02:00
Petr Kalis
d230cb7d49 Fix - audio validator for Harmony has wrong logic
Wrong condition stayed after change from asset to raise (it should be negated).
2022-06-17 12:39:44 +02:00
Petr Kalis
dbbc633e83 Fix - added missing task
Task used in validations later.
2022-05-11 10:36:41 +02:00
Jakub Trllo
5bded18fbd replaced avalon imports in harmony 2022-04-14 11:59:13 +02:00
Petr Kalis
57404e5bcd Added creating subset name for workfile from template for Harmony 2022-04-06 15:22:56 +02:00
Jakub Trllo
eb49761887 Merge branch 'develop' into enhancement/OP-2848_move-loader-logic-from-avalon-to-openpype 2022-03-14 11:47:33 +01:00
Jakub Trllo
c5ac2290f6 use moved functions in hosts and tools 2022-03-14 11:36:17 +01:00
Jakub Trllo
78d566b654 replaced usage of avalon.lib.time with new function get_formatted_current_time 2022-03-11 16:40:41 +01:00
Petr Kalis
4d0d255346 Fix for new publish validations for Harmony 2022-03-08 17:36:26 +01:00
Jakub Trllo
467208309b Merge branch 'develop' into feature/validation_exceptions 2022-03-01 11:37:44 +01:00
Petr Kalis
3497822381 OP-2414 - Hound 2022-02-08 18:52:33 +01:00
Petr Kalis
7d8f339b8d OP-2414 - updated message after palette load 2022-02-08 18:44:36 +01:00
Petr Kalis
e317c5e307 Merge branch 'develop' of github.com:pypeclub/OpenPype into chore/OP-2414_Move-harmony-to-openpype 2022-02-07 20:49:21 +01:00
Petr Kalis
9d1468de8b Fix - context must be pushed through with RenderInstance
Submission to DL checks context for flag for pushing through OPENPYPE_MONGO
2022-02-07 13:13:44 +01:00
Petr Kalis
9cde48fb55 Merge branch 'develop' of github.com:pypeclub/OpenPype into chore/OP-2414_Move-harmony-to-openpype 2022-02-02 13:44:31 +01:00
Petr Kalis
5a3ce84748 OP-2414 - fixed imports for plugins after move to OP 2022-01-27 18:21:48 +01:00
Roy Nieterau
107e2e637e Fix typos / cosmetics 2022-01-16 13:05:26 +01:00
Petr Kalis
d7f6db8d38 Added new style validators for New Publisher for Harmony 2021-12-22 13:56:18 +01:00
clement.hector
7ec884f2d5 filled anatomyData in publish plugins 2021-10-26 17:22:27 +02:00
iLLiCiTiT
9720dac97b removed unnecessary formatting 2021-09-16 15:04:08 +02:00
Petr Kalis
ef5dd3c543 Harmony - moved filtering of DB setting from init to validator 2021-05-13 13:59:53 +02:00
Petr Kalis
b689b0cd9e Harmony - cleaned up settings location
Standardized to use regex when possible
Removed 'General' sections as everything is in ValidateSceneSettings
2021-05-13 12:17:31 +02:00
Milan Kolar
8432e94615 rename folder 2021-04-01 18:54:46 +02:00