From 789ba5457861d82c8ca0cb977a5e86bac7f52229 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Srokosz?= Date: Fri, 21 Jul 2023 16:51:29 +0200 Subject: [PATCH 1/2] Meaningful __repr__ for objects --- mwdblib/blob.py | 6 ++++++ mwdblib/comment.py | 3 +++ mwdblib/config.py | 6 ++++++ mwdblib/core.py | 6 ++++++ mwdblib/file.py | 3 +++ mwdblib/karton.py | 3 +++ 6 files changed, 27 insertions(+) diff --git a/mwdblib/blob.py b/mwdblib/blob.py index b74d0da..144c940 100644 --- a/mwdblib/blob.py +++ b/mwdblib/blob.py @@ -95,3 +95,9 @@ def last_seen(self) -> "datetime.datetime": if "last_seen" not in self.data: self._load() return datetime.datetime.fromisoformat(self.data["last_seen"]) + + def __repr__(self) -> str: + return ( + f"MWDBBlob(id={repr(self.id)}, name={repr(self.blob_name)}, " + f"type={repr(self.blob_type)})" + ) diff --git a/mwdblib/comment.py b/mwdblib/comment.py index e6a8842..9fe5b0a 100644 --- a/mwdblib/comment.py +++ b/mwdblib/comment.py @@ -52,3 +52,6 @@ def delete(self) -> None: Deletes this comment """ self.api.delete("object/{}/comment/{}".format(self.parent.id, self.id)) + + def __repr__(self) -> str: + return f"MWDBComment(id={repr(self.id)}, author={repr(self.author)})" diff --git a/mwdblib/config.py b/mwdblib/config.py index 282077e..4abeeee 100644 --- a/mwdblib/config.py +++ b/mwdblib/config.py @@ -75,3 +75,9 @@ def cfg(self) -> Dict[str, Any]: .. seealso:: :py:attr:`config_dict` """ return self.config + + def __repr__(self) -> str: + return ( + f"MWDBConfig(id={repr(self.id)}, family={repr(self.family)}, " + f"type={repr(self.type)})" + ) diff --git a/mwdblib/core.py b/mwdblib/core.py index 82a9246..4f5146e 100644 --- a/mwdblib/core.py +++ b/mwdblib/core.py @@ -1053,3 +1053,9 @@ def upload_blob( ) result = self.api.post("blob", json=params) return MWDBBlob(self.api, result) + + def __repr__(self) -> str: + return ( + f"MWDB(api_url={repr(self.api.options.api_url)}, " + f"username={repr(self.api.logged_user)})" + ) diff --git a/mwdblib/file.py b/mwdblib/file.py index 1bc03a8..0e81834 100644 --- a/mwdblib/file.py +++ b/mwdblib/file.py @@ -155,3 +155,6 @@ def download_legacy(self) -> bytes: "/" )[-1] return cast(bytes, self.api.get("download/{}".format(token), raw=True)) + + def __repr__(self) -> str: + return f"MWDBFile(sha256={repr(self.id)}, name={repr(self.file_name)})" diff --git a/mwdblib/karton.py b/mwdblib/karton.py index cb8b14d..2d2dd4d 100644 --- a/mwdblib/karton.py +++ b/mwdblib/karton.py @@ -28,3 +28,6 @@ def arguments(self) -> Dict[str, Any]: @property def processing_in(self) -> Dict[str, Any]: return cast(Dict[str, Any], self.data["processing_in"]) + + def __repr__(self) -> str: + return f"MWDBKartonAnalysis(id={repr(self.id)})" From d710ce03e7781f930dac74cc24dc81833490f2e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Srokosz?= Date: Fri, 21 Jul 2023 16:53:20 +0200 Subject: [PATCH 2/2] Bump version to 4.5.0 --- mwdblib/__version__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mwdblib/__version__.py b/mwdblib/__version__.py index ecdb1ce..9faa2c2 100644 --- a/mwdblib/__version__.py +++ b/mwdblib/__version__.py @@ -1 +1 @@ -__version__ = "4.4.0" +__version__ = "4.5.0"