sapiopycommons 2025.4.8a474__py3-none-any.whl → 2025.4.9a150__py3-none-any.whl

sapiopycommons/files/file_util.py

@@ -21,14 +21,10 @@ class FileUtil:
     Utilities for the handling of files, including the requesting of files from the user and the parsing of files into
     tokenized lists. Makes use of Pandas DataFrames for any file parsing purposes.
     """
-    # PR-47433: Add a keep_default_na argument to FileUtil.tokenize_csv and FileUtil.tokenize_xlsx so that N/A values
-    # don't get returned as NoneType, and add **kwargs in case any other Pandas input parameters need changed by the
-    # caller.
     @staticmethod
     def tokenize_csv(file_bytes: bytes, required_headers: list[str] | None = None, header_row_index: int | None = 0,
                      seperator: str = ",", *, encoding: str | None = None, encoding_error: str | None = "strict",
-                     exception_on_empty: bool = True, keep_default_na: bool = False, **kwargs) \
-            -> tuple[list[dict[str, str]], list[list[str]]]:
+                     exception_on_empty: bool = True) -> tuple[list[dict[str, str]], list[list[str]]]:
         """
         Tokenize a CSV file. The provided file must be uniform. That is, if row 1 has 10 cells, all the rows in the file
         must have 10 cells. Otherwise, the Pandas parser throws a tokenizer exception.
@@ -50,9 +46,6 @@ class FileUtil:
             https://docs.python.org/3/library/codecs.html#error-handlers
         :param exception_on_empty: Throw a user error exception if the provided file bytes result in an empty list in
             the first element of the returned tuple.
-        :param keep_default_na: If False, values that are recognized as NaN (e.g. N/A, NA, NaN) will remain as strings.
-            If True, these values will be converted to a NoneType value.
-        :param kwargs: Additional arguments to be passed to the pandas read_csv function.
         :return: The CSV parsed into a list of dicts where each dict is a row, mapping the headers to the cells for
             that row. Also returns a list of each row above the headers (the metadata), parsed into a list of each cell.
             If the header row index is 0 or None, this list will be empty.
@@ -60,8 +53,7 @@ class FileUtil:
         # Parse the file bytes into two DataFrames. The first is metadata of the file located above the header row,
         # while the second is the body of the file below the header row.
         file_body, file_metadata = FileUtil.csv_to_data_frames(file_bytes, header_row_index, seperator,
-                                                               encoding=encoding, encoding_error=encoding_error,
-                                                               keep_default_na=keep_default_na, **kwargs)
+                                                               encoding=encoding, encoding_error=encoding_error)
         # Parse the metadata from above the header row index into a list of lists.
         metadata: list[list[str]] = FileUtil.data_frame_to_lists(file_metadata)
         # Parse the data from the file body into a list of dicts.
@@ -72,8 +64,7 @@ class FileUtil:
 
     @staticmethod
     def tokenize_xlsx(file_bytes: bytes, required_headers: list[str] | None = None, header_row_index: int | None = 0,
-                      *, exception_on_empty: bool = True, keep_default_na: bool = False, **kwargs) \
-            -> tuple[list[dict[str, str]], list[list[str]]]:
+                      *, exception_on_empty: bool = True) -> tuple[list[dict[str, str]], list[list[str]]]:
         """
         Tokenize an XLSX file row by row.
 
@@ -86,17 +77,13 @@ class FileUtil:
             is assumed to be the header row.
         :param exception_on_empty: Throw a user error exception if the provided file bytes result in an empty list in
             the first element of the returned tuple.
-        :param keep_default_na: If False, values that are recognized as NaN (e.g. N/A, NA, NaN) will remain as strings.
-            If True, these values will be converted to a NoneType value.
-        :param kwargs: Additional arguments to be passed to the pandas read_excel function.
         :return: The XLSX parsed into a list of dicts where each dict is a row, mapping the headers to the cells for
             that row. Also returns a list of each row above the headers (the metadata), parsed into a list of each cell.
             If the header row index is 0 or None, this list will be empty.
         """
         # Parse the file bytes into two DataFrames. The first is metadata of the file located above the header row,
         # while the second is the body of the file below the header row.
