Skip to content
This repository has been archived by the owner on Sep 20, 2024. It is now read-only.

Colorspace Management and Distribution #4195

Merged
Show file tree
Hide file tree
Changes from 79 commits
Commits
Show all changes
114 commits
Select commit Hold shift + click to select a range
cfc6bca
global: adding imageio with ocioconfig and rules
jakubjezek001 Dec 1, 2022
a41fd6e
global: converted imageio to schema
jakubjezek001 Dec 2, 2022
4bbde9f
global: restructure imageio schema
jakubjezek001 Dec 2, 2022
0349149
Adding imageio defaults to hosts
jakubjezek001 Dec 2, 2022
dee22b0
settings: adding imageio new schemas to hosts
jakubjezek001 Dec 2, 2022
225e9d5
position of bracket
jakubjezek001 Dec 2, 2022
c9d2445
depricated configPath label to schema
jakubjezek001 Dec 2, 2022
ffcb207
updating imageio settings with deprecated label
jakubjezek001 Dec 2, 2022
0d017be
Make deprecated message standing out
jakubjezek001 Dec 2, 2022
b832470
global: colorspace modul wip
jakubjezek001 Dec 7, 2022
a426d38
udating poetry dependencies [opencolorio]
jakubjezek001 Dec 8, 2022
63cd1d1
global: colorspace modul in progress
jakubjezek001 Dec 8, 2022
b87d4e5
global: finishing colorspace module
jakubjezek001 Dec 8, 2022
79b301e
global: adding colorspace to pipeline init
jakubjezek001 Dec 8, 2022
a489641
global: improving name clarity for colorspace
jakubjezek001 Dec 8, 2022
815fa7a
Merge branch 'release/3.15.x' into feature/OP-4404_color-v3-Settings-…
jakubjezek001 Dec 8, 2022
24cacbe
Merge branch 'release/3.15.x' into feature/OP-2479_color-v3-Colorspac…
jakubjezek001 Dec 8, 2022
c9391f5
Merge branch 'feature/OP-2479_color-v3-Colorspace-management-and-dist…
jakubjezek001 Dec 8, 2022
d499ceb
global: fine tuning colorspace after testing
jakubjezek001 Dec 8, 2022
cd10b7d
Merge pull request #4158 from pypeclub/feature/OP-4404_color-v3-Setti…
jakubjezek001 Dec 12, 2022
61ef42f
Merge branch 'release/3.15.x' into feature/OP-2479_color-v3-Colorspac…
jakubjezek001 Dec 20, 2022
317f1f1
Merge branch 'feature/OP-2479_color-v3-Colorspace-management-and-dist…
jakubjezek001 Dec 20, 2022
2239842
Merge branch 'release/3.15.x' into feature/OP-4406_color-v3-global-co…
jakubjezek001 Dec 23, 2022
0c19c0e
Global: adding colorspace context collector
jakubjezek001 Dec 23, 2022
af761d6
global: updating function to accept config and file rules as inputs
jakubjezek001 Dec 23, 2022
db767d5
global: adding colorspace exctrator
jakubjezek001 Dec 23, 2022
12153b0
global: updating colorspace data exctractor
jakubjezek001 Dec 23, 2022
d1ec029
fixing poetry.lock
jakubjezek001 Dec 23, 2022
39c55f4
globa: update colorspace data exctractor
jakubjezek001 Dec 23, 2022
9259692
Global: abstracting colorspace func to own publish exctractor class
jakubjezek001 Dec 29, 2022
5a5b662
global: use full name of context
jakubjezek001 Dec 29, 2022
598a0a2
global: removing legacy_io references
jakubjezek001 Dec 29, 2022
2a99075
Nuke: refactory local render exctractor to new colormanaged class
jakubjezek001 Dec 29, 2022
35f907c
global: rename host to host_name
jakubjezek001 Dec 29, 2022
855bf4d
global: integrating colorspace data
jakubjezek001 Dec 29, 2022
3b68eb0
global | nuke: fixing input kwargs
jakubjezek001 Dec 29, 2022
b9e91ba
global: bypass if colorspace is known from host
jakubjezek001 Dec 29, 2022
0861f87
nuke: set colorspace directly form node
jakubjezek001 Dec 29, 2022
e2b3bcd
global: rename typo on function name
jakubjezek001 Dec 30, 2022
efcb5c4
global: making colorspace module compatible to all python versions
jakubjezek001 Dec 30, 2022
e54d13c
global: validator should return True
jakubjezek001 Dec 30, 2022
1cc1d2c
Merge branch 'release/3.15.x' into feature/OP-2479_color-v3-Colorspac…
jakubjezek001 Dec 30, 2022
8848c77
Merge branch 'feature/OP-2479_color-v3-Colorspace-management-and-dist…
jakubjezek001 Dec 30, 2022
5c61297
global: adding parse colorspace func to colorspace
jakubjezek001 Dec 30, 2022
56aca63
testing: adding basic colorspace testing
jakubjezek001 Dec 30, 2022
7fd2242
Update openpype/pipeline/colorspace.py
jakubjezek001 Dec 30, 2022
05488bd
global: colorspace rename function
jakubjezek001 Dec 30, 2022
f350d6b
Merge remote-tracking branch 'origin/feature/OP-4406_color-v3-global-…
jakubjezek001 Dec 30, 2022
04d12cf
global: ocio script simplification
jakubjezek001 Dec 30, 2022
da6e4c3
global: getting config views data
jakubjezek001 Dec 30, 2022
72cb5ae
testing: pipeline colorspace get views
jakubjezek001 Dec 30, 2022
05a11f6
Bumped log higher
kalisp Jan 3, 2023
8cbc9c2
Handle download from Gdrive for big zip files
kalisp Jan 3, 2023
e36b441
testing: improving colorspace
jakubjezek001 Jan 3, 2023
4d24aa6
testing: colorspace legacy_io to fixture
jakubjezek001 Jan 3, 2023
03195cb
global: colorspace subprocess only if py2
jakubjezek001 Jan 3, 2023
f40495e
testing: colorspace test file rules
jakubjezek001 Jan 3, 2023
e8af855
global: better fail log
jakubjezek001 Jan 3, 2023
ff9edbd
testing: improving test module unit test class
jakubjezek001 Jan 3, 2023
7e73aba
Move setting of project root to dbcon fixture
kalisp Jan 4, 2023
360ff07
testing: remove enlighten module since it was buggy
jakubjezek001 Jan 4, 2023
4518d57
testing: colorspace update
jakubjezek001 Jan 4, 2023
233808f
testing: fixing relation of fixture
jakubjezek001 Jan 4, 2023
14b52ac
testing: colorspace legacy_io fixture
jakubjezek001 Jan 4, 2023
ed89581
suggestions from PR
jakubjezek001 Jan 4, 2023
e27e8a6
scripts: ocio wrapper docstrings and rename
jakubjezek001 Jan 4, 2023
c87b147
testing: removing prints form colorspace tests
jakubjezek001 Jan 4, 2023
b361bcb
global: adding docstrings and optimization of code
jakubjezek001 Jan 4, 2023
a429352
testing: abstracting legacy_io fixture to lib for other pipeline tests
jakubjezek001 Jan 4, 2023
70b2df5
testing: adding publish plugins tests
jakubjezek001 Jan 4, 2023
b084b70
global: change configPath to configData
jakubjezek001 Jan 5, 2023
f2a9169
testing: publish plugins finalisation
jakubjezek001 Jan 5, 2023
e13a997
testing: updating to new gdrive data
jakubjezek001 Jan 5, 2023
7146e8d
:pencil2: fix typos
antirotor Jan 6, 2023
f912699
Update openpype/scripts/ocio_wrapper.py
jakubjezek001 Jan 10, 2023
de6e537
nuke: removing obsolete todo comment
jakubjezek001 Jan 10, 2023
75840e3
Merge remote-tracking branch 'ynput/feature/OP-4406_color-v3-global-c…
jakubjezek001 Jan 10, 2023
36b3ccd
Merge pull request #4270 from ynput/feature/OP-4406_color-v3-global-c…
jakubjezek001 Jan 10, 2023
14baff2
Merge branch 'release/3.15.x' into feature/OP-2479_color-v3-Colorspac…
jakubjezek001 Jan 10, 2023
5305652
imageio: admin documentation
jakubjezek001 Jan 10, 2023
f191c33
Global: adding more docstrings and README
jakubjezek001 Jan 10, 2023
344837f
Update website/docs/project_settings/settings_project_global.md
jakubjezek001 Jan 11, 2023
7854249
Update website/docs/project_settings/settings_project_global.md
jakubjezek001 Jan 11, 2023
7abfe83
Update website/docs/project_settings/settings_project_global.md
jakubjezek001 Jan 11, 2023
60b5826
Update website/docs/project_settings/settings_project_global.md
jakubjezek001 Jan 11, 2023
9d21009
Update openpype/pipeline/publish/publish_plugins.py
jakubjezek001 Jan 11, 2023
84806f1
Merge branch 'bugfix/harmony_docs' into feature/OP-2479_color-v3-Colo…
jakubjezek001 Jan 11, 2023
e1ac21a
updating documentation
jakubjezek001 Jan 11, 2023
da50070
global: reworking config path settings to be multipath with order
jakubjezek001 Jan 11, 2023
f8aa3fd
global: making sure `platform` key is available for template formatting.
jakubjezek001 Jan 11, 2023
2cf862e
documentation: updating colorspace
jakubjezek001 Jan 11, 2023
5cab4d0
global: simplification of ExctractorColormanaged
jakubjezek001 Jan 11, 2023
54f04dd
testing: refactor set_representation_colorspace to address new inputs
jakubjezek001 Jan 11, 2023
29d51b0
testing: updating test data to colorspace
jakubjezek001 Jan 13, 2023
e75a621
Update openpype/pipeline/publish/publish_plugins.py
jakubjezek001 Jan 16, 2023
4a14b03
Update openpype/pipeline/colorspace.py
jakubjezek001 Jan 16, 2023
4abd631
Update website/docs/dev_colorspace.md
jakubjezek001 Jan 16, 2023
ad43d12
Update website/docs/dev_colorspace.md
jakubjezek001 Jan 16, 2023
dc36776
Update website/docs/dev_colorspace.md
jakubjezek001 Jan 16, 2023
c61a453
Update website/docs/dev_colorspace.md
jakubjezek001 Jan 16, 2023
f983bbc
Update website/docs/dev_colorspace.md
jakubjezek001 Jan 16, 2023
6803474
Update website/docs/dev_colorspace.md
jakubjezek001 Jan 16, 2023
4e0d913
Update website/docs/dev_colorspace.md
jakubjezek001 Jan 16, 2023
78b0e70
global: `configData` rename to `config`
jakubjezek001 Jan 17, 2023
3d4d63b
flake8 fixes
jakubjezek001 Jan 17, 2023
f32d286
nuke: implementing new ocio config schema
jakubjezek001 Jan 18, 2023
ab5b83a
global: prep formatting data outside of loop
jakubjezek001 Jan 18, 2023
133c6aa
Update openpype/pipeline/colorspace.py
jakubjezek001 Jan 18, 2023
5ef8b40
global: improve docs strings
jakubjezek001 Jan 18, 2023
80e94e0
global: removing printing
jakubjezek001 Jan 18, 2023
029e891
global: privatisation of functions
jakubjezek001 Jan 18, 2023
71e347d
Merge branch 'release/3.15.x' into feature/OP-2479_color-v3-Colorspac…
jakubjezek001 Jan 18, 2023
5409c3e
updating poetrylock and pyproject
jakubjezek001 Jan 18, 2023
4509119
Merge branch 'release/3.15.x' into feature/OP-2479_color-v3-Colorspac…
jakubjezek001 Jan 19, 2023
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
12 changes: 5 additions & 7 deletions common/openpype_common/distribution/file_handler.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import enlighten
import os
import re
import urllib
Expand Down Expand Up @@ -252,22 +251,21 @@ def _get_confirm_token(response):
if key.startswith('download_warning'):
return value

