sapiopycommons 2024.8.28a315__tar.gz → 2024.8.29a317__tar.gz

{sapiopycommons-2024.8.28a315 → sapiopycommons-2024.8.29a317}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sapiopycommons
-Version: 2024.8.28a315
+Version: 2024.8.29a317
 Summary: Official Sapio Python API Utilities Package
 Project-URL: Homepage, https://github.com/sapiosciences
 Author-email: Jonathan Steck <jsteck@sapiosciences.com>, Yechen Qiao <yqiao@sapiosciences.com>

{sapiopycommons-2024.8.28a315 → sapiopycommons-2024.8.29a317}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "sapiopycommons"
-version='2024.08.28a315'
+version='2024.08.29a317'
 authors = [
     { name="Jonathan Steck", email="jsteck@sapiosciences.com" },
     { name="Yechen Qiao", email="yqiao@sapiosciences.com" },

{sapiopycommons-2024.8.28a315 → sapiopycommons-2024.8.29a317}/src/sapiopycommons/callbacks/callback_util.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import io
-from weakref import WeakValueDictionary
+from typing import Any
 
 from sapiopylib.rest.ClientCallbackService import ClientCallback
 from sapiopylib.rest.DataMgmtService import DataMgmtServer
@@ -15,17 +15,16 @@ from sapiopylib.rest.pojo.datatype.FieldDefinition import AbstractVeloxFieldDefi
 from sapiopylib.rest.pojo.webhook.ClientCallbackRequest import OptionDialogRequest, ListDialogRequest, \
     FormEntryDialogRequest, InputDialogCriteria, TableEntryDialogRequest, ESigningRequestPojo, \
     DataRecordDialogRequest, InputSelectionRequest, FilePromptRequest, MultiFilePromptRequest, \
-    TempTableSelectionRequest, DisplayPopupRequest, PopupType
+    TempTableSelectionRequest
 from sapiopylib.rest.pojo.webhook.ClientCallbackResult import ESigningResponsePojo
+from sapiopylib.rest.pojo.webhook.WebhookContext import SapioWebhookContext
 from sapiopylib.rest.pojo.webhook.WebhookEnums import FormAccessLevel, ScanToSelectCriteria, SearchType
 from sapiopylib.rest.utils.DataTypeCacheManager import DataTypeCacheManager
 from sapiopylib.rest.utils.FormBuilder import FormBuilder
 from sapiopylib.rest.utils.recorddatasinks import InMemoryRecordDataSink
 from sapiopylib.rest.utils.recordmodel.RecordModelWrapper import WrappedType
 
-from sapiopycommons.files.file_util import FileUtil
-from sapiopycommons.general.aliases import FieldMap, SapioRecord, AliasUtil, RecordIdentifier, FieldValue, \
-    UserIdentifier
+from sapiopycommons.general.aliases import FieldMap, SapioRecord, AliasUtil, RecordIdentifier
 from sapiopycommons.general.custom_report_util import CustomReportUtil
 from sapiopycommons.general.exceptions import SapioUserCancelledException, SapioException, SapioUserErrorException
 from sapiopycommons.recordmodel.record_handler import RecordHandler
@@ -38,86 +37,26 @@ class CallbackUtil:
     width_pixels: int | None
     width_percent: float | None
 
-    __instances: WeakValueDictionary[SapioUser, CallbackUtil] = WeakValueDictionary()
-    __initialized: bool
-
-    def __new__(cls, context: UserIdentifier):
-        """
-        :param context: The current webhook context or a user object to send requests from.
-        """
-        user = AliasUtil.to_sapio_user(context)
-        obj = cls.__instances.get(user)
-        if not obj:
-            obj = object.__new__(cls)
-            obj.__initialized = False
-            cls.__instances[user] = obj
-        return obj
-
-    def __init__(self, context: UserIdentifier):
+    def __init__(self, context: SapioWebhookContext | SapioUser):
         """
         :param context: The current webhook context or a user object to send requests from.
         """
-        if self.__initialized:
-            return
-        self.__initialized = True
-
-        self.user = AliasUtil.to_sapio_user(context)
+        self.user = context if isinstance(context, SapioUser) else context.user
         self.callback = DataMgmtServer.get_client_callback(self.user)
         self.dt_cache = DataTypeCacheManager(self.user)
         self.width_pixels = None
         self.width_percent = None
 
-    def set_dialog_width(self, width_pixels: int | None = None, width_percent: float | None = None):
+    def set_dialog_width(self, width_pixels: int | None, width_percent: float | None):
         """
         Set the width that dialogs will appear as for those dialogs that support specifying their width.
 
         :param width_pixels: The number of pixels wide that dialogs will appear as.
-        :param width_percent: The percentage (as a value between 0 and 1) of the client's screen width that dialogs
-            will appear as.
+        :param width_percent: The percentage of the client's screen width that dialogs will appear as.
         """
-        if width_pixels is not None and width_percent is not None:
-            raise SapioException("Cannot set both width_pixels and width_percent at once.")
         self.width_pixels = width_pixels
         self.width_percent = width_percent
-
-    def toaster_popup(self, message: str, title: str = "", popup_type: PopupType = PopupType.Info) -> None:
-        """
-        Display a toaster popup in the bottom right corner of the user's screen.
-
-        :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
-        """
-        self.callback.display_popup(DisplayPopupRequest(title, message, popup_type))
-
-    def display_info(self, message: str) -> None:
-        """
-        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.
-        """
-        self.callback.display_info(message)
-
-    def display_warning(self, message: str) -> None:
-        """
-        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.
-        """
-        self.callback.display_warning(message)
-
-    def display_error(self, message: str) -> None:
-        """
-        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.
-        """
-        self.callback.display_error(message)
-
+    
     def option_dialog(self, title: str, msg: str, options: list[str], default_option: int = 0,
                       user_can_cancel: bool = False) -> str:
         """
@@ -132,8 +71,7 @@ class CallbackUtil:
             SapioUserCancelledException is thrown.
         :return: The name of the button that the user selected.
         """
-        request = OptionDialogRequest(title, msg, options, default_option, user_can_cancel,
-                                      width_in_pixels=self.width_pixels, width_percentage=self.width_percent)
+        request = OptionDialogRequest(title, msg, options, default_option, user_can_cancel)
         response: int | None = self.callback.show_option_dialog(request)
         if response is None:
             raise SapioUserCancelledException()
@@ -173,20 +111,16 @@ class CallbackUtil:
         """
         return self.option_dialog(title, msg, ["Yes", "No"], 0 if default_yes else 1, False) == "Yes"
 
-    def list_dialog(self, title: str, options: list[str], multi_select: bool = False,
-                    preselected_values: list[str] | None = None) -> list[str]:
+    def list_dialog(self, title: str, options: list[str], multi_select: bool = False) -> list[str]:
         """
         Create a list dialog with the given options for the user to choose from.
 
         :param title: The title of the dialog.
         :param options: The list options that the user has to choose from.
         :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.
         :return: The list of options that the user selected.
         """
-        request = ListDialogRequest(title, multi_select, options, preselected_values,
-                                    width_in_pixels=self.width_pixels, width_percentage=self.width_percent)
+        request = ListDialogRequest(title, multi_select, options)
         response: list[str] | None = self.callback.show_list_dialog(request)
         if response is None:
             raise SapioUserCancelledException()
@@ -229,6 +163,8 @@ class CallbackUtil:
         builder = FormBuilder(data_type, display_name, plural_display_name)
         for field_def in fields:
             field_name = field_def.data_field_name
+            if values and hasattr(field_def, "default_value"):
+                field_def.default_value = values.get(field_name)
             column: int = 0
             span: int = 4
             if column_positions and field_name in column_positions:
@@ -237,8 +173,7 @@ class CallbackUtil:
                 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)
+        request = FormEntryDialogRequest(title, msg, builder.get_temporary_data_type())
         response: FieldMap | None = self.callback.show_form_entry_dialog(request)
         if response is None:
             raise SapioUserCancelledException()
@@ -280,13 +215,13 @@ class CallbackUtil:
         modifier = FieldModifier(visible=True, editable=editable)
 
         # 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)
+            if hasattr(field_def, "default_value"):
+                field_def.default_value = record.get_field_value(field_name)
             column: int = 0
             span: int = 4
             if column_positions and field_name in column_positions:
@@ -295,14 +230,13 @@ class CallbackUtil:
                 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)
+        request = FormEntryDialogRequest(title, msg, builder.get_temporary_data_type())
         response: FieldMap | None = self.callback.show_form_entry_dialog(request)
         if response is None:
             raise SapioUserCancelledException()
         return response
 
-    def input_dialog(self, title: str, msg: str, field: AbstractVeloxFieldDefinition) -> FieldValue:
+    def input_dialog(self, title: str, msg: str, field: AbstractVeloxFieldDefinition) -> Any:
         """
         Create an input dialog where the user must input data for a singular field.
 
@@ -311,9 +245,8 @@ class CallbackUtil:
         :param field: The definition for a field that the user must provide input to.
         :return: The response value from the user for the given field.
         """
-        request = InputDialogCriteria(title, msg, field,
-                                      width_in_pixels=self.width_pixels, width_percentage=self.width_percent)
-        response: FieldValue | None = self.callback.show_input_dialog(request)
+        request = InputDialogCriteria(title, msg, field, self.width_pixels, self.width_percent)
+        response: Any | None = self.callback.show_input_dialog(request)
         if response is None:
             raise SapioUserCancelledException()
         return response
@@ -389,8 +322,6 @@ class CallbackUtil:
                      msg: str,
                      fields: list[AbstractVeloxFieldDefinition],
                      values: list[FieldMap],
-                     group_by: str | None = None,
-                     image_data: list[bytes] | None = None,
                      *,
                      data_type: str = "Default",
                      display_name: str | None = None,
@@ -404,10 +335,6 @@ class CallbackUtil:
         :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 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 values list.
         :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.
@@ -429,9 +356,7 @@ class CallbackUtil:
         for field in fields:
             builder.add_field(modifier.modify_field(field))
 
-        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)
+        request = TableEntryDialogRequest(title, msg, builder.get_temporary_data_type(), values)
         response: list[FieldMap] | None = self.callback.show_table_entry_dialog(request)
         if response is None:
             raise SapioUserCancelledException()
@@ -442,9 +367,7 @@ class CallbackUtil:
                             msg: str,
                             fields: list[str],
                             records: list[SapioRecord],
-                            editable: bool | None = True,
-                            group_by: str | None = None,
-                            image_data: list[bytes] | None = None) -> list[FieldMap]:
+                            editable: bool | None = True) -> 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. Provided field names must match fields on the definition of the data
@@ -461,10 +384,6 @@ class CallbackUtil:
             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
-            the image data list corresponds to the element at the same index in the records list.
         :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.
         """
@@ -491,9 +410,7 @@ class CallbackUtil:
                 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)
