Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Submit AYON_SERVER_URL to jobs #42

Merged
merged 26 commits into from
Oct 30, 2024
Merged

Submit AYON_SERVER_URL to jobs #42

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
c5e67f3
Submit along `AYON_SERVER_URL` with deadline jobs
BigRoy Oct 7, 2024
e0009e8
Merge branch 'develop' into enhancement/submit_ayon_server_url
BigRoy Oct 7, 2024
d718648
Merge branch 'develop' of https://github.com/ynput/ayon-deadline into…
BigRoy Oct 8, 2024
cffab6b
Remove incorrect file docstring
BigRoy Oct 8, 2024
4ce6250
Submit along `AYON_API_KEY`
BigRoy Oct 8, 2024
b17af4b
Merge branch 'enhancement/submit_ayon_server_url' of https://github.c…
BigRoy Oct 8, 2024
5737d4a
Expose plug-in in settings
BigRoy Oct 8, 2024
d1cf912
Submit optional state (mostly for inherited `CollectAYONServerUrlToFa…
BigRoy Oct 9, 2024
4a57ffd
Fix label for optional field
kalisp Oct 9, 2024
86b4900
Removed TODO as already implemented
kalisp Oct 9, 2024
65d82a1
The applying of `AYON_USE_DEV` should already be solved on the farm t…
BigRoy Oct 10, 2024
08fa08f
Set AYON API key from settings
BigRoy Oct 10, 2024
4b21b44
Merge branch 'enhancement/submit_ayon_server_url' of https://github.c…
BigRoy Oct 10, 2024
47d8512
Cosmetics
BigRoy Oct 10, 2024
bc36531
Remove optional/active settings - because it should not be optional +…
BigRoy Oct 11, 2024
67667b6
Update default
BigRoy Oct 11, 2024
741209c
Merge branch 'develop' into enhancement/submit_ayon_server_url
BigRoy Oct 19, 2024
9c6ab87
Move the passing of the AYON_API_KEY to Deadline Repository AYON Plug…
BigRoy Oct 19, 2024
bc5c8d2
Remove plug-in that was moved into other file
BigRoy Oct 19, 2024
02982d5
Cosmetics
BigRoy Oct 19, 2024
7816fce
Remove non-existing default
BigRoy Oct 19, 2024
91e6f92
Update client/ayon_deadline/repository/custom/plugins/GlobalJobPreLoa…
BigRoy Oct 23, 2024
a10e7a3
Merge branch 'develop' into enhancement/submit_ayon_server_url
BigRoy Oct 23, 2024
4bd2db0
Merge branch 'develop' into enhancement/submit_ayon_server_url
MustafaJafar Oct 23, 2024
8642e66
Added casting to list
kalisp Oct 29, 2024
cedf5d6
Merge branch 'develop' into enhancement/submit_ayon_server_url
kalisp Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions client/ayon_deadline/plugins/publish/global/collect_deadline_job_env_vars.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,13 @@ class CollectDeadlineNukeJobEnvVars(CollectDeadlineJobEnvVars):
"PYTHONPATH",
"PATH",
]


class CollectAYONServerUrlToFarmJob(CollectDeadlineJobEnvVars):
label = "Submit AYON server URL to farm job"

# TODO: Expose the enabled/optional state to settings
ENV_KEYS = [
"AYON_SERVER_URL",
"AYON_USE_DEV",
BigRoy marked this conversation as resolved.
Show resolved Hide resolved
]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want send AYON_SERVER_URL always? If thats the case, server url in AYON Deadline plugin doesn't make sense, neither code for it in GlobalJobPreload.

(Just note, API keys for all DL servers would need to be same as they would be still set via AYON DL plugin.)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want send AYON_SERVER_URL always? If thats the case, server url in AYON Deadline plugin doesn't make sense, neither code for it in GlobalJobPreload.

No - I think we'd want to make this plug-in disabled by default, and configurable via settings to enable it.

(Just note, API keys for all DL servers would need to be same as they would be still set via AYON DL plugin.)

Sir - that's a very valid point. We may need to submit that along too. @tweak-wtf, thoughts?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh sheet, true! thanks for catching!
i really like what's described in ynput/ayon-documentation#285
seems like minimal impact on the existing addon codebase and on the additional AYON instances settings.

if we want to expand on that and the n:n idea between AYON and DL, i could imagine the AYON Deadline Plugin Settings getting either a new section Additional AYON Servers or a general list of dicts kinda like the current AYON server settings for the DL servers.
then submitting the current AYON URL could become enabled by default. whether that's desirable, i can't really say.

for me using AYON_API_KEY in ayon+settings://core/environments as an override in that instance's settings really does the trick.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How does that work, with the AYON_API_KEY in settings? When GlobalJobPreLoad triggers the connection with the AYON server - it already needs a valid API key to make the connection? Seems like for you it may just happen to work because it maybe found some matching 'login' using your local cached login?

3 changes: 2 additions & 1 deletion client/ayon_deadline/plugins/publish/maya/submit_maya_deadline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
targets = ["local"]
settings_category = "deadline"

tile_assembler_plugin = "OpenPypeTileAssembler"
tile_assembler_plugin = "DraftTileAssembler"
priority = 50
tile_priority = 50
limit = [] # limit groups
Expand Down Expand Up @@ -794,6 +794,7 @@ def get_attribute_defs(cls):

return defs


def _format_tiles(
filename,
index,
Expand Down
Binary file removed ...t/ayon_deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.ico
View file
Open in desktop
Binary file not shown.
35 changes: 0 additions & 35 deletions ...on_deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.options
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions ...ayon_deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.param
View file
Open in desktop

This file was deleted.

Loading