# handle antivirus warning for big zips
found = re.search("(confirm=)([^&.+])", response.text)
if found:
return found.groups()[1]

return None

@staticmethod
def _save_response_content(
response_gen, destination,
):
with open(destination, "wb") as f:
pbar = enlighten.Counter(
total=None, desc="Save content", units="%", color="green")
progress = 0
for chunk in response_gen:
if chunk: # filter out keep-alive new chunks
f.write(chunk)
progress += len(chunk)

pbar.close()

@staticmethod
def _quota_exceeded(first_chunk):
Expand Down
16 changes: 14 additions & 2 deletions openpype/hosts/nuke/plugins/publish/extract_render_local.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
from openpype.pipeline import publish


class NukeRenderLocal(publish.Extractor):
# TODO: rewrite docstring to nuke
class NukeRenderLocal(publish.ExtractorColormanaged):
"""Render the current Nuke composition locally.

Extract the result of savers by starting a comp render
Expand All @@ -22,6 +21,10 @@ class NukeRenderLocal(publish.Extractor):
families = ["render.local", "prerender.local", "still.local"]

def process(self, instance):
# get colorspace settings data
config_data, file_rules = self.get_colorspace_settings(
instance.context)

families = instance.data["families"]

node = None
Expand Down Expand Up @@ -67,6 +70,7 @@ def process(self, instance):
)

ext = node["file_type"].value()
colorspace = node["colorspace"].value()

if "representations" not in instance.data:
instance.data["representations"] = []
Expand All @@ -90,6 +94,14 @@ def process(self, instance):
'files': filenames,
"stagingDir": out_dir
}

# inject colorspace data
self.set_representation_colorspace(
repre, instance.context,
config_data, file_rules,
colorspace=colorspace
)

instance.data["representations"].append(repre)

self.log.info("Extracted instance '{0}' to: {1}".format(
Expand Down
Loading