mypy implementation for adapters in tiled #700
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Protocols that we should write up together:
|
skarakuzu
force-pushed
the
mypy_for_tiled
branch
2 times, most recently
from
e317207 to
03b2408
Compare
tiled/adapters/array.py
Outdated
| ): | ||
| metadata: Optional[JSON] = None, | ||
| specs: Optional[List[Spec]] = None, | ||
| access_policy: Optional[Union[SimpleAccessPolicy, DummyAccessPolicy]] = None, |
There was a problem hiding this comment.
I think this is a good place to use the AccessPolicy protocol. Same for everywhere else this is used.
tiled/adapters/array.py
Outdated
| array = self._array | ||
| if slice is not None: | ||
| array = array[slice] | ||
| array = array[slice] |
There was a problem hiding this comment.
Might as well combine this into a single statement.
tiled/adapters/array.py
Outdated
| def read( | ||
| self, | ||
| slice: Union[ | ||
| int, slice, Tuple[Union[int, slice, EllipsisType], ...], EllipsisType |
There was a problem hiding this comment.
I seems worthwhile to make a "type alias" for this, like you did for JSON. I suggest the name NDSlice.
tiled/adapters/array.py
Outdated
| def slice_and_shape_from_block_and_chunks(block, chunks): | ||
| def slice_and_shape_from_block_and_chunks( | ||
| block: Tuple[int, ...], chunks: Tuple[Tuple[int, ...], ...] | ||
| ) -> Tuple[Tuple[slice, ...], Tuple[int, ...]]: |
There was a problem hiding this comment.
Suggested change
| ) -> Tuple[Tuple[slice, ...], Tuple[int, ...]]: | |
| ) -> Tuple[NDSlice, Tuple[int, ...]]: |
tiled/adapters/awkward.py
Outdated
| return self._metadata | ||
|
|
||
| def read_buffers(self, form_keys=None): | ||
| def read_buffers(self, form_keys: Optional[List[str]] = None) -> Dict[str, Any]: |
There was a problem hiding this comment.
Suggested change
| def read_buffers(self, form_keys: Optional[List[str]] = None) -> Dict[str, Any]: | |
| def read_buffers(self, form_keys: Optional[List[str]] = None) -> Dict[str, bytes]: |
| if len(self.blocks) > 1: | ||
| raise NotImplementedError | ||
| uri = self.blocks[(0,) * len(self._structure.shape)] | ||
| data.to_parquet(path_from_uri(uri)) | ||
|
|
||
| def read(self, slice=...): | ||
| def read(self, slice: Optional[Union[int, slice]]) -> NDArray[Any]: |
There was a problem hiding this comment.
Suggested change
| def read(self, slice: Optional[Union[int, slice]]) -> NDArray[Any]: | |
| def read(self, slice: Optional[Union[int, slice]]) -> sparse.COO: |
tiled/adapters/tiff.py
Outdated
| @@ -22,13 +26,23 @@ class TiffAdapter: | |||
|
|
|||
| def __init__( | |||
| self, | |||
| data_uri, | |||
| data_uri: Union[str, List[str]], | |||
There was a problem hiding this comment.
Suggested change
| data_uri: Union[str, List[str]], | |
| data_uri: str, |
tiled/adapters/zarr.py
Outdated
|
|
||
| INLINED_DEPTH = int(os.getenv("TILED_HDF5_INLINED_CONTENTS_MAX_DEPTH", "7")) | ||
|
|
||
|
|
||
| def read_zarr(data_uri, structure=None, **kwargs): | ||
| def read_zarr( | ||
| data_uri: Union[str, List[str]], |
There was a problem hiding this comment.
Suggested change
| data_uri: Union[str, List[str]], | |
| data_uri: str, |
tiled/adapters/sparse.py
Outdated
| def read_block(self, block, slice=None): | ||
| def read_block( | ||
| self, block: Tuple[int, ...], slice: Optional[Union[int, slice]] = None | ||
| ) -> NDArray[Any]: |
There was a problem hiding this comment.
Suggested change
| ) -> NDArray[Any]: | |
| ) -> sparse.COO: |
tiled/adapters/sparse.py
Outdated
| coords, data = self.blocks[block] | ||
| _, shape = slice_and_shape_from_block_and_chunks(block, self._structure.chunks) | ||
| arr = sparse.COO(data=data[:], coords=coords[:], shape=shape) | ||
| if slice: | ||
| arr = arr[slice] | ||
| return arr | ||
|
|
||
| def read(self, slice=None): | ||
| def read(self, slice: Optional[Union[int, slice]] = None) -> NDArray[Any]: |
There was a problem hiding this comment.
Suggested change
| def read(self, slice: Optional[Union[int, slice]] = None) -> NDArray[Any]: | |
| def read(self, slice: Optional[Union[int, slice]] = None) -> sparse.COO: |
danielballan
force-pushed
the
mypy_for_tiled
branch
from
15ebb1b to
3f57d4c
Compare
skarakuzu
changed the title
danielballan
force-pushed
the
mypy_for_tiled
branch
from
1d4b7a1 to
453b807
Compare
| pass | ||
|
|
||
|
|
||
| if sys.version_info < (3, 9): |
There was a problem hiding this comment.
Is this PR the time to upgrade Tiled's minimum supported python version to SPEC0, which at present would be 3.10 or greater? We could then remove this Mapping stuff.
There was a problem hiding this comment.
One or two users out there have asked if we can give them a 3.8 (or even a 3.7) compatible release up through the first beta, so they have at least a basically usable client available in legacy environments.
I figure we'll fast-forward to 3.10 shortly after tagging beta.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
beginning of mypy implementation in tiled. It is not ready to merge.