-
Notifications
You must be signed in to change notification settings - Fork 100
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.
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
refactor: Rename MatplotlibWriter
to MatplotlibDataset
#1027
Open
SajidAlamQB
wants to merge
16
commits into
main
Choose a base branch
from
feat/rename-matplotlibwriter
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
aa62a64
rename and deprecate old matplotlib_writer
SajidAlamQB 03d18bf
Update test_matplotlib_dataset.py
SajidAlamQB a7ebb98
lint
SajidAlamQB d00e287
Merge branch 'main' into feat/rename-matplotlibwriter
SajidAlamQB 707359e
fix docs
SajidAlamQB 51ec844
secrets allowlist
SajidAlamQB 56119cb
fix docs-check
SajidAlamQB 535a424
secret
SajidAlamQB b646442
fix test
SajidAlamQB 1c3fab8
Merge branch 'main' into feat/rename-matplotlibwriter
SajidAlamQB a01bb88
Update test_base_table_dataset.py
SajidAlamQB 94fd87c
Merge branch 'feat/rename-matplotlibwriter' of https://github.com/ked…
SajidAlamQB bc5d07b
attempt fix
SajidAlamQB 1a0e8b9
revert
SajidAlamQB f3a7341
Merge branch 'main' into feat/rename-matplotlibwriter
SajidAlamQB 1a36ed3
Merge branch 'main' into feat/rename-matplotlibwriter
SajidAlamQB File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
257 changes: 257 additions & 0 deletions
257
kedro-datasets/kedro_datasets/matplotlib/matplotlib_dataset.py
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,257 @@ | ||
"""``MatplotlibDataset`` saves one or more Matplotlib objects as image | ||
files to an underlying filesystem (e.g. local, S3, GCS).""" | ||
from __future__ import annotations | ||
|
||
import base64 | ||
import io | ||
from copy import deepcopy | ||
from pathlib import PurePosixPath | ||
from typing import Any, NoReturn | ||
from warnings import warn | ||
|
||
import fsspec | ||
import matplotlib.pyplot as plt | ||
from kedro.io.core import ( | ||
AbstractVersionedDataset, | ||
DatasetError, | ||
Version, | ||
get_filepath_str, | ||
get_protocol_and_path, | ||
) | ||
from matplotlib.figure import Figure | ||
|
||
from kedro_datasets._typing import ImagePreview | ||
|
||
|
||
class MatplotlibDataset( | ||
AbstractVersionedDataset[Figure | list[Figure] | dict[str, Figure], NoReturn] | ||
): | ||
"""``MatplotlibDataset`` saves one or more Matplotlib objects as | ||
image files to an underlying filesystem (e.g. local, S3, GCS). | ||
|
||
Example usage for the | ||
`YAML API <https://docs.kedro.org/en/stable/data/data_catalog_yaml_examples.html>`_: | ||
|
||
.. code-block:: yaml | ||
|
||
output_plot: | ||
type: matplotlib.MatplotlibDataset | ||
filepath: data/08_reporting/output_plot.png | ||
save_args: | ||
format: png | ||
|
||
Example usage for the | ||
`Python API <https://docs.kedro.org/en/stable/data/\ | ||
advanced_data_catalog_usage.html>`_: | ||
|
||
.. code-block:: pycon | ||
|
||
>>> import matplotlib.pyplot as plt | ||
>>> from kedro_datasets.matplotlib import MatplotlibDataset | ||
>>> | ||
>>> fig = plt.figure() | ||
>>> plt.plot([1, 2, 3]) # doctest: +ELLIPSIS | ||
[<matplotlib.lines.Line2D object at 0x...>] | ||
>>> plot_writer = MatplotlibDataset(filepath=tmp_path / "data/08_reporting/output_plot.png") | ||
>>> plt.close() | ||
>>> plot_writer.save(fig) | ||
|
||
Example saving a plot as a PDF file: | ||
|
||
.. code-block:: pycon | ||
|
||
>>> import matplotlib.pyplot as plt | ||
>>> from kedro_datasets.matplotlib import MatplotlibDataset | ||
>>> | ||
>>> fig = plt.figure() | ||
>>> plt.plot([1, 2, 3]) # doctest: +ELLIPSIS | ||
[<matplotlib.lines.Line2D object at 0x...>] | ||
>>> pdf_plot_writer = MatplotlibDataset( | ||
... filepath=tmp_path / "data/08_reporting/output_plot.pdf", save_args={"format": "pdf"} | ||
... ) | ||
>>> plt.close() | ||
>>> pdf_plot_writer.save(fig) | ||
|
||
Example saving multiple plots in a folder, using a dictionary: | ||
|
||
.. code-block:: pycon | ||
|
||
>>> import matplotlib.pyplot as plt | ||
>>> from kedro_datasets.matplotlib import MatplotlibDataset | ||
>>> | ||
>>> plots_dict = {} | ||
>>> for colour in ["blue", "green", "red"]: | ||
... plots_dict[f"{colour}.png"] = plt.figure() | ||
... plt.plot([1, 2, 3], color=colour) | ||
... | ||
[<matplotlib.lines.Line2D object at 0x...>] | ||
[<matplotlib.lines.Line2D object at 0x...>] | ||
[<matplotlib.lines.Line2D object at 0x...>] | ||
>>> plt.close("all") | ||
>>> dict_plot_writer = MatplotlibDataset(filepath=tmp_path / "data/08_reporting/plots") | ||
>>> dict_plot_writer.save(plots_dict) | ||
|
||
Example saving multiple plots in a folder, using a list: | ||
|
||
.. code-block:: pycon | ||
|
||
>>> import matplotlib.pyplot as plt | ||
>>> from kedro_datasets.matplotlib import MatplotlibDataset | ||
>>> | ||
>>> plots_list = [] | ||
>>> for i in range(5): # doctest: +ELLIPSIS | ||
... plots_list.append(plt.figure()) | ||
... plt.plot([i, i + 1, i + 2]) | ||
... | ||
[<matplotlib.lines.Line2D object at 0x...>] | ||
[<matplotlib.lines.Line2D object at 0x...>] | ||
[<matplotlib.lines.Line2D object at 0x...>] | ||
[<matplotlib.lines.Line2D object at 0x...>] | ||
[<matplotlib.lines.Line2D object at 0x...>] | ||
>>> plt.close("all") | ||
>>> list_plot_writer = MatplotlibDataset(filepath=tmp_path / "data/08_reporting/plots") | ||
>>> list_plot_writer.save(plots_list) | ||
|
||
""" | ||
|
||
DEFAULT_SAVE_ARGS: dict[str, Any] = {} | ||
|
||
def __init__( # noqa: PLR0913 | ||
self, | ||
*, | ||
filepath: str, | ||
fs_args: dict[str, Any] | None = None, | ||
credentials: dict[str, Any] | None = None, | ||
save_args: dict[str, Any] | None = None, | ||
version: Version | None = None, | ||
overwrite: bool = False, | ||
metadata: dict[str, Any] | None = None, | ||
) -> None: | ||
"""Creates a new instance of ``MatplotlibDataset``. | ||
|
||
Args: | ||
filepath: Filepath in POSIX format to save Matplotlib objects to, prefixed with a | ||
protocol like `s3://`. If prefix is not provided, `file` protocol (local filesystem) | ||
will be used. The prefix should be any protocol supported by ``fsspec``. | ||
fs_args: Extra arguments to pass into underlying filesystem class constructor | ||
(e.g. `{"project": "my-project"}` for ``GCSFileSystem``), as well as | ||
to pass to the filesystem's `open` method through nested key `open_args_save`. | ||
Here you can find all available arguments for `open`: | ||
https://filesystem-spec.readthedocs.io/en/latest/api.html#fsspec.spec.AbstractFileSystem.open | ||
All defaults are preserved, except `mode`, which is set to `wb` when saving. | ||
credentials: Credentials required to get access to the underlying filesystem. | ||
E.g. for ``S3FileSystem`` it should look like: | ||
`{'key': '<id>', 'secret': '<key>'}}` | ||
save_args: Save args passed to `plt.savefig`. See | ||
https://matplotlib.org/api/_as_gen/matplotlib.pyplot.savefig.html | ||
version: If specified, should be an instance of | ||
``kedro.io.core.Version``. If its ``load`` attribute is | ||
None, the latest version will be loaded. If its ``save`` | ||
attribute is None, save version will be autogenerated. | ||
overwrite: If True, any existing image files will be removed. | ||
Only relevant when saving multiple Matplotlib objects at | ||
once. | ||
metadata: Any arbitrary Any arbitrary metadata. | ||
This is ignored by Kedro, but may be consumed by users or external plugins. | ||
""" | ||
_credentials = deepcopy(credentials) or {} | ||
_fs_args = deepcopy(fs_args) or {} | ||
_fs_open_args_save = _fs_args.pop("open_args_save", {}) | ||
_fs_open_args_save.setdefault("mode", "wb") | ||
|
||
protocol, path = get_protocol_and_path(filepath, version) | ||
if protocol == "file": | ||
_fs_args.setdefault("auto_mkdir", True) | ||
|
||
self._protocol = protocol | ||
self._fs = fsspec.filesystem(self._protocol, **_credentials, **_fs_args) | ||
|
||
self.metadata = metadata | ||
|
||
super().__init__( | ||
filepath=PurePosixPath(path), | ||
version=version, | ||
exists_function=self._fs.exists, | ||
glob_function=self._fs.glob, | ||
) | ||
|
||
self._fs_open_args_save = _fs_open_args_save | ||
|
||
# Handle default save arguments | ||
self._save_args = {**self.DEFAULT_SAVE_ARGS, **(save_args or {})} | ||
|
||
if overwrite and version is not None: | ||
warn( | ||
"Setting 'overwrite=True' is ineffective if versioning " | ||
"is enabled, since the versioned path must not already " | ||
"exist; overriding flag with 'overwrite=False' instead." | ||
) | ||
overwrite = False | ||
self._overwrite = overwrite | ||
|
||
def _describe(self) -> dict[str, Any]: | ||
return { | ||
"filepath": self._filepath, | ||
"protocol": self._protocol, | ||
"save_args": self._save_args, | ||
"version": self._version, | ||
} | ||
|
||
def load(self) -> NoReturn: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think this is not documented well in the older docs as well. It says |
||
raise DatasetError(f"Loading not supported for '{self.__class__.__name__}'") | ||
|
||
def save(self, data: Figure | (list[Figure] | dict[str, Figure])) -> None: | ||
save_path = self._get_save_path() | ||
|
||
if isinstance(data, list | dict) and self._overwrite and self._exists(): | ||
self._fs.rm(get_filepath_str(save_path, self._protocol), recursive=True) | ||
|
||
if isinstance(data, list): | ||
for index, plot in enumerate(data): | ||
full_key_path = get_filepath_str( | ||
save_path / f"{index}.png", self._protocol | ||
) | ||
self._save_to_fs(full_key_path=full_key_path, plot=plot) | ||
elif isinstance(data, dict): | ||
for plot_name, plot in data.items(): | ||
full_key_path = get_filepath_str(save_path / plot_name, self._protocol) | ||
self._save_to_fs(full_key_path=full_key_path, plot=plot) | ||
else: | ||
full_key_path = get_filepath_str(save_path, self._protocol) | ||
self._save_to_fs(full_key_path=full_key_path, plot=data) | ||
|
||
plt.close("all") | ||
|
||
self._invalidate_cache() | ||
|
||
def _save_to_fs(self, full_key_path: str, plot: Figure): | ||
bytes_buffer = io.BytesIO() | ||
plot.savefig(bytes_buffer, **self._save_args) | ||
|
||
with self._fs.open(full_key_path, **self._fs_open_args_save) as fs_file: | ||
fs_file.write(bytes_buffer.getvalue()) | ||
|
||
def _exists(self) -> bool: | ||
load_path = get_filepath_str(self._get_load_path(), self._protocol) | ||
return self._fs.exists(load_path) | ||
|
||
def _release(self) -> None: | ||
super()._release() | ||
self._invalidate_cache() | ||
|
||
def _invalidate_cache(self) -> None: | ||
"""Invalidate underlying filesystem caches.""" | ||
filepath = get_filepath_str(self._filepath, self._protocol) | ||
self._fs.invalidate_cache(filepath) | ||
|
||
def preview(self) -> ImagePreview: | ||
""" | ||
Generates a preview of the matplotlib dataset as a base64 encoded image. | ||
|
||
Returns: | ||
str: A base64 encoded string representing the matplotlib plot image. | ||
""" | ||
load_path = get_filepath_str(self._get_load_path(), self._protocol) | ||
with self._fs.open(load_path, mode="rb") as img_file: | ||
base64_bytes = base64.b64encode(img_file.read()) | ||
return ImagePreview(base64_bytes.decode("utf-8")) |
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[Nit] The example usage still uses
plot_writer
variable names when assigning MatplotlibDataset instances. May beplot_dataset
would be better