-        file_body, file_metadata = FileUtil.xlsx_to_data_frames(file_bytes, header_row_index,
-                                                                keep_default_na=keep_default_na, **kwargs)
+        file_body, file_metadata = FileUtil.xlsx_to_data_frames(file_bytes, header_row_index)
         # Parse the metadata from above the header row index into a list of lists.
         metadata: list[list[str]] = FileUtil.data_frame_to_lists(file_metadata)
         # Parse the data from the file body into a list of dicts.
@@ -107,8 +94,7 @@ class FileUtil:
 
     @staticmethod
     def csv_to_data_frames(file_bytes: bytes, header_row_index: int | None = 0, seperator: str = ",",
-                           *, encoding: str | None = None, encoding_error: str | None = "strict",
-                           keep_default_na: bool = False, **kwargs) \
+                           *, encoding: str | None = None, encoding_error: str | None = "strict") \
             -> tuple[DataFrame, DataFrame | None]:
         """
         Parse the file bytes for a CSV into DataFrames. The provided file must be uniform. That is, if row 1 has 10
@@ -127,9 +113,6 @@ class FileUtil:
             is "strict", meaning that encoding errors raise an exception. Change this to "ignore" to skip over invalid
             characters or "replace" to replace invalid characters with a ? character. For a full list of options, see
             https://docs.python.org/3/library/codecs.html#error-handlers
-        :param keep_default_na: If False, values that are recognized as NaN (e.g. N/A, NA, NaN) will remain as strings.
-            If True, these values will be converted to a NoneType value.
-        :param kwargs: Additional arguments to be passed to the pandas read_csv function.
         :return: A tuple of two DataFrames. The first is the frame for the CSV table body, while the second is for the
             metadata from above the header row, or None if there is no metadata.
         """
@@ -142,21 +125,19 @@ class FileUtil:
                 file_metadata = pandas.read_csv(file_io, header=None, dtype=dtype(str),
                                                 skiprows=lambda x: x >= header_row_index,
                                                 skip_blank_lines=False, sep=seperator, encoding=encoding,
-                                                encoding_errors=encoding_error, keep_default_na=keep_default_na,
-                                                **kwargs)
+                                                encoding_errors=encoding_error)
         with io.BytesIO(file_bytes) as file_io:
             # The use of the dtype argument is to ensure that everything from the file gets read as a string. Added
             # because some numerical values would get ".0" appended to them, even when casting the DataFrame cell to a
             # string.
             file_body: DataFrame = pandas.read_csv(file_io, header=header_row_index, dtype=dtype(str),
-                                                   skip_blank_lines=False, sep=seperator, encoding=encoding,
-                                                   keep_default_na=keep_default_na, **kwargs)
+                                                   skip_blank_lines=False, sep=seperator, encoding=encoding)
 
         return file_body, file_metadata
 
     @staticmethod
-    def xlsx_to_data_frames(file_bytes: bytes, header_row_index: int | None = 0, *, keep_default_na: bool = False,
-                            **kwargs) -> tuple[DataFrame, DataFrame | None]:
+    def xlsx_to_data_frames(file_bytes: bytes, header_row_index: int | None = 0) \
+            -> tuple[DataFrame, DataFrame | None]:
         """
         Parse the file bytes for an XLSX into DataFrames.
 
@@ -165,9 +146,6 @@ class FileUtil:
             row is returned in the metadata list. If input is None, then no row is considered to be the header row,
             meaning that required headers are also ignored if any are provided. By default, the first row (0th index)
             is assumed to be the header row.
-        :param keep_default_na: If False, values that are recognized as NaN (e.g. N/A, NA, NaN) will remain as strings.
-            If True, these values will be converted to a NoneType value.
-        :param kwargs: Additional arguments to be passed to the pandas read_excel function.
         :return: A tuple of two DataFrames. The first is the frame for the XLSX table body, while the second is for the
             metadata from above the header row, or None if there is no metadata.
         """
