sapiopycommons 2024.8.28a315__py3-none-any.whl → 2024.8.29a317__py3-none-any.whl

sapiopycommons/rules/eln_rule_handler.py

@@ -1,15 +1,10 @@
-from __future__ import annotations
-
-from weakref import WeakValueDictionary
-
-from sapiopylib.rest.User import SapioUser
 from sapiopylib.rest.pojo.DataRecord import DataRecord
-from sapiopylib.rest.pojo.eln.SapioELNEnums import ElnBaseDataType
+from sapiopylib.rest.pojo.webhook.VeloxRules import VeloxRuleType, VeloxRuleParser
 from sapiopylib.rest.pojo.webhook.WebhookContext import SapioWebhookContext
 from sapiopylib.rest.utils.recordmodel.RecordModelManager import RecordModelManager, RecordModelInstanceManager
 from sapiopylib.rest.utils.recordmodel.RecordModelWrapper import WrappedType
 
-from sapiopycommons.general.aliases import FieldMap, AliasUtil, DataTypeIdentifier
+from sapiopycommons.general.aliases import FieldMap
 from sapiopycommons.general.exceptions import SapioException
 
 
@@ -17,6 +12,7 @@ from sapiopycommons.general.exceptions import SapioException
 class ElnRuleHandler:
     """
     A class which helps with the parsing and navigation of the ELN rule result map of a webhook context.
+    TODO: Add functionality around the VeloxRuleType of the rule results.
     """
     __context: SapioWebhookContext
     """The context that this handler is working from."""
@@ -38,25 +34,7 @@ class ElnRuleHandler:
     """A mapping of entry name to the lists of field maps for that entry, each grouping of field maps being mapped by
     its data type."""
 
-    __instances: WeakValueDictionary[SapioUser, ElnRuleHandler] = WeakValueDictionary()
-    __initialized: bool
-
-    def __new__(cls, context: SapioWebhookContext):
-        if context.velox_eln_rule_result_map is None:
-            raise SapioException("No Velox ELN rule result map in context for ElnRuleHandler to parse.")
-        user = context if isinstance(context, SapioUser) else context.user
-        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: SapioWebhookContext):
-        if self.__initialized:
-            return
-        self.__initialized = True
-
         if context.velox_eln_rule_result_map is None:
             raise SapioException("No Velox ELN rule result map in context for ElnRuleHandler to parse.")
         self.__context = context
@@ -86,8 +64,13 @@ class ElnRuleHandler:
                         # Get the data type of this record. If this is an ELN type, ignore the digits.
                         data_type: str = record.data_type_name
                         # PR-46331: Ensure that all ELN types are converted to their base data type name.
-                        if ElnBaseDataType.is_eln_type(data_type):
-                            data_type = ElnBaseDataType.get_base_type(data_type).data_type_name
+                        # TODO: Use ElnBaseDataType.is_eln_type when it is no longer bugged in sapiopylib.
+                        if data_type.startswith("ELNExperiment_"):
+                            data_type = "ELNExperiment"
+                        elif data_type.startswith("ELNExperimentDetail_"):
+                            data_type = "ELNExperimentDetail"
+                        elif data_type.startswith("ELNSampleDetail_"):
+                            data_type = "ELNSampleDetail"
                         # Update the list of records of this type that exist so far globally.
                         self.__records.setdefault(data_type, set()).add(record)
                         # Do the same for the list of records of this type for this specific entry.
@@ -102,9 +85,19 @@ class ElnRuleHandler:
             entry_dict: dict[str, dict[int, FieldMap]] = {}
             for record_result in entry_results:
                 for result in record_result.velox_type_rule_field_map_result_list:
