From d3d3b3920101d168610797e773daef1cf7288309 Mon Sep 17 00:00:00 2001 From: Synchon Mandal Date: Thu, 3 Aug 2023 11:01:18 +0200 Subject: [PATCH 1/3] update: add feature_md5 argument in read_transform and set default feature_name to None --- junifer/onthefly/read_transform.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/junifer/onthefly/read_transform.py b/junifer/onthefly/read_transform.py index c59c70a0b..3f1be6b8b 100644 --- a/junifer/onthefly/read_transform.py +++ b/junifer/onthefly/read_transform.py @@ -17,8 +17,9 @@ if TYPE_CHECKING: def read_transform( storage: Type["BaseFeatureStorage"], - feature_name: str, transform: str, + feature_name: Optional[str] = None, + feature_md5: Optional[str] = None, transform_args: Optional[Tuple] = None, transform_kw_args: Optional[Dict] = None, ) -> pd.DataFrame: @@ -28,11 +29,13 @@ def read_transform( ---------- storage : storage-like The storage class, for example, SQLiteFeatureStorage. - feature_name : str - Name of the feature to read. transform : str The kind of transform formatted as ``_``, for example, ``bctpy_degrees_und``. + feature_name : str, optional + Name of the feature to read (default None). + feature_md5 : str, optional + MD5 hash of the feature to read (default None). transform_args : tuple, optional The positional arguments for the callable of ``transform`` (default None). @@ -62,7 +65,9 @@ def read_transform( transform_kw_args = transform_kw_args or {} # Read storage - stored_data = storage.read(feature_name=feature_name) # type: ignore + stored_data = storage.read( + feature_name=feature_name, feature_md5=feature_md5 + ) # type: ignore # Retrieve package and function package, func_str = transform.split("_", 1) # Condition for package -- 2.52.0 From 687671bb228395c7c274d3a5759e8c3214cdc229 Mon Sep 17 00:00:00 2001 From: Synchon Mandal Date: Thu, 3 Aug 2023 11:49:03 +0200 Subject: [PATCH 2/3] chore: update logs for read_transform() --- junifer/onthefly/read_transform.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/junifer/onthefly/read_transform.py b/junifer/onthefly/read_transform.py index 3f1be6b8b..c1bfa6ca5 100644 --- a/junifer/onthefly/read_transform.py +++ b/junifer/onthefly/read_transform.py @@ -110,7 +110,8 @@ def read_transform( # Apply function and store subject-wise output_list = [] logger.debug( - f"Computing '{package}.{func_str}' for feature {feature_name} ..." + f"Computing '{package}.{func_str}' for feature " + f"{feature_name or feature_md5} ..." ) for subject in range(stored_data["data"].shape[2]): output = func( @@ -124,7 +125,8 @@ def read_transform( idx_df = pd.DataFrame(data=stored_data["element"]) # Create multiindex from dataframe logger.debug( - f"Generating pandas.MultiIndex for feature {feature_name} ..." + "Generating pandas.MultiIndex for feature " + f"{feature_name or feature_md5} ..." ) data_idx = pd.MultiIndex.from_frame(df=idx_df) -- 2.52.0 From 3f8febcc1a765e09588a38730eb5736575bffb5a Mon Sep 17 00:00:00 2001 From: Synchon Mandal Date: Thu, 3 Aug 2023 11:52:32 +0200 Subject: [PATCH 3/3] chore: add changelog 248.change --- docs/changes/newsfragments/248.change | 1 + 1 file changed, 1 insertion(+) create mode 100644 docs/changes/newsfragments/248.change diff --git a/docs/changes/newsfragments/248.change b/docs/changes/newsfragments/248.change new file mode 100644 index 000000000..55162a23f --- /dev/null +++ b/docs/changes/newsfragments/248.change @@ -0,0 +1 @@ +Add ``feature_md5`` argument to :func:`.read_transform()` by `Synchon Mandal`_ -- 2.52.0