dara-core 1.23.2a1__py3-none-any.whl → 1.24.0__py3-none-any.whl

dara/core/_assets/auto_js/dara.core.umd.cjs

@@ -39079,8 +39079,6 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
       style: Object.assign(Object.assign(Object.assign({}, floatingStyles), { maxHeight: 800, minWidth: 150, zIndex: 9999 }), style)
     }), { isOpen, children: jsxRuntimeExports.jsx(SectionedList, { items: allowColumnHiding ? [resetFunctions, columnToggles] : [resetFunctions], onSelect: onOptionSelect }, isOpen ? "open" : "closed") })), document.body)] });
   };
-  const { fontSize } = window.getComputedStyle(document.documentElement);
-  const DEFAULT_ROW_HEIGHT = parseFloat(fontSize) * 2.5;
   var __rest$1 = function(s, e2) {
     var t2 = {};
     for (var p2 in s) if (Object.prototype.hasOwnProperty.call(s, p2) && e2.indexOf(p2) < 0)
@@ -39092,6 +39090,8 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
       }
     return t2;
   };
+  const { fontSize } = window.getComputedStyle(document.documentElement);
+  const ROW_HEIGHT = parseFloat(fontSize) * 2.5;
   const shouldForwardProp$2 = (prop) => !["isSorted", "onClickRow"].includes(prop);
   const Row = styled.div.withConfig({ shouldForwardProp: shouldForwardProp$2 })`
     cursor: ${(props) => props.onClickRow ? "pointer" : "default"};
@@ -39147,7 +39147,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     align-items: center;
 
     min-width: 80px;
-    height: ${({ rowHeight }) => `${rowHeight}px`};
+    height: ${() => `${ROW_HEIGHT}px`};
 
     color: ${(props) => props.theme.colors.grey6};
 
@@ -39171,7 +39171,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     var _a;
     return areEqual(prevProps, nextProps) && !(((_a = nextProps.data) === null || _a === void 0 ? void 0 : _a.headerGroups) || []).some((headerGroup) => ((headerGroup === null || headerGroup === void 0 ? void 0 : headerGroup.headers) || []).some((header) => header.isResizing));
   };
-  const RenderRow = React__namespace.memo(({ data: { width, currentEditCell, headerGroups, rows, prepareRow, getItem, totalColumnsWidth, onClickRow, throttledClickRow, backgroundColor, mappedColumns, rowHeight }, index: index2, style: renderRowStyle }) => {
+  const RenderRow = React__namespace.memo(({ data: { width, currentEditCell, headerGroups, rows, prepareRow, getItem, totalColumnsWidth, onClickRow, throttledClickRow, backgroundColor, mappedColumns }, index: index2, style: renderRowStyle }) => {
     let row = rows[index2];
     if (getItem) {
       const value = getItem(index2);
@@ -39184,8 +39184,8 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     }
     if (!row) {
       return jsxRuntimeExports.jsx("div", { children: headerGroups.map((headerGroup, gidx) => jsxRuntimeExports.jsx(RowPlaceholder, { style: {
-        height: rowHeight,
-        top: (index2 + 1) * rowHeight,
+        height: ROW_HEIGHT,
+        top: (index2 + 1) * ROW_HEIGHT,
         width: totalColumnsWidth > width ? totalColumnsWidth : "100%"
       }, children: headerGroup === null || headerGroup === void 0 ? void 0 : headerGroup.headers.map((col, cidx) => {
         const headerProps = col.getHeaderProps();
@@ -39203,23 +39203,15 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
       }
     };
     const _a = row.getRowProps({ style: renderRowStyle }), { style: rowStyle } = _a, restRow = __rest$1(_a, ["style"]);
-    return React$1.createElement(Row, Object.assign({}, restRow, { key: `row-${index2}`, onClick, onClickRow, style: Object.assign(Object.assign({}, rowStyle), {
-      // The first row is the header row which is not controlled by this rowHeight prop so it needs to be part of the calculation.
-      top: index2 === 0 ? DEFAULT_ROW_HEIGHT : index2 * rowHeight + DEFAULT_ROW_HEIGHT,
-      width: totalColumnsWidth > width ? totalColumnsWidth : "100%"
-    }) }), row.cells.map((cell, colIdx) => {
-      var _a2, _b, _c, _d, _e2;
+    return React$1.createElement(Row, Object.assign({}, restRow, { key: `row-${index2}`, onClick, onClickRow, style: Object.assign(Object.assign({}, rowStyle), { top: (index2 + 1) * ROW_HEIGHT, width: totalColumnsWidth > width ? totalColumnsWidth : "100%" }) }), row.cells.map((cell, colIdx) => {
+      var _a2;
       const cellProps = cell.getCellProps();
       return React$1.createElement(
         Cell,
-        Object.assign({}, cellProps, { rowHeight, key: `cell-${index2}-${colIdx}`, style: Object.assign(Object.assign(Object.assign(Object.assign({}, cellProps.style), { backgroundColor, justifyContent: mappedColumns[colIdx].align, maxWidth: (_a2 = cell.column) === null || _a2 === void 0 ? void 0 : _a2.maxWidth, width: (
+        Object.assign({}, cellProps, { key: `cell-${index2}-${colIdx}`, style: Object.assign(Object.assign({}, cellProps.style), { backgroundColor, justifyContent: mappedColumns[colIdx].align, maxWidth: (_a2 = cell.column) === null || _a2 === void 0 ? void 0 : _a2.maxWidth, width: (
           // If width calc has messed up then use the raw width from the column
           cellProps.style.width === "NaNpx" ? mappedColumns[colIdx].width : cellProps.style.width
-        ) }), ((_b = mappedColumns[colIdx]) === null || _b === void 0 ? void 0 : _b.sticky) === "left" && typeof ((_c = mappedColumns[colIdx]) === null || _c === void 0 ? void 0 : _c.stickyOffset) === "number" ? {
-          left: `${mappedColumns[colIdx].stickyOffset}px`
-        } : {}), ((_d = mappedColumns[colIdx]) === null || _d === void 0 ? void 0 : _d.sticky) === "right" && typeof ((_e2 = mappedColumns[colIdx]) === null || _e2 === void 0 ? void 0 : _e2.stickyOffset) === "number" ? {
-          right: `${mappedColumns[colIdx].stickyOffset}px`
-        } : {}) }),
+        ) }) }),
         jsxRuntimeExports.jsx(CellContent, { children: cell.render("Cell", {
           colIdx,
           currentEditCell,
@@ -39300,7 +39292,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     justify-content: space-between;
 
     min-width: 80px;
-    height: ${DEFAULT_ROW_HEIGHT}px;
+    height: ${ROW_HEIGHT}px;
 
     color: ${(props) => props.theme.colors.text};
 
@@ -39385,26 +39377,6 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     });
     return [...leftStickyCols, ...nonStickyCols, ...rightStickyCols];
   };
-  const appendStickyOffsets = (columns) => {
-    let leftOffset = 0;
-    let rightOffset = 0;
-    const rightStickyColumnWidths = columns.filter((col) => col.sticky === "right").slice(1).map((col) => parseInt(col.width) || 150);
-    return columns.map((col) => {
-      if (col.sticky === "left") {
-        const nextCol = Object.assign(Object.assign({}, col), { stickyOffset: leftOffset });
-        const width = parseInt(col.width) || 150;
-        leftOffset += width;
-        return nextCol;
-      }
-      if (col.sticky === "right") {
-        rightOffset = rightStickyColumnWidths.reduce((acc, width) => acc + width, 0);
-        const nextCol = Object.assign(Object.assign({}, col), { stickyOffset: rightOffset });
-        rightStickyColumnWidths.shift();
-        return nextCol;
-      }
-      return col;
-    });
-  };
   const filterComponentMap = {
     categorical: CategoricalFilter,
     datetime: DatetimeFilter,
@@ -39422,26 +39394,12 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
       return Object.assign(Object.assign({}, col), { Filter: filterComponentMap[col.filter] });
     });
   };
-  const createActionColumn = (actions, accessor, sticky, disableSelectAll = false) => {
-    const width = actions.includes(Actions.SELECT) ? 52 : actions.length * 24 + 24;
-    return {
-      Cell: ActionCell,
-      Header: actions.includes(Actions.SELECT) && !disableSelectAll ? SelectHeader : "",
-      accessor: accessor || "actions",
-      actions,
-      disableSortBy: true,
-      maxWidth: width,
-      minWidth: actions.includes(Actions.SELECT) ? 52 : 48,
-      sticky: sticky || null,
-      width
-    };
-  };
   const cells = {
     DATETIME: DatetimeCell,
     EDIT_INPUT: EditInputCell,
     EDIT_SELECT: EditSelectCell
   };
-  const createItemData$1 = memoizeOne$1((width, currentEditCell, headerGroups, rows, prepareRow, getItem, totalColumnsWidth, onClickRow, throttledClickRow, backgroundColor, mappedColumns, rowHeight) => ({
+  const createItemData$1 = memoizeOne$1((width, currentEditCell, headerGroups, rows, prepareRow, getItem, totalColumnsWidth, onClickRow, throttledClickRow, backgroundColor, mappedColumns) => ({
     backgroundColor,
     currentEditCell,
     getItem,
@@ -39450,14 +39408,12 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     onClickRow,
     prepareRow,
     rows,
-    rowHeight,
     throttledClickRow,
     totalColumnsWidth,
     width
   }));
-  const Table = React$1.forwardRef(({ allowHiding, actions, backgroundColor, className, columns, data: data2, getItem, initialSort = [], itemCount, maxRows, onAction, onChange: onChange2, onClickRow, onItemsRendered, onFilter, onSort, rowHeight, showTableOptions, style, tableOptionsStyle }, ref) => {
+  const Table = React$1.forwardRef(({ allowHiding, backgroundColor, className, columns, data: data2, getItem, initialSort = [], itemCount, maxRows, onAction, onChange: onChange2, onClickRow, onItemsRendered, onFilter, onSort, showTableOptions, style, tableOptionsStyle }, ref) => {
     const [currentSortBy, setCurrentSortBy] = React$1.useState(initialSort);
-    const tableRowHeight = rowHeight || DEFAULT_ROW_HEIGHT;
     React$1.useEffect(
       () => {
         setCurrentSortBy(initialSort);
@@ -39487,14 +39443,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
       throttledSetEditCell([Number(cell[0]), cell[1]]);
     };
     const infiniteData = React$1.useMemo(() => Array(itemCount).fill(0), [itemCount]);
-    const mappedColumns = React$1.useMemo(() => {
-      let processedColumns = columns;
-      if (actions && actions.length > 0) {
-        const actionColumn = createActionColumn(actions);
-        processedColumns = [...columns, actionColumn];
-      }
-      return appendStickyOffsets(appendFilterComponents(orderStickyCols(processedColumns)));
-    }, [columns, actions]);
+    const mappedColumns = React$1.useMemo(() => appendFilterComponents(orderStickyCols(columns)), [columns]);
     const hasFixedColumns = React$1.useMemo(() => mappedColumns.some((column) => "sticky" in column), [mappedColumns]);
     const totalColumnsWidth = React$1.useMemo(() => mappedColumns.reduce((acc, column) => acc + (parseInt(column.width) || 150), 0), [mappedColumns]);
     const filterTypes = React$1.useMemo(() => ({
@@ -39550,15 +39499,11 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
           const showHeaderCellButtonContainer = showSort || showFilter || showOptions;
           return React$1.createElement(
             HeaderCell,
-            Object.assign({}, headerProps, { key: `col-${gidx}-${cidx}`, style: Object.assign(Object.assign(Object.assign(Object.assign({}, headerProps.style), {
+            Object.assign({}, headerProps, { key: `col-${gidx}-${cidx}`, style: Object.assign(Object.assign({}, headerProps.style), {
               maxWidth: col.maxWidth,
               // If width calc has messed up then use the raw width from the column
               width: headerProps.style.width === "NaNpx" ? mappedColumns[cidx].width : headerProps.style.width
-            }), col.sticky === "left" && typeof col.stickyOffset === "number" ? {
-              left: `${col.stickyOffset}px`
-            } : {}), col.sticky === "right" && typeof col.stickyOffset === "number" ? {
-              right: `${col.stickyOffset}px`
-            } : {}) }),
+            }) }),
             jsxRuntimeExports.jsxs(HeaderTooltipContainer, { isPrimitiveHeader: typeof headerContent === "string", children: [jsxRuntimeExports.jsx(HeaderContentWrapper, Object.assign({}, sortProps, { isPrimitiveHeader: typeof headerContent === "string", title: typeof headerContent === "string" ? headerContent : "", children: headerContent })), col.tooltip && jsxRuntimeExports.jsx(Tooltip, { content: col.tooltip, children: jsxRuntimeExports.jsx(TooltipIcon, { icon: faCircleQuestion }) })] }),
             showHeaderCellButtonContainer && jsxRuntimeExports.jsxs(HeaderCellButtonContainer, { children: [jsxRuntimeExports.jsxs(HeaderIconsWrapper, { children: [showSort && jsxRuntimeExports.jsx(HeaderIconWrapper, { children: jsxRuntimeExports.jsx(SortIcon, Object.assign({}, sortProps, { className: "tableSortArrow", icon: getSortIcon(col.isSorted, col.isSortedDesc), isSorted: col.isSorted })) }), showFilter ? jsxRuntimeExports.jsx(FilterContainer, { col }) : null, showOptions && jsxRuntimeExports.jsx(OptionsMenu, { allColumns, allowColumnHiding: allowHiding, numVisibleColumns, resetResizing, setAllFilters, style: tableOptionsStyle })] }), jsxRuntimeExports.jsx(ResizeBorder, Object.assign({}, resizerProps))] })
           );
@@ -39567,15 +39512,28 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
       // eslint-disable-next-line react-hooks/exhaustive-deps
       useDeepCompare([tableProps, totalColumnsWidth, headerGroups])
     );
-    return jsxRuntimeExports.jsx(Wrapper$2, Object.assign({}, getTableProps(), { "$hasMaxRows": !!maxRows, className: `${className} ${hasFixedColumns ? "sticky" : ""}`, style: Object.assign({ height: maxRows ? (Math.min(rows.length, maxRows) + 1) * tableRowHeight : "100%" }, style), children: jsxRuntimeExports.jsx(AutoSizer, { children: ({ height, width }) => {
-      return jsxRuntimeExports.jsx(StyledFixedSizeList, { height, innerElementType: renderTable, itemCount: itemCount || rows.length, itemData: createItemData$1(width, currentEditCell, headerGroups, rows, prepareRow, getItem, totalColumnsWidth, onClickRow, throttledClickRow, backgroundColor, mappedColumns, tableRowHeight), itemSize: tableRowHeight, onItemsRendered, style: {
+    return jsxRuntimeExports.jsx(Wrapper$2, Object.assign({}, getTableProps(), { "$hasMaxRows": !!maxRows, className: `${className} ${hasFixedColumns ? "sticky" : ""}`, style: Object.assign({ height: maxRows ? (Math.min(rows.length, maxRows) + 1) * ROW_HEIGHT : "100%" }, style), children: jsxRuntimeExports.jsx(AutoSizer, { children: ({ height, width }) => {
+      return jsxRuntimeExports.jsx(StyledFixedSizeList, { height, innerElementType: renderTable, itemCount: itemCount || rows.length, itemData: createItemData$1(width, currentEditCell, headerGroups, rows, prepareRow, getItem, totalColumnsWidth, onClickRow, throttledClickRow, backgroundColor, mappedColumns), itemSize: ROW_HEIGHT, onItemsRendered, style: {
         overflowX: width < totalColumnsWidth ? "auto" : "hidden",
-        overflowY: height < (rows.length + 1) * tableRowHeight ? "auto" : "hidden"
+        overflowY: height < (rows.length + 1) * ROW_HEIGHT ? "auto" : "hidden"
       }, width, children: RenderRow }, "table-list");
     } }) }));
   });
   Table.displayName = "Table";
-  Table.ActionColumn = createActionColumn;
+  Table.ActionColumn = (actions, accessor, sticky, disableSelectAll = false) => {
+    const width = actions.includes(Actions.SELECT) ? 52 : actions.length * 24 + 24;
+    return {
+      Cell: ActionCell,
+      Header: actions.includes(Actions.SELECT) && !disableSelectAll ? SelectHeader : "",
+      accessor: accessor || "actions",
+      actions,
+      disableSortBy: true,
+      maxWidth: width,
+      minWidth: actions.includes(Actions.SELECT) ? 52 : 48,
+      sticky: sticky || null,
+      width
+    };
+  };
   Table.Actions = Actions;
   Table.cells = cells;
   styled.div`

