dara-core 1.19.0__py3-none-any.whl → 1.20.0__py3-none-any.whl

dara/core/internal/utils.py

@@ -33,13 +33,16 @@ from typing import (
     Literal,
     Optional,
     Tuple,
+    Type,
+    TypeVar,
     Union,
 )
 
 import anyio
 from anyio import from_thread
-from exceptiongroup import ExceptionGroup
+from exceptiongroup import BaseExceptionGroup, ExceptionGroup
 from starlette.concurrency import run_in_threadpool
+from typing_extensions import ParamSpec
 
 from dara.core.auth.definitions import SESSION_ID, USER
 from dara.core.base_definitions import CacheType
@@ -176,7 +179,11 @@ def enforce_sso(conf: ConfigurationBuilder):
         ) from err
 
 
-def async_dedupe(fn: Callable[..., Awaitable]):
+P = ParamSpec('P')
+T = TypeVar('T')
+
+
+def async_dedupe(fn: Callable[P, Awaitable[T]]) -> Callable[P, Awaitable[T]]:
     """
     Decorator to deduplicate concurrent calls to asynchronous functions based on their arguments.
 
@@ -194,7 +201,7 @@ def async_dedupe(fn: Callable[..., Awaitable]):
     is_method = 'self' in inspect.signature(fn).parameters
 
     @wraps(fn)
-    async def wrapped(*args, **kwargs):
+    async def wrapped(*args: P.args, **kwargs: P.kwargs) -> T:
         non_self_args = args[1:] if is_method else args
         key = (non_self_args, frozenset(kwargs.items()))
         lock = locks.get(key)
@@ -234,3 +241,18 @@ def resolve_exception_group(error: Any):
         return resolve_exception_group(error.exceptions[0])
 
     return error
+
+
+def exception_group_contains(err_type: Type[BaseException], group: BaseExceptionGroup) -> bool:
+    """
+    Check if an ExceptionGroup contains an error of a given type, recursively
+
+    :param err_type: The type of error to check for
+    :param group: The ExceptionGroup to check
+    """
+    for exc in group.exceptions:
+        if isinstance(exc, err_type):
+            return True
+        if isinstance(exc, BaseExceptionGroup):
+            return exception_group_contains(err_type, exc)
+    return False

dara/core/internal/websocket.py

@@ -474,7 +474,7 @@ async def ws_handler(websocket: WebSocket, token: Optional[str] = Query(default=
     if pending_tokens_registry.has(token):
         pending_tokens_registry.remove(token)
 
-    user_identifier = token_content.identity_id or token_content.identity_name
+    user_identifier = token_content.identity_id
 
     # Add the new session ID to known sessions for that user
     if sessions_registry.has(user_identifier):

dara/core/js_tooling/js_utils.py

@@ -544,11 +544,13 @@ def bundle_js(build_cache: BuildCache, copy_js: bool = False):
 
     cwd = os.getcwd()
     os.chdir(build_cache.static_files_dir)
+    dev_logger.info('Installing JS dependencies...')
     exit_code = os.system(f'{package_manager} install')  # nosec B605 # package_manager is validated
     if exit_code > 0:
         raise SystemError(
             "Failed to install the JS dependencies - there's likely a connection issue or a broken package"
         )
+    dev_logger.info('JS dependencies installed successfully')
 
     # Load entry template as a string
     with open(entry_template, encoding='utf-8') as f:

dara/core/logging.py

@@ -74,7 +74,7 @@ class Logger:
 
         self._logger.warning(payload, extra={'content': extra})
 
-    def error(self, title: str, error: Exception, extra: Optional[Dict[str, Any]] = None):
+    def error(self, title: str, error: BaseException, extra: Optional[Dict[str, Any]] = None):
         """
         Log a message at the ERROR level
 
@@ -171,11 +171,14 @@ class LoggingMiddleware(BaseHTTPMiddleware):
         return response
 
 
-def _print_stacktrace():
+def _print_stacktrace(err: Optional[BaseException] = None) -> str:
     """
     Prints out the current stack trace whilst unwinding all the logging calls on the way so it just shows the relevant
     parts. Will also extract any exceptions and print them at the end.
     """
+    if err is not None:
+        return ''.join(traceback.format_exception(type(err), err, err.__traceback__))
+
     exc = sys.exc_info()[0]
     stack = traceback.extract_stack()[:-1]
     if exc is not None:
@@ -215,8 +218,9 @@ class DaraProdFormatter(logging.Formatter):
             }
 
             if record.levelname == 'ERROR':
-                payload['error'] = str(payload.pop('error'))
-                payload['stacktrace'] = _print_stacktrace()
+                err = payload.pop('error')
+                payload['error'] = str(err)
+                payload['stacktrace'] = _print_stacktrace(err if isinstance(err, BaseException) else None)
 
             return payload
 
@@ -281,8 +285,8 @@ class DaraDevFormatter(logging.Formatter):
 
             if record.levelname == 'ERROR':
                 error = ''
-                if payload.get('error'):
-                    error = _print_stacktrace()
+                if err := payload.get('error'):
+                    error = _print_stacktrace(err if isinstance(err, BaseException) else None)
                 content = base_msg
                 if record.__dict__.get('content'):
                     content = content + '\r\n' + self.extra_template % (spacer, record.__dict__['content'])

dara/core/persistence.py

@@ -255,7 +255,7 @@ class BackendStore(PersistenceStore):
         user = USER.get()
 
         if user:
-            user_key = user.identity_id or user.identity_name
+            user_key = user.identity_id
 
             # Make sure the store is initialized
             if user_key not in self.initialized_scopes:
@@ -277,7 +277,7 @@ class BackendStore(PersistenceStore):
         if key == 'global':
             return None
 
-        # otherwise key is a user identity_id or identity_name
+        # otherwise key is a user identity_id
         return key
 
     def _register(self):
@@ -374,7 +374,7 @@ class BackendStore(PersistenceStore):
         if not user:
             return
 
-        user_identifier = user.identity_id or user.identity_name
+        user_identifier = user.identity_id
         return await self._notify_user(user_identifier, value=value, ignore_channel=ignore_channel)
 
     async def _notify_patches(self, patches: List[Dict[str, Any]]):
@@ -393,7 +393,7 @@ class BackendStore(PersistenceStore):
         if not user:
             return
 
-        user_identifier = user.identity_id or user.identity_name
+        user_identifier = user.identity_id
         return await self._notify_user(user_identifier, patches=patches)
 
     async def init(self, variable: 'Variable'):
@@ -540,3 +540,25 @@ class BackendStoreEntry(BaseModel):
     uid: str
     store: BackendStore
     """Store instance"""
+
+
+class BrowserStore(PersistenceStore):
+    """
+    Persistence store implementation that uses browser local storage
+    """
+
+    async def init(self, variable: 'Variable'):
+        # noop
+        pass
+
+
+class QueryParamStore(PersistenceStore):
+    """
+    Persistence store implementation that uses a URL query parameter
+    """
+
+    query: str
+
+    async def init(self, variable: 'Variable'):
+        # noop
+        pass