dara-core 1.15.6a1__py3-none-any.whl → 1.16.0a1__py3-none-any.whl

dara/core/internal/settings.py

@@ -21,7 +21,7 @@ from secrets import token_hex
 from typing import List, Optional
 
 from dotenv import dotenv_values
-from pydantic import BaseSettings
+from pydantic_settings import BaseSettings, SettingsConfigDict
 
 from dara.core.logging import dev_logger
 
@@ -45,9 +45,7 @@ class Settings(BaseSettings):
     sso_jwt_algo: str = 'ES256'
     sso_verify_audience: bool = False
     sso_extra_audience: Optional[List[str]] = None
-
-    class Config:
-        env_file = '.env'
+    model_config = SettingsConfigDict(env_file='.env')
 
 
 def generate_env_content():

dara/core/internal/store.py

@@ -31,9 +31,6 @@ class Store:
     and resolve at the same time when the value is correctly updated by the first one to request the specific key
     """
 
-    class Config:
-        use_enum_values = True
-
     def __init__(self):
         # This dict is the main store of values, the first level of keys is the cache type and the second level are the
         # value keys. The root key is used for any non-session/user dependant keys that are added.

dara/core/internal/tasks.py

@@ -29,6 +29,7 @@ from anyio import (
 from anyio.abc import TaskGroup
 from anyio.streams.memory import MemoryObjectSendStream
 from exceptiongroup import ExceptionGroup
+from pydantic import ConfigDict
 
 from dara.core.base_definitions import (
     BaseTask,
@@ -58,8 +59,7 @@ class Task(BaseTask):
     Methods for reading from the subprocess and writing to it are also provided.
     """
 