dara/core/internal/dependency_resolution.py

@@ -61,6 +61,33 @@ def is_resolved_switch_variable(obj: Any) -> TypeGuard[ResolvedSwitchVariable]:
     return isinstance(obj, dict) and 'uid' in obj and obj.get('type') == 'switch'
 
 
+def _resolve_nested(value: Any, nested: list[str]) -> Any:
+    """
+    Resolve a nested value from an object using a list of keys.
+    This matches the frontend resolveNested function in nested.tsx.
+
+    :param value: The value to extract nested data from
+    :param nested: A list of keys to traverse
+    :return: The nested value, or None if the path doesn't exist
+    """
+    # Nested not provided
+    if not nested or len(nested) == 0:
+        return value
+
+    # Not a dict (equivalent to frontend's object check)
+    if value is None or not isinstance(value, dict):
+        return value
+
+    result = value
+    for key in nested:
+        # If the key doesn't exist, return None as we're referring to a path which doesn't exist yet
+        if not isinstance(result, dict) or key not in result:
+            return None
+        result = result[key]
+
+    return result
+
+
 def is_forced(value: Any) -> bool:
     """
     Whether a value is a Derived(Data)Variable with a force_key or any of its values are forced
@@ -93,25 +120,33 @@ async def resolve_dependency(
     entry: ResolvedDerivedVariable | ResolvedSwitchVariable | Any,
     store: CacheStore,
     task_mgr: TaskManager,
-):
+) -> Any:
     """
     Resolve an incoming dependency to its value.
     Handles 'Resolved(Derived)(Data)Variable' structures, and returns the same value for any other input.