@@ -177,14 +155,12 @@ class FileUtil:
                 # The metadata DataFrame has no headers and only consists of the rows above the header row index.
                 # Therefore, we skip every row including and past the header.
                 file_metadata = pandas.read_excel(file_io, header=None, dtype=dtype(str),
-                                                  skiprows=lambda x: x >= header_row_index,
-                                                  keep_default_na=keep_default_na, **kwargs)
+                                                  skiprows=lambda x: x >= header_row_index)
         with io.BytesIO(file_bytes) as file_io:
             # The use of the dtype argument is to ensure that everything from the file gets read as a string. Added
             # because some numerical values would get ".0" appended to them, even when casting the DataFrame cell to a
             # string.
-            file_body: DataFrame = pandas.read_excel(file_io, header=header_row_index, dtype=dtype(str),
-                                                     keep_default_na=keep_default_na, **kwargs)
+            file_body: DataFrame = pandas.read_excel(file_io, header=header_row_index, dtype=dtype(str))
 
         return file_body, file_metadata
 
@@ -279,7 +255,6 @@ class FileUtil:
             data_frame = pandas.read_csv(csv, sep=",", header=None)
 
         with io.BytesIO() as output:
-            # noinspection PyTypeChecker
             with pandas.ExcelWriter(output, engine='xlsxwriter') as writer:
                 # Setting header and index to false makes the CSV convert to an XLSX as-is.
                 data_frame.to_excel(writer, sheet_name='Sheet1', header=False, index=False)
@@ -327,10 +302,10 @@ class FileUtil:
         :param files: A dictionary of file name to file data as a string or bytes.
         :return: The bytes for a zip file containing the input files.
         """
-        with io.BytesIO() as zip_buffer:
-            with zipfile.ZipFile(zip_buffer, "w", zipfile.ZIP_DEFLATED) as zip_file:
-                for file_name, file_data in files.items():
-                    zip_file.writestr(file_name, file_data)
+        zip_buffer: io.BytesIO = io.BytesIO()
+        with zipfile.ZipFile(zip_buffer, "w", zipfile.ZIP_DEFLATED) as zip_file:
+            for file_name, file_data in files.items():
+                zip_file.writestr(file_name, file_data)
         return zip_buffer.getvalue()
 
     # Deprecated functions:

sapiopycommons/files/file_validator.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import re
 from abc import abstractmethod
 from typing import Any
 
@@ -10,9 +9,9 @@ from sapiopylib.rest.pojo.datatype.FieldDefinition import VeloxIntegerFieldDefin
     AbstractVeloxFieldDefinition
 
 from sapiopycommons.callbacks.callback_util import CallbackUtil
-from sapiopycommons.customreport.auto_pagers import QuickReportDictAutoPager
 from sapiopycommons.files.file_data_handler import FileDataHandler, FilterList
 from sapiopycommons.general.aliases import UserIdentifier, AliasUtil
+from sapiopycommons.general.custom_report_util import CustomReportUtil
 from sapiopycommons.general.exceptions import SapioUserCancelledException
 from sapiopycommons.general.time_util import TimeUtil
 
@@ -312,8 +311,8 @@ class MatchesPatternRule(ColumnRule):
     """
     pattern: str
 