+        request = TableEntryDialogRequest(title, msg, builder.get_temporary_data_type(), field_map_list)
         response: list[FieldMap] | None = self.callback.show_table_entry_dialog(request)
         if response is None:
             raise SapioUserCancelledException()
@@ -605,10 +522,10 @@ class CallbackUtil:
             field_names.append(name)
 
         # Get the values for each row.
-        values: list[dict[str, FieldValue]] = []
+        values: list[dict[str, Any]] = []
         for row in row_contents:
             # The final values for this row:
-            row_values: dict[str, FieldValue] = {}
+            row_values: dict[str, Any] = {}
 
             # Map the records for this row by their data type. If a field map is provided, its data type is Default.
             row_records: dict[str, SapioRecord | FieldMap] = {}
@@ -650,8 +567,7 @@ class CallbackUtil:
         for field in final_fields:
             builder.add_field(field)
 
-        request = TableEntryDialogRequest(title, msg, builder.get_temporary_data_type(), values,
-                                          width_in_pixels=self.width_pixels, width_percentage=self.width_percent)
+        request = TableEntryDialogRequest(title, msg, builder.get_temporary_data_type(), values)
         response: list[FieldMap] | None = self.callback.show_table_entry_dialog(request)
         if response is None:
             raise SapioUserCancelledException()
