sapiopycommons 2025.2.6a418__tar.gz → 2025.2.6a420__tar.gz

{sapiopycommons-2025.2.6a418 → sapiopycommons-2025.2.6a420}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sapiopycommons
-Version: 2025.2.6a418
+Version: 2025.2.6a420
 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-2025.2.6a418 → sapiopycommons-2025.2.6a420}/pyproject.toml

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

{sapiopycommons-2025.2.6a418 → sapiopycommons-2025.2.6a420}/src/sapiopycommons/elain/tool_of_tools.py

@@ -9,7 +9,7 @@ from sapiopylib.rest.pojo.DataRecord import DataRecord
 from sapiopylib.rest.pojo.chartdata.DashboardDefinition import GaugeChartDefinition
 from sapiopylib.rest.pojo.chartdata.DashboardEnums import ChartGroupingType, ChartOperationType, ChartType
 from sapiopylib.rest.pojo.chartdata.DashboardSeries import GaugeChartSeries
-from sapiopylib.rest.pojo.datatype.FieldDefinition import AbstractVeloxFieldDefinition
+from sapiopylib.rest.pojo.datatype.FieldDefinition import AbstractVeloxFieldDefinition, FieldType
 from sapiopylib.rest.pojo.eln.ElnExperiment import ElnExperiment
 from sapiopylib.rest.pojo.eln.ExperimentEntry import ExperimentEntry
 from sapiopylib.rest.pojo.eln.ExperimentEntryCriteria import ElnEntryCriteria, ElnFormEntryUpdateCriteria, \
@@ -124,16 +124,21 @@ def create_experiment_details_from_json(user: SapioUser,
     # Determine which fields in the JSON can be used to create field definitions.
     fb = FieldBuilder()
     fields: list[AbstractVeloxFieldDefinition] = []
+    fields_by_name: dict[str, AbstractVeloxFieldDefinition] = {}
     valid_keys: list[str] = []
     display_to_field_name: dict[str, str] = {}
     for key, value in json_list[0].items():
         field_name: str = key.replace(" ", "_")
         display_to_field_name[key] = field_name
         if isinstance(value, str):
-            fields.append(fb.string_field(field_name, display_name=key))
+            field = fb.string_field(field_name, display_name=key)
+            fields.append(field)
+            fields_by_name[field_name] = field
             valid_keys.append(key)
         elif isinstance(value, (int, float)):
-            fields.append(fb.double_field(field_name, display_name=key))
+            field = fb.double_field(field_name, display_name=key, precision=3)
+            fields.append(field)
+            fields_by_name[field_name] = field
             valid_keys.append(key)
 
     # Extract the valid field values from the JSON.
@@ -141,7 +146,11 @@ def create_experiment_details_from_json(user: SapioUser,
     for json_dict in json_list:
         field_map: dict[str, Any] = {}
         for key in valid_keys:
-            field_map[display_to_field_name[key]] = json_dict.get(key)
+            # Watch out for NaN values or other special values.
+            val: Any = json_dict.get(key)
+            if fields_by_name[key].data_field_type == FieldType.DOUBLE and not isinstance(val, (int, float)):
+                val = None
+            field_map[display_to_field_name[key]] = val
         field_maps.append(field_map)
 
     detail_entry = ElnEntryCriteria(ElnEntryType.Table, entry_name,