-    def __init__(self, header: str, pattern: str | re.Pattern[str], *, reason: str | None = None,
-                 whitelist: FilterList = None, blacklist: FilterList = None):
+    def __init__(self, header: str, pattern: str, *, reason: str | None = None, whitelist: FilterList = None,
+                 blacklist: FilterList = None):
         """
         :param header: The header that this rule acts upon.
         :param pattern: A regex pattern.
@@ -530,7 +529,7 @@ class UniqueSystemValueRule(ColumnRule):
         # Run a quick report for all records of this type that match these field values.
         term = RawReportTerm(self.data_type_name, self.data_field_name, RawTermOperation.EQUAL_TO_OPERATOR,
                              "{" + ",".join(values) + "}")
-        results: list[dict[str, Any]] = QuickReportDictAutoPager(self.user, term).get_all_at_once()
+        results: list[dict[str, Any]] = CustomReportUtil.run_quick_report(self.user, term)
         existing_values: list[Any] = [x.get(self.data_field_name) for x in results]
         return file_handler.get_in_list(self.header, existing_values)
 
@@ -564,6 +563,6 @@ class ExistingSystemValueRule(ColumnRule):
         # Run a quick report for all records of this type that match these field values.
         term = RawReportTerm(self.data_type_name, self.data_field_name, RawTermOperation.EQUAL_TO_OPERATOR,
                              "{" + ",".join(values) + "}")
-        results: list[dict[str, Any]] = QuickReportDictAutoPager(self.user, term).get_all_at_once()
+        results: list[dict[str, Any]] = CustomReportUtil.run_quick_report(self.user, term)
         existing_values: list[Any] = [x.get(self.data_field_name) for x in results]
         return file_handler.get_not_in_list(self.header, existing_values)

sapiopycommons/files/file_writer.py

@@ -307,7 +307,7 @@ class FieldColumn(ColumnDef):
         elif self.search_order == FieldSearchOrder.BUNDLE_ONLY:
             return row.fields.get(self.field_name)
         elif self.search_order == FieldSearchOrder.RECORD_FIRST:
-            fields: dict[str, Any] = AliasUtil.to_field_map(record) if record else {}
+            fields: dict[str, Any] = AliasUtil.to_field_map_lists([record])[0] if record else {}
             if self.field_name not in fields or (self.skip_none_values and fields.get(self.field_name) is None):
                 return row.fields.get(self.field_name)
             return fields.get(self.field_name)

sapiopycommons/flowcyto/flow_cyto.py

@@ -2,8 +2,8 @@ from __future__ import annotations
 
 from weakref import WeakValueDictionary
 
-from databind.json import dumps
 from sapiopylib.rest.User import SapioUser
+from databind.json import dumps
 
 from sapiopycommons.flowcyto.flowcyto_data import FlowJoWorkspaceInputJson, UploadFCSInputJson, \
     ComputeFlowStatisticsInputJson

sapiopycommons/general/accession_service.py

@@ -95,7 +95,7 @@ class AccessionWithPrefixSuffix(AbstractAccessionServiceOperator):
 
     @property
     def default_accessor_name(self):
-        return "PREFIX_AND_SUFFIX" + "(" + self.prefix + "," + self.suffix + ")"
+        return "PREFIX_AND_SUFFIX" + "(" + self.prefix + "," + self.suffix + ")";
 
 
 class AccessionGlobalPrefixSuffix(AbstractAccessionServiceOperator):
@@ -199,7 +199,7 @@ class AccessionRequestId(AbstractAccessionServiceOperator):
 
     Properties:
         numberOfCharacters: Number of characters maximum in the request ID.
-        accessorName: This is a legacy variable from drum.getNextIdListByMapName(), which allows setting different "accessorName" from old system. We need this for compatibility patch for converting these to the new preference format.
+        accessorName: This is a legacy variable from drum.getNextIdListByMapName(), which allows setting different "accessorName" from old system. We need this for compability patch for converting these to the new preference format.
     """
     _num_of_characters: int
     _accessor_name: str
