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

Jump to bottom

Remove multi-context restrictions for publishing image sequences on farm #42

Closed
wants to merge 6 commits into from
+7 −17
Closed

Remove multi-context restrictions for publishing image sequences on farm #42

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
02f74d2
:fire: remove restriction
antirotor Dec 22, 2023
2cac10a
Merge branch 'develop' into enhancement/remove-multicontext-restriction
antirotor Dec 22, 2023
4d26961
Merge branch 'develop' into enhancement/remove-multicontext-restriction
antirotor Feb 8, 2024
8265180
Add submodule
tokejepsen Feb 13, 2024
7b6b6e4
Add fonts
tokejepsen Feb 13, 2024
49dd6d2
Merge branch 'develop' into enhancement/remove-multicontext-restriction
tokejepsen Feb 13, 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
24 changes: 7 additions & 17 deletions client/ayon_core/plugins/publish/collect_rendered_files.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,23 +75,13 @@ def _process_path(self, data, anatomy):
"job", "instances", "version"]
assert all(elem in data.keys() for elem in required), data_err

# set context by first json file
ctx = self._context.data

ctx["asset"] = ctx.get("asset") or data.get("asset")
ctx["intent"] = ctx.get("intent") or data.get("intent")
ctx["comment"] = ctx.get("comment") or data.get("comment")
ctx["user"] = ctx.get("user") or data.get("user")
ctx["version"] = ctx.get("version") or data.get("version")

# basic sanity check to see if we are working in same context
# if some other json file has different context, bail out.
ctx_err = "inconsistent contexts in json files - %s"
assert ctx.get("asset") == data.get("asset"), ctx_err % "asset"
assert ctx.get("intent") == data.get("intent"), ctx_err % "intent"
assert ctx.get("comment") == data.get("comment"), ctx_err % "comment"
assert ctx.get("user") == data.get("user"), ctx_err % "user"
assert ctx.get("version") == data.get("version"), ctx_err % "version"
Comment on lines -78 to -94
Copy link
Collaborator

Choose a reason for hiding this comment

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

Technically - when is this is valid. If I have two .json files that specify a different running context to publish in this may be very dangerous because now suddenly that context isn't actually used for ONE of the json files?

I think, yes we should not assert that instance context must MATCH the gloibal context - but if we were to load multiple JSON files at once we should still assert the global context of both JSON files is shared between them.

Copy link
Member Author

Choose a reason for hiding this comment

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

@BigRoy this is just a port. Could you comment on the original PR; ynput/OpenPype#6088 ?

# ftrack credentials are passed as environment variables by Deadline
# to publish job, but Muster doesn't pass them.
if data.get("ftrack") and not os.environ.get("FTRACK_API_USER"):
ftrack = data.get("ftrack")
os.environ["FTRACK_API_USER"] = ftrack["FTRACK_API_USER"]
os.environ["FTRACK_API_KEY"] = ftrack["FTRACK_API_KEY"]
os.environ["FTRACK_SERVER"] = ftrack["FTRACK_SERVER"]

# now we can just add instances from json file and we are done
any_staging_dir_persistent = False
Expand Down
Loading