+    Also handles the 'nested' property to extract nested values from resolved variables.
 
     :param entry: dependency entry to resolve
     :param store: store instance
     :param task_mgr: task manager instance
     """
-    if is_resolved_derived_variable(entry):
-        return await _resolve_derived_var(entry, store, task_mgr)
+    # Extract nested property if present
+    nested: list[str] = entry.get('nested', []) if isinstance(entry, dict) else []
 
-    if is_resolved_server_variable(entry):
-        return await _resolve_server_var(entry)
+    if is_resolved_derived_variable(entry):
+        result = await _resolve_derived_var(entry, store, task_mgr)
+    elif is_resolved_server_variable(entry):
+        result = await _resolve_server_var(entry)
+    elif is_resolved_switch_variable(entry):
+        result = await _resolve_switch_var(entry, store, task_mgr)
+    else:
+        return entry
 
-    if is_resolved_switch_variable(entry):
-        return await _resolve_switch_var(entry, store, task_mgr)
+    # Apply nested extraction if present
+    if nested:
+        result = _resolve_nested(result, nested)
 
-    return entry
+    return result
 
 
 async def _resolve_derived_var(
@@ -218,7 +253,7 @@ async def _resolve_switch_var(
     switch_variable_entry: ResolvedSwitchVariable,
     store: CacheStore,
     task_mgr: TaskManager,
-):
+) -> Any:
     """
     Resolve a switch variable by evaluating its constituent parts and returning the appropriate value.
 

