compressed-lists 0.4.2__tar.gz → 0.4.4__tar.gz

{compressed_lists-0.4.2 → compressed_lists-0.4.4}/CHANGELOG.md

@@ -1,11 +1,12 @@
 # Changelog
 
-## Version 0.4.0 - 0.4.2
+## Version 0.4.0 - 0.4.4
 
 - Classes extend `BiocObject` from biocutils. `metadata` is a named list.
 - Update actions to run from 3.10-3.14
 - Support empty compressed list objects of size `n`.
 - Implement combine generic for compressed lists.
+- element metadata slot is a `BiocFrame`.
 
 ## Version 0.3.0
 

{compressed_lists-0.4.2 → compressed_lists-0.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: compressed-lists
-Version: 0.4.2
+Version: 0.4.4
 Summary: Memory-efficient container for list-like objects
 Home-page: https://github.com/biocpy/compressed-lists
 Author: Jayaram Kancherla
@@ -14,9 +14,9 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
 License-File: LICENSE.txt
 Requires-Dist: importlib-metadata; python_version < "3.8"
-Requires-Dist: biocutils>=0.3.1
+Requires-Dist: biocutils>=0.3.3
 Requires-Dist: numpy
-Requires-Dist: biocframe>=0.7.1
+Requires-Dist: biocframe>=0.7.2
 Provides-Extra: testing
 Requires-Dist: setuptools; extra == "testing"
 Requires-Dist: pytest; extra == "testing"

{compressed_lists-0.4.2 → compressed_lists-0.4.4}/setup.cfg

@@ -24,9 +24,9 @@ package_dir =
 python_requires = >=3.9
 install_requires = 
 	importlib-metadata; python_version<"3.8"
-	biocutils>=0.3.1
+	biocutils>=0.3.3
 	numpy
-	biocframe>=0.7.1
+	biocframe>=0.7.2
 
 [options.packages.find]
 where = src

{compressed_lists-0.4.2 → compressed_lists-0.4.4}/src/compressed_lists/base.py

@@ -4,6 +4,7 @@ from typing import Any, Callable, Dict, Iterator, List, Optional, Sequence, Unio
 from warnings import warn
 
 import biocutils as ut
+from biocframe import BiocFrame
 import numpy as np
 
 from .partition import Partitioning
@@ -13,6 +14,31 @@ __copyright__ = "Jayaram Kancherla"
 __license__ = "MIT"
 
 
+def is_pandas(x: Any) -> bool:
+    """Check if ``x`` is a :py:class:`~pandas.DataFrame`.
+
+    Args:
+        x:
+            Any object.
+
+    Returns:
+        True if ``x`` is a :py:class:`~pandas.DataFrame`.
+    """
+    if hasattr(x, "dtypes"):
+        return True
+
+    return False
+
+
+def _sanitize_frame(frame, num_rows: int):
+    frame = frame if frame is not None else BiocFrame({}, number_of_rows=num_rows)
+
+    if is_pandas(frame):
+        frame = BiocFrame.from_pandas(frame)
+
+    return frame
+
+
 def _validate_data_and_partitions(unlist_data, partition):
     if len(unlist_data) != partition.nobj():
         raise ValueError(
@@ -33,7 +59,7 @@ class CompressedList(ut.BiocObject):
         unlist_data: Any,
         partitioning: Partitioning,
         element_type: Any = None,
-        element_metadata: Optional[dict] = None,
+        element_metadata: Optional[BiocFrame] = None,
         metadata: Optional[Union[Dict[str, Any], ut.NamedList]] = None,
         _validate: bool = True,
     ):
@@ -64,7 +90,7 @@ class CompressedList(ut.BiocObject):
         self._unlist_data = unlist_data
         self._partitioning = partitioning
         self._element_type = element_type
-        self._element_metadata = element_metadata or {}
+        self._element_metadata = _sanitize_frame(element_metadata, len(partitioning))
 
         if _validate:
             _validate_data_and_partitions(self._unlist_data, self._partitioning)
@@ -93,6 +119,7 @@ class CompressedList(ut.BiocObject):
             element_type=_elem_type_copy,
             element_metadata=_elem_metadata_copy,
             metadata=_metadata_copy,
+            _validate=False,
         )
 
     def __copy__(self):
