dara-core 1.20.0__py3-none-any.whl → 1.20.1a1__py3-none-any.whl

dara/core/__init__.py

@@ -14,8 +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.
 """
-# ruff: noqa: F403, F405
-
 from importlib.metadata import version
 
 from pydantic import BaseModel
@@ -41,7 +39,6 @@ __all__ = [
     'DerivedVariable',
     'DerivedDataVariable',
     'DataVariable',
-    'ServerVariable',
     'UrlVariable',
     'Cache',
     'CacheType',

dara/core/actions.py

@@ -16,7 +16,8 @@ limitations under the License.
 """
 
 # Re-export actions so users can import from dara.core.actions instead of dara_core.interactivity
-from dara.core.interactivity import (  # noqa: F401
+# pylint: disable=unused-import
+from dara.core.interactivity import (
     DownloadContent,
     DownloadContentImpl,
     DownloadVariable,

dara/core/auth/basic.py

@@ -25,6 +25,7 @@ from dara.core.auth.definitions import (
     EXPIRED_TOKEN_ERROR,
     INVALID_CREDENTIALS_ERROR,
     INVALID_TOKEN_ERROR,
+    JWT_ALGO,
     SESSION_ID,
     USER,
     AuthError,
@@ -34,6 +35,7 @@ from dara.core.auth.definitions import (
     UserData,
 )
 from dara.core.auth.utils import decode_token, sign_jwt
+from dara.core.internal.settings import get_settings
 
 DefaultAuthLogin = AuthComponent(js_module='@darajs/core', py_module='dara.core', js_name='DefaultAuthLogin')
 
@@ -67,7 +69,7 @@ class BaseBasicAuthConfig(BaseAuthConfig):
 
         return {
             'token': sign_jwt(
-                identity_id=body.username,
+                identity_id=None,
                 identity_name=body.username,
                 identity_email=None,
                 groups=[],
@@ -85,15 +87,14 @@ class BaseBasicAuthConfig(BaseAuthConfig):
             SESSION_ID.set(decoded.session_id)
             USER.set(
                 UserData(
-                    identity_id=decoded.identity_name,
                     identity_name=decoded.identity_name,
                 )
             )
             return decoded
-        except jwt.ExpiredSignatureError as e:
-            raise AuthError(EXPIRED_TOKEN_ERROR, 401) from e
-        except jwt.DecodeError as e:
-            raise AuthError(INVALID_TOKEN_ERROR, 401) from e
+        except jwt.ExpiredSignatureError:
+            raise AuthError(EXPIRED_TOKEN_ERROR, 401)
+        except jwt.DecodeError:
+            raise AuthError(INVALID_TOKEN_ERROR, 401)
 
 
 class BasicAuthConfig(BaseBasicAuthConfig):
@@ -120,13 +121,13 @@ class DefaultAuthConfig(BaseAuthConfig):
         logout=BasicAuthLogout,
     )
 
-    def get_token(self, body: SessionRequestBody) -> TokenResponse:
+    def get_token(self, _: SessionRequestBody) -> TokenResponse:
         """
         Get a session token.
 
         In default auth a new token is returned every time.
         """
-        token = sign_jwt(identity_id='user', identity_name='user', identity_email=None, groups=[])
+        token = sign_jwt(identity_id=None, identity_name='user', identity_email=None, groups=[])
         return {'token': token}
 
     def verify_token(self, token: str) -> TokenData:
@@ -138,17 +139,10 @@ class DefaultAuthConfig(BaseAuthConfig):
         :param token: the token to verify
         """
         try:
-            decoded = decode_token(token)
-            SESSION_ID.set(decoded.session_id)
-            # Implicit auth assumes used by one user so all users are the same
-            USER.set(
-                UserData(
-                    identity_id=decoded.identity_id,
-                    identity_name=decoded.identity_id,
-                )
-            )
-            return decoded
-        except jwt.ExpiredSignatureError as e:
-            raise AuthError(EXPIRED_TOKEN_ERROR, 401) from e
-        except jwt.DecodeError as e:
-            raise AuthError(INVALID_TOKEN_ERROR, 401) from e
+            decoded = jwt.decode(token, get_settings().jwt_secret, algorithms=[JWT_ALGO])
+            SESSION_ID.set(decoded.get('session_id'))
+            return TokenData.parse_obj(decoded)
+        except jwt.ExpiredSignatureError:
+            raise AuthError(EXPIRED_TOKEN_ERROR, 401)
+        except jwt.DecodeError:
+            raise AuthError(INVALID_TOKEN_ERROR, 401)

dara/core/auth/definitions.py

@@ -39,7 +39,7 @@ class TokenData(BaseModel):
 
     session_id: str
     exp: Union[float, int, datetime]
-    identity_id: str
+    identity_id: Optional[str] = None
     identity_name: str
     identity_email: Optional[str] = None
     id_token: Optional[str] = None
@@ -56,7 +56,7 @@ class UserData(BaseModel):
     :param groups: list of groups user belongs to
     """
 
-    identity_id: str
+    identity_id: Optional[str] = None
     identity_name: str
     identity_email: Optional[str] = None
     groups: Optional[List[str]] = []

dara/core/auth/routes.py

@@ -75,13 +75,13 @@ async def verify_session(
             return SESSION_ID.get()
         except jwt.ExpiredSignatureError as e:
             dev_logger.error('Expired Token Signature', error=e)
-            raise HTTPException(status_code=401, detail=EXPIRED_TOKEN_ERROR) from e
+            raise HTTPException(status_code=401, detail=EXPIRED_TOKEN_ERROR)
         except jwt.PyJWTError as e:
             dev_logger.error('Invalid Token', error=e)
-            raise HTTPException(status_code=401, detail=INVALID_TOKEN_ERROR) from e
+            raise HTTPException(status_code=401, detail=INVALID_TOKEN_ERROR)
         except AuthError as err:
             dev_logger.error('Auth Error', error=err)
-            raise HTTPException(status_code=err.code, detail=err.detail) from err
+            raise HTTPException(status_code=err.code, detail=err.detail)
     raise HTTPException(status_code=400, detail=BAD_REQUEST_ERROR('No auth credentials passed'))
 
 
@@ -162,11 +162,11 @@ async def handle_refresh_token(
         # Explicitly handle expired signature error
         if isinstance(e, jwt.ExpiredSignatureError):
             dev_logger.error('Expired Token Signature', error=e)
-            raise HTTPException(status_code=401, detail=EXPIRED_TOKEN_ERROR, headers=headers) from e
+            raise HTTPException(status_code=401, detail=EXPIRED_TOKEN_ERROR, headers=headers)
 
         # Otherwise show a generic invalid token error
         dev_logger.error('Invalid Token', error=cast(Exception, e))
-        raise HTTPException(status_code=401, detail=INVALID_TOKEN_ERROR, headers=headers) from e
+        raise HTTPException(status_code=401, detail=INVALID_TOKEN_ERROR, headers=headers)
 
 
 # Request to retrieve a session token from the backend. The app does this on startup.

dara/core/auth/utils.py

@@ -44,14 +44,14 @@ def decode_token(token: str, **kwargs) -> TokenData:
     """
     try:
         return TokenData.parse_obj(jwt.decode(token, get_settings().jwt_secret, algorithms=[JWT_ALGO], **kwargs))
-    except jwt.ExpiredSignatureError as e:
-        raise AuthError(code=401, detail=EXPIRED_TOKEN_ERROR) from e
-    except jwt.DecodeError as e:
-        raise AuthError(code=401, detail=INVALID_TOKEN_ERROR) from e
+    except jwt.ExpiredSignatureError:
+        raise AuthError(code=401, detail=EXPIRED_TOKEN_ERROR)
+    except jwt.DecodeError:
+        raise AuthError(code=401, detail=INVALID_TOKEN_ERROR)
 
 
 def sign_jwt(
-    identity_id: str,
+    identity_id: Optional[str],
     identity_name: str,
     identity_email: Optional[str],
     groups: List[str],

dara/core/base_definitions.py

@@ -21,16 +21,17 @@ from __future__ import annotations
 # between other parts of the framework
 import abc
 import uuid
-from collections.abc import Awaitable, Mapping
 from enum import Enum
 from typing import (
     TYPE_CHECKING,
     Annotated,
     Any,
+    Awaitable,
     Callable,
     ClassVar,
     Dict,
     List,
+    Mapping,
     Optional,
     Tuple,
     Union,
@@ -66,7 +67,7 @@ def annotation_has_base_model(typ: Any) -> bool:
         type_args = get_args(typ)
         if len(type_args) > 0:
             return any(annotation_has_base_model(arg) for arg in type_args)
-    except:  # noqa: E722
+    except:   # pylint: disable=bare-except
         # canot get arguments, should be a simple type
         pass
 
@@ -78,7 +79,9 @@ def annotation_has_base_model(typ: Any) -> bool:
 # It works by adding SerializeAsAny to all fields of the model.
 # See https://github.com/pydantic/pydantic/issues/6381
 class SerializeAsAnyMeta(ModelMetaclass):
-    def __new__(cls, name: str, bases: Tuple[type], namespaces: Dict[str, Any], **kwargs):
+    def __new__(
+        self, name: str, bases: Tuple[type], namespaces: Dict[str, Any], **kwargs
+    ):   # pylint: disable=bad-mcs-classmethod-argument
         annotations: dict = namespaces.get('__annotations__', {}).copy()
 
         for base in bases:
@@ -94,11 +97,11 @@ class SerializeAsAnyMeta(ModelMetaclass):
                 if isinstance(annotation, str) or annotation is ClassVar:
                     continue
                 if annotation_has_base_model(annotation):
-                    annotations[field] = SerializeAsAny[annotation]  # type: ignore
+                    annotations[field] = SerializeAsAny[annotation]   # type: ignore
 
         namespaces['__annotations__'] = annotations
 
-        return super().__new__(cls, name, bases, namespaces, **kwargs)
+        return super().__new__(self, name, bases, namespaces, **kwargs)
 
 
 class DaraBaseModel(BaseModel, metaclass=SerializeAsAnyMeta):
@@ -132,17 +135,16 @@ class DaraBaseModel(BaseModel, metaclass=SerializeAsAnyMeta):
                 and annotation_has_base_model(field_info.annotation)
             ):
                 # Skip if it has metadata that is already annotated with SerializeAsAny
-                if any(isinstance(x, SerializeAsAny) for x in field_info.metadata):  # type: ignore
+                if any(isinstance(x, SerializeAsAny) for x in field_info.metadata):   # type: ignore
                     continue
                 # Skip if the type is already annotated with SerializeAsAny
                 if get_origin(field_info.annotation) is Annotated and any(
-                    isinstance(arg, SerializeAsAny)  # pyright: ignore[reportArgumentType]
-                    for arg in field_info.annotation.__metadata__  # type: ignore
+                    isinstance(arg, SerializeAsAny) for arg in field_info.annotation.__metadata__  # type: ignore
                 ):
                     continue
 
-                field_info.annotation = SerializeAsAny[field_info.annotation]  # type: ignore
-                field_info.metadata = list(field_info.annotation.__metadata__)  # type: ignore
+                field_info.annotation = SerializeAsAny[field_info.annotation]   # type: ignore
+                field_info.metadata = list(field_info.annotation.__metadata__)   # type: ignore
 
         # Rebuild again with force to ensure we rebuild the schema with new annotations
         return super().model_rebuild(
@@ -253,8 +255,10 @@ class Cache:
             if isinstance(arg, Cache.Type):
                 return LruCachePolicy(cache_type=arg)
 
-            if isinstance(arg, str) and (typ := Cache.Type.get_member(arg)):
-                return LruCachePolicy(cache_type=typ)
+            if isinstance(arg, str):
+                # Check that the string is one of allowed cache members
+                if typ := Cache.Type.get_member(arg):
+                    return LruCachePolicy(cache_type=typ)
 
             raise ValueError(
                 f'Invalid cache argument: {arg}. Please provide a Cache.Policy object or one of Cache.Type members'
@@ -304,12 +308,6 @@ class CachedRegistryEntry(BaseModel):
         return f'{self.__class__.__name__}(cache={self.cache}, uid={self.uid})'
 
 
-class NonTabularDataError(Exception):
-    """
-    Raised when trying to interpret a non-tabular variable as tabular
-    """
-
-
 class BaseTaskMessage(BaseModel):
     task_id: str
 
@@ -351,10 +349,12 @@ class BaseTask(abc.ABC):
         super().__init__()
 
     @abc.abstractmethod
-    async def run(self, send_stream: Optional[MemoryObjectSendStream[TaskMessage]] = None) -> Any: ...
+    async def run(self, send_stream: Optional[MemoryObjectSendStream[TaskMessage]] = None) -> Any:
+        ...
 
     @abc.abstractmethod
-    async def cancel(self): ...
+    async def cancel(self):
+        ...
 
 
 class PendingTask(BaseTask):
@@ -413,7 +413,7 @@ class PendingTask(BaseTask):
             self.cancel_scope.cancel()
         await self.task_def.cancel()
 
-        self.error = anyio.get_cancelled_exc_class()()
+        self.error = Exception('Task was cancelled')
         self.event.set()
 
     def add_subscriber(self):
@@ -438,6 +438,47 @@ class PendingTask(BaseTask):
         return self.result
 
 
+class PendingValue:
+    """
+    An internal class that's used to represent a pending value. Holds a future object that can be awaited by
+    multiple consumers.
+    """
+
+    def __init__(self):
+        self.event = anyio.Event()
+        self._value = None
+        self._error = None
+
+    async def wait(self):
+        """
+        Wait for the underlying event to be set
+        """
+        # Waiting in chunks as otherwise Jupyter blocks the event loop
+        while not self.event.is_set():
+            await anyio.sleep(0.01)
+        if self._error:
+            raise self._error
+        return self._value
+
+    def resolve(self, value: Any):
+        """
+        Resolve the pending state and send values to the waiting code
+
+        :param value: the value to resolve as the result
+        """
+        self._value = value
+        self.event.set()
+
+    def error(self, exc: Exception):
+        """
+        Resolve the pending state with an error and send it to the waiting code
+
+        :param exc: exception to resolve as the result
+        """
+        self._error = exc
+        self.event.set()
+
+
 class AnnotatedAction(BaseModel):
     """
     Represents a single call to an @action-annotated action.
@@ -463,11 +504,12 @@ class AnnotatedAction(BaseModel):
     dynamic_kwargs: Mapping[str, Any]
     """Dynamic kwargs of the action; uid -> variable instance"""
 
-    loading: Variable  # type: ignore # noqa: F821
+    loading: 'Variable'   # type: ignore
     """Loading Variable instance"""
 
     def __init__(self, **data):
         # Resolve the circular dependency to add a loading Variable to the model upon creation
+        # pylint: disable-next=import-error, import-outside-toplevel
         from dara.core.interactivity.plain_variable import Variable
 
         self.model_rebuild()

dara/core/cli.py

@@ -21,10 +21,10 @@ import pathlib
 import subprocess
 from typing import List, Optional
 
-import uvicorn
-
 import click
+import uvicorn
 from click.exceptions import UsageError
+
 from dara.core.internal.port_utils import find_available_port
 from dara.core.internal.settings import generate_env_file
 from dara.core.internal.utils import find_module_path
@@ -52,7 +52,7 @@ def cli():
 @click.option('--port', help='The port to run on', type=int)
 @click.option('--metrics-port', help='The port for the metrics server to run on', type=int)
 @click.option('--disable-metrics', is_flag=True, help='Whether to disable the metrics server')
-@click.option('--host', default='0.0.0.0', help='The host to run on')  # nosec B104 # default for local dev
+@click.option('--host', default='0.0.0.0', help='The host to run on')   # nosec B104 # default for local dev
 @click.option('--rebuild', is_flag=True, help='Whether to force a rebuild of the app')
 @click.option('--require-sso', is_flag=True, help='Whether to enforce that an SSO auth config is used')
 @click.option('--docker', is_flag=True, help='Whether to run in Docker mode - assumes assets are prebuilt')
@@ -214,11 +214,10 @@ def dev():
         stderr=subprocess.STDOUT,
         shell=True,
     ) as vite_process:
-        if vite_process.stdout is not None:
-            for line in vite_process.stdout:
-                decoded_line = line.decode('utf-8').strip()
-                if decoded_line != '':
-                    print(decoded_line)
+        for line in vite_process.stdout:
+            decoded_line = line.decode('utf-8').strip()
+            if decoded_line != '':
+                print(decoded_line)   # pylint: disable=bad-builtin
 
 
 @cli.command()

dara/core/configuration.py

@@ -14,7 +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.
 """
-
 import os
 import pathlib
 from inspect import isclass, isfunction
@@ -387,7 +386,7 @@ class ConfigurationBuilder:
         icon: Optional[str] = None,
         route: Optional[str] = None,
         include_in_menu: Optional[bool] = True,
-        reset_vars_on_load: Optional[List[AnyVariable]] = None,
+        reset_vars_on_load: Optional[List[AnyVariable]] = [],
         on_load: Optional[Action] = None,
     ):
         """
@@ -403,8 +402,6 @@ class ConfigurationBuilder:
         :param on_load: optional action to execute upon visiting the page
         """
         # Backwards compatibility - deprecated
-        if reset_vars_on_load is None:
-            reset_vars_on_load = []
         if reset_vars_on_load is not None and len(reset_vars_on_load) > 0:
             if on_load is not None:
                 raise ValueError('reset_vars_on_load and on_load cannot be used together')
@@ -488,7 +485,7 @@ class ConfigurationBuilder:
             if len(options) > 0:
                 dev_logger.warning(f'Options provided for a function middleware {middleware}, but they will be ignored')
         elif isclass(middleware):
-            constructed_middleware = Middleware(middleware, **options)  # type: ignore
+            constructed_middleware = Middleware(middleware, **options)   # type: ignore
         else:
             raise ValueError(f'Invalid middleware type: {type(middleware)}')
 

dara/core/css.py

@@ -18,7 +18,8 @@ limitations under the License.
 from typing import Literal, Optional
 
 # Re-export CSSProperties for easier importing
-from dara.core.visual.css import CSSProperties  # noqa: F401
+# pylint: disable=unused-import
+from dara.core.visual.css import CSSProperties
 
 IconStyle = Literal['solid', 'regular', 'brands']
 IconSize = Literal['1x', '2x', '3x', '4x', '5x', '6x', '7x', '8x', '9x', '10x', '2xs', 'xs', 'sm', 'lg', 'xl', '2xl']

dara/core/data_utils.py

@@ -25,9 +25,10 @@ from pandas import DataFrame
 from dara.core.base_definitions import CacheType
 from dara.core.base_definitions import DaraBaseModel as BaseModel
 from dara.core.interactivity import (
-    ClientVariable,
+    DerivedDataVariable,
     DerivedVariable,
     DownloadContent,
+    NonDataVariable,
     SideEffect,
     Variable,
 )
@@ -115,7 +116,7 @@ class FileStore(BaseModel):
         if not os.path.exists(file_path):
             return None
 
-        return open(file_path, 'rb')
+        return io.open(file_path, 'rb')
 
     def write_file(self, cache_type: CacheType, name: str) -> io.BufferedWriter:
         """
@@ -129,7 +130,7 @@ class FileStore(BaseModel):
         """
         scope_path = self.get_scoped_path(cache_type)
         os.makedirs(scope_path, exist_ok=True)
-        return open(os.path.join(scope_path, name), 'wb')
+        return io.open(os.path.join(scope_path, name), 'wb')
 
     def delete_file(self, cache_type: CacheType, name: str) -> None:
         """
@@ -171,7 +172,7 @@ class DataFactory(BaseModel):
 
     def list_datasets_var(
         self,
-        cache: Union[CacheType, ClientVariable] = CacheType.GLOBAL,
+        cache: Union[CacheType, NonDataVariable] = CacheType.GLOBAL,
         polling_interval: Optional[int] = None,
     ) -> DerivedVariable[List[str]]:
         """
@@ -180,7 +181,7 @@ class DataFactory(BaseModel):
         :param cache: cache type to get the list of datasets for
         :param polling_interval: optional polling_interval in seconds for the derived variable
         """
-        cache_var = cache if isinstance(cache, ClientVariable) else Variable(cache)
+        cache_var = cache if isinstance(cache, NonDataVariable) else Variable(cache)
 
         return DerivedVariable(
             lambda cache_val: self.file_store.list_files(cache_val or CacheType.GLOBAL),
@@ -288,21 +289,21 @@ class DataFactory(BaseModel):
 
     def read_dataset_var(
         self,
-        name: Union[str, ClientVariable],
-        cache: Union[CacheType, ClientVariable] = CacheType.GLOBAL,
+        name: Union[str, NonDataVariable],
+        cache: Union[CacheType, NonDataVariable] = CacheType.GLOBAL,
         polling_interval: Optional[int] = None,
-    ) -> DerivedVariable:
+    ) -> DerivedDataVariable:
         """
-        Create a DerivedVariable which reads a specific dataset from disk
+        Create a DerivedDataVariable which reads a specific dataset from disk
 
         :param name: name of the dataset
         :param cache: cache to get the dataset for
         :param polling_interval: optional polling interval in seconds for the derived variable
         """
-        name_var = name if isinstance(name, ClientVariable) else Variable(name)
-        cache_var = cache if isinstance(cache, ClientVariable) else Variable(cache)
+        name_var = name if isinstance(name, NonDataVariable) else Variable(name)
+        cache_var = cache if isinstance(cache, NonDataVariable) else Variable(cache)
 
-        return DerivedVariable(
+        return DerivedDataVariable(
             self.read_dataset,
             variables=[name_var, cache_var],
             cache=CacheType.SESSION,
@@ -319,7 +320,7 @@ class DataFactory(BaseModel):
         self.file_store.delete_file(cache, name)
 
     def delete_dataset_action(
-        self, name: Union[str, ClientVariable], cache: Union[CacheType, ClientVariable] = CacheType.GLOBAL
+        self, name: Union[str, NonDataVariable], cache: Union[CacheType, NonDataVariable] = CacheType.GLOBAL
     ):
         """
         Get a SideEffect action which deletes a given dataset
@@ -327,13 +328,13 @@ class DataFactory(BaseModel):
         :param name: name of the dataset
         :param cache: cache to remove the daatset for
         """
-        name_var = name if isinstance(name, ClientVariable) else Variable(name)
-        cache_var = cache if isinstance(cache, ClientVariable) else Variable(cache)
+        name_var = name if isinstance(name, NonDataVariable) else Variable(name)
+        cache_var = cache if isinstance(cache, NonDataVariable) else Variable(cache)
 
         return SideEffect(lambda ctx: self.delete_dataset(ctx.extras[0], ctx.extras[1]), extras=[name_var, cache_var])
 
     def download_dataset_action(
-        self, name: Union[str, ClientVariable], cache: Union[CacheType, ClientVariable] = CacheType.GLOBAL
+        self, name: Union[str, NonDataVariable], cache: Union[CacheType, NonDataVariable] = CacheType.GLOBAL
     ):
         """
         Get a DownloadContent action which downloads a dataset with a given name as a .csv
@@ -341,8 +342,8 @@ class DataFactory(BaseModel):
         :param name: name of the dataset to download
         :param cache: cache to download dataset for
         """
-        name_var = name if isinstance(name, ClientVariable) else Variable(name)
-        cache_var = cache if isinstance(cache, ClientVariable) else Variable(cache)
+        name_var = name if isinstance(name, NonDataVariable) else Variable(name)
+        cache_var = cache if isinstance(cache, NonDataVariable) else Variable(cache)
 
         def _resolver(ctx: DownloadContent.Ctx):  # type: ignore
             ds_name, sel_cache = ctx.extras  # type: ignore

dara/core/defaults.py

@@ -17,7 +17,7 @@ limitations under the License.
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Dict, cast
+from typing import TYPE_CHECKING, Dict
 
 from dara.core.base_definitions import ActionDef
 from dara.core.interactivity.actions import (
@@ -53,7 +53,6 @@ from dara.core.visual.components import (
     TopBarFrame,
     TopBarFrameDef,
 )
-from dara.core.visual.components.fallback import CustomFallbackDef
 from dara.core.visual.template import TemplateBuilder
 
 if TYPE_CHECKING:
@@ -78,9 +77,8 @@ CORE_COMPONENTS: Dict[str, ComponentTypeAnnotation] = {
     RouterContent.__name__: RouterContentDef,
     SideBarFrame.__name__: SideBarFrameDef,
     TopBarFrame.__name__: TopBarFrameDef,
-    cast(str, Fallback.Default.py_component): DefaultFallbackDef,
-    cast(str, Fallback.Row.py_component): RowFallbackDef,
-    cast(str, Fallback.Custom.py_component): CustomFallbackDef,
+    Fallback.Default.py_component: DefaultFallbackDef,
+    Fallback.Row.py_component: RowFallbackDef,
     For.__name__: ForDef,
 }
 
@@ -95,9 +93,9 @@ CORE_ACTIONS: Dict[str, ActionDef] = {
     Notify.__name__: NotifyDef,
 }
 
-
 # Define a default layout template
 def default_template(config: Configuration) -> Template:
+
     template = TemplateBuilder(name='default')
 
     router = template.add_router_from_pages(list(config.pages.values()))
@@ -109,6 +107,7 @@ def default_template(config: Configuration) -> Template:
 
 # Define a blank template
 def blank_template(config: Configuration) -> Template:
+
     template = TemplateBuilder(name='default')
 
     router = template.add_router_from_pages(list(config.pages.values()))
@@ -120,6 +119,7 @@ def blank_template(config: Configuration) -> Template:
 
 # Define a top layout template
 def top_template(config: Configuration) -> Template:
+
     template = TemplateBuilder(name='default')
 
     router = template.add_router_from_pages(list(config.pages.values()))
@@ -131,6 +131,7 @@ def top_template(config: Configuration) -> Template:
 
 # Define a top layout template with menu
 def top_menu_template(config: Configuration) -> Template:
+
     template = TemplateBuilder(name='default')
 
     router = template.add_router_from_pages(list(config.pages.values()))