dara/core/internal/routing.py

@@ -561,6 +561,14 @@ class PyComponentChunk(BaseModel):
 Chunk = DerivedVariableChunk | PyComponentChunk
 
 
+class UnserializablePayloadError(Exception):
+    payload_type: type
+
+    def __init__(self, message: str, payload_type: type):
+        super().__init__(message)
+        self.payload_type = payload_type
+
+
 def create_loader_route(config: Configuration, app: FastAPI):
     route_map = config.router.to_route_map()
 
@@ -617,6 +625,14 @@ def create_loader_route(config: Configuration, app: FastAPI):
                 CURRENT_ACTION_ID.set('')
                 ACTION_CONTEXT.set(None)
 
+        def create_payload(x):
+            try:
+                return jsonable_encoder(x)
+            except Exception as e:
+                raise UnserializablePayloadError(
+                    f'Unserializable payload found - {str(e)}', payload_type=type(x)
+                ) from e
+
         async def process_variables(send_stream: MemoryObjectSendStream[Chunk]):
             for payload in body.derived_variable_payloads:
                 try:
@@ -629,7 +645,17 @@ def create_loader_route(config: Configuration, app: FastAPI):
                             force_key=None,
                         ),
                     )
-                    await send_stream.send(DerivedVariableChunk(uid=payload.uid, result=Result.success(result)))
+
+                    await send_stream.send(
+                        DerivedVariableChunk(uid=payload.uid, result=Result.success(create_payload(result)))
+                    )
+                except UnserializablePayloadError as e:
+                    dev_logger.warning(
+                        f'Unserializable payload found for derived variable, skipping preload - {str(e)}',
+                    )
+                    await send_stream.send(
+                        DerivedVariableChunk(uid=payload.uid, result=Result.error(str(e))),
+                    )
                 except BaseException as e:
                     dev_logger.error(f'Error streaming derived_variable {payload.uid}', error=e)
                     await send_stream.send(
@@ -647,7 +673,16 @@ def create_loader_route(config: Configuration, app: FastAPI):
                             ws_channel=body.ws_channel,
                         ),
                     )
