dara-core 1.12.1__py3-none-any.whl → 1.12.3__py3-none-any.whl

dara/core/interactivity/derived_data_variable.py

@@ -17,10 +17,12 @@ limitations under the License.
 
 from __future__ import annotations
 
+import asyncio
 from typing import Any, Callable, Coroutine, List, Optional, Union, cast
 from uuid import uuid4
 
 from pandas import DataFrame
+from pandas.io.json._table_schema import build_table_schema
 
 from dara.core.base_definitions import (
     BaseTask,
@@ -48,7 +50,7 @@ from dara.core.interactivity.filtering import (
 )
 from dara.core.internal.cache_store import CacheStore
 from dara.core.internal.hashing import hash_object
-from dara.core.internal.pandas_utils import append_index
+from dara.core.internal.pandas_utils import append_index, df_convert_to_internal
 from dara.core.internal.tasks import MetaTask, Task, TaskManager
 from dara.core.logging import eng_logger
 
@@ -135,6 +137,15 @@ class DerivedDataVariable(AnyDataVariable, DerivedVariable):
             ),
         )
 
+    @staticmethod
+    def _get_schema_cache_key(cache_key: str) -> str:
+        """
+        Get a unique cache key for the data variable's schema.
+
+        :param cache_key: cache_key of the DerivedDataVariable
+        """
+        return f'schema-{cache_key}'
+
     @staticmethod
     async def _filter_data(
         data: Union[DataFrame, Any, None],
@@ -164,7 +175,19 @@ class DerivedDataVariable(AnyDataVariable, DerivedVariable):
         filtered_data, count = apply_filters(data, coerce_to_filter_query(filters), pagination)
 
         # Cache the count
-        await store.set(var_entry, key=count_cache_key, value=count, pin=True)
+        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,
+            ),
+        )
 
         return filtered_data
 
@@ -194,7 +217,19 @@ class DerivedDataVariable(AnyDataVariable, DerivedVariable):
         value = await super().get_value(var_entry, store, task_mgr, args, force)
 
         # Pin the value in the store until it's read by get data
