transformations (wip) - #22

Closed
LucaMarconato wants to merge 50 commits into
mainfrom
feature/transform
Closed

transformations (wip)#22
LucaMarconato wants to merge 50 commits into
mainfrom
feature/transform

Conversation

@LucaMarconato

Copy link
Copy Markdown
Member
  • io for transform
  • fixed bugs from previous pull request (appeared when running on the merfish dataset from spatialdata-sandbox)

@LucaMarconatoLucaMarconato changed the title io for transforms, fixed bugs when testing on the merfish datasettransforms and bugfixAug 17, 2022
@codecov-commenter

codecov-commenter commented Aug 17, 2022

Copy link
Copy Markdown

Codecov Report

Merging #22 (07dc775) into main (7e82f0c) will not change coverage.
The diff coverage is 0.00%.

Additional details and impacted files
@@ Coverage Diff @@## main #22 +/- ##
======================================
Coverage 0.00% 0.00% ======================================
Files 15 15 Lines 737 1343 +606 ======================================
- Misses 737 1343 +606 
FlagCoverage Δ
unittests0.00% <0.00%> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted FilesCoverage Δ
spatialdata/_core/_spatialdata.py0.00% <0.00%> (ø)
spatialdata/_core/coordinate_system.py0.00% <0.00%> (ø)
spatialdata/_core/elements.py0.00% <0.00%> (ø)
spatialdata/_core/transformations.py0.00% <0.00%> (ø)
spatialdata/_io/format.py0.00% <0.00%> (ø)
spatialdata/_io/read.py0.00% <0.00%> (ø)
spatialdata/_io/write.py0.00% <0.00%> (ø)
spatialdata/temp/bug_dask_zarr.py0.00% <0.00%> (ø)
spatialdata/temp/bug_dask_zarr_report.py0.00% <0.00%> (ø)
spatialdata/temp/load_and_view_merfish.py0.00% <ø> (ø)
... and 2 more