-                    data_type: str = result.velox_type_pojo.data_type_name
-                    if ElnBaseDataType.is_eln_type(data_type):
-                        data_type = ElnBaseDataType.get_base_type(data_type).data_type_name
+                    # TODO: sapiopylib currently has a bug where this velox_type_pojo variable is stored as a dict instead
+                    #  of as the intended VeloxRuleType object. Parse that dict as a VeloxRuleType before use.
+                    velox_type: VeloxRuleType | dict = result.velox_type_pojo
+                    if isinstance(velox_type, dict):
+                        velox_type: VeloxRuleType = VeloxRuleParser.parse_velox_rule_type(velox_type)
+                    data_type: str = velox_type.data_type_name
+                    # TODO: Use ElnBaseDataType.is_eln_type when it is no longer bugged in sapiopylib.
+                    if data_type.startswith("ELNExperiment_"):
+                        data_type = "ELNExperiment"
+                    elif data_type.startswith("ELNExperimentDetail_"):
+                        data_type = "ELNExperimentDetail"
+                    elif data_type.startswith("ELNSampleDetail_"):
+                        data_type = "ELNSampleDetail"
                     for field_map in result.field_map_list:
                         rec_id: int = field_map.get("RecordId")
                         self.__field_maps.setdefault(data_type, {}).update({rec_id: field_map})
@@ -125,7 +118,7 @@ class ElnRuleHandler:
         """
         return list(self.__entry_to_field_maps.keys())
 
-    def get_records(self, data_type: DataTypeIdentifier, entry: str | None = None) -> list[DataRecord]:
+    def get_records(self, data_type: str, entry: str | None = None) -> list[DataRecord]:
         """
         Get records from the cached context with the given data type. Capable of being filtered to searching within
         the context of an entry name. If the given data type or entry does not exist in the context,
@@ -136,12 +129,11 @@ class ElnRuleHandler:
             type from every entry. If an entry is provided, but it does not exist in the context, returns an empty list.
         :return: The records from the context that match the input parameters.
         """
-        data_type: str = AliasUtil.to_data_type_name(data_type)
         records: dict[str, set[DataRecord]] = self.__entry_to_records.get(entry, {}) if entry else self.__records
         return list(records.get(data_type, []))
 
     # FR-46701: Add functions to the rule handlers for accessing the field maps of inaccessible records in the context.
-    def get_field_maps(self, data_type: DataTypeIdentifier, entry: str | None = None) -> list[FieldMap]:
+    def get_field_maps(self, data_type: str, entry: str | None = None) -> list[FieldMap]:
         """
         Get field maps from the cached context with the given data type. Capable of being filtered to searching within
         the context of an entry name. If the given data type or entry does not exist in the context,
@@ -157,7 +149,6 @@ class ElnRuleHandler:
             list.
         :return: The field maps from the context that match the input parameters.
         """
-        data_type: str = AliasUtil.to_data_type_name(data_type)
         field_maps: dict[str, dict[int, FieldMap]] = self.__entry_to_field_maps.get(entry, {}) if entry else self.__field_maps
         return list(field_maps.get(data_type, {}).values())
 

sapiopycommons/rules/on_save_rule_handler.py

@@ -1,15 +1,10 @@
-from __future__ import annotations
-
-from weakref import WeakValueDictionary
-
-from sapiopylib.rest.User import SapioUser
 from sapiopylib.rest.pojo.DataRecord import DataRecord
-from sapiopylib.rest.pojo.eln.SapioELNEnums import ElnBaseDataType
+from sapiopylib.rest.pojo.webhook.VeloxRules import VeloxRuleType, VeloxRuleParser
 from sapiopylib.rest.pojo.webhook.WebhookContext import SapioWebhookContext
 from sapiopylib.rest.utils.recordmodel.RecordModelManager import RecordModelManager, RecordModelInstanceManager
 from sapiopylib.rest.utils.recordmodel.RecordModelWrapper import WrappedType
 
-from sapiopycommons.general.aliases import FieldMap, DataTypeIdentifier, AliasUtil
+from sapiopycommons.general.aliases import FieldMap
 from sapiopycommons.general.exceptions import SapioException
 
 
@@ -17,6 +12,7 @@ from sapiopycommons.general.exceptions import SapioException
 class OnSaveRuleHandler:
     """
     A class which helps with the parsing and navigation of the on save rule result map of a webhook context.