@@ -107,6 +134,7 @@ class CompressedList(ut.BiocObject):
             element_type=self._element_type,
             element_metadata=self._element_metadata,
             metadata=self._metadata,
+            _validate=False,
         )
 
     def copy(self):
@@ -150,8 +178,7 @@ class CompressedList(ut.BiocObject):
             _etype_name = self._element_type.__name__
         output += ", element_type=" + _etype_name
 
-        if len(self._element_metadata) > 0:
-            output += ", element_metadata=" + ut.print_truncated_dict(self._element_metadata)
+        output += ", element_metadata=" + self._element_metadata.__repr__()
 
         if len(self._metadata) > 0:
             output += ", metadata=" + ut.print_truncated_dict(self._metadata)
@@ -178,7 +205,7 @@ class CompressedList(ut.BiocObject):
 
         output += f"partitioning: {ut.print_truncated_list(self._partitioning)}\n"
 
-        output += f"element_metadata({str(len(self._element_metadata))}): {ut.print_truncated_list(list(self._element_metadata.keys()), sep=' ', include_brackets=False, transform=lambda y: y)}\n"
+        output += f"element_metadata({str(len(self._element_metadata))} rows): {ut.print_truncated_list(list(self._element_metadata.get_column_names()), sep=' ', include_brackets=False, transform=lambda y: y)}\n"
         output += f"metadata({str(len(self._metadata))}): {ut.print_truncated_list(list(self._metadata.keys()), sep=' ', include_brackets=False, transform=lambda y: y)}\n"
 
         return output
@@ -303,14 +330,14 @@ class CompressedList(ut.BiocObject):
     ######>> element metadata <<#######
     ###################################
 
-    def get_element_metadata(self) -> dict:
+    def get_element_metadata(self) -> BiocFrame:
         """
         Returns:
             Dictionary of metadata for each element in this object.
         """
         return self._element_metadata
 
-    def set_element_metadata(self, element_metadata: dict, in_place: bool = False) -> CompressedList:
+    def set_element_metadata(self, element_metadata: BiocFrame, in_place: bool = False) -> CompressedList:
         """Set new element metadata.
 
         Args:
@@ -324,19 +351,20 @@ class CompressedList(ut.BiocObject):
             A modified ``CompressedList`` object, either as a copy of the original
             or as a reference to the (in-place-modified) original.
         """
-        if not isinstance(element_metadata, dict):
-            raise TypeError(f"`element_metadata` must be a dictionary, provided {type(element_metadata)}.")
+        if not isinstance(element_metadata, BiocFrame):
+            raise TypeError(f"`element_metadata` must be a BiocFrame, provided {type(element_metadata)}.")
+
         output = self._define_output(in_place)
-        output._element_metadata = element_metadata
+        output._element_metadata = _sanitize_frame(element_metadata, len(self._partitioning))
         return output
 
     @property
-    def element_metadata(self) -> dict:
+    def element_metadata(self) -> BiocFrame:
         """Alias for :py:attr:`~get_element_metadata`."""
         return self.get_element_metadata()
 
     @element_metadata.setter
-    def element_metadata(self, element_metadata: dict):
+    def element_metadata(self, element_metadata: BiocFrame):
         """Alias for :py:attr:`~set_element_metadata` with ``in_place = True``.
 
         As this mutates the original object, a warning is raised.
@@ -378,7 +406,10 @@ class CompressedList(ut.BiocObject):
             return self.extract_range(start, end)
 
         # slices
-        elif isinstance(key, slice):
+        elif isinstance(key, (range, slice)):
+            if isinstance(key, range):
+                key = slice(key.start, key.stop, key.step)
+
             indices = range(*key.indices(len(self)))
             result = []
             for i in indices:
@@ -531,6 +562,10 @@ class CompressedList(ut.BiocObject):
         Returns:
             A new CompressedList with only the selected elements.
         """
