dara-core 1.12.7__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

@@ -175,19 +175,7 @@ class DerivedDataVariable(AnyDataVariable, DerivedVariable):
         filtered_data, count = apply_filters(data, coerce_to_filter_query(filters), pagination)
 
         # Cache the count
-        await asyncio.gather(
-            store.set(var_entry, key=count_cache_key, value=count, pin=True),
-            store.set(
-                registry_entry=var_entry,
-                key=DerivedDataVariable._get_schema_cache_key(
-                    count_cache_key.split('_')[0]  # remove the filter part from the key
-                ),
-                value=build_table_schema(df_convert_to_internal(cast(DataFrame, filtered_data)))
-                if isinstance(filtered_data, DataFrame)
-                else None,
-                pin=True,
-            ),
-        )
+        await store.set(var_entry, key=count_cache_key, value=count, pin=True)
 
         return filtered_data
 
@@ -251,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.
@@ -309,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
 
@@ -329,11 +324,13 @@ class DerivedDataVariable(AnyDataVariable, DerivedVariable):
         return entry
 
     @classmethod
-    async def get_schema(cls, data_entry: DataVariableRegistryEntry, store: CacheStore, cache_key: str):
+    async def get_schema(cls, derived_entry: DerivedVariableRegistryEntry, store: CacheStore, cache_key: str):
         """
         Get the schema of the derived data variable.
         """
-        return cast(DataFrameSchema, await store.get(data_entry, key=cls._get_schema_cache_key(cache_key), unpin=True))
+        return cast(
+            DataFrameSchema, await store.get(derived_entry, key=cls._get_schema_cache_key(cache_key), unpin=True)
+        )
 
     @classmethod
     async def resolve_value(

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(
@@ -391,17 +393,19 @@ def create_router(config: Configuration):
         try:
             store: CacheStore = utils_registry.get('Store')
             registry_mgr: RegistryLookup = utils_registry.get('RegistryLookup')
-            variable_def = await registry_mgr.get(data_variable_registry, uid)
+            data_def = await registry_mgr.get(data_variable_registry, uid)
 
-            if variable_def.type == 'plain':
-                return await variable_def.get_schema(variable_def, store)
+            if data_def.type == 'plain':
+                return await data_def.get_schema(data_def, store)
 
             if cache_key is None:
                 raise HTTPException(
                     status_code=400, detail='Cache key is required when requesting DerivedDataVariable schema'
                 )
 
-            data = await variable_def.get_schema(variable_def, store, cache_key)
+            # Use the other registry for derived variables
+            derived_ref = await registry_mgr.get(derived_variable_registry, uid)
+            data = await data_def.get_schema(derived_ref, store, cache_key)
             content = json.dumps(jsonable_encoder(data)) if isinstance(data, dict) else data
             return Response(content=content, media_type='application/json')
         except ValueError as e:

dara/core/js_tooling/templates/vite.config.template.ts

@@ -6,7 +6,7 @@ export default defineConfig({
     plugins: [
         react({
             jsxRuntime: 'classic',
-        }),
+        })
     ],
     publicDir: false,
     build: {
@@ -25,4 +25,7 @@ export default defineConfig({
             strict: false,
         },
     },
+    worker: {
+        format: 'es',
+    }
 });