sapiopycommons 2025.6.11a561__py3-none-any.whl → 2025.6.18a563__py3-none-any.whl

sapiopycommons/callbacks/callback_util.py

@@ -4,7 +4,7 @@ import io
 import re
 import warnings
 from copy import copy
-from typing import Iterable, TypeAlias, Any, Callable, Container, Collection
+from typing import Iterable, TypeAlias, Any, Callable
 from weakref import WeakValueDictionary
 
 from requests import ReadTimeout
@@ -38,18 +38,11 @@ from sapiopycommons.general.aliases import FieldMap, SapioRecord, AliasUtil, Rec
 from sapiopycommons.general.custom_report_util import CustomReportUtil
 from sapiopycommons.general.exceptions import SapioUserCancelledException, SapioException, SapioUserErrorException, \
     SapioDialogTimeoutException
-from sapiopycommons.general.time_util import TimeUtil
 from sapiopycommons.recordmodel.record_handler import RecordHandler
 
 DataTypeLayoutIdentifier: TypeAlias = DataTypeLayout | str | None
 
 
-# CR-47521: Updated various parameter type hints from list or Iterable to more specific type hints.
-# If we need to iterate over the parameter, then it is Iterable.
-# If we need to see if the parameter contains a value, then it is Container.
-# If the length/size of the parameter is needed, then it is Collection.
-# If we need to access the parameter by an index, then it is Sequence. (This excludes sets and dictionaries, so it's
-# probably better to accept a Collection then cast the parameter to a list if you need to get an element from it.)
 class CallbackUtil:
     user: SapioUser
     callback: ClientCallback
@@ -200,7 +193,7 @@ class CallbackUtil:
     def ok_cancel_dialog(self, title: str, msg: str, default_ok: bool = True) -> bool:
         """
         Create an option dialog where the only options are "OK" and "Cancel". Doesn't allow the user to cancel the
-        dialog using the X in the top right corner.
+        dialog using the X at the top right corner.
 
         :param title: The title of the dialog.
         :param msg: The message to display in the dialog. This can be formatted using HTML elements.
@@ -212,7 +205,7 @@ class CallbackUtil:
     def yes_no_dialog(self, title: str, msg: str, default_yes: bool = True) -> bool:
         """
         Create an option dialog where the only options are "Yes" and "No". Doesn't allow the user to cancel the
-        dialog using the X in the top right corner.
+        dialog using the X at the top right corner.
 
         :param title: The title of the dialog.
         :param msg: The message to display in the dialog. This can be formatted using HTML elements.
