Commit graph

252 commits

Author SHA1 Message Date
Ondřej Samohel
f321c55f80
Merge pull request #5588 from BigRoy/chore/remove_unused_variables_and_cleanup 2023-09-07 18:41:51 +02:00
Roy Nieterau
ba6dfc5ead Remove unused variables + tweak logs 2023-09-06 23:28:39 +02:00
Roy Nieterau
f954c87702 Refactor usage of deprecated self.fname to new style 2023-09-06 22:17:56 +02:00
Jakub Trllo
3ae020f064
Applications: Launch hooks cleanup (#5395)
* 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

* use set instead of list

* removed '__init__' from celaction hooks

* use 'CELACTION_ROOT_DIR' in pre setup

* use full import from applications
2023-08-03 12:24:23 +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
Simone Barbieri
225cbd2ffe Minor changes to FBX camera extractor to improve clarity 2023-07-24 14:49:50 +01:00
Simone Barbieri
3f47ab0fb6 Moved camera abc extraction to separate class 2023-07-24 14:46:10 +01:00
Simone Barbieri
1ceda4712a Added support for camera in abc extractor 2023-07-24 14:28:49 +01:00
Simone Barbieri
e9cd50b1cf
Merge pull request #5338 from ynput/enhancement/OP-4483_blender-configurable_startup_resolution_and_frames 2023-07-24 10:52:53 +01:00
Simone Barbieri
99099b81e0 Added menu entries to set resolution and frame range 2023-07-24 10:47:03 +01:00
Simone Barbieri
ccd56c4bb5 Improved code based on suggestions 2023-07-24 09:42:50 +01:00
Simone Barbieri
66e2820063 ExtractBurning for Blender reviews 2023-07-21 16:46:47 +01:00
Simone Barbieri
27d3edb89a Make configurable to set resolution and start/end frames at startup 2023-07-21 15:51:57 +01:00
Simone Barbieri
266f2308ef Increment workfile version when publishing blendScene 2023-07-14 15:46:46 +01:00
Simone Barbieri
aaafb9ccf2 Added blendScene family 2023-07-14 12:05:49 +01:00
Simone Barbieri
585df83135 Apply parenting fix to other families as well 2023-07-14 11:28:36 +01:00
Simone Barbieri
18324615d5 Fix parenting if creating an instance while selecting a whole hierarchy 2023-07-14 10:14:57 +01:00
Simone Barbieri
4faeea5b30 Hound fixes 2023-07-13 16:53:09 +01:00
Simone Barbieri
8732a684fa Merge branch 'develop' into feature/blender-blend_file_family 2023-07-13 16:49:56 +01:00
Simone Barbieri
a80685c7f0 Update the members of parent containers as well 2023-07-13 16:43:57 +01:00
Jakub Ježek
a49b4265c6
Merge pull request #5291 from ynput/release/next-minor 2023-07-13 15:43:02 +03:00
Simone Barbieri
3d21df1fc5 Avoid remove and update to delete new data
This commit avoids that when updating or removing an asset, all new data, such as animations (actions), are removed.
2023-07-13 13:41:17 +01:00
Jakub Trllo
9e5720953f fix loader filepath access 2023-07-11 18:13:51 +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
Laroustine
c9dec84c37 [ADD] Load QApplication on register for Blender 2023-07-07 16:49:21 +02:00
Roy Nieterau
2b23b42da6
RepairAction and SelectInvalidAction actually filter to instances that failed on the exact plugin - not on "any failure" (#5240) 2023-07-05 14:11:20 +02:00
Simone Barbieri
39d2159ed4
Blender: Add support for custom path for app templates (#5137)
* Add support for custom path for app templates

* Use same env variable as scripts and assure correct path exist
2023-06-22 11:57:23 +02:00
Simone Barbieri
30032214f6 Added support for camera 2023-06-16 15:52:38 +01:00
Simone Barbieri
e41621875f Removed old loaders and redundant plugins 2023-06-16 15:32:55 +01:00
Simone Barbieri
d6aabc93dd Added support for layouts in new blend loader 2023-06-16 15:29:09 +01:00
Simone Barbieri
1fe5cb0e0c Implemented update and remove 2023-06-16 10:28:11 +01:00
Simone Barbieri
b0f42ae6cf Remove library after loading 2023-06-15 16:50:51 +01:00
Simone Barbieri
1e3e63aaec Implemented loader for blend representations 2023-06-15 16:41:10 +01:00
Simone Barbieri
1fd81887ce Merge branch 'develop' into feature/blender-blend_file_family 2023-06-15 09:50:02 +01:00
Simone Barbieri
722f227ebb
Merge pull request #4905 from Tilix4/feature/blender_python_launch_script 2023-06-01 15:58:50 +01:00
Milan Kolar
a068bd9b05
Merge pull request #4990 from ynput/feature/OP-5915_blender_load-abc-camera 2023-05-29 23:34:24 +02:00
Milan Kolar
3e316dd495
Merge pull request #4987 from ynput/enhancement/OP-5918_blender-add_base_file_unit_scale_in_settings 2023-05-29 23:33:00 +02:00
Felix David
dc7373408f continue if not python script path 2023-05-22 10:39:30 +02:00
Félix David
2e7b0b9d95 fix raise 2023-05-19 18:20:03 +02:00
Simone Barbieri
ec7c172fb2 Implement loading of abc camera 2023-05-18 15:26:12 +01:00
Simone Barbieri
0d4ae4efa7 Added message if base scale has been changed when opening a file 2023-05-18 10:38:22 +01:00
Simone Barbieri
d95299a31b Added settings to make optional the setting the unit scale 2023-05-18 10:37:38 +01:00
Simone Barbieri
3350e0995f Set base unit scale when opening a file or creating a new one 2023-05-17 15:47:38 +01:00
Simone Barbieri
d39fe87092 Fix abc loading in Blender 2023-05-17 14:58:10 +01:00
Félix David
52ad442a9c lint 2023-05-10 10:10:12 +02:00
Félix David
6252e4b6c5 skipping if python script doesn't exist 2023-05-10 10:07:12 +02:00
Félix David
4fe7ce64a2 changes from comments 2023-04-26 14:05:39 +02:00
Félix David
610a65420d remove useless settings 2023-04-26 14:02:18 +02:00
Félix David
6de1710810 clean Path 2023-04-26 12:53:20 +02:00