sapiopycommons 2025.3.6a453__py3-none-any.whl → 2025.3.10a455__py3-none-any.whl

sapiopycommons/callbacks/callback_util.py

@@ -1,24 +1,18 @@
 from __future__ import annotations
 
 import io
-import re
-import warnings
-from copy import copy
-from typing import Iterable, TypeAlias, Any, Callable
 from weakref import WeakValueDictionary
 
 from requests import ReadTimeout
 from sapiopylib.rest.ClientCallbackService import ClientCallback
 from sapiopylib.rest.DataMgmtService import DataMgmtServer
-from sapiopylib.rest.DataTypeService import DataTypeManager
 from sapiopylib.rest.User import SapioUser
 from sapiopylib.rest.pojo.CustomReport import CustomReport, CustomReportCriteria
 from sapiopylib.rest.pojo.DataRecord import DataRecord
 from sapiopylib.rest.pojo.datatype.DataType import DataTypeDefinition
 from sapiopylib.rest.pojo.datatype.DataTypeLayout import DataTypeLayout
 from sapiopylib.rest.pojo.datatype.FieldDefinition import AbstractVeloxFieldDefinition, VeloxStringFieldDefinition, \
-    VeloxIntegerFieldDefinition, VeloxDoubleFieldDefinition, FieldType
-from sapiopylib.rest.pojo.datatype.TemporaryDataType import TemporaryDataType
+    VeloxIntegerFieldDefinition, VeloxDoubleFieldDefinition, FieldDefinitionParser
 from sapiopylib.rest.pojo.webhook.ClientCallbackRequest import OptionDialogRequest, ListDialogRequest, \
     FormEntryDialogRequest, InputDialogCriteria, TableEntryDialogRequest, ESigningRequestPojo, \
     DataRecordDialogRequest, InputSelectionRequest, FilePromptRequest, MultiFilePromptRequest, \
@@ -30,23 +24,18 @@ from sapiopylib.rest.utils.FormBuilder import FormBuilder
 from sapiopylib.rest.utils.recorddatasinks import InMemoryRecordDataSink
 from sapiopylib.rest.utils.recordmodel.RecordModelWrapper import WrappedType
 
-from sapiopycommons.callbacks.field_builder import FieldBuilder, AnyFieldInfo
 from sapiopycommons.files.file_util import FileUtil
 from sapiopycommons.general.aliases import FieldMap, SapioRecord, AliasUtil, RecordIdentifier, FieldValue, \
-    UserIdentifier, FieldIdentifier, DataTypeIdentifier
+    UserIdentifier
 from sapiopycommons.general.custom_report_util import CustomReportUtil
 from sapiopycommons.general.exceptions import SapioUserCancelledException, SapioException, SapioUserErrorException, \
     SapioDialogTimeoutException
 from sapiopycommons.recordmodel.record_handler import RecordHandler
 
-DataTypeLayoutIdentifier: TypeAlias = DataTypeLayout | str | None
-
 
 class CallbackUtil:
     user: SapioUser
     callback: ClientCallback
-    rec_handler: RecordHandler
-    dt_man: DataTypeManager
     dt_cache: DataTypeCacheManager
     _original_timeout: int
     timeout_seconds: int
@@ -56,10 +45,6 @@ class CallbackUtil:
     __instances: WeakValueDictionary[SapioUser, CallbackUtil] = WeakValueDictionary()
     __initialized: bool
 
-    # TODO: Remove this if ever the DataTypeCacheManager starts handling it.
-    __layouts: dict[str, dict[str, DataTypeLayout]]
-    """A cache for data type layouts that have been requested by this CallbackUtil."""
-
     def __new__(cls, context: UserIdentifier):
         """
         :param context: The current webhook context or a user object to send requests from.
@@ -82,14 +67,11 @@ class CallbackUtil:
 
         self.user = AliasUtil.to_sapio_user(context)
         self.callback = DataMgmtServer.get_client_callback(self.user)
-        self.rec_handler = RecordHandler(self.user)
-        self.dt_man = DataMgmtServer.get_data_type_manager(self.user)
         self.dt_cache = DataTypeCacheManager(self.user)
         self._original_timeout = self.user.timeout_seconds
         self.timeout_seconds = self.user.timeout_seconds
         self.width_pixels = None
         self.width_percent = None
-        self.__layouts = {}
 
     def set_dialog_width(self, width_pixels: int | None = None, width_percent: float | None = None):
         """
@@ -119,7 +101,7 @@ class CallbackUtil:
         """
         Display a toaster popup in the bottom right corner of the user's screen.
 
-        :param message: The message to display in the toaster. This can be formatted using HTML elements.
+        :param message: The message to display in the toaster.
         :param title: The title to display at the top of the toaster.
         :param popup_type: The popup type to use for the toaster. This controls the color that the toaster appears with.
             Info is blue, Success is green, Warning is yellow, and Error is red
@@ -131,7 +113,7 @@ class CallbackUtil:
         Display an info message to the user in a dialog. Repeated calls to this function will append the new messages
         to the same dialog if it is still opened by the user.
 
-        :param message: The message to display to the user. This can be formatted using HTML elements.
+        :param message: The message to display to the user.
         """
         self.callback.display_info(message)
 
@@ -140,7 +122,7 @@ class CallbackUtil:
         Display a warning message to the user in a dialog. Repeated calls to this function will append the new messages
         to the same dialog if it is still opened by the user.
 
-        :param message: The message to display to the user. This can be formatted using HTML elements.
+        :param message: The message to display to the user.
         """
         self.callback.display_warning(message)
 
@@ -149,17 +131,17 @@ class CallbackUtil:
         Display an error message to the user in a dialog. Repeated calls to this function will append the new messages
         to the same dialog if it is still opened by the user.
 
-        :param message: The message to display to the user. This can be formatted using HTML elements.
+        :param message: The message to display to the user.
         """
         self.callback.display_error(message)
 