-    class Config:
-        use_enum_values = True
+    model_config = ConfigDict(use_enum_values=True)
 
     def __init__(
         self,

dara/core/internal/websocket.py

@@ -30,12 +30,19 @@ from exceptiongroup import catch
 from fastapi import Query, WebSocketException
 from fastapi.encoders import jsonable_encoder
 from jwt import DecodeError
-from pydantic import BaseModel, Field, parse_obj_as
+from pydantic import (
+    ConfigDict,
+    Field,
+    SerializerFunctionWrapHandler,
+    TypeAdapter,
+    model_serializer,
+)
 from starlette.websockets import WebSocket, WebSocketDisconnect
 
 from dara.core.auth.base import BaseAuthConfig
 from dara.core.auth.definitions import AuthError, TokenData
 from dara.core.auth.utils import decode_token
+from dara.core.base_definitions import DaraBaseModel as BaseModel
 from dara.core.logging import dev_logger, eng_logger
 
 
@@ -47,22 +54,24 @@ class DaraClientMessage(BaseModel):
     An optional chunk_count field can be used to indicate that a message is chunked and what number of messages to expect
     """
 
-    type: Literal['message'] = Field(default='message', const=True)
+    type: Literal['message'] = 'message'
     channel: str
     chunk_count: Optional[int] = None
     message: Any
 
 
 class CustomClientMessagePayload(BaseModel):
+    model_config = ConfigDict(serialize_by_alias=True)
+
     rchan: Optional[str] = Field(default=None, alias='__rchan')
     """Return channel if the message is expected to have a response for"""
 
     kind: str
     data: Any
 
-    def dict(self, *args, **kwargs):
-        # Force by_alias to True to use __rchan name
-        result = super().dict(*args, **{**kwargs, 'by_alias': True})
+    @model_serializer(mode='wrap')
+    def ser_model(self, nxt: SerializerFunctionWrapHandler) -> dict:
+        result = nxt(self)
 
         # remove rchan if None
         if '__rchan' in result and result.get('__rchan') is None:
@@ -76,7 +85,7 @@ class CustomClientMessage(BaseModel):
     Represents a custom message sent by the frontend to the backend.
     """
 
-    type: Literal['custom'] = Field(default='custom', const=True)
+    type: Literal['custom'] = 'custom'
     message: CustomClientMessagePayload
 
 
@@ -85,18 +94,17 @@ ClientMessage = Union[DaraClientMessage, CustomClientMessage]
 
 # Server message types
 class ServerMessagePayload(BaseModel):
+    model_config = ConfigDict(serialize_by_alias=True, extra='allow')
+
     rchan: Optional[str] = Field(default=None, alias='__rchan')
     """Return channel if the message is expected to have a response for"""
 
     response_for: Optional[str] = Field(default=None, alias='__response_for')
     """ID of the __rchan included in the original client message if this message is a response to a client message"""
 
-    class Config:
-        extra = 'allow'
-
-    def dict(self, *args, **kwargs):
-        # Force by_alias to True to use __rchan name
-        result = super().dict(*args, **{**kwargs, 'by_alias': True})
+    @model_serializer(mode='wrap')
+    def ser_model(self, nxt: SerializerFunctionWrapHandler) -> dict:
+        result = nxt(self)
 
         # remove rchan if None
         if '__rchan' in result and result.get('__rchan') is None:
@@ -119,7 +127,7 @@ class DaraServerMessage(BaseModel):
     Represents a message sent by Dara internals from the backend to the frontend.
     """
 
-    type: Literal['message'] = Field(default='message', const=True)
+    type: Literal['message'] = 'message'
     message: ServerMessagePayload  # exact messages expected by frontend are defined in js/api/websocket.tsx
 
 
@@ -128,7 +136,7 @@ class CustomServerMessage(BaseModel):
     Represents a custom message sent by the backend to the frontend.
     """
 
-    type: Literal['custom'] = Field(default='custom', const=True)
+    type: Literal['custom'] = 'custom'
     message: CustomServerMessagePayload
 
 
@@ -165,8 +173,7 @@ class WebSocketHandler:
     notify when the response is received and the response data.
     """
 
-    class Config:
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(arbitrary_types_allowed=True)
 
     def __init__(self, channel_id: str):
         send_stream, receive_stream = create_memory_object_stream[ServerMessage](math.inf)
@@ -334,9 +341,9 @@ class WebsocketManager:
         :param custom: Whether the message is a custom message
         """
         if custom:
-            return CustomServerMessage(message=CustomServerMessagePayload.parse_obj(payload))
+            return CustomServerMessage(message=CustomServerMessagePayload.model_validate(payload))
         else:
-            return DaraServerMessage(message=ServerMessagePayload.parse_obj(payload))
+            return DaraServerMessage(message=ServerMessagePayload.model_validate(payload))
 
     def create_handler(self, channel_id: str) -> WebSocketHandler:
         """
@@ -534,7 +541,7 @@ async def ws_handler(websocket: WebSocket, token: Optional[str] = Query(default=
                                 eng_logger.error('Error updating token data', error=e)
                         else:
                             try:
-                                parsed_data = parse_obj_as(ClientMessage, data)
+                                parsed_data = TypeAdapter(ClientMessage).validate_python(data)
                                 result = handler.process_client_message(parsed_data)
                                 # Process the resulting coroutine before moving on to next message
                                 if inspect.iscoroutine(result):
@@ -547,6 +554,8 @@ async def ws_handler(websocket: WebSocket, token: Optional[str] = Query(default=
                     Handle messages sent to the client and pass them via the websocket
                     """
                     async for message in handler.receive_stream:
+                        # TODO: This is hacky, should probably be a model_serializer
+                        # on a proper payload type
                         if (
                             message.type == 'message'
                             and isinstance(message.message, ServerMessagePayload)
@@ -556,7 +565,7 @@ async def ws_handler(websocket: WebSocket, token: Optional[str] = Query(default=
                             data = message.message
                             # Reconstruct the payload without the result field
                             message.message = ServerMessagePayload(
-                                **{k: v for k, v in data.dict().items() if k != 'result'}
+                                **{k: v for k, v in data.model_dump().items() if k != 'result'}
                             )
                         await websocket.send_json(jsonable_encoder(message))
 

dara/core/js_tooling/js_utils.py

@@ -451,7 +451,7 @@ def rebuild_js(build_cache: BuildCache, build_diff: BuildCacheDiff = BuildCacheD
     # Store the new build cache
     build_cache_path = os.path.join(build_cache.static_files_dir, BuildCache.FILENAME)
     with open(build_cache_path, 'w+', encoding='utf-8') as f:
-        f.write(build_cache.json(indent=2))
+        f.write(build_cache.model_dump_json(indent=2))
 
 
 def bundle_js(build_cache: BuildCache, copy_js: bool = False):

dara/core/main.py

@@ -264,8 +264,8 @@ def _start_application(config: Configuration):
             dev_logger.debug(
                 'Building JS...',
                 extra={
-                    'New build cache': build_cache.dict(),
-                    'Difference from last cache': build_diff.dict(),
+                    'New build cache': build_cache.model_dump(),
+                    'Difference from last cache': build_diff.model_dump(),
                 },
             )
             rebuild_js(build_cache, build_diff)

dara/core/persistence.py

@@ -6,7 +6,14 @@ from uuid import uuid4
 
 import aiorwlock
 import anyio
-from pydantic import BaseModel, Field, PrivateAttr, validator
+from pydantic import (
+    BaseModel,
+    Field,
+    PrivateAttr,
+    SerializerFunctionWrapHandler,
+    field_validator,
+    model_serializer,
+)
 
 from dara.core.auth.definitions import USER
 from dara.core.internal.utils import run_user_handler
@@ -88,7 +95,7 @@ class FileBackend(PersistenceBackend):
     path: str
     _lock: aiorwlock.RWLock = PrivateAttr(default_factory=aiorwlock.RWLock)
 
-    @validator('path', check_fields=True)
+    @field_validator('path', check_fields=True)
     @classmethod
     def validate_path(cls, value):
         if not os.path.splitext(value)[1] == '.json':
@@ -151,8 +158,9 @@ class PersistenceStore(BaseModel, abc.ABC):
         Initialize the store when connecting to a variable
         """
 
-    def dict(self, *args, **kwargs):
-        parent_dict = super().dict(*args, **kwargs)
+    @model_serializer(mode='wrap')
+    def ser_model(self, nxt: SerializerFunctionWrapHandler) -> dict:
+        parent_dict = nxt(self)
         parent_dict['__typename'] = self.__class__.__name__
         return parent_dict
 

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

@@ -11588,7 +11588,7 @@ var __privateWrapper = (obj, member, setter, getter) => ({
     map: map$1$1,
     object: object$1$1,
     optional: optional$1$1,
-    set: set$1$2,
+    set: set$1$1,
     tuple: tuple$1$1,
     writableArray: writableArray$1$1,
     writableDict: writableDict$1$1,
@@ -11651,7 +11651,7 @@ var __privateWrapper = (obj, member, setter, getter) => ({
     dict: dict$1$1,
     object: object$1$1,
     optional: optional$1$1,
-    set: set$1$2,
+    set: set$1$1,
     map: map$1$1,
     writableArray: writableArray$1$1,
     writableDict: writableDict$1$1,
@@ -49604,7 +49604,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
   };
   function createListComponent(_ref2) {
     var _class;
-    var getItemOffset = _ref2.getItemOffset, getEstimatedTotalSize2 = _ref2.getEstimatedTotalSize, getItemSize = _ref2.getItemSize, getOffsetForIndexAndAlignment = _ref2.getOffsetForIndexAndAlignment, getStartIndexForOffset = _ref2.getStartIndexForOffset, getStopIndexForStartIndex = _ref2.getStopIndexForStartIndex, initInstanceProps = _ref2.initInstanceProps, shouldResetStyleCacheOnItemSizeChange = _ref2.shouldResetStyleCacheOnItemSizeChange, validateProps = _ref2.validateProps;
+    var getItemOffset = _ref2.getItemOffset, getEstimatedTotalSize = _ref2.getEstimatedTotalSize, getItemSize = _ref2.getItemSize, getOffsetForIndexAndAlignment = _ref2.getOffsetForIndexAndAlignment, getStartIndexForOffset = _ref2.getStartIndexForOffset, getStopIndexForStartIndex = _ref2.getStopIndexForStartIndex, initInstanceProps = _ref2.initInstanceProps, shouldResetStyleCacheOnItemSizeChange = _ref2.shouldResetStyleCacheOnItemSizeChange, validateProps = _ref2.validateProps;
     return _class = /* @__PURE__ */ function(_PureComponent) {
       _inheritsLoose$1(List2, _PureComponent);
       function List2(props) {
@@ -49832,7 +49832,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
             }));
           }
         }
-        var estimatedTotalSize = getEstimatedTotalSize2(this.props, this._instanceProps);
+        var estimatedTotalSize = getEstimatedTotalSize(this.props, this._instanceProps);
         return React.createElement(outerElementType || outerTagName || "div", {
           className,
           onScroll,
@@ -49900,161 +49900,6 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     _ref2.width;
     _ref3.instance;
   };
-  var DEFAULT_ESTIMATED_ITEM_SIZE$1 = 50;
-  var getItemMetadata$1 = function getItemMetadata(props, index2, instanceProps) {
-    var _ref2 = props, itemSize = _ref2.itemSize;
-    var itemMetadataMap = instanceProps.itemMetadataMap, lastMeasuredIndex = instanceProps.lastMeasuredIndex;
-    if (index2 > lastMeasuredIndex) {
-      var offset2 = 0;
-      if (lastMeasuredIndex >= 0) {
-        var itemMetadata = itemMetadataMap[lastMeasuredIndex];
-        offset2 = itemMetadata.offset + itemMetadata.size;
-      }
-      for (var i2 = lastMeasuredIndex + 1; i2 <= index2; i2++) {
-        var size2 = itemSize(i2);
-        itemMetadataMap[i2] = {
-          offset: offset2,
-          size: size2
-        };
-        offset2 += size2;
-      }
-      instanceProps.lastMeasuredIndex = index2;
-    }
-    return itemMetadataMap[index2];
-  };
-  var findNearestItem$1 = function findNearestItem(props, instanceProps, offset2) {
-    var itemMetadataMap = instanceProps.itemMetadataMap, lastMeasuredIndex = instanceProps.lastMeasuredIndex;
-    var lastMeasuredItemOffset = lastMeasuredIndex > 0 ? itemMetadataMap[lastMeasuredIndex].offset : 0;
-    if (lastMeasuredItemOffset >= offset2) {
-      return findNearestItemBinarySearch$1(props, instanceProps, lastMeasuredIndex, 0, offset2);
-    } else {
-      return findNearestItemExponentialSearch$1(props, instanceProps, Math.max(0, lastMeasuredIndex), offset2);
-    }
-  };
-  var findNearestItemBinarySearch$1 = function findNearestItemBinarySearch(props, instanceProps, high, low, offset2) {
-    while (low <= high) {
-      var middle = low + Math.floor((high - low) / 2);
-      var currentOffset = getItemMetadata$1(props, middle, instanceProps).offset;
-      if (currentOffset === offset2) {
-        return middle;
-      } else if (currentOffset < offset2) {
-        low = middle + 1;
-      } else if (currentOffset > offset2) {
-        high = middle - 1;
-      }
-    }
-    if (low > 0) {
-      return low - 1;
-    } else {
-      return 0;
-    }
-  };
-  var findNearestItemExponentialSearch$1 = function findNearestItemExponentialSearch(props, instanceProps, index2, offset2) {
-    var itemCount = props.itemCount;
-    var interval = 1;
-    while (index2 < itemCount && getItemMetadata$1(props, index2, instanceProps).offset < offset2) {
-      index2 += interval;
-      interval *= 2;
-    }
-    return findNearestItemBinarySearch$1(props, instanceProps, Math.min(index2, itemCount - 1), Math.floor(index2 / 2), offset2);
-  };
-  var getEstimatedTotalSize = function getEstimatedTotalSize2(_ref2, _ref3) {
-    var itemCount = _ref2.itemCount;
-    var itemMetadataMap = _ref3.itemMetadataMap, estimatedItemSize = _ref3.estimatedItemSize, lastMeasuredIndex = _ref3.lastMeasuredIndex;
-    var totalSizeOfMeasuredItems = 0;
-    if (lastMeasuredIndex >= itemCount) {
-      lastMeasuredIndex = itemCount - 1;
-    }
-    if (lastMeasuredIndex >= 0) {
-      var itemMetadata = itemMetadataMap[lastMeasuredIndex];
-      totalSizeOfMeasuredItems = itemMetadata.offset + itemMetadata.size;
-    }
-    var numUnmeasuredItems = itemCount - lastMeasuredIndex - 1;
-    var totalSizeOfUnmeasuredItems = numUnmeasuredItems * estimatedItemSize;
-    return totalSizeOfMeasuredItems + totalSizeOfUnmeasuredItems;
-  };
-  var VariableSizeList = /* @__PURE__ */ createListComponent({
-    getItemOffset: function getItemOffset(props, index2, instanceProps) {
-      return getItemMetadata$1(props, index2, instanceProps).offset;
-    },
-    getItemSize: function getItemSize(props, index2, instanceProps) {
-      return instanceProps.itemMetadataMap[index2].size;
-    },
-    getEstimatedTotalSize,
-    getOffsetForIndexAndAlignment: function getOffsetForIndexAndAlignment(props, index2, align, scrollOffset, instanceProps, scrollbarSize) {
-      var direction = props.direction, height = props.height, layout = props.layout, width = props.width;
-      var isHorizontal = direction === "horizontal" || layout === "horizontal";
-      var size2 = isHorizontal ? width : height;
-      var itemMetadata = getItemMetadata$1(props, index2, instanceProps);
-      var estimatedTotalSize = getEstimatedTotalSize(props, instanceProps);
-      var maxOffset = Math.max(0, Math.min(estimatedTotalSize - size2, itemMetadata.offset));
-      var minOffset = Math.max(0, itemMetadata.offset - size2 + itemMetadata.size + scrollbarSize);
-      if (align === "smart") {
-        if (scrollOffset >= minOffset - size2 && scrollOffset <= maxOffset + size2) {
-          align = "auto";
-        } else {
-          align = "center";
-        }
-      }
-      switch (align) {
-        case "start":
-          return maxOffset;
-        case "end":
-          return minOffset;
-        case "center":
-          return Math.round(minOffset + (maxOffset - minOffset) / 2);
-        case "auto":
-        default:
-          if (scrollOffset >= minOffset && scrollOffset <= maxOffset) {
-            return scrollOffset;
-          } else if (scrollOffset < minOffset) {
-            return minOffset;
-          } else {
-            return maxOffset;
-          }
-      }
-    },
-    getStartIndexForOffset: function getStartIndexForOffset(props, offset2, instanceProps) {
-      return findNearestItem$1(props, instanceProps, offset2);
-    },
-    getStopIndexForStartIndex: function getStopIndexForStartIndex(props, startIndex, scrollOffset, instanceProps) {
-      var direction = props.direction, height = props.height, itemCount = props.itemCount, layout = props.layout, width = props.width;
-      var isHorizontal = direction === "horizontal" || layout === "horizontal";
-      var size2 = isHorizontal ? width : height;
-      var itemMetadata = getItemMetadata$1(props, startIndex, instanceProps);
-      var maxOffset = scrollOffset + size2;
-      var offset2 = itemMetadata.offset + itemMetadata.size;
-      var stopIndex = startIndex;
-      while (stopIndex < itemCount - 1 && offset2 < maxOffset) {
-        stopIndex++;
-        offset2 += getItemMetadata$1(props, stopIndex, instanceProps).size;
-      }
-      return stopIndex;
-    },
-    initInstanceProps: function initInstanceProps(props, instance) {
-      var _ref4 = props, estimatedItemSize = _ref4.estimatedItemSize;
-      var instanceProps = {
-        itemMetadataMap: {},
-        estimatedItemSize: estimatedItemSize || DEFAULT_ESTIMATED_ITEM_SIZE$1,
-        lastMeasuredIndex: -1
-      };
-      instance.resetAfterIndex = function(index2, shouldForceUpdate) {
-        if (shouldForceUpdate === void 0) {
-          shouldForceUpdate = true;
-        }
-        instanceProps.lastMeasuredIndex = Math.min(instanceProps.lastMeasuredIndex, index2 - 1);
-        instance._getItemStyleCache(-1);
-        if (shouldForceUpdate) {
-          instance.forceUpdate();
-        }
-      };
-      return instanceProps;
-    },
-    shouldResetStyleCacheOnItemSizeChange: false,
-    validateProps: function validateProps(_ref5) {
-      _ref5.itemSize;
-    }
-  });
   var FixedSizeList = /* @__PURE__ */ createListComponent({
     getItemOffset: function getItemOffset(_ref2, index2) {
       var itemSize = _ref2.itemSize;
@@ -50064,7 +49909,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
       var itemSize = _ref2.itemSize;
       return itemSize;
     },
-    getEstimatedTotalSize: function getEstimatedTotalSize2(_ref3) {
+    getEstimatedTotalSize: function getEstimatedTotalSize(_ref3) {
       var itemCount = _ref3.itemCount, itemSize = _ref3.itemSize;
       return itemSize * itemCount;
     },
@@ -54634,7 +54479,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
   }
   var _assignValue = assignValue$3;
   var assignValue$2 = _assignValue, castPath$1 = _castPath, isIndex = _isIndex, isObject$2 = isObject_1, toKey = _toKey;
-  function baseSet$2(object2, path, value, customizer) {
+  function baseSet$1(object2, path, value, customizer) {
     if (!isObject$2(object2)) {
       return object2;
     }
@@ -54657,14 +54502,14 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     }
     return object2;
   }
-  var _baseSet = baseSet$2;
-  var baseGet = _baseGet, baseSet$1 = _baseSet, castPath = _castPath;
+  var _baseSet = baseSet$1;
+  var baseGet = _baseGet, baseSet = _baseSet, castPath = _castPath;
   function basePickBy$1(object2, paths, predicate) {
     var index2 = -1, length = paths.length, result = {};
     while (++index2 < length) {
       var path = paths[index2], value = baseGet(object2, path);
       if (predicate(value, path)) {
-        baseSet$1(result, castPath(path, object2), value);
+        baseSet(result, castPath(path, object2), value);
       }
     }
     return result;
@@ -56703,7 +56548,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
       return success$1(out, warnings);
     };
   }
-  function set$1(checker) {
+  function set(checker) {
     return (value, path = new Path$1()) => {
       if (!(value instanceof Set)) {
         return failure$1("value is not a Set", path);
@@ -56773,7 +56618,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     object,
     optional,
     dict,
-    set: set$1,
+    set,
     map,
     writableArray,
     writableDict,
@@ -57055,7 +56900,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     map: map$1,
     object: object$1,
     optional: optional$1,
-    set: set$1$1,
+    set: set$1,
     tuple: tuple$1,
     writableArray: writableArray$1,
     writableDict: writableDict$1,
@@ -57116,7 +56961,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     dict: dict$1,
     object: object$1,
     optional: optional$1,
-    set: set$1$1,
+    set: set$1,
     map: map$1,
     writableArray: writableArray$1,
     writableDict: writableDict$1,
@@ -58825,50 +58670,6 @@ Inferred class string: "${iconClasses}."`
       serialize: urlSerializer
     };
   }
-  var baseSet = _baseSet;
-  function set(object2, path, value) {
-    return object2 == null ? object2 : baseSet(object2, path, value);
-  }
-  var set_1 = set;
-  function isTemplateMarker(value) {
-    return value && typeof value === "object" && value.__typename === "TemplateMarker";
-  }
-  function hasTemplateMarkers(component) {
-    if (!component || typeof component !== "object") {
-      return false;
-    }
-    for (const value of Object.values(component)) {
-      if (isTemplateMarker(value)) {
-        return true;
-      }
-      if (value && typeof value === "object") {
-        return hasTemplateMarkers(value);
-      }
-    }
-    return false;
-  }
-  function getMarkerPaths(template) {
-    const paths = {};
-    function recurse(component, path) {
-      for (const [key, value] of Object.entries(component)) {
-        if (isTemplateMarker(value)) {
-          paths[path + key] = value.field_name;
-        } else if (value instanceof Object) {
-          recurse(value, `${path + key}.`);
-        }
-      }
-    }
-    recurse(template, "");
-    return paths;
-  }
-  function replaceMarkers(template, data, paths) {
-    const templateCopy = cloneDeep_1(template);
-    for (const [path, fieldName] of Object.entries(paths)) {
-      const value = data[fieldName];
-      set_1(templateCopy, path, value);
-    }
-    return templateCopy;
-  }
   const Wrapper$2 = styled__default.default.div`
     display: flex;
     align-items: center;
@@ -59854,15 +59655,6 @@ Inferred class string: "${iconClasses}."`
     const { get: getComponent } = useComponentRegistry();
     const importers = React.useContext(importersCtx);
     const fallbackCtx$1 = React.useContext(fallbackCtx);
-    const firstRender = React.useRef(true);
-    if (firstRender.current) {
-      if (hasTemplateMarkers(props.component)) {
-        throw new Error(
-          `Component "${props.component.name}" has unhandled template markers. Make sure it's used in a component which handles templated components`
-        );
-      }
-      firstRender.current = false;
-    }
     React.useEffect(() => {
       var _a2;
       if (((_a2 = props.component) == null ? void 0 : _a2.name) === "RawString") {
@@ -86441,61 +86233,6 @@ Inferred class string: "${iconClasses}."`
     const [style, css2] = useComponentStyles(props);
     return /* @__PURE__ */ React__default.default.createElement(StyledDots, { $rawCss: css2, style });
   }
-  function ForChild(props) {
-    const component = React.useMemo(() => {
-      const withoutMarkers = replaceMarkers(props.template, props.data, props.markerPaths);
-      withoutMarkers.props.style = props.style;
-      return withoutMarkers;
-    }, [props.template, props.data]);
-    return /* @__PURE__ */ React__default.default.createElement(DynamicComponent, { component });
-  }
-  function For(props) {
-    const data = useAnyVariable(props.data);
-    const markerPaths = React.useMemo(() => getMarkerPaths(props.template), [props.template]);
-    const ListChild = React.useCallback(
-      (listProps) => {
-        return /* @__PURE__ */ React__default.default.createElement(
-          ForChild,
-          {
-            data: listProps.data[listProps.index],
-            key: listProps.data[listProps.index][props.key_accessor],
-            markerPaths,
-            style: listProps.style,
-            template: props.template
-          }
-        );
-      },
-      [markerPaths, props.key_accessor]
-    );
-    const getItemSize = React.useCallback(
-      (index2) => {
-        return data[index2][props.size_accessor];
-      },
-      [data, props.size_accessor]
-    );
-    const getItemKey = React.useCallback(
-      (index2, listData) => {
-        return listData[index2][props.key_accessor];
-      },
-      [props.key_accessor]
-    );
-    if (!props.virtualize) {
-      return /* @__PURE__ */ React__default.default.createElement(React__default.default.Fragment, null, data.map((item, index2) => /* @__PURE__ */ React__default.default.createElement(ListChild, { data, index: index2, key: item[props.key_accessor], style: {} })));
-    }
-    return /* @__PURE__ */ React__default.default.createElement(AutoSizer, null, ({ height, width }) => /* @__PURE__ */ React__default.default.createElement(
-      VariableSizeList,
-      {
-        height,
-        itemCount: data.length,
-        itemData: data,
-        itemKey: getItemKey,
-        itemSize: getItemSize,
-        layout: props.direction,
-        width
-      },
-      ListChild
-    ));
-  }
   exports.BasicAuthLogin = BasicAuthLogin;
   exports.BasicAuthLogout = BasicAuthLogout;
   exports.Center = Center;
@@ -86508,7 +86245,6 @@ Inferred class string: "${iconClasses}."`
   exports.DynamicComponent = DynamicComponent;
   exports.EventBus = EventBus;
   exports.EventCapturer = EventCapturer;
-  exports.For = For;
   exports.Menu = Menu;
   exports.NavigateTo = NavigateTo;
   exports.Notifications = index$1;

dara/core/visual/components/__init__.py

@@ -23,7 +23,6 @@ from dara.core.visual.components.fallback import (
     Fallback,
     RowFallbackDef,
 )
-from dara.core.visual.components.for_cmp import For, ForDef
 from dara.core.visual.components.invalid_component import InvalidComponent
 from dara.core.visual.components.menu import Menu, MenuDef
 from dara.core.visual.components.progress_tracker import (
@@ -50,8 +49,6 @@ __all__ = [
     'SideBarFrameDef',
     'TopBarFrame',
     'TopBarFrameDef',
-    'For',
-    'ForDef',
     'DefaultFallbackDef',
     'RowFallbackDef',
     'Fallback',