@@ -700,8 +616,7 @@ class CallbackUtil:
                 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)
+        request = DataRecordDialogRequest(title, record, layout, minimized, access_level, plugin_path_list)
         response: bool = self.callback.data_record_form_view_dialog(request)
         if not response:
             raise SapioUserCancelledException()
@@ -748,7 +663,7 @@ class CallbackUtil:
         return response
     
     def record_selection_dialog(self, msg: str, fields: list[str], records: list[SapioRecord],
-                                multi_select: bool = True) -> list[SapioRecord]:
+                                multi_select: bool = True) -> list[FieldMap]:
         """
         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.
@@ -761,7 +676,7 @@ class CallbackUtil:
             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.
-        :return: A list of the selected records.
+        :return: A list of field maps corresponding to the chosen input records.
         """
         data_types: set[str] = {x.data_type_name for x in records}
         if len(data_types) > 1:
@@ -859,7 +774,7 @@ class CallbackUtil:
 
         # If CustomReportCriteria was provided, it must be wrapped as a CustomReport.
         if isinstance(custom_search, CustomReportCriteria):
-            custom_search: CustomReport = CustomReport(False, [], custom_search)
+            custom_search: CustomReport = CustomReport(False, None, custom_search)
         # If a string was provided, locate the report criteria for the predefined search in the system matching this
         # name.
         if isinstance(custom_search, str):