+    TODO: Add functionality around the VeloxRuleType of the rule results.
     """
     __context: SapioWebhookContext
     """The context that this handler is working from."""
@@ -38,25 +34,7 @@ class OnSaveRuleHandler:
     """A mapping of record IDs of records in the context.data_record_list to the field maps related to that
     record, each grouping of field maps being mapped by its data type."""
 
-    __instances: WeakValueDictionary[SapioUser, OnSaveRuleHandler] = WeakValueDictionary()
-    __initialized: bool
-
-    def __new__(cls, context: SapioWebhookContext):
-        if context.velox_on_save_result_map is None:
-            raise SapioException("No Velox on save rule result map in context for OnSaveRuleHandler to parse.")
-        user = context if isinstance(context, SapioUser) else context.user
-        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: SapioWebhookContext):
-        if self.__initialized:
-            return
-        self.__initialized = True
-
         if context.velox_on_save_result_map is None:
             raise SapioException("No Velox on save rule result map in context for OnSaveRuleHandler to parse.")
         self.__context = context
@@ -73,6 +51,9 @@ class OnSaveRuleHandler:
         self.__base_id_to_records = {}
         # Each record ID in the context has a list of results for that record.
         for record_id, rule_results in self.__context.velox_on_save_result_map.items():
+            # TODO: Record IDs are currently being stored in the map as strings instead of ints. This can be removed
+            #  once sapiopylib is fixed.
+            record_id = int(record_id)
             # Keep track of the records for this specific record ID.
             id_dict: dict[str, set[DataRecord]] = {}
             # The list of results for a record consist of a list of data records and a VeloxType that specifies
@@ -83,8 +64,13 @@ class OnSaveRuleHandler:
                     # Get the data type of this record. If this is an ELN type, ignore the digits.
                     data_type: str = record.data_type_name
                     # PR-46331: Ensure that all ELN types are converted to their base data type name.
-                    if ElnBaseDataType.is_eln_type(data_type):
-                        data_type = ElnBaseDataType.get_base_type(data_type).data_type_name
+                    # TODO: Use ElnBaseDataType.is_eln_type when it is no longer bugged in sapiopylib.
+                    if data_type.startswith("ELNExperiment_"):
+                        data_type = "ELNExperiment"
+                    elif data_type.startswith("ELNExperimentDetail_"):
+                        data_type = "ELNExperimentDetail"
+                    elif data_type.startswith("ELNSampleDetail_"):
+                        data_type = "ELNSampleDetail"
                     # Update the list of records of this type that exist so far globally.
                     self.__records.setdefault(data_type, set()).add(record)
                     # Do the same for the list of records of this type that relate to this record ID.
@@ -96,11 +82,24 @@ class OnSaveRuleHandler:
         self.__base_id_to_field_maps = {}
         # Repeat the same thing for the field map results.
         for record_id, rule_results in self.__context.velox_on_save_field_map_result_map.items():
+            # TODO: Record IDs are currently being stored in the map as strings instead of ints. This can be removed
+            #  once sapiopylib is fixed.
+            record_id = int(record_id)
             id_dict: dict[str, dict[int, FieldMap]] = {}
             for record_result in rule_results:
-                data_type: str = record_result.velox_type_pojo.data_type_name
-                if ElnBaseDataType.is_eln_type(data_type):
-                    data_type = ElnBaseDataType.get_base_type(data_type).data_type_name
+                # TODO: sapiopylib currently has a bug where this velox_type_pojo variable is stored as a dict instead
+                #  of as the intended VeloxRuleType object. Parse that dict as a VeloxRuleType before use.
+                velox_type: VeloxRuleType | dict = record_result.velox_type_pojo
+                if isinstance(velox_type, dict):
+                    velox_type: VeloxRuleType = VeloxRuleParser.parse_velox_rule_type(velox_type)
+                data_type: str = velox_type.data_type_name
+                # TODO: Use ElnBaseDataType.is_eln_type when it is no longer bugged in sapiopylib.
+                if data_type.startswith("ELNExperiment_"):
+                    data_type = "ELNExperiment"
+                elif data_type.startswith("ELNExperimentDetail_"):
+                    data_type = "ELNExperimentDetail"
+                elif data_type.startswith("ELNSampleDetail_"):
+                    data_type = "ELNSampleDetail"
                 for field_map in record_result.field_map_list:
                     rec_id: int = field_map.get("RecordId")
                     self.__field_maps.setdefault(data_type, {}).update({rec_id: field_map})
@@ -121,7 +120,7 @@ class OnSaveRuleHandler:
         """
         return list(self.__base_id_to_field_maps.keys())
 
