Commit graph

2334 commits

Author SHA1 Message Date
Jakub Jezek
aace680fa1
fusion deadline, rewriting to new instance data 2023-05-09 17:22:31 +02:00
Jakub Jezek
2cc22174a0
Merge branch 'enhancement/OP-5548_Fusion-saver-settings' into feature/OP-5548_Fusion-Deadline-and-publish 2023-05-08 14:46:32 +02:00
Jakub Jezek
b9055d61af
POC wip 2023-05-04 17:42:16 +02:00
Petr Kalis
e7aa413038
AfterEffects: add review flag to each instance (#4884)
* OP-5657 - add artist control for review in AfterEffects

Artist can disable review to be created for particular publish.

* OP-5657 - add artist control for review in AfterEffects

Removed configuration for Deadline, should be controlled by what is on instance.

* OP-5657 - handle legacy instances

Legacy instances wont't have mark_for_review in creator_attributes. Set to true as by default we always want review.

* OP-5657 - remove explicit review for all AE

Now handled directly on instance

* OP-5657 - fix - cannot remove now

Without this 'review' wont be added to tags on representation. Eventually this should be refactored.
Control on whole instance, eg. disabling review, should be enough.

* OP-5657 - fix - correct host name used

* OP-5657 - fix - correct handling of review

On local renders review should be added only from families, not from older approach through Settings.

Farm instance cannot have review in families or extract_review would get triggered even locally.

* OP-5657 - refactor - changed label

* OP-5657 - Hound

* OP-5657 - added explicitly skipping review

Instance might have set 'review' to False, which should explicitly skip review (might come from Publisher where artist can disable/enable review on an instance).

* OP-5657 - updated setting of review variable

instance.data.review == False >> explicitly set to do not create review. Keep None to let logic decide.

* OP-5657 - fix adding review flag

* OP-5657 - updated test

Removed review for second instance.

* OP-5657 - refactor to context plugin

* OP-5657 - tie thumbnail to review for local render

Produce thumbnail only when review should be created to synchronize state with farm rendering.
Move creation of thumnbail out of this plugin to general plugin to limit duplication of logic.
2023-05-04 12:16:58 +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
Roy Nieterau
b05afaa837
Global: Optimize anatomy formatting by only formatting used templates instead (#4784)
* TemplatesDict can create different type of template

* anatomy templates can be formatted on their own

* return objected templates on get item

* '_rootless_path' is public classmethod 'rootless_path_from_result'

* 'AnatomyStringTemplate' expect anatomy templates

* remove key getters

* fix typo 'create_ojected_templates' -> 'create_objected_templates'

* Fix type of argument

* Fix long line

* Optimize formatting to use single template formatting instead of formatting full anatomy

* Optimize formatting to use single template formatting instead of formatting full anatomy

* Optimize formatting to use single template formatting instead of formatting full anatomy

* Optimize formatting to use single template formatting instead of formatting full anatomy

* Optimize formatting to use single template formatting instead of formatting full anatomy

* Optimize formatting to use single template formatting instead of formatting full anatomy

* Optimize formatting to use single template formatting instead of formatting full anatomy

* Use format strict + code cosmetics

* Get template from the formatted data

* Update openpype/plugins/publish/integrate_legacy.py

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

* Cosmetics

* Move template obj definition for path up + rename to `path_template_obj`

* Refactor more cases from `anatomy.format` to template obj `.format_strict`

* Refactor more cases from `anatomy.format` to template obj `.format_strict`

* Refactor more cases from `anatomy.format` to template obj `.format_strict`

---------

Co-authored-by: Jakub Trllo <jakub.trllo@gmail.com>
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2023-04-17 14:53:15 +02:00
Milan Kolar
bbb62e8d2c
Merge pull request #4832 from tokejepsen/bugfix/OP-5566_Tile-rendering-still-not-working 2023-04-13 22:36:51 +02:00
Toke Stuart Jepsen
1663a309a6 Fix tile rendering 2023-04-12 12:06:54 +01:00
Roy Nieterau
25295c8677 Merge remote-tracking branch 'upstream/develop' into deadline_remove_framespertask
# Conflicts:
#	openpype/modules/deadline/plugins/publish/submit_max_deadline.py
2023-04-06 11:38:28 +02:00
Roy Nieterau
aaa991ac81 Merge remote-tracking branch 'upstream/develop' into deadline_remove_framespertask
# Conflicts:
#	openpype/modules/deadline/plugins/publish/submit_max_deadline.py
2023-04-06 11:36:46 +02:00
Toke Stuart Jepsen
3b680e2afa Replace hardcode with find_root_template_from_path 2023-04-04 12:58:07 +01:00
Jakub Ježek
0bd74df421
Merge branch 'develop' into feature/OP-5372_Nuke-Deadline-job-with-suspended-publishing 2023-04-04 11:56:55 +02:00
Thomas Fricard
34528b6eeb
Deactivate closed Kitsu projects on OP (#4619)
* update openpype projects status from kitsu settings

* fix linting errors

* get all projects and verify the project status for each project

* optimizing project status name verification

* sync only if project exists and is active in OP

* remove noqa

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

* break from all_status for loop and add comment for non sync projects

---------

Co-authored-by: jeremy.oblet <jeremy.oblet@fixstudio.com>
Co-authored-by: Thomas Fricard <tfricard@ws114.prs.vfx.int>
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2023-04-03 12:11:53 +02:00
Roy Nieterau
d4e79f97d0
Update openpype/modules/base.py
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2023-03-30 22:41:22 +02:00
Roy Nieterau
5b163fe84d
Apply suggestions from code review
Co-authored-by: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
2023-03-30 22:40:44 +02:00
Roy Nieterau
3fae1f8521 Just some grammar tweaks 2023-03-30 13:59:22 +02:00
Jakub Trllo
6f04af0d92
Merge branch 'develop' into enhancemen_kitsu_note_family_requirements 2023-03-29 10:57:50 +02:00
Jakub Jezek
9fbd84b0ee
nuke, dl: returning suspende_publish attribute 2023-03-27 11:36:48 +02:00
Kayla Man
3d787c3c0b Merge branch 'develop' into enhancement/OP-5227_3dsmax-render-instance-settings 2023-03-25 21:29:17 +08:00
Sharkitty
0cc5f3ee37 Changed logic as suggested 2023-03-24 15:44:29 +01:00
Jakub Trllo
de4b3e4d65
Ftrack: Hierarchical <> Non-Hierarchical attributes sync fix (#4635)
* modify action to use 'CustomAttributeValue' and fix bugs

* modify and fix event handler to push hierarchical values

* added few smaller comments

* removed unused variables
2023-03-24 15:25:49 +01:00
Jakub Ježek
2bbb91c8c9
Merge pull request #4680 from BigRoy/docs_minor_typo 2023-03-24 10:58:35 +01:00
Jakub Ježek
47f4e9ec2c
Merge pull request #4677 from ynput/feature/OP-4997_CelAction-Deadline-chunk-size 2023-03-23 14:54:45 +01:00
Jakub Jezek
f5117f4593
celaction: fixes after testing 2023-03-23 14:28:05 +01:00
Roy Nieterau
0a085c7001
Kitsu: Slightly less strict with instance data (#4678)
* Match family and families

* Allow kitsu note to not have set comment and capture it without erroring in IntegrateKitsuReview

* Allow fallback to context for instance `task`

* Shush hound

* Refactor variable names
2023-03-23 12:06:05 +01:00
Roy Nieterau
fb6c1f7f35 Fix grammar 2023-03-23 00:48:13 +01:00
Sharkitty
3af2736790 linted 2023-03-22 14:38:42 +01:00
Sharkitty
583fecd400 Fixes and adjustments based on reviews 2023-03-22 14:37:59 +01:00
Jakub Trllo
c8c31018d6
General: Filter available applications (#4667)
* added project settings for applications

* filter applications by new settings in launcher and ftrack

* disable filtering by default
2023-03-21 18:10:09 +01:00
Roy Nieterau
afd6faffc3
Update openpype/modules/deadline/plugins/publish/submit_max_deadline.py
Co-authored-by: Kayla Man <64118225+moonyuet@users.noreply.github.com>
2023-03-21 17:53:04 +01:00
Sharkitty
5ca5498b03 Changed family requirement check based on discussions 2023-03-21 17:33:50 +01:00
Sharkitty
2022a38c65 Apply suggestions from code review
Adjustment to documentation, and families set declaration

Co-authored-by: Félix David <felixg.david@gmail.com>
2023-03-21 16:34:23 +01:00
Sharkitty
83aabf4c2b Linted 2023-03-21 16:30:24 +01:00
Sharkitty
d8360b5b19 Made changes to resolve conflicts with develop. Changes how publisshed families are accessed. 2023-03-21 16:21:29 +01:00
Sharkitty
7356887df6 Renaming equality into condition, made a new screenshot so both equal and not equal settings are shown 2023-03-21 16:15:39 +01:00
Sharkitty
b467909fd6 Using lower cases for families and a small fix 2023-03-21 16:10:21 +01:00
Sharkitty
c42ce4e96c Enhancement: Adding family requirements option to kitsu note 2023-03-21 16:10:11 +01:00
Sharkitty
6f16f3e4f4
Enhancement kitsu note with exceptions (#4537)
* Enhancement: Allowing kitsu not status exceptions

* Update openpype/modules/kitsu/plugins/publish/integrate_kitsu_note.py

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

* adding equal/not equal option

* Making equal/not equal option available at for every list item

* Changed  into , renamed  into , added documentation

* Using upper cases during check, so the new settings aren't case sensitive

* Linting little detail

* Renaming Equality into Condition, new screenshot with both equal and not equal shown on it

* Update website/docs/module_kitsu.md

README adjustments

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

* Changes needed to resolve conflict

* Changing context into instance where appropriate

* Minor change to avoid changing a line that doesn't need to be changed

* Turning exceptions into conditions. Making checks positive instead of negative. Changing implementation based on suggestions.

---------

Co-authored-by: Félix David <felixg.david@gmail.com>
2023-03-21 15:22:23 +01:00
Roy Nieterau
ec9b6cb56d
Merge pull request #4596 from EmberLightVFX/kitsu-int-metadata
Kitsu: Sync OP with zou, make sure value-data is int or float
2023-03-21 14:55:06 +01:00
Milan Kolar
0504f9f364
Merge pull request #4599 from EmberLightVFX/kitsu-custom-commentfield
Kitsu custom comment template
2023-03-21 12:53:15 +01:00
Kayla Man
fc7f43c301 Merge branch 'develop' into enhancement/OP-5227_3dsmax-render-instance-settings 2023-03-21 19:24:07 +08:00
Kayla Man
a24dcd207c renaming chunksize variablesd 2023-03-21 18:53:12 +08:00
Jakub Ježek
a2f56b7921
Merge pull request #4623 from ynput/bugfix/nuke-deadline-submitter 2023-03-21 11:37:47 +01:00
Kayla Man
828f59bfb5 clean up attributes 2023-03-21 16:37:58 +08:00
Kayla Man
6bdca1561b clean up the duplicate attributes for pool settings 2023-03-21 16:00:29 +08:00
Kayla Man
6c18822364 hound fix 2023-03-21 15:56:15 +08:00
Kayla Man
d8441216e4 move the pool settings into the pool collectors 2023-03-21 15:55:07 +08:00
Kayla Man
c48fddbba3 cosmetic issue fix 2023-03-21 15:45:01 +08:00
Kayla Man
2af4c94e2c move the pool settings into the pool collectors 2023-03-21 15:43:45 +08:00
Kayla Man
fb6bc696f8 cosmetic issue fix 2023-03-20 23:54:16 +08:00