Commit graph

194 commits

Author SHA1 Message Date
Sharkitty
71a1365216
Fix: Hardcoded main site and wrongly copied workfile (#5733) 2023-10-09 17:11:35 +02:00
Sharkitty
1d02f46e15
Feature: Copy resources when downloading last workfile (#4944)
* Feature: Copy resources when downloading workfile

* Fixed resources dir var name

* Removing prints

* Fix wrong resources path

* Fixed workfile copied to resources folder + lint

* Added comments

* Handling resource already exists

* linting

* more linting

* Bugfix: copy resources backslash in main path

* linting

* Using more continue statements, and more comments

---------

Co-authored-by: Petr Kalis <petr.kalis@gmail.com>
2023-10-09 14:12:26 +02:00
Félix David
fc5e52e9ab
Feature: Download last published workfile specify version (#4998)
Co-authored-by: Petr Kalis <petr.kalis@gmail.com>
2023-08-11 16:47:14 +02:00
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
7e9f42b447
Applications: Use prelaunch hooks to extract environments (#5387)
* ApplicationManager can have more granular way how applications are launched

* executable is optional to be able create ApplicationLaunchContext

* launch context can run prelaunch hooks without launching application

* 'get_app_environments_for_context' is using launch context to prepare environments

* added 'launch_type' as one of filtering options for LaunchHook

* added 'local' launch type filter to existing launch hooks

* define 'automated' launch type in remote publish function

* modified publish and extract environments cli commands

* launch types are only for local by default

* fix import

* fix launch types of global host data

* change order or kwargs

* change unreal filter attribute
2023-08-03 10:04:15 +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
Félix David
87802d0620
Fix: Download last workfile doesn't work if wf not already downloaded (#4942) 2023-05-18 14:39:27 +02:00
Petr Kalis
fec104de8e
Fix: Locally copied version of last published workfile is not incremented (#4722)
* Fix: Locally copied version of last published workfile is not incremented

* fix subset first match

* correct anatomy name

* Fix typo and linting

* keep source filepath for further path conformation

* fetch also input dependencies of workfile

* required changes

* lint

* fix case only one subset

* Enhancement:  copy last workfile as reusable methods (#6)

* Enhancement: copy last published workfile as reusable methods (WiP)

* Added get_host_extensions method, added subset_id and las_version_doc access, added optional arguments to get_last_published_workfile

* Plugged in the new methods + minor changes

* Added docstrings, last workfile optional argument, and removed unused code

* Using new implementation to get local workfile path. Warning: It adds an extra dot to the extension which I need to fix

* Refactoring and fixed double dots

* Added match subset_id and get representation method, plus clan up

* Removed unused vars

* Fixed some rebasing errors

* delinted unchanged code and renamed get_representation into get_representation_with_task

* This time it's really delinted, I hope...

* Update openpype/modules/sync_server/sync_server.py

reprenation isn't the right spelling (:

Co-authored-by: Félix David <felixg.david@gmail.com>

* Changes based on reviews

* Fixed non imperative docstring and missing space

* Fixed another non imperative docstring

* Update openpype/modules/sync_server/sync_server.py

Fixed typo

Co-authored-by: Félix David <felixg.david@gmail.com>

Co-authored-by: Hayley GUILLOT <hayleyguillot@outlook.com>
Co-authored-by: Félix David <felixg.david@gmail.com>

* Fix: syntax error

* fix single subset case

* Restore sync server enabled test in hook

* Python2 syntax

* renaming and missing key case handling

* Fix local workfile overwritten on update in some cases (#7)

* Fix: Local workfile overwrite when local version number is higher than published workfile version number (WiP)

* Changed regex search, clean up

* Readded mistakenly removed newline

* lint

* remove anticipated functions for cleaner PR

* remove funcs from entities.py

* change to get_last_workfile_with_version

* clean

* Update openpype/modules/sync_server/sync_server.py

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

* removed get_last_published_workfile_path

* moved hook to sync server module

* fix lint

* Refactor - download only if not present

* Refactor - change to list instead of set

* Refactor - removing unnecessary code

last_published_workfile_path must exists or we wouldn't get there. Use version only from that.

* Refactor - removing unnecessary imports

* Added check for max fail tries

* Refactor - cleaned up how to get last workfile

* Updated docstrings

* Remove unused imports

Co-authored-by: Félix David <felixg.david@gmail.com>

* OP-5466 - run this on more DCC

* Updated documentation

* Fix - handle hero versions

Skip hero versions, look only for versioned published to get max version id.

* Hound

* Refactor - simplified download_last_published_workfile

Logic should be in pre hook

* Skip if no profile found

* Removed unwanted import

* Use collected project_doc

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

* Use cached project_settings

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

---------

Co-authored-by: Félix David <felixg.david@gmail.com>
Co-authored-by: Sharkitty <81646000+Sharkitty@users.noreply.github.com>
Co-authored-by: Hayley GUILLOT <hayleyguillot@outlook.com>
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Co-authored-by: Jakub Ježek <jakubjezek001@gmail.com>
2023-05-02 18:49:02 +02:00
Petr Kalis
a7f0d57638
SiteSync: host dirmap is not working properly (#4563)
- only editable keys are returned from Site Sync module to Local Settings

Cleaner approach even if LS UI is going away in Ayon.

- use remote_site only if is local_drive provider

- remove unwanted import

- cache mapping, update logging

Mapping was called multiple times for Nuke.
Logging was too verbose.
2023-03-13 10:32:19 +01:00
Petr Kalis
3c21535093 removed unnecessary try catch 2023-02-27 11:38:56 +01:00
Jakub Trllo
1b5d7a1d38 rename method 2023-02-27 11:38:56 +01:00
Jakub Trllo
5de35b48e5 change exception type and message 2023-02-27 11:38:56 +01:00
Jakub Trllo
f4c47d41d4 move validation of site name to sync server 2023-02-27 11:38:56 +01:00
Jakub Trllo
d81debdc10 implemented methods to get active site type from sync server module 2023-02-27 11:38:56 +01:00
Jakub Trllo
5a4852703b Merge branch 'develop' into release/3.15.x 2023-01-18 12:10:47 +01:00
Jakub Trllo
782957bd0a Merge branch 'release/3.15.x' into feature/OP-4634_Use-qtpy-in-tools
# Conflicts:
#	poetry.lock
2023-01-16 18:09:09 +01:00
Félix David
cb3880a8d1 changes for gdrive optim 2023-01-13 18:31:53 +01:00
Félix David
b4197787f6 moved parents check before representation check 2023-01-13 15:21:14 +01:00
Félix David
a119b6236d cleaning 2023-01-13 15:11:11 +01:00
Félix David
9ca9b0f6f2 clean _paused_representations 2023-01-13 15:03:09 +01:00
Félix David
30e8bc5bb8 refactor is_representation_paused to check into the database 2023-01-13 14:57:44 +01:00
Petr Kalis
1bf9be8c0d Fix: (un)pause_representation doesn't work programmatically.
fix #4311
2023-01-13 14:57:28 +01:00
Petr Kalis
d3f09c075b OP-4490 - Hound 2023-01-04 15:39:13 +01:00
Petr Kalis
8527554c2d OP-4490 - fixed unnecessary checks
Configured sites were checked all the time even if they weren't used.
Now it checks only sites that are set for project.
2023-01-04 15:07:36 +01:00
Petr Kalis
e44f585aa6 OP-4490 - safer resolving if site is active 2023-01-04 15:05:36 +01:00
Petr Kalis
8ee073fd73
Merge pull request #4231 from pypeclub/bugfix/OP-4512_Anatomy-local-drive-site-roots-ignored
SiteSync: anatomy local drive site roots ignored
2022-12-22 14:23:44 +01:00
Petr Kalis
34e2ee9e7b OP-4512 - fix typo 2022-12-22 12:26:02 +01:00
Jakub Trllo
8e19d0957d use class attributes from classes instead of objects 2022-12-21 15:19:40 +01:00
Petr Kalis
19ab86499a OP-4512 - update method to get all configured sites
Added more details to be more useful.
2022-12-15 12:00:10 +01:00
Petr Kalis
0c481f8351 OP-4512 - safer resolution of enabled
If new site is added in System setting, but project settings are not saved, 'enabled' key is missing. This should be safer in this cases.
2022-12-15 11:55:14 +01:00
Jakub Trllo
a66e421fad use qtpy in module tools 2022-12-13 17:46:43 +01:00
Petr Kalis
c85594c324 OP-4512 - fix normalize local name
'local' should be returned for local site only
2022-12-13 15:06:40 +01:00
Petr Kalis
49565f34ae
Merge pull request #4049 from Tilix4/ft_auto_dl_first_workfile
Feature: Auto use last published workfile as first workfile
2022-11-15 18:12:03 +01:00
Félix David
f111fc3763 clean 2022-11-09 17:09:38 +01:00
Petr Kalis
d8c7ff2d15 small updates to docstrings 2022-11-09 12:48:52 +01:00
Petr Kalis
21833283b8 added method to check if representation has all files on site 2022-11-09 12:40:28 +01:00
Jakub Trllo
189dc17ce3 fix typo 2022-11-09 11:51:00 +01:00
Jakub Trllo
a137258b1b 'reset_timer' can reset timer via rest api endpoint 2022-11-09 11:19:32 +01:00
Jakub Trllo
0ca0173e9b added ability to rese timer from add_site 2022-11-09 11:19:15 +01:00
Jakub Trllo
50afec5222 replaced 'add_sites_to_representations' with 'reset_timer' in rest api 2022-11-09 11:19:03 +01:00
Félix David
bf6af7f717 clean 2022-11-08 19:04:03 +01:00
Félix David
255d5d8b9b clean 2022-11-08 18:59:03 +01:00
Félix David
f19c2b3a79 clean 2022-11-08 18:58:19 +01:00
Félix David
3ad8e95ca4 add priority to add_site 2022-11-08 18:57:02 +01:00
Felix David
82be7ce8d0 Change to REST API using web server 2022-11-03 18:33:54 +01:00
Jakub Trllo
0478d3ea59 use new import of interfaces 2022-11-03 16:21:58 +01:00
Felix David
c49017e671 lint 2022-11-01 10:50:30 +01:00
Félix David
ac2f268575 Feature: Auto download last published workfile as first workfile 2022-10-31 13:28:50 +01:00
Jakub Trllo
79e6de15b5 import Logger from 'openpype.lib' instead of 'openpype.api' 2022-09-28 14:49:52 +02:00
Jakub Trllo
1ff3b31d40 added cli commands for sync server 2022-08-31 14:43:10 +02:00