@@ -265,7 +258,7 @@ class CallbackUtil:
     def form_dialog(self,
                     title: str,
                     msg: str,
-                    fields: Iterable[AbstractVeloxFieldDefinition],
+                    fields: list[AbstractVeloxFieldDefinition],
                     values: FieldMap = None,
                     column_positions: dict[str, tuple[int, int]] = None,
                     *,
@@ -303,7 +296,7 @@ class CallbackUtil:
     def record_form_dialog(self,
                            title: str,
                            msg: str,
-                           fields: Iterable[FieldIdentifier | FieldFilterCriteria] | DataTypeLayoutIdentifier,
+                           fields: list[FieldIdentifier | FieldFilterCriteria] | DataTypeLayoutIdentifier,
                            record: SapioRecord,
                            column_positions: dict[str, tuple[int, int]] | None = None,
                            editable=None,
@@ -376,7 +369,7 @@ class CallbackUtil:
     def set_record_form_dialog(self,
                                title: str,
                                msg: str,
-                               fields: Iterable[FieldIdentifier | FieldFilterCriteria] | DataTypeLayoutIdentifier,
+                               fields: list[FieldIdentifier | FieldFilterCriteria] | DataTypeLayoutIdentifier,
                                record: SapioRecord,
                                column_positions: dict[str, tuple[int, int]] | None = None,
                                *,
@@ -419,7 +412,7 @@ class CallbackUtil:
     def create_record_form_dialog(self,
                                   title: str,
                                   msg: str,
-                                  fields: Iterable[FieldIdentifier | FieldFilterCriteria] | DataTypeLayoutIdentifier,
+                                  fields: list[FieldIdentifier | FieldFilterCriteria] | DataTypeLayoutIdentifier,
                                   wrapper_type: type[WrappedType] | str,
                                   column_positions: dict[str, tuple[int, int]] | None = None,
                                   *,
@@ -625,14 +618,14 @@ class CallbackUtil:
     def table_dialog(self,
                      title: str,
                      msg: str,
-                     fields: Iterable[AbstractVeloxFieldDefinition],
-                     values: Iterable[FieldMap],
+                     fields: list[AbstractVeloxFieldDefinition],
+                     values: list[FieldMap],
                      *,
                      data_type: DataTypeIdentifier = "Default",
                      display_name: str | None = None,
                      plural_display_name: str | None = None,
                      group_by: FieldIdentifier | None = None,
-                     image_data: Iterable[bytes] | None = None) -> list[FieldMap]:
+                     image_data: list[bytes] | None = None) -> list[FieldMap]:
         """
         Create a table dialog where the user may input data into the fields of the table. Requires that the caller
         provide the definitions of every field in the table.
@@ -667,7 +660,7 @@ class CallbackUtil:
         temp_dt.record_image_assignable = bool(image_data)
 
         # Send the request to the user.
-        request = TableEntryDialogRequest(title, msg, temp_dt, list(values),
+        request = TableEntryDialogRequest(title, msg, temp_dt, values,
                                           record_image_data_list=image_data, group_by_field=group_by,
                                           width_in_pixels=self.width_pixels, width_percentage=self.width_percent)
         response: list[FieldMap] = self.__handle_dialog_request(request, self.callback.show_table_entry_dialog)
@@ -676,15 +669,14 @@ class CallbackUtil:
     def record_table_dialog(self,
                             title: str,
                             msg: str,
-                            fields: Iterable[FieldIdentifier | FieldFilterCriteria] | DataTypeLayoutIdentifier,
-                            records: Iterable[SapioRecord],
+                            fields: list[FieldIdentifier | FieldFilterCriteria] | DataTypeLayoutIdentifier,
+                            records: list[SapioRecord],
                             editable=None,
                             *,
                             default_modifier: FieldModifier | None = None,
                             field_modifiers: dict[FieldIdentifier, FieldModifier] | None = None,
                             group_by: FieldIdentifier | None = None,
-                            image_data: Iterable[bytes] | None = None,
-                            index_field: str | None = None) -> list[FieldMap]:
+                            image_data: list[bytes] | None = None) -> list[FieldMap]:
         """
         Create a table dialog where the user may input data into the fields of the table. The table is constructed from
         a given list of records of a singular type.
@@ -714,12 +706,6 @@ class CallbackUtil:
             The user may remove this grouping if they want to.
         :param image_data: The bytes to the images that should be displayed in the rows of the table. Each element in
             the image data list corresponds to the element at the same index in the records list.
-        :param index_field: If provided, the returned field maps will contain a field with this name that is equal to
-            the record ID of the record at the same index in the records list. This can be used to map the results
-            back to the original records. This is used instead of using a RecordId field, as the RecordId field has
-            special behavior in the system that can cause issues if the given records are uncommitted record models
-            with negative record IDs, meaning we don't want to have a RecordId field in the field maps provided to the
-            system.
         :return: A list of dictionaries mapping the data field names of the given field definitions to the response
             value from the user for that field for each row.
         """
@@ -731,10 +717,7 @@ class CallbackUtil:
         if not records:
             raise SapioException("No records provided.")
         data_type: str = AliasUtil.to_singular_data_type_name(records)
-        if index_field is not None:
-            field_map_list: list[FieldMap] = self.__get_indexed_field_maps(records, index_field)
-        else:
-            field_map_list: list[FieldMap] = AliasUtil.to_field_map_list(records)
+        field_map_list: list[FieldMap] = AliasUtil.to_field_map_list(records)
 
         # Convert the group_by parameter to a field name.
         if group_by is not None:
@@ -767,13 +750,13 @@ class CallbackUtil:
     def set_record_table_dialog(self,
                                 title: str,
                                 msg: str,
-                                fields: Iterable[FieldValue] | DataTypeLayoutIdentifier,
-                                records: Iterable[SapioRecord],
+                                fields: list[FieldValue] | DataTypeLayoutIdentifier,
+                                records: list[SapioRecord],
                                 *,
                                 default_modifier: FieldModifier | None = None,
                                 field_modifiers: dict[FieldIdentifier, FieldModifier] | None = None,
                                 group_by: FieldIdentifier | None = None,
-                                image_data: Iterable[bytes] | None = None):
+                                image_data: list[bytes] | None = None):
         """
         Create a table dialog where the user may input data into the fields of the table. The table is constructed from
         a given list of records of a singular type. After the user submits this dialog, the values that the user
@@ -804,30 +787,25 @@ class CallbackUtil:
         :param image_data: The bytes to the images that should be displayed in the rows of the table. Each element in
             the image data list corresponds to the element at the same index in the records list.
         """
-        # Index the records with a field name that is the current time in milliseconds. This is done to avoid
-        # collisions with any existing field names.
-        index_field: str = f"_{TimeUtil.now_in_millis()}"
         results: list[FieldMap] = self.record_table_dialog(title, msg, fields, records,
                                                            default_modifier=default_modifier,
                                                            field_modifiers=field_modifiers,
-                                                           group_by=group_by, image_data=image_data,
-                                                           index_field=index_field)
+                                                           group_by=group_by, image_data=image_data)
         records_by_id: dict[int, SapioRecord] = self.rec_handler.map_by_id(records)
         for result in results:
-            index: int = result.pop(index_field)
-            records_by_id[index].set_field_values(result)
+            records_by_id[result["RecordId"]].set_field_values(result)
 
     def create_record_table_dialog(self,
                                    title: str,
                                    msg: str,
-                                   fields: Iterable[FieldValue] | DataTypeLayoutIdentifier,
+                                   fields: list[FieldValue] | DataTypeLayoutIdentifier,
                                    wrapper_type: type[WrappedType] | str,
                                    count: int | tuple[int, int],
                                    *,
                                    default_modifier: FieldModifier | None = None,
                                    field_modifiers: dict[FieldIdentifier, FieldModifier] | None = None,
                                    group_by: FieldIdentifier | None = None,
-                                   image_data: Iterable[bytes] | None = None,
+                                   image_data: list[bytes] | None = None,
                                    require_input: bool = False,
                                    repeat_message: str | None = "Please provide a value to continue.") \
             -> list[WrappedType] | list[PyRecordModel]:
@@ -882,15 +860,14 @@ class CallbackUtil:
     def record_adaptive_dialog(self,
                                title: str,
                                msg: str,
-                               fields: Iterable[FieldIdentifier | FieldFilterCriteria] | DataTypeLayoutIdentifier,
-                               records: Collection[SapioRecord],
+                               fields: list[FieldIdentifier | FieldFilterCriteria] | DataTypeLayoutIdentifier,
+                               records: list[SapioRecord],
                                *,
                                default_modifier: FieldModifier | None = None,
                                field_modifiers: dict[FieldIdentifier, FieldModifier] | None = None,
                                column_positions: dict[str, tuple[int, int]] | None = None,
                                group_by: FieldIdentifier | None = None,
-                               image_data: Iterable[bytes] | None = None,
-                               index_field: str | None = None) -> list[FieldMap]:
+                               image_data: list[bytes] | None = None) -> list[FieldMap]:
         """
         Create a dialog where the user may input data into the specified fields. The dialog is constructed from
         a given list of records of a singular type.
@@ -926,12 +903,6 @@ class CallbackUtil:
         :param image_data: The bytes to the images that should be displayed in the rows of the table. Each element in
             the image data list corresponds to the element at the same index in the records list. Only used if the
             adaptive dialog becomes a table.
-        :param index_field: If provided, the returned field maps will contain a field with this name that is equal to
-            the record ID of the record at the same index in the records list. This can be used to map the results
-            back to the original records. This is used instead of using a RecordId field, as the RecordId field has
-            special behavior in the system that can cause issues if the given records are uncommitted record models
-            with negative record IDs, meaning we don't want to have a RecordId field in the field maps provided to the
-            system. Only used if the adaptive dialog becomes a table.
         :return: A list of dictionaries mapping the data field names of the given field definitions to the response
             value from the user for that field for each row. Even if a form was displayed, the field values will still
             be returned in a list.
@@ -940,23 +911,23 @@ class CallbackUtil:
         if not count:
             raise SapioException("No records provided.")
         if count == 1:
-            return [self.record_form_dialog(title, msg, fields, list(records)[0], column_positions,
+            return [self.record_form_dialog(title, msg, fields, records[0], column_positions,
                                             default_modifier=default_modifier, field_modifiers=field_modifiers)]
         return self.record_table_dialog(title, msg, fields, records,
                                         default_modifier=default_modifier, field_modifiers=field_modifiers,
-                                        group_by=group_by, image_data=image_data, index_field=index_field)
+                                        group_by=group_by, image_data=image_data)
 
     def set_record_adaptive_dialog(self,
                                    title: str,
                                    msg: str,
-                                   fields: Iterable[FieldIdentifier | FieldFilterCriteria] | DataTypeLayoutIdentifier,
-                                   records: Collection[SapioRecord],
+                                   fields: list[FieldIdentifier | FieldFilterCriteria] | DataTypeLayoutIdentifier,
+                                   records: list[SapioRecord],
                                    *,
                                    default_modifier: FieldModifier | None = None,
                                    field_modifiers: dict[FieldIdentifier, FieldModifier] | None = None,
                                    column_positions: dict[str, tuple[int, int]] | None = None,
                                    group_by: FieldIdentifier | None = None,
-                                   image_data: Iterable[bytes] | None = None) -> None:
+                                   image_data: list[bytes] | None = None) -> None:
         """
         Create a dialog where the user may input data into the fields of the dialog. The dialog is constructed from
         a given list of records of a singular type. After the user submits this dialog, the values that the user
@@ -998,7 +969,7 @@ class CallbackUtil:
         if not count:
             raise SapioException("No records provided.")
         if count == 1:
-            self.set_record_form_dialog(title, msg, fields, list(records)[0], column_positions,
+            self.set_record_form_dialog(title, msg, fields, records[0], column_positions,
                                         default_modifier=default_modifier, field_modifiers=field_modifiers)
         else:
             self.set_record_table_dialog(title, msg, fields, records,
@@ -1008,7 +979,7 @@ class CallbackUtil:
     def create_record_adaptive_dialog(self,
                                       title: str,
                                       msg: str,
-                                      fields: Iterable[FieldValue] | DataTypeLayoutIdentifier,
+                                      fields: list[FieldValue] | DataTypeLayoutIdentifier,
                                       wrapper_type: type[WrappedType] | str,
                                       count: int | tuple[int, int],
                                       *,
@@ -1016,7 +987,7 @@ class CallbackUtil:
                                       field_modifiers: dict[FieldIdentifier, FieldModifier] | None = None,
                                       column_positions: dict[str, tuple[int, int]] | None = None,
                                       group_by: FieldIdentifier | None = None,
-                                      image_data: Iterable[bytes] | None = None,
+                                      image_data: list[bytes] | None = None,
                                       require_input: bool = False,
                                       repeat_message: str | None = "Please provide a value to continue.") \
             -> list[WrappedType]:
@@ -1079,8 +1050,8 @@ class CallbackUtil:
     def multi_type_table_dialog(self,
                                 title: str,
                                 msg: str,
-                                fields: Iterable[tuple[DataTypeIdentifier, FieldIdentifier] | AbstractVeloxFieldDefinition],
-                                row_contents: Iterable[Iterable[SapioRecord | FieldMap]],
+                                fields: list[tuple[DataTypeIdentifier, FieldIdentifier] | AbstractVeloxFieldDefinition],
+                                row_contents: list[list[SapioRecord | FieldMap]],
                                 *,
                                 default_modifier: FieldModifier | None = None,
                                 field_modifiers: dict[FieldIdentifier, FieldModifier] | None = None,
@@ -1216,7 +1187,7 @@ class CallbackUtil:
                 if rec is None:
                     continue
                 # Map records to their data type name. Map field maps to Default.
-                dt: str = "Default" if isinstance(rec, dict) else AliasUtil.to_data_type_name(rec)
+                dt: str = "Default" if isinstance(rec, dict) else AliasUtil.to_data_type_names(rec)
                 # Warn if the same data type name appears more than once.
                 if dt in row_records:
                     raise SapioException(f"The data type \"{dt}\" appears more than once in the given row contents.")
@@ -1255,7 +1226,7 @@ class CallbackUtil:
                            layout: DataTypeLayoutIdentifier = None,
                            minimized: bool = False,
                            access_level: FormAccessLevel | None = None,
-                           plugin_path_list: Iterable[str] | None = None) -> None:
+                           plugin_path_list: list[str] | None = None) -> None:
         """
         Create an IDV dialog for the given record. This IDV may use an existing layout already defined in the system,
         and can be created to allow the user to edit the field in the IDV, or to be read-only for the user to review.
@@ -1292,15 +1263,15 @@ class CallbackUtil:
     # CR-47326: Allow the selection dialog functions to preselect rows/records in the table.
     def selection_dialog(self,
                          msg: str,
-                         fields: Iterable[AbstractVeloxFieldDefinition],
-                         values: Iterable[FieldMap],
+                         fields: list[AbstractVeloxFieldDefinition],
+                         values: list[FieldMap],
                          multi_select: bool = True,
-                         preselected_rows: Iterable[FieldMap | RecordIdentifier] | None = None,
+                         preselected_rows: list[FieldMap | RecordIdentifier] | None = None,
                          *,
                          data_type: DataTypeIdentifier = "Default",
                          display_name: str | None = None,
                          plural_display_name: str | None = None,
-                         image_data: Iterable[bytes] | None = None,
+                         image_data: list[bytes] | None = None,
                          require_selection: bool = False,
                          repeat_message: str | None = "Please provide a selection to continue.") -> list[FieldMap]:
         """
@@ -1358,7 +1329,6 @@ class CallbackUtil:
 
             # Add a RecordId definition to the fields if one is not already present. This is necessary for the
             # pre-selected records parameter to function.
-            fields = list(fields)
             if "RecordId" not in [x.data_field_name for x in fields]:
                 builder = FieldBuilder(data_type)
                 fields.append(builder.long_field("RecordId", abstract_info=AnyFieldInfo(visible=False)))
@@ -1368,7 +1338,7 @@ class CallbackUtil:
         temp_dt.record_image_assignable = bool(image_data)
 
         # Send the request to the user.
-        request = TempTableSelectionRequest(temp_dt, msg, list(values), image_data, preselected_rows, multi_select)
+        request = TempTableSelectionRequest(temp_dt, msg, values, image_data, preselected_rows, multi_select)
         # If require_selection is true, repeat the request if the user didn't make a selection.
         while True:
             response: list[FieldMap] = self.__handle_dialog_request(request,
@@ -1381,12 +1351,12 @@ class CallbackUtil:
 
     def record_selection_dialog(self,
                                 msg: str,
-                                fields: Iterable[FieldIdentifier | FieldFilterCriteria] | DataTypeLayoutIdentifier,
-                                records: Iterable[SapioRecord],
+                                fields: list[FieldIdentifier | FieldFilterCriteria] | DataTypeLayoutIdentifier,
+                                records: list[SapioRecord],
                                 multi_select: bool = True,
-                                preselected_records: Iterable[RecordIdentifier] | None = None,
+                                preselected_records: list[RecordIdentifier] | None = None,
                                 *,
-                                image_data: Iterable[bytes] | None = None,
+                                image_data: list[bytes] | None = None,
                                 require_selection: bool = False,
                                 repeat_message: str | None = "Please provide a selection to continue.") \
             -> list[SapioRecord]:
@@ -1468,12 +1438,12 @@ class CallbackUtil:
                                msg: str,
                                multi_select: bool = True,
                                only_key_fields: bool = False,
-                               search_types: Iterable[SearchType] | None = None,
+                               search_types: list[SearchType] | None = None,
                                scan_criteria: ScanToSelectCriteria | None = None,
                                custom_search: CustomReport | CustomReportCriteria | str | None = None,
-                               preselected_records: Iterable[RecordIdentifier] | None = None,
-                               record_blacklist: Iterable[RecordIdentifier] | None = None,
-                               record_whitelist: Iterable[RecordIdentifier] | None = None,
+                               preselected_records: list[RecordIdentifier] | None = None,
+                               record_blacklist: list[RecordIdentifier] | None = None,
+                               record_whitelist: list[RecordIdentifier] | None = None,
                                allow_creation: bool = False,
                                default_creation_number: int = 1,
                                *,
@@ -1563,7 +1533,7 @@ class CallbackUtil:
                      title: str,
                      msg: str,
                      show_comment: bool = True,
-                     additional_fields: Iterable[AbstractVeloxFieldDefinition] | None = None,
+                     additional_fields: list[AbstractVeloxFieldDefinition] | None = None,
                      *,
                      require_authentication: bool = False) -> ESigningResponsePojo:
         """
@@ -1602,7 +1572,7 @@ class CallbackUtil:
                                    popup_type=PopupType.Error)
         return response
 
-    def request_file(self, title: str, exts: Iterable[str] | None = None,
+    def request_file(self, title: str, exts: list[str] | None = None,
                      show_image_editor: bool = False, show_camera_button: bool = False) -> tuple[str, bytes]:
         """
         Request a single file from the user.
@@ -1635,7 +1605,7 @@ class CallbackUtil:
         self.__verify_file(file_path, sink.data, exts)
         return file_path, sink.data
 
-    def request_files(self, title: str, exts: Iterable[str] | None = None,
+    def request_files(self, title: str, exts: list[str] | None = None,
                       show_image_editor: bool = False, show_camera_button: bool = False) -> dict[str, bytes]:
         """
         Request multiple files from the user.
@@ -1667,7 +1637,7 @@ class CallbackUtil:
         return ret_dict
 
     @staticmethod
-    def __verify_file(file_path: str, file_bytes: bytes, allowed_extensions: Iterable[str]) -> None:
+    def __verify_file(file_path: str, file_bytes: bytes, allowed_extensions: list[str]) -> None:
         """
         Verify that the provided file was read (i.e. the file path and file bytes aren't None or empty) and that it
         has the correct file extension. Raises a user error exception if something about the file is incorrect.
@@ -1678,7 +1648,7 @@ class CallbackUtil:
         """
         if file_path is None or len(file_path) == 0 or file_bytes is None or len(file_bytes) == 0:
             raise SapioUserErrorException("Empty file provided or file unable to be read.")
-        if allowed_extensions:
+        if len(allowed_extensions) != 0:
             matches: bool = False
             for ext in allowed_extensions:
                 if file_path.endswith("." + ext.lstrip(".")):
@@ -1695,8 +1665,8 @@ class CallbackUtil:
         :param file_name: The name of the file.
         :param file_data: The data of the file, provided as either a string or as a bytes array.
         """
-        with io.BytesIO(file_data.encode() if isinstance(file_data, str) else file_data) as data:
-            self.callback.send_file(file_name, False, data)
+        data = io.BytesIO(file_data.encode() if isinstance(file_data, str) else file_data)
+        self.callback.send_file(file_name, False, data)
 
     def write_zip_file(self, zip_name: str, files: dict[str, str | bytes]) -> None:
         """
@@ -1705,33 +1675,12 @@ class CallbackUtil:
         :param zip_name: The name of the zip file.
         :param files: A dictionary of the files to add to the zip file.
         """
-        with io.BytesIO(FileUtil.zip_files(files)) as data:
-            self.callback.send_file(zip_name, False, data)
-
-    @staticmethod
-    def __get_indexed_field_maps(records: Iterable[SapioRecord], index_field: str) -> list[FieldMap]:
-        """
-        For dialogs that accept multiple records, we may want to be able to match the returned results back to the
-        records that they're for. In this case, we need to add an index to each record so that we can match them back
-        to the original records. We can't use the RecordId field, as new record models have negative record IDs that
-        cause the callback dialogs to bug out if the RecordId field is present and negative.
-
-        :param records: The records to return indexed field maps of.
-        :param index_field: The name of the field to use as the index. Make sure that this field doesn't exist on the
-            records, as then it will overwrite the existing value.
-        :return: A list of field maps for the records, with an index field added to each. The value of the index on
-            each field map is the record's record ID (even if it's a record model with a negative ID).
-        """
-        ret_val: list[FieldMap] = []
-        for record in records:
-            field_map: FieldMap = AliasUtil.to_field_map(record)
-            field_map[index_field] = AliasUtil.to_record_id(record)
-            ret_val.append(field_map)
-        return ret_val
+        data = io.BytesIO(FileUtil.zip_files(files))
+        self.callback.send_file(zip_name, False, data)
 
     @staticmethod
     def __temp_dt_from_field_defs(data_type: DataTypeIdentifier, display_name: str | None,
-                                  plural_display_name: str | None, fields: Iterable[AbstractVeloxFieldDefinition],
+                                  plural_display_name: str | None, fields: list[AbstractVeloxFieldDefinition],
                                   column_positions: dict[str, tuple[int, int]] | None) -> TemporaryDataType:
         """
         Construct a Temporary Data Type definition from a provided list of field definitions for use in a callback.
@@ -1765,7 +1714,7 @@ class CallbackUtil:
             builder.add_field(field_def, column, span)
         return builder.get_temporary_data_type()
 
-    def __temp_dt_from_field_names(self, data_type: str, fields: Iterable[FieldIdentifier | FieldFilterCriteria],
+    def __temp_dt_from_field_names(self, data_type: str, fields: list[FieldIdentifier | FieldFilterCriteria],
                                    column_positions: dict[str, tuple[int, int]] | None,
                                    default_modifier: FieldModifier, field_modifiers: dict[str, FieldModifier]) \
             -> TemporaryDataType:
@@ -1782,7 +1731,6 @@ class CallbackUtil:
 
         # Determine if any FieldFilterCriteria were provided. If so, remove them from the fields list so that it
         # contains only field identifiers.
-        fields = list(fields)
         filter_criteria: list[FieldFilterCriteria] = [x for x in fields if isinstance(x, FieldFilterCriteria)]
         for criteria in filter_criteria:
             fields.remove(criteria)
@@ -2035,15 +1983,15 @@ class FieldFilterCriteria:
     key_field: bool | None
     identifier: bool | None
     system_field: bool | None
-    field_types: Container[FieldType] | None
-    not_field_types: Container[FieldType] | None
+    field_types: list[FieldType] | None
+    not_field_types: list[FieldType] | None
     matches_tag: str | None
     contains_tag: str | None
     regex_tag: str | re.Pattern[str] | None
 
     def __init__(self, *, required: bool | None = None, editable: bool | None = None, key_field: bool | None = None,
                  identifier: bool | None = None, system_field: bool | None = None,
-                 field_types: Container[FieldType] | None = None, not_field_types: Container[FieldType] | None = None,
+                 field_types: list[FieldType] | None = None, not_field_types: list[FieldType] | None = None,
                  matches_tag: str | None = None, contains_tag: str | None = None,
                  regex_tag: str | re.Pattern[str] | None = None):
         """

sapiopycommons/callbacks/field_builder.py

@@ -443,8 +443,6 @@ class FieldBuilder:
                 raise SapioException("Unable to set multiple list modes at once for a selection list.")
             # Static values don't have a list mode. Evaluate this last so that the multiple list modes check doesn't
             # need to be more complex.
-            # PR-47531: Even though static values don't use an existing list mode, a list mode must still be set.
-            list_mode = ListMode.USER
 
         if not list_mode and static_values is None:
             raise SapioException("A list mode must be chosen for selection list fields.")

sapiopycommons/chem/IndigoMolecules.py

@@ -10,36 +10,9 @@ indigo.setOption("render-stereo-style", "ext")
 indigo.setOption("aromaticity-model", "generic")
 indigo.setOption("render-coloring", True)
 indigo.setOption("molfile-saving-mode", "3000")
-indigo.setOption("dearomatize-verification", False)
 indigo_inchi = IndigoInchi(indigo)
 
 
-def get_aromatic_dearomatic_forms(m: IndigoObject):
-    """
-    Get the aromatic and dearomatic forms of the molecule. Retain the original form if it's not inversible.
-    Inversible: after aromatic-dearomatic-aromatic transformation, the molecule is the same as the first aromatic transformation.
-    :param m: molecule from indigo.
-    :return: pair of indigo objects, first is aromatic, second is dearomatic.
-    """
-    try:
-        aromatic_reaction = m.clone()
-        aromatic_reaction.aromatize()
-        dearomatic_reaction = aromatic_reaction.clone()
-        dearomatic_reaction.dearomatize()
-        second_aromatic_reaction = dearomatic_reaction.clone()
-        second_aromatic_reaction.aromatize()
-        match = indigo.exactMatch(aromatic_reaction, second_aromatic_reaction)
-        if match:
-            return aromatic_reaction, dearomatic_reaction
-        else:
-            return m, dearomatic_reaction
-    except (Exception):
-        # If aromatization then following deromatization fails, we just skip it.
-        dearomatic_reaction = m.clone()
-        dearomatic_reaction.dearomatize()
-        return m, dearomatic_reaction
-
-
 # Function to process dative bonds in a molecule
 # Returns True if at least one dative bond (_BOND_COORDINATION) was removed
 def remove_dative_bonds_in_mol(molecule: IndigoObject) -> bool:
@@ -78,8 +51,7 @@ def remove_dative_in_reaction(reaction: IndigoObject) -> bool:
     :param reaction: The reaction to remove dative bonds.
     :return: Whether there are any dative bonds in the reaction that were removed.
     """
-    reactant_dative_removed: bool = any(
-        remove_dative_bonds_in_mol(reactant) for reactant in reaction.iterateReactants())
+    reactant_dative_removed: bool = any(remove_dative_bonds_in_mol(reactant) for reactant in reaction.iterateReactants())
     product_dative_removed: bool = any(remove_dative_bonds_in_mol(product) for product in reaction.iterateProducts())
     return reactant_dative_removed or product_dative_removed
 

sapiopycommons/chem/Molecules.py

@@ -1,6 +1,6 @@
 # Author Yechen Qiao
 # Common Molecule Utilities for Molecule Transfers with Sapio
-from indigo import IndigoObject
+
 from rdkit import Chem
 from rdkit.Chem import Crippen, MolToInchi
 from rdkit.Chem import Descriptors
@@ -10,7 +10,7 @@ from rdkit.Chem.MolStandardize import rdMolStandardize
 from rdkit.Chem.SaltRemover import SaltRemover
 from rdkit.Chem.rdchem import Mol, RWMol, Bond
 
-from sapiopycommons.chem.IndigoMolecules import indigo, renderer, indigo_inchi, get_aromatic_dearomatic_forms
+from sapiopycommons.chem.IndigoMolecules import indigo, renderer, indigo_inchi
 
 metal_disconnector = rdMolStandardize.MetalDisconnector()
 tautomer_params = Chem.MolStandardize.rdMolStandardize.CleanupParameters()
@@ -247,7 +247,7 @@ def mol_to_sapio_substance(mol: Mol, include_stereoisomers=False,
         molecule["image"] = None
     # We need to test the INCHI can be loaded back to indigo.
     indigo_mol = indigo.loadMolecule(molBlock)
-    indigo_mol = get_aromatic_dearomatic_forms(indigo_mol)[0]  # Get the aromatic form of the molecule.
+    indigo_mol.aromatize()
     if enhanced_stereo:
         # Remove enhanced stereo layer when generating InChI as the stereo hash is generated separately for reg.
         Chem.CanonicalizeEnhancedStereo(inchi_mol)

sapiopycommons/customreport/auto_pagers.py

@@ -6,7 +6,6 @@ from sapiopylib.rest.CustomReportService import CustomReportManager
 from sapiopylib.rest.DataMgmtService import DataMgmtServer
 from sapiopylib.rest.pojo.CustomReport import CustomReportCriteria, CustomReport, RawReportTerm, ReportColumn
 from sapiopylib.rest.pojo.datatype.FieldDefinition import FieldType
-# noinspection PyProtectedMember
 from sapiopylib.rest.utils.autopaging import SapioPyAutoPager, PagerResultCriteriaType, _default_report_page_size, \
     _default_record_page_size
 from sapiopylib.rest.utils.recordmodel.PyRecordModel import PyRecordModel
@@ -154,7 +153,7 @@ class _RecordReportPagerBase(SapioPyAutoPager[CustomReportCriteria, WrappedType
         if id_index == -1:
             raise SapioException(f"This report does not contain a Record ID column for the given record model type "
                                  f"{self._data_type}.")
-        ids: set[int] = {row[id_index] for row in report.result_table}
+        ids: list[int] = [row[id_index] for row in report.result_table]
         for row in self._rec_handler.query_models_by_id(self._query_type, ids, page_size=report.page_size):
             queue.put(row)
         if report.has_next_page:

sapiopycommons/customreport/term_builder.py

@@ -279,7 +279,7 @@ class TermBuilder:
 
         :param a: The first term in the operation.
         :param b: The second term in the operation.
-        :param is_negated: Whether the returned term should be negated (i.e. turn this into an XNOR operation).
+        :param is_negated: Whether the returned term should be negated (i.e. turn this into an xnor operation).
         :return: A composite report term for "A xor B".
         """
         return TermBuilder.and_terms(TermBuilder.or_terms(a, b),