-    def option_dialog(self, title: str, msg: str, options: Iterable[str], default_option: int = 0,
+    def option_dialog(self, title: str, msg: str, options: list[str], default_option: int = 0,
                       user_can_cancel: bool = False) -> str:
         """
         Create an option dialog with the given options for the user to choose from.
 
         :param title: The title of the dialog.
-        :param msg: The message to display in the dialog. This can be formatted using HTML elements.
+        :param msg: The message to display in the dialog.
         :param options: The button options that the user has to choose from.
         :param default_option: The index of the option in the options list that defaults as the first choice.
         :param user_can_cancel: True if the user is able to click the X to close the dialog. False if the user cannot
@@ -167,16 +149,17 @@ class CallbackUtil:
             SapioUserCancelledException is thrown.
         :return: The name of the button that the user selected.
         """
-        if not options:
-            raise SapioException("No options provided.")
-
-        # Convert the iterable of options to a list of options.
-        options: list[str] = list(options)
-
-        # Send the request to the user.
         request = OptionDialogRequest(title, msg, options, default_option, user_can_cancel,
                                       width_in_pixels=self.width_pixels, width_percentage=self.width_percent)
-        response: int = self.__handle_dialog_request(request, self.callback.show_option_dialog)
+        try:
+            self.user.timeout_seconds = self.timeout_seconds
+            response: int | None = self.callback.show_option_dialog(request)
+        except ReadTimeout:
+            raise SapioDialogTimeoutException()
+        finally:
+            self.user.timeout_seconds = self._original_timeout
+        if response is None:
+            raise SapioUserCancelledException()
         return options[response]
 
     def ok_dialog(self, title: str, msg: str) -> None:
@@ -185,7 +168,7 @@ class CallbackUtil:
         dialog using the X at the top right corner. Returns nothing.
 
         :param title: The title of the dialog.
-        :param msg: The message to display in the dialog. This can be formatted using HTML elements.
+        :param msg: The message to display in the dialog.
         """
         self.option_dialog(title, msg, ["OK"], 0, False)
 
@@ -195,7 +178,7 @@ class CallbackUtil:
         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.
+        :param msg: The message to display in the dialog.
         :param default_ok: If true, "OK" is the default choice. Otherwise, the default choice is "Cancel".
         :return: True if the user selected OK. False if the user selected Cancel.
         """
@@ -207,22 +190,14 @@ class CallbackUtil:
         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.
+        :param msg: The message to display in the dialog.
         :param default_yes: If true, "Yes" is the default choice. Otherwise, the default choice is "No".
         :return: True if the user selected Yes. False if the user selected No.
         """
         return self.option_dialog(title, msg, ["Yes", "No"], 0 if default_yes else 1, False) == "Yes"
 
-    # CR-47310: Add a parameter to the list, input, selection, and e-sign dialog functions to control reprompting the
-    # user if no input/selection/valid credentials are provided.
-    def list_dialog(self,
-                    title: str,
-                    options: Iterable[str],
-                    multi_select: bool = False,
-                    preselected_values: Iterable[str] | None = None,
-                    *,
-                    require_selection: bool = False,
-                    repeat_message: str | None = "Please provide a selection to continue.") -> list[str]:
+    def list_dialog(self, title: str, options: list[str], multi_select: bool = False,
+                    preselected_values: list[str] | None = None) -> list[str]:
         """
         Create a list dialog with the given options for the user to choose from.
 
@@ -231,27 +206,19 @@ class CallbackUtil:
         :param multi_select: Whether the user is able to select multiple options from the list.
         :param preselected_values: A list of values that will already be selected when the list dialog is created. The
             user can unselect these values if they want to.
-        :param require_selection: If true, the request will be re-sent if the user submits the dialog without making
-            a selection.
-        :param repeat_message: If require_selection is true and a repeat_message is provided, then that message appears
-            as toaster text if the dialog is repeated.
         :return: The list of options that the user selected.
         """
-        if not options:
-            raise SapioException("No options provided.")
-
-        # Send the request to the user.
-        request = ListDialogRequest(title, multi_select, list(options),
-                                    list(preselected_values) if preselected_values else None,
+        request = ListDialogRequest(title, multi_select, options, preselected_values,
                                     width_in_pixels=self.width_pixels, width_percentage=self.width_percent)
-
-        # If require_selection is true, repeat the request if the user didn't make a selection.
-        while True:
-            response: list[str] = self.__handle_dialog_request(request, self.callback.show_list_dialog)
-            if not require_selection or response:
-                break
-            if repeat_message:
-                self.toaster_popup(repeat_message, popup_type=PopupType.Warning)
+        try:
+            self.user.timeout_seconds = self.timeout_seconds
+            response: list[str] | None = self.callback.show_list_dialog(request)
+        except ReadTimeout:
+            raise SapioDialogTimeoutException()
+        finally:
+            self.user.timeout_seconds = self._original_timeout
+        if response is None:
+            raise SapioUserCancelledException()
         return response
 
     def form_dialog(self,
@@ -261,7 +228,7 @@ class CallbackUtil:
                     values: FieldMap = None,
                     column_positions: dict[str, tuple[int, int]] = None,
                     *,
-                    data_type: DataTypeIdentifier = "Default",
+                    data_type: str = "Default",
                     display_name: str | None = None,
                     plural_display_name: str | None = None) -> FieldMap:
         """
@@ -269,7 +236,7 @@ class CallbackUtil:
         provide the definitions of every field in the form.
 
         :param title: The title of the dialog.
-        :param msg: The message to display at the top of the form. This can be formatted using HTML elements.
+        :param msg: The message to display at the top of the form.
         :param fields: The definitions of the fields to display in the form. Fields will be displayed in the order they
             are provided in this list.
         :param values: Sets the default values of the fields.
@@ -283,249 +250,133 @@ class CallbackUtil:
         :return: A dictionary mapping the data field names of the given field definitions to the response value from
             the user for that field.
         """
-        # Build a temporary data type for the request.
-        temp_dt = self.__temp_dt_from_field_defs(data_type, display_name, plural_display_name, fields, column_positions)
+        if display_name is None:
+            display_name = data_type
+        if plural_display_name is None:
+            plural_display_name = display_name + "s"
 
-        # Send the request to the user.
-        request = FormEntryDialogRequest(title, msg, temp_dt, values,
+        builder = FormBuilder(data_type, display_name, plural_display_name)
+        for field_def in fields:
+            field_name = field_def.data_field_name
+            column: int = 0
+            span: int = 4
+            if column_positions and field_name in column_positions:
+                position = column_positions.get(field_name)
+                column = position[0]
+                span = position[1]
+            builder.add_field(field_def, column, span)
+
+        request = FormEntryDialogRequest(title, msg, builder.get_temporary_data_type(), values,
                                          width_in_pixels=self.width_pixels, width_percentage=self.width_percent)
-        response: FieldMap = self.__handle_dialog_request(request, self.callback.show_form_entry_dialog)
+        try:
+            self.user.timeout_seconds = self.timeout_seconds
+            response: FieldMap | None = self.callback.show_form_entry_dialog(request)
+        except ReadTimeout:
+            raise SapioDialogTimeoutException()
+        finally:
+            self.user.timeout_seconds = self._original_timeout
+        if response is None:
+            raise SapioUserCancelledException()
         return response
 
     def record_form_dialog(self,
                            title: str,
                            msg: str,
-                           fields: list[FieldIdentifier | FieldFilterCriteria] | DataTypeLayoutIdentifier,
+                           fields: list[str],
                            record: SapioRecord,
-                           column_positions: dict[str, tuple[int, int]] | None = None,
-                           editable=None,
-                           *,
-                           default_modifier: FieldModifier | None = None,
-                           field_modifiers: dict[FieldIdentifier, FieldModifier] | None = None) -> FieldMap:
+                           column_positions: dict[str, tuple[int, int]] = None,
+                           editable: bool | None = True) -> FieldMap:
         """
         Create a form dialog where the user may input data into the fields of the form. The form is constructed from
-        a given record.
+        a given record. Provided field names must match fields on the definition of the data type of the given record.
+        The fields that are displayed will have their default value be that of the fields on the given record.
 
         Makes webservice calls to get the data type definition and fields of the given record if they weren't
         previously cached.
 
         :param title: The title of the dialog.
-        :param msg: The message to display in the dialog. This can be formatted using HTML elements.
-        :param fields: The names of the fields to display as columns in the table. These names must match field names on
-            the data type of the provided record. Provided field names may also be extension fields of the form
-            [Extension Data Type Name].[Data Field Name]. This parameter may also be an identifier for a data type
-            layout from the data type of the provided records. If None, then the layout assigned to the current user's
-            group for this data type will be used.
+        :param msg: The message to display in the dialog.
+        :param fields: The data field names of the fields from the record to display in the form. Fields will be
+            displayed in the order they are provided in this list.
         :param record: The record to display the values of.
         :param column_positions: If a tuple is provided for a field name, alters that field's column position and column
-            span. (Field order is still determined by the fields list.) Has no effect if the fields parameter provides
-            a data type layout.
-        :param editable: DEPRECATED. Has no effect.
-        :param default_modifier: A default field modifier that will be applied to the given fields. This can be used to
-            make field definitions from the system behave differently than their system values. If this value is None,
-            then a default field modifier is created that causes all specified fields to be both visible and not key
-            fields. (Key fields get displayed first before any non-key fields in tables, so the key field setting is
-            disabled by default in order to have the columns in the table respect the order of the fields as they are
-            provided to this function.)
-        :param field_modifiers: A mapping of data field name to field modifier for changes that should be applied to
-            the matching field. If a data field name is not present in the provided dict, or the provided dictionary is
-            None, then the default modifier will be used.
+            span. (Field order is still determined by the fields list.)
+        :param editable: If true, all fields are displayed as editable. If false, all fields are displayed as
+            uneditable. If none, only those fields that are defined as editable by the data designer will be editable.
         :return: A dictionary mapping the data field names of the given field definitions to the response value from
             the user for that field.
         """
-        # CR-47313: Replace the editable boolean with the default_modifier and field_modifiers parameters.
-        if editable is not None:
-            warnings.warn("The editable parameter is deprecated. Use the default_modifier and field_modifiers "
-                          "parameters instead.", DeprecationWarning)
+        # Get the field definitions of the data type.
+        data_type: str = record.data_type_name
+        type_def: DataTypeDefinition = self.dt_cache.get_data_type(data_type)
+        field_defs: dict[str, AbstractVeloxFieldDefinition] = self.dt_cache.get_fields_for_type(data_type)
 
-        # Get the data type name and field values from the provided record.
-        data_type: str = AliasUtil.to_data_type_name(record)
-        values: dict[str, FieldValue] = AliasUtil.to_field_map(record)
+        # Make everything visible, because presumably the caller gave a field name because they want it to be seen.
+        modifier = FieldModifier(visible=True, editable=editable)
 
-        # Set the default modifier to make all fields visible and not key if no default was provided.
-        if default_modifier is None:
-            default_modifier = FieldModifier(visible=True, key_field=False)
-        # To make things simpler, treat null field modifiers as an empty dict.
-        if field_modifiers is None:
-            field_modifiers = {}
-        else:
-            field_modifiers: dict[str, FieldModifier] = AliasUtil.to_data_field_names_dict(field_modifiers)
-
-        # Build a temporary data type for the request.
-        if isinstance(fields, DataTypeLayoutIdentifier):
-            temp_dt = self.__temp_dt_from_layout(data_type, fields, default_modifier, field_modifiers)
-        else:
-            temp_dt = self.__temp_dt_from_field_names(data_type, fields, column_positions,
-                                                      default_modifier, field_modifiers)
-
-        # Send the request to the user.
-        request = FormEntryDialogRequest(title, msg, temp_dt, values,
+        # Build the form using only those fields that are desired.
+        values: dict[str, FieldValue] = {}
+        builder = FormBuilder(data_type, type_def.display_name, type_def.plural_display_name)
+        for field_name in fields:
+            field_def = field_defs.get(field_name)
+            if field_def is None:
+                raise SapioException(f"No field of name \"{field_name}\" in field definitions of type \"{data_type}\"")
+            values[field_name] = record.get_field_value(field_name)
+            column: int = 0
+            span: int = 4
+            if column_positions and field_name in column_positions:
+                position = column_positions.get(field_name)
+                column = position[0]
+                span = position[1]
+            builder.add_field(modifier.modify_field(field_def), column, span)
+
+        request = FormEntryDialogRequest(title, msg, builder.get_temporary_data_type(), values,
                                          width_in_pixels=self.width_pixels, width_percentage=self.width_percent)
-        response: FieldMap = self.__handle_dialog_request(request, self.callback.show_form_entry_dialog)
+        try:
+            self.user.timeout_seconds = self.timeout_seconds
+            response: FieldMap | None = self.callback.show_form_entry_dialog(request)
+        except ReadTimeout:
+            raise SapioDialogTimeoutException()
+        finally:
+            self.user.timeout_seconds = self._original_timeout
+        if response is None:
+            raise SapioUserCancelledException()
         return response
 
-    # FR-47314: Create record form and table dialogs for updating or creating records.
-    def set_record_form_dialog(self,
-                               title: str,
-                               msg: str,
-                               fields: list[FieldIdentifier | FieldFilterCriteria] | DataTypeLayoutIdentifier,
-                               record: SapioRecord,
-                               column_positions: dict[str, tuple[int, int]] | None = None,
-                               *,
-                               default_modifier: FieldModifier | None = None,
-                               field_modifiers: dict[FieldIdentifier, FieldModifier] | None = None) -> None:
-        """
-        Create a form dialog where the user may input data into the fields of the form. The form is constructed from
-        a given record. After the user submits this dialog, the values that the user provided are used to update the
-        provided record.
-
-        Makes webservice calls to get the data type definition and fields of the given record if they weren't
-        previously cached.
-
-        :param title: The title of the dialog.
-        :param msg: The message to display in the dialog. This can be formatted using HTML elements.
-        :param fields: The names of the fields to display as columns in the table. These names must match field names on
-            the data type of the provided record. Provided field names may also be extension fields of the form
-            [Extension Data Type Name].[Data Field Name]. This parameter may also be an identifier for a data type
-            layout from the data type of the provided records. If None, then the layout assigned to the current user's
-            group for this data type will be used.
-        :param record: The record to display and update the values of.
-        :param column_positions: If a tuple is provided for a field name, alters that field's column position and column
-            span. (Field order is still determined by the fields list.) Has no effect if the fields parameter provides
-            a data type layout.
-        :param default_modifier: A default field modifier that will be applied to the given fields. This can be used to
-            make field definitions from the system behave differently than their system values. If this value is None,
-            then a default field modifier is created that causes all specified fields to be both visible and not key
-            fields. (Key fields get displayed first before any non-key fields in tables, so the key field setting is
-            disabled by default in order to have the columns in the table respect the order of the fields as they are
-            provided to this function.)
-        :param field_modifiers: A mapping of data field name to field modifier for changes that should be applied to
-            the matching field. If a data field name is not present in the provided dict, or the provided dictionary is
-            None, then the default modifier will be used.
-        """
-        results: FieldMap = self.record_form_dialog(title, msg, fields, record, column_positions,
-                                                    default_modifier=default_modifier, field_modifiers=field_modifiers)
-        record.set_field_values(results)
-
-    def create_record_form_dialog(self,
-                                  title: str,
-                                  msg: str,
-                                  fields: list[FieldIdentifier | FieldFilterCriteria] | DataTypeLayoutIdentifier,
-                                  wrapper_type: type[WrappedType],
-                                  column_positions: dict[str, tuple[int, int]] | None = None,
-                                  *,
-                                  default_modifier: FieldModifier | None = None,
-                                  field_modifiers: dict[FieldIdentifier, FieldModifier] | None = None) -> WrappedType:
-        """
-        Create a form dialog where the user may input data into the fields of the form. The form is constructed from
-        a record that is created using the given record model wrapper. After the user submits this dialog, the values
-        that the user provided are used to update the created record.
-
-        Makes webservice calls to get the data type definition and fields of the given record if they weren't
-        previously cached.
-
-        :param title: The title of the dialog.
-        :param msg: The message to display in the dialog. This can be formatted using HTML elements.
-        :param fields: The names of the fields to display as columns in the table. These names must match field names on
-            the data type of the provided wrapper. Provided field names may also be extension fields of the form
-            [Extension Data Type Name].[Data Field Name]. This parameter may also be an identifier for a data type
-            layout from the data type of the provided records. If None, then the layout assigned to the current user's
-            group for this data type will be used. FieldFilterCriteria may also be provided in lieu of field names.
-        :param wrapper_type: The record model wrapper of the record to be created and updated.
-        :param column_positions: If a tuple is provided for a field name, alters that field's column position and column
-            span. (Field order is still determined by the fields list.) Has no effect if the fields parameter provides
-            a data type layout.
-        :param default_modifier: A default field modifier that will be applied to the given fields. This can be used to
-            make field definitions from the system behave differently than their system values. If this value is None,
-            then a default field modifier is created that causes all specified fields to be both visible and not key
-            fields. (Key fields get displayed first before any non-key fields in tables, so the key field setting is
-            disabled by default in order to have the columns in the table respect the order of the fields as they are
-            provided to this function.)
-        :param field_modifiers: A mapping of data field name to field modifier for changes that should be applied to
-            the matching field. If a data field name is not present in the provided dict, or the provided dictionary is
-            None, then the default modifier will be used.
-        :return: The record model that was created and updated by the user.
-        """
-        record: WrappedType = self.rec_handler.add_model(wrapper_type)
-        self.set_record_form_dialog(title, msg, fields, record, column_positions,
-                                    default_modifier=default_modifier, field_modifiers=field_modifiers)
-        return record
-
-    def input_dialog(self,
-                     title: str,
-                     msg: str,
-                     field: AbstractVeloxFieldDefinition,
-                     *,
-                     require_input: bool = False,
-                     repeat_message: str | None = "Please provide a value to continue.") -> FieldValue:
+    def input_dialog(self, title: str, msg: str, field: AbstractVeloxFieldDefinition) -> FieldValue:
         """
         Create an input dialog where the user must input data for a singular field.
 
         :param title: The title of the dialog.
-        :param msg: The message to display in the dialog. This can be formatted using HTML elements.
+        :param msg: The message to display in the dialog.
         :param field: The definition for a field that the user must provide input to.
-        :param require_input: If true, the request will be re-sent if the user submits the dialog without providing an
-            input field value.
-        :param repeat_message: If require_input is true and a repeat_message is provided, then that message appears
-            as toaster text if the dialog is repeated.
         :return: The response value from the user for the given field.
         """
-        # Send the request to the user.
         request = InputDialogCriteria(title, msg, field,
                                       width_in_pixels=self.width_pixels, width_percentage=self.width_percent)
-
-        # If require_input is true, repeat the request if the user didn't provide a field value.
-        while True:
-            try:
-                self.user.timeout_seconds = self.timeout_seconds
-                # It's not possible to distinguish between the user cancelling this dialog and submitting the dialog
-                # with no input if the ClientCallback show_input_dialog function is used, as both cases just return
-                # None. Therefore, in order to be able to make that distinction, we need to call the endpoint without
-                # ClientCallback and get the raw response object.
-                raw_response = self.user.post('/clientcallback/showInputDialog', payload=request.to_json())
-                # A response status code of 204 is what represents a cancelled dialog.
-                if raw_response.status_code == 204:
-                    raise SapioUserCancelledException()
-                self.user.raise_for_status(raw_response)
-                json_dct: dict | None = self.user.get_json_data_or_none(raw_response)
-                response: FieldValue = json_dct['result'] if json_dct else None
-            except ReadTimeout:
-                raise SapioDialogTimeoutException()
-            finally:
-                self.user.timeout_seconds = self._original_timeout
-            # String fields that the user didn't provide will return as an empty string instead of a None response.
-            is_str: bool = isinstance(response, str)
-            if not require_input or (is_str and response) or (not is_str and response is not None):
-                break
-            if repeat_message:
-                self.toaster_popup(repeat_message, popup_type=PopupType.Warning)
+        try:
+            self.user.timeout_seconds = self.timeout_seconds
+            response: FieldValue | None = self.callback.show_input_dialog(request)
+        except ReadTimeout:
+            raise SapioDialogTimeoutException()
+        finally:
+            self.user.timeout_seconds = self._original_timeout
+        if response is None:
+            raise SapioUserCancelledException()
         return response
 
-    def string_input_dialog(self,
-                            title: str,
-                            msg: str,
-                            field_name: str,
-                            default_value: str | None = None,
-                            max_length: int | None = None,
-                            editable: bool = True,
-                            *,
-                            require_input: bool = False,
-                            repeat_message: str | None = "Please provide a value to continue.",
-                            **kwargs) -> str:
+    def string_input_dialog(self, title: str, msg: str, field_name: str, default_value: str | None = None,
+                            max_length: int | None = None, editable: bool = True, **kwargs) -> str:
         """
         Create an input dialog where the user must input data for a singular text field.
 
         :param title: The title of the dialog.
-        :param msg: The message to display in the dialog. This can be formatted using HTML elements.
+        :param msg: The message to display in the dialog.
         :param field_name: The name and display name of the string field.
         :param default_value: The default value to place into the string field, if any.
         :param max_length: The max length of the string value. If not provided, uses the length of the default value.
             If neither this nor a default value are provided, defaults to 100 characters.
         :param editable: Whether the field is editable by the user.
-        :param require_input: If true, the request will be re-sent if the user submits the dialog without making
-            a selection.
-        :param repeat_message: If require_input is true and a repeat_message is provided, then that message appears
-            as toaster text if the dialog is repeated.
         :param kwargs: Any additional keyword arguments to pass to the field definition.
         :return: The string that the user input into the dialog.
         """
@@ -533,36 +384,21 @@ class CallbackUtil:
             max_length = len(default_value) if default_value else 100
         field = VeloxStringFieldDefinition("Input", field_name, field_name, default_value=default_value,
                                            max_length=max_length, editable=editable, **kwargs)
-        return self.input_dialog(title, msg, field,
-                                 require_input=require_input, repeat_message=repeat_message)
-
-    def integer_input_dialog(self,
-                             title: str,
-                             msg: str,
-                             field_name: str,
-                             default_value: int = None,
-                             min_value: int = -10000,
-                             max_value: int = 10000,
-                             editable: bool = True,
-                             *,
-                             require_input: bool = False,
-                             repeat_message: str | None = "Please provide a value to continue.",
-                             **kwargs) -> int:
+        return self.input_dialog(title, msg, field)
+
+    def integer_input_dialog(self, title: str, msg: str, field_name: str, default_value: int = None,
+                             min_value: int = -10000, max_value: int = 10000, editable: bool = True, **kwargs) -> int:
         """
         Create an input dialog where the user must input data for a singular integer field.
 
         :param title: The title of the dialog.
-        :param msg: The message to display in the dialog. This can be formatted using HTML elements.
+        :param msg: The message to display in the dialog.
         :param field_name: The name and display name of the integer field.
         :param default_value: The default value to place into the integer field. If not provided, defaults to the 0 or
             the minimum value, whichever is higher.
         :param min_value: The minimum allowed value of the input.
         :param max_value: The maximum allowed value of the input.
         :param editable: Whether the field is editable by the user.
-        :param require_input: If true, the request will be re-sent if the user submits the dialog without making
-            a selection.
-        :param repeat_message: If require_input is true and a repeat_message is provided, then that message appears
-            as toaster text if the dialog is repeated.
         :param kwargs: Any additional keyword arguments to pass to the field definition.
         :return: The integer that the user input into the dialog.
         """
@@ -570,36 +406,22 @@ class CallbackUtil:
             default_value = max(0, min_value)
         field = VeloxIntegerFieldDefinition("Input", field_name, field_name, default_value=default_value,
                                             min_value=min_value, max_value=max_value, editable=editable, **kwargs)
-        return self.input_dialog(title, msg, field,
-                                 require_input=require_input, repeat_message=repeat_message)
+        return self.input_dialog(title, msg, field)
 
-    def double_input_dialog(self,
-                            title: str,
-                            msg: str,
-                            field_name: str,
-                            default_value: float = None,
-                            min_value: float = -10000000,
-                            max_value: float = 100000000,
-                            editable: bool = True,
-                            *,
-                            require_input: bool = False,
-                            repeat_message: str | None = "Please provide a value to continue.",
+    def double_input_dialog(self, title: str, msg: str, field_name: str, default_value: float = None,
+                            min_value: float = -10000000, max_value: float = 100000000, editable: bool = True,
                             **kwargs) -> float:
         """
         Create an input dialog where the user must input data for a singular double field.
 
         :param title: The title of the dialog.
-        :param msg: The message to display in the dialog. This can be formatted using HTML elements.
+        :param msg: The message to display in the dialog.
         :param field_name: The name and display name of the double field.
         :param default_value: The default value to place into the double field. If not provided, defaults to the 0 or
             the minimum value, whichever is higher.
         :param min_value: The minimum allowed value of the input.
         :param max_value: The maximum allowed value of the input.
         :param editable: Whether the field is editable by the user.
-        :param require_input: If true, the request will be re-sent if the user submits the dialog without making
-            a selection.
-        :param repeat_message: If require_input is true and a repeat_message is provided, then that message appears
-            as toaster text if the dialog is repeated.
         :param kwargs: Any additional keyword arguments to pass to the field definition.
         :return: The float that the user input into the dialog.
         """
@@ -607,26 +429,25 @@ class CallbackUtil:
             default_value = max(0., min_value)
         field = VeloxDoubleFieldDefinition("Input", field_name, field_name, default_value=default_value,
                                            min_value=min_value, max_value=max_value, editable=editable, **kwargs)
-        return self.input_dialog(title, msg, field,
-                                 require_input=require_input, repeat_message=repeat_message)
+        return self.input_dialog(title, msg, field)
 
     def table_dialog(self,
                      title: str,
                      msg: str,
                      fields: list[AbstractVeloxFieldDefinition],
                      values: list[FieldMap],
+                     group_by: str | None = None,
+                     image_data: list[bytes] | None = None,
                      *,
-                     data_type: DataTypeIdentifier = "Default",
+                     data_type: str = "Default",
                      display_name: str | None = None,
-                     plural_display_name: str | None = None,
-                     group_by: FieldIdentifier | None = None,
-                     image_data: list[bytes] | None = None) -> list[FieldMap]:
+                     plural_display_name: str | 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.
 
         :param title: The title of the dialog.
-        :param msg: The message to display at the top of the form. This can be formatted using HTML elements.
+        :param msg: The message to display at the top of the form.
         :param fields: The definitions of the fields to display as table columns. Fields will be displayed in the order
             they are provided in this list.
         :param values: The values to set for each row of the table.
@@ -642,61 +463,57 @@ class CallbackUtil:
         :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.
         """
-        if not values:
-            raise SapioException("No values provided.")
+        if display_name is None:
+            display_name = data_type
+        if plural_display_name is None:
+            plural_display_name = display_name + "s"
 
-        # Convert the group_by parameter to a field name.
-        if group_by is not None:
-            group_by: str = AliasUtil.to_data_field_name(group_by)
+        # Key fields display their columns in order before all non-key fields.
+        # Unmark key fields so that the column order is respected exactly as the caller provides it.
+        modifier = FieldModifier(key_field=False)
 
-        # Build a temporary data type for the request.
-        temp_dt = self.__temp_dt_from_field_defs(data_type, display_name, plural_display_name, fields, None)
-        # PR-47376: Mark record_image_assignable as true if image data is provided.
-        temp_dt.record_image_assignable = bool(image_data)
+        builder = FormBuilder(data_type, display_name, plural_display_name)
+        for field in fields:
+            builder.add_field(modifier.modify_field(field))
 
-        # Send the request to the user.
-        request = TableEntryDialogRequest(title, msg, temp_dt, values,
+        request = TableEntryDialogRequest(title, msg, builder.get_temporary_data_type(), 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)
+        try:
+            self.user.timeout_seconds = self.timeout_seconds
+            response: list[FieldMap] | None = self.callback.show_table_entry_dialog(request)
+        except ReadTimeout:
+            raise SapioDialogTimeoutException()
+        finally:
+            self.user.timeout_seconds = self._original_timeout
+        if response is None:
+            raise SapioUserCancelledException()
         return response
 
     def record_table_dialog(self,
                             title: str,
                             msg: str,
-                            fields: list[FieldIdentifier | FieldFilterCriteria] | DataTypeLayoutIdentifier,
+                            fields: list[str],
                             records: list[SapioRecord],
-                            editable=None,
-                            *,
-                            default_modifier: FieldModifier | None = None,
-                            field_modifiers: dict[FieldIdentifier, FieldModifier] | None = None,
-                            group_by: FieldIdentifier | None = None,
+                            editable: bool | None = True,
+                            group_by: str | None = None,
                             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.
+        a given list of records of a singular type. Provided field names must match fields on the definition of the data
+        type of the given records. The fields that are displayed will have their default value be that of the fields on
+        the given records.
 
         Makes webservice calls to get the data type definition and fields of the given records if they weren't
         previously cached.
 
         :param title: The title of the dialog.
-        :param msg: The message to display in the dialog. This can be formatted using HTML elements.
-        :param fields: The names of the fields to display as columns in the table. These names must match field names on
-            the data type of the provided record. Provided field names may also be extension fields of the form
-            [Extension Data Type Name].[Data Field Name]. This parameter may also be an identifier for a data type
-            layout from the data type of the provided records. If None, then the layout assigned to the current user's
-            group for this data type will be used.
+        :param msg: The message to display in the dialog.
         :param records: The records to display as rows in the table.
-        :param editable: DEPRECATED. Has no effect.
-        :param default_modifier: A default field modifier that will be applied to the given fields. This can be used to
-            make field definitions from the system behave differently than their system values. If this value is None,
-            then a default field modifier is created that causes all specified fields to be both visible and not key
-            fields. (Key fields get displayed first before any non-key fields in tables, so the key field setting is
-            disabled by default in order to have the columns in the table respect the order of the fields as they are
-            provided to this function.)
-        :param field_modifiers: A mapping of data field name to field modifier for changes that should be applied to
-            the matching field. If a data field name is not present in the provided dict, or the provided dictionary is
-            None, then the default modifier will be used.
+        :param fields: The names of the fields to display as columns in the table. Fields will be displayed in the order
+            they are provided in this list.
+        :param editable: If true, all fields are displayed as editable. If false, all fields are displayed as
+            uneditable. If none, only those fields that are defined as editable by the data designer will be editable.
         :param group_by: If provided, the created table dialog will be grouped by the field with this name by default.
             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
@@ -704,351 +521,54 @@ class CallbackUtil:
         :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.
         """
-        # CR-47313: Replace the editable boolean with the default_modifier and field_modifiers parameters.
-        if editable is not None:
-            warnings.warn("The editable parameter is deprecated. Use the default_modifier and field_modifiers "
-                          "parameters instead.", DeprecationWarning)
-        # Get the data type name and field values from the provided records.
         if not records:
             raise SapioException("No records provided.")
-        data_type: str = AliasUtil.to_singular_data_type_name(records)
-        field_map_list: list[FieldMap] = AliasUtil.to_field_map_list(records)
+        data_types: set[str] = {x.data_type_name for x in records}
+        if len(data_types) > 1:
+            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_lists(records)
+        # Get the field definitions of the data type.
+        type_def: DataTypeDefinition = self.dt_cache.get_data_type(data_type)
+        field_defs: dict[str, AbstractVeloxFieldDefinition] = self.dt_cache.get_fields_for_type(data_type)
 
-        # Convert the group_by parameter to a field name.
-        if group_by is not None:
-            group_by: str = AliasUtil.to_data_field_name(group_by)
+        # Key fields display their columns in order before all non-key fields.
+        # Unmark key fields so that the column order is respected exactly as the caller provides it.
+        # Also make everything visible, because presumably the caller gave a field name because they want it to be seen.
+        modifier = FieldModifier(visible=True, key_field=False, editable=editable)
 
-        # Set the default modifier to make all fields visible and not key if no default was provided.
-        if default_modifier is None:
-            default_modifier = FieldModifier(visible=True, key_field=False)
-        # To make things simpler, treat null field modifiers as an empty dict.
-        if field_modifiers is None:
-            field_modifiers = {}
-        else:
-            field_modifiers: dict[str, FieldModifier] = AliasUtil.to_data_field_names_dict(field_modifiers)
-
-        # Build a temporary data type for the request.
-        if isinstance(fields, DataTypeLayoutIdentifier):
-            temp_dt = self.__temp_dt_from_layout(data_type, fields, default_modifier, field_modifiers)
-        else:
-            temp_dt = self.__temp_dt_from_field_names(data_type, fields, None, default_modifier, field_modifiers)
-        temp_dt.record_image_assignable = bool(image_data)
-
-        # Send the request to the user.
-        request = TableEntryDialogRequest(title, msg, temp_dt, field_map_list,
+        # Build the form using only those fields that are desired.
+        builder = FormBuilder(data_type, type_def.display_name, type_def.plural_display_name)
+        for field_name in fields:
+            field_def = field_defs.get(field_name)
+            if field_def is None:
+                raise SapioException(f"No field of name \"{field_name}\" in field definitions of type \"{data_type}\"")
+            builder.add_field(modifier.modify_field(field_def))
+
+        request = TableEntryDialogRequest(title, msg, builder.get_temporary_data_type(), field_map_list,
                                           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)
+        try:
+            self.user.timeout_seconds = self.timeout_seconds
+            response: list[FieldMap] | None = self.callback.show_table_entry_dialog(request)
+        except ReadTimeout:
+            raise SapioDialogTimeoutException()
+        finally:
+            self.user.timeout_seconds = self._original_timeout
+        if response is None:
+            raise SapioUserCancelledException()
         return response
 
-    # FR-47314: Create record form and table dialogs for updating or creating records.
-    def set_record_table_dialog(self,
-                                title: str,
-                                msg: str,
-                                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: 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
-        provided are used to update the provided records.
-
-        Makes webservice calls to get the data type definition and fields of the given records if they weren't
-        previously cached.
-
-        :param title: The title of the dialog.
-        :param msg: The message to display in the dialog. This can be formatted using HTML elements.
-        :param fields: The names of the fields to display as columns in the table. These names must match field names on
-            the data type of the provided record. Provided field names may also be extension fields of the form
-            [Extension Data Type Name].[Data Field Name]. This parameter may also be an identifier for a data type
-            layout from the data type of the provided records. If None, then the layout assigned to the current user's
-            group for this data type will be used.
-        :param records: The records to display as rows in the table and update the values of.
-        :param default_modifier: A default field modifier that will be applied to the given fields. This can be used to
-            make field definitions from the system behave differently than their system values. If this value is None,
-            then a default field modifier is created that causes all specified fields to be both visible and not key
-            fields. (Key fields get displayed first before any non-key fields in tables, so the key field setting is
-            disabled by default in order to have the columns in the table respect the order of the fields as they are
-            provided to this function.)
-        :param field_modifiers: A mapping of data field name to field modifier for changes that should be applied to
-            the matching field. If a data field name is not present in the provided dict, or the provided dictionary is
-            None, then the default modifier will be used.
-        :param group_by: If provided, the created table dialog will be grouped by the field with this name by default.
-            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.
-        """
-        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)
-        records_by_id: dict[int, SapioRecord] = self.rec_handler.map_by_id(records)
-        for result in results:
-            records_by_id[result["RecordId"]].set_field_values(result)
-
-    def create_record_table_dialog(self,
-                                   title: str,
-                                   msg: str,
-                                   fields: list[FieldValue] | DataTypeLayoutIdentifier,
-                                   wrapper_type: type[WrappedType],
-                                   count: int | tuple[int, int],
-                                   *,
-                                   default_modifier: FieldModifier | None = None,
-                                   field_modifiers: dict[FieldIdentifier, FieldModifier] | None = None,
-                                   group_by: FieldIdentifier | None = None,
-                                   image_data: list[bytes] | None = None,
-                                   require_input: bool = False,
-                                   repeat_message: str | None = "Please provide a value to continue.") \
-            -> list[WrappedType]:
-        """
-        Create a table dialog where the user may input data into the fields of the table. The table is constructed from
-        a list of records that are created using the given record model wrapper. After the user submits this dialog,
-        the values that the user provided are used to update the created records.
-
-        Makes webservice calls to get the data type definition and fields of the given records if they weren't
-        previously cached.
-
-        :param title: The title of the dialog.
-        :param msg: The message to display in the dialog. This can be formatted using HTML elements.
-        :param fields: The names of the fields to display as columns in the table. These names must match field names on
-            the data type of the provided wrapper. Provided field names may also be extension fields of the form
-            [Extension Data Type Name].[Data Field Name]. This parameter may also be an identifier for a data type
-            layout from the data type of the provided records. If None, then the layout assigned to the current user's
-            group for this data type will be used.
-        :param wrapper_type: The record model wrapper of the records to be created and updated.
-        :param count: The number of records to create. If provided as a tuple of two integers, the user will first be
-            prompted to select an integer between the two values in the tuple.
-        :param default_modifier: A default field modifier that will be applied to the given fields. This can be used to
-            make field definitions from the system behave differently than their system values. If this value is None,
-            then a default field modifier is created that causes all specified fields to be both visible and not key
-            fields. (Key fields get displayed first before any non-key fields in tables, so the key field setting is
-            disabled by default in order to have the columns in the table respect the order of the fields as they are
-            provided to this function.)
-        :param field_modifiers: A mapping of data field name to field modifier for changes that should be applied to
-            the matching field. If a data field name is not present in the provided dict, or the provided dictionary is
-            None, then the default modifier will be used.
-        :param group_by: If provided, the created table dialog will be grouped by the field with this name by default.
-            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 require_input: If true and the user is prompted to input the number of records to create, the request
-            will be re-sent if the user submits the dialog without making a selection.
-        :param repeat_message: If require_input is true and a repeat_message is provided, then that message appears
-            as toaster text if the record count dialog is repeated.
-        :return: A list of the newly created records.
-        """
-        count: int = self.__prompt_for_count(count, wrapper_type, require_input, repeat_message)
-        if count <= 0:
-            return []
-        records: list[WrappedType] = self.rec_handler.add_models(wrapper_type, count)
-        self.set_record_table_dialog(title, msg, fields, records,
-                                     default_modifier=default_modifier, field_modifiers=field_modifiers,
-                                     group_by=group_by, image_data=image_data)
-        return records
-
-    # FR-47314: Create record dialogs that adapt to become a form or table based on the size of the input.
-    def record_adaptive_dialog(self,
-                               title: str,
-                               msg: str,
-                               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: 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.
-
-        The dialog created will adapt to the number of records. If there is only one record then a form dialog will be
-        created. Otherwise, a table dialog is created.
-
-        Makes webservice calls to get the data type definition and fields of the given records if they weren't
-        previously cached.
-
-        :param title: The title of the dialog.
-        :param msg: The message to display in the dialog. This can be formatted using HTML elements.
-        :param fields: The names of the fields to display in the dialog. These names must match field names on
-            the data type of the provided record. Provided field names may also be extension fields of the form
-            [Extension Data Type Name].[Data Field Name]. This parameter may also be an identifier for a data type
-            layout from the data type of the provided records. If None, then the layout assigned to the current user's
-            group for this data type will be used.
-        :param records: The records to display in the dialog.
-        :param default_modifier: A default field modifier that will be applied to the given fields. This can be used to
-            make field definitions from the system behave differently than their system values. If this value is None,
-            then a default field modifier is created that causes all specified fields to be both visible and not key
-            fields. (Key fields get displayed first before any non-key fields in tables, so the key field setting is
-            disabled by default in order to have the columns in the table respect the order of the fields as they are
-            provided to this function.)
-        :param field_modifiers: A mapping of data field name to field modifier for changes that should be applied to
-            the matching field. If a data field name is not present in the provided dict, or the provided dictionary is
-            None, then the default modifier will be used.
-        :param column_positions: If a tuple is provided for a field name, alters that field's column position and column
-            span. (Field order is still determined by the fields list.) Has no effect if the fields parameter provides
-            a data type layout. Only used if the adaptive dialog becomes a form.
-        :param group_by: If provided, the created table dialog will be grouped by the field with this name by default.
-            The user may remove this grouping if they want to. Only used if the adaptive dialog becomes a table.
-        :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.
-        :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.
-        """
-        count: int = len(records)
-        if not count:
-            raise SapioException("No records provided.")
-        if count == 1:
-            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)
-
-    def set_record_adaptive_dialog(self,
-                                   title: str,
-                                   msg: str,
-                                   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: 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
-        provided are used to update the provided records.
-
-        The dialog created will adapt to the number of records. If there is only one record then a form dialog will be
-        created. Otherwise, a table dialog is created.
-
-        Makes webservice calls to get the data type definition and fields of the given records if they weren't
-        previously cached.
-
-        :param title: The title of the dialog.
-        :param msg: The message to display in the dialog. This can be formatted using HTML elements.
-        :param fields: The names of the fields to display in the dialog. These names must match field names on
-            the data type of the provided record. Provided field names may also be extension fields of the form
-            [Extension Data Type Name].[Data Field Name]. This parameter may also be an identifier for a data type
-            layout from the data type of the provided records. If None, then the layout assigned to the current user's
-            group for this data type will be used.
-        :param records: The records to display in the dialog and update the values of.
-        :param default_modifier: A default field modifier that will be applied to the given fields. This can be used to
-            make field definitions from the system behave differently than their system values. If this value is None,
-            then a default field modifier is created that causes all specified fields to be both visible and not key
-            fields. (Key fields get displayed first before any non-key fields in tables, so the key field setting is
-            disabled by default in order to have the columns in the table respect the order of the fields as they are
-            provided to this function.)
-        :param field_modifiers: A mapping of data field name to field modifier for changes that should be applied to
-            the matching field. If a data field name is not present in the provided dict, or the provided dictionary is
-            None, then the default modifier will be used.
-        :param column_positions: If a tuple is provided for a field name, alters that field's column position and column
-            span. (Field order is still determined by the fields list.) Has no effect if the fields parameter provides
-            a data type layout. Only used if the adaptive dialog becomes a form.
-        :param group_by: If provided, the created table dialog will be grouped by the field with this name by default.
-            The user may remove this grouping if they want to. Only used if the adaptive dialog becomes a table.
-        :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.
-        """
-        count: int = len(records)
-        if not count:
-            raise SapioException("No records provided.")
-        if count == 1:
-            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,
-                                         default_modifier=default_modifier, field_modifiers=field_modifiers,
-                                         group_by=group_by, image_data=image_data)
-
-    def create_record_adaptive_dialog(self,
-                                      title: str,
-                                      msg: str,
-                                      fields: list[FieldValue] | DataTypeLayoutIdentifier,
-                                      wrapper_type: type[WrappedType],
-                                      count: int | tuple[int, int],
-                                      *,
-                                      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: list[bytes] | None = None,
-                                      require_input: bool = False,
-                                      repeat_message: str | None = "Please provide a value to continue.") \
-            -> list[WrappedType]:
-        """
-        Create a dialog where the user may input data into the specified fields. The dialog is constructed from
-        a list of records that are created using the given record model wrapper. After the user submits this dialog,
-        the values that the user provided are used to update the created records.
-
-        The dialog created will adapt to the number of records. If there is only one record then a form dialog will be
-        created. Otherwise, a table dialog is created.
-
-        Makes webservice calls to get the data type definition and fields of the given records if they weren't
-        previously cached.
-
-        :param title: The title of the dialog.
-        :param msg: The message to display in the dialog. This can be formatted using HTML elements.
-        :param fields: The names of the fields to display in the dialog. These names must match field names on
-            the data type of the provided wrapper. Provided field names may also be extension fields of the form
-            [Extension Data Type Name].[Data Field Name]. This parameter may also be an identifier for a data type
-            layout from the data type of the provided records. If None, then the layout assigned to the current user's
-            group for this data type will be used.
-        :param wrapper_type: The record model wrapper of the records to be created and updated.
-        :param count: The number of records to create. If provided as a tuple of two integers, the user will first be
-            prompted to select an integer between the two values in the tuple.
-        :param default_modifier: A default field modifier that will be applied to the given fields. This can be used to
-            make field definitions from the system behave differently than their system values. If this value is None,
-            then a default field modifier is created that causes all specified fields to be both visible and not key
-            fields. (Key fields get displayed first before any non-key fields in tables, so the key field setting is
-            disabled by default in order to have the columns in the table respect the order of the fields as they are
-            provided to this function.)
-        :param field_modifiers: A mapping of data field name to field modifier for changes that should be applied to
-            the matching field. If a data field name is not present in the provided dict, or the provided dictionary is
-            None, then the default modifier will be used.
-        :param column_positions: If a tuple is provided for a field name, alters that field's column position and column
-            span. (Field order is still determined by the fields list.) Has no effect if the fields parameter provides
-            a data type layout. Only used if the adaptive dialog becomes a form.
-        :param group_by: If provided, the created table dialog will be grouped by the field with this name by default.
-            The user may remove this grouping if they want to. Only used if the adaptive dialog becomes a table.
-        :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 require_input: If true and the user is prompted to input the number of records to create, the request
-            will be re-sent if the user submits the dialog without making a selection.
-        :param repeat_message: If require_input is true and a repeat_message is provided, then that message appears
-            as toaster text if the record count dialog is repeated.
-        :return: A list of the newly created records. Even if a form was displayed, the created record will still be
-            returned in a list.
-        """
-        count: int = self.__prompt_for_count(count, wrapper_type, require_input, repeat_message)
-        if count <= 0:
-            return []
-        if count == 1:
-            return [self.create_record_form_dialog(title, msg, fields, wrapper_type, column_positions,
-                                                   default_modifier=default_modifier, field_modifiers=field_modifiers)]
-        return self.create_record_table_dialog(title, msg, fields, wrapper_type, count,
-                                               default_modifier=default_modifier, field_modifiers=field_modifiers,
-                                               group_by=group_by, image_data=image_data)
-
     def multi_type_table_dialog(self,
                                 title: str,
                                 msg: str,
-                                fields: list[tuple[DataTypeIdentifier, FieldIdentifier] | AbstractVeloxFieldDefinition],
+                                fields: list[(str, str) | AbstractVeloxFieldDefinition],
                                 row_contents: list[list[SapioRecord | FieldMap]],
                                 *,
                                 default_modifier: FieldModifier | None = None,
-                                field_modifiers: dict[FieldIdentifier, FieldModifier] | None = None,
-                                data_type: DataTypeIdentifier = "Default",
+                                field_modifiers: dict[str, FieldModifier] | None = None,
+                                data_type: str = "Default",
                                 display_name: str | None = None,
                                 plural_display_name: str | None = None) -> list[FieldMap]:
         """
@@ -1061,7 +581,7 @@ class CallbackUtil:
         previously cached.
 
         :param title: The title of the dialog.
-        :param msg: The message to display in the dialog. This can be formatted using HTML elements.
+        :param msg: The message to display in the dialog.
         :param fields: A list of objects representing the fields in the table. This could either be a two-element tuple
             where the first element is a data type name and the second is a field name, or it could be a field
             definition. If it is the former, a query will be made to find the field definition matching tht data type.
@@ -1107,31 +627,23 @@ class CallbackUtil:
         :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.
         """
-        if not row_contents:
-            raise SapioException("No values provided.")
-
         # Set the default modifier to make all fields visible and not key if no default was provided.
         if default_modifier is None:
             default_modifier = FieldModifier(visible=True, key_field=False)
         # To make things simpler, treat null field modifiers as an empty dict.
         if field_modifiers is None:
             field_modifiers = {}
-        else:
-            field_modifiers: dict[str, FieldModifier] = AliasUtil.to_data_field_names_dict(field_modifiers)
 
         # Construct the final fields list from the possible field objects.
         final_fields: list[AbstractVeloxFieldDefinition] = []
         # Keep track of whether any given field name appears more than once, as two fields could have the same
         # field name but different data types. In this case, the user should provide a field modifier or field
         # definition that changes one of the field names.
-        raw_field_names: set[str] = set()
-        field_names: set[str] = set()
+        field_names: list[str] = []
         for field in fields:
             # Find the field definition for this field object.
             if isinstance(field, tuple):
-                dt: str = AliasUtil.to_data_type_name(field[0])
-                fld: str = AliasUtil.to_data_field_name(field[1])
-                field_def: AbstractVeloxFieldDefinition = self.__get_field_def(dt, fld)
+                field_def: AbstractVeloxFieldDefinition = self.dt_cache.get_fields_for_type(field[0]).get(field[1])
             elif isinstance(field, AbstractVeloxFieldDefinition):
                 field_def: AbstractVeloxFieldDefinition = field
             else:
@@ -1139,21 +651,7 @@ class CallbackUtil:
 
             # Locate the modifier for this field and store the modified field.
             name: str = field_def.data_field_name
-            # PR-47378: Account for the scenario where two fields share the same field name and we need to determine
-            # which field modifier to apply to each field name.
-            duplicate: bool = name in raw_field_names
-            if duplicate and name in field_modifiers:
-                raise SapioException(f"The field name \"{name}\" appears more than once in the given fields while also "
-                                     f"having a field_modifiers dictionary key of the same name. This function is "
-                                     f"unable to distinguish which field the field modifier should be applied to. "
-                                     f"Update your field_modifiers dictionary to provide keys in the form "
-                                     f"[Data Type Name].[Data Field Name] for this field name.")
-            raw_field_names.add(name)
-            full_name = f"{field_def.data_type_name}.{name}"
-            if full_name in field_modifiers:
-                modifier: FieldModifier = field_modifiers.get(full_name)
-            else:
-                modifier: FieldModifier = field_modifiers.get(name, default_modifier)
+            modifier: FieldModifier = field_modifiers.get(name, default_modifier)
             field_def: AbstractVeloxFieldDefinition = modifier.modify_field(field_def)
             final_fields.append(field_def)
 
@@ -1163,9 +661,9 @@ class CallbackUtil:
             if name in field_names:
                 raise SapioException(f"The field name \"{name}\" appears more than once in the given fields. "
                                      f"If you have provided two fields with the same name but different data types, "
-                                     f"consider providing a FieldModifier where prepend_data_type is true for "
-                                     f"this field so that the field names will become different.")
-            field_names.add(name)
+                                     f"consider providing a FieldModifier where prepend_data_type is true for one of "
+                                     f"the fields so that the field names will be different.")
+            field_names.append(name)
 
         # Get the values for each row.
         values: list[dict[str, FieldValue]] = []
@@ -1180,7 +678,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_names(rec)
+                dt: str = "Default" if isinstance(rec, dict) else rec.data_type_name
                 # 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.")
@@ -1192,7 +690,7 @@ class CallbackUtil:
                 record: SapioRecord | FieldMap | None = row_records.get(field.data_type_name)
                 # This could be either a record, a field map, or null. Convert any records to field maps.
                 if not isinstance(record, dict) and record is not None:
-                    record: FieldMap | None = AliasUtil.to_field_map(record)
+                    record: FieldMap | None = AliasUtil.to_field_map_lists([record])[0]
 
                 # Find out if this field had its data type prepended to it. If this is the case, then we need to find
                 # the true data field name before retrieving the value from the field map.
@@ -1204,19 +702,32 @@ class CallbackUtil:
                 row_values[field.data_field_name] = record.get(name) if record else None
             values.append(row_values)
 
-        # Build a temporary data type for the request.
-        temp_dt = self.__temp_dt_from_field_defs(data_type, display_name, plural_display_name, final_fields, None)
+        if display_name is None:
+            display_name = data_type
+        if plural_display_name is None:
+            plural_display_name = display_name + "s"
+
+        builder = FormBuilder(data_type, display_name, plural_display_name)
+        for field in final_fields:
+            builder.add_field(field)
 
-        # Send the request to the user.
-        request = TableEntryDialogRequest(title, msg, temp_dt, values,
+        request = TableEntryDialogRequest(title, msg, builder.get_temporary_data_type(), values,
                                           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)
+        try:
+            self.user.timeout_seconds = self.timeout_seconds
+            response: list[FieldMap] | None = self.callback.show_table_entry_dialog(request)
+        except ReadTimeout:
+            raise SapioDialogTimeoutException()
+        finally:
+            self.user.timeout_seconds = self._original_timeout
+        if response is None:
+            raise SapioUserCancelledException()
         return response
-
+    
     def record_view_dialog(self,
                            title: str,
                            record: SapioRecord,
-                           layout: DataTypeLayoutIdentifier = None,
+                           layout: str | DataTypeLayout | None = None,
                            minimized: bool = False,
                            access_level: FormAccessLevel | None = None,
                            plugin_path_list: list[str] | None = None) -> None:
@@ -1240,192 +751,145 @@ class CallbackUtil:
         :param plugin_path_list: A white list of plugins that should be displayed in the dialog. This white list
             includes plugins that would be displayed on sub-tables/components in the layout.
         """
-        # Get the data record and data type layout from the provided parameters.
+        # Ensure that the given record is a DataRecord.
         record: DataRecord = AliasUtil.to_data_record(record)
-        layout: DataTypeLayout | None = self.__to_layout(AliasUtil.to_data_type_name(record), layout)
 
-        # Send the request to the user.
+        # Get the corresponding DataTypeLayout for the provided name.
+        if isinstance(layout, str):
+            # TODO: Replace with dt_cache if the DataTypeCacheManager ever starts caching layouts.
+            dt_man = DataMgmtServer.get_data_type_manager(self.user)
+            data_type: str = record.get_data_type_name()
+            layouts: dict[str, DataTypeLayout] = {x.layout_name: x for x in dt_man.get_data_type_layout_list(data_type)}
+            layout_name: str = layout
+            layout: DataTypeLayout | None = layouts.get(layout_name)
+            # If a name was provided then the caller expects that name to exist. Throw an exception if it doesn't.
+            if not layout:
+                raise SapioException(f"The data type \"{data_type}\" does not have a layout by the name "
+                                     f"\"{layout_name}\" in the system.")
+
         request = DataRecordDialogRequest(title, record, layout, minimized, access_level, plugin_path_list,
                                           width_in_pixels=self.width_pixels, width_percentage=self.width_percent)
-        response: bool = self.__handle_dialog_request(request, self.callback.data_record_form_view_dialog)
-        # The __handle_dialog_request function only throws a cancelled exception if the response is None, but in
-        # this case we also want to throw if the response is False.
+        try:
+            self.user.timeout_seconds = self.timeout_seconds
+            response: bool = self.callback.data_record_form_view_dialog(request)
+        except ReadTimeout:
+            raise SapioDialogTimeoutException()
+        finally:
+            self.user.timeout_seconds = self._original_timeout
         if not response:
             raise SapioUserCancelledException()
-
-    # CR-47326: Allow the selection dialog functions to preselect rows/records in the table.
+    
     def selection_dialog(self,
                          msg: str,
                          fields: list[AbstractVeloxFieldDefinition],
                          values: list[FieldMap],
                          multi_select: bool = True,
-                         preselected_rows: list[FieldMap | RecordIdentifier] | None = None,
                          *,
-                         data_type: DataTypeIdentifier = "Default",
+                         data_type: str = "Default",
                          display_name: str | None = None,
-                         plural_display_name: str | None = None,
-                         image_data: list[bytes] | None = None,
-                         require_selection: bool = False,
-                         repeat_message: str | None = "Please provide a selection to continue.") -> list[FieldMap]:
+                         plural_display_name: str | None = None) -> list[FieldMap]:
         """
         Create a selection dialog for a list of field maps for the user to choose from. Requires that the caller
         provide the definitions of every field in the table.
-        The title of a selection dialog will always be "Select [plural display name]".
 
-        :param msg: The message to display in the dialog. This can be formatted using HTML elements.
+        :param msg: The message to display in the dialog.
         :param fields: The definitions of the fields to display as table columns. Fields will be displayed in the order
             they are provided in this list.
         :param values: The values to set for each row of the table.
         :param multi_select: Whether the user is able to select multiple rows from the list.
-        :param preselected_rows: The rows that should be selected in the dialog when it is initially
-            displayed to the user. The user will be allowed to deselect these records if they so wish. If preselected
-            rows are provided, the dialog will automatically allow multi-selection of records. Note that in order for
-            preselected rows to be identified, they MUST contain a "RecordId" field with a numeric value that is unique
-            across all provided values.
         :param data_type: The data type name for the temporary data type that will be created for this table.
         :param display_name: The display name for the temporary data type. If not provided, defaults to the data type
             name.
         :param plural_display_name: The plural display name for the temporary data type. If not provided, defaults to
             the display name + "s".
-        :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 values list.
-        :param require_selection: If true, the request will be re-sent if the user submits the dialog without making
-            a selection.
-        :param repeat_message: If require_selection is true and a repeat_message is provided, then that message appears
-            as toaster text if the dialog is repeated.
         :return: A list of field maps corresponding to the chosen input field maps.
         """
-        if not values:
-            raise SapioException("No values provided.")
-
-        if preselected_rows:
-            # Confirm that the provided field maps are validly configured to allow the use of preselected rows.
-            encountered_ids: set[int] = set()
-            for row in values:
-                if "RecordId" not in row or row["RecordId"] is None:
-                    raise SapioException("When using preselected_rows, the provided field map values must have a "
-                                         "RecordId field.")
-                row_id: int = row["RecordId"]
-                if row_id in encountered_ids:
-                    raise SapioException(f"Not all RecordId values in the provided field maps are unique. "
-                                         f"{row_id} was encountered more than once.")
-                encountered_ids.add(row_id)
-
-            # Convert the preselected rows to a list of integers.
-            new_list: list[int] = []
-            for value in preselected_rows:
-                if isinstance(value, dict):
-                    new_list.append(value["RecordId"])
-                else:
-                    new_list.append(AliasUtil.to_record_id(value))
-            preselected_rows: list[int] = new_list
-
-            # Add a RecordId definition to the fields if one is not already present. This is necessary for the
-            # pre-selected records parameter to function.
-            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)))
-
-        # Build a temporary data type for the request.
-        temp_dt = self.__temp_dt_from_field_defs(data_type, display_name, plural_display_name, fields, None)
-        temp_dt.record_image_assignable = bool(image_data)
-
-        # Send the request to the user.
-        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,
-                                                                    self.callback.show_temp_table_selection_dialog)
-            if not require_selection or response:
-                break
-            if repeat_message:
-                self.toaster_popup(repeat_message, popup_type=PopupType.Warning)
-        return response
+        if display_name is None:
+            display_name = data_type
+        if plural_display_name is None:
+            plural_display_name = display_name + "s"
 
-    def record_selection_dialog(self,
-                                msg: str,
-                                fields: list[FieldIdentifier | FieldFilterCriteria] | DataTypeLayoutIdentifier,
-                                records: list[SapioRecord],
-                                multi_select: bool = True,
-                                preselected_records: list[RecordIdentifier] | None = None,
-                                *,
-                                image_data: list[bytes] | None = None,
-                                require_selection: bool = False,
-                                repeat_message: str | None = "Please provide a selection to continue.") \
-            -> list[SapioRecord]:
+        builder = FormBuilder(data_type, display_name, plural_display_name)
+        for field in fields:
+            builder.add_field(field)
+
+        request = TempTableSelectionRequest(builder.get_temporary_data_type(), msg, values,
+                                            multi_select=multi_select)
+        try:
+            self.user.timeout_seconds = self.timeout_seconds
+            response: list[FieldMap] | None = self.callback.show_temp_table_selection_dialog(request)
+        except ReadTimeout:
+            raise SapioDialogTimeoutException()
+        finally:
+            self.user.timeout_seconds = self._original_timeout
+        if response is None:
+            raise SapioUserCancelledException()
+        return response
+    
+    def record_selection_dialog(self, msg: str, fields: list[str], records: list[SapioRecord],
+                                multi_select: bool = True) -> list[SapioRecord]:
         """
         Create a record selection dialog for a list of records for the user to choose from. Provided field names must
         match fields on the definition of the data type of the given records.
-        The title of a selection dialog will always be "Select [plural display name]".
 
         Makes webservice calls to get the data type definition and fields of the given records if they weren't
         previously cached.
 
-        :param msg: The message to display in the dialog. This can be formatted using HTML elements.
+        :param msg: The message to display in the dialog.
         :param fields: The names of the fields to display as columns in the table. Fields will be displayed in the order
-            they are provided in this list. This parameter may also be an identifier for a data type layout from the
-            data type of the provided records. If None, then the layout assigned to the current user's group for this
-            data type will be used.
+            they are provided in this list.
         :param records: The records to display as rows in the table.
         :param multi_select: Whether the user is able to select multiple records from the list.
-        :param preselected_records: The records that should be selected in the dialog when it is initially
-            displayed to the user. The user will be allowed to deselect these records if they so wish. If preselected
-            record IDs are provided, the dialog will automatically allow multi-selection of records.
-        :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 require_selection: If true, the request will be re-sent if the user submits the dialog without making
-            a selection.
-        :param repeat_message: If require_selection is true and a repeat_message is provided, then that message appears
-            as toaster text if the dialog is repeated.
         :return: A list of the selected records.
         """
-        # Get the data type name and field values from the provided records.
         if not records:
             raise SapioException("No records provided.")
-        data_type: str = AliasUtil.to_singular_data_type_name(records)
-        field_map_list: list[FieldMap] = AliasUtil.to_field_map_list(records, include_record_id=True)
+        data_types: set[str] = {x.data_type_name for x in records}
+        if len(data_types) > 1:
+            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_lists(records)
+        # Put the record ID of each record in its corresponding field map so that we can map the field maps back to
+        # the records when we return them to the caller.
+        for record, field_map in zip(records, field_map_list):
+            field_map.update({"RecId": record.record_id})
+        # Get the field definitions of the data type.
+        type_def: DataTypeDefinition = self.dt_cache.get_data_type(data_type)
+        field_defs: dict[str, AbstractVeloxFieldDefinition] = self.dt_cache.get_fields_for_type(data_type)
 
         # Key fields display their columns in order before all non-key fields.
         # Unmark key fields so that the column order is respected exactly as the caller provides it.
         # Also make everything visible, because presumably the caller give a field name because they want it to be seen.
         modifier = FieldModifier(visible=True, key_field=False)
 
-        # Build a temporary data type for the request.
-        if isinstance(fields, DataTypeLayoutIdentifier):
-            temp_dt = self.__temp_dt_from_layout(data_type, fields, modifier, {})
-        else:
-            temp_dt = self.__temp_dt_from_field_names(data_type, fields, None, modifier, {})
-        temp_dt.record_image_assignable = bool(image_data)
-
-        if preselected_records:
-            # Convert the preselected records to a list of integers.
-            preselected_records: list[int] = AliasUtil.to_record_ids(preselected_records)
-            # Add a RecordId definition to the fields if one is not already present. This is necessary for the
-            # pre-selected records parameter to function.
-            if "RecordId" not in [x.data_field_name for x in temp_dt.get_field_def_list()]:
-                builder = FieldBuilder(data_type)
-                temp_dt.set_field_definition(builder.long_field("RecordId", abstract_info=AnyFieldInfo(visible=False)))
-
-        # Send the request to the user.
-        request = TempTableSelectionRequest(temp_dt, msg, field_map_list, image_data, preselected_records, 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,
-                                                                    self.callback.show_temp_table_selection_dialog)
-            if not require_selection or response:
-                break
-            if repeat_message:
-                self.toaster_popup(repeat_message, popup_type=PopupType.Warning)
+        # Build the form using only those fields that are desired.
+        builder = FormBuilder(data_type, type_def.display_name, type_def.plural_display_name)
+        for field_name in fields:
+            field_def = field_defs.get(field_name)
+            if field_def is None:
+                raise SapioException(f"No field of name \"{field_name}\" in field definitions of type \"{data_type}\"")
+            builder.add_field(modifier.modify_field(field_def))
 
+        request = TempTableSelectionRequest(builder.get_temporary_data_type(), msg, field_map_list,
+                                            multi_select=multi_select)
+        try:
+            self.user.timeout_seconds = self.timeout_seconds
+            response: list[FieldMap] | None = self.callback.show_temp_table_selection_dialog(request)
+        except ReadTimeout:
+            raise SapioDialogTimeoutException()
+        finally:
+            self.user.timeout_seconds = self._original_timeout
+        if response is None:
+            raise SapioUserCancelledException()
         # Map the field maps in the response back to the record they come from, returning the chosen record instead of
         # the chosen field map.
         records_by_id: dict[int, SapioRecord] = RecordHandler.map_by_id(records)
         ret_list: list[SapioRecord] = []
         for field_map in response:
-            ret_list.append(records_by_id.get(field_map.get("RecordId")))
+            ret_list.append(records_by_id.get(field_map.get("RecId")))
         return ret_list
 
-    # CR-47377: Add allow_creation and default_creation_number to cover new parameters of this request type from 24.12.
     def input_selection_dialog(self,
                                wrapper_type: type[WrappedType],
                                msg: str,
@@ -1436,21 +900,14 @@ class CallbackUtil:
                                custom_search: CustomReport | CustomReportCriteria | str | 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,
-                               *,
-                               require_selection: bool = False,
-                               repeat_message: str | None = "Please provide a selection to continue.") \
-            -> list[WrappedType]:
+                               record_whitelist: list[RecordIdentifier] | None = None) -> list[WrappedType]:
         """
         Display a table of records that exist in the system matching the given data type and filter criteria and have
         the user select one or more records from the table.
-        The title of a selection dialog will always be "Select [plural display name]".
 
         :param wrapper_type: The record model wrapper for the records to display in the dialog.
         :param msg: The message to show near the top of the dialog, below the title. This can be used to
-            instruct the user on what is desired from the dialog. This can be formatted using HTML elements.
+            instruct the user on what is desired from the dialog.
         :param multi_select: Whether the user may select multiple items at once in this dialog.
         :param only_key_fields: Whether only key fields of the selected data type should be displayed in the table
             of data in the dialog. If false, allows all possible fields to be displayed as columns in the table.
@@ -1474,18 +931,6 @@ class CallbackUtil:
         :param record_blacklist: A list of records that should not be seen as possible options in the dialog.
         :param record_whitelist: A list of records that will be seen as possible options in the dialog. Records not in
             this whitelist will not be displayed if a whitelist is provided.
-        :param allow_creation: Whether the "Create New" button will be visible to the user to create new records of the
-            given type. The user must also have group access to be able to create the records.
-        :param default_creation_number: If the user clicks the "Create New" button, then this is the value that will
-            appear by default in the dialog that prompts the user to select how many new records to create. The value
-            must be between 1 and 500, with values outside of that range being clamped to it. If this value is greater
-            than 1, then multi-selection must be true. The data type definition of the records being created must have
-            "Prompt for Number to Add" set to true in order to allow the user to select how many records to create, as
-            otherwise user will only ever be able to create one record at a time.
-        :param require_selection: If true, the request will be re-sent if the user submits the dialog without making
-            a selection.
-        :param repeat_message: If require_selection is true and a repeat_message is provided, then that message appears
-            as toaster text if the dialog is repeated.
         :return: A list of the records selected by the user in the dialog, wrapped as record models using the provided
             wrapper.
         """
@@ -1507,61 +952,50 @@ class CallbackUtil:
         if isinstance(custom_search, str):
             custom_search: CustomReport = CustomReportUtil.get_system_report_criteria(self.user, custom_search)
 
-        # Send the request to the user.
         request = InputSelectionRequest(data_type, msg, search_types, only_key_fields, record_blacklist,
                                         record_whitelist, preselected_records, custom_search, scan_criteria,
-                                        multi_select, allow_creation, default_creation_number)
-        # If require_selection is true, repeat the request if the user didn't make a selection.
-        while True:
-            response: list[DataRecord] = self.__handle_dialog_request(request,
-                                                                      self.callback.show_input_selection_dialog)
-            if not require_selection or response:
-                break
-            if repeat_message:
-                self.toaster_popup(repeat_message, popup_type=PopupType.Warning)
-        return self.rec_handler.wrap_models(response, wrapper_type)
-
-    def esign_dialog(self,
-                     title: str,
-                     msg: str,
-                     show_comment: bool = True,
-                     additional_fields: list[AbstractVeloxFieldDefinition] | None = None,
-                     *,
-                     require_authentication: bool = False) -> ESigningResponsePojo:
+                                        multi_select)
+        try:
+            self.user.timeout_seconds = self.timeout_seconds
+            response: list[DataRecord] | None = self.callback.show_input_selection_dialog(request)
+        except ReadTimeout:
+            raise SapioDialogTimeoutException()
+        finally:
+            self.user.timeout_seconds = self._original_timeout
+        if response is None:
+            raise SapioUserCancelledException()
+        return RecordHandler(self.user).wrap_models(response, wrapper_type)
+    
+    def esign_dialog(self, title: str, msg: str, show_comment: bool = True,
+                     additional_fields: list[AbstractVeloxFieldDefinition] = None) -> ESigningResponsePojo:
         """
         Create an e-sign dialog for the user to interact with.
-
+        
         :param title: The title of the dialog.
-        :param msg: The message to display in the dialog. This can be formatted using HTML elements.
+        :param msg: The message to display in the dialog.
         :param show_comment: Whether the "Meaning of Action" field should appear in the e-sign dialog. If true, the
             user is required to provide an action.
         :param additional_fields: Field definitions for additional fields to display in the dialog, for if there is
             other information you wish to gather from the user alongside the e-sign.
-        :param require_authentication: If true, the request will be re-sent if the user submits the dialog with invalid
-            credentials.
         :return: An e-sign response object containing information about the e-sign attempt.
         """
-        # Construct a temporary data type if any additional fields are provided.
         temp_dt = None
         if additional_fields:
             builder = FormBuilder()
             for field in additional_fields:
                 builder.add_field(field)
             temp_dt = builder.get_temporary_data_type()
-
-        # Send the request to the user.
         request = ESigningRequestPojo(title, msg, show_comment, temp_dt,
                                       width_in_pixels=self.width_pixels, width_percentage=self.width_percent)
-        # If require_authentication is true, repeat the request if the user didn't provide valid credentials.
-        while True:
-            response: ESigningResponsePojo = self.__handle_dialog_request(request, self.callback.show_esign_dialog)
-            if not require_authentication or response.authenticated:
-                break
-            # This matches the OOB behavior.
-            self.toaster_popup("Incorrect username/password", popup_type=PopupType.Error)
-            if not response.same_user:
-                self.toaster_popup(f"This action requires the credentials of {self.user.username}",
-                                   popup_type=PopupType.Error)
+        try:
+            self.user.timeout_seconds = self.timeout_seconds
+            response: ESigningResponsePojo | None = self.callback.show_esign_dialog(request)
+        except ReadTimeout:
+            raise SapioDialogTimeoutException()
+        finally:
+            self.user.timeout_seconds = self._original_timeout
+        if response is None:
+            raise SapioUserCancelledException()
         return response
 
     def request_file(self, title: str, exts: list[str] | None = None,
@@ -1589,11 +1023,17 @@ class CallbackUtil:
             def do_consume(chunk: bytes) -> None:
                 return sink.consume_data(chunk, io_obj)
 
-            # Send the request to the user.
             request = FilePromptRequest(title, show_image_editor, ",".join(exts), show_camera_button)
-            file_path: str = self.__handle_dialog_request(request, self.callback.show_file_dialog, data_sink=do_consume)
+            try:
+                self.user.timeout_seconds = self.timeout_seconds
+                file_path: str | None = self.callback.show_file_dialog(request, do_consume)
+            except ReadTimeout:
+                raise SapioDialogTimeoutException()
+            finally:
+                self.user.timeout_seconds = self._original_timeout
+        if file_path is None:
+            raise SapioUserCancelledException()
 
-        # Verify that each of the file given matches the expected extension(s).
         self.__verify_file(file_path, sink.data, exts)
         return file_path, sink.data
 
@@ -1614,11 +1054,17 @@ class CallbackUtil:
         if exts is None:
             exts: list[str] = []
 
-        # Send the request to the user.
         request = MultiFilePromptRequest(title, show_image_editor, ",".join(exts), show_camera_button)
-        file_paths: list[str] = self.__handle_dialog_request(request, self.callback.show_multi_file_dialog)
+        try:
+            self.user.timeout_seconds = self.timeout_seconds
+            file_paths: list[str] | None = self.callback.show_multi_file_dialog(request)
+        except ReadTimeout:
+            raise SapioDialogTimeoutException()
+        finally:
+            self.user.timeout_seconds = self._original_timeout
+        if not file_paths:
+            raise SapioUserCancelledException()
 
-        # Verify that each of the files given match the expected extension(s).
         ret_dict: dict[str, bytes] = {}
         for file_path in file_paths:
             sink = InMemoryRecordDataSink(self.user)
@@ -1670,236 +1116,6 @@ class CallbackUtil:
         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: 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.
-        """
-        # Get the data type name as a string from the parameters, and set the display name and plural display name if
-        # they haven't been set.
-        data_type: str = AliasUtil.to_data_type_name(data_type)
-        if display_name is None:
-            display_name = data_type
-        if plural_display_name is None:
-            plural_display_name = display_name + "s"
-
-        # Key fields display their columns in order before all non-key fields.
-        # Unmark key fields so that the column order is respected exactly as the caller provides it.
-        modifier = FieldModifier(key_field=False)
-
-        builder = FormBuilder(data_type, display_name, plural_display_name)
-        for field_def in fields:
-            # Determine the column and span for each field in the form.
-            # If this isn't a form dialog, then adding the column and span to the FormBuilder has no effect.
-            field_name = field_def.data_field_name
-            column: int = 0
-            span: int = 4
-            if column_positions and field_name in column_positions:
-                position = column_positions.get(field_name)
-                column = position[0]
-                span = position[1]
-            # Apply the field modifier to each key field in the form.
-            if field_def.key_field:
-                field_def = modifier.modify_field(field_def)
-            builder.add_field(field_def, column, span)
-        return builder.get_temporary_data_type()
-
-    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:
-        """
-        Construct a Temporary Data Type definition from a given data type name and list of field identifiers for that
-        data type. Queries for the data type's definition to get the display name and plural display name, as well as
-        the data field definitions of the data type to map the given field identifiers to field definitions. If an
-        extension field is provided, then the extension data type's fields will be queried. Finally, applies the
-        provided field modifiers to the field definitions to alter them from their system-set values
-        """
-        # Get the definition of the data type to construct the form builder with the proper values.
-        type_def: DataTypeDefinition = self.dt_cache.get_data_type(data_type)
-        builder = FormBuilder(data_type, type_def.display_name, type_def.plural_display_name)
-
-        # Determine if any FieldFilterCriteria were provided. If so, remove them from the fields list so that it
-        # contains only field identifiers.
-        filter_criteria: list[FieldFilterCriteria] = [x for x in fields if isinstance(x, FieldFilterCriteria)]
-        for criteria in filter_criteria:
-            fields.remove(criteria)
-
-        # Build the form using only those fields that are desired.
-        field_names: list[str] = AliasUtil.to_data_field_names(fields)
-        for field_name in field_names:
-            field_def: AbstractVeloxFieldDefinition = self.__get_field_def(data_type, field_name)
-
-            # Determine the column and span for each field in the form.
-            # If this isn't a form dialog, then adding the column and span to the FormBuilder has no effect.
-            column: int = 0
-            span: int = 4
-            if column_positions and field_name in column_positions:
-                position = column_positions.get(field_name)
-                column = position[0]
-                span = position[1]
-
-            # Apply the field modifiers to each field in the form.
-            modifier: FieldModifier = field_modifiers.get(field_name, default_modifier)
-            builder.add_field(modifier.modify_field(field_def), column, span)
-
-        # Now determine if any fields match the provided filter criteria.
-        all_fields: dict[str, AbstractVeloxFieldDefinition] = self.dt_cache.get_fields_for_type(data_type)
-        current_column: int = 0
-        for criteria in filter_criteria:
-            for field_name, field_def in all_fields.items():
-                # Don't add fields that have already been added.
-                if field_name in field_names or not criteria.field_matches(field_def):
-                    continue
-                field_names.append(field_name)
-
-                # The caller can't know what fields are present, so the column positions dictionary can't be used.
-                # Still come up with spans for each field to minimize wasted space.
-                # Give boolean fields a span of 1 and HTML or multi-line string fields a span of 4.
-                # Give all other fields a span of 2.
-                if field_def.data_field_type == FieldType.BOOLEAN:
-                    span = 1
-                elif (isinstance(field_def, VeloxStringFieldDefinition)
-                      and (field_def.html_editor or field_def.num_lines > 1)):
-                    span = 4
-                else:
-                    span = 2
-                # Wrap the column position if necessary.
-                if current_column + span > 4:
-                    current_column = 0
-
-                # Apply the field modifiers to each field in the form.
-                modifier: FieldModifier = field_modifiers.get(field_name, default_modifier)
-                builder.add_field(modifier.modify_field(field_def), current_column, span)
-                current_column += span
-
-        return builder.get_temporary_data_type()
-
-    # CR-47309: Allow layouts to be provided in place of field names for record dialogs.
-    def __temp_dt_from_layout(self, data_type: str, layout: DataTypeLayoutIdentifier,
-                              default_modifier: FieldModifier, field_modifiers: dict[str, FieldModifier]) \
-            -> TemporaryDataType:
-        """
-        Construct a Temporary Data Type definition from a given data type name and layout identifier.
-        Applies the provided field modifiers to the field definitions from the layout's temp data type to alter them
-        from their system-set values
-        """
-        # Get the temp data type for the provided layout.
-        temp_dt = self.dt_man.get_temporary_data_type(data_type, self.__to_layout_name(layout))
-        # Apply the field modifiers to each field in the layout.
-        for field_def in temp_dt.get_field_def_list():
-            field_name: str = field_def.data_field_name
-            modifier: FieldModifier = field_modifiers.get(field_name, default_modifier)
-            temp_dt.set_field_definition(modifier.modify_field(field_def))
-        return temp_dt
-
-    def __prompt_for_count(self, count: tuple[int, int] | int, wrapper_type: type[WrappedType],
-                           require_input: bool, repeat_message: str) -> int:
-        """
-        Given a count value, if it is a tuple representing an allowable range of values for a number of records to
-        create, prompt the user to input the exact count to use. If the count is already a single integer, simply
-        return that.
-        """
-        if isinstance(count, tuple):
-            if hasattr(wrapper_type, "PLURAL_DISPLAY_NAME"):
-                plural: str = wrapper_type.PLURAL_DISPLAY_NAME
-            else:
-                plural: str = self.dt_cache.get_plural_display_name(wrapper_type.get_wrapper_data_type_name())
-            min_val, max_val = count
-            msg: str = f"How many {plural} should be created? ({min_val} to {max_val})"
-            count: int = self.integer_input_dialog(f"Create {plural}", msg, "Count", min_val, min_val, max_val,
-                                                   require_input=require_input, repeat_message=repeat_message)
-        return count
-
-    def __to_layout(self, data_type: str, layout: DataTypeLayoutIdentifier) -> DataTypeLayout | None:
-        """
-        Convert a data type layout identifier to a data type layout.
-        """
-        if layout is None:
-            return None
-        if isinstance(layout, DataTypeLayout):
-            return layout
-        layout_name: str = layout
-        layout: DataTypeLayout | None = self.__get_data_type_layout(data_type, layout_name)
-        # If a name was provided then the caller expects that name to exist. Throw an exception if it doesn't.
-        if not layout:
-            raise SapioException(f"The data type \"{data_type}\" does not have a layout by the name "
-                                 f"\"{layout_name}\" in the system.")
-        return layout
-
-    @staticmethod
-    def __to_layout_name(layout: DataTypeLayoutIdentifier) -> str | None:
-        """
-        Convert a data type layout identifier to a layout name.
-        """
-        if layout is None:
-            return None
-        if isinstance(layout, DataTypeLayout):
-            return layout.layout_name
-        return layout
-
-    def __get_data_type_layout(self, data_type: str, layout: str) -> DataTypeLayout:
-        """
-        Get a data type layout from the cache given its name.
-        """
-        if data_type in self.__layouts:
-            return self.__layouts[data_type].get(layout)
-        self.__layouts[data_type] = {x.layout_name: x for x in self.dt_man.get_data_type_layout_list(data_type)}
-        return self.__layouts[data_type].get(layout)
-
-    def __get_field_def(self, data_type: str, field_name: str) -> AbstractVeloxFieldDefinition:
-        """
-        Given a data type name and a data field name, return the field definition for that field on that data type.
-        If the field name is an extension field, properly gets the field definition from the extension data type instead
-        of the given data type and updates the extension field def to have its data field name match the given field
-        name.
-        """
-        # CR-47311: Support displaying extension fields with single-data-type record dialogs.
-        if "." in field_name:
-            # If there is a period in the given field name, then this is an extension field.
-            ext_dt, ext_fld = field_name.split(".")
-            # Locate the extension data type's field definitions.
-            field_def = self.dt_cache.get_fields_for_type(ext_dt).get(ext_fld)
-            if field_def is None:
-                raise SapioException(f"No field of name \"{ext_fld}\" in field definitions of extension type \"{ext_dt}\"")
-            # Copy the field definition and set its field name to match the extension field name so that the record
-            # field maps properly map the field value to the field definition.
-            field_def = copy(field_def)
-            field_def._data_field_name = field_name
-        else:
-            # If there is no period in the given field name, then this is a field on the base data type.
-            field_def = self.dt_cache.get_fields_for_type(data_type).get(field_name)
-            if field_def is None:
-                raise SapioException(f"No field of name \"{field_name}\" in field definitions of type \"{data_type}\"")
-        return field_def
-
-    def __handle_dialog_request(self, request: Any, func: Callable, **kwargs) -> Any:
-        """
-        Send a client callback request to the user that creates a dialog.
-
-        This function handles updating the user object's request timeout to match the request timeout of this
-        CallbackUtil for the duration of the dialog.
-        If the dialog times out then a SapioDialogTimeoutException is thrown.
-        If the user cancels the dialog then a SapioUserCancelledException is thrown.
-
-        :param request: The client callback request to send to the user.
-        :param func: The ClientCallback function to call with the given request as input.
-        :param kwargs: Additional keywords for the provided function call.
-        :return: The response from the client callback, if one was received.
-        """
-        try:
-            self.user.timeout_seconds = self.timeout_seconds
-            response: Any | None = func(request, **kwargs)
-        except ReadTimeout:
-            raise SapioDialogTimeoutException()
-        finally:
-            self.user.timeout_seconds = self._original_timeout
-        if response is None:
-            raise SapioUserCancelledException()
-        return response
-
 
 class FieldModifier:
     """
@@ -1943,99 +1159,29 @@ class FieldModifier:
         Apply modifications to a given field.
 
         :param field: The field to modify.
-        :return: A copy of the input field with the modifications applied. The input field is unchanged.
+        :return: A copy of the input field with the modifications applied.
         """
-        ret_val: AbstractVeloxFieldDefinition = copy(field)
+        field = copy_field(field)
         if self.prepend_data_type is True:
-            ret_val._data_field_name = ret_val.data_type_name + "." + ret_val.data_field_name
+            field._data_field_name = field.data_type_name + "." + field.data_field_name
         if self.display_name is not None:
-            ret_val.display_name = self.display_name
+            field.display_name = self.display_name
         if self.required is not None:
-            ret_val.required = self.required
+            field.required = self.required
         if self.editable is not None:
-            ret_val.editable = self.editable
+            field.editable = self.editable
         if self.visible is not None:
-            ret_val.visible = self.visible
+            field.visible = self.visible
         if self.key_field is not None:
-            ret_val.key_field = self.key_field
+            field.key_field = self.key_field
         if self.column_width is not None:
-            ret_val.default_table_column_width = self.column_width
-        return ret_val
+            field.default_table_column_width = self.column_width
+        return field
 
 
-# CR-46866: Create a class that can be used by record-backed dialogs to filter for the fields displayed in the dialog
-# based on the attributes of the field definitions of the data type instead of requiring that the caller know the
-# names of the fields to be displayed.
-class FieldFilterCriteria:
+def copy_field(field: AbstractVeloxFieldDefinition) -> AbstractVeloxFieldDefinition:
     """
-    A FieldFilterCriteria can be used to filter the fields that are displayed in certain record-backed client callbacks.
+    Create a copy of a given field definition. This is used to modify field definitions from the server for existing
+    data types without also modifying the field definition in the cache.
     """
-    required: bool | None
-    editable: bool | None
-    key_field: bool | None
-    identifier: bool | None
-    system_field: bool | 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: 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):
-        """
-        Values that are left as None have no effect on the filtering. A field must match all non-None values in order
-        to count as matching this filter.
-
-        :param required: Whether the field is required.
-        :param editable: Whether the field is editable.
-        :param key_field: Whether the field is a key field.
-        :param identifier: Whether the field is an identifier field.
-        :param system_field: Whether the field is a system field.
-        :param field_types: Include fields matching these types.
-        :param not_field_types: Exclude fields matching these types.
-        :param matches_tag: If provided, the field's tag must exactly match this value.
-        :param contains_tag: If provided, the field's tag must contain this value.
-        :param regex_tag: If provided, the field's tag must match this regex.
-        """
-        self.required = required
-        self.editable = editable
-        self.key_field = key_field
-        self.identifier = identifier
-        self.system_field = system_field
-        self.field_types = field_types
-        self.not_field_types = not_field_types
-        self.matches_tag = matches_tag
-        self.contains_tag = contains_tag
-        self.regex_tag = regex_tag
-
-    def field_matches(self, field: AbstractVeloxFieldDefinition) -> bool:
-        """
-        :param field: A field definition from a data type.
-        :return: Whether the field definition matches the filter criteria.
-        """
-        ret_val: bool = True
-        if self.required is not None:
-            ret_val = ret_val and self.required == field.required
-        if self.editable is not None:
-            ret_val = ret_val and self.editable == field.editable
-        if self.key_field is not None:
-            ret_val = ret_val and self.key_field == field.key_field
-        if self.identifier is not None:
-            ret_val = ret_val and self.identifier == field.identifier
-        if self.system_field is not None:
-            ret_val = ret_val and self.system_field == field.system_field
-        if self.field_types is not None:
-            ret_val = ret_val and field.data_field_type in self.field_types
-        if self.not_field_types is not None:
-            ret_val = ret_val and field.data_field_type not in self.not_field_types
-        if self.matches_tag is not None:
-            ret_val = ret_val and field.tag is not None and self.matches_tag == field.tag
-        if self.contains_tag is not None:
-            ret_val = ret_val and field.tag is not None and self.contains_tag in field.tag
-        if self.regex_tag is not None:
-            ret_val = ret_val and field.tag is not None and bool(re.match(self.regex_tag, field.tag))
-        return ret_val
+    return FieldDefinitionParser.to_field_definition(field.to_json())