@@ -341,7 +341,7 @@ class AccessionService:
     def get_affixed_id_in_batch(self, data_type_name: str, data_field_name: str, num_ids: int, prefix: str | None,
                                 suffix: str | None, num_digits: int | None, start_num: int = 1) -> list[str]:
         """
-        Get the batch affixed IDs that are maximal in cache and contiguous for a particular datatype.datafield under a given format.
+        Get the batch affixed IDs that are maximal in cache and contiguious for a particular datatype.datafield under a given format.
         :param data_type_name: The datatype name to look for max ID
         :param data_field_name: The datafield name to look for max ID
         :param num_ids: The number of IDs to accession.

sapiopycommons/general/aliases.py

@@ -1,53 +1,50 @@
 from collections.abc import Iterable
-from typing import Any, TypeAlias
+from typing import Any
 
 from sapiopylib.rest.User import SapioUser
 from sapiopylib.rest.pojo.DataRecord import DataRecord
-from sapiopylib.rest.pojo.datatype.FieldDefinition import FieldType, AbstractVeloxFieldDefinition
+from sapiopylib.rest.pojo.datatype.FieldDefinition import FieldType
 from sapiopylib.rest.pojo.eln.ElnExperiment import ElnExperiment
 from sapiopylib.rest.pojo.eln.ExperimentEntry import ExperimentEntry
 from sapiopylib.rest.pojo.eln.SapioELNEnums import ElnBaseDataType
-from sapiopylib.rest.pojo.eln.eln_headings import ElnExperimentTab
 from sapiopylib.rest.pojo.webhook.WebhookContext import SapioWebhookContext
 from sapiopylib.rest.utils.Protocols import ElnExperimentProtocol, ElnEntryStep
-from sapiopylib.rest.utils.recordmodel.PyRecordModel import PyRecordModel, AbstractRecordModel
+from sapiopylib.rest.utils.recordmodel.PyRecordModel import PyRecordModel
 from sapiopylib.rest.utils.recordmodel.RecordModelWrapper import WrappedRecordModel, WrappedType, WrapperField
 
 from sapiopycommons.general.exceptions import SapioException
 
-FieldValue: TypeAlias = int | float | str | bool | None
+FieldValue = int | float | str | bool | None
 """Allowable values for fields in the system."""
-RecordModel: TypeAlias = PyRecordModel | AbstractRecordModel | WrappedRecordModel
+RecordModel = PyRecordModel | WrappedRecordModel
 """Different forms that a record model could take."""
-SapioRecord: TypeAlias = DataRecord | RecordModel
+SapioRecord = DataRecord | RecordModel
 """A record could be provided as either a DataRecord, PyRecordModel, or WrappedRecordModel (WrappedType)."""
-RecordIdentifier: TypeAlias = SapioRecord | int
+RecordIdentifier = SapioRecord | int
 """A RecordIdentifier is either a record type or an integer for the record's record ID."""
-DataTypeIdentifier: TypeAlias = SapioRecord | type[WrappedType] | str
+DataTypeIdentifier = SapioRecord | type[WrappedType] | str
 """A DataTypeIdentifier is either a SapioRecord, a record model wrapper type, or a string."""
-FieldIdentifier: TypeAlias = AbstractVeloxFieldDefinition | WrapperField | str | tuple[str, FieldType]
+FieldIdentifier = WrapperField | str | tuple[str, FieldType]
 """A FieldIdentifier is either wrapper field from a record model wrapper, a string, or a tuple of string
 and field type."""
-FieldIdentifierKey: TypeAlias = WrapperField | str
+FieldIdentifierKey = WrapperField | str
 """A FieldIdentifierKey is a FieldIdentifier, except it can't be a tuple, s tuples can't be used as keys in
 dictionaries.."""
-HasFieldWrappers: TypeAlias = type[WrappedType] | WrappedRecordModel
+HasFieldWrappers = type[WrappedType] | WrappedRecordModel
 """An identifier for classes that have wrapper fields."""
-ExperimentIdentifier: TypeAlias = ElnExperimentProtocol | ElnExperiment | int
+ExperimentIdentifier = ElnExperimentProtocol | ElnExperiment | int
 """An ExperimentIdentifier is either an experiment protocol, experiment, or an integer for the experiment's notebook
 ID."""
-ExperimentEntryIdentifier: TypeAlias = ElnEntryStep | ExperimentEntry | int
+ExperimentEntryIdentifier = ElnEntryStep | ExperimentEntry | int
 """An ExperimentEntryIdentifier is either an ELN entry step, experiment entry, or an integer for the entry's ID."""
-TabIdentifier: TypeAlias = int | ElnExperimentTab
-"""A TabIdentifier is either an integer for the tab's ID or an ElnExperimentTab object."""
-FieldMap: TypeAlias = dict[str, FieldValue]
+FieldMap = dict[str, FieldValue]
 """A field map is simply a dict of data field names to values. The purpose of aliasing this is to help distinguish
 any random dict in a webhook from one which is explicitly used for record fields."""
-FieldIdentifierMap: TypeAlias = dict[FieldIdentifierKey, FieldValue]
+FieldIdentifierMap = dict[FieldIdentifierKey, FieldValue]
 """A field identifier map is the same thing as a field map, except the keys can be field identifiers instead
 of just strings. Note that although one of the allowed field identifiers is a tuple, you can't use tuples as
 keys in a dictionary."""
