address reviews

Author: d33bs

pyproject.toml

@@ -116,7 +116,7 @@ lint.per-file-ignores."src/cytodataframe/image.py" = [ "PLR2004" ]
 # ignore typing rules for tests
 lint.per-file-ignores."tests/*" = [ "ANN201", "PLR0913", "PLR2004", "SIM105" ]
 
-# specify where version replacement is performed
+# configure Bandit security checks (exclude tests directory from scanning)
 [tool.bandit]
 exclude_dirs = [ "tests" ]
 

src/cytodataframe/frame.py

@@ -124,7 +124,7 @@ def __init__(  # noqa: PLR0913
         segmentation_file_regex: Optional[Dict[str, str]] = None,
         image_adjustment: Optional[Callable] = None,
         display_options: Optional[Dict[str, Any]] = None,
-        *args: Tuple[Any, ...],
+        *args: Any,
         **kwargs: Dict[str, Any],
     ) -> None:
         """
@@ -385,15 +385,16 @@ def _constructor(self: CytoDataFrame_type) -> Callable[..., CytoDataFrame_type]:
     def _build_result_cdf(
         self: CytoDataFrame_type,
         data: Union["CytoDataFrame", pd.DataFrame, pd.Series, Any],
-        *args: Tuple[Any, ...],
+        *args: Any,
         **kwargs: Dict[str, Any],
     ) -> CytoDataFrame_type:
         """Construct a result frame while preserving CytoDataFrame metadata."""
         if data is None and "data" in kwargs:
             data = kwargs.pop("data")
 
         cdf = CytoDataFrame(
-            data=data,
+            data,
+            *args,
             data_context_dir=self._custom_attrs["data_context_dir"],
             data_image_paths=self._custom_attrs["data_image_paths"],
             data_bounding_box=self._custom_attrs["data_bounding_box"],
@@ -403,7 +404,6 @@ def _build_result_cdf(
             segmentation_file_regex=self._custom_attrs["segmentation_file_regex"],
             image_adjustment=self._custom_attrs["image_adjustment"],
             display_options=self._custom_attrs["display_options"],
-            *args,
             **kwargs,
         )
 
@@ -422,7 +422,7 @@ def _return_cytodataframe(
         self: CytoDataFrame_type,
         method: Callable,
         method_name: str,
-        *args: Tuple[Any, ...],
+        *args: Any,
         **kwargs: Dict[str, Any],
     ) -> Any:
         """
@@ -434,7 +434,7 @@ def _return_cytodataframe(
                 The method to be called and wrapped.
             method_name (str):
                 The name of the method to be wrapped.
-            *args (Tuple[Any, ...]):
+            *args (Any):
                 Positional arguments to be passed to the method.
             **kwargs (Dict[str, Any]):
                 Keyword arguments to be passed to the method.
@@ -453,12 +453,14 @@ def _return_cytodataframe(
             else method(*args, **kwargs)
         )
 
-        if isinstance(result, pd.DataFrame):
-            cdf = self._build_result_cdf(result)
-            # If the method name is transpose we know that
-            # the dataframe has been transposed.
-            if method_name == "transpose" and not self._custom_attrs["is_transposed"]:
-                cdf._custom_attrs["is_transposed"] = True
+        if not isinstance(result, pd.DataFrame):
+            return result
+
+        cdf = self._build_result_cdf(result)
+        # If the method name is transpose we know that
+        # the dataframe has been transposed.
+        if method_name == "transpose" and not self._custom_attrs["is_transposed"]:
+            cdf._custom_attrs["is_transposed"] = True
 
         return cdf
 
@@ -482,7 +484,7 @@ def _wrap_method(self: CytoDataFrame_type, method_name: str) -> Callable:
                 the result is a CytoDataFrame.
         """
 
-        def wrapper(*args: Tuple[Any, ...], **kwargs: Dict[str, Any]) -> Any:
+        def wrapper(*args: Any, **kwargs: Dict[str, Any]) -> Any:
             """
             Wraps the specified method to ensure
             it returns a CytoDataFrame.
@@ -494,7 +496,7 @@ def wrapper(*args: Tuple[Any, ...], **kwargs: Dict[str, Any]) -> Any:
             custom attributes.
 
             Args:
-                *args (Tuple[Any, ...]):
+                *args (Any):
                     Positional arguments to be passed to the method.
                 **kwargs (Dict[str, Any]):
                     Keyword arguments to be passed to the method.

tests/test_frame.py

@@ -801,6 +801,16 @@ def test_return_cytodataframe(cytotable_NF1_data_parquet_shrunken: str):
     assert isinstance(cdf.iloc[0:5:2], CytoDataFrame)
 
 
+def test_return_cytodataframe_passthroughs_non_dataframe_results() -> None:
+    """Ensure helper methods return scalar-like results without wrapping."""
+
+    cdf = CytoDataFrame(pd.DataFrame({"a": [1, 2, 3]}))
+
+    result = cdf._return_cytodataframe(lambda: 3, "dummy_method")
+
+    assert result == 3
+
+
 def test_iloc_slice_preserves_cytodataframe_html_formatting():
     """Ensure ``iloc`` slices keep the CytoDataFrame notebook HTML renderer."""