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

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',

dara/core/visual/components/fallback.py

@@ -17,14 +17,14 @@ limitations under the License.
 
 from typing import ClassVar
 
-from dara.core.definitions import BaseFallback, JsComponentDef, StyledComponentInstance
+from dara.core.definitions import BaseFallback, JsComponentDef
 
 DefaultFallbackDef = JsComponentDef(name='DefaultFallback', js_module='@darajs/core', py_module='dara.core')
 RowFallbackDef = JsComponentDef(name='RowFallback', js_module='@darajs/core', py_module='dara.core')
 
 
 class Fallback:
-    class Default(BaseFallback, StyledComponentInstance):
+    class Default(BaseFallback):
         """
         ![FallbackDefault](../../../../../docs/packages/dara-core/assets/FallbackDefault.gif)
 
@@ -49,7 +49,7 @@ class Fallback:
 
         py_component: ClassVar[str] = 'DefaultFallback'
 
-    class Row(BaseFallback, StyledComponentInstance):
+    class Row(BaseFallback):
         """
         ![FallbackRow](../../../../../docs/packages/dara-core/assets/FallbackRow.gif)
 

dara/core/visual/components/invalid_component.py

@@ -15,6 +15,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
+from pydantic import ConfigDict
+
 from dara.core.definitions import ComponentInstance
 
 
@@ -24,6 +26,4 @@ class InvalidComponent(ComponentInstance):
     """
 
     error: str
-
-    class Config:
-        extra = 'forbid'
+    model_config = ConfigDict(extra='forbid')

dara/core/visual/components/menu.py

@@ -17,6 +17,8 @@ limitations under the License.
 
 from typing import List
 
+from pydantic import ConfigDict
+
 from dara.core.definitions import ComponentInstance, JsComponentDef, TemplateRouterLink
 
 MenuDef = JsComponentDef(name='Menu', js_module='@darajs/core', py_module='dara.core')
@@ -24,6 +26,4 @@ MenuDef = JsComponentDef(name='Menu', js_module='@darajs/core', py_module='dara.
 
 class Menu(ComponentInstance):
     routes: List[TemplateRouterLink]
-
-    class Config:
-        extra = 'forbid'
+    model_config = ConfigDict(extra='forbid')

dara/core/visual/components/progress_tracker.py

@@ -15,6 +15,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
+from pydantic import ConfigDict
+
 from dara.core.definitions import ComponentInstance, JsComponentDef
 
 ProgressTrackerDef = JsComponentDef(name='ProgressTracker', js_module='@darajs/core', py_module='dara.core')
@@ -49,5 +51,4 @@ class ProgressTracker(ComponentInstance):
 
     """
 
-    class Config:
-        extra = 'forbid'
+    model_config = ConfigDict(extra='forbid')

dara/core/visual/components/raw_string.py

@@ -15,6 +15,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
+from pydantic import ConfigDict
+
 from dara.core.definitions import ComponentInstance
 
 
@@ -25,6 +27,4 @@ class RawString(ComponentInstance):
     """
 
     content: str
-
-    class Config:
-        extra = 'forbid'
+    model_config = ConfigDict(extra='forbid')

dara/core/visual/components/router_content.py

@@ -17,6 +17,8 @@ limitations under the License.
 
 from typing import List
 
+from pydantic import ConfigDict
+
 from dara.core.definitions import (
     ComponentInstance,
     JsComponentDef,
@@ -28,6 +30,4 @@ RouterContentDef = JsComponentDef(name='RouterContent', js_module='@darajs/core'
 
 class RouterContent(ComponentInstance):
     routes: List[TemplateRouterContent]
-
-    class Config:
-        extra = 'forbid'
+    model_config = ConfigDict(extra='forbid')

dara/core/visual/components/sidebar_frame.py

@@ -17,6 +17,8 @@ limitations under the License.
 
 from typing import Optional
 
+from pydantic import ConfigDict
+
 from dara.core.definitions import ComponentInstance, JsComponentDef
 
 SideBarFrameDef = JsComponentDef(name='SideBarFrame', js_module='@darajs/core', py_module='dara.core')
@@ -32,6 +34,4 @@ class SideBarFrame(ComponentInstance):
     side_bar_padding: Optional[str] = None
     side_bar_position: Optional[str] = None
     side_bar_width: Optional[str] = None
-
-    class Config:
-        extra = 'forbid'
+    model_config = ConfigDict(extra='forbid')

dara/core/visual/components/topbar_frame.py

@@ -17,6 +17,8 @@ limitations under the License.
 
 from typing import Optional
 
+from pydantic import ConfigDict
+
 from dara.core.definitions import ComponentInstance, JsComponentDef
 
 TopBarFrameDef = JsComponentDef(name='TopBarFrame', js_module='@darajs/core', py_module='dara.core')
@@ -32,6 +34,4 @@ class TopBarFrame(ComponentInstance):
     top_bar_padding: Optional[str] = None
     top_bar_position: Optional[str] = None
     top_bar_height: Optional[str] = None
-
-    class Config:
-        extra = 'forbid'
+    model_config = ConfigDict(extra='forbid')

dara/core/visual/css/__init__.py

@@ -24,7 +24,7 @@ from __future__ import annotations
 
 from typing import Literal, Optional, Union
 
-from pydantic import Field
+from pydantic import ConfigDict, Field
 
 from dara.core.base_definitions import DaraBaseModel
 
@@ -7684,8 +7684,4 @@ class CSSProperties(DaraBaseModel):
         default=None,
         description='The non-standard **`zoom`** CSS property can be used to control the magnification level of an element. `transform: scale()` should be used instead of this property, if possible. However, unlike CSS Transforms, `zoom` affects the layout size of the element.\n\n**Syntax**: `normal | reset | <number> | <percentage>`\n\n**Initial value**: `normal`\n\n| Chrome | Firefox | Safari  |  Edge  |   IE    |\n| :----: | :-----: | :-----: | :----: | :-----: |\n| **1**  |   No    | **3.1** | **12** | **5.5** |',
     )
-
-    class Config:
-        extra = 'allow'
-        use_enum_values = True
-        smart_union = True
+    model_config = ConfigDict(extra='allow', use_enum_values=True)

dara/core/visual/dynamic_component.py

@@ -14,9 +14,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 """
-
-from __future__ import annotations
-
 import json
 import uuid
 from contextvars import ContextVar
@@ -59,8 +56,8 @@ CURRENT_COMPONENT_ID = ContextVar('current_component_id', default='')
 
 class PyComponentInstance(ComponentInstance):
     func_name: str
-    dynamic_kwargs: Optional[Mapping[str, AnyVariable]]
-    polling_interval: Optional[int]
+    dynamic_kwargs: Optional[Mapping[str, AnyVariable]] = None
+    polling_interval: Optional[int] = None
     js_module: ClassVar[Optional[str]] = None
 
 
@@ -327,7 +324,7 @@ def _make_render_safe(handler: Callable):
 
             # Handle primitives being returned by just displaying the value as a string
             safe_result = RawString(content=str(result))
-        elif not isinstance(result, ComponentInstance):
+        elif not ComponentInstance.isinstance(result):
             # Otherwise it must be a component instance, return the error for frontend to display
             safe_result = InvalidComponent(
                 error=f'PyComponent "{handler.__name__}" did not return a ComponentInstance, found "{result}"'