-    def get_records(self, data_type: DataTypeIdentifier, record_id: int | None = None) -> list[DataRecord]:
+    def get_records(self, data_type: str, record_id: int | None = None) -> list[DataRecord]:
         """
         Get records from the cached context with the given data type. Capable of being filtered to searching within
         the context of a record ID. If the given data type or record ID does not exist in the context,
@@ -132,12 +131,11 @@ class OnSaveRuleHandler:
             data type from every ID. If an ID is provided, but it does not exist in the context, returns an empty list.
         :return: The records from the context that match the input parameters.
         """
-        data_type: str = AliasUtil.to_data_type_name(data_type)
         records: dict[str, set[DataRecord]] = self.__base_id_to_records.get(record_id, {}) if record_id else self.__records
         return list(records.get(data_type, []))
 
     # FR-46701: Add functions to the rule handlers for accessing the field maps of inaccessible records in the context.
-    def get_field_maps(self, data_type: DataTypeIdentifier, record_id: int | None = None) -> list[FieldMap]:
+    def get_field_maps(self, data_type: str, record_id: int | None = None) -> list[FieldMap]:
         """
         Get field maps from the cached context with the given data type. Capable of being filtered to searching within
         the context of a record ID. If the given data type or record ID does not exist in the context,
@@ -153,7 +151,6 @@ class OnSaveRuleHandler:
             list.
         :return: The field maps from the context that match the input parameters.
         """
-        data_type: str = AliasUtil.to_data_type_name(data_type)
         field_maps: dict[str, dict[int, FieldMap]] = self.__base_id_to_field_maps.get(record_id, {}) if record_id else self.__field_maps
         return list(field_maps.get(data_type, {}).values())
 

sapiopycommons/webhook/webhook_handlers.py

@@ -4,25 +4,16 @@ from logging import Logger
 
 from sapiopylib.rest.DataMgmtService import DataMgmtServer
 from sapiopylib.rest.DataRecordManagerService import DataRecordManager
-from sapiopylib.rest.User import SapioUser
 from sapiopylib.rest.WebhookService import AbstractWebhookHandler
-from sapiopylib.rest.pojo.Message import VeloxLogMessage, VeloxLogLevel
 from sapiopylib.rest.pojo.webhook.WebhookContext import SapioWebhookContext
 from sapiopylib.rest.pojo.webhook.WebhookEnums import WebhookEndpointType
 from sapiopylib.rest.pojo.webhook.WebhookResult import SapioWebhookResult
-from sapiopylib.rest.utils.DataTypeCacheManager import DataTypeCacheManager
 from sapiopylib.rest.utils.recordmodel.RecordModelManager import RecordModelManager, RecordModelInstanceManager, \
     RecordModelRelationshipManager
 from sapiopylib.rest.utils.recordmodel.ancestry import RecordModelAncestorManager
 
-from sapiopycommons.callbacks.callback_util import CallbackUtil
-from sapiopycommons.eln.experiment_handler import ExperimentHandler
 from sapiopycommons.general.exceptions import SapioUserErrorException, SapioCriticalErrorException, \
-    SapioUserCancelledException, SapioException
-from sapiopycommons.general.sapio_links import SapioNavigationLinker
-from sapiopycommons.recordmodel.record_handler import RecordHandler
-from sapiopycommons.rules.eln_rule_handler import ElnRuleHandler
-from sapiopycommons.rules.on_save_rule_handler import OnSaveRuleHandler
+    SapioUserCancelledException
 
 
 # FR-46064 - Initial port of PyWebhookUtils to sapiopycommons.