-UserIdentifier: TypeAlias = SapioWebhookContext | SapioUser
+UserIdentifier = SapioWebhookContext | SapioUser
 """An identifier for classes from which a user object can be used for sending requests."""
 
 
@@ -145,25 +142,23 @@ class AliasUtil:
     @staticmethod
     def to_data_field_name(value: FieldIdentifier) -> str:
         """
-        Convert an object that can be used to identify a data field to a data field name string.
+        Convert a string or WrapperField to a data field name string.
 
-        :param value: An object that can be used to identify a data field.
+        :param value: A string or WrapperField.
         :return: A string of the data field name of the input value.
         """
         if isinstance(value, tuple):
             return value[0]
         if isinstance(value, WrapperField):
             return value.field_name
-        if isinstance(value, AbstractVeloxFieldDefinition):
-            return value.data_field_name
         return value
 
     @staticmethod
     def to_data_field_names(values: Iterable[FieldIdentifier]) -> list[str]:
         """
-        Convert an iterable of objects that can be used to identify data fields to a list of data field name strings.
+        Convert an iterable of strings or WrapperFields to a list of data field name strings.
 
-        :param values: An iterable of objects that can be used to identify a data field.
+        :param values: An iterable of strings or WrapperFields.
         :return: A list of strings of the data field names of the input values.
         """
         return [AliasUtil.to_data_field_name(x) for x in values]
@@ -210,38 +205,20 @@ class AliasUtil:
                              f"field with the name \"{field}\",")
 
     @staticmethod
-    def to_field_map(record: SapioRecord, include_record_id: bool = False) -> FieldMap:
+    def to_field_map_lists(records: Iterable[SapioRecord]) -> list[FieldMap]:
         """
-        Convert a given record value to a field map.
-
-        :param record: A record which is a DataRecord, PyRecordModel, or WrappedRecordModel.
-        :param include_record_id: If true, include the record ID of the record in the field map using the RecordId key.
-        :return: The field map for the input record.
-        """
-        if isinstance(record, DataRecord):
-            # noinspection PyTypeChecker
-            fields: FieldMap = record.get_fields()
-        else:
-            fields: FieldMap = record.fields.copy_to_dict()
-        # PR-47457: Only include the record ID if the caller requests it, since including the record ID can break
-        # callbacks in certain circumstances if the record ID is negative.
-        if include_record_id:
-            fields["RecordId"] = AliasUtil.to_record_id(record)
-        return fields
-
-    @staticmethod
-    def to_field_map_list(records: Iterable[SapioRecord], include_record_id: bool = False) -> list[FieldMap]:
-        """
-        Convert a list of variables that could either be DataRecords, PyRecordModels, or WrappedRecordModels
-        to a list of their field maps. This includes the given RecordId of the given records.
+        Convert a list of variables that could either be DataRecords, PyRecordModels,
+        or WrappedRecordModels to a list of their field maps.
 
-        :param records: An iterable of records which are DataRecords, PyRecordModels, or WrappedRecordModels.
-        :param include_record_id: If true, include the record ID of the records in the field map using the RecordId key.
         :return: A list of field maps for the input records.
         """
         field_map_list: list[FieldMap] = []
         for record in records:
-            field_map_list.append(AliasUtil.to_field_map(record, include_record_id))
+            if isinstance(record, DataRecord):
+                # noinspection PyTypeChecker
+                field_map_list.append(record.get_fields())
+            else:
+                field_map_list.append(record.fields.copy_to_dict())
         return field_map_list
 
     @staticmethod

sapiopycommons/general/audit_log.py

@@ -3,11 +3,11 @@ from enum import Enum
 from sapiopylib.rest.User import SapioUser
 from sapiopylib.rest.pojo.CustomReport import ReportColumn, CustomReportCriteria
 
-from sapiopycommons.customreport.auto_pagers import CustomReportDictAutoPager
 from sapiopycommons.customreport.column_builder import ColumnBuilder
 from sapiopycommons.customreport.term_builder import TermBuilder
 from sapiopycommons.datatype.pseudo_data_types import AuditLogPseudoDef
 from sapiopycommons.general.aliases import RecordIdentifier, AliasUtil, UserIdentifier, FieldIdentifier, FieldValue