+        print("here", indices, type(indices))
+        if isinstance(indices, np.ndarray):
+            indices = indices.tolist()
+
         # Validate indices
         for i in indices:
             if i < 0 or i >= len(self):
@@ -544,23 +579,32 @@ class CompressedList(ut.BiocObject):
         new_partitioning = Partitioning.from_lengths(new_lengths, new_names)
 
         # Extract data
-        new_data = []
+        _new_data = []
         for i in indices:
             start, end = self._partitioning.get_partition_range(i)
-            if isinstance(self._unlist_data, np.ndarray):
-                new_data.append(self._unlist_data[start:end])
-            else:
-                new_data.extend(self._unlist_data[start:end])
-
-        if isinstance(self._unlist_data, np.ndarray):
-            new_data = np.concatenate(new_data)
+            _subset = ut.subset_sequence(self._unlist_data, [j for j in range(start, end)])
+            _new_data.append(_subset)
+        #     if isinstance(self._unlist_data, np.ndarray):
+        #         new_data.append(self._unlist_data[start:end])
+        #     else:
+        #         new_data.extend(self._unlist_data[start:end])
+
+        # if isinstance(self._unlist_data, np.ndarray):
+        #     new_data = np.concatenate(new_data)
+
+        if len(_new_data) == 1:
+            new_data = _new_data[0]
+        elif len(_new_data) > 0:
+            new_data = ut.combine_sequences(*_new_data)
+        else:
+            new_data = []
 
         current_class_const = type(self)
         return current_class_const(
             new_data,
             new_partitioning,
             element_type=self._element_type,
-            element_metadata={k: v for k, v in self._element_metadata.items() if k in indices},
+            element_metadata=self._element_metadata[indices,],
             metadata=self._metadata.copy(),
         )
 

{compressed_lists-0.4.2 → compressed_lists-0.4.4}/src/compressed_lists/biocframe_list.py

@@ -133,8 +133,7 @@ class CompressedSplitBiocFrameList(CompressedList):
             else self._element_type
         )
 
-        if len(self._element_metadata) > 0:
-            output += ", element_metadata=" + ut.print_truncated_dict(self._element_metadata)
+        output += ", element_metadata=" + self._element_metadata.__repr__()
 
         if len(self._metadata) > 0:
             output += ", metadata=" + ut.print_truncated_dict(self._metadata)
@@ -155,7 +154,7 @@ class CompressedSplitBiocFrameList(CompressedList):
 
         output += f"partitioning: {ut.print_truncated_list(self._partitioning)}\n"
 
-        output += f"element_metadata({str(len(self._element_metadata))}): {ut.print_truncated_list(list(self._element_metadata.keys()), sep=' ', include_brackets=False, transform=lambda y: y)}\n"
+        output += f"element_metadata({str(len(self._element_metadata))} rows): {ut.print_truncated_list(list(self._element_metadata.get_column_names()), sep=' ', include_brackets=False, transform=lambda y: y)}\n"
         output += f"metadata({str(len(self._metadata))}): {ut.print_truncated_list(list(self._metadata.keys()), sep=' ', include_brackets=False, transform=lambda y: y)}\n"
 
         return output

{compressed_lists-0.4.2 → compressed_lists-0.4.4}/src/compressed_lists.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: compressed-lists
-Version: 0.4.2
+Version: 0.4.4
 Summary: Memory-efficient container for list-like objects
 Home-page: https://github.com/biocpy/compressed-lists
 Author: Jayaram Kancherla