-        await store.set(registry_entry=var_entry, key=value['cache_key'], value=value['value'], pin=True)
+        await asyncio.gather(
+            store.set(registry_entry=var_entry, key=value['cache_key'], value=value['value'], pin=True),
+            store.set(
+                registry_entry=var_entry,
+                key=cls._get_schema_cache_key(value['cache_key']),
+                value=build_table_schema(
+                    df_convert_to_internal(cast(DataFrame, value['value'])),
+                )
+                if isinstance(value['value'], DataFrame)
+                else None,
+                pin=True,
+            ),
+        )
 
         eng_logger.info(
             f'Derived Data Variable {_uid_short} received result from superclass',
@@ -298,7 +333,7 @@ class DerivedDataVariable(AnyDataVariable, DerivedVariable):
         """
         Get the schema of the derived data variable.
         """
-        return cast(DataFrameSchema, await store.get(data_entry, key=cache_key, unpin=True))
+        return cast(DataFrameSchema, await store.get(data_entry, key=cls._get_schema_cache_key(cache_key), unpin=True))
 
     @classmethod
     async def resolve_value(

dara/core/interactivity/filtering.py

@@ -17,6 +17,7 @@ limitations under the License.
 
 from __future__ import annotations
 
+import re
 from datetime import datetime, timezone
 from enum import Enum
 from typing import Any, List, Optional, Tuple, Union
@@ -27,6 +28,8 @@ from pydantic import BaseModel
 
 from dara.core.logging import dev_logger
 
+COLUMN_PREFIX_REGEX = re.compile(r'__(?:col|index)__\d+__')
+
 
 class Pagination(BaseModel):
     """
@@ -207,10 +210,10 @@ def _filter_to_series(data: DataFrame, column: str, operator: QueryOperator, val
 
 def _resolve_filter_query(data: DataFrame, query: FilterQuery) -> 'Optional[Series[bool]]':
     """
-    Resolve a FilterQuery to a Series[bool] for filtering
+    Resolve a FilterQuery to a Series[bool] for filtering. Strips the internal column index from the query.
     """
     if isinstance(query, ValueQuery):
-        return _filter_to_series(data, query.column, query.operator, query.value)
+        return _filter_to_series(data, re.sub(COLUMN_PREFIX_REGEX, '', query.column, 1), query.operator, query.value)
     elif isinstance(query, ClauseQuery):
         filters = None
 
@@ -271,7 +274,9 @@ def apply_filters(
                 order_by = order_by[1:]
                 ascending = False
 
-            new_data = new_data.sort_values(by=order_by, ascending=ascending, inplace=False)
+            new_data = new_data.sort_values(
+                by=re.sub(COLUMN_PREFIX_REGEX, '', order_by), ascending=ascending, inplace=False
+            )
 
         # PAGINATE
         start_index = pagination.offset if pagination.offset is not None else 0

dara/core/internal/routing.py

@@ -386,11 +386,8 @@ def create_router(config: Configuration):
         except ValueError as e:
             raise HTTPException(status_code=400, detail=str(e))
 
-    class DataVariableSchemaRequestBody(BaseModel):
-        cache_key: Optional[str]
-
     @core_api_router.get('/data-variable/{uid}/schema', dependencies=[Depends(verify_session)])
-    async def get_data_variable_schema(uid: str, body: Optional[DataVariableSchemaRequestBody] = None):
+    async def get_data_variable_schema(uid: str, cache_key: Optional[str] = None):
         try:
             store: CacheStore = utils_registry.get('Store')
             registry_mgr: RegistryLookup = utils_registry.get('RegistryLookup')
@@ -399,12 +396,12 @@ def create_router(config: Configuration):
             if variable_def.type == 'plain':
                 return await variable_def.get_schema(variable_def, store)
 
-            if body is None or body.cache_key is None:
+            if cache_key is None:
                 raise HTTPException(
-                    status_code=400, detail="Cache key is required when requesting DerivedDataVariable's schema"
+                    status_code=400, detail='Cache key is required when requesting DerivedDataVariable schema'
                 )
 
-            data = await variable_def.get_schema(variable_def, store, body.cache_key)
+            data = await variable_def.get_schema(variable_def, 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/umd/dara.core.umd.js

@@ -57520,9 +57520,10 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     return response.json();
   }
   async function fetchDataVariableSchema(uid2, extras, cacheKey) {
+    const queryString = cacheKey ? new URLSearchParams({ cache_key: cacheKey }).toString() : "";
     const response = await request(
-      `/api/core/data-variable/${uid2}/schema`,
-      { body: JSON.stringify({ cache_key: cacheKey }), method: HTTP_METHOD.GET },
+      `/api/core/data-variable/${uid2}/schema?${queryString}`,
+      { method: HTTP_METHOD.GET },
       extras
     );
     await handleAuthErrors(response, true);

{dara_core-1.12.1.dist-info → dara_core-1.12.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dara-core
-Version: 1.12.1
+Version: 1.12.3
 Summary: Dara Framework Core
 Home-page: https://dara.causalens.com/
 License: Apache-2.0
@@ -20,10 +20,10 @@ Requires-Dist: async-asgi-testclient (>=1.4.11,<2.0.0)
 Requires-Dist: certifi (>=2024.7.4)
 Requires-Dist: click (==8.1.3)
 Requires-Dist: colorama (>=0.4.6,<0.5.0)
-Requires-Dist: create-dara-app (==1.12.1)
+Requires-Dist: create-dara-app (==1.12.3)
 Requires-Dist: croniter (>=1.0.15,<2.0.0)
 Requires-Dist: cryptography (>=42.0.4)
-Requires-Dist: dara-components (==1.12.1) ; extra == "all"
+Requires-Dist: dara-components (==1.12.3) ; extra == "all"
 Requires-Dist: exceptiongroup (>=1.1.3,<2.0.0)
 Requires-Dist: fastapi (==0.109.0)
 Requires-Dist: fastapi-vite (==0.3.1)
@@ -51,7 +51,7 @@ Description-Content-Type: text/markdown
 
 # Dara Application Framework
 
-<img src="https://github.com/causalens/dara/blob/v1.12.1/img/dara_light.svg?raw=true">
+<img src="https://github.com/causalens/dara/blob/v1.12.3/img/dara_light.svg?raw=true">
 
 ![Master tests](https://github.com/causalens/dara/actions/workflows/tests.yml/badge.svg?branch=master)
 [![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)
@@ -96,7 +96,7 @@ source .venv/bin/activate
 dara start
 ```
 
-![Dara App](https://github.com/causalens/dara/blob/v1.12.1/img/components_gallery.png?raw=true)
+![Dara App](https://github.com/causalens/dara/blob/v1.12.3/img/components_gallery.png?raw=true)
 
 Note: `pip` installation uses [PEP 660](https://peps.python.org/pep-0660/) `pyproject.toml`-based editable installs which require `pip >= 21.3` and `setuptools >= 64.0.0`. You can upgrade both with:
 
@@ -113,9 +113,9 @@ Explore some of our favorite apps - a great way of getting started and getting t
 
 | Dara App                                                                                                 | Description                                                                                                                                                                                                       |
 | -------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| ![Large Language Model](https://github.com/causalens/dara/blob/v1.12.1/img/llm.png?raw=true)              | Demonstrates how to use incorporate a LLM chat box into your decision app to understand model insights                                                                                                            |
-| ![Plot Interactivity](https://github.com/causalens/dara/blob/v1.12.1/img/plot_interactivity.png?raw=true) | Demonstrates how to enable the user to interact with plots, trigger actions based on clicks, mouse movements and other interactions with `Bokeh` or `Plotly` plots                                                |
-| ![Graph Editor](https://github.com/causalens/dara/blob/v1.12.1/img/graph_viewer.png?raw=true)             | Demonstrates how to use the `CausalGraphViewer` component to display your graphs or networks, customising the displayed information through colors and tooltips, and updating the page based on user interaction. |
+| ![Large Language Model](https://github.com/causalens/dara/blob/v1.12.3/img/llm.png?raw=true)              | Demonstrates how to use incorporate a LLM chat box into your decision app to understand model insights                                                                                                            |
+| ![Plot Interactivity](https://github.com/causalens/dara/blob/v1.12.3/img/plot_interactivity.png?raw=true) | Demonstrates how to enable the user to interact with plots, trigger actions based on clicks, mouse movements and other interactions with `Bokeh` or `Plotly` plots                                                |
+| ![Graph Editor](https://github.com/causalens/dara/blob/v1.12.3/img/graph_viewer.png?raw=true)             | Demonstrates how to use the `CausalGraphViewer` component to display your graphs or networks, customising the displayed information through colors and tooltips, and updating the page based on user interaction. |
 
 Check out our [App Gallery](https://dara.causalens.com/gallery) for more inspiration!
 
@@ -127,9 +127,9 @@ This repository covers the Dara Application Framework first-party packages.
 - `dara-components`: Components for the Dara Framework.
 - `create-dara-app`: A CLI tool for creating new Dara applications.
 
-More information on the repository structure can be found in the [CONTRIBUTING.md](https://github.com/causalens/dara/blob/v1.12.1/CONTRIBUTING.md) file.
+More information on the repository structure can be found in the [CONTRIBUTING.md](https://github.com/causalens/dara/blob/v1.12.3/CONTRIBUTING.md) file.
 
 ## License
 
-Dara is open-source and licensed under the [Apache 2.0 License](https://github.com/causalens/dara/blob/v1.12.1/LICENSE).
+Dara is open-source and licensed under the [Apache 2.0 License](https://github.com/causalens/dara/blob/v1.12.3/LICENSE).
 

{dara_core-1.12.1.dist-info → dara_core-1.12.3.dist-info}/RECORD

@@ -20,9 +20,9 @@ dara/core/interactivity/any_data_variable.py,sha256=npgtgAIEKNix8VGYLFCc1G3jwXr1
 dara/core/interactivity/any_variable.py,sha256=HuQTcCw1ysqYcJ5T9Jl--nV_1XzDWMfGw26g6eaQM2k,13281
 dara/core/interactivity/condition.py,sha256=ynK53cGuVMC852X6kkbrgltcdpIX7Otw7j1DEXEO4Q8,1424
 dara/core/interactivity/data_variable.py,sha256=KIN2V2ipESfhczBtmyPnZUi0iirlZXdN1S1P0aPPVRA,11099
-dara/core/interactivity/derived_data_variable.py,sha256=5TqUdKQD4ncv7MTJuRFcyjWuQnF_TCjK85DCwx6eiUM,13860
+dara/core/interactivity/derived_data_variable.py,sha256=Y3Yw5gdnjvVIUrZhyHafCEaQZMyVT9S5SJ7sC8lcYxA,15176
 dara/core/interactivity/derived_variable.py,sha256=6xOv-E5wQj-fd9S2RVmRdE_DfkvxVGyptfZlDSj0fmY,21497
-dara/core/interactivity/filtering.py,sha256=F80lkbI6_9wfEiV6jRDA7p4RWIFPwFqOQ6bf8JerfaI,8815
+dara/core/interactivity/filtering.py,sha256=RniL8Qq9HIzY0D3p6ZXFQD363ksqZ6b7uCxtklUILyo,9035
 dara/core/interactivity/non_data_variable.py,sha256=ewPaNaTpMixR5YCVY1pjmyHgeC53K0CsjQxMusbJsiw,1147
 dara/core/interactivity/plain_variable.py,sha256=iuISw0x14ruOnZqrRg1Zay6ny7Ey0QImRUHVg0S11e0,8017
 dara/core/interactivity/url_variable.py,sha256=DEHEvg1mE7xXlK69p1D5iZZbf4emzNe6r_RH6DHcyoc,4219
@@ -54,7 +54,7 @@ dara/core/internal/port_utils.py,sha256=AQOUNiFNBYKVUwQ7i9UlY1NQ3sWb5xh5GkO6P1Bm
 dara/core/internal/registries.py,sha256=9WDczIsNeSmzi6aViIq_b14lmmYGGkdsUGHpv0Sg9zo,3278
 dara/core/internal/registry.py,sha256=ONCDusqaL0q59Py_r8-fFVN3vbkkDf5TXzNvbB9SrGQ,4305
 dara/core/internal/registry_lookup.py,sha256=bUtb3lJYYM9NdHUtSWhizKkmTfM3STkoD6t1H3igvnc,2063
-dara/core/internal/routing.py,sha256=balTwv1aq_vLasKFuIs5Vhw14NRg-iLAQUusflmPazg,22665
+dara/core/internal/routing.py,sha256=mdFOz8Q7g0IWUAl-qR5cHzK9qXn8QbNHhTuKVrxTp7E,22530
 dara/core/internal/scheduler.py,sha256=z6OYwazBf3GYo8CzMC9IuGC2P96gI7JwxquT8GaoTMk,12944
 dara/core/internal/settings.py,sha256=wAWxl-HXjq7PW3twe_CrR-UuMRw9VBudC3eRmevZAhM,3869
 dara/core/internal/store.py,sha256=qVyU7JfC3zE2vYC2mfjmvECWMlFS9b-nMF1k-alg4Y8,7756
@@ -81,7 +81,7 @@ dara/core/metrics/cache.py,sha256=ybofUhZO0TCHeyhB_AtldWk1QTmTKh7GucTXpOkeTFA,25
 dara/core/metrics/runtime.py,sha256=YP-6Dz0GeI9_Yr7bUk_-OqShyFySGH_AKpDO126l6es,1833
 dara/core/metrics/utils.py,sha256=rYlBinxFc7VehFT5cTNXLk8gC74UEj7ZGq6vLgIDpSg,2247
 dara/core/persistence.py,sha256=TO94rPAN7jxZKVCC5YA4eE7GGDoNlCPe-BkkItV2VUE,10379
-dara/core/umd/dara.core.umd.js,sha256=r50GaubVbv_sIpixLI6lPHhgrhp97ZvJjZk6A-Pz3vU,4875647
+dara/core/umd/dara.core.umd.js,sha256=2AENw8gbOqzcrJb4t6wRkhib7sSHN4E4EpUxbbsPQ0g,4875712
 dara/core/umd/style.css,sha256=YQtQ4veiSktnyONl0CU1iU1kKfcQhreH4iASi1MP7Ak,4095007
 dara/core/visual/__init__.py,sha256=QN0wbG9HPQ_vXh8BO8DnBXeYLIENVTNtRmYzZf1lx7c,577
 dara/core/visual/components/__init__.py,sha256=O-Em_glGdZNO0LLl2RWmJSrQiXKxliXg_PuhVXGT81I,1811
@@ -105,8 +105,8 @@ dara/core/visual/themes/__init__.py,sha256=aM4mgoIYo2neBSw5FRzswsht7PUKjLthiHLmF
 dara/core/visual/themes/dark.py,sha256=UQGDooOc8ric73eHs9E0ltYP4UCrwqQ3QxqN_fb4PwY,1942
 dara/core/visual/themes/definitions.py,sha256=m3oN0txs65MZepqjj7AKMMxybf2aq5fTjcTwJmHqEbk,2744
 dara/core/visual/themes/light.py,sha256=-Tviq8oEwGbdFULoDOqPuHO0UpAZGsBy8qFi0kAGolQ,1944
-dara_core-1.12.1.dist-info/LICENSE,sha256=r9u1w2RvpLMV6YjuXHIKXRBKzia3fx_roPwboGcLqCc,10944
-dara_core-1.12.1.dist-info/METADATA,sha256=Rt7HMrbFkk3_AeTRYv9NRkNmCIn4O5b_-gBT2JRa_AM,6771
-dara_core-1.12.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-dara_core-1.12.1.dist-info/entry_points.txt,sha256=H__D5sNIGuPIhVam0DChNL-To5k8Y7nY7TAFz9Mz6cc,139
-dara_core-1.12.1.dist-info/RECORD,,
+dara_core-1.12.3.dist-info/LICENSE,sha256=r9u1w2RvpLMV6YjuXHIKXRBKzia3fx_roPwboGcLqCc,10944
+dara_core-1.12.3.dist-info/METADATA,sha256=9atEUgmSrN6Ayv3CsSadWdZt9ryz1VL0Ss_bfoAFEhk,6771
+dara_core-1.12.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+dara_core-1.12.3.dist-info/entry_points.txt,sha256=H__D5sNIGuPIhVam0DChNL-To5k8Y7nY7TAFz9Mz6cc,139
+dara_core-1.12.3.dist-info/RECORD,,