@@ -34,7 +25,6 @@ class CommonsWebhookHandler(AbstractWebhookHandler):
     """
     logger: Logger
 
-    user: SapioUser
     context: SapioWebhookContext
 
     dr_man: DataRecordManager
@@ -44,46 +34,21 @@ class CommonsWebhookHandler(AbstractWebhookHandler):
     # FR-46329: Add the ancestor manager to CommonsWebhookHandler.
     an_man: RecordModelAncestorManager
 
-    dt_cache: DataTypeCacheManager
-    rec_handler: RecordHandler
-    callback: CallbackUtil
-    exp_handler: ExperimentHandler | None
-    rule_handler: OnSaveRuleHandler | ElnRuleHandler | None
-
     def run(self, context: SapioWebhookContext) -> SapioWebhookResult:
-        self.user = context.user
         self.context = context
-
-        self.logger = self.user.logger
+        self.logger = context.user.logger
 
         self.dr_man = context.data_record_manager
-        self.rec_man = RecordModelManager(self.user)
+        self.rec_man = RecordModelManager(context.user)
         self.inst_man = self.rec_man.instance_manager
         self.rel_man = self.rec_man.relationship_manager
         self.an_man = RecordModelAncestorManager(self.rec_man)
 
-        self.dt_cache = DataTypeCacheManager(self.user)
-        self.rec_handler = RecordHandler(context)
-        self.callback = CallbackUtil(context)
-        if context.eln_experiment is not None:
-            self.exp_handler = ExperimentHandler(context)
-        else:
-            self.exp_handler = None
-        if self.is_on_save_rule():
-            self.rule_handler = OnSaveRuleHandler(context)
-        elif self.is_eln_rule():
-            self.rule_handler = ElnRuleHandler(context)
-        else:
-            self.rule_handler = None
-
         # Wrap the execution of each webhook in a try/catch. If an exception occurs, handle any special sapiopycommons
         # exceptions. Otherwise, return a generic message stating that an error occurred.
         try:
             self.initialize(context)
-            result = self.execute(context)
-            if result is None:
-                raise SapioException("Your execute function returned a None result! Don't forget your return statement!")
-            return result
+            return self.execute(context)
         except SapioUserErrorException as e:
             return self.handle_user_error_exception(e)
         except SapioCriticalErrorException as e:
@@ -135,7 +100,7 @@ class CommonsWebhookHandler(AbstractWebhookHandler):
             return result
         self.log_error(traceback.format_exc())
         if self.can_send_client_callback():
-            DataMgmtServer.get_client_callback(self.user).display_error(e.args[0])
+            DataMgmtServer.get_client_callback(self.context.user).display_error(e.args[0])
         return SapioWebhookResult(False)
 
     def handle_unexpected_exception(self, e: Exception) -> SapioWebhookResult:
@@ -149,10 +114,7 @@ class CommonsWebhookHandler(AbstractWebhookHandler):
         result: SapioWebhookResult | None = self.handle_any_exception(e)
         if result is not None:
             return result
-        msg: str = traceback.format_exc()
-        self.log_error(msg)
-        # FR-47079: Also log all unexpected exception messages to the webhook execution log within the platform.
-        self.log_error_to_webhook_execution_log(msg)
+        self.log_error(traceback.format_exc())
         return SapioWebhookResult(False, display_text="Unexpected error occurred during webhook execution. "
                                                       "Please contact Sapio support.")
 
@@ -167,7 +129,7 @@ class CommonsWebhookHandler(AbstractWebhookHandler):
         result: SapioWebhookResult | None = self.handle_any_exception(e)
         if result is not None:
             return result
-        return SapioWebhookResult(False)
+        return SapioWebhookResult(False, display_text="User cancelled.")
 
     # noinspection PyMethodMayBeStatic,PyUnusedLocal
     def handle_any_exception(self, e: Exception) -> SapioWebhookResult | None:
@@ -183,58 +145,32 @@ class CommonsWebhookHandler(AbstractWebhookHandler):
 
     def log_info(self, msg: str) -> None:
         """