@@ -892,15 +807,14 @@ class CallbackUtil:
             for field in additional_fields:
                 builder.add_field(field)
             temp_dt = builder.get_temporary_data_type()
-        request = ESigningRequestPojo(title, msg, show_comment, temp_dt,
-                                      width_in_pixels=self.width_pixels, width_percentage=self.width_percent)
+        request = ESigningRequestPojo(title, msg, show_comment, temp_dt)
         response: ESigningResponsePojo | None = self.callback.show_esign_dialog(request)
         if response is None:
             raise SapioUserCancelledException()
         return response
 
     def request_file(self, title: str, exts: list[str] | None = None,
-                     show_image_editor: bool = False, show_camera_button: bool = False) -> tuple[str, bytes]:
+                     show_image_editor: bool = False, show_camera_button: bool = False) -> (str, bytes):
         """
         Request a single file from the user.
 
@@ -933,7 +847,7 @@ class CallbackUtil:
         return file_path, sink.data
 
     def request_files(self, title: str, exts: list[str] | None = None,
-                      show_image_editor: bool = False, show_camera_button: bool = False) -> dict[str, bytes]:
+                      show_image_editor: bool = False, show_camera_button: bool = False):
         """
         Request multiple files from the user.
 
@@ -964,7 +878,7 @@ class CallbackUtil:
         return ret_dict
 
     @staticmethod
-    def __verify_file(file_path: str, file_bytes: bytes, allowed_extensions: list[str]) -> None:
+    def __verify_file(file_path: str, file_bytes: bytes, allowed_extensions: list[str]):
         """
         Verify that the provided file was read (i.e. the file path and file bytes aren't None or empty) and that it
         has the correct file extension. Raises a user error exception if something about the file is incorrect.
@@ -978,7 +892,7 @@ class CallbackUtil:
         if len(allowed_extensions) != 0:
             matches: bool = False
             for ext in allowed_extensions:
-                if file_path.endswith("." + ext.lstrip(".")):
+                if file_path.endswith("." + ext):
                     matches = True
                     break
             if matches is False:
@@ -992,19 +906,9 @@ class CallbackUtil:
         :param file_name: The name of the file.
         :param file_data: The data of the file, provided as either a string or as a bytes array.
         """
-        data = io.BytesIO(file_data.encode() if isinstance(file_data, str) else file_data)
+        data = io.StringIO(file_data) if isinstance(file_data, str) else io.BytesIO(file_data)
         self.callback.send_file(file_name, False, data)
 