@giovpgiovp mentioned this pull request Aug 18, 2022
giovpand others added 5 commits August 18, 2022 16:05
* add io test
* [pre-commit.ci] pre-commit autoupdate (#13)
updates:
- [github.com/asottile/yesqa: v1.3.0 → v1.4.0](asottile/yesqa@v1.3.0...v1.4.0)
- [github.com/PyCQA/flake8: 5.0.1 → 5.0.4](PyCQA/flake8@5.0.1...5.0.4)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@kevinyamauchi

Copy link
Copy Markdown
Collaborator

@LucaMarconato , does this need review or are you still working on this? No pressure - just checking in to see if you need anything from me.

@LucaMarconato

Copy link
Copy Markdown
MemberAuthor

Hi, there is still quite some work to be done. I am going through all the examples in spatialdata-sandbox, converting to OME-NGFF, reading them into a SpatialData object and passing them to the new napari-spatialdata plugin. You can see the current status of the datasets that work by running examples/view_spatialdata.py in napari-spatialdata.

@LucaMarconato

Copy link
Copy Markdown
MemberAuthor

@giovp there are two flake8 issues in spatialdata._constants._enum.py. I am not familiar with that code, can you check it please?

@LucaMarconato

LucaMarconato commented Oct 24, 2022

Copy link
Copy Markdown
MemberAuthor

@giovp

I am working on this pr. Could you please give more details re this:

I think we want to have a way to store the transforms types and variables somewhere else, and in the class only materialize them. They could be as a schema or as a dataclass?> but basically I would avoid instantiating dictionaries in method call, and rather separate the transform implementations from the transforms specs

My idea is to actually keep the logic of the specs in the classes, since it is not just about data storage but also what each type of transformation can do, like an Identity can't have a ndim method telling the dimensionality since the specs don't specify information about that for identity transformations, but a ndim method is available for Rotation since the specs require the full matrix to be specified.

But what I would do is that I would separate how the specs dictate how to store the data (i.e. as json/dict) and the variables that are inside the classes. So for example Scale would now access in the constructor just a vector of scaling factors, not the corresponding dict that the NGFF specs describes.

@LucaMarconatoLucaMarconato changed the title transforms and bugfixenough features for applicationsNov 2, 2022
@LucaMarconatoLucaMarconato changed the title enough features for applicationstransformationsNov 2, 2022
@LucaMarconatoLucaMarconato changed the title transformationstransformations (wip)Nov 2, 2022
@LucaMarconato

Copy link
Copy Markdown
MemberAuthor

@giovp ready for review! Please see the two comments regarding your previous review.

Additional comments on the pr.

  1. When constructing a transformation one can decide to omit, or to specify, the input and/or output coordinate systems.
    1.1. By default they are None, and if the user don't specify them, there will be an error when trying to apply the transformation to points.
    1.2. If they are specified, then a validation step will be performed when trying to apply the transformation to points, whenever this is possible. For instance an error will be raised if one tries to apply an Identity/Translate/Scale/Rotation transformation between different input and output coordinate systems. Instead when applying a Affine transformation, only the dimensionality of the axes is checked, but the transformation will be considered valid both if the input->output are xy->xy and xy->yx. There is no way to know which of the two is correct, it is responsibility of the user.
    1.3. The coordinate system can be a string. This allows to specify a coordinate system by name. It will be responsibility of SpatialData to fill it with the appropriate CoordinateSystem object, otherwise an error will be raised when trying to apply the transformation to some points.
  2. The class Sequence is complex. The reason is that by design the transformations that compose a Sequence object can be declared without specifying the input/output coordinate systems. These systems can be sometimes inferred (like if we apply a scale we know that input and output axes must coincide). Other times this is not possible. Instead of just applying the sequence of transformations without checking if the inferred coordinate systems make sense, I have written a system to infer them and check them when possible, by populating the .input_coordinate_system and .output_coordinate_system realtime when applying a Sequence transformations. These changes are then reverted back when the transformation is applied. In this way we leave the object untoched but we are able to catch bugs. I will link a discussion with John regarding this topic and add it to the comments.

@ivirshup

Copy link
Copy Markdown
Member

from_dict

Point of feedback regarding from_dict, and an alternative to the big if ... else block:

Instead of doing one big block, I would have something more like:

TRANSFORMATION_REGISTRY= {
"Rotation": Rotation.from_dict,
...
}
deftransformation_from_dict(arg: dict) ->BaseTransformation:
returnTRANSFORMATION_REGISTRY[arg["type"]](arg)

This lets us keep code factored out, and allows registering more transformations as they're created.

@giovpgiovp mentioned this pull request Nov 29, 2022
@LucaMarconato

Copy link
Copy Markdown
MemberAuthor

The branch has already been merged to feature/transform_and_schema, which has been merged to main. The code review has been implemented, so no need to merge and now closing this pr.

@LucaMarconato
LucaMarconato deleted the feature/transform branch December 12, 2022 13:32
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@LucaMarconato@codecov-commenter@kevinyamauchi@ivirshup@giovp
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

transformations (wip) - #22

Closed
LucaMarconato wants to merge 50 commits into
mainfrom
feature/transform
Closed

transformations (wip)#22
LucaMarconato wants to merge 50 commits into
mainfrom
feature/transform

Conversation

@LucaMarconato

Copy link
Copy Markdown
Member
  • io for transform
  • fixed bugs from previous pull request (appeared when running on the merfish dataset from spatialdata-sandbox)

@LucaMarconatoLucaMarconato changed the title io for transforms, fixed bugs when testing on the merfish datasettransforms and bugfixAug 17, 2022
@codecov-commenter

codecov-commenter commented Aug 17, 2022

Copy link
Copy Markdown

Codecov Report

Merging #22 (07dc775) into main (7e82f0c) will not change coverage.
The diff coverage is 0.00%.

Additional details and impacted files
@@ Coverage Diff @@## main #22 +/- ##
======================================
Coverage 0.00% 0.00% ======================================
Files 15 15 Lines 737 1343 +606 ======================================
- Misses 737 1343 +606 
FlagCoverage Δ
unittests0.00% <0.00%> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted FilesCoverage Δ
spatialdata/_core/_spatialdata.py0.00% <0.00%> (ø)
spatialdata/_core/coordinate_system.py0.00% <0.00%> (ø)
spatialdata/_core/elements.py0.00% <0.00%> (ø)
spatialdata/_core/transformations.py0.00% <0.00%> (ø)
spatialdata/_io/format.py0.00% <0.00%> (ø)
spatialdata/_io/read.py0.00% <0.00%> (ø)
spatialdata/_io/write.py0.00% <0.00%> (ø)
spatialdata/temp/bug_dask_zarr.py0.00% <0.00%> (ø)
spatialdata/temp/bug_dask_zarr_report.py0.00% <0.00%> (ø)
spatialdata/temp/load_and_view_merfish.py0.00% <ø> (ø)
... and 2 more

@giovpgiovp mentioned this pull request Aug 18, 2022
giovpand others added 5 commits August 18, 2022 16:05
* add io test
* [pre-commit.ci] pre-commit autoupdate (#13)
updates:
- [github.com/asottile/yesqa: v1.3.0 → v1.4.0](asottile/yesqa@v1.3.0...v1.4.0)
- [github.com/PyCQA/flake8: 5.0.1 → 5.0.4](PyCQA/flake8@5.0.1...5.0.4)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@kevinyamauchi

Copy link
Copy Markdown
Collaborator

@LucaMarconato , does this need review or are you still working on this? No pressure - just checking in to see if you need anything from me.

@LucaMarconato

Copy link
Copy Markdown
MemberAuthor

Hi, there is still quite some work to be done. I am going through all the examples in spatialdata-sandbox, converting to OME-NGFF, reading them into a SpatialData object and passing them to the new napari-spatialdata plugin. You can see the current status of the datasets that work by running examples/view_spatialdata.py in napari-spatialdata.

@LucaMarconato

Copy link
Copy Markdown
MemberAuthor

@giovp there are two flake8 issues in spatialdata._constants._enum.py. I am not familiar with that code, can you check it please?

@LucaMarconato

LucaMarconato commented Oct 24, 2022

Copy link
Copy Markdown
MemberAuthor

@giovp

I am working on this pr. Could you please give more details re this:

I think we want to have a way to store the transforms types and variables somewhere else, and in the class only materialize them. They could be as a schema or as a dataclass?> but basically I would avoid instantiating dictionaries in method call, and rather separate the transform implementations from the transforms specs

My idea is to actually keep the logic of the specs in the classes, since it is not just about data storage but also what each type of transformation can do, like an Identity can't have a ndim method telling the dimensionality since the specs don't specify information about that for identity transformations, but a ndim method is available for Rotation since the specs require the full matrix to be specified.

But what I would do is that I would separate how the specs dictate how to store the data (i.e. as json/dict) and the variables that are inside the classes. So for example Scale would now access in the constructor just a vector of scaling factors, not the corresponding dict that the NGFF specs describes.

@LucaMarconatoLucaMarconato changed the title transforms and bugfixenough features for applicationsNov 2, 2022
@LucaMarconatoLucaMarconato changed the title enough features for applicationstransformationsNov 2, 2022
@LucaMarconatoLucaMarconato changed the title transformationstransformations (wip)Nov 2, 2022
@LucaMarconato

Copy link
Copy Markdown
MemberAuthor

@giovp ready for review! Please see the two comments regarding your previous review.

Additional comments on the pr.

  1. When constructing a transformation one can decide to omit, or to specify, the input and/or output coordinate systems.
    1.1. By default they are None, and if the user don't specify them, there will be an error when trying to apply the transformation to points.
    1.2. If they are specified, then a validation step will be performed when trying to apply the transformation to points, whenever this is possible. For instance an error will be raised if one tries to apply an Identity/Translate/Scale/Rotation transformation between different input and output coordinate systems. Instead when applying a Affine transformation, only the dimensionality of the axes is checked, but the transformation will be considered valid both if the input->output are xy->xy and xy->yx. There is no way to know which of the two is correct, it is responsibility of the user.
    1.3. The coordinate system can be a string. This allows to specify a coordinate system by name. It will be responsibility of SpatialData to fill it with the appropriate CoordinateSystem object, otherwise an error will be raised when trying to apply the transformation to some points.
  2. The class Sequence is complex. The reason is that by design the transformations that compose a Sequence object can be declared without specifying the input/output coordinate systems. These systems can be sometimes inferred (like if we apply a scale we know that input and output axes must coincide). Other times this is not possible. Instead of just applying the sequence of transformations without checking if the inferred coordinate systems make sense, I have written a system to infer them and check them when possible, by populating the .input_coordinate_system and .output_coordinate_system realtime when applying a Sequence transformations. These changes are then reverted back when the transformation is applied. In this way we leave the object untoched but we are able to catch bugs. I will link a discussion with John regarding this topic and add it to the comments.

@ivirshup

Copy link
Copy Markdown
Member

from_dict

Point of feedback regarding from_dict, and an alternative to the big if ... else block:

Instead of doing one big block, I would have something more like:

TRANSFORMATION_REGISTRY= {
"Rotation": Rotation.from_dict,
...
}
deftransformation_from_dict(arg: dict) ->BaseTransformation:
returnTRANSFORMATION_REGISTRY[arg["type"]](arg)

This lets us keep code factored out, and allows registering more transformations as they're created.

@giovpgiovp mentioned this pull request Nov 29, 2022
@LucaMarconato

Copy link
Copy Markdown
MemberAuthor

The branch has already been merged to feature/transform_and_schema, which has been merged to main. The code review has been implemented, so no need to merge and now closing this pr.

@LucaMarconato
LucaMarconato deleted the feature/transform branch December 12, 2022 13:32
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@LucaMarconato@codecov-commenter@kevinyamauchi@ivirshup@giovp
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

transformations (wip) - #22

Closed
LucaMarconato wants to merge 50 commits into
mainfrom
feature/transform
Closed

transformations (wip)#22
LucaMarconato wants to merge 50 commits into
mainfrom
feature/transform

Conversation

@LucaMarconato

Copy link
Copy Markdown
Member
  • io for transform
  • fixed bugs from previous pull request (appeared when running on the merfish dataset from spatialdata-sandbox)

@LucaMarconatoLucaMarconato changed the title io for transforms, fixed bugs when testing on the merfish datasettransforms and bugfixAug 17, 2022
@codecov-commenter

codecov-commenter commented Aug 17, 2022

Copy link
Copy Markdown

Codecov Report

Merging #22 (07dc775) into main (7e82f0c) will not change coverage.
The diff coverage is 0.00%.

Additional details and impacted files
@@ Coverage Diff @@## main #22 +/- ##
======================================
Coverage 0.00% 0.00% ======================================
Files 15 15 Lines 737 1343 +606 ======================================
- Misses 737 1343 +606 
FlagCoverage Δ
unittests0.00% <0.00%> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted FilesCoverage Δ
spatialdata/_core/_spatialdata.py0.00% <0.00%> (ø)
spatialdata/_core/coordinate_system.py0.00% <0.00%> (ø)
spatialdata/_core/elements.py0.00% <0.00%> (ø)
spatialdata/_core/transformations.py0.00% <0.00%> (ø)
spatialdata/_io/format.py0.00% <0.00%> (ø)
spatialdata/_io/read.py0.00% <0.00%> (ø)
spatialdata/_io/write.py0.00% <0.00%> (ø)
spatialdata/temp/bug_dask_zarr.py0.00% <0.00%> (ø)
spatialdata/temp/bug_dask_zarr_report.py0.00% <0.00%> (ø)
spatialdata/temp/load_and_view_merfish.py0.00% <ø> (ø)
... and 2 more

@giovpgiovp mentioned this pull request Aug 18, 2022
giovpand others added 5 commits August 18, 2022 16:05
* add io test
* [pre-commit.ci] pre-commit autoupdate (#13)
updates:
- [github.com/asottile/yesqa: v1.3.0 → v1.4.0](asottile/yesqa@v1.3.0...v1.4.0)
- [github.com/PyCQA/flake8: 5.0.1 → 5.0.4](PyCQA/flake8@5.0.1...5.0.4)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@kevinyamauchi

Copy link
Copy Markdown
Collaborator

@LucaMarconato , does this need review or are you still working on this? No pressure - just checking in to see if you need anything from me.

@LucaMarconato

Copy link
Copy Markdown
MemberAuthor

Hi, there is still quite some work to be done. I am going through all the examples in spatialdata-sandbox, converting to OME-NGFF, reading them into a SpatialData object and passing them to the new napari-spatialdata plugin. You can see the current status of the datasets that work by running examples/view_spatialdata.py in napari-spatialdata.

@LucaMarconato

Copy link
Copy Markdown
MemberAuthor

@giovp there are two flake8 issues in spatialdata._constants._enum.py. I am not familiar with that code, can you check it please?

@LucaMarconato

LucaMarconato commented Oct 24, 2022

Copy link
Copy Markdown
MemberAuthor

@giovp

I am working on this pr. Could you please give more details re this:

I think we want to have a way to store the transforms types and variables somewhere else, and in the class only materialize them. They could be as a schema or as a dataclass?> but basically I would avoid instantiating dictionaries in method call, and rather separate the transform implementations from the transforms specs

My idea is to actually keep the logic of the specs in the classes, since it is not just about data storage but also what each type of transformation can do, like an Identity can't have a ndim method telling the dimensionality since the specs don't specify information about that for identity transformations, but a ndim method is available for Rotation since the specs require the full matrix to be specified.

But what I would do is that I would separate how the specs dictate how to store the data (i.e. as json/dict) and the variables that are inside the classes. So for example Scale would now access in the constructor just a vector of scaling factors, not the corresponding dict that the NGFF specs describes.

@LucaMarconatoLucaMarconato changed the title transforms and bugfixenough features for applicationsNov 2, 2022
@LucaMarconatoLucaMarconato changed the title enough features for applicationstransformationsNov 2, 2022
@LucaMarconatoLucaMarconato changed the title transformationstransformations (wip)Nov 2, 2022
@LucaMarconato

Copy link
Copy Markdown
MemberAuthor

@giovp ready for review! Please see the two comments regarding your previous review.

Additional comments on the pr.

  1. When constructing a transformation one can decide to omit, or to specify, the input and/or output coordinate systems.
    1.1. By default they are None, and if the user don't specify them, there will be an error when trying to apply the transformation to points.
    1.2. If they are specified, then a validation step will be performed when trying to apply the transformation to points, whenever this is possible. For instance an error will be raised if one tries to apply an Identity/Translate/Scale/Rotation transformation between different input and output coordinate systems. Instead when applying a Affine transformation, only the dimensionality of the axes is checked, but the transformation will be considered valid both if the input->output are xy->xy and xy->yx. There is no way to know which of the two is correct, it is responsibility of the user.
    1.3. The coordinate system can be a string. This allows to specify a coordinate system by name. It will be responsibility of SpatialData to fill it with the appropriate CoordinateSystem object, otherwise an error will be raised when trying to apply the transformation to some points.
  2. The class Sequence is complex. The reason is that by design the transformations that compose a Sequence object can be declared without specifying the input/output coordinate systems. These systems can be sometimes inferred (like if we apply a scale we know that input and output axes must coincide). Other times this is not possible. Instead of just applying the sequence of transformations without checking if the inferred coordinate systems make sense, I have written a system to infer them and check them when possible, by populating the .input_coordinate_system and .output_coordinate_system realtime when applying a Sequence transformations. These changes are then reverted back when the transformation is applied. In this way we leave the object untoched but we are able to catch bugs. I will link a discussion with John regarding this topic and add it to the comments.

@ivirshup

Copy link
Copy Markdown
Member

from_dict

Point of feedback regarding from_dict, and an alternative to the big if ... else block:

Instead of doing one big block, I would have something more like:

TRANSFORMATION_REGISTRY= {
"Rotation": Rotation.from_dict,
...
}
deftransformation_from_dict(arg: dict) ->BaseTransformation:
returnTRANSFORMATION_REGISTRY[arg["type"]](arg)

This lets us keep code factored out, and allows registering more transformations as they're created.

@giovpgiovp mentioned this pull request Nov 29, 2022
@LucaMarconato

Copy link
Copy Markdown
MemberAuthor

The branch has already been merged to feature/transform_and_schema, which has been merged to main. The code review has been implemented, so no need to merge and now closing this pr.

@LucaMarconato
LucaMarconato deleted the feature/transform branch December 12, 2022 13:32
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@LucaMarconato@codecov-commenter@kevinyamauchi@ivirshup@giovp
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

transformations (wip) - #22

Closed
LucaMarconato wants to merge 50 commits into
mainfrom
feature/transform
Closed

transformations (wip)#22
LucaMarconato wants to merge 50 commits into
mainfrom
feature/transform

Conversation

@LucaMarconato

Copy link
Copy Markdown
Member
  • io for transform
  • fixed bugs from previous pull request (appeared when running on the merfish dataset from spatialdata-sandbox)

@LucaMarconatoLucaMarconato changed the title io for transforms, fixed bugs when testing on the merfish datasettransforms and bugfixAug 17, 2022
@codecov-commenter

codecov-commenter commented Aug 17, 2022

Copy link
Copy Markdown

Codecov Report

Merging #22 (07dc775) into main (7e82f0c) will not change coverage.
The diff coverage is 0.00%.

Additional details and impacted files
@@ Coverage Diff @@## main #22 +/- ##
======================================
Coverage 0.00% 0.00% ======================================
Files 15 15 Lines 737 1343 +606 ======================================
- Misses 737 1343 +606 
FlagCoverage Δ
unittests0.00% <0.00%> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted FilesCoverage Δ
spatialdata/_core/_spatialdata.py0.00% <0.00%> (ø)
spatialdata/_core/coordinate_system.py0.00% <0.00%> (ø)
spatialdata/_core/elements.py0.00% <0.00%> (ø)
spatialdata/_core/transformations.py0.00% <0.00%> (ø)
spatialdata/_io/format.py0.00% <0.00%> (ø)
spatialdata/_io/read.py0.00% <0.00%> (ø)
spatialdata/_io/write.py0.00% <0.00%> (ø)
spatialdata/temp/bug_dask_zarr.py0.00% <0.00%> (ø)
spatialdata/temp/bug_dask_zarr_report.py0.00% <0.00%> (ø)
spatialdata/temp/load_and_view_merfish.py0.00% <ø> (ø)
... and 2 more

@giovpgiovp mentioned this pull request Aug 18, 2022
giovpand others added 5 commits August 18, 2022 16:05
* add io test
* [pre-commit.ci] pre-commit autoupdate (#13)
updates:
- [github.com/asottile/yesqa: v1.3.0 → v1.4.0](asottile/yesqa@v1.3.0...v1.4.0)
- [github.com/PyCQA/flake8: 5.0.1 → 5.0.4](PyCQA/flake8@5.0.1...5.0.4)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@kevinyamauchi

Copy link
Copy Markdown
Collaborator

@LucaMarconato , does this need review or are you still working on this? No pressure - just checking in to see if you need anything from me.

@LucaMarconato

Copy link
Copy Markdown
MemberAuthor

Hi, there is still quite some work to be done. I am going through all the examples in spatialdata-sandbox, converting to OME-NGFF, reading them into a SpatialData object and passing them to the new napari-spatialdata plugin. You can see the current status of the datasets that work by running examples/view_spatialdata.py in napari-spatialdata.

@LucaMarconato

Copy link
Copy Markdown
MemberAuthor

@giovp there are two flake8 issues in spatialdata._constants._enum.py. I am not familiar with that code, can you check it please?

@LucaMarconato

LucaMarconato commented Oct 24, 2022

Copy link
Copy Markdown
MemberAuthor

@giovp

I am working on this pr. Could you please give more details re this:

I think we want to have a way to store the transforms types and variables somewhere else, and in the class only materialize them. They could be as a schema or as a dataclass?> but basically I would avoid instantiating dictionaries in method call, and rather separate the transform implementations from the transforms specs

My idea is to actually keep the logic of the specs in the classes, since it is not just about data storage but also what each type of transformation can do, like an Identity can't have a ndim method telling the dimensionality since the specs don't specify information about that for identity transformations, but a ndim method is available for Rotation since the specs require the full matrix to be specified.

But what I would do is that I would separate how the specs dictate how to store the data (i.e. as json/dict) and the variables that are inside the classes. So for example Scale would now access in the constructor just a vector of scaling factors, not the corresponding dict that the NGFF specs describes.

@LucaMarconatoLucaMarconato changed the title transforms and bugfixenough features for applicationsNov 2, 2022
@LucaMarconatoLucaMarconato changed the title enough features for applicationstransformationsNov 2, 2022
@LucaMarconatoLucaMarconato changed the title transformationstransformations (wip)Nov 2, 2022
@LucaMarconato

Copy link
Copy Markdown
MemberAuthor

@giovp ready for review! Please see the two comments regarding your previous review.

Additional comments on the pr.

  1. When constructing a transformation one can decide to omit, or to specify, the input and/or output coordinate systems.
    1.1. By default they are None, and if the user don't specify them, there will be an error when trying to apply the transformation to points.
    1.2. If they are specified, then a validation step will be performed when trying to apply the transformation to points, whenever this is possible. For instance an error will be raised if one tries to apply an Identity/Translate/Scale/Rotation transformation between different input and output coordinate systems. Instead when applying a Affine transformation, only the dimensionality of the axes is checked, but the transformation will be considered valid both if the input->output are xy->xy and xy->yx. There is no way to know which of the two is correct, it is responsibility of the user.
    1.3. The coordinate system can be a string. This allows to specify a coordinate system by name. It will be responsibility of SpatialData to fill it with the appropriate CoordinateSystem object, otherwise an error will be raised when trying to apply the transformation to some points.
  2. The class Sequence is complex. The reason is that by design the transformations that compose a Sequence object can be declared without specifying the input/output coordinate systems. These systems can be sometimes inferred (like if we apply a scale we know that input and output axes must coincide). Other times this is not possible. Instead of just applying the sequence of transformations without checking if the inferred coordinate systems make sense, I have written a system to infer them and check them when possible, by populating the .input_coordinate_system and .output_coordinate_system realtime when applying a Sequence transformations. These changes are then reverted back when the transformation is applied. In this way we leave the object untoched but we are able to catch bugs. I will link a discussion with John regarding this topic and add it to the comments.

@ivirshup

Copy link
Copy Markdown
Member

from_dict

Point of feedback regarding from_dict, and an alternative to the big if ... else block:

Instead of doing one big block, I would have something more like:

TRANSFORMATION_REGISTRY= {
"Rotation": Rotation.from_dict,
...
}
deftransformation_from_dict(arg: dict) ->BaseTransformation:
returnTRANSFORMATION_REGISTRY[arg["type"]](arg)

This lets us keep code factored out, and allows registering more transformations as they're created.

@giovpgiovp mentioned this pull request Nov 29, 2022
@LucaMarconato

Copy link
Copy Markdown
MemberAuthor

The branch has already been merged to feature/transform_and_schema, which has been merged to main. The code review has been implemented, so no need to merge and now closing this pr.

@LucaMarconato
LucaMarconato deleted the feature/transform branch December 12, 2022 13:32
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@LucaMarconato@codecov-commenter@kevinyamauchi@ivirshup@giovp
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

transformations (wip) - #22

Closed
LucaMarconato wants to merge 50 commits into
mainfrom
feature/transform
Closed

transformations (wip)#22
LucaMarconato wants to merge 50 commits into
mainfrom
feature/transform

Conversation

@LucaMarconato

Copy link
Copy Markdown
Member
  • io for transform
  • fixed bugs from previous pull request (appeared when running on the merfish dataset from spatialdata-sandbox)

@LucaMarconatoLucaMarconato changed the title io for transforms, fixed bugs when testing on the merfish datasettransforms and bugfixAug 17, 2022
@codecov-commenter

codecov-commenter commented Aug 17, 2022

Copy link
Copy Markdown

Codecov Report

Merging #22 (07dc775) into main (7e82f0c) will not change coverage.
The diff coverage is 0.00%.

Additional details and impacted files
@@ Coverage Diff @@## main #22 +/- ##
======================================
Coverage 0.00% 0.00% ======================================
Files 15 15 Lines 737 1343 +606 ======================================
- Misses 737 1343 +606 
FlagCoverage Δ
unittests0.00% <0.00%> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted FilesCoverage Δ
spatialdata/_core/_spatialdata.py0.00% <0.00%> (ø)
spatialdata/_core/coordinate_system.py0.00% <0.00%> (ø)
spatialdata/_core/elements.py0.00% <0.00%> (ø)
spatialdata/_core/transformations.py0.00% <0.00%> (ø)
spatialdata/_io/format.py0.00% <0.00%> (ø)
spatialdata/_io/read.py0.00% <0.00%> (ø)
spatialdata/_io/write.py0.00% <0.00%> (ø)
spatialdata/temp/bug_dask_zarr.py0.00% <0.00%> (ø)
spatialdata/temp/bug_dask_zarr_report.py0.00% <0.00%> (ø)
spatialdata/temp/load_and_view_merfish.py0.00% <ø> (ø)
... and 2 more

@giovpgiovp mentioned this pull request Aug 18, 2022
giovpand others added 5 commits August 18, 2022 16:05
* add io test
* [pre-commit.ci] pre-commit autoupdate (#13)
updates:
- [github.com/asottile/yesqa: v1.3.0 → v1.4.0](asottile/yesqa@v1.3.0...v1.4.0)
- [github.com/PyCQA/flake8: 5.0.1 → 5.0.4](PyCQA/flake8@5.0.1...5.0.4)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@kevinyamauchi

Copy link
Copy Markdown
Collaborator

@LucaMarconato , does this need review or are you still working on this? No pressure - just checking in to see if you need anything from me.

@LucaMarconato

Copy link
Copy Markdown
MemberAuthor

Hi, there is still quite some work to be done. I am going through all the examples in spatialdata-sandbox, converting to OME-NGFF, reading them into a SpatialData object and passing them to the new napari-spatialdata plugin. You can see the current status of the datasets that work by running examples/view_spatialdata.py in napari-spatialdata.

@LucaMarconato

Copy link
Copy Markdown
MemberAuthor

@giovp there are two flake8 issues in spatialdata._constants._enum.py. I am not familiar with that code, can you check it please?

@LucaMarconato

LucaMarconato commented Oct 24, 2022

Copy link
Copy Markdown
MemberAuthor

@giovp

I am working on this pr. Could you please give more details re this:

I think we want to have a way to store the transforms types and variables somewhere else, and in the class only materialize them. They could be as a schema or as a dataclass?> but basically I would avoid instantiating dictionaries in method call, and rather separate the transform implementations from the transforms specs

My idea is to actually keep the logic of the specs in the classes, since it is not just about data storage but also what each type of transformation can do, like an Identity can't have a ndim method telling the dimensionality since the specs don't specify information about that for identity transformations, but a ndim method is available for Rotation since the specs require the full matrix to be specified.

But what I would do is that I would separate how the specs dictate how to store the data (i.e. as json/dict) and the variables that are inside the classes. So for example Scale would now access in the constructor just a vector of scaling factors, not the corresponding dict that the NGFF specs describes.

@LucaMarconatoLucaMarconato changed the title transforms and bugfixenough features for applicationsNov 2, 2022
@LucaMarconatoLucaMarconato changed the title enough features for applicationstransformationsNov 2, 2022
@LucaMarconatoLucaMarconato changed the title transformationstransformations (wip)Nov 2, 2022
@LucaMarconato

Copy link
Copy Markdown
MemberAuthor

@giovp ready for review! Please see the two comments regarding your previous review.

Additional comments on the pr.

  1. When constructing a transformation one can decide to omit, or to specify, the input and/or output coordinate systems.
    1.1. By default they are None, and if the user don't specify them, there will be an error when trying to apply the transformation to points.
    1.2. If they are specified, then a validation step will be performed when trying to apply the transformation to points, whenever this is possible. For instance an error will be raised if one tries to apply an Identity/Translate/Scale/Rotation transformation between different input and output coordinate systems. Instead when applying a Affine transformation, only the dimensionality of the axes is checked, but the transformation will be considered valid both if the input->output are xy->xy and xy->yx. There is no way to know which of the two is correct, it is responsibility of the user.
    1.3. The coordinate system can be a string. This allows to specify a coordinate system by name. It will be responsibility of SpatialData to fill it with the appropriate CoordinateSystem object, otherwise an error will be raised when trying to apply the transformation to some points.
  2. The class Sequence is complex. The reason is that by design the transformations that compose a Sequence object can be declared without specifying the input/output coordinate systems. These systems can be sometimes inferred (like if we apply a scale we know that input and output axes must coincide). Other times this is not possible. Instead of just applying the sequence of transformations without checking if the inferred coordinate systems make sense, I have written a system to infer them and check them when possible, by populating the .input_coordinate_system and .output_coordinate_system realtime when applying a Sequence transformations. These changes are then reverted back when the transformation is applied. In this way we leave the object untoched but we are able to catch bugs. I will link a discussion with John regarding this topic and add it to the comments.

@ivirshup

Copy link
Copy Markdown
Member

from_dict

Point of feedback regarding from_dict, and an alternative to the big if ... else block:

Instead of doing one big block, I would have something more like:

TRANSFORMATION_REGISTRY= {
"Rotation": Rotation.from_dict,
...
}
deftransformation_from_dict(arg: dict) ->BaseTransformation:
returnTRANSFORMATION_REGISTRY[arg["type"]](arg)

This lets us keep code factored out, and allows registering more transformations as they're created.

@giovpgiovp mentioned this pull request Nov 29, 2022
@LucaMarconato

Copy link
Copy Markdown
MemberAuthor

The branch has already been merged to feature/transform_and_schema, which has been merged to main. The code review has been implemented, so no need to merge and now closing this pr.

@LucaMarconato
LucaMarconato deleted the feature/transform branch December 12, 2022 13:32
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@LucaMarconato@codecov-commenter@kevinyamauchi@ivirshup@giovp
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

transformations (wip) - #22

Closed
LucaMarconato wants to merge 50 commits into
mainfrom
feature/transform
Closed

transformations (wip)#22
LucaMarconato wants to merge 50 commits into
mainfrom
feature/transform

Conversation

@LucaMarconato

Copy link
Copy Markdown
Member
  • io for transform
  • fixed bugs from previous pull request (appeared when running on the merfish dataset from spatialdata-sandbox)

@LucaMarconatoLucaMarconato changed the title io for transforms, fixed bugs when testing on the merfish datasettransforms and bugfixAug 17, 2022
@codecov-commenter

codecov-commenter commented Aug 17, 2022

Copy link
Copy Markdown

Codecov Report

Merging #22 (07dc775) into main (7e82f0c) will not change coverage.
The diff coverage is 0.00%.

Additional details and impacted files
@@ Coverage Diff @@## main #22 +/- ##
======================================
Coverage 0.00% 0.00% ======================================
Files 15 15 Lines 737 1343 +606 ======================================
- Misses 737 1343 +606 
FlagCoverage Δ
unittests0.00% <0.00%> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted FilesCoverage Δ
spatialdata/_core/_spatialdata.py0.00% <0.00%> (ø)
spatialdata/_core/coordinate_system.py0.00% <0.00%> (ø)
spatialdata/_core/elements.py0.00% <0.00%> (ø)
spatialdata/_core/transformations.py0.00% <0.00%> (ø)
spatialdata/_io/format.py0.00% <0.00%> (ø)
spatialdata/_io/read.py0.00% <0.00%> (ø)
spatialdata/_io/write.py0.00% <0.00%> (ø)
spatialdata/temp/bug_dask_zarr.py0.00% <0.00%> (ø)
spatialdata/temp/bug_dask_zarr_report.py0.00% <0.00%> (ø)
spatialdata/temp/load_and_view_merfish.py0.00% <ø> (ø)
... and 2 more

@giovpgiovp mentioned this pull request Aug 18, 2022
giovpand others added 5 commits August 18, 2022 16:05
* add io test
* [pre-commit.ci] pre-commit autoupdate (#13)
updates:
- [github.com/asottile/yesqa: v1.3.0 → v1.4.0](asottile/yesqa@v1.3.0...v1.4.0)
- [github.com/PyCQA/flake8: 5.0.1 → 5.0.4](PyCQA/flake8@5.0.1...5.0.4)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@kevinyamauchi

Copy link
Copy Markdown
Collaborator

@LucaMarconato , does this need review or are you still working on this? No pressure - just checking in to see if you need anything from me.

@LucaMarconato

Copy link
Copy Markdown
MemberAuthor

Hi, there is still quite some work to be done. I am going through all the examples in spatialdata-sandbox, converting to OME-NGFF, reading them into a SpatialData object and passing them to the new napari-spatialdata plugin. You can see the current status of the datasets that work by running examples/view_spatialdata.py in napari-spatialdata.

@LucaMarconato

Copy link
Copy Markdown
MemberAuthor

@giovp there are two flake8 issues in spatialdata._constants._enum.py. I am not familiar with that code, can you check it please?

@LucaMarconato

LucaMarconato commented Oct 24, 2022

Copy link
Copy Markdown
MemberAuthor

@giovp

I am working on this pr. Could you please give more details re this:

I think we want to have a way to store the transforms types and variables somewhere else, and in the class only materialize them. They could be as a schema or as a dataclass?> but basically I would avoid instantiating dictionaries in method call, and rather separate the transform implementations from the transforms specs

My idea is to actually keep the logic of the specs in the classes, since it is not just about data storage but also what each type of transformation can do, like an Identity can't have a ndim method telling the dimensionality since the specs don't specify information about that for identity transformations, but a ndim method is available for Rotation since the specs require the full matrix to be specified.

But what I would do is that I would separate how the specs dictate how to store the data (i.e. as json/dict) and the variables that are inside the classes. So for example Scale would now access in the constructor just a vector of scaling factors, not the corresponding dict that the NGFF specs describes.

@LucaMarconatoLucaMarconato changed the title transforms and bugfixenough features for applicationsNov 2, 2022
@LucaMarconatoLucaMarconato changed the title enough features for applicationstransformationsNov 2, 2022
@LucaMarconatoLucaMarconato changed the title transformationstransformations (wip)Nov 2, 2022
@LucaMarconato

Copy link
Copy Markdown
MemberAuthor

@giovp ready for review! Please see the two comments regarding your previous review.

Additional comments on the pr.

  1. When constructing a transformation one can decide to omit, or to specify, the input and/or output coordinate systems.
    1.1. By default they are None, and if the user don't specify them, there will be an error when trying to apply the transformation to points.
    1.2. If they are specified, then a validation step will be performed when trying to apply the transformation to points, whenever this is possible. For instance an error will be raised if one tries to apply an Identity/Translate/Scale/Rotation transformation between different input and output coordinate systems. Instead when applying a Affine transformation, only the dimensionality of the axes is checked, but the transformation will be considered valid both if the input->output are xy->xy and xy->yx. There is no way to know which of the two is correct, it is responsibility of the user.
    1.3. The coordinate system can be a string. This allows to specify a coordinate system by name. It will be responsibility of SpatialData to fill it with the appropriate CoordinateSystem object, otherwise an error will be raised when trying to apply the transformation to some points.
  2. The class Sequence is complex. The reason is that by design the transformations that compose a Sequence object can be declared without specifying the input/output coordinate systems. These systems can be sometimes inferred (like if we apply a scale we know that input and output axes must coincide). Other times this is not possible. Instead of just applying the sequence of transformations without checking if the inferred coordinate systems make sense, I have written a system to infer them and check them when possible, by populating the .input_coordinate_system and .output_coordinate_system realtime when applying a Sequence transformations. These changes are then reverted back when the transformation is applied. In this way we leave the object untoched but we are able to catch bugs. I will link a discussion with John regarding this topic and add it to the comments.

@ivirshup

Copy link
Copy Markdown
Member

from_dict

Point of feedback regarding from_dict, and an alternative to the big if ... else block:

Instead of doing one big block, I would have something more like:

TRANSFORMATION_REGISTRY= {
"Rotation": Rotation.from_dict,
...
}
deftransformation_from_dict(arg: dict) ->BaseTransformation:
returnTRANSFORMATION_REGISTRY[arg["type"]](arg)

This lets us keep code factored out, and allows registering more transformations as they're created.

@giovpgiovp mentioned this pull request Nov 29, 2022
@LucaMarconato

Copy link
Copy Markdown
MemberAuthor

The branch has already been merged to feature/transform_and_schema, which has been merged to main. The code review has been implemented, so no need to merge and now closing this pr.

@LucaMarconato
LucaMarconato deleted the feature/transform branch December 12, 2022 13:32
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@LucaMarconato@codecov-commenter@kevinyamauchi@ivirshup@giovp
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

transformations (wip) - #22

Closed
LucaMarconato wants to merge 50 commits into
mainfrom
feature/transform
Closed

transformations (wip)#22
LucaMarconato wants to merge 50 commits into
mainfrom
feature/transform

Conversation

@LucaMarconato

Copy link
Copy Markdown
Member
  • io for transform
  • fixed bugs from previous pull request (appeared when running on the merfish dataset from spatialdata-sandbox)

@LucaMarconatoLucaMarconato changed the title io for transforms, fixed bugs when testing on the merfish datasettransforms and bugfixAug 17, 2022
@codecov-commenter

codecov-commenter commented Aug 17, 2022

Copy link
Copy Markdown

Codecov Report

Merging #22 (07dc775) into main (7e82f0c) will not change coverage.
The diff coverage is 0.00%.

Additional details and impacted files
@@ Coverage Diff @@## main #22 +/- ##
======================================
Coverage 0.00% 0.00% ======================================
Files 15 15 Lines 737 1343 +606 ======================================
- Misses 737 1343 +606 
FlagCoverage Δ
unittests0.00% <0.00%> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted FilesCoverage Δ
spatialdata/_core/_spatialdata.py0.00% <0.00%> (ø)
spatialdata/_core/coordinate_system.py0.00% <0.00%> (ø)
spatialdata/_core/elements.py0.00% <0.00%> (ø)
spatialdata/_core/transformations.py0.00% <0.00%> (ø)
spatialdata/_io/format.py0.00% <0.00%> (ø)
spatialdata/_io/read.py0.00% <0.00%> (ø)
spatialdata/_io/write.py0.00% <0.00%> (ø)
spatialdata/temp/bug_dask_zarr.py0.00% <0.00%> (ø)
spatialdata/temp/bug_dask_zarr_report.py0.00% <0.00%> (ø)
spatialdata/temp/load_and_view_merfish.py0.00% <ø> (ø)
... and 2 more

@giovpgiovp mentioned this pull request Aug 18, 2022
giovpand others added 5 commits August 18, 2022 16:05
* add io test
* [pre-commit.ci] pre-commit autoupdate (#13)
updates:
- [github.com/asottile/yesqa: v1.3.0 → v1.4.0](asottile/yesqa@v1.3.0...v1.4.0)
- [github.com/PyCQA/flake8: 5.0.1 → 5.0.4](PyCQA/flake8@5.0.1...5.0.4)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@kevinyamauchi

Copy link
Copy Markdown
Collaborator

@LucaMarconato , does this need review or are you still working on this? No pressure - just checking in to see if you need anything from me.

@LucaMarconato

Copy link
Copy Markdown
MemberAuthor

Hi, there is still quite some work to be done. I am going through all the examples in spatialdata-sandbox, converting to OME-NGFF, reading them into a SpatialData object and passing them to the new napari-spatialdata plugin. You can see the current status of the datasets that work by running examples/view_spatialdata.py in napari-spatialdata.

@LucaMarconato

Copy link
Copy Markdown
MemberAuthor

@giovp there are two flake8 issues in spatialdata._constants._enum.py. I am not familiar with that code, can you check it please?

@LucaMarconato

LucaMarconato commented Oct 24, 2022

Copy link
Copy Markdown
MemberAuthor

@giovp

I am working on this pr. Could you please give more details re this:

I think we want to have a way to store the transforms types and variables somewhere else, and in the class only materialize them. They could be as a schema or as a dataclass?> but basically I would avoid instantiating dictionaries in method call, and rather separate the transform implementations from the transforms specs

My idea is to actually keep the logic of the specs in the classes, since it is not just about data storage but also what each type of transformation can do, like an Identity can't have a ndim method telling the dimensionality since the specs don't specify information about that for identity transformations, but a ndim method is available for Rotation since the specs require the full matrix to be specified.

But what I would do is that I would separate how the specs dictate how to store the data (i.e. as json/dict) and the variables that are inside the classes. So for example Scale would now access in the constructor just a vector of scaling factors, not the corresponding dict that the NGFF specs describes.

@LucaMarconatoLucaMarconato changed the title transforms and bugfixenough features for applicationsNov 2, 2022
@LucaMarconatoLucaMarconato changed the title enough features for applicationstransformationsNov 2, 2022
@LucaMarconatoLucaMarconato changed the title transformationstransformations (wip)Nov 2, 2022
@LucaMarconato

Copy link
Copy Markdown
MemberAuthor

@giovp ready for review! Please see the two comments regarding your previous review.

Additional comments on the pr.

  1. When constructing a transformation one can decide to omit, or to specify, the input and/or output coordinate systems.
    1.1. By default they are None, and if the user don't specify them, there will be an error when trying to apply the transformation to points.
    1.2. If they are specified, then a validation step will be performed when trying to apply the transformation to points, whenever this is possible. For instance an error will be raised if one tries to apply an Identity/Translate/Scale/Rotation transformation between different input and output coordinate systems. Instead when applying a Affine transformation, only the dimensionality of the axes is checked, but the transformation will be considered valid both if the input->output are xy->xy and xy->yx. There is no way to know which of the two is correct, it is responsibility of the user.
    1.3. The coordinate system can be a string. This allows to specify a coordinate system by name. It will be responsibility of SpatialData to fill it with the appropriate CoordinateSystem object, otherwise an error will be raised when trying to apply the transformation to some points.
  2. The class Sequence is complex. The reason is that by design the transformations that compose a Sequence object can be declared without specifying the input/output coordinate systems. These systems can be sometimes inferred (like if we apply a scale we know that input and output axes must coincide). Other times this is not possible. Instead of just applying the sequence of transformations without checking if the inferred coordinate systems make sense, I have written a system to infer them and check them when possible, by populating the .input_coordinate_system and .output_coordinate_system realtime when applying a Sequence transformations. These changes are then reverted back when the transformation is applied. In this way we leave the object untoched but we are able to catch bugs. I will link a discussion with John regarding this topic and add it to the comments.

@ivirshup

Copy link
Copy Markdown
Member

from_dict

Point of feedback regarding from_dict, and an alternative to the big if ... else block:

Instead of doing one big block, I would have something more like:

TRANSFORMATION_REGISTRY= {
"Rotation": Rotation.from_dict,
...
}
deftransformation_from_dict(arg: dict) ->BaseTransformation:
returnTRANSFORMATION_REGISTRY[arg["type"]](arg)

This lets us keep code factored out, and allows registering more transformations as they're created.

@giovpgiovp mentioned this pull request Nov 29, 2022
@LucaMarconato

Copy link
Copy Markdown
MemberAuthor

The branch has already been merged to feature/transform_and_schema, which has been merged to main. The code review has been implemented, so no need to merge and now closing this pr.

@LucaMarconato
LucaMarconato deleted the feature/transform branch December 12, 2022 13:32
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@LucaMarconato@codecov-commenter@kevinyamauchi@ivirshup@giovp
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

transformations (wip) - #22

Closed
LucaMarconato wants to merge 50 commits into
mainfrom
feature/transform
Closed

transformations (wip)#22
LucaMarconato wants to merge 50 commits into
mainfrom
feature/transform

Conversation

@LucaMarconato

Copy link
Copy Markdown
Member
  • io for transform
  • fixed bugs from previous pull request (appeared when running on the merfish dataset from spatialdata-sandbox)

@LucaMarconatoLucaMarconato changed the title io for transforms, fixed bugs when testing on the merfish datasettransforms and bugfixAug 17, 2022
@codecov-commenter

codecov-commenter commented Aug 17, 2022

Copy link
Copy Markdown

Codecov Report

Merging #22 (07dc775) into main (7e82f0c) will not change coverage.
The diff coverage is 0.00%.

Additional details and impacted files
@@ Coverage Diff @@## main #22 +/- ##
======================================
Coverage 0.00% 0.00% ======================================
Files 15 15 Lines 737 1343 +606 ======================================
- Misses 737 1343 +606 
FlagCoverage Δ
unittests0.00% <0.00%> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted FilesCoverage Δ
spatialdata/_core/_spatialdata.py0.00% <0.00%> (ø)
spatialdata/_core/coordinate_system.py0.00% <0.00%> (ø)
spatialdata/_core/elements.py0.00% <0.00%> (ø)
spatialdata/_core/transformations.py0.00% <0.00%> (ø)
spatialdata/_io/format.py0.00% <0.00%> (ø)
spatialdata/_io/read.py0.00% <0.00%> (ø)
spatialdata/_io/write.py0.00% <0.00%> (ø)
spatialdata/temp/bug_dask_zarr.py0.00% <0.00%> (ø)
spatialdata/temp/bug_dask_zarr_report.py0.00% <0.00%> (ø)
spatialdata/temp/load_and_view_merfish.py0.00% <ø> (ø)
... and 2 more

@giovpgiovp mentioned this pull request Aug 18, 2022
giovpand others added 5 commits August 18, 2022 16:05
* add io test
* [pre-commit.ci] pre-commit autoupdate (#13)
updates:
- [github.com/asottile/yesqa: v1.3.0 → v1.4.0](asottile/yesqa@v1.3.0...v1.4.0)
- [github.com/PyCQA/flake8: 5.0.1 → 5.0.4](PyCQA/flake8@5.0.1...5.0.4)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@kevinyamauchi

Copy link
Copy Markdown
Collaborator

@LucaMarconato , does this need review or are you still working on this? No pressure - just checking in to see if you need anything from me.

@LucaMarconato

Copy link
Copy Markdown
MemberAuthor

Hi, there is still quite some work to be done. I am going through all the examples in spatialdata-sandbox, converting to OME-NGFF, reading them into a SpatialData object and passing them to the new napari-spatialdata plugin. You can see the current status of the datasets that work by running examples/view_spatialdata.py in napari-spatialdata.

@LucaMarconato

Copy link
Copy Markdown
MemberAuthor

@giovp there are two flake8 issues in spatialdata._constants._enum.py. I am not familiar with that code, can you check it please?

@LucaMarconato

LucaMarconato commented Oct 24, 2022

Copy link
Copy Markdown
MemberAuthor

@giovp

I am working on this pr. Could you please give more details re this:

I think we want to have a way to store the transforms types and variables somewhere else, and in the class only materialize them. They could be as a schema or as a dataclass?> but basically I would avoid instantiating dictionaries in method call, and rather separate the transform implementations from the transforms specs

My idea is to actually keep the logic of the specs in the classes, since it is not just about data storage but also what each type of transformation can do, like an Identity can't have a ndim method telling the dimensionality since the specs don't specify information about that for identity transformations, but a ndim method is available for Rotation since the specs require the full matrix to be specified.

But what I would do is that I would separate how the specs dictate how to store the data (i.e. as json/dict) and the variables that are inside the classes. So for example Scale would now access in the constructor just a vector of scaling factors, not the corresponding dict that the NGFF specs describes.

@LucaMarconatoLucaMarconato changed the title transforms and bugfixenough features for applicationsNov 2, 2022
@LucaMarconatoLucaMarconato changed the title enough features for applicationstransformationsNov 2, 2022
@LucaMarconatoLucaMarconato changed the title transformationstransformations (wip)Nov 2, 2022
@LucaMarconato

Copy link
Copy Markdown
MemberAuthor

@giovp ready for review! Please see the two comments regarding your previous review.

Additional comments on the pr.

  1. When constructing a transformation one can decide to omit, or to specify, the input and/or output coordinate systems.
    1.1. By default they are None, and if the user don't specify them, there will be an error when trying to apply the transformation to points.
    1.2. If they are specified, then a validation step will be performed when trying to apply the transformation to points, whenever this is possible. For instance an error will be raised if one tries to apply an Identity/Translate/Scale/Rotation transformation between different input and output coordinate systems. Instead when applying a Affine transformation, only the dimensionality of the axes is checked, but the transformation will be considered valid both if the input->output are xy->xy and xy->yx. There is no way to know which of the two is correct, it is responsibility of the user.
    1.3. The coordinate system can be a string. This allows to specify a coordinate system by name. It will be responsibility of SpatialData to fill it with the appropriate CoordinateSystem object, otherwise an error will be raised when trying to apply the transformation to some points.
  2. The class Sequence is complex. The reason is that by design the transformations that compose a Sequence object can be declared without specifying the input/output coordinate systems. These systems can be sometimes inferred (like if we apply a scale we know that input and output axes must coincide). Other times this is not possible. Instead of just applying the sequence of transformations without checking if the inferred coordinate systems make sense, I have written a system to infer them and check them when possible, by populating the .input_coordinate_system and .output_coordinate_system realtime when applying a Sequence transformations. These changes are then reverted back when the transformation is applied. In this way we leave the object untoched but we are able to catch bugs. I will link a discussion with John regarding this topic and add it to the comments.

@ivirshup

Copy link
Copy Markdown
Member

from_dict

Point of feedback regarding from_dict, and an alternative to the big if ... else block:

Instead of doing one big block, I would have something more like:

TRANSFORMATION_REGISTRY= {
"Rotation": Rotation.from_dict,
...
}
deftransformation_from_dict(arg: dict) ->BaseTransformation:
returnTRANSFORMATION_REGISTRY[arg["type"]](arg)

This lets us keep code factored out, and allows registering more transformations as they're created.

@giovpgiovp mentioned this pull request Nov 29, 2022
@LucaMarconato

Copy link
Copy Markdown
MemberAuthor

The branch has already been merged to feature/transform_and_schema, which has been merged to main. The code review has been implemented, so no need to merge and now closing this pr.

@LucaMarconato
LucaMarconato deleted the feature/transform branch December 12, 2022 13:32
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@LucaMarconato@codecov-commenter@kevinyamauchi@ivirshup@giovp