junifer 0.0.4.dev11__py3-none-any.whl → 0.0.4.dev15__py3-none-any.whl

junifer/_version.py

@@ -1,4 +1,4 @@
 # file generated by setuptools_scm
 # don't change, don't track in version control
-__version__ = version = '0.0.4.dev11'
-__version_tuple__ = version_tuple = (0, 0, 4, 'dev11')
+__version__ = version = '0.0.4.dev15'
+__version_tuple__ = version_tuple = (0, 0, 4, 'dev15')

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 ``<package>_<function>``,
         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
@@ -105,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(
@@ -119,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)
 

{junifer-0.0.4.dev11.dist-info → junifer-0.0.4.dev15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: junifer
-Version: 0.0.4.dev11
+Version: 0.0.4.dev15
 Summary: JUelich NeuroImaging FEature extractoR
 Author-email: Fede Raimondo <f.raimondo@fz-juelich.de>, Synchon Mandal <s.mandal@fz-juelich.de>
 Maintainer-email: Fede Raimondo <f.raimondo@fz-juelich.de>, Synchon Mandal <s.mandal@fz-juelich.de>

{junifer-0.0.4.dev11.dist-info → junifer-0.0.4.dev15.dist-info}/RECORD

@@ -1,5 +1,5 @@
 junifer/__init__.py,sha256=x1UR2jUcrUdm2HNl-3Qvyi4UUrU6ms5qm2qcmNY7zZk,391
-junifer/_version.py,sha256=U_geoF1S5yFBDnhC2lSmPmARQSU4qlaR9_4EWCI7QRA,175
+junifer/_version.py,sha256=ZwqhGZ18UivOp5VizAjwA0R1I9txaG9DFoVQGhBFIWc,175
 junifer/stats.py,sha256=KUX4jJcLWnlE34coet8EkdFypFd-td4Vtpx5LvlomVs,5879
 junifer/api/__init__.py,sha256=YILu9M7SC0Ri4CVd90fELH2OnK_gvCYAXCoqBNCFE8E,257
 junifer/api/cli.py,sha256=epPGiMU9szF0Dbv-_ty3hxxWPUd8KM-gqQI10TJEl2Y,9843
@@ -147,7 +147,7 @@ junifer/markers/tests/test_markers_base.py,sha256=cbuCeMmjyFMP1ea6J6XRsBQo8CivQ4
 junifer/markers/tests/test_parcel_aggregation.py,sha256=RW2EKRokmavMZB7e8WghYc6fLm6UOHzOm6xKdvBsoo0,21501
 junifer/markers/tests/test_sphere_aggregation.py,sha256=1uOfnLQJ5hVCz7jcX9QG3M6htLSJSEOflKV6fXNtSZI,7652
 junifer/onthefly/__init__.py,sha256=GG_Z5NgnVNph6CLPtGFI2HE_OIuVTZ874BOq72mA-ps,160
-junifer/onthefly/read_transform.py,sha256=2yLlFscCZDS3z80ffD36_vF1GeKxSFfK0xNB-xsqOTM,4040
+junifer/onthefly/read_transform.py,sha256=8ia2QktWpVhPDD20bKywuVHPU1Ys2Wyc_HvKyyRTcVo,4309
 junifer/onthefly/tests/test_read_transform.py,sha256=D2C3IpXQHdsJSF07v8rEwGntLGXjZOserlRhebJUAVM,4719
 junifer/pipeline/__init__.py,sha256=gOOrLf_C3oe9RdmLLjKMhs2gqtrr5Tzfi_cyTFEp8HM,238
 junifer/pipeline/pipeline_step_mixin.py,sha256=fZtJa5NJ2_9r6dD_UOkXA5fOPtRjuPUbh4lnF-ILB4c,5019
@@ -190,10 +190,10 @@ junifer/utils/fs.py,sha256=Jd9AoV2fIF7pT7KhXsn8T1O1fJ1_SFZgaFuOBAM7DG8,460
 junifer/utils/logging.py,sha256=phBwOFaK6ejqbSjkCSAkZhhdo4sr01GdVZmJIL8t-Lw,8994
 junifer/utils/tests/test_fs.py,sha256=WQS7cKlKEZ742CIuiOYYpueeAhY9PqlastfDVpVVtvE,923
 junifer/utils/tests/test_logging.py,sha256=l8oo-AiBV7H6_IzlsNcj__cLeZBUvgIGoaMszD9VaJg,7754
-junifer-0.0.4.dev11.dist-info/AUTHORS.rst,sha256=rmULKpchpSol4ExWFdm-qu4fkpSZPYqIESVJBZtGb6E,163
-junifer-0.0.4.dev11.dist-info/LICENSE.md,sha256=MqCnOBu8uXsEOzRZWh9EBVfVz-kE9NkXcLCrtGXo2yU,34354
-junifer-0.0.4.dev11.dist-info/METADATA,sha256=qu8F2l3pSDS7qyCT7775kEtZbiuN-YGyVpPA0zhqnTo,6833
-junifer-0.0.4.dev11.dist-info/WHEEL,sha256=AtBG6SXL3KF_v0NxLf0ehyVOh0cold-JbJYXNGorC6Q,92
-junifer-0.0.4.dev11.dist-info/entry_points.txt,sha256=DxFvKq0pOqRunAK0FxwJcoDfV1-dZvsFDpD5HRqSDhw,48
-junifer-0.0.4.dev11.dist-info/top_level.txt,sha256=4bAq1R2QFQ4b3hohjys2JBvxrl0GKk5LNFzYvz9VGcA,8
-junifer-0.0.4.dev11.dist-info/RECORD,,
+junifer-0.0.4.dev15.dist-info/AUTHORS.rst,sha256=rmULKpchpSol4ExWFdm-qu4fkpSZPYqIESVJBZtGb6E,163
+junifer-0.0.4.dev15.dist-info/LICENSE.md,sha256=MqCnOBu8uXsEOzRZWh9EBVfVz-kE9NkXcLCrtGXo2yU,34354
+junifer-0.0.4.dev15.dist-info/METADATA,sha256=6sr_iKHAMdS1rBLwlyGO7fciJEpqkJb5JzZ74qZlGc8,6833
+junifer-0.0.4.dev15.dist-info/WHEEL,sha256=AtBG6SXL3KF_v0NxLf0ehyVOh0cold-JbJYXNGorC6Q,92
+junifer-0.0.4.dev15.dist-info/entry_points.txt,sha256=DxFvKq0pOqRunAK0FxwJcoDfV1-dZvsFDpD5HRqSDhw,48
+junifer-0.0.4.dev15.dist-info/top_level.txt,sha256=4bAq1R2QFQ4b3hohjys2JBvxrl0GKk5LNFzYvz9VGcA,8
+junifer-0.0.4.dev15.dist-info/RECORD,,