Commit graph

190 commits

Author SHA1 Message Date
Ondřej Samohel
9ff27b51b5
🔥 remove Muster 2023-12-21 14:27:35 +01:00
Jakub Trllo
597ea86876
fix source path, not destination path (#5702) 2023-10-05 14:44:56 +02:00
Ondřej Samohel
1665ceff78 ♻️ change logic
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2023-07-11 18:11:08 +02:00
Petr Kalis
e42aebc1f2 Global: custom location for OP local versions (#4673)
* OP-5221 - updated settings for custom location of artist zip folder

* OP-5221 - updated igniter for custom location of artist zip folder

Introduced new function
Updated data_dir only after access to Mongo (DB)

* OP-5221 - pushed resolving of local folder to OpenPypeVersion

Logic in OpenPypeVersion is used even in openpype_version.py

* OP-5221 - updates after review

* OP-5221 - fix paths should be single paths

* OP-5221 - refactor to cls

* OP-5221 - refactor

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

* OP-5221 - fix defaults for single paths

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

* OP-5221 - remove unwanted line

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

* OP-5221 - update look of Settings

Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2023-07-11 17:50:51 +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
33148f45e7 General: Environment variable for default OCIO configs (#4670)
* set 'BUILTIN_OCIO_ROOT' environment variable in start.py

We need to use simplified variant to fill default ocio root for OCIO configs to replace '{OPENPYPE_ROOT}/vendor/bin/ocioconfig/OpenColorIOConfigs' in settings.

The explicit path from OPENPYPE_ROOT disable option to change the path elsewhere without harm of settings change. Using 'BUILTIN_OCIO_ROOT' can be usd universally.

* use new env variable in OCIO settings
2023-07-11 17:48:33 +02:00
Jakub Trllo
e42918997e fix possible issues with destination drive path 2023-07-11 17:48:30 +02:00
Ondrej Samohel
7992ba6969 🐛 fix error reports in silent mode 2023-07-11 17:48:30 +02:00
Petr Kalis
41f4c3981b
Merge branch 'release/3.15.x' into feature/OP-3426_Add-support-for-Deadline-for-automatic-tests 2022-11-11 19:32:08 +01:00
Petr Kalis
d3769b3b73 OP-3426 - fix - add _tests suffix only if not present
_tests suffix is added to avalon and openpype DB for testing run. env vars for these might be already injected, so do not add them again.
2022-11-07 12:50:05 +01:00
Petr Kalis
058d4014a8 OP-3426 - refactor - cleaned up cli arguments 2022-11-07 11:28:30 +01:00
Jakub Trllo
2341f08492 store '--use-staging' to 'OPENPYPE_USE_STAGING' env variable 2022-10-25 16:45:40 +02:00
Petr Kalis
8f3b6e5c0e OP-3426 - don't remove from sys.args
Cli should have automatic_tests argument even if it is not pushed through, just for better documentation of command with --help
2022-10-19 15:15:03 +02:00
Petr Kalis
76de4e4bbb OP-3426 - added support for automatic tests into GlobalJobPreLoad
Jobs sent to DL must propagate flag IS_TEST to note that job is an automatic tests, it should use different DBs from regular jobs.
2022-10-19 13:40:33 +02:00
Ondrej Samohel
84b3bc3db2
♻️ remove staging logic 2022-10-13 11:34:57 +02:00
Jakub Trllo
cfb14d32b5 Show dialog if installed version is not compatible in UI mode 2022-08-16 15:42:25 +02:00
Ondrej Samohel
aa0fe93a50
🐛 fix version list 2022-08-12 19:50:07 +02:00
Ondrej Samohel
b61e47a15d
♻️ don't look for compatible version automatically 2022-08-12 19:45:26 +02:00
Ondrej Samohel
1ad9728962
♻️ remove forgotten args, fix typos 2022-08-12 19:32:13 +02:00
Ondrej Samohel
0c72b8e278
♻️ refactor compatibility check 2022-08-12 15:31:56 +02:00
Ondrej Samohel
312b6d3243
🐛 fix finding of last version 2022-08-12 13:00:41 +02:00
Ondřej Samohel
0e126a2d82
♻️ handle multiple versions 2022-08-01 18:01:25 +02:00
Ondřej Samohel
bb10fdd041
🚨 f-strings and cosmetic issues 2022-08-01 18:00:14 +02:00
Ondřej Samohel
4c849e8d86
🐛 fix environment resolution
this will fix environment resolution of general settings in one pass
2022-07-27 18:14:22 +02:00
Jakub Trllo
bfbb1225d0 Use 'Logger' instead of 'PypeLogger' 2022-07-27 10:57:19 +02:00
Jakub Trllo
361ba53f26 use new location of 'get_default_components' function 2022-07-27 10:54:57 +02:00
Jakub Trllo
40ea037ed4 register module publish plugins during openpype plugin installation instead of using environment variable 2022-05-13 12:08:30 +02:00
Jakub Trllo
f3cf21ebb4 avoid duplicated calls 2022-05-04 17:45:54 +02:00
Jakub Trllo
2ec9bcfca1 reduced duplicated code when OP version is not allowed 2022-05-04 17:43:17 +02:00
Jakub Trllo
313382f2fb fix OPENPYPE_ROOT usage 2022-05-03 12:46:40 +02:00
Jakub Trllo
712d4c72ab moved print and validate versions logic to separated functions 2022-05-03 12:23:36 +02:00
Jakub Trllo
518ab19a0b fix missing openpype_versions variable for headless mode 2022-05-03 12:11:23 +02:00
Jakub Trllo
45a5538a5c removed backwards compatibility 2022-04-28 16:50:05 +02:00
Jakub Trllo
a579cd31c8 Merge branch 'develop' into enhancement/OP-2858_move-AvalonMongoDB-logic 2022-04-25 18:03:38 +02:00
Jakub Trllo
38d93c1b46 don't look for repos directory in add_paths_from_directory 2022-04-22 11:30:40 +02:00
Jakub Trllo
613e14c012 don't look into repos directory to be added to sys path 2022-04-22 11:25:40 +02:00
Jakub Trllo
a118c1e980 check global settings on start if logs should be send to mongo 2022-04-19 18:51:05 +02:00
Jakub Trllo
d71baa8390 added debug argument to global sys argv handling 2022-04-19 18:50:11 +02:00
Jakub Trllo
9ff8f3011b added global verbose argument which can change log level 2022-04-19 18:49:54 +02:00
Jakub Trllo
89eeb4b31b don't set all environments 2022-04-19 18:17:24 +02:00
Jakub Trllo
3babf06542 changed how and if are repos added to sys path 2022-04-19 18:17:05 +02:00
Roy Nieterau
86c6e51263 Refactor remaining usage of get_openpype_path_from_db -> get_openpype_path_from_settings 2022-02-08 23:05:51 +01:00
Roy Nieterau
2373d13348 Re-use global settings more since the data is large and query is slow over network (2s+) 2022-01-29 15:13:12 +01:00
Roy Nieterau
b088e952e6 Only construct info when needed + optimize "silent commands" lookup
- Lookup in "silent commands" as `set`
- Do "silent commands" lookup only once instead of in the for loop
- Move imports closer to where they are needed (e.g. don't import terminal if we don't use it)
2022-01-29 14:39:00 +01:00
iLLiCiTiT
247c931c0f Merge branch 'develop' into enhancement/OP-2075_version-handling 2022-01-04 16:53:23 +01:00
Jakub Trllo
d18eee883b
Merge pull request #2401 from pypeclub/feature/OP-2013_MongoDB-Ability-to-specify-replica-set-groups
General: MongoDB ability to specify replica set groups
2021-12-22 12:57:31 +01:00
iLLiCiTiT
1914c144cd uses get_default_components for log components 2021-12-22 11:38:43 +01:00
Petr Kalis
1cbcdba969 OP-2053 - merge develop 2021-12-14 15:26:15 +01:00
Petr Kalis
148bb47b7d OP-2053 - allow injection of AVALON_DB env var as a db 2021-12-14 10:54:10 +01:00
iLLiCiTiT
53e362f3db renamed build verion to installed version 2021-12-10 10:40:42 +01:00