dara-core 1.13.0__py3-none-any.whl → 1.13.1__py3-none-any.whl

dara/core/interactivity/data_variable.py

@@ -182,6 +182,7 @@ class DataVariable(AnyDataVariable):
         store: CacheStore,
         filters: Optional[Union[FilterQuery, dict]] = None,
         pagination: Optional[Pagination] = None,
+        format_for_display: bool = False,
     ) -> Optional[DataFrame]:
         """
         Get the value of this DataVariable.
@@ -212,6 +213,12 @@ class DataVariable(AnyDataVariable):
 
         if entry.data is not None:
             filtered_data, count = apply_filters(entry.data, coerce_to_filter_query(filters), pagination)
+            if format_for_display and filtered_data is not None:
+                filtered_data = filtered_data.copy()
+                for col in filtered_data.columns:
+                    if filtered_data[col].dtype == 'object':
+                        # We need to convert all values to string to avoid issues with displaying data in the Table component, for example when displaying datetime and number objects in the same column
+                        filtered_data.loc[:, col] = filtered_data[col].apply(str)
             data = filtered_data
             # Store count for given filters and schema
             await asyncio.gather(

dara/core/interactivity/derived_data_variable.py

@@ -239,6 +239,7 @@ class DerivedDataVariable(AnyDataVariable, DerivedVariable):
         store: CacheStore,
         filters: Optional[Union[FilterQuery, dict]] = None,
         pagination: Optional[Pagination] = None,
+        format_for_display: bool = False,
     ) -> Union[BaseTask, DataFrame, None]:
         """
         Get the filtered data from the underlying derived variable stored under the specified cache_key.
@@ -297,6 +298,12 @@ class DerivedDataVariable(AnyDataVariable, DerivedVariable):
 
         # Run the filtering
         data = await cls._filter_data(data, count_cache_key, data_entry, store, filters, pagination)
+        if format_for_display and data is not None:
+            data = data.copy()
+            for col in data.columns:
+                if data[col].dtype == 'object':
+                    # We need to convert all values to string to avoid issues with displaying data in the Table component, for example when displaying datetime and number objects in the same column
+                    data.loc[:, col] = data[col].apply(str)
 
         return data
 

dara/core/internal/routing.py

@@ -332,6 +332,7 @@ def create_router(config: Configuration):
                     store,
                     body.filters,
                     Pagination(offset=offset, limit=limit, orderBy=order_by, index=index),
+                    format_for_display=True,
                 )
                 if isinstance(data, BaseTask):
                     await task_mgr.run_task(data, body.ws_channel)
@@ -342,6 +343,7 @@ def create_router(config: Configuration):
                     store,
                     body.filters,
                     Pagination(offset=offset, limit=limit, orderBy=order_by, index=index),
+                    format_for_display=True,
                 )
 
             dev_logger.debug(