-        Write an info message to the webhook server log. Log destination is stdout. This message will be prepended with
-        the user's username and the experiment ID of the experiment they are in, if any.
+        Write an info message to the log. Log destination is stdout. This message will be prepended with the user's
+        username and the experiment ID of the experiment they are in, if any.
         """
-        self.logger.info(self._format_log(msg, "log_info call"))
+        exp_id = None
+        if self.context.eln_experiment is not None:
+            exp_id = self.context.eln_experiment.notebook_experiment_id
+        # CR-46333: Add the user's group to the logging message.
+        user = self.context.user
+        username = user.username
+        group_name = user.session_additional_data.current_group_name
+        self.logger.info(f"(User: {username}, Group: {group_name}, Experiment: {exp_id}):\n{msg}")
 
     def log_error(self, msg: str) -> None:
         """
-        Write an error message to the webhook server log. Log destination is stderr. This message will be prepended with
-        the user's username and the experiment ID of the experiment they are in, if any.
+        Write an error message to the log. Log destination is stderr. This message will be prepended with the user's
+        username and the experiment ID of the experiment they are in, if any.
         """
-        # PR-46209: Use logger.error instead of logger.info when logging errors.
-        self.logger.error(self._format_log(msg, "log_error call"))
-
-    def log_error_to_webhook_execution_log(self, msg: str) -> None:
-        """
-        Write an error message to the platform's webhook execution log. This can be reviewed by navigating to the
-        webhook configuration where the webhook that called this function is defined and clicking the "View Log"
-        button. From there, select one of the rows for the webhook executions and click "Download Log" from the right
-        side table.
-        """
-        messenger = DataMgmtServer.get_messenger(self.user)
-        messenger.log_message(VeloxLogMessage(message=self._format_log(msg, "Error occurred during webhook execution."),
-                                              log_level=VeloxLogLevel.ERROR,
-                                              originating_class=self.__class__.__name__))
-
-    def _format_log(self, msg: str, prefix: str | None = None) -> str:
-        """
-        Given a message to log, populate it with some metadata about this particular webhook execution, including
-        the group of the user and the invocation type of the webhook call.
-        """
-        # If we're able to, provide a link to the location that the error occurred at.
-        navigator = SapioNavigationLinker(self.context)
+        exp_id = None
         if self.context.eln_experiment is not None:
-            link = navigator.experiment(self.context.eln_experiment)
-        elif self.context.data_record and not self.context.data_record_list:
-            link = navigator.data_record(self.context.data_record)
-        elif self.context.base_data_record:
-            link = navigator.data_record(self.context.base_data_record)
-        else:
-            link = None
-
-        message: str = ""
-        if prefix:
-            message += prefix + "\n"
-        message += f"Webhook invocation type: {self.context.end_point_type.display_name}\n"
-        message += f"Username: {self.user.username}\n"
+            exp_id = self.context.eln_experiment.notebook_experiment_id
         # CR-46333: Add the user's group to the logging message.
-        message += f"User group: {self.user.session_additional_data.current_group_name}\n"
-        if link:
-            message += f"User location: {link}\n"
-        message += msg
-        return message
+        user = self.context.user
+        username = user.username
+        group_name = user.session_additional_data.current_group_name
+        # PR-46209: Use logger.error instead of logger.info when logging errors.
+        self.logger.error(f"(User: {username}, Group: {group_name}, Experiment: {exp_id}):\n{msg}")
 
     def is_main_toolbar(self) -> bool:
         """

{sapiopycommons-2024.8.28a315.dist-info → sapiopycommons-2024.8.29a317.dist-info}/METADATA

@@ -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.29a317.dist-info/RECORD

