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

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
 
@@ -329,11 +317,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/interactivity/filtering.py

@@ -274,14 +274,16 @@ def apply_filters(
                 order_by = order_by[1:]
                 ascending = False
 
-            new_data = new_data.sort_values(
-                by=re.sub(COLUMN_PREFIX_REGEX, '', order_by), ascending=ascending, inplace=False
-            )
+            col = re.sub(COLUMN_PREFIX_REGEX, '', order_by)
+            if col == 'index':
+                new_data = new_data.sort_index(ascending=ascending, inplace=False)
+            else:
+                new_data = new_data.sort_values(by=col, ascending=ascending, inplace=False)
 
         # PAGINATE
         start_index = pagination.offset if pagination.offset is not None else 0
         stop_index = start_index + pagination.limit if pagination.limit is not None else total_count
 
-        new_data = new_data[start_index:stop_index]
+        new_data = new_data.iloc[start_index:stop_index]
 
     return new_data, total_count

dara/core/internal/routing.py

@@ -391,17 +391,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',
+    }
 });

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

@@ -20681,7 +20681,7 @@ var __privateWrapper = (obj, member, setter, getter) => ({
     var _a;
     return jsxRuntime.exports.jsxs(Wrapper$8, { className: props.className, style: props.style, children: [jsxRuntime.exports.jsxs(Loader, { color: props.color, size: props.size, children: [jsxRuntime.exports.jsx("div", { className: "sk-chase-dot" }), jsxRuntime.exports.jsx("div", { className: "sk-chase-dot" }), jsxRuntime.exports.jsx("div", { className: "sk-chase-dot" }), jsxRuntime.exports.jsx("div", { className: "sk-chase-dot" }), jsxRuntime.exports.jsx("div", { className: "sk-chase-dot" }), jsxRuntime.exports.jsx("div", { className: "sk-chase-dot" })] }), (props.showText || props.text) && jsxRuntime.exports.jsx(LoadingText, { color: props.color, children: (_a = props.text) !== null && _a !== void 0 ? _a : "LOADING" })] });
   }
-  var __rest$7 = globalThis && globalThis.__rest || function(s, e3) {
+  var __rest$8 = globalThis && globalThis.__rest || function(s, e3) {
     var t2 = {};
     for (var p2 in s)
       if (Object.prototype.hasOwnProperty.call(s, p2) && e3.indexOf(p2) < 0)
@@ -20787,7 +20787,7 @@ var __privateWrapper = (obj, member, setter, getter) => ({
     secondary: SecondaryButton
   };
   function Button(_a, ref) {
-    var { autoFocus, children, className, disabled: disabled2, download, href, loading, id, onClick, outline = false, style, styling = "primary", type = "button" } = _a, props = __rest$7(_a, ["autoFocus", "children", "className", "disabled", "download", "href", "loading", "id", "onClick", "outline", "style", "styling", "type"]);
+    var { autoFocus, children, className, disabled: disabled2, download, href, loading, id, onClick, outline = false, style, styling = "primary", type = "button" } = _a, props = __rest$8(_a, ["autoFocus", "children", "className", "disabled", "download", "href", "loading", "id", "onClick", "outline", "style", "styling", "type"]);
     const currentTheme = useClTheme();
     const Component = stylingMap[styling];
     const content = loading ? jsxRuntime.exports.jsx(StyledLoading, { color: outline ? currentTheme.colors.grey2 : currentTheme.colors.blue1 }) : children;
@@ -26438,7 +26438,7 @@ var __privateWrapper = (obj, member, setter, getter) => ({
 
     width: 100%;
     height: 100%;
-    min-height: 3.6rem;
+    min-height: 3.4rem;
     padding: 1rem;
 
     font-size: 1rem;
@@ -26449,14 +26449,14 @@ var __privateWrapper = (obj, member, setter, getter) => ({
     border-radius: 0.25rem;
     outline: 0;
 
-    :focus:not(:disabled) {
-        border: 1px solid ${(props) => props.isErrored ? props.theme.colors.error : props.theme.colors.grey3};
-    }
-
     :hover:not(:disabled) {
         border: 1px solid ${(props) => props.isErrored ? props.theme.colors.error : props.theme.colors.grey2};
     }
 
+    :focus:not(:disabled) {
+        border: 1px solid ${(props) => props.isErrored ? props.theme.colors.error : props.theme.colors.grey3};
+    }
+
     :active:not(:disabled) {
         border: 1px solid ${(props) => props.isErrored ? props.theme.colors.error : props.theme.colors.grey3};
     }
@@ -29685,8 +29685,7 @@ var __privateWrapper = (obj, member, setter, getter) => ({
     }
 
     blockquote {
-        /* stylelint-disable-next-line */
-        quotes: '"\\201C""\\201D""\\2018""\\2019"';
+        quotes: '\\201C' '\\201D' '\\2018' '\\2019';
 
         margin-top: 1.5rem;
         margin-bottom: 1.5rem;
@@ -29697,6 +29696,14 @@ var __privateWrapper = (obj, member, setter, getter) => ({
         color: ${(props) => props.theme.colors.grey6};
 
         border-left: 0.25rem solid ${(props) => props.theme.colors.grey3};
+
+        p:first-of-type::before {
+            content: open-quote;
+        }
+
+        p:last-of-type::after {
+            content: close-quote;
+        }
     }
 
     h1 {
@@ -29709,7 +29716,7 @@ var __privateWrapper = (obj, member, setter, getter) => ({
     }
 
     h2 {
-        margin-top: 1rem;
+        margin-top: 2rem;
         margin-bottom: 1rem;
 
         font-size: 2rem;
@@ -29744,6 +29751,13 @@ var __privateWrapper = (obj, member, setter, getter) => ({
         }
     }
 
+    figcaption {
+        margin-top: 0.875rem;
+        font-size: 0.875rem;
+        line-height: 1.5rem;
+        color: ${(props) => props.theme.colors.grey5};
+    }
+
     h2 code {
         font-size: 0.875rem;
     }
@@ -29811,10 +29825,6 @@ var __privateWrapper = (obj, member, setter, getter) => ({
                 border-radius: 0.25rem;
             }
 
-            strong {
-                font-style: italic;
-            }
-
             p {
                 margin-top: 0.75rem;
                 margin-bottom: 0.75rem;
@@ -29830,20 +29840,42 @@ var __privateWrapper = (obj, member, setter, getter) => ({
         }
     }
 
+    ol > li::marker {
+        font-weight: 400;
+        color: ${(props) => props.theme.colors.text};
+    }
+
+    ul > li::marker {
+        color: ${(props) => props.theme.colors.grey4};
+    }
+
     hr {
         margin-top: 3rem;
         margin-bottom: 3rem;
     }
 
     table {
+        table-layout: auto;
+        border-collapse: collapse;
+
+        width: 100%;
+        margin-top: 2rem;
+        margin-bottom: 2rem;
+
         font-size: 0.875rem;
         line-height: 1.7;
 
         thead {
+            border-bottom: 1px solid ${(props) => props.theme.colors.grey3};
+
             th {
                 padding-right: 0.5rem;
                 padding-bottom: 0.5rem;
                 padding-left: 0.5rem;
+
+                font-weight: 600;
+                text-align: start;
+                vertical-align: bottom;
             }
 
             th:first-child {
@@ -29855,17 +29887,36 @@ var __privateWrapper = (obj, member, setter, getter) => ({
             }
         }
 
-        tbody {
+        tfoot {
+            border-top: 1px solid ${(props) => props.theme.colors.grey2};
+
             td {
-                padding: 0.5rem;
+                text-align: start;
+                vertical-align: top;
             }
+        }
 
-            td:first-child {
-                padding-left: 0;
+        tbody {
+            tr {
+                border-bottom: 1px solid ${(props) => props.theme.colors.grey2};
+
+                &:last-child {
+                    border-bottom: 0;
+                }
             }
 
-            td:last-child {
-                padding-right: 0;
+            td {
+                padding: 0.5rem;
+                text-align: start;
+                vertical-align: baseline;
+
+                &:first-child {
+                    padding-left: 0;
+                }
+
+                &:last-child {
+                    padding-right: 0;
+                }
             }
         }
     }
@@ -34222,7 +34273,7 @@ var __privateWrapper = (obj, member, setter, getter) => ({
       return jsxRuntime.exports.jsx(CheckboxWrapper, { "aria-disabled": props.disabled, children: jsxRuntime.exports.jsx(Checkbox, { disabled: isSelectPermitted ? props.disabled : ((_a = checkedState.find((option) => option.value === item.value)) === null || _a === void 0 ? void 0 : _a.state) === false, id: index2, isListStyle: props.isListStyle, label: item.label ? item.label : item.value, onChange: (checked, e3) => onChangeValue(e3), selected: (_b = checkedState.find((option) => option.value === item.value)) === null || _b === void 0 ? void 0 : _b.state }) }, `item-${index2}`);
     })] });
   }
-  var __rest$6 = globalThis && globalThis.__rest || function(s, e3) {
+  var __rest$7 = globalThis && globalThis.__rest || function(s, e3) {
     var t2 = {};
     for (var p2 in s)
       if (Object.prototype.hasOwnProperty.call(s, p2) && e3.indexOf(p2) < 0)
@@ -34278,35 +34329,25 @@ var __privateWrapper = (obj, member, setter, getter) => ({
     color: ${(props) => props.theme.colors.error};
 `;
   const Input$1 = React.forwardRef((_a, ref) => {
-    var { type = "text" } = _a, props = __rest$6(_a, ["type"]);
-    const onChange2 = (e3) => {
+    var { type = "text", onChange: onChange2, onKeyDown, keydownFilter, onComplete, maxValue, minValue, errorMsg, className, style, initialValue } = _a, rest = __rest$7(_a, ["type", "onChange", "onKeyDown", "keydownFilter", "onComplete", "maxValue", "minValue", "errorMsg", "className", "style", "initialValue"]);
+    const handleChange = (e3) => {
       const target = e3.target;
-      if (props.onChange) {
-        props.onChange(target.value, e3);
+      if (onChange2) {
+        onChange2(target.value, e3);
       }
     };
-    const onKeyDown = (e3) => {
-      if (props.onKeyDown) {
-        props.onKeyDown(e3);
+    const handleKeyDown = (e3) => {
+      if (onKeyDown) {
+        onKeyDown(e3);
       }
-      if (props.keydownFilter && !props.keydownFilter(e3)) {
+      if (keydownFilter && !keydownFilter(e3)) {
         e3.preventDefault();
       }
-      if (e3.key === Key.ENTER && props.onComplete) {
-        props.onComplete();
-      }
-    };
-    const addOptionalItems = () => {
-      const result = {};
-      if (props.minValue) {
-        result.minValue = props.minValue;
-      }
-      if (props.maxValue) {
-        result.maxValue = props.minValue;
+      if (e3.key === Key.ENTER && onComplete) {
+        onComplete();
       }
-      return result;
     };
-    return jsxRuntime.exports.jsxs(InputWrapper$3, { className: props.className, style: props.style, children: [jsxRuntime.exports.jsx(PrimaryInput, Object.assign({ autoFocus: props.autoFocus, defaultValue: props.initialValue, disabled: props.disabled, isErrored: !!props.errorMsg, maxLength: props.maxLength, onBlur: props.onBlur, onChange: onChange2, onClick: props.onClick, onKeyDown, placeholder: props.placeholder, ref, type, value: props.value }, addOptionalItems())), props.errorMsg && jsxRuntime.exports.jsxs(ErrorMessage$1, { children: [props.errorMsg, " "] })] });
+    return jsxRuntime.exports.jsxs(InputWrapper$3, { className, style, children: [jsxRuntime.exports.jsx(PrimaryInput, Object.assign({}, rest, { defaultValue: initialValue, isErrored: !!errorMsg, onChange: handleChange, onKeyDown: handleKeyDown, ref, type, min: minValue, max: maxValue })), errorMsg && jsxRuntime.exports.jsx(ErrorMessage$1, { children: errorMsg })] });
   });
   Input$1.displayName = "Input";
   const Wrapper$7 = styled__default.default.div`
@@ -36572,7 +36613,7 @@ var __privateWrapper = (obj, member, setter, getter) => ({
     keyNavigationNext: "ArrowRight",
     keyNavigationPrevious: "ArrowLeft"
   });
-  var __rest$5 = globalThis && globalThis.__rest || function(s, e3) {
+  var __rest$6 = globalThis && globalThis.__rest || function(s, e3) {
     var t2 = {};
     for (var p2 in s)
       if (Object.prototype.hasOwnProperty.call(s, p2) && e3.indexOf(p2) < 0)
@@ -36593,11 +36634,11 @@ var __privateWrapper = (obj, member, setter, getter) => ({
     background-color: transparent !important;
 `;
   const ChevronButton = (_a) => {
-    var { getToggleButtonProps, disabled: disabled2, isOpen } = _a, props = __rest$5(_a, ["getToggleButtonProps", "disabled", "isOpen"]);
+    var { getToggleButtonProps, disabled: disabled2, isOpen } = _a, props = __rest$6(_a, ["getToggleButtonProps", "disabled", "isOpen"]);
     return jsxRuntime.exports.jsx(StyledChevronButton, Object.assign({}, getToggleButtonProps(), props, { children: jsxRuntime.exports.jsx(Chevron$2, { disabled: disabled2, isOpen }) }));
   };
   const ChevronButton$1 = React__default.default.memo(ChevronButton);
-  var __rest$4 = globalThis && globalThis.__rest || function(s, e3) {
+  var __rest$5 = globalThis && globalThis.__rest || function(s, e3) {
     var t2 = {};
     for (var p2 in s)
       if (Object.prototype.hasOwnProperty.call(s, p2) && e3.indexOf(p2) < 0)
@@ -36650,7 +36691,7 @@ var __privateWrapper = (obj, member, setter, getter) => ({
     }
 `;
   const ListItem = ({ size: size2, title, item, index: index2, getItemProps, itemClass, children, isHighlighted, isSelected }) => {
-    const _a = getItemProps({ index: index2, item }), { itemClassName } = _a, itemProps = __rest$4(_a, ["itemClassName"]);
+    const _a = getItemProps({ index: index2, item }), { itemClassName } = _a, itemProps = __rest$5(_a, ["itemClassName"]);
     return jsxRuntime.exports.jsx(StyledListItem, Object.assign({}, itemProps, { className: itemClass ? `${itemClassName} ${itemClass}` : itemClassName, title, size: size2, item, isHighlighted, isSelected, children }));
   };
   ListItem.displayName = "ListItem";
@@ -43240,7 +43281,7 @@ var __privateWrapper = (obj, member, setter, getter) => ({
     } }]), a2;
   }(), jt = "input", Ht = "navigate";
   const reactDatepicker = "";
-  var __rest$3 = globalThis && globalThis.__rest || function(s, e3) {
+  var __rest$4 = globalThis && globalThis.__rest || function(s, e3) {
     var t2 = {};
     for (var p2 in s)
       if (Object.prototype.hasOwnProperty.call(s, p2) && e3.indexOf(p2) < 0)
@@ -43372,7 +43413,7 @@ var __privateWrapper = (obj, member, setter, getter) => ({
     }
 `;
   const DatepickerListItem = React__namespace.memo(({ item, index: index2, getItemProps, isSelected, size: size2, isHighlighted }) => {
-    const _a = getItemProps({ index: index2, item }), itemProps = __rest$3(_a, ["itemClassName"]);
+    const _a = getItemProps({ index: index2, item }), itemProps = __rest$4(_a, ["itemClassName"]);
     return jsxRuntime.exports.jsx(StyledDatepickerListItem, Object.assign({}, itemProps, { isSelected, title: item.label, item, index: index2, size: size2, isHighlighted, children: item.label }));
   });
   const StyledDropdownList = React__namespace.memo(styled__default.default(DropdownList$1)`
@@ -45466,6 +45507,18 @@ var __privateWrapper = (obj, member, setter, getter) => ({
     const stepDown = () => step(amountToStep * -1);
     return jsxRuntime.exports.jsxs(StepperWrapper, { disabled: disabled2, children: [jsxRuntime.exports.jsx(StepperButton, { disabled: disabled2, onClick: stepUp, styling: "ghost", tabIndex: -1, children: jsxRuntime.exports.jsx(ChevronUp, {}) }), jsxRuntime.exports.jsx(StepperButton, { disabled: disabled2, onClick: stepDown, styling: "ghost", tabIndex: -1, children: jsxRuntime.exports.jsx(ChevronDown, {}) })] });
   };
+  var __rest$3 = globalThis && globalThis.__rest || function(s, e3) {
+    var t2 = {};
+    for (var p2 in s)
+      if (Object.prototype.hasOwnProperty.call(s, p2) && e3.indexOf(p2) < 0)
+        t2[p2] = s[p2];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+      for (var i2 = 0, p2 = Object.getOwnPropertySymbols(s); i2 < p2.length; i2++) {
+        if (e3.indexOf(p2[i2]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p2[i2]))
+          t2[p2[i2]] = s[p2[i2]];
+      }
+    return t2;
+  };
   const InputWrapper$1 = styled__default.default.div`
     display: flex;
     flex-direction: row;
@@ -45557,27 +45610,27 @@ var __privateWrapper = (obj, member, setter, getter) => ({
     }
     return "";
   };
-  React__namespace.forwardRef((props, ref) => {
+  React__namespace.forwardRef((_a, ref) => {
+    var { value, onChange: onChange2, initialValue } = _a, props = __rest$3(_a, ["value", "onChange", "initialValue"]);
     const keydownFilter = React.useMemo(() => numericFilter(props.integerOnly), [props.integerOnly]);
-    const [input, setInput] = React.useState(getInitialValue(props.value, props.initialValue));
-    const step = (value) => {
-      var _a;
+    const [input, setInput] = React.useState(getInitialValue(value, initialValue));
+    const step = (v2) => {
       if (!input || input === "-") {
         return;
       }
       const isFloat = input.includes(".");
       const parsedValue = isFloat ? parseFloat(input) : parseInt(input);
-      let nextValueNumber = parsedValue + value;
+      let nextValueNumber = parsedValue + v2;
       let nextValueStr = String(nextValueNumber);
       if (isFloat) {
         const decimals = input.split(".")[1];
         if (decimals) {
-          nextValueStr = (parsedValue + value / Math.pow(10, decimals.length)).toFixed(decimals.length);
+          nextValueStr = (parsedValue + v2 / Math.pow(10, decimals.length)).toFixed(decimals.length);
           nextValueNumber = parseFloat(nextValueStr);
         }
       }
-      if (props.value !== void 0) {
-        (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, nextValueNumber, {
+      if (value !== void 0) {
+        onChange2 === null || onChange2 === void 0 ? void 0 : onChange2(nextValueNumber, {
           target: {
             value: nextValueStr
           }
@@ -45587,8 +45640,8 @@ var __privateWrapper = (obj, member, setter, getter) => ({
       }
     };
     const onKeyDown = (e3) => {
-      var _a, _b;
-      (_a = props.onKeyDown) === null || _a === void 0 ? void 0 : _a.call(props, e3);
+      var _a2, _b;
+      (_a2 = props.onKeyDown) === null || _a2 === void 0 ? void 0 : _a2.call(props, e3);
       if (!props.stepper) {
         return;
       }
@@ -45600,35 +45653,34 @@ var __privateWrapper = (obj, member, setter, getter) => ({
         step(stepSkip * -1);
       }
     };
-    const onChange2 = React.useCallback(
-      (value, e3) => {
-        var _a, _b;
-        const parsed = props.integerOnly ? parseInt(value) : parseFloat(value);
-        if (props.value === void 0) {
-          setInput(value);
-          (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, parsed, e3);
+    const handleOnChange = React.useCallback(
+      (v2, e3) => {
+        const parsed = props.integerOnly ? parseInt(v2) : parseFloat(v2);
+        if (value === void 0) {
+          setInput(v2);
+          onChange2 === null || onChange2 === void 0 ? void 0 : onChange2(parsed, e3);
           return;
         }
-        if (value.endsWith(".")) {
-          setInput(value);
+        if (v2.endsWith(".")) {
+          setInput(v2);
           return;
         }
-        if (value.includes(".") && value.endsWith("0")) {
-          setInput(value);
+        if (v2.includes(".") && v2.endsWith("0")) {
+          setInput(v2);
           return;
         }
-        if (value === "-") {
-          setInput(value);
+        if (v2 === "-") {
+          setInput(v2);
           return;
         }
-        (_b = props.onChange) === null || _b === void 0 ? void 0 : _b.call(props, parsed, e3);
+        onChange2 === null || onChange2 === void 0 ? void 0 : onChange2(parsed, e3);
       },
-      [props.integerOnly, props.value, props.onChange]
+      [props.integerOnly, value, onChange2]
     );
     React.useEffect(() => {
-      setInput(getInitialValue(props.value, props.initialValue));
-    }, [props.value]);
-    return jsxRuntime.exports.jsxs("div", { children: [jsxRuntime.exports.jsxs(InputWrapper$1, { disabled: props.disabled, errorMsg: props.errorMsg, stepper: props.stepper, style: props.style, children: [jsxRuntime.exports.jsx(Input$1, { autoFocus: props.autoFocus, className: props.className, disabled: props.disabled, keydownFilter, maxValue: props.maxValue, minValue: props.minValue, onBlur: props.onBlur, onChange: onChange2, onComplete: props.onComplete, onKeyDown, placeholder: props.placeholder, ref, value: input }), props.stepper && jsxRuntime.exports.jsx(InputStepper, { disabled: props.disabled, step, stepSkip: props.stepSkip })] }), props.errorMsg && jsxRuntime.exports.jsx(ErrorMessage$1, { children: props.errorMsg })] });
+      setInput(getInitialValue(value, initialValue));
+    }, [value]);
+    return jsxRuntime.exports.jsxs("div", { children: [jsxRuntime.exports.jsxs(InputWrapper$1, { disabled: props.disabled, errorMsg: props.errorMsg, stepper: props.stepper, style: props.style, children: [jsxRuntime.exports.jsx(Input$1, Object.assign({}, props, { keydownFilter, onChange: handleOnChange, onKeyDown, ref, value: input })), props.stepper && jsxRuntime.exports.jsx(InputStepper, { disabled: props.disabled, step, stepSkip: props.stepSkip })] }), props.errorMsg && jsxRuntime.exports.jsx(ErrorMessage$1, { children: props.errorMsg })] });
   });
   Input$1.displayName = "NumericInput";
   styled__default.default.div`
@@ -57572,12 +57624,12 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     const eventBus = useEventBus();
     const extras = useRequestExtras();
     const dataCallback = React.useCallback(
-      async (filters, pagination, withSchema = false) => {
+      async (filters, pagination, options) => {
         const mergedFilters = combineFilters("AND", [variable.filters, filters]);
         const data = await fetchDataVariable(variable.uid, extras, mergedFilters, pagination);
         const [totalCount, schema = null] = await Promise.all([
           fetchDataVariableCount(variable.uid, extras, mergedFilters),
-          ...withSchema ? [fetchDataVariableSchema(variable.uid, extras)] : []
+          ...(options == null ? void 0 : options.schema) ? [fetchDataVariableSchema(variable.uid, extras)] : []
         ]);
         eventBus.publish("DATA_VARIABLE_LOADED", { variable, value: { data, totalCount } });
         return {
@@ -57595,7 +57647,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     const extras = useRequestExtras();
     const previousResult = React.useRef({ data: null, totalCount: 0, schema: { fields: [], primaryKey: [] } });
     const dataCallback = React.useCallback(
-      async (filters, pagination, withSchema = false) => {
+      async (filters, pagination, options) => {
         const mergedFilters = combineFilters("AND", [variable.filters, filters]);
         const dvValue = await dvValuePromise;
         const response = await fetchDerivedDataVariable(
@@ -57625,8 +57677,8 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
           data = response;
         }
         const [totalCount, schema = null] = await Promise.all([
-          fetchDataVariableCount(variable.uid, extras, mergedFilters),
-          ...withSchema ? [fetchDataVariableSchema(variable.uid, extras)] : []
+          fetchDataVariableCount(variable.uid, extras, mergedFilters, dvValue.cache_key),
+          ...(options == null ? void 0 : options.schema) ? [fetchDataVariableSchema(variable.uid, extras, dvValue.cache_key)] : []
         ]);
         previousResult.current = {
           data,

{dara_core-1.12.6.dist-info → dara_core-1.13.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dara-core
-Version: 1.12.6
+Version: 1.13.0
 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.6)
+Requires-Dist: create-dara-app (==1.13.0)
 Requires-Dist: croniter (>=1.0.15,<2.0.0)
 Requires-Dist: cryptography (>=42.0.4)
-Requires-Dist: dara-components (==1.12.6) ; extra == "all"
+Requires-Dist: dara-components (==1.13.0) ; 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.6/img/dara_light.svg?raw=true">
+<img src="https://github.com/causalens/dara/blob/v1.13.0/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.6/img/components_gallery.png?raw=true)
+![Dara App](https://github.com/causalens/dara/blob/v1.13.0/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.6/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.6/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.6/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.13.0/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.13.0/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.13.0/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.6/CONTRIBUTING.md) file.
+More information on the repository structure can be found in the [CONTRIBUTING.md](https://github.com/causalens/dara/blob/v1.13.0/CONTRIBUTING.md) file.
 
 ## License
 
-Dara is open-source and licensed under the [Apache 2.0 License](https://github.com/causalens/dara/blob/v1.12.6/LICENSE).
+Dara is open-source and licensed under the [Apache 2.0 License](https://github.com/causalens/dara/blob/v1.13.0/LICENSE).
 

{dara_core-1.12.6.dist-info → dara_core-1.13.0.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=Y3Yw5gdnjvVIUrZhyHafCEaQZMyVT9S5SJ7sC8lcYxA,15176
+dara/core/interactivity/derived_data_variable.py,sha256=RsVotZuWUvF3Z08-8HT9SSkAeObIZ4pPxLee54g80lQ,14711
 dara/core/interactivity/derived_variable.py,sha256=6xOv-E5wQj-fd9S2RVmRdE_DfkvxVGyptfZlDSj0fmY,21497
-dara/core/interactivity/filtering.py,sha256=RniL8Qq9HIzY0D3p6ZXFQD363ksqZ6b7uCxtklUILyo,9035
+dara/core/interactivity/filtering.py,sha256=veQbDi4ogeDO5SODOp3hpx1FQGAYKFLwnhqmbfFDyJo,9168
 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=8snHu2wUUsngXjHyHh6eZqL_WwonTTQB6-WBX-R_WZg,2238
-dara/core/internal/routing.py,sha256=mdFOz8Q7g0IWUAl-qR5cHzK9qXn8QbNHhTuKVrxTp7E,22530
+dara/core/internal/routing.py,sha256=R2SLQ_d81wVG0qxBI9fH_6XrBKdvkf0QVUVf9lqD7Gg,22649
 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
@@ -72,7 +72,7 @@ dara/core/js_tooling/templates/.npmrc,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 dara/core/js_tooling/templates/_entry.template.tsx,sha256=oTeiSLDmq4J-2pM7qjA2RgUocT6Rla7BNwyEAJGvdCc,161
 dara/core/js_tooling/templates/_entry_autojs.template.tsx,sha256=OtdXqH4kshaMiTk7E6gvccbVKU1UN-ShRKA9gLpu22E,217
 dara/core/js_tooling/templates/dara.config.json,sha256=RZG_R_xJv_5rYIoz2QZulcG49wD0JURTzshtAzG_di4,84
-dara/core/js_tooling/templates/vite.config.template.ts,sha256=d85cmO9p41QBL6X-HM-WdRwVoVA3JWOn9w2IZXZLg3I,590
+dara/core/js_tooling/templates/vite.config.template.ts,sha256=f7_DbAQPDq6FJcOFJDnf2bMtzsvGWnN6VclRJjVdql8,631
 dara/core/log_configs/logging.yaml,sha256=YJyD18psAmSVz6587dcEOyoulLuRFFu1g8yMXl1ylM0,706
 dara/core/logging.py,sha256=QXf8qQDNdh5UW5-jnYwFz7U7KDmhPiZXmObBal_mwPo,13093
 dara/core/main.py,sha256=bl-Sjcgh0Hb-iYoCAuiMlkoG-fN8Erhwa5Nw3HGv_cc,17899
@@ -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=eAzeW0wT8sdeoYKEmTdPPlD_OsxRP9PHJUTko912TAM,4876798
+dara/core/umd/dara.core.umd.js,sha256=xHduhIjStK_x2rjCYi8RzAE7w9v9C6ET6k1kd7_75pc,4878180
 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.6.dist-info/LICENSE,sha256=r9u1w2RvpLMV6YjuXHIKXRBKzia3fx_roPwboGcLqCc,10944
-dara_core-1.12.6.dist-info/METADATA,sha256=hw9ZCren224YQQEpDUsYd83NCGruzySuODIJU0ep_qQ,6771
-dara_core-1.12.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-dara_core-1.12.6.dist-info/entry_points.txt,sha256=H__D5sNIGuPIhVam0DChNL-To5k8Y7nY7TAFz9Mz6cc,139
-dara_core-1.12.6.dist-info/RECORD,,
+dara_core-1.13.0.dist-info/LICENSE,sha256=r9u1w2RvpLMV6YjuXHIKXRBKzia3fx_roPwboGcLqCc,10944
+dara_core-1.13.0.dist-info/METADATA,sha256=0f5jmYg7f6oUjFAKVhtGFHXOTR-Y1gQczFqFuHY74iE,6771
+dara_core-1.13.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+dara_core-1.13.0.dist-info/entry_points.txt,sha256=H__D5sNIGuPIhVam0DChNL-To5k8Y7nY7TAFz9Mz6cc,139
+dara_core-1.13.0.dist-info/RECORD,,