dara-core 1.17.1__py3-none-any.whl → 1.17.3__py3-none-any.whl

dara/core/interactivity/data_variable.py

@@ -200,7 +200,10 @@ class DataVariable(AnyDataVariable):
         eng_logger.debug(
             f'Data Variable {_uid_short}',
             'retrieved from cache',
-            {'uid': var_entry.uid, 'size': len(entry.data.index) if entry is not None else 0},
+            {
+                'uid': var_entry.uid,
+                'size': len(entry.data.index) if entry is not None and entry.data is not None else 0,
+            },
         )
 
         if entry is None:

dara/core/umd/dara.core.umd.js

@@ -52939,27 +52939,6 @@ Inferred class string: "${iconClasses}."`
   function isTaskResponse$1(dvResponse) {
     return "task_id" in dvResponse;
   }
-  function formatDerivedVariableRequest(values) {
-    return values.map((val) => {
-      if (isResolvedDerivedVariable(val) || isResolvedDerivedDataVariable(val)) {
-        const { deps, values: nestedValues, ...rest } = val;
-        return {
-          ...rest,
-          force: false,
-          values: formatDerivedVariableRequest(nestedValues)
-        };
-      }
-      if (isResolvedSwitchVariable(val)) {
-        return {
-          ...val,
-          value: formatDerivedVariableRequest([val.value])[0],
-          value_map: formatDerivedVariableRequest([val.value_map])[0],
-          default: formatDerivedVariableRequest([val.default])[0]
-        };
-      }
-      return val;
-    });
-  }
   async function fetchDerivedVariable({
     cache: cache2,
     force,
@@ -53158,10 +53137,7 @@ Inferred class string: "${iconClasses}."`
                 force: derivedResult.force,
                 is_data_variable: isDerivedDataVariable(variable),
                 selectorKey,
-                values: normalizeRequest(
-                  formatDerivedVariableRequest(derivedResult.values),
-                  variable.variables
-                ),
+                values: normalizeRequest(cleanArgs(derivedResult.values, false), variable.variables),
                 variableUid: variable.uid,
                 wsClient
               });
@@ -53427,6 +53403,38 @@ Inferred class string: "${iconClasses}."`
     }
     return resolver(getOrRegisterPlainVariable(variable, client, taskContext, extras));
   }
+  function cleanValue(value, force) {
+    if (isResolvedDerivedVariable(value) || isResolvedDerivedDataVariable(value)) {
+      const { deps, ...rest } = value;
+      const cleanedValues = value.values.map((v2) => cleanValue(v2, force));
+      return {
+        ...rest,
+        force,
+        values: cleanedValues
+      };
+    }
+    if (isResolvedSwitchVariable(value)) {
+      return {
+        ...value,
+        value: cleanValue(value.value, force),
+        value_map: cleanValue(value.value_map, force),
+        default: cleanValue(value.default, force)
+      };
+    }
+    return value;
+  }
+  function cleanKwargs(kwargs, force) {
+    return Object.keys(kwargs).reduce(
+      (acc, k2) => {
+        acc[k2] = cleanValue(kwargs[k2], force);
+        return acc;
+      },
+      {}
+    );
+  }
+  function cleanArgs(values, force) {
+    return values.map((val) => cleanValue(val, force));
+  }
   /*!
    * https://github.com/Starcounter-Jack/JSON-Patch
    * (c) 2017-2022 Joachim Wester
@@ -54685,7 +54693,7 @@ Inferred class string: "${iconClasses}."`
           execution_id: executionId,
           input,
           uid: annotatedAction.uid,
-          values: normalizeRequest(resolvedKwargs, annotatedAction.dynamic_kwargs),
+          values: normalizeRequest(cleanKwargs(resolvedKwargs, false), annotatedAction.dynamic_kwargs),
           ws_channel
         }),
         method: HTTP_METHOD.POST
@@ -55028,7 +55036,7 @@ Inferred class string: "${iconClasses}."`
       force: false,
       selectorKey: resolved.uid,
       values: normalizeRequest(
-        formatDerivedVariableRequest(resolved.values),
+        cleanArgs(resolved.values, false),
         variable.variables
       ),
       variableUid: resolved.uid,
@@ -55353,35 +55361,6 @@ Inferred class string: "${iconClasses}."`
     const result = await res.json();
     return result;
   }
