sapiopycommons 2024.6.24a263__py3-none-any.whl → 2024.6.26a266__py3-none-any.whl

sapiopycommons/callbacks/callback_util.py

@@ -14,8 +14,8 @@ from sapiopylib.rest.pojo.datatype.FieldDefinition import AbstractVeloxFieldDefi
     VeloxIntegerFieldDefinition, VeloxDoubleFieldDefinition, FieldDefinitionParser
 from sapiopylib.rest.pojo.webhook.ClientCallbackRequest import OptionDialogRequest, ListDialogRequest, \
     FormEntryDialogRequest, InputDialogCriteria, TableEntryDialogRequest, ESigningRequestPojo, \
-    DataRecordSelectionRequest, DataRecordDialogRequest, InputSelectionRequest, FilePromptRequest, \
-    MultiFilePromptRequest
+    DataRecordDialogRequest, InputSelectionRequest, FilePromptRequest, MultiFilePromptRequest, \
+    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
@@ -627,7 +627,8 @@ class CallbackUtil:
                          values: list[FieldMap],
                          multi_select: bool = True,
                          *,
-                         display_name: str = "Default",
+                         data_type: str = "Default",
+                         display_name: str | None = None,
                          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
@@ -638,18 +639,25 @@ class CallbackUtil:
             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 display_name: The display name for the temporary data type that will be created.
+        :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".
         :return: A list of field maps corresponding to the chosen input field maps.
         """
+        if display_name is None:
+            display_name = data_type
         if plural_display_name is None:
             plural_display_name = display_name + "s"
 
-        # Build the form using only those fields that are desired.
-        request = DataRecordSelectionRequest(display_name, plural_display_name,
-                                             fields, values, msg, multi_select)
-        response: list[FieldMap] | None = self.callback.show_data_record_selection_dialog(request)
+        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)
+        response: list[FieldMap] | None = self.callback.show_temp_table_selection_dialog(request)
         if response is None:
             raise SapioUserCancelledException()
         return response
@@ -690,16 +698,16 @@ class CallbackUtil:
         modifier = FieldModifier(visible=True, key_field=False)
 
         # Build the form using only those fields that are desired.
-        field_def_list: list = []
+        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}\"")
-            field_def_list.append(modifier.modify_field(field_def))
+            builder.add_field(modifier.modify_field(field_def))
 
-        request = DataRecordSelectionRequest(type_def.display_name, type_def.plural_display_name,
-                                             field_def_list, field_map_list, msg, multi_select)
-        response: list[FieldMap] | None = self.callback.show_data_record_selection_dialog(request)
+        request = TempTableSelectionRequest(builder.get_temporary_data_type(), msg, field_map_list,
+                                            multi_select=multi_select)
+        response: list[FieldMap] | None = self.callback.show_temp_table_selection_dialog(request)
         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

sapiopycommons/multimodal/multimodal_data.py

@@ -251,11 +251,11 @@ class ChemSearchRequestPojo:
     contextData: ChemQuickSearchContextData | None
     simSearchUpperLimit: float | None
 
-    def __init__(self, search_str: str, search_type: ChemSearchType, join_method: str | None = None,
+    def __init__(self, search_str: str, search_type: ChemSearchType, join_sapio_type: str | None = None,
                  context_data: ChemQuickSearchContextData | None = None, sim_search_upper: float | None = None):
         self.searchStr = search_str
         self.searchType = search_type
-        self.joinMethod = join_method
+        self.joinSapioType = join_sapio_type
         self.contextData = context_data
         self.simSearchUpperLimit = sim_search_upper
 

{sapiopycommons-2024.6.24a263.dist-info → sapiopycommons-2024.6.26a266.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sapiopycommons
-Version: 2024.6.24a263
+Version: 2024.6.26a266
 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.6.24a263.dist-info → sapiopycommons-2024.6.26a266.dist-info}/RECORD

@@ -1,6 +1,6 @@
 sapiopycommons/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sapiopycommons/callbacks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sapiopycommons/callbacks/callback_util.py,sha256=1wtKc_-3V_uNfKs5eUTHRWAK_P1CFvTKssURzVLuwg0,57628
+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
@@ -25,7 +25,7 @@ sapiopycommons/general/popup_util.py,sha256=-mN5IgYPrLrOEHJ4CHPi2rec4_WAN6X0yMxH
 sapiopycommons/general/storage_util.py,sha256=ovmK_jN7v09BoX07XxwShpBUC5WYQOM7dbKV_VeLXJU,8892
 sapiopycommons/general/time_util.py,sha256=jiJUh7jc1ZRCOem880S3HaLPZ4RboBtSl4_U9sqAQuM,7290
 sapiopycommons/multimodal/multimodal.py,sha256=w9_M3EYH_cwIbBS0abl-Y0Os-PMR633nYQLkt8UP-Nk,5724
-sapiopycommons/multimodal/multimodal_data.py,sha256=srs3qoo1TV9oUr4vI58N2zyDdoKPyJEulNAPCcSTKOA,14096
+sapiopycommons/multimodal/multimodal_data.py,sha256=Lz34CkmDapVi2TiNIiG-d0CdSEY9Z80r0dBOTi0Ev3Q,14107
 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
@@ -35,7 +35,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=ibpBY3Sk3Eij919bIdW0awzlogYoQSWYDDOg--NwsQE,13431
-sapiopycommons-2024.6.24a263.dist-info/METADATA,sha256=xF8XN8cmYA0PClhtj5NV3Kd1nsISjB-1-7H48xLp7PY,3176
-sapiopycommons-2024.6.24a263.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-sapiopycommons-2024.6.24a263.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-sapiopycommons-2024.6.24a263.dist-info/RECORD,,
+sapiopycommons-2024.6.26a266.dist-info/METADATA,sha256=YkW3DPvFAApUZedDrJ249fYG41_3hMUREzHAoPlv8kY,3176
+sapiopycommons-2024.6.26a266.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+sapiopycommons-2024.6.26a266.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+sapiopycommons-2024.6.26a266.dist-info/RECORD,,