Commit graph

161 commits

Author SHA1 Message Date
Jakub Trllo
a31b2d9d77
SyncServer: Existence of module is optional (#5413)
* 'get_repre_icons' have optional sync server

* local settings have optional sync server

* sync server is optional in sceneinventory

* sync server is optional in loader tool

* sync server is optional in library loader

* sync server is optional in host dirmap

* sync server is optional in nuke cache

* sync server is optional in integrate plugin

* added "sync_server" back to ignored modules for openpype package

* fix missing variable

* mark syncserver command as deprecated

* define 'SYNC_SERVER_ROOT'

* added method to receive icon paths

* use sync server module to receive icons

* fix scene inventory
2023-08-07 18:48:27 +02:00
Jakub Trllo
b48e7ebfe4 AYON: Preparation for products (#5038)
* removed settings of IntegrateAssetNew

* added 'active' to 'ValidateEditorialAssetName' plugin settings

* removed unused 'families_to_review' setting from tvpain

* implemented product name -> subset and product type -> family conversion

* fixed most of conversion utils related to subsets

* removed unused constants

* anatomy templates are handling folder and product in templates

* handle all possible template changes of asset, subest and family in settings

* updated ayon api

* updated fixed ayon api

* added conversion functions for representations

* fixed 'get_thumbnail' compatibility

* use del to handle ayon mode in intput links

* changed labels in UI based on AYON mode

* updated ayon_api with 0.2.0 release code
2023-07-11 18:13:50 +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
Jakub Trllo
b24b4a9d5f
Loader: Hide inactive versions in UI (#5100)
* Function 'get_last_versions' have active filter

* filter in active versions in loader
2023-06-08 11:54:41 +02:00
Roy Nieterau
4ed1c1f65d
Enhancement: Fix PySide 6.5 support for loader (#4900)
* Reverse inheritance order to avoid PySide6.5 bug `PYSIDE-2294` & `PYSIDE-2304`

* Fix PySide6 support
2023-04-25 10:29:12 +02:00
Jakub Trllo
199f70e1ca
add missing variable 'handles' to loader (#4781) 2023-04-05 14:35:07 +02:00
Roy Nieterau
d958f989e0 Remove "handles" backwards compatibility 2023-03-29 23:57:35 +02:00
Jakub Trllo
86184a8ee0
Tools: Fix recursive filtering (#4597)
* check for 'filterRegExp' first

* use recursive filtering option if is available
2023-03-13 11:20:59 +01:00
Jakub Trllo
8a34313b97 added 'data' and 'context' to representations widget too 2023-02-28 11:30:39 +01:00
Jakub Trllo
9e432f7c5c add data and context to repre document fields 2023-02-28 11:30:39 +01: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
6894e17bbc Refactor - use values from context if available
Remove unnecessary keys from data
2023-02-08 16:18:45 +01:00
Jakub Trllo
d48b73ed61 fix typo 'AbtractAttrDef' to 'AbstractAttrDef' 2023-01-27 16:28:00 +01:00
Jakub Trllo
5a4852703b Merge branch 'develop' into release/3.15.x 2023-01-18 12:10:47 +01:00
Jakub Trllo
e444e0c7d9
Merge pull request #4284 from ynput/feature/OP-3930_Publish-to-Studio-Library
General: Push to studio library
2023-01-17 14:47:04 +01:00
iLLiCiTiT
5f4cad6851 check if loader is enabled in loader tool 2023-01-12 00:41:50 +01:00
Jakub Trllo
77df80aa83 removed unused import 2023-01-06 18:59:32 +01:00
Jakub Trllo
679becc3a8 fix work with checkstate constants 2023-01-06 18:51:51 +01:00
Jakub Trllo
0aa011184b fix checked int for pyside6 2023-01-06 17:38:06 +01:00
Jakub Trllo
74984afc7b added new 'LoadError' to avoid showing traceback 2023-01-05 18:11:49 +01:00
Jakub Trllo
7cd57e051a support new method for regex filtering 2022-12-21 15:19:57 +01:00
Jakub Trllo
d8d99f8bd8 use qtpy in loader 2022-12-21 13:51:33 +01:00
Jakub Trllo
d4ae2ac60c
Merge pull request #4052 from pypeclub/feature/attribute_defs_dialog
General/TVPaint: Attribute defs dialog
2022-11-04 21:36:12 +01:00
Jakub Trllo
761d624b2e fix comparison of repre name 2022-11-01 16:07:50 +01:00
Jakub Trllo
cec37f0101 loader can handle both qargparse and attribute definitions 2022-11-01 14:36:50 +01:00
Jakub Trllo
3418a94d47 query hero versions too 2022-10-05 13:09:08 +02:00
Roy Nieterau
c3588e2f9d Make loaded_in_scene column 5 pixels wider + reorder to match with column order 2022-09-14 12:37:46 +02:00
Roy Nieterau
1eae84fd49 Switch columns 2022-09-14 11:58:10 +02:00
Roy Nieterau
a8909889c4 Fix refactored code 2022-09-14 11:49:52 +02:00
Roy Nieterau
d84b175efb
Support ILoadHost hosts
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2022-09-14 11:47:52 +02:00
Roy Nieterau
d5cb828edc Move LoadedInSceneDelegate into Loader tool since it's specific to loader 2022-09-14 11:45:44 +02:00
Roy Nieterau
8d048bd72a Merge remote-tracking branch 'upstream/develop' into loader_show_containers_in_scene
# Conflicts:
#	openpype/tools/loader/model.py
2022-09-08 20:09:44 +02:00
Roy Nieterau
9ebd602a91 Add delegate to loaded in scene column for "yes/no" and colorized column 2022-09-08 20:06:34 +02:00
Roy Nieterau
dc903c7520 Store loaded_in_scene as bool in model 2022-09-08 19:49:17 +02:00
Roy Nieterau
ff149b6821 Remove unused import 2022-09-08 19:42:55 +02:00
Jakub Trllo
fce4e6e3d8 fix version specific repre info in loader 2022-08-23 16:38:45 +02:00
Jakub Trllo
7f234e1d81 fix iterator index acces 2022-08-23 16:20:54 +02:00
Jakub Trllo
0f114331ec use client options to change subset group 2022-08-23 15:35:57 +02:00
Jakub Trllo
9d54333e93 load error can handle invalid hero version 2022-08-18 15:28:54 +02:00
Roy Nieterau
63e6088391 Refactor .remove to .discard to fix bug if version wasn't in version_ids 2022-08-16 11:55:23 +02:00
Roy Nieterau
4870610113 Report subsets without representation in one go 2022-08-16 10:17:11 +02:00
Roy Nieterau
874d95270f Fix logic 2022-08-16 10:11:45 +02:00
Petr Kalis
1bd2d53172
Merge pull request #3597 from pypeclub/chore/OP-3405_Use-query-functions-in-sync-server
SyncServer: use query functions
2022-08-15 13:43:05 +02:00
Roy Nieterau
ca40a71f5c Reduce queries to get loaded subset ids 2022-08-12 09:48:52 +02:00
Roy Nieterau
b3517a2da9 Remove print statement 2022-08-12 09:47:21 +02:00
Roy Nieterau
a07650226a Remove unused variables 2022-08-11 18:09:19 +02:00
Roy Nieterau
74161e931e Show whether a subset is loaded into the current scene 2022-08-11 18:02:47 +02:00
Jakub Trllo
0b24237bfe loader pass project name to discover loader plugins 2022-08-05 10:08:54 +02:00
Petr Kalis
eb2c825588 OP-3405 - extracted aggregate query from Loader to Site Sync module 2022-08-02 16:09:59 +02:00
Jakub Trllo
af2c57674e use new Anatomy source in tools 2022-06-29 15:21:21 +02:00