+from sapiopycommons.general.custom_report_util import CustomReportUtil
 
 
 class EventType(Enum):
@@ -164,7 +164,7 @@ class AuditLogUtil:
         criteria = AuditLogUtil.create_data_record_audit_log_report(records, fields)
 
         # Then we must run the custom report using that criteria.
-        raw_report_data: list[dict[str, FieldValue]] = CustomReportDictAutoPager(self.user, criteria).get_all_at_once()
+        raw_report_data: list[dict[str, FieldValue]] = CustomReportUtil.run_custom_report(self.user, criteria)
 
         # This section will prepare a map matching the original RecordIdentifier by record id.
         # This is because the audit log entries will have record ids, but we want the keys in our result map

sapiopycommons/general/custom_report_util.py

@@ -1,4 +1,3 @@
-import warnings
 from collections.abc import Iterable
 
 from sapiopylib.rest.DataMgmtService import DataMgmtServer
@@ -41,7 +40,6 @@ class CustomReportUtil:
             had a Sample column with a data field name of Identifier and a Request column with the same data field name,
             then the dictionary keys for these columns would be Sample.Identifier and Request.Identifier respectively.
         """
-        warnings.warn("Deprecated in favor of the SystemReportDictAutoPager class.", DeprecationWarning)
         results: tuple = CustomReportUtil._exhaust_system_report(context, report_name, page_limit,
                                                                  page_size, page_number)
         columns: list[ReportColumn] = results[0]
@@ -84,7 +82,6 @@ class CustomReportUtil:
             had a Sample column with a data field name of Identifier and a Request column with the same data field name,
             then the dictionary keys for these columns would be Sample.Identifier and Request.Identifier respectively.
         """
-        warnings.warn("Deprecated in favor of the CustomReportDictAutoPager class.", DeprecationWarning)
         results: tuple = CustomReportUtil._exhaust_custom_report(context, report_criteria, page_limit,
                                                                  page_size, page_number)
         columns: list[ReportColumn] = results[0]
@@ -120,7 +117,6 @@ class CustomReportUtil:
         :return: The results of the report listed row by row, mapping each cell to the header it is under. The header
             values in the dicts are the data field names of the columns.
         """
-        warnings.warn("Deprecated in favor of the QuickReportDictAutoPager class.", DeprecationWarning)
         results: tuple = CustomReportUtil._exhaust_quick_report(context, report_term, page_limit,
                                                                 page_size, page_number)
         columns: list[ReportColumn] = results[0]
@@ -131,8 +127,7 @@ class CustomReportUtil:
     def get_system_report_criteria(context: UserIdentifier, report_name: str) -> CustomReport:
         """
         Retrieve a custom report from the system given the name of the report. This works by querying the system report
-        with a page number of 0 and page size of 1 to minimize the amount of data transfer needed to retrieve the
-        report's config.
+        with a page number and size of 1 to minimize the amount of data transfer needed to retrieve the report's config.
 
         System reports are also known as predefined searches in the system and must be defined in the data designer for
         a specific data type. That is, saved searches created by users cannot be run using this function.
@@ -148,24 +143,6 @@ class CustomReportUtil:
         report_man = DataMgmtServer.get_custom_report_manager(user)
         return report_man.run_system_report_by_name(report_name, 1, 0)
 