@@ -0,0 +1,43 @@
+sapiopycommons/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+sapiopycommons/callbacks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+sapiopycommons/callbacks/callback_util.py,sha256=caeIWCHvK33jDs3TRskpJv0kDe7W8NPK4MyJPjgztwo,58012
+sapiopycommons/chem/IndigoMolecules.py,sha256=QqFDi9CKERj6sn_ZwVcS2xZq4imlkaTeCrpq1iNcEJA,1992
+sapiopycommons/chem/Molecules.py,sha256=t80IsQBPJ9mwE8ZxnWomAGrZDhdsOuPvLaTPb_N6jGU,8639
+sapiopycommons/chem/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+sapiopycommons/datatype/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+sapiopycommons/datatype/attachment_util.py,sha256=YlnMprj5IGBbAZDLG2khS1P7JIYTw_NYfpJAfRZfP3M,3219
+sapiopycommons/eln/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+sapiopycommons/eln/experiment_handler.py,sha256=v1pG4qtZb8OSNWfKtFo6NjnEkReqnu5R9i_hqWh_xxg,57198
+sapiopycommons/eln/experiment_report_util.py,sha256=FTLw-6SLAMeoWTOO-qhGROE9g54pZdyoQJIhiIzlwGw,7848
+sapiopycommons/eln/plate_designer.py,sha256=FYJfhhNq8hdfuXgDYOYHy6g0m2zNwQXZWF_MTPzElDg,7184
+sapiopycommons/files/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+sapiopycommons/files/complex_data_loader.py,sha256=XSJOl676mIklJo78v07-70u1b015a5DI4sqZPI3C-Tw,1475
+sapiopycommons/files/file_bridge.py,sha256=GI3-gWFzcL0q0c8jKOxTevbzJqtUpiElmkXfTnMsaOo,6224
+sapiopycommons/files/file_bridge_handler.py,sha256=MU2wZR4VY606yx6Bnv8-LzG3mGCeuXeRBn914WNRFCo,13601
+sapiopycommons/files/file_data_handler.py,sha256=3-guAdhJdeJWAFq1a27ijspkO7uMMZ6CapMCD_6o4jA,36746
+sapiopycommons/files/file_util.py,sha256=44mzhn3M_QltoncBB-ooX7_yO6u5k-XU_bzUXHGxUiw,26299
+sapiopycommons/files/file_validator.py,sha256=BhXB2XnoNEzdBXuwul1s2RNoj-3ZoiMmephUCU_0o3Y,28113
+sapiopycommons/files/file_writer.py,sha256=5u_iZXTQvuUU7ceHZr8Q001_tvgJhOqBwAnB_pxcAbQ,16027
+sapiopycommons/general/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+sapiopycommons/general/accession_service.py,sha256=HYgyOsH_UaoRnoury-c2yTW8SeG4OtjLemdpCzoV4R8,13484
+sapiopycommons/general/aliases.py,sha256=i6af5o2oVFGNcyk7GkvTWXQs0H9xTbFKc_GIah8NKVU,3594
+sapiopycommons/general/custom_report_util.py,sha256=cLgIR5Fn3M9uyAtgfTYRv3JRk2SKNevnsb_R5zidSYs,15557
+sapiopycommons/general/exceptions.py,sha256=DOlLKnpCatxQF-lVCToa8ryJgusWLvip6N_1ALN00QE,1679
+sapiopycommons/general/popup_util.py,sha256=-mN5IgYPrLrOEHJ4CHPi2rec4_WAN6X0yMxHwD5h3Bs,30126
+sapiopycommons/general/storage_util.py,sha256=ovmK_jN7v09BoX07XxwShpBUC5WYQOM7dbKV_VeLXJU,8892
+sapiopycommons/general/time_util.py,sha256=jiJUh7jc1ZRCOem880S3HaLPZ4RboBtSl4_U9sqAQuM,7290
+sapiopycommons/multimodal/multimodal.py,sha256=A1QsC8QTPmgZyPr7KtMbPRedn2Ie4WIErodUvQ9otgU,6724
+sapiopycommons/multimodal/multimodal_data.py,sha256=zqgYHO-ULaPKV0POFWZVY9N-Sfm1RQWwdsfwFxe5DjI,15038
+sapiopycommons/processtracking/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+sapiopycommons/processtracking/endpoints.py,sha256=g5h_uCVByqacYm9zWAz8TyAdRsGfaO2o0b5RSJdOaSA,10926
+sapiopycommons/recordmodel/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+sapiopycommons/recordmodel/record_handler.py,sha256=AyK1H3x-g1eu1Mt9XD1h57yRrZp_TJjZlEaQ2kPP4Dc,54432
+sapiopycommons/rules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+sapiopycommons/rules/eln_rule_handler.py,sha256=qfkBZtck0KK1i9s9Xe2UZqkzQOgPCzDxRkhxE8Si1xk,10671
+sapiopycommons/rules/on_save_rule_handler.py,sha256=JY9F30IcHwFVdgPAMQtTYuRastV1jeezhVktyrzNASU,10763
+sapiopycommons/webhook/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+sapiopycommons/webhook/webhook_handlers.py,sha256=ibpBY3Sk3Eij919bIdW0awzlogYoQSWYDDOg--NwsQE,13431
+sapiopycommons-2024.8.29a317.dist-info/METADATA,sha256=Pgj3R0rfc31rPqz3voTIjd6r1axXbXfCSfwXI3eCZGQ,3176
+sapiopycommons-2024.8.29a317.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+sapiopycommons-2024.8.29a317.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+sapiopycommons-2024.8.29a317.dist-info/RECORD,,

