sapiopycommons 2024.5.16a227__py3-none-any.whl → 2024.5.17a231__py3-none-any.whl

sapiopycommons/eln/experiment_handler.py

@@ -64,14 +64,11 @@ class ExperimentHandler:
     The cache is updated whenever the entry options for a step are changed by this handler."""
 
     # Constants
-    # TODO: sapiopylib is currently storing the status of entries as strings when first queried, requiring us to compare
-    #  against the value of the enums instead of the enums themselves. The ".value"s can be removed once sapiopylib is
-    #  fixed.
-    __ENTRY_COMPLETE_STATUSES = [ExperimentEntryStatus.Completed.value, ExperimentEntryStatus.CompletedApproved.value]
+    __ENTRY_COMPLETE_STATUSES = [ExperimentEntryStatus.Completed, ExperimentEntryStatus.CompletedApproved]
     """The set of statuses that an ELN entry could have and be considered completed/submitted."""
-    __ENTRY_LOCKED_STATUSES = [ExperimentEntryStatus.Completed.value, ExperimentEntryStatus.CompletedApproved.value,
-                               ExperimentEntryStatus.Disabled.value, ExperimentEntryStatus.LockedAwaitingApproval.value,
-                               ExperimentEntryStatus.LockedRejected.value]
+    __ENTRY_LOCKED_STATUSES = [ExperimentEntryStatus.Completed, ExperimentEntryStatus.CompletedApproved,
+                               ExperimentEntryStatus.Disabled, ExperimentEntryStatus.LockedAwaitingApproval,
+                               ExperimentEntryStatus.LockedRejected]
     """The set of statuses that an ELN entry could have and be considered locked."""
     __EXPERIMENT_COMPLETE_STATUSES = [ElnExperimentStatus.Completed, ElnExperimentStatus.CompletedApproved]
     """The set of statuses that an ELN experiment could have and be considered completed."""
@@ -786,10 +783,7 @@ class ExperimentHandler:
         if dependency_set is not None:
             entry.dependency_set = dependency_set
         if entry_status is not None:
-            # TODO: sapiopylib is currently storing the status of entries as strings when first queried. For the sake of not
-            #  breaking comparisons to enums that expect this behavior, also setting the status to the enum's string.
-            #  The ".value" can be removed once sapiopylib is fixed.
-            entry.entry_status = entry_status.value
+            entry.entry_status = entry_status
         if order is not None:
             entry.order = order
         if description is not None:
@@ -942,10 +936,7 @@ class ExperimentHandler:
         step = self.__to_eln_step(step)
         if step.eln_entry.entry_status not in self.__ENTRY_COMPLETE_STATUSES:
             step.complete_step()
-            # TODO: sapiopylib is currently storing the status of entries as strings when first queried. For the sake of not
-            #  breaking comparisons to enums that expect this behavior, also setting the status to the enum's string.
-            #  The ".value" can be removed once sapiopylib is fixed.
-            step.eln_entry.entry_status = ExperimentEntryStatus.Completed.value
+            step.eln_entry.entry_status = ExperimentEntryStatus.Completed
 
     def unlock_step(self, step: Step) -> None:
         """
@@ -963,10 +954,7 @@ class ExperimentHandler:
         step = self.__to_eln_step(step)
         if step.eln_entry.entry_status in self.__ENTRY_LOCKED_STATUSES:
             step.unlock_step()
-            # TODO: sapiopylib is currently storing the status of entries as strings when first queried. For the sake of not
-            #  breaking comparisons to enums that expect this behavior, also setting the status to the enum's string.
-            #  The ".value" can be removed once sapiopylib is fixed.
-            step.eln_entry.entry_status = ExperimentEntryStatus.UnlockedChangesRequired.value
+            step.eln_entry.entry_status = ExperimentEntryStatus.UnlockedChangesRequired
 
     def step_is_submitted(self, step: Step) -> bool:
         """

sapiopycommons/files/file_data_handler.py

@@ -534,7 +534,7 @@ class FileDataHandler:
         records_to_row: dict[SapioRecord, dict[str, Any]] = self.match_records(match_header, match_field, records)
         for record, row in records_to_row.items():
             for header, field in header_to_fields.items():
-                record.set_field_values(field, row.get(header))
+                record.set_field_value(field, row.get(header))
 
     def find_missing_values(self, header: str, field: str, records: list[SapioRecord]) -> list[int]:
         """

{sapiopycommons-2024.5.16a227.dist-info → sapiopycommons-2024.5.17a231.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sapiopycommons
-Version: 2024.5.16a227
+Version: 2024.5.17a231
 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.5.16a227.dist-info → sapiopycommons-2024.5.17a231.dist-info}/RECORD

@@ -7,12 +7,12 @@ sapiopycommons/chem/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 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=DIQ9hiqJBJTTeHUuJRf0e_t-2KL8tI-NI8-5vXRbaD0,58448
+sapiopycommons/eln/experiment_handler.py,sha256=v1pG4qtZb8OSNWfKtFo6NjnEkReqnu5R9i_hqWh_xxg,57198
 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=6yjUi0ejypb1nvcEvn21EuquB-SmEjB-fCZiMaNZg7Q,5757
-sapiopycommons/files/file_data_handler.py,sha256=_Qplb_bVZ6pmliFdDk6pCutb7QJixZtwfAZyWUEZwpk,36747
+sapiopycommons/files/file_data_handler.py,sha256=3-guAdhJdeJWAFq1a27ijspkO7uMMZ6CapMCD_6o4jA,36746
 sapiopycommons/files/file_util.py,sha256=92SzwRif4dOcGqZ9ri90QeC20NOCenT8DxQjdSH5Uyc,25556
 sapiopycommons/files/file_validator.py,sha256=5DUI_h0WB1AvfoPgx8En3-sC5xlzm5Z2deoSf9qviKQ,24499
 sapiopycommons/files/file_writer.py,sha256=5u_iZXTQvuUU7ceHZr8Q001_tvgJhOqBwAnB_pxcAbQ,16027
@@ -34,7 +34,7 @@ sapiopycommons/rules/eln_rule_handler.py,sha256=qfkBZtck0KK1i9s9Xe2UZqkzQOgPCzDx
 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=K_K7CEAMZ-bNb2LCIKdt0CxHsBKkwSBzfnp0JSdGJUM,11102
-sapiopycommons-2024.5.16a227.dist-info/METADATA,sha256=mGwYIMG4hYp97MWKWLpoV5VFApwU8rEjSLGWrZsF7bA,3176
-sapiopycommons-2024.5.16a227.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-sapiopycommons-2024.5.16a227.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-sapiopycommons-2024.5.16a227.dist-info/RECORD,,
+sapiopycommons-2024.5.17a231.dist-info/METADATA,sha256=uJtRJBvmtP8EZIE6q8-_F0nhMD2a-xWnxl8fcyPhV90,3176
+sapiopycommons-2024.5.17a231.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
+sapiopycommons-2024.5.17a231.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+sapiopycommons-2024.5.17a231.dist-info/RECORD,,