-    @staticmethod
-    def get_quick_report_criteria(context: UserIdentifier, report_term: RawReportTerm) -> CustomReport:
-        """
-        Retrieve a quick report from the system given a report term. This works by making a quick report query
-        with a page number of 0 and page size of 1 to minimize the amount of data transfer needed to retrieve the
-        report's config.
-
-        Using this, you can add to the root term of the search to then run a new search, or provide it to client
-        callbacks or directives that take CustomReports.
-
-        :param context: The current webhook context or a user object to send requests from.
-        :param report_term: The raw report term to use for the quick report.
-        :return: The CustomReport object for the given report term.
-        """
-        user: SapioUser = AliasUtil.to_sapio_user(context)
-        report_man = DataMgmtServer.get_custom_report_manager(user)
-        return report_man.run_quick_report(report_term, 1, 0)
-
     @staticmethod
     def _exhaust_system_report(context: UserIdentifier,
                                report_name: str,

sapiopycommons/general/exceptions.py

@@ -1,20 +1,3 @@
-from enum import Enum
-
-
-class MessageDisplayType(Enum):
-    """
-    An enum representing the different ways in which a message can be displayed to the user.
-    """
-    TOASTER_SUCCESS = 0
-    TOASTER_INFO = 1
-    TOASTER_WARNING = 2
-    TOASTER_ERROR = 3
-    OK_DIALOG = 4
-    DISPLAY_INFO = 5
-    DISPLAY_WARNING = 6
-    DISPLAY_ERROR = 7
-
-
 # FR-46064 - Initial port of PyWebhookUtils to sapiopycommons.
 class SapioException(Exception):
     """
@@ -46,29 +29,7 @@ class SapioDialogTimeoutException(SapioException):
     pass
 
 
-class DisplayableException(SapioException):
-    """
-    A generic exception that promises to return a user-friendly message explaining the error that should be displayed to
-    the user. Note that it is up to whichever class that catches this exception to actually display the message.
-    """
-    msg: str
-    display_type: MessageDisplayType | None
-    title: str | None
-
-    def __init__(self, msg: str, display_type: MessageDisplayType | None = None, title: str | None = None):
-        """
-        :param msg: The message that should be displayed to the user.
-        :param display_type: The manner in which the message should be displayed. If None, then the display type should
-            be controlled by the class that catches this exception.
-        :param title: If the display type is able to have a title, this is the title that will be displayed. If None,
-            then the title should be controlled by the class that catches this exception.
-        """
-        self.msg = msg
-        self.display_type = display_type
-        self.title = title
-
-
-class SapioUserErrorException(DisplayableException):
+class SapioUserErrorException(SapioException):
     """
     An exception caused by user error (e.g. user provided a CSV when an XLSX was expected), which promises to return a
     user-friendly message explaining the error that should be displayed to the user.
@@ -78,7 +39,7 @@ class SapioUserErrorException(DisplayableException):
     pass
 
 
-class SapioCriticalErrorException(DisplayableException):
+class SapioCriticalErrorException(SapioException):
     """
     A critical exception caused by user error, which promises to return a user-friendly message explaining the error
     that should be displayed to the user.

sapiopycommons/general/popup_util.py

@@ -311,7 +311,7 @@ class PopupUtil:
             raise SapioException("Multiple data type names encountered in records list for record table popup.")
         data_type: str = data_types.pop()
         # Get the field maps from the records.
-        field_map_list: list[FieldMap] = AliasUtil.to_field_map_list(records)
+        field_map_list: list[FieldMap] = AliasUtil.to_field_map_lists(records)
         # Get the field definitions of the data type.
         type_man = DataMgmtServer.get_data_type_manager(context.user)
         type_def: DataTypeDefinition = type_man.get_data_type_definition(data_type)
@@ -366,7 +366,7 @@ class PopupUtil:
             raise SapioException("Multiple data type names encountered in records list for record table popup.")
         data_type: str = data_types.pop()
         # Get the field maps from the records.
-        field_map_list: list[FieldMap] = AliasUtil.to_field_map_list(records)
+        field_map_list: list[FieldMap] = AliasUtil.to_field_map_lists(records)
         # Get the field definitions of the data type.
         type_man = DataMgmtServer.get_data_type_manager(context.user)
         type_def: DataTypeDefinition = type_man.get_data_type_definition(data_type)

sapiopycommons/multimodal/multimodal.py

@@ -6,7 +6,6 @@ from weakref import WeakValueDictionary
 
 from databind.json import dumps, loads
 from sapiopylib.rest.User import SapioUser
-from sapiopylib.rest.pojo.DataRecord import DataRecord
 
 from sapiopycommons.general.exceptions import SapioException
 from sapiopycommons.multimodal.multimodal_data import *