-                    await send_stream.send(PyComponentChunk(uid=payload.uid, result=Result.success(result)))
+                    await send_stream.send(
+                        PyComponentChunk(uid=payload.uid, result=Result.success(create_payload(result)))
+                    )
+                except UnserializablePayloadError as e:
+                    dev_logger.warning(
+                        f'Unserializable payload found for py_component, skipping preload - {str(e)}',
+                    )
+                    await send_stream.send(
+                        PyComponentChunk(uid=payload.uid, result=Result.error(str(e))),
+                    )
                 except BaseException as e:
                     dev_logger.error(f'Error streaming py_component {payload.name}', error=e)
                     await send_stream.send(

dara/core/js_tooling/js_utils.py

@@ -369,7 +369,7 @@ class BuildCache(BaseModel):
         pkg_json['dependencies'] = {
             **deps,
             '@vitejs/plugin-react': '4.6.0',
-            'vite': '7.0.4',
+            'vite': '7.0.8',
             'vite-plugin-node-polyfills': '0.24.0',
         }
 

dara/core/router/dependency_graph.py

@@ -34,6 +34,11 @@ def _analyze_component_dependencies(component: ComponentInstance, graph: Depende
     """
     Recursively analyze a component tree to build a dependency graph of DerivedVariables and PyComponentInstances.
     """
+    try:
+        from dara.components import Table
+    except ImportError:
+        Table = None
+
     # The component itself is a PyComponentInstance
     if isinstance(component, PyComponentInstance):
         if component.uid not in graph.py_components:
@@ -46,6 +51,9 @@ def _analyze_component_dependencies(component: ComponentInstance, graph: Depende
 
         # Handle encountered variables and py_components
         if isinstance(value, DerivedVariable) and value.uid not in graph.derived_variables:
+            # SPECIAL CASE: exclude Table.data since it's tabular and preloading it would be a waste
+            if Table and isinstance(component, Table) and attr == 'data':
+                continue
             graph.derived_variables[value.uid] = value
         elif isinstance(value, PyComponentInstance) and value.uid not in graph.py_components:
             graph.py_components[value.uid] = value

dara/core/visual/components/for_cmp.py

@@ -1,11 +1,14 @@
-from typing import Literal
+from typing import TYPE_CHECKING, Literal
 
-from pydantic import Field
+from pydantic import Field, model_validator
 
 from dara.core.base_definitions import DaraBaseModel
 from dara.core.definitions import ComponentInstance, JsComponentDef
 from dara.core.interactivity.any_variable import AnyVariable
 
+if TYPE_CHECKING:
+    from dara.core.visual.dynamic_component import PyComponentInstance
+
 ForDef = JsComponentDef(name='For', js_module='@darajs/core', py_module='dara.core')
 
 
@@ -61,12 +64,16 @@ class For(ComponentInstance):
     )
     ```
 
-    For interactivity can use list items in Dara actions, DerivedVariables, py_components, and `If` component for conditional rendering.
+    For interactivity can use list items in Dara actions, DerivedVariables, and `If` component for conditional rendering.
+
+    Note: Using `@py_component` inside a For renderer is not allowed as it would require a backend call for each
+    item rendered, defeating the purpose of the optimized loop primitive. Instead, precompute any derived fields
+    in the `items` variable itself using a DerivedVariable - this runs the logic once for the whole list rather
+    than per item.
 
     ```python
-    import asyncio
-    from dara.core import Variable, action, DerivedVariable, py_component
-    from dara.components import Text, Card, Button, Stack, Input
+    from dara.core import Variable, action, DerivedVariable
+    from dara.components import Text, Card, Button, Stack
 
     # Define a variable that holds a list of items
     arr_var = Variable(
@@ -82,10 +89,6 @@ class For(ComponentInstance):
     async def say_hello(ctx: ActionCtx, item):
         await ctx.notify(f'Hello {item}!', title='Hello', status='SUCCESS')
 
-    @py_component
-    async def display_city(city: str):
-        return Text(text=f'Server-rendered city: {city}')
-
     Stack(
         Text(text='Items:'),
         For(
@@ -107,8 +110,6 @@ class For(ComponentInstance):
                     Text(
                         text=DerivedVariable(lambda x: f'age doubled is {x * 2}', variables=[arr_var.list_item['age']])
                     ),
-                    # Pass item data into a py_component
-                    display_city(arr_var.list_item['data']['city']),
                 ),
                 title=arr_var.list_item.get('name'),
                 subtitle=arr_var.list_item.get('age'),
@@ -151,3 +152,55 @@ class For(ComponentInstance):
     placeholder: ComponentInstance | None = None
     key_accessor: str | None = None
     virtualization: VirtualizationConfig | None = None
+
+    @model_validator(mode='after')
+    def validate_no_py_components(self):
+        """
+        Validate that the renderer does not contain any PyComponentInstance.
+        Using @py_component inside a For loop is inefficient as it requires a backend call for each render,
+        defeating the purpose of the optimized loop primitive.
+        """
+        py_components = _find_py_components(self.renderer)
+        if py_components:
+            func_names = ', '.join(f"'{pc.func_name}'" for pc in py_components)
+            raise ValueError(
+                f'For component renderer contains @py_component(s): {func_names}. '
+                'Using @py_component inside a For loop is inefficient as it requires a backend call '
+                'for each item rendered. Instead, precompute any derived fields in the `items` variable '
+                'using a DerivedVariable - this runs the logic once for the whole list rather than per item.'
+            )
+
+        return self
+
+
+def _find_py_components(component: ComponentInstance) -> list['PyComponentInstance']:
+    """
+    Recursively search a component tree for any PyComponentInstance nodes.
+
+    :param component: The root component to search
+    :return: List of PyComponentInstance found in the tree
+    """
+    from dara.core.visual.dynamic_component import PyComponentInstance
+
+    found: list[PyComponentInstance] = []
+
+    if isinstance(component, PyComponentInstance):
+        found.append(component)
+        return found
+
+    # Check each field set on the component
+    for attr in component.model_fields_set:
+        value = getattr(component, attr, None)
+
+        if isinstance(value, PyComponentInstance):
+            found.append(value)
+        elif isinstance(value, ComponentInstance):
+            found.extend(_find_py_components(value))
+        elif isinstance(value, list):
+            for item in value:
+                if isinstance(item, PyComponentInstance):
+                    found.append(item)
+                elif isinstance(item, ComponentInstance):
+                    found.extend(_find_py_components(item))
+
+    return found

{dara_core-1.23.2a1.dist-info → dara_core-1.24.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dara-core
-Version: 1.23.2a1
+Version: 1.24.0
 Summary: Dara Framework Core
 Home-page: https://dara.causalens.com/
 License: Apache-2.0
@@ -21,10 +21,10 @@ Requires-Dist: cachetools (>=5.0.0)
 Requires-Dist: certifi (>=2024.7.4)
 Requires-Dist: click (>=8.1.3,<9.0.0)
 Requires-Dist: colorama (>=0.4.6,<0.5.0)
-Requires-Dist: create-dara-app (==1.23.2-alpha.1)
+Requires-Dist: create-dara-app (==1.24.0)
 Requires-Dist: croniter (>=6.0.0,<7.0.0)
 Requires-Dist: cryptography (>=42.0.4)
-Requires-Dist: dara-components (==1.23.2-alpha.1) ; extra == "all"
+Requires-Dist: dara-components (==1.24.0) ; extra == "all"
 Requires-Dist: exceptiongroup (>=1.1.3,<2.0.0)
 Requires-Dist: fastapi (>=0.115.0,<0.121.0)
 Requires-Dist: fastapi_vite_dara (==0.4.0)
@@ -36,7 +36,7 @@ Requires-Dist: odfpy
 Requires-Dist: openpyxl
 Requires-Dist: packaging (>=23.1)
 Requires-Dist: pandas (>=1.1.0,<3.0.0)
-Requires-Dist: prometheus-client (>=0.14.1,<0.15.0)
+Requires-Dist: prometheus-client (>=0.14.1,<1.0.0)
 Requires-Dist: pyarrow
 Requires-Dist: pydantic (>=2.11.7,<3.0.0)
 Requires-Dist: pydantic-settings (>=2.8.1,<3.0.0)
@@ -55,7 +55,7 @@ Description-Content-Type: text/markdown
 
 # Dara Application Framework
 
-<img src="https://github.com/causalens/dara/blob/v1.23.2-alpha.1/img/dara_light.svg?raw=true">
+<img src="https://github.com/causalens/dara/blob/v1.24.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)
@@ -100,7 +100,7 @@ source .venv/bin/activate
 dara start
 ```
 
-![Dara App](https://github.com/causalens/dara/blob/v1.23.2-alpha.1/img/components_gallery.png?raw=true)
+![Dara App](https://github.com/causalens/dara/blob/v1.24.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:
 
@@ -117,9 +117,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.23.2-alpha.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.23.2-alpha.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.23.2-alpha.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.24.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.24.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.24.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!
 
@@ -146,9 +146,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.23.2-alpha.1/CONTRIBUTING.md) file.
+More information on the repository structure can be found in the [CONTRIBUTING.md](https://github.com/causalens/dara/blob/v1.24.0/CONTRIBUTING.md) file.
 
 ## License
 
-Dara is open-source and licensed under the [Apache 2.0 License](https://github.com/causalens/dara/blob/v1.23.2-alpha.1/LICENSE).
+Dara is open-source and licensed under the [Apache 2.0 License](https://github.com/causalens/dara/blob/v1.24.0/LICENSE).
 

{dara_core-1.23.2a1.dist-info → dara_core-1.24.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
 dara/core/__init__.py,sha256=yTp-lXT0yy9XqLGYWlmjPgFG5g2eEg2KhKo8KheTHoo,1408
 dara/core/_assets/__init__.py,sha256=13vMoWHvl1zcFcjNHh8lbTwWOvu4f7krYSco978qxwM,723
 dara/core/_assets/auto_js/dara.core.css,sha256=yT3PKpi2sKI2-kQIF8xtVbTPQqgpK7-Ua7tfzDPuSsI,4095881
-dara/core/_assets/auto_js/dara.core.umd.cjs,sha256=JBxFuCmrugsMdISIVkEEWbdCSht8gydVvwt2Vksnmyw,5166175
+dara/core/_assets/auto_js/dara.core.umd.cjs,sha256=hvmFXD-p5KiQFZdoyp6z-Js_DG6r2bFIzXKoGtj5QFQ,5163770
 dara/core/_assets/auto_js/react-dom.development.js,sha256=vR2Fq5LXMKS5JsTo2CMl6oGCJT8scJV2wXSteTtx8aE,1077040
 dara/core/_assets/auto_js/react-is.development.js,sha256=2IRgmaphdMq6wx2MbsmVUQ0UwapGETNjgano3XEkGcc,7932
 dara/core/_assets/auto_js/react-query.development.js,sha256=lI2fTKMvWmjbagGQaVtZYr51_-C_U_so064JwetuDS0,130366
@@ -56,7 +56,7 @@ dara/core/internal/cache_store/lru.py,sha256=6Jd4TmUX1LaEPnOraf8cSnL9Rx-A_LDhjqO
 dara/core/internal/cache_store/ttl.py,sha256=WzSZfdhK-nTf0fwCwtaRbJ-9I-FeTNBXgnZgSvZMbKQ,4966
 dara/core/internal/cgroup.py,sha256=yKCTY8RxyxnNy-Mw4tfzeZew1dL8qw381gHBVE96-OA,3217
 dara/core/internal/custom_response.py,sha256=MM0xEX7kVZWyX943Obl7sic3bxXr6kHGLWe6pc5pcYg,1304
-dara/core/internal/dependency_resolution.py,sha256=6dHMEFfT3Fg9bstZgxSFFJpF13HMNN_rlCdg0ozJF3A,10264
+dara/core/internal/dependency_resolution.py,sha256=SmG-MyfOVrUDRikkLLKWZQ9Zsp70j3qb-tanhm1n3b8,11511
 dara/core/internal/devtools.py,sha256=4LsK7sqES33fAqb53dyH3n0OSWang3W-MiPsmo57aXU,2586
 dara/core/internal/download.py,sha256=wBSUapMY6evZ_sA5ZgvnWhaRtzVMIDIC51mPzFCMWuM,3548
 dara/core/internal/encoder_registry.py,sha256=Q8F5Y2uZVkx7EUtk4MZ99wvPBWaMnPKcFZzK92FYNPw,11159
@@ -76,7 +76,7 @@ dara/core/internal/port_utils.py,sha256=3NN94CubNrIYQKmPM4SEwstY-UMqsbbe1M_JhyPc
 dara/core/internal/registries.py,sha256=j_Z3KqmiNHK3HsYmQI2O23B12MsT31SPvo3ezemASR8,3654
 dara/core/internal/registry.py,sha256=Wqt7tEOmf5bR8D6lFIcLd3W1EtlENT364vRhxSqeOIQ,4356
 dara/core/internal/registry_lookup.py,sha256=XgZ4PL4RLyKWNTXkh08lL6mmU492xgdPUsvFKA6pKDY,2411
-dara/core/internal/routing.py,sha256=C4_GLsXHueQ2Q4VVDgrY9bezr3YGZFdL6Yfs6C81Op8,26458
+dara/core/internal/routing.py,sha256=uqbFtp9Eyc_G3dXVH7NrqT-35Ec3ep-vNw9xlYSnqkE,27832
 dara/core/internal/scheduler.py,sha256=3LYdWAyFp8N1s9Xfud9XYwUbjcHpI-hCay3jZ5zRAiQ,12991
 dara/core/internal/settings.py,sha256=2g-PIoYVLlGoBNKoXTIbkH1FGV8TXUXRdwuhQ6cTrkE,2614
 dara/core/internal/store.py,sha256=aq37Tk4J3DoqzLVHuZRbZFkpghKP-oiCbpQfIE95gCo,6399
@@ -87,7 +87,7 @@ dara/core/jinja/index.html,sha256=O3uyA9Hozwbqh--wQq5IHuLNEFUNf2BykWLGuIZqUjo,30
 dara/core/jinja/index_autojs.html,sha256=ov9qg_ymClTL9BdhZw86jS4UKC5jy5PufIrb9F7sy9w,3009
 dara/core/js_tooling/custom_js_scaffold/index.tsx,sha256=FEzSV5o5Nyzxw6eXvGLi7BkEBkXf3brV34_7ATLnY7o,68
 dara/core/js_tooling/custom_js_scaffold/local-js-component.tsx,sha256=Ojsyeh9MYJnH_XJXGkSc8PAUZIqJcqcGTu_uRITo_88,709
-dara/core/js_tooling/js_utils.py,sha256=eZgt-gidj0yaxbu87cVzslTOCstBOfBouSlH3ouT8XI,29960
+dara/core/js_tooling/js_utils.py,sha256=tQzmnhhrJ57uwCsLgFIftIpidi-8yxZ8xNyiBBAbO5g,29960
 dara/core/js_tooling/statics/favicon.ico,sha256=CJP26erMMIwQB8FFmyhoUJ-Cx1cXEopiVGxFwyxcpo0,47068
 dara/core/js_tooling/statics/tsconfig.json,sha256=ubnFjwvPHbx2F7wVWsU2VHLDeEnnOwXkTIk7hLNY8ZM,446
 dara/core/js_tooling/templates/.npmrc,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -106,13 +106,13 @@ dara/core/persistence.py,sha256=EAEER1T0MHBrtT-iLZ-eXzAsqwu4Klqw5mDlTPSdPkI,1932
 dara/core/router/__init__.py,sha256=yGI_MgLQU37ircCtYVNjnhqCjWQxKd5amoNqvMyrhOs,121
 dara/core/router/compat.py,sha256=B83wq46AwQARTDfZwGrpr0slrnQmi_T7shOUNpqltSM,3112
 dara/core/router/components.py,sha256=Wsf_bBnnN-1EE5jhbjPSOyDv_TVKEsY4royyOQOazM4,6132
-dara/core/router/dependency_graph.py,sha256=A0xGuZWSOCGs7rwHbeZC5vLvZouUt-2fnEX9VM2Ukp0,2280
+dara/core/router/dependency_graph.py,sha256=4N8RVTLi1JD-zOMzgEFJgGemQw08i0ItBSWnRK73HP4,2577
 dara/core/router/router.py,sha256=ys3k48pIjTdbmch5516O4TAeo8IIUPThdqgeoXC-kMQ,32593
 dara/core/visual/__init__.py,sha256=QN0wbG9HPQ_vXh8BO8DnBXeYLIENVTNtRmYzZf1lx7c,577
 dara/core/visual/components/__init__.py,sha256=Jrh38Q4Lc8iFFVKPuEaDeloYHVLohTTHgK92u1e_ZtY,2515
 dara/core/visual/components/dynamic_component.py,sha256=F_UxogMQ9I5GB6BLqDmGaojRQyOOmwJBB5kaIk1iPpI,867
 dara/core/visual/components/fallback.py,sha256=-7lJwqPrm47Xbqs3rYEUw2JXuJRJpd_wYMt7no8uWkE,4746
-dara/core/visual/components/for_cmp.py,sha256=SxUR0KYYHbLYZqPGesfSM-GSzCBL2eXyqYDlYYLkYdQ,6316
+dara/core/visual/components/for_cmp.py,sha256=5w7qRF9C-U3-PbZFfoxpoQJcjoSExoa1E34B43s83_Q,8615
 dara/core/visual/components/invalid_component.py,sha256=Q6O9rAwVUNZXjEmliAKLfWf2lsyYK5JhgQvMM6jVco8,901
 dara/core/visual/components/match_cmp.py,sha256=hwH38azC3DKgg36OKnM5_LFCrOEXtHN3PV9BkCsqwPA,1623
 dara/core/visual/components/menu.py,sha256=_Q_aGrCssOe29WFmRfRFOIOpFDn2HEn2TKF2ll_Ddss,1088
@@ -134,8 +134,8 @@ dara/core/visual/themes/__init__.py,sha256=aM4mgoIYo2neBSw5FRzswsht7PUKjLthiHLmF
 dara/core/visual/themes/dark.py,sha256=QazCRDqh_SCOyQhdwMkH1wbHf301oL7gCFj91plbLww,2020
 dara/core/visual/themes/definitions.py,sha256=dtET2YUlwXkO6gJ23MqSb8gIq-LxJ343CWsgueWSifM,2787
 dara/core/visual/themes/light.py,sha256=dtHb6Q1HOb5r_AvJfe0vZajikVc-GnBEUrGsTcI5MHA,2022
-dara_core-1.23.2a1.dist-info/LICENSE,sha256=r9u1w2RvpLMV6YjuXHIKXRBKzia3fx_roPwboGcLqCc,10944
-dara_core-1.23.2a1.dist-info/METADATA,sha256=X5eVDXyUa0Ikj_AGLfwFOIrMgxyI2NeLL1rvPG-YZB8,7598
-dara_core-1.23.2a1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-dara_core-1.23.2a1.dist-info/entry_points.txt,sha256=nAT9o1kJCmTK1saDh29PFGFD6cbxDDDjTj31HDEDwfU,197
-dara_core-1.23.2a1.dist-info/RECORD,,
+dara_core-1.24.0.dist-info/LICENSE,sha256=r9u1w2RvpLMV6YjuXHIKXRBKzia3fx_roPwboGcLqCc,10944
+dara_core-1.24.0.dist-info/METADATA,sha256=nHHuPBW-sLrRPLWA_OW5N8F2oJOvoYNFJvNgAeeR22o,7523
+dara_core-1.24.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+dara_core-1.24.0.dist-info/entry_points.txt,sha256=nAT9o1kJCmTK1saDh29PFGFD6cbxDDDjTj31HDEDwfU,197
+dara_core-1.24.0.dist-info/RECORD,,