sapiopycommons/customreport/column_builder.py

@@ -1,60 +0,0 @@
-from sapiopylib.rest.pojo.CustomReport import ReportColumn
-from sapiopylib.rest.pojo.datatype.FieldDefinition import FieldType
-
-from sapiopycommons.general.aliases import DataTypeIdentifier, FieldIdentifier, AliasUtil
-from sapiopycommons.general.exceptions import SapioException
-
-# The system fields that every record has and their field types. System fields aren't generated as record model fields
-# for all platform version, hence the need to create a dict for them in the off chance that they're not present on
-# the model wrapper.
-SYSTEM_FIELDS: dict[str, FieldType] = {
-    "DataRecordName": FieldType.IDENTIFIER,
-    "RecordId": FieldType.LONG,
-    "DateCreated": FieldType.DATE,
-    "CreatedBy": FieldType.STRING,
-    "VeloxLastModifiedDate": FieldType.DATE,
-    "VeloxLastModifiedBy": FieldType.STRING
-}
-
-
-class ColumnBuilder:
-    """
-    A class for building report columns for custom reports.
-    """
-    @staticmethod
-    def build_column(data_type: DataTypeIdentifier, field: FieldIdentifier, field_type: FieldType | None = None) \
-            -> ReportColumn:
-        """
-        Build a ReportColumn from a variety of possible inputs.
-
-        :param data_type: An object that can be used to identify a data type.
-        :param field: An object that can be used to identify a data field.
-        :param field_type: The field type of the provided field. This is only required if the field type cannot be
-            determined from the given data type and field, which occurs when the given field is a string and the
-            given data type is not a wrapped record model or record model wrapper.
-        :return: A ReportColumn for the inputs.
-        """
-        # Get the data type and field names from the inputs.
-        data_type_name = AliasUtil.to_data_type_name(data_type)
-        field_name = AliasUtil.to_data_field_name(field)
-        if field_type is None:
-            field_type = ColumnBuilder.__field_type(data_type, field)
-        if field_type is None:
-            raise SapioException("The field_type parameter is required for the provided data_type and field inputs.")
-        return ReportColumn(data_type_name, field_name, field_type)
-
-    @staticmethod
-    def __field_type(data_type: DataTypeIdentifier, field: FieldIdentifier) -> FieldType | None:
-        """
-        Given a record model wrapper and a field name, return the field type for that field. Accounts for system fields.
-
-        :param data_type: The record model wrapper that the field is on.
-        :param field: The field name to return the type of.
-        :return: The field type of the given field name.
-        """
-        # Check if the field name is a system field. If it us, use the field type defined in this file.
-        field_name: str = AliasUtil.to_data_field_name(field)
-        if field_name in SYSTEM_FIELDS:
-            return SYSTEM_FIELDS.get(field_name)
-        # Otherwise, check if the field type can be found from the wrapper.
-        return AliasUtil.to_field_type(field_name, data_type)