Commit graph

88 commits

Author SHA1 Message Date
Milan Kolar
5991a4a8c9
Merge pull request #5024 from moonyuet/enhancement/OP-3622_Delivery-renamed-frame-numbers 2023-07-13 14:59:36 +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
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
Kayla Man
a687cc068d Jakub's comment 2023-07-07 20:37:26 +08:00
Kayla Man
0f015a6f92 jakub's comment 2023-07-07 20:30:55 +08:00
Kayla Man
d7256a0992 hound fix 2023-07-05 21:07:45 +08:00
Kayla Man
be10dc7349 Jakub's comment 2023-07-05 21:06:31 +08:00
Kayla Man
5358395008 Merge branch 'develop' into enhancement/OP-3622_Delivery-renamed-frame-numbers 2023-07-05 18:30:05 +08:00
Kayla Man
4cc4bccbb5 Jakub's comment 2023-07-05 18:28:58 +08:00
Alexey Bogomolov
09f0d183d8 hound remove whitespace 2023-07-03 15:40:16 +03:00
Alexey Bogomolov
5f8a07aa8f remove unnecessary else statement 2023-07-03 12:30:43 +03:00
Alexey Bogomolov
76b6fed6a7 disable delivery button if no representations checked
fix macos combobox layout
add error message if no delivery templates found
2023-07-03 03:41:37 +03:00
Kayla Man
191876cd15 ondrej's comment 2023-06-20 22:04:24 +08:00
Kayla Man
3cf1ffeb44 hound fix 2023-06-15 15:44:08 +08:00
Kayla Man
a4d9342885 able to renumber frame through delivery action 2023-06-15 15:36:18 +08:00
Kayla Man
89070dc8e3 renumber first frame option 2023-06-06 18:11:55 +08:00
Kayla Man
199be9fb72 hound fix 2023-06-02 15:17:06 +08:00
Kayla Man
d6b22badd2 add renumber frame button 2023-06-02 15:15:32 +08:00
Kayla Man
ca9d386281 remove print function 2023-05-24 21:11:19 +08:00
Kayla Man
ad1763a483 delivery action add renamed frame number 2023-05-24 21:05:31 +08:00
Roy Nieterau
bad6aa2d96
DJV open action extensions as set (#5005)
* Allow to open with djv by extension instead of representation name

* Turn extensions into `set` like on base loader class

---------

Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2023-05-22 16:50:38 +02:00
Roy Nieterau
72fee37af6
Allow to open with djv by extension instead of representation name (#5004) 2023-05-22 16:42:12 +02:00
Petr Kalis
77861116c3
Merge pull request #4359 from ynput/bugfix/add_hero_in_add_site_loader
Fix - addSite loader handles hero version
2023-02-10 16:27:03 +01:00
Petr Kalis
b16af10670 Removed obsolete method and imports
Fixed in get_linked_representation_id instead
2023-02-09 16:27:34 +01:00
Petr Kalis
4edf16cad6 Fix - updated usage of correct variables 2023-02-08 17:26:48 +01:00
Petr Kalis
d9877ae623 Refactor - remove explict handling of hero version
If representation_id should be added(downloaded) it shouldn't download hero version if downloaded repre is actually latest, eg hero version. They files are  completely separate.
Hero version should be downloaded explicitly in Loader.
2023-02-08 16:54:20 +01:00
Petr Kalis
6894e17bbc Refactor - use values from context if available
Remove unnecessary keys from data
2023-02-08 16:18:45 +01:00
Petr Kalis
60c6a61779 Fix - added docstring 2023-01-25 18:27:08 +01:00
Petr Kalis
977d4263cb Fix - addSite loader handles hero version
If adding site to representation presence of hero version is checked, if found hero version is marked to be donwloaded too.
2023-01-20 19:39:52 +01:00
Jakub Trllo
5a4852703b Merge branch 'develop' into release/3.15.x 2023-01-18 12:10:47 +01:00
Jakub Trllo
23d2f78a38 added push to library loader 2023-01-05 18:13:44 +01:00
Jakub Trllo
e51453466c global loader plugins are using qtpy 2022-12-21 13:54:00 +01:00
Jakub Trllo
fe0ab169f7 import 'ApplicationManager' from lib 2022-10-21 15:34:43 +02:00
Petr Kalis
469ba24879 Fix - updated to not use deprecated function 2022-09-05 12:27:23 +02:00
Jakub Trllo
c8ef54e9ce use new source of 'get_linked_ids_for_representations' 2022-08-31 18:22:04 +02:00
Roy Nieterau
767f20ef1b Open main file of representation
For image sequences this is the same first file as uses before
2022-08-30 20:02:01 +02:00
Jakub Trllo
cd09f23b96 removed unused import 2022-08-29 16:44:51 +02:00
Jakub Trllo
d3a7637d15 Marked 'process_sequence' as deprecated and moved to pipeline delivery as 'deliver_sequence' 2022-08-29 15:10:44 +02:00
Jakub Trllo
eaff50b23e Marked 'process_single_file' as deprecated and moved to pipeline delivery as 'deliver_single_file' 2022-08-29 15:07:45 +02:00
Jakub Trllo
dc77d4a609 marked 'check_destination_path' as deprecated and moved to pipeline.delivery 2022-08-29 15:04:03 +02:00
Jakub Trllo
e2060b9d65 marked 'get_format_dict' as deprecated and moved it to pipeline delivery 2022-08-29 15:00:08 +02:00
Jakub Trllo
f2a191861b marked 'path_from_representation' as deprecated and replaced it's usage with 'get_representation_path_with_anatomy' 2022-08-29 14:41:28 +02:00
Jakub Trllo
c26119cc9f use new functions in code 2022-08-29 14:13:08 +02:00
Jakub Trllo
31a3911d4e move functions from openpype.lib.config to openpype.lib.dateutils 2022-07-26 11:48:24 +02:00
Jakub Trllo
eb26078731
Merge pull request #3459 from pypeclub/feature/OP-3515_Use-query-functions-in-global-plugins
General: Use query functions in global plugins
2022-07-08 12:47:20 +02:00
Jakub Trllo
408593bf14 define query result 2022-07-04 11:12:46 +02:00
Jakub Trllo
9f174cc92c fix query 2022-07-04 11:11:34 +02:00
Jakub Trllo
409362e4ff moveed the ftrack logic into separated method 2022-07-04 10:50:40 +02:00
Jakub Trllo
5baedfc3a0 use ftrack module to determine if ftrack is enabled 2022-07-04 10:37:57 +02:00
Jakub Trllo
4e4bf77172 use direct import of ftrack_api 2022-07-04 10:37:36 +02:00