-  function cleanValue(value, force) {
-    if (isResolvedDerivedVariable(value) || isResolvedDerivedDataVariable(value)) {
-      const { deps, ...rest } = value;
-      const cleanedValues = value.values.map((v2) => cleanValue(v2, force));
-      return {
-        ...rest,
-        force,
-        values: cleanedValues
-      };
-    }
-    if (isResolvedSwitchVariable(value)) {
-      return {
-        ...value,
-        value: cleanValue(value.value, force),
-        value_map: cleanValue(value.value_map, force),
-        default: cleanValue(value.default, force)
-      };
-    }
-    return value;
-  }
-  function cleanKwargs(kwargs, force) {
-    return Object.keys(kwargs).reduce(
-      (acc, k2) => {
-        acc[k2] = cleanValue(kwargs[k2], force);
-        return acc;
-      },
-      {}
-    );
-  }
   function getOrRegisterComponentTrigger(uid2, loop_instance_uid) {
     const triggerKey = getComponentRegistryKey(uid2, true, loop_instance_uid);
     if (!atomRegistry.has(triggerKey)) {
@@ -82671,7 +82650,6 @@ Inferred class string: "${iconClasses}."`
   exports.atomRegistry = atomRegistry;
   exports.cancelTask = cancelTask;
   exports.cleanSessionCache = cleanSessionCache;
-  exports.cleanValue = cleanValue;
   exports.clearActionHandlerCache_TEST = clearActionHandlerCache_TEST;
   exports.clearCaches_TEST = clearCaches_TEST;
   exports.clearRegistries_TEST = clearRegistries_TEST;
@@ -82681,7 +82659,6 @@ Inferred class string: "${iconClasses}."`
   exports.depsRegistry = depsRegistry;
   exports.fetchDerivedVariable = fetchDerivedVariable;
   exports.fetchTaskResult = fetchTaskResult;
-  exports.formatDerivedVariableRequest = formatDerivedVariableRequest;
   exports.getComponentRegistryKey = getComponentRegistryKey;
   exports.getDeps = getDeps;
   exports.getIcon = getIcon;

{dara_core-1.17.1.dist-info → dara_core-1.17.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dara-core
-Version: 1.17.1
+Version: 1.17.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.17.1)
+Requires-Dist: create-dara-app (==1.17.3)
 Requires-Dist: croniter (>=1.0.15,<3.0.0)
 Requires-Dist: cryptography (>=42.0.4)
-Requires-Dist: dara-components (==1.17.1) ; extra == "all"
+Requires-Dist: dara-components (==1.17.3) ; extra == "all"
 Requires-Dist: exceptiongroup (>=1.1.3,<2.0.0)
 Requires-Dist: fastapi (>=0.115.0,<0.116.0)
 Requires-Dist: fastapi_vite_dara (==0.4.0)
@@ -54,7 +54,7 @@ Description-Content-Type: text/markdown
 
 # Dara Application Framework
 
-<img src="https://github.com/causalens/dara/blob/v1.17.1/img/dara_light.svg?raw=true">
+<img src="https://github.com/causalens/dara/blob/v1.17.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)
@@ -99,7 +99,7 @@ source .venv/bin/activate
 dara start
 ```
 
-![Dara App](https://github.com/causalens/dara/blob/v1.17.1/img/components_gallery.png?raw=true)
+![Dara App](https://github.com/causalens/dara/blob/v1.17.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:
 
@@ -116,9 +116,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.17.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.17.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.17.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.17.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.17.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.17.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!
 
@@ -145,9 +145,9 @@ And the supporting UI packages and tools.
 - `ui-utils` - miscellaneous utility functions
 - `ui-widgets` - widget components
 
-More information on the repository structure can be found in the [CONTRIBUTING.md](https://github.com/causalens/dara/blob/v1.17.1/CONTRIBUTING.md) file.
+More information on the repository structure can be found in the [CONTRIBUTING.md](https://github.com/causalens/dara/blob/v1.17.3/CONTRIBUTING.md) file.
 
 ## License
 
-Dara is open-source and licensed under the [Apache 2.0 License](https://github.com/causalens/dara/blob/v1.17.1/LICENSE).
+Dara is open-source and licensed under the [Apache 2.0 License](https://github.com/causalens/dara/blob/v1.17.3/LICENSE).
 

{dara_core-1.17.1.dist-info → dara_core-1.17.3.dist-info}/RECORD

@@ -19,7 +19,7 @@ dara/core/interactivity/actions.py,sha256=niNMt-IE_YXTtLpYrueTNCT60KelmNCGpUn7-W
 dara/core/interactivity/any_data_variable.py,sha256=1dLLxLuDErRsgaFPSTXxZHvpVucKKty90twQE6N-_NI,5286
 dara/core/interactivity/any_variable.py,sha256=LOGhbDdYffujlRxF4LR9ZuWdai03R-EXuGsTEJAwfo0,13544
 dara/core/interactivity/condition.py,sha256=69tdxgLqNbU-AlwHTWFdp-hvxGDugNnb_McDrz0mDtE,1575
-dara/core/interactivity/data_variable.py,sha256=pvPOx6SMxHWDxoo5Ea5xqLwrBTrWN68x8lnBiblYSGg,11760
+dara/core/interactivity/data_variable.py,sha256=lIn2v3MSSfbhTtR-9qCqUP8VSzjVj5_wMClpgS1-UZQ,11834
 dara/core/interactivity/derived_data_variable.py,sha256=u2HOts5rtmzK3D1K383YfYYQnb4pHZF3rTu1lfwMpPA,15323
 dara/core/interactivity/derived_variable.py,sha256=x_vdt8hvgubDEISX6GfpR5CS7n2Vxq3oZIkVd8Daiw0,21927
 dara/core/interactivity/filtering.py,sha256=BZsWsQvXPhn6WUoAFpAtgN6hXlGDudPbi4h97Qao2ic,9197
@@ -83,7 +83,7 @@ dara/core/metrics/cache.py,sha256=bGXwjO_rSc-FkS3PnPi1mvIZf1x-hvmG113dAUk1g-Y,26
 dara/core/metrics/runtime.py,sha256=YP-6Dz0GeI9_Yr7bUk_-OqShyFySGH_AKpDO126l6es,1833
 dara/core/metrics/utils.py,sha256=aKaa_hskV3M3h4xOGZYvegDLq_OWOEUlslkQKrrPQiI,2281
 dara/core/persistence.py,sha256=-lnksbGfHwabeRjbJkceoFd0kHfCu4gK2fud8dkeDTg,18538
-dara/core/umd/dara.core.umd.js,sha256=XNr43n2tSWqKbOCkZTqqffmkqTVhaz784rziVqPJdt8,4730577
+dara/core/umd/dara.core.umd.js,sha256=eWUu19pFrZO4VigOLx3zrUGBADrgdQ_-o0D6zTY-HGE,4729818
 dara/core/umd/style.css,sha256=YQtQ4veiSktnyONl0CU1iU1kKfcQhreH4iASi1MP7Ak,4095007
 dara/core/visual/__init__.py,sha256=QN0wbG9HPQ_vXh8BO8DnBXeYLIENVTNtRmYzZf1lx7c,577
 dara/core/visual/components/__init__.py,sha256=eg6M2YcH1o-I2H3IqLaD32ExfZcXhKuH5KTM52Ow6RM,2359
@@ -107,8 +107,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=nS_gQvOzCt5hTmj74d0_siq_9QWuj6wNuir4VCHy0Dk,2779
 dara/core/visual/themes/light.py,sha256=-Tviq8oEwGbdFULoDOqPuHO0UpAZGsBy8qFi0kAGolQ,1944
-dara_core-1.17.1.dist-info/LICENSE,sha256=r9u1w2RvpLMV6YjuXHIKXRBKzia3fx_roPwboGcLqCc,10944
-dara_core-1.17.1.dist-info/METADATA,sha256=a9khY4ezt2GchJVNB0oR7P-iu056WiStyCM71OmUDNs,7497
-dara_core-1.17.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-dara_core-1.17.1.dist-info/entry_points.txt,sha256=H__D5sNIGuPIhVam0DChNL-To5k8Y7nY7TAFz9Mz6cc,139
-dara_core-1.17.1.dist-info/RECORD,,
+dara_core-1.17.3.dist-info/LICENSE,sha256=r9u1w2RvpLMV6YjuXHIKXRBKzia3fx_roPwboGcLqCc,10944
+dara_core-1.17.3.dist-info/METADATA,sha256=sHBcDoFrYNvL0uWZtXrdnopP-46eNjdegMk12ZQHM7c,7497
+dara_core-1.17.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+dara_core-1.17.3.dist-info/entry_points.txt,sha256=H__D5sNIGuPIhVam0DChNL-To5k8Y7nY7TAFz9Mz6cc,139
+dara_core-1.17.3.dist-info/RECORD,,