-    def write_zip_file(self, zip_name: str, files: dict[str, str | bytes]) -> None:
-        """
-        Send a collection of files to the user in a zip file.
-
-        :param zip_name: The name of the zip file.
-        :param files: A dictionary of the files to add to the zip file.
-        """
-        data = io.BytesIO(FileUtil.zip_files(files))
-        self.callback.send_file(zip_name, False, data)
-
 
 class FieldModifier:
     """

{sapiopycommons-2024.8.28a315 → sapiopycommons-2024.8.29a317}/src/sapiopycommons/datatype/attachment_util.py

@@ -1,9 +1,10 @@
 import io
 
-from sapiopylib.rest.DataMgmtService import DataMgmtServer
+from sapiopylib.rest.User import SapioUser
+from sapiopylib.rest.pojo.webhook.WebhookContext import SapioWebhookContext
 from sapiopylib.rest.utils.recordmodel.RecordModelWrapper import WrappedType
 
-from sapiopycommons.general.aliases import AliasUtil, SapioRecord, UserIdentifier
+from sapiopycommons.general.aliases import AliasUtil, SapioRecord
 from sapiopycommons.general.exceptions import SapioException
 from sapiopycommons.recordmodel.record_handler import RecordHandler
 
@@ -11,32 +12,31 @@ from sapiopycommons.recordmodel.record_handler import RecordHandler
 # FR-46064 - Initial port of PyWebhookUtils to sapiopycommons.
 class AttachmentUtil:
     @staticmethod
-    def get_attachment_bytes(context: UserIdentifier, attachment: SapioRecord) -> bytes:
+    def get_attachment_bytes(context: SapioWebhookContext, attachment: SapioRecord) -> bytes:
         """
         Get the data bytes for the given attachment record. Makes a webservice call to retrieve the data.
 
-        :param context: The current webhook context or a user object to send requests from.
+        :param context: The current webhook context.
         :param attachment: The attachment record.
         :return: The bytes for the attachment's file data.
         """
         attachment = AliasUtil.to_data_record(attachment)
-        dr_man = DataMgmtServer.get_data_record_manager(AliasUtil.to_sapio_user(context))
         with io.BytesIO() as data_sink:
             def consume_data(chunk: bytes):
                 data_sink.write(chunk)
-            dr_man.get_attachment_data(attachment, consume_data)
+            context.data_record_manager.get_attachment_data(attachment, consume_data)
             data_sink.flush()
             data_sink.seek(0)
             file_bytes = data_sink.read()
         return file_bytes
 
     @staticmethod
-    def set_attachment_bytes(context: UserIdentifier, attachment: SapioRecord,
+    def set_attachment_bytes(context: SapioWebhookContext, attachment: SapioRecord,
                              file_name: str, file_bytes: bytes) -> None:
         """
         Set the attachment data for a given attachment record. Makes a webservice call to set the data.
 
-        :param context: The current webhook context or a user object to send requests from.
+        :param context: The current webhook context.
         :param attachment: The attachment record. Must be an existing data record that is an attachment type.
         :param file_name: The name of the attachment.
         :param file_bytes: The bytes of the attachment data.
@@ -45,12 +45,11 @@ class AttachmentUtil:
             raise SapioException("Provided record cannot have its attachment data set, as it does not exist in the "
                                  "system yet.")
         attachment = AliasUtil.to_data_record(attachment)
-        dr_man = DataMgmtServer.get_data_record_manager(AliasUtil.to_sapio_user(context))
         with io.BytesIO(file_bytes) as stream:
-            dr_man.set_attachment_data(attachment, file_name, stream)
+            context.data_record_manager.set_attachment_data(attachment, file_name, stream)
 
     @staticmethod
-    def create_attachment(context: UserIdentifier, file_name: str, file_bytes: bytes,
+    def create_attachment(context: SapioWebhookContext | SapioUser, file_name: str, file_bytes: bytes,
                           wrapper_type: type[WrappedType]) -> WrappedType:
         """
         Create an attachment data type and initialize its attachment bytes at the same time.