@@ -14,9 +14,9 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
 License-File: LICENSE.txt
 Requires-Dist: importlib-metadata; python_version < "3.8"
-Requires-Dist: biocutils>=0.3.1
+Requires-Dist: biocutils>=0.3.3
 Requires-Dist: numpy
-Requires-Dist: biocframe>=0.7.1
+Requires-Dist: biocframe>=0.7.2
 Provides-Extra: testing
 Requires-Dist: setuptools; extra == "testing"
 Requires-Dist: pytest; extra == "testing"

{compressed_lists-0.4.2 → compressed_lists-0.4.4}/src/compressed_lists.egg-info/requires.txt

@@ -1,6 +1,6 @@
-biocutils>=0.3.1
+biocutils>=0.3.3
 numpy
-biocframe>=0.7.1
+biocframe>=0.7.2
 
 [:python_version < "3.8"]
 importlib-metadata

{compressed_lists-0.4.2 → compressed_lists-0.4.4}/tests/test_base.py

@@ -4,6 +4,7 @@ import biocutils as ut
 import pytest
 
 from compressed_lists import CompressedList
+from biocframe import BiocFrame
 
 __author__ = "Jayaram Kancherla"
 __copyright__ = "Jayaram Kancherla"
@@ -95,14 +96,13 @@ def test_base_metadata(base_list):
         base_list.metadata = meta
     assert base_list.metadata == ut.NamedList.from_dict({"source": "test"})
 
-    el_meta = {"info": "details"}
+    el_meta = BiocFrame({"score": [1, 2, 3]})
     cl_el_meta = base_list.set_element_metadata(el_meta, in_place=False)
-    assert base_list.element_metadata == {}
-    assert cl_el_meta.element_metadata == {"info": "details"}
+    assert len(base_list.element_metadata) == 3
+    assert cl_el_meta.element_metadata.get_column("score") == el_meta.get_column("score")
 
-    with pytest.warns(UserWarning, match="Setting property 'element_metadata'"):
-        base_list.element_metadata = el_meta
-    assert base_list.element_metadata == {"info": "details"}
+    with pytest.raises(Exception):
+        base_list.element_metadata = {"info": "details"}
 
 
 def test_base_copying(base_list):

{compressed_lists-0.4.2 → compressed_lists-0.4.4}/tests/test_comp_biocframe.py

@@ -46,7 +46,6 @@ def test_bframe_typed_list_column():
 
 def test_split_biocframe(frame_data):
     frame_data.set_column("groups", [0, 0, 1], in_place=True)
-    print(frame_data)
     clist = splitAsCompressedList(frame_data, groups_or_partitions=frame_data.get_column("groups"))
 
     assert isinstance(clist, CompressedSplitBiocFrameList)

{compressed_lists-0.4.2 → compressed_lists-0.4.4}/tests/test_comp_bool.py

@@ -1,5 +1,5 @@
 import pytest
-from biocutils.boolean_list import BooleanList
+from biocutils import BooleanList
 
 from compressed_lists import CompressedBooleanList
 

{compressed_lists-0.4.2 → compressed_lists-0.4.4}/tests/test_comp_float.py

@@ -1,5 +1,5 @@
 import pytest
-from biocutils.float_list import FloatList
+from biocutils import FloatList
 
 from compressed_lists import CompressedFloatList
 

{compressed_lists-0.4.2 → compressed_lists-0.4.4}/tests/test_comp_int.py

@@ -1,6 +1,6 @@
 import numpy as np
 import pytest
-from biocutils.integer_list import IntegerList
+from biocutils import IntegerList
 
 from compressed_lists import CompressedIntegerList, Partitioning
 

{compressed_lists-0.4.2 → compressed_lists-0.4.4}/tests/test_comp_str.py

@@ -1,5 +1,5 @@
 import pytest
-from biocutils.string_list import StringList
+from biocutils import StringList
 
 from compressed_lists import CompressedStringList