dara-core 1.14.0a1__py3-none-any.whl → 1.14.0a2__py3-none-any.whl

dara/core/auth/base.py

@@ -69,14 +69,6 @@ class BaseAuthConfig(BaseModel, abc.ABC):
     Defines components to use for auth routes
     """
 
-    supports_token_refresh: ClassVar[bool] = False
-    """
-    Whether this auth config supports token refresh.
-
-    If an auth config supports token refresh, it should override the refresh_token method
-    and set this to True.
-    """
-
     @abc.abstractmethod
     def get_token(self, body: SessionRequestBody) -> Union[TokenResponse, RedirectResponse]:
         """

dara/core/auth/routes.py

@@ -19,7 +19,15 @@ from inspect import iscoroutinefunction
 from typing import Union, cast
 
 import jwt
-from fastapi import APIRouter, Cookie, Depends, HTTPException, Request, Response
+from fastapi import (
+    APIRouter,
+    BackgroundTasks,
+    Cookie,
+    Depends,
+    HTTPException,
+    Request,
+    Response,
+)
 from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
 
 from dara.core.auth.base import BaseAuthConfig
@@ -108,6 +116,7 @@ async def _revoke_session(response: Response, credentials: HTTPAuthorizationCred
 @auth_router.post('/refresh-token')
 async def handle_refresh_token(
     response: Response,
+    background_tasks: BackgroundTasks,
     dara_refresh_token: Union[str, None] = Cookie(default=None),
     credentials: HTTPAuthorizationCredentials = Depends(HTTPBearer()),
 ):
@@ -130,9 +139,15 @@ async def handle_refresh_token(
             ),
         )
 
-    from dara.core.internal.registries import auth_registry
+    from dara.core.internal.registries import (
+        auth_registry,
+        utils_registry,
+        websocket_registry,
+    )
+    from dara.core.internal.websocket import WebsocketManager
 
     auth_config: BaseAuthConfig = auth_registry.get('auth_config')
+    ws_manager: WebsocketManager = utils_registry.get('WebsocketManager')
 
     try:
         # decode the old token ignoring expiry date
@@ -141,6 +156,17 @@ async def handle_refresh_token(
         # Refresh logic up to implementation - passing in old token data so session_id can be preserved
         session_token, refresh_token = auth_config.refresh_token(old_token_data, dara_refresh_token)
 
+        # Notify the active websocket handlers (i.e. active connections, per each tab open)
+        # so they can update the data in ContextVars
+        async def notify_ws_connections():
+            session_token_data = decode_token(session_token)
+            channels = websocket_registry.get(old_token_data.session_id)
+            for channel in channels:
+                if handler := ws_manager.handlers.get(channel):
+                    await handler.update_token(session_token_data)
+
+        background_tasks.add_task(notify_ws_connections)
+
         # Using 'Strict' as it is only used for the refresh-token endpoint so cross-site requests are not expected
         response.set_cookie(
             key='dara_refresh_token', value=refresh_token, secure=True, httponly=True, samesite='strict'

dara/core/internal/routing.py

@@ -212,7 +212,6 @@ def create_router(config: Configuration):
     async def get_auth_config():  # pylint: disable=unused-variable
         return {
             'auth_components': config.auth_config.component_config.dict(),
-            'supports_token_refresh': config.auth_config.supports_token_refresh,
         }
 
     @core_api_router.get('/components', dependencies=[Depends(verify_session)])

dara/core/internal/websocket.py

@@ -156,6 +156,16 @@ class WebSocketHandler:
     Stream containing messages to send to the client.
     """
 
+    token_send_stream: MemoryObjectSendStream[TokenData]
+    """
+    Stream for sending token updates to the WS connection.
+    """
+
+    token_receive_stream: MemoryObjectReceiveStream[TokenData]
+    """
+    Stream for receiving token updates in the WS connection.
+    """
+
     pending_responses: Dict[str, Tuple[Event, Optional[Any]]]
     """
     A map of pending responses from the client. The key is the message ID and the value is a tuple of the event to
@@ -167,11 +177,38 @@ class WebSocketHandler:
 
     def __init__(self, channel_id: str):
         send_stream, receive_stream = create_memory_object_stream[ServerMessage](math.inf)
-        self.channel_id = channel_id
-        self.send_stream = send_stream
         self.receive_stream = receive_stream
+        self.send_stream = send_stream
+
+        token_send_stream, token_receive_stream = anyio.create_memory_object_stream[TokenData](math.inf)
+        self.token_send_stream = token_send_stream
+        self.token_receive_stream = token_receive_stream
+
+        self.channel_id = channel_id
         self.pending_responses = {}
 
+    async def update_token(self, token_data: TokenData):
+        """
+        Update the token for the client.
+        Should be used if the token is refreshed or changed in some way
+        so the live WS connection can update it's ContextVars accordingly
+        and they're up to date in custom message handlers.
+
+        :param token_data: The new token data
+        """
+        await self.token_send_stream.send(token_data)
+
+    def get_token_update(self) -> Optional[TokenData]:
+        """
+        Get the latest token update for the client.
+
+        :return: The latest token update
+        """
+        try:
+            return self.token_receive_stream.receive_nowait()
+        except Exception:
+            return None
+
     async def send_message(self, message: ServerMessage):
         """
         Send a message to the client.
@@ -446,17 +483,20 @@ async def ws_handler(websocket: WebSocket, token: Optional[str] = Query(default=
     else:
         sessions_registry.set(user_identifier, {token_content.session_id})
 
-    # Set Auth context vars for the WS connection
-    USER.set(
-        UserData(
-            identity_id=token_content.identity_id,
-            identity_name=token_content.identity_name,
-            identity_email=token_content.identity_email,
-            groups=token_content.groups,
+    def update_context(token_data: TokenData):
+        USER.set(
+            UserData(
+                identity_id=token_data.identity_id,
+                identity_name=token_data.identity_name,
+                identity_email=token_data.identity_email,
+                groups=token_data.groups,
+            )
         )
-    )
-    SESSION_ID.set(token_content.session_id)
-    ID_TOKEN.set(token_content.id_token)
+        SESSION_ID.set(token_data.session_id)
+        ID_TOKEN.set(token_data.id_token)
+
+    # Set initial Auth context vars for the WS connection
+    update_context(token_content)
 
     # Change protocol from http to ws - from this point exceptions can't be raised
     await websocket.accept()
@@ -488,6 +528,10 @@ async def ws_handler(websocket: WebSocket, token: Optional[str] = Query(default=
                         # as the latter does not properly handle disconnections e.g. when relaoading the server
                         data = await websocket.receive_json()
 
+                        # update Auth context vars for the WS connection
+                        while new_token_data := handler.get_token_update():
+                            update_context(new_token_data)
+
                         # Heartbeat to keep connection alive
                         if data['type'] == 'ping':
                             await websocket.send_json({'type': 'pong', 'message': None})

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

@@ -1200,7 +1200,7 @@ var __privateMethod = (obj, member, method) => {
    * This source code is licensed under the MIT license found in the
    * LICENSE file in the root directory of this source tree.
    */
-  var b$1 = "function" === typeof Symbol && Symbol.for, c$1 = b$1 ? Symbol.for("react.element") : 60103, d$2 = b$1 ? Symbol.for("react.portal") : 60106, e$3 = b$1 ? Symbol.for("react.fragment") : 60107, f$2 = b$1 ? Symbol.for("react.strict_mode") : 60108, g$1 = b$1 ? Symbol.for("react.profiler") : 60114, h$1 = b$1 ? Symbol.for("react.provider") : 60109, k$2 = b$1 ? Symbol.for("react.context") : 60110, l$3 = b$1 ? Symbol.for("react.async_mode") : 60111, m$2 = b$1 ? Symbol.for("react.concurrent_mode") : 60111, n$4 = b$1 ? Symbol.for("react.forward_ref") : 60112, p$3 = b$1 ? Symbol.for("react.suspense") : 60113, q$2 = b$1 ? Symbol.for("react.suspense_list") : 60120, r$3 = b$1 ? Symbol.for("react.memo") : 60115, t$2 = b$1 ? Symbol.for("react.lazy") : 60116, v$1 = b$1 ? Symbol.for("react.block") : 60121, w$2 = b$1 ? Symbol.for("react.fundamental") : 60117, x$1 = b$1 ? Symbol.for("react.responder") : 60118, y$1 = b$1 ? Symbol.for("react.scope") : 60119;
+  var b$1 = "function" === typeof Symbol && Symbol.for, c$1 = b$1 ? Symbol.for("react.element") : 60103, d$2 = b$1 ? Symbol.for("react.portal") : 60106, e$2 = b$1 ? Symbol.for("react.fragment") : 60107, f$2 = b$1 ? Symbol.for("react.strict_mode") : 60108, g$1 = b$1 ? Symbol.for("react.profiler") : 60114, h$1 = b$1 ? Symbol.for("react.provider") : 60109, k$2 = b$1 ? Symbol.for("react.context") : 60110, l$3 = b$1 ? Symbol.for("react.async_mode") : 60111, m$2 = b$1 ? Symbol.for("react.concurrent_mode") : 60111, n$3 = b$1 ? Symbol.for("react.forward_ref") : 60112, p$3 = b$1 ? Symbol.for("react.suspense") : 60113, q$2 = b$1 ? Symbol.for("react.suspense_list") : 60120, r$2 = b$1 ? Symbol.for("react.memo") : 60115, t$1 = b$1 ? Symbol.for("react.lazy") : 60116, v$1 = b$1 ? Symbol.for("react.block") : 60121, w$2 = b$1 ? Symbol.for("react.fundamental") : 60117, x$1 = b$1 ? Symbol.for("react.responder") : 60118, y$1 = b$1 ? Symbol.for("react.scope") : 60119;
   function z$1(a2) {
     if ("object" === typeof a2 && null !== a2) {
       var u2 = a2.$$typeof;
@@ -1209,7 +1209,7 @@ var __privateMethod = (obj, member, method) => {
           switch (a2 = a2.type, a2) {
             case l$3:
             case m$2:
-            case e$3:
+            case e$2:
             case g$1:
             case f$2:
             case p$3:
@@ -1217,9 +1217,9 @@ var __privateMethod = (obj, member, method) => {
             default:
               switch (a2 = a2 && a2.$$typeof, a2) {
                 case k$2:
-                case n$4:
-                case t$2:
-                case r$3:
+                case n$3:
+                case t$1:
+                case r$2:
                 case h$1:
                   return a2;
                 default:
@@ -1239,10 +1239,10 @@ var __privateMethod = (obj, member, method) => {
   reactIs_production_min$1.ContextConsumer = k$2;
   reactIs_production_min$1.ContextProvider = h$1;
   reactIs_production_min$1.Element = c$1;
-  reactIs_production_min$1.ForwardRef = n$4;
-  reactIs_production_min$1.Fragment = e$3;
-  reactIs_production_min$1.Lazy = t$2;
-  reactIs_production_min$1.Memo = r$3;
+  reactIs_production_min$1.ForwardRef = n$3;
+  reactIs_production_min$1.Fragment = e$2;
+  reactIs_production_min$1.Lazy = t$1;
+  reactIs_production_min$1.Memo = r$2;
   reactIs_production_min$1.Portal = d$2;
   reactIs_production_min$1.Profiler = g$1;
   reactIs_production_min$1.StrictMode = f$2;
@@ -1261,16 +1261,16 @@ var __privateMethod = (obj, member, method) => {
     return "object" === typeof a2 && null !== a2 && a2.$$typeof === c$1;
   };
   reactIs_production_min$1.isForwardRef = function(a2) {
-    return z$1(a2) === n$4;
+    return z$1(a2) === n$3;
   };
   reactIs_production_min$1.isFragment = function(a2) {
-    return z$1(a2) === e$3;
+    return z$1(a2) === e$2;
   };
   reactIs_production_min$1.isLazy = function(a2) {
-    return z$1(a2) === t$2;
+    return z$1(a2) === t$1;
   };
   reactIs_production_min$1.isMemo = function(a2) {
-    return z$1(a2) === r$3;
+    return z$1(a2) === r$2;
   };
   reactIs_production_min$1.isPortal = function(a2) {
     return z$1(a2) === d$2;
@@ -1285,7 +1285,7 @@ var __privateMethod = (obj, member, method) => {
     return z$1(a2) === p$3;
   };
   reactIs_production_min$1.isValidElementType = function(a2) {
-    return "string" === typeof a2 || "function" === typeof a2 || a2 === e$3 || a2 === m$2 || a2 === g$1 || a2 === f$2 || a2 === p$3 || a2 === q$2 || "object" === typeof a2 && null !== a2 && (a2.$$typeof === t$2 || a2.$$typeof === r$3 || a2.$$typeof === h$1 || a2.$$typeof === k$2 || a2.$$typeof === n$4 || a2.$$typeof === w$2 || a2.$$typeof === x$1 || a2.$$typeof === y$1 || a2.$$typeof === v$1);
+    return "string" === typeof a2 || "function" === typeof a2 || a2 === e$2 || a2 === m$2 || a2 === g$1 || a2 === f$2 || a2 === p$3 || a2 === q$2 || "object" === typeof a2 && null !== a2 && (a2.$$typeof === t$1 || a2.$$typeof === r$2 || a2.$$typeof === h$1 || a2.$$typeof === k$2 || a2.$$typeof === n$3 || a2.$$typeof === w$2 || a2.$$typeof === x$1 || a2.$$typeof === y$1 || a2.$$typeof === v$1);
   };
   reactIs_production_min$1.typeOf = z$1;
   (function(module2) {
@@ -12153,7 +12153,7 @@ var __privateMethod = (obj, member, method) => {
    * This source code is licensed under the MIT license found in the
    * LICENSE file in the root directory of this source tree.
    */
-  var f$1 = React__default.default, k$1 = Symbol.for("react.element"), l$2 = Symbol.for("react.fragment"), m$1 = Object.prototype.hasOwnProperty, n$3 = f$1.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner, p$2 = { key: true, ref: true, __self: true, __source: true };
+  var f$1 = React__default.default, k$1 = Symbol.for("react.element"), l$2 = Symbol.for("react.fragment"), m$1 = Object.prototype.hasOwnProperty, n$2 = f$1.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner, p$2 = { key: true, ref: true, __self: true, __source: true };
   function q$1(c2, a2, g2) {
     var b2, d2 = {}, e3 = null, h2 = null;
     void 0 !== g2 && (e3 = "" + g2);
@@ -12164,7 +12164,7 @@ var __privateMethod = (obj, member, method) => {
     if (c2 && c2.defaultProps)
       for (b2 in a2 = c2.defaultProps, a2)
         void 0 === d2[b2] && (d2[b2] = a2[b2]);
-    return { $$typeof: k$1, type: c2, key: e3, ref: h2, props: d2, _owner: n$3.current };
+    return { $$typeof: k$1, type: c2, key: e3, ref: h2, props: d2, _owner: n$2.current };
   }
   reactJsxRuntime_production_min.Fragment = l$2;
   reactJsxRuntime_production_min.jsx = q$1;
@@ -34373,23 +34373,23 @@ var __privateMethod = (obj, member, method) => {
    * This source code is licensed under the MIT license found in the
    * LICENSE file in the root directory of this source tree.
    */
-  var b = 60103, c = 60106, d = 60107, e$2 = 60108, f = 60114, g = 60109, h = 60110, k = 60112, l$1 = 60113, m = 60120, n$2 = 60115, p = 60116, q = 60121, r$2 = 60122, u = 60117, v = 60129, w = 60131;
+  var b = 60103, c = 60106, d = 60107, e$1 = 60108, f = 60114, g = 60109, h = 60110, k = 60112, l$1 = 60113, m = 60120, n$1 = 60115, p = 60116, q = 60121, r$1 = 60122, u = 60117, v = 60129, w = 60131;
   if ("function" === typeof Symbol && Symbol.for) {
     var x = Symbol.for;
     b = x("react.element");
     c = x("react.portal");
     d = x("react.fragment");
-    e$2 = x("react.strict_mode");
+    e$1 = x("react.strict_mode");
     f = x("react.profiler");
     g = x("react.provider");
     h = x("react.context");
     k = x("react.forward_ref");
     l$1 = x("react.suspense");
     m = x("react.suspense_list");
-    n$2 = x("react.memo");
+    n$1 = x("react.memo");
     p = x("react.lazy");
     q = x("react.block");
-    r$2 = x("react.server.block");
+    r$1 = x("react.server.block");
     u = x("react.fundamental");
     v = x("react.debug_trace_mode");
     w = x("react.legacy_hidden");
@@ -34402,7 +34402,7 @@ var __privateMethod = (obj, member, method) => {
           switch (a2 = a2.type, a2) {
             case d:
             case f:
-            case e$2:
+            case e$1:
             case l$1:
             case m:
               return a2;
@@ -34411,7 +34411,7 @@ var __privateMethod = (obj, member, method) => {
                 case h:
                 case k:
                 case p:
-                case n$2:
+                case n$1:
                 case g:
                   return a2;
                 default:
@@ -34423,7 +34423,7 @@ var __privateMethod = (obj, member, method) => {
       }
     }
   }
-  var z = g, A = b, B = k, C = d, D = p, E = n$2, F = c, G = f, H = e$2, I = l$1;
+  var z = g, A = b, B = k, C = d, D = p, E = n$1, F = c, G = f, H = e$1, I = l$1;
   reactIs_production_min.ContextConsumer = h;
   reactIs_production_min.ContextProvider = z;
   reactIs_production_min.Element = A;
@@ -34460,7 +34460,7 @@ var __privateMethod = (obj, member, method) => {
     return y(a2) === p;
   };
   reactIs_production_min.isMemo = function(a2) {
-    return y(a2) === n$2;
+    return y(a2) === n$1;
   };
   reactIs_production_min.isPortal = function(a2) {
     return y(a2) === c;
@@ -34469,13 +34469,13 @@ var __privateMethod = (obj, member, method) => {
     return y(a2) === f;
   };
   reactIs_production_min.isStrictMode = function(a2) {
-    return y(a2) === e$2;
+    return y(a2) === e$1;
   };
   reactIs_production_min.isSuspense = function(a2) {
     return y(a2) === l$1;
   };
   reactIs_production_min.isValidElementType = function(a2) {
-    return "string" === typeof a2 || "function" === typeof a2 || a2 === d || a2 === f || a2 === v || a2 === e$2 || a2 === l$1 || a2 === m || a2 === w || "object" === typeof a2 && null !== a2 && (a2.$$typeof === p || a2.$$typeof === n$2 || a2.$$typeof === g || a2.$$typeof === h || a2.$$typeof === k || a2.$$typeof === u || a2.$$typeof === q || a2[0] === r$2) ? true : false;
+    return "string" === typeof a2 || "function" === typeof a2 || a2 === d || a2 === f || a2 === v || a2 === e$1 || a2 === l$1 || a2 === m || a2 === w || "object" === typeof a2 && null !== a2 && (a2.$$typeof === p || a2.$$typeof === n$1 || a2.$$typeof === g || a2.$$typeof === h || a2.$$typeof === k || a2.$$typeof === u || a2.$$typeof === q || a2[0] === r$1) ? true : false;
   };
   reactIs_production_min.typeOf = y;
   (function(module2) {
@@ -34483,10 +34483,10 @@ var __privateMethod = (obj, member, method) => {
       module2.exports = reactIs_production_min;
     }
   })(reactIs);
-  let e$1 = (e3) => "object" == typeof e3 && null != e3 && 1 === e3.nodeType, t$1 = (e3, t2) => (!t2 || "hidden" !== e3) && ("visible" !== e3 && "clip" !== e3), n$1 = (e3, n2) => {
+  let e = (e3) => "object" == typeof e3 && null != e3 && 1 === e3.nodeType, t = (e3, t2) => (!t2 || "hidden" !== e3) && ("visible" !== e3 && "clip" !== e3), n = (e3, n2) => {
     if (e3.clientHeight < e3.scrollHeight || e3.clientWidth < e3.scrollWidth) {
       let l2 = getComputedStyle(e3, null);
-      return t$1(l2.overflowY, n2) || t$1(l2.overflowX, n2) || ((e4) => {
+      return t(l2.overflowY, n2) || t(l2.overflowX, n2) || ((e4) => {
         let t2 = ((e6) => {
           if (!e6.ownerDocument || !e6.ownerDocument.defaultView)
             return null;
@@ -34504,20 +34504,20 @@ var __privateMethod = (obj, member, method) => {
     let t2 = e3.parentElement;
     return null == t2 ? e3.getRootNode().host || null : t2;
   };
-  var o$1 = (t2, o2) => {
+  var o = (t2, o2) => {
     var r2, d2, h2, f2, u2, s;
     if ("undefined" == typeof document)
       return [];
     let { scrollMode: a2, block: c2, inline: g2, boundary: m2, skipOverflowHiddenElements: p2 } = o2, w2 = "function" == typeof m2 ? m2 : (e3) => e3 !== m2;
-    if (!e$1(t2))
+    if (!e(t2))
       throw new TypeError("Invalid target");
     let W = document.scrollingElement || document.documentElement, H2 = [], b2 = t2;
-    for (; e$1(b2) && w2(b2); ) {
+    for (; e(b2) && w2(b2); ) {
       if (b2 = i(b2), b2 === W) {
         H2.push(b2);
         break;
       }
-      null != b2 && b2 === document.body && n$1(b2) && !n$1(document.documentElement) || null != b2 && n$1(b2, p2) && H2.push(b2);
+      null != b2 && b2 === document.body && n(b2) && !n(document.documentElement) || null != b2 && n(b2, p2) && H2.push(b2);
     }
     let v2 = null != (d2 = null == (r2 = window.visualViewport) ? void 0 : r2.width) ? d2 : innerWidth, y2 = null != (f2 = null == (h2 = window.visualViewport) ? void 0 : h2.height) ? f2 : innerHeight, E2 = null != (u2 = window.scrollX) ? u2 : pageXOffset, M = null != (s = window.scrollY) ? s : pageYOffset, { height: x2, width: I2, top: C2, right: R, bottom: T, left: V } = t2.getBoundingClientRect(), k2 = "start" === c2 || "nearest" === c2 ? C2 : "end" === c2 ? T : C2 + x2 / 2, B2 = "center" === g2 ? V + I2 / 2 : "end" === g2 ? R : V, D2 = [];
     for (let e3 = 0; e3 < H2.length; e3++) {
@@ -34799,7 +34799,7 @@ var __privateMethod = (obj, member, method) => {
     if (!node) {
       return;
     }
-    var actions = o$1(node, {
+    var actions = o(node, {
       boundary: menuNode,
       block: "nearest",
       scrollMode: "if-needed"
@@ -36777,7 +36777,7 @@ var __privateMethod = (obj, member, method) => {
       }
     })();
   })(classnames);
-  const r$1 = classnames.exports;
+  const r = classnames.exports;
   function _typeof(o2) {
     "@babel/helpers - typeof";
     return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o3) {
@@ -42072,7 +42072,7 @@ var __privateMethod = (obj, member, method) => {
       var e3 = this.dropdownRef.current;
       e3 && (e3.scrollTop = e3.scrollHeight / 2 - e3.clientHeight / 2);
     } }, { key: "render", value: function() {
-      var t2 = r$1({ "react-datepicker__year-dropdown": true, "react-datepicker__year-dropdown--scrollable": this.props.scrollableYearDropdown });
+      var t2 = r({ "react-datepicker__year-dropdown": true, "react-datepicker__year-dropdown--scrollable": this.props.scrollableYearDropdown });
       return React__default.default.createElement("div", { className: t2, ref: this.dropdownRef }, this.renderOptions());
     } }]), a2;
   }()), gt = function(t2) {
@@ -42215,7 +42215,7 @@ var __privateMethod = (obj, member, method) => {
       }), r2.state = { monthYearsList: Ct(r2.props.minDate, r2.props.maxDate) }, r2;
     }
     return le(o2, [{ key: "render", value: function() {
-      var t3 = r$1({ "react-datepicker__month-year-dropdown": true, "react-datepicker__month-year-dropdown--scrollable": this.props.scrollableMonthYearDropdown });
+      var t3 = r({ "react-datepicker__month-year-dropdown": true, "react-datepicker__month-year-dropdown--scrollable": this.props.scrollableMonthYearDropdown });
       return React__default.default.createElement("div", { className: t3 }, this.renderOptions());
     } }]), o2;
   }()), _t = function(t2) {
@@ -42330,7 +42330,7 @@ var __privateMethod = (obj, member, method) => {
         return t3.isSameDay(t3.props.selected);
       }), de(ye(t3), "getClassNames", function(e3) {
         var n3 = t3.props.dayClassName ? t3.props.dayClassName(e3) : void 0;
-        return r$1("react-datepicker__day", n3, "react-datepicker__day--" + Oe(t3.props.day), { "react-datepicker__day--disabled": t3.isDisabled(), "react-datepicker__day--excluded": t3.isExcluded(), "react-datepicker__day--selected": t3.isSelected(), "react-datepicker__day--keyboard-selected": t3.isKeyboardSelected(), "react-datepicker__day--range-start": t3.isRangeStart(), "react-datepicker__day--range-end": t3.isRangeEnd(), "react-datepicker__day--in-range": t3.isInRange(), "react-datepicker__day--in-selecting-range": t3.isInSelectingRange(), "react-datepicker__day--selecting-range-start": t3.isSelectingRangeStart(), "react-datepicker__day--selecting-range-end": t3.isSelectingRangeEnd(), "react-datepicker__day--today": t3.isCurrentDay(), "react-datepicker__day--weekend": t3.isWeekend(), "react-datepicker__day--outside-month": t3.isAfterMonth() || t3.isBeforeMonth() }, t3.getHighLightedClass("react-datepicker__day--highlighted"));
+        return r("react-datepicker__day", n3, "react-datepicker__day--" + Oe(t3.props.day), { "react-datepicker__day--disabled": t3.isDisabled(), "react-datepicker__day--excluded": t3.isExcluded(), "react-datepicker__day--selected": t3.isSelected(), "react-datepicker__day--keyboard-selected": t3.isKeyboardSelected(), "react-datepicker__day--range-start": t3.isRangeStart(), "react-datepicker__day--range-end": t3.isRangeEnd(), "react-datepicker__day--in-range": t3.isInRange(), "react-datepicker__day--in-selecting-range": t3.isInSelectingRange(), "react-datepicker__day--selecting-range-start": t3.isSelectingRangeStart(), "react-datepicker__day--selecting-range-end": t3.isSelectingRangeEnd(), "react-datepicker__day--today": t3.isCurrentDay(), "react-datepicker__day--weekend": t3.isWeekend(), "react-datepicker__day--outside-month": t3.isAfterMonth() || t3.isBeforeMonth() }, t3.getHighLightedClass("react-datepicker__day--highlighted"));
       }), de(ye(t3), "getAriaLabel", function() {
         var e3 = t3.props, r2 = e3.day, n3 = e3.ariaLabelPrefixWhenEnabled, o3 = void 0 === n3 ? "Choose" : n3, a3 = e3.ariaLabelPrefixWhenDisabled, s2 = void 0 === a3 ? "Not available" : a3, i3 = t3.isDisabled() || t3.isExcluded() ? s2 : o3;
         return "".concat(i3, " ").concat(Ee(r2, "PPPP", t3.props.locale));
@@ -42365,7 +42365,7 @@ var __privateMethod = (obj, member, method) => {
     }
     return le(o2, [{ key: "render", value: function() {
       var t3 = this.props, n3 = t3.weekNumber, o3 = t3.ariaLabelPrefix, a2 = void 0 === o3 ? "week " : o3, s = { "react-datepicker__week-number": true, "react-datepicker__week-number--clickable": !!t3.onClick };
-      return React__default.default.createElement("div", { className: r$1(s), "aria-label": "".concat(a2, " ").concat(this.props.weekNumber), onClick: this.handleClick }, n3);
+      return React__default.default.createElement("div", { className: r(s), "aria-label": "".concat(a2, " ").concat(this.props.weekNumber), onClick: this.handleClick }, n3);
     } }]), o2;
   }(), Et = function(t2) {
     he(n2, React__default.default.Component);
@@ -42473,7 +42473,7 @@ var __privateMethod = (obj, member, method) => {
         t3.handleDayClick(Fe(setQuarter(t3.props.day, r2)), e3);
       }), de(ye(t3), "getMonthClassNames", function(e3) {
         var n3 = t3.props, o3 = n3.day, a3 = n3.startDate, s2 = n3.endDate, i3 = n3.selected, p2 = n3.minDate, c2 = n3.maxDate, l2 = n3.preSelection, d2 = n3.monthClassName, u2 = d2 ? d2(o3) : void 0;
-        return r$1("react-datepicker__month-text", "react-datepicker__month-".concat(e3), u2, { "react-datepicker__month--disabled": (p2 || c2) && Ze(setMonth(o3, e3), t3.props), "react-datepicker__month--selected": t3.isSelectedMonth(o3, e3, i3), "react-datepicker__month-text--keyboard-selected": getMonth(l2) === e3, "react-datepicker__month--in-range": et(a3, s2, e3, o3), "react-datepicker__month--range-start": t3.isRangeStartMonth(e3), "react-datepicker__month--range-end": t3.isRangeEndMonth(e3), "react-datepicker__month-text--today": t3.isCurrentMonth(o3, e3) });
+        return r("react-datepicker__month-text", "react-datepicker__month-".concat(e3), u2, { "react-datepicker__month--disabled": (p2 || c2) && Ze(setMonth(o3, e3), t3.props), "react-datepicker__month--selected": t3.isSelectedMonth(o3, e3, i3), "react-datepicker__month-text--keyboard-selected": getMonth(l2) === e3, "react-datepicker__month--in-range": et(a3, s2, e3, o3), "react-datepicker__month--range-start": t3.isRangeStartMonth(e3), "react-datepicker__month--range-end": t3.isRangeEndMonth(e3), "react-datepicker__month-text--today": t3.isCurrentMonth(o3, e3) });
       }), de(ye(t3), "getTabIndex", function(e3) {
         var r2 = getMonth(t3.props.preSelection);
         return t3.props.disabledKeyboardNavigation || e3 !== r2 ? "-1" : "0";
@@ -42482,7 +42482,7 @@ var __privateMethod = (obj, member, method) => {
         return "".concat(c2, " ").concat(Ee(p2, "MMMM yyyy"));
       }), de(ye(t3), "getQuarterClassNames", function(e3) {
         var n3 = t3.props, o3 = n3.day, a3 = n3.startDate, s2 = n3.endDate, i3 = n3.selected, p2 = n3.minDate, c2 = n3.maxDate;
-        return r$1("react-datepicker__quarter-text", "react-datepicker__quarter-".concat(e3), { "react-datepicker__quarter--disabled": (p2 || c2) && tt(setQuarter(o3, e3), t3.props), "react-datepicker__quarter--selected": t3.isSelectedQuarter(o3, e3, i3), "react-datepicker__quarter--in-range": nt(a3, s2, e3, o3), "react-datepicker__quarter--range-start": t3.isRangeStartQuarter(e3), "react-datepicker__quarter--range-end": t3.isRangeEndQuarter(e3) });
+        return r("react-datepicker__quarter-text", "react-datepicker__quarter-".concat(e3), { "react-datepicker__quarter--disabled": (p2 || c2) && tt(setQuarter(o3, e3), t3.props), "react-datepicker__quarter--selected": t3.isSelectedQuarter(o3, e3, i3), "react-datepicker__quarter--in-range": nt(a3, s2, e3, o3), "react-datepicker__quarter--range-start": t3.isRangeStartQuarter(e3), "react-datepicker__quarter--range-end": t3.isRangeEndQuarter(e3) });
       }), de(ye(t3), "renderMonths", function() {
         var r2 = t3.props, n3 = r2.showFullMonthYearPicker, o3 = r2.showTwoColumnMonthYearPicker, a3 = r2.showFourColumnMonthYearPicker, s2 = r2.locale, i3 = r2.day, p2 = r2.selected;
         return (a3 ? [[0, 1, 2, 3], [4, 5, 6, 7], [8, 9, 10, 11]] : o3 ? [[0, 1], [2, 3], [4, 5], [6, 7], [8, 9], [10, 11]] : [[0, 1, 2], [3, 4, 5], [6, 7, 8], [9, 10, 11]]).map(function(r3, o4) {
@@ -42505,7 +42505,7 @@ var __privateMethod = (obj, member, method) => {
         var e3 = t3.props;
         e3.day;
         var n3 = e3.selectingDate, o3 = e3.selectsStart, a3 = e3.selectsEnd, s2 = e3.showMonthYearPicker, i3 = e3.showQuarterYearPicker;
-        return r$1("react-datepicker__month", { "react-datepicker__month--selecting-range": n3 && (o3 || a3) }, { "react-datepicker__monthPicker": s2 }, { "react-datepicker__quarterPicker": i3 });
+        return r("react-datepicker__month", { "react-datepicker__month--selecting-range": n3 && (o3 || a3) }, { "react-datepicker__monthPicker": s2 }, { "react-datepicker__quarterPicker": i3 });
       }), t3;
     }
     return le(o2, [{ key: "render", value: function() {
@@ -42611,7 +42611,7 @@ var __privateMethod = (obj, member, method) => {
           }
       }), de(ye(a2), "getYearClassNames", function(e3) {
         var t4 = a2.props, n3 = t4.minDate, o3 = t4.maxDate, s = t4.selected;
-        return r$1("react-datepicker__year-text", { "react-datepicker__year-text--selected": e3 === getYear(s), "react-datepicker__year-text--disabled": (n3 || o3) && rt(e3, a2.props), "react-datepicker__year-text--keyboard-selected": a2.isKeyboardSelected(e3), "react-datepicker__year-text--today": a2.isCurrentYear(e3) });
+        return r("react-datepicker__year-text", { "react-datepicker__year-text--selected": e3 === getYear(s), "react-datepicker__year-text--disabled": (n3 || o3) && rt(e3, a2.props), "react-datepicker__year-text--keyboard-selected": a2.isKeyboardSelected(e3), "react-datepicker__year-text--today": a2.isCurrentYear(e3) });
       }), de(ye(a2), "getYearTabIndex", function(e3) {
         return a2.props.disabledKeyboardNavigation ? "-1" : e3 === getYear(a2.props.preSelection) ? "0" : "-1";
       }), a2;
@@ -42723,7 +42723,7 @@ var __privateMethod = (obj, member, method) => {
         var t4 = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : a2.state.date, n3 = Te(t4, a2.props.locale, a2.props.calendarStartDay), o3 = [];
         return a2.props.showWeekNumbers && o3.push(React__default.default.createElement("div", { key: "W", className: "react-datepicker__day-name" }, a2.props.weekLabel || "#")), o3.concat([0, 1, 2, 3, 4, 5, 6].map(function(t5) {
           var o4 = addDays(n3, t5), s = a2.formatWeekday(o4, a2.props.locale), i2 = a2.props.weekDayClassName ? a2.props.weekDayClassName(o4) : void 0;
-          return React__default.default.createElement("div", { key: t5, className: r$1("react-datepicker__day-name", i2) }, s);
+          return React__default.default.createElement("div", { key: t5, className: r("react-datepicker__day-name", i2) }, s);
         }));
       }), de(ye(a2), "formatWeekday", function(e3, t4) {
         return a2.props.formatWeekDay ? function(e4, t5, r2) {
@@ -42865,7 +42865,7 @@ var __privateMethod = (obj, member, method) => {
       this.props.preSelection && !We(this.props.preSelection, e3.preSelection) ? this.setState({ date: this.props.preSelection }) : this.props.openToDate && !We(this.props.openToDate, e3.openToDate) && this.setState({ date: this.props.openToDate });
     } }, { key: "render", value: function() {
       var t3 = this.props.container || It;
-      return React__default.default.createElement("div", { ref: this.containerRef }, React__default.default.createElement(t3, { className: r$1("react-datepicker", this.props.className, { "react-datepicker--time-only": this.props.showTimeSelectOnly }), showPopperArrow: this.props.showPopperArrow, arrowProps: this.props.arrowProps }, this.renderPreviousButton(), this.renderNextButton(), this.renderMonths(), this.renderYears(), this.renderTodayButton(), this.renderTimeSection(), this.renderInputTimeSection(), this.props.children));
+      return React__default.default.createElement("div", { ref: this.containerRef }, React__default.default.createElement(t3, { className: r("react-datepicker", this.props.className, { "react-datepicker--time-only": this.props.showTimeSelectOnly }), showPopperArrow: this.props.showPopperArrow, arrowProps: this.props.arrowProps }, this.renderPreviousButton(), this.renderNextButton(), this.renderMonths(), this.renderYears(), this.renderTodayButton(), this.renderTimeSection(), this.renderInputTimeSection(), this.props.children));
     } }], [{ key: "defaultProps", get: function() {
       return { onDropdownFocus: function() {
       }, monthsShown: 1, monthSelectedIn: 0, forceShowMonthNavigation: false, timeCaption: "Time", previousYearButtonLabel: "Previous Year", nextYearButtonLabel: "Next Year", previousMonthButtonLabel: "Previous Month", nextMonthButtonLabel: "Next Month", customTimeInput: null, yearItemNumber: 12 };
@@ -42915,14 +42915,14 @@ var __privateMethod = (obj, member, method) => {
     return le(o2, [{ key: "render", value: function() {
       var t3, n3 = this.props, o3 = n3.className, a2 = n3.wrapperClassName, s = n3.hidePopper, i2 = n3.popperComponent, p2 = n3.popperModifiers, c2 = n3.popperPlacement, l2 = n3.popperProps, d2 = n3.targetComponent, u2 = n3.enableTabLoop, h2 = n3.popperOnKeyDown, m2 = n3.portalId, f2 = n3.portalHost;
       if (!s) {
-        var y2 = r$1("react-datepicker-popper", o3);
+        var y2 = r("react-datepicker-popper", o3);
         t3 = React__default.default.createElement(Popper, ue({ modifiers: p2, placement: c2 }, l2), function(t4) {
           var r2 = t4.ref, n4 = t4.style, o4 = t4.placement, a3 = t4.arrowProps;
           return React__default.default.createElement(At, { enableTabLoop: u2 }, React__default.default.createElement("div", { ref: r2, style: n4, className: y2, "data-placement": o4, onKeyDown: h2 }, React__default.default.cloneElement(i2, { arrowProps: a3 })));
         });
       }
       this.props.popperContainer && (t3 = React__default.default.createElement(this.props.popperContainer, {}, t3)), m2 && !s && (t3 = React__default.default.createElement(Rt, { portalId: m2, portalHost: f2 }, t3));
-      var v2 = r$1("react-datepicker-wrapper", a2);
+      var v2 = r("react-datepicker-wrapper", a2);
       return React__default.default.createElement(Manager, { className: "react-datepicker-manager" }, React__default.default.createElement(Reference, null, function(t4) {
         var r2 = t4.ref;
         return React__default.default.createElement("div", { ref: r2, className: v2 }, d2);
@@ -43100,7 +43100,7 @@ var __privateMethod = (obj, member, method) => {
           s.calendar = e3;
         }, locale: s.props.locale, calendarStartDay: s.props.calendarStartDay, chooseDayAriaLabelPrefix: s.props.chooseDayAriaLabelPrefix, disabledDayAriaLabelPrefix: s.props.disabledDayAriaLabelPrefix, weekAriaLabelPrefix: s.props.weekAriaLabelPrefix, monthAriaLabelPrefix: s.props.monthAriaLabelPrefix, adjustDateOnChange: s.props.adjustDateOnChange, setOpen: s.setOpen, shouldCloseOnSelect: s.props.shouldCloseOnSelect, dateFormat: s.props.dateFormatCalendar, useWeekdaysShort: s.props.useWeekdaysShort, formatWeekDay: s.props.formatWeekDay, dropdownMode: s.props.dropdownMode, selected: s.props.selected, preSelection: s.state.preSelection, onSelect: s.handleSelect, onWeekSelect: s.props.onWeekSelect, openToDate: s.props.openToDate, minDate: s.props.minDate, maxDate: s.props.maxDate, selectsStart: s.props.selectsStart, selectsEnd: s.props.selectsEnd, selectsRange: s.props.selectsRange, startDate: s.props.startDate, endDate: s.props.endDate, excludeDates: s.props.excludeDates, excludeDateIntervals: s.props.excludeDateIntervals, filterDate: s.props.filterDate, onClickOutside: s.handleCalendarClickOutside, formatWeekNumber: s.props.formatWeekNumber, highlightDates: s.state.highlightDates, includeDates: s.props.includeDates, includeDateIntervals: s.props.includeDateIntervals, includeTimes: s.props.includeTimes, injectTimes: s.props.injectTimes, inline: s.props.inline, shouldFocusDayInline: s.state.shouldFocusDayInline, peekNextMonth: s.props.peekNextMonth, showMonthDropdown: s.props.showMonthDropdown, showPreviousMonths: s.props.showPreviousMonths, useShortMonthInDropdown: s.props.useShortMonthInDropdown, showMonthYearDropdown: s.props.showMonthYearDropdown, showWeekNumbers: s.props.showWeekNumbers, showYearDropdown: s.props.showYearDropdown, withPortal: s.props.withPortal, forceShowMonthNavigation: s.props.forceShowMonthNavigation, showDisabledMonthNavigation: s.props.showDisabledMonthNavigation, scrollableYearDropdown: s.props.scrollableYearDropdown, scrollableMonthYearDropdown: s.props.scrollableMonthYearDropdown, todayButton: s.props.todayButton, weekLabel: s.props.weekLabel, outsideClickIgnoreClass: "react-datepicker-ignore-onclickoutside", fixedHeight: s.props.fixedHeight, monthsShown: s.props.monthsShown, monthSelectedIn: s.state.monthSelectedIn, onDropdownFocus: s.handleDropdownFocus, onMonthChange: s.props.onMonthChange, onYearChange: s.props.onYearChange, dayClassName: s.props.dayClassName, weekDayClassName: s.props.weekDayClassName, monthClassName: s.props.monthClassName, timeClassName: s.props.timeClassName, showTimeSelect: s.props.showTimeSelect, showTimeSelectOnly: s.props.showTimeSelectOnly, onTimeChange: s.handleTimeChange, timeFormat: s.props.timeFormat, timeIntervals: s.props.timeIntervals, minTime: s.props.minTime, maxTime: s.props.maxTime, excludeTimes: s.props.excludeTimes, filterTime: s.props.filterTime, timeCaption: s.props.timeCaption, className: s.props.calendarClassName, container: s.props.calendarContainer, yearItemNumber: s.props.yearItemNumber, yearDropdownItemNumber: s.props.yearDropdownItemNumber, previousMonthAriaLabel: s.props.previousMonthAriaLabel, previousMonthButtonLabel: s.props.previousMonthButtonLabel, nextMonthAriaLabel: s.props.nextMonthAriaLabel, nextMonthButtonLabel: s.props.nextMonthButtonLabel, previousYearAriaLabel: s.props.previousYearAriaLabel, previousYearButtonLabel: s.props.previousYearButtonLabel, nextYearAriaLabel: s.props.nextYearAriaLabel, nextYearButtonLabel: s.props.nextYearButtonLabel, timeInputLabel: s.props.timeInputLabel, disabledKeyboardNavigation: s.props.disabledKeyboardNavigation, renderCustomHeader: s.props.renderCustomHeader, popperProps: s.props.popperProps, renderDayContents: s.props.renderDayContents, onDayMouseEnter: s.props.onDayMouseEnter, onMonthMouseLeave: s.props.onMonthMouseLeave, selectsDisabledDaysInRange: s.props.selectsDisabledDaysInRange, showTimeInput: s.props.showTimeInput, showMonthYearPicker: s.props.showMonthYearPicker, showFullMonthYearPicker: s.props.showFullMonthYearPicker, showTwoColumnMonthYearPicker: s.props.showTwoColumnMonthYearPicker, showFourColumnMonthYearPicker: s.props.showFourColumnMonthYearPicker, showYearPicker: s.props.showYearPicker, showQuarterYearPicker: s.props.showQuarterYearPicker, showPopperArrow: s.props.showPopperArrow, excludeScrollbar: s.props.excludeScrollbar, handleOnKeyDown: s.props.onKeyDown, handleOnDayKeyDown: s.onDayKeyDown, isInputFocused: s.state.focused, customTimeInput: s.props.customTimeInput, setPreSelection: s.setPreSelection }, s.props.children) : null;
       }), de(ye(s), "renderDateInput", function() {
-        var t4, n2 = r$1(s.props.className, de({}, "react-datepicker-ignore-onclickoutside", s.state.open)), o3 = s.props.customInput || React__default.default.createElement("input", { type: "text" }), a3 = s.props.customInputRef || "ref", i2 = "string" == typeof s.props.value ? s.props.value : "string" == typeof s.state.inputValue ? s.state.inputValue : s.props.selectsRange ? function(e3, t5, r2) {
+        var t4, n2 = r(s.props.className, de({}, "react-datepicker-ignore-onclickoutside", s.state.open)), o3 = s.props.customInput || React__default.default.createElement("input", { type: "text" }), a3 = s.props.customInputRef || "ref", i2 = "string" == typeof s.props.value ? s.props.value : "string" == typeof s.state.inputValue ? s.state.inputValue : s.props.selectsRange ? function(e3, t5, r2) {
           if (!e3)
             return "";
           var n3 = Ne(e3, r2), o4 = t5 ? Ne(t5, r2) : "";
@@ -43108,7 +43108,7 @@ var __privateMethod = (obj, member, method) => {
         }(s.props.startDate, s.props.endDate, s.props) : Ne(s.props.selected, s.props);
         return React__default.default.cloneElement(o3, (de(t4 = {}, a3, function(e3) {
           s.input = e3;
-        }), de(t4, "value", i2), de(t4, "onBlur", s.handleBlur), de(t4, "onChange", s.handleChange), de(t4, "onClick", s.onInputClick), de(t4, "onFocus", s.handleFocus), de(t4, "onKeyDown", s.onInputKeyDown), de(t4, "id", s.props.id), de(t4, "name", s.props.name), de(t4, "autoFocus", s.props.autoFocus), de(t4, "placeholder", s.props.placeholderText), de(t4, "disabled", s.props.disabled), de(t4, "autoComplete", s.props.autoComplete), de(t4, "className", r$1(o3.props.className, n2)), de(t4, "title", s.props.title), de(t4, "readOnly", s.props.readOnly), de(t4, "required", s.props.required), de(t4, "tabIndex", s.props.tabIndex), de(t4, "aria-describedby", s.props.ariaDescribedBy), de(t4, "aria-invalid", s.props.ariaInvalid), de(t4, "aria-labelledby", s.props.ariaLabelledBy), de(t4, "aria-required", s.props.ariaRequired), t4));
+        }), de(t4, "value", i2), de(t4, "onBlur", s.handleBlur), de(t4, "onChange", s.handleChange), de(t4, "onClick", s.onInputClick), de(t4, "onFocus", s.handleFocus), de(t4, "onKeyDown", s.onInputKeyDown), de(t4, "id", s.props.id), de(t4, "name", s.props.name), de(t4, "autoFocus", s.props.autoFocus), de(t4, "placeholder", s.props.placeholderText), de(t4, "disabled", s.props.disabled), de(t4, "autoComplete", s.props.autoComplete), de(t4, "className", r(o3.props.className, n2)), de(t4, "title", s.props.title), de(t4, "readOnly", s.props.readOnly), de(t4, "required", s.props.required), de(t4, "tabIndex", s.props.tabIndex), de(t4, "aria-describedby", s.props.ariaDescribedBy), de(t4, "aria-invalid", s.props.ariaInvalid), de(t4, "aria-labelledby", s.props.ariaLabelledBy), de(t4, "aria-required", s.props.ariaRequired), t4));
       }), de(ye(s), "renderClearButton", function() {
         var t4 = s.props, r2 = t4.isClearable, n2 = t4.selected, o3 = t4.startDate, a3 = t4.endDate, i2 = t4.clearButtonTitle, p2 = t4.clearButtonClassName, c2 = void 0 === p2 ? "" : p2, l2 = t4.ariaLabelClose, d2 = void 0 === l2 ? "Close" : l2;
         return !r2 || null == n2 && null == o3 && null == a3 ? null : React__default.default.createElement("button", { type: "button", className: "react-datepicker__close-icon ".concat(c2).trim(), "aria-label": d2, onClick: s.onClearClick, title: i2, tabIndex: -1 });
@@ -54981,8 +54981,8 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
       return __privateGet(this, _state)[key];
     }
     setValue(key, value) {
-      __privateMethod(this, _notify, notify_fn).call(this, key, value);
       __privateGet(this, _state)[key] = value;
+      __privateMethod(this, _notify, notify_fn).call(this, key, value);
     }
     async replaceValue(key, fn) {
       if (__privateGet(this, _locks)[key]) {
@@ -54998,10 +54998,8 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
       let result;
       try {
         result = await fn();
-        __privateGet(this, _state)[key] = result;
-        __privateMethod(this, _notify, notify_fn).call(this, key, result);
-        unlock(result);
         this.setValue(key, result);
+        unlock(result);
       } catch (e3) {
         unlockError(e3);
       } finally {
@@ -58960,57 +58958,6 @@ Inferred class string: "${iconClasses}."`
     }
     return templateCopy;
   }
-  function e(e3) {
-    this.message = e3;
-  }
-  e.prototype = new Error(), e.prototype.name = "InvalidCharacterError";
-  var r = "undefined" != typeof window && window.atob && window.atob.bind(window) || function(r2) {
-    var t2 = String(r2).replace(/=+$/, "");
-    if (t2.length % 4 == 1)
-      throw new e("'atob' failed: The string to be decoded is not correctly encoded.");
-    for (var n2, o2, a2 = 0, i2 = 0, c2 = ""; o2 = t2.charAt(i2++); ~o2 && (n2 = a2 % 4 ? 64 * n2 + o2 : o2, a2++ % 4) ? c2 += String.fromCharCode(255 & n2 >> (-2 * a2 & 6)) : 0)
-      o2 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".indexOf(o2);
-    return c2;
-  };
-  function t(e3) {
-    var t2 = e3.replace(/-/g, "+").replace(/_/g, "/");
-    switch (t2.length % 4) {
-      case 0:
-        break;
-      case 2:
-        t2 += "==";
-        break;
-      case 3:
-        t2 += "=";
-        break;
-      default:
-        throw "Illegal base64url string!";
-    }
-    try {
-      return function(e4) {
-        return decodeURIComponent(r(e4).replace(/(.)/g, function(e6, r2) {
-          var t3 = r2.charCodeAt(0).toString(16).toUpperCase();
-          return t3.length < 2 && (t3 = "0" + t3), "%" + t3;
-        }));
-      }(t2);
-    } catch (e4) {
-      return r(t2);
-    }
-  }
-  function n(e3) {
-    this.message = e3;
-  }
-  function o(e3, r2) {
-    if ("string" != typeof e3)
-      throw new n("Invalid token specified");
-    var o2 = true === (r2 = r2 || {}).header ? 0 : 1;
-    try {
-      return JSON.parse(t(e3.split(".")[o2]));
-    } catch (e4) {
-      throw new n("Invalid token specified: " + e4.message);
-    }
-  }
-  n.prototype = new Error(), n.prototype.name = "InvalidTokenError";
   const Wrapper$2 = styled__default.default.div`
     display: flex;
     align-items: center;
@@ -59148,28 +59095,6 @@ Inferred class string: "${iconClasses}."`
     }
     return isLoading ? /* @__PURE__ */ React__default.default.createElement(DefaultFallback, null) : children;
   }
-  async function checkTokenExpiry(token) {
-    if (token) {
-      try {
-        const decoded = o(token);
-        if (decoded.exp * 1e3 - Date.now() < 5 * 60 * 1e3) {
-          const res = await request("/api/auth/refresh-token", {
-            headers: {
-              Accept: "application/json",
-              "Content-Type": "application/json"
-            },
-            method: "POST"
-          });
-          if (res.ok) {
-            const { token: newToken } = await res.json();
-            return newToken;
-          }
-        }
-      } catch (e3) {
-        console.warn("Failed to refresh token", e3);
-      }
-    }
-  }
   function DynamicAuthComponent(props) {
     const importers = React.useContext(importersCtx);
     const [component, setComponent] = React.useState(() => /* @__PURE__ */ React__default.default.createElement(DefaultFallback, null));
@@ -59199,19 +59124,6 @@ Inferred class string: "${iconClasses}."`
       isMounted.current = true;
       store.setValue("sessionToken", getToken());
     }
-    React.useEffect(() => {
-      if (!(authConfig == null ? void 0 : authConfig.supports_token_refresh)) {
-        return;
-      }
-      const interval = setInterval(async () => {
-        const token = await store.getValue("sessionToken");
-        const newToken = await checkTokenExpiry(token);
-        if (newToken) {
-          store.setValue("sessionToken", newToken);
-        }
-      }, 60 * 1e3);
-      return () => clearInterval(interval);
-    }, [authConfig]);
     React.useEffect(() => {
       return store.subscribe("sessionToken", (newToken) => {
         const key = getTokenKey();

{dara_core-1.14.0a1.dist-info → dara_core-1.14.0a2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dara-core
-Version: 1.14.0a1
+Version: 1.14.0a2
 Summary: Dara Framework Core
 Home-page: https://dara.causalens.com/
 License: Apache-2.0
@@ -20,10 +20,10 @@ Requires-Dist: async-asgi-testclient (>=1.4.11,<2.0.0)
 Requires-Dist: certifi (>=2024.7.4)
 Requires-Dist: click (==8.1.3)
 Requires-Dist: colorama (>=0.4.6,<0.5.0)
-Requires-Dist: create-dara-app (==1.14.0-alpha.1)
+Requires-Dist: create-dara-app (==1.14.0-alpha.2)
 Requires-Dist: croniter (>=1.0.15,<2.0.0)
 Requires-Dist: cryptography (>=42.0.4)
-Requires-Dist: dara-components (==1.14.0-alpha.1) ; extra == "all"
+Requires-Dist: dara-components (==1.14.0-alpha.2) ; extra == "all"
 Requires-Dist: exceptiongroup (>=1.1.3,<2.0.0)
 Requires-Dist: fastapi (==0.109.0)
 Requires-Dist: fastapi-vite (==0.3.1)
@@ -51,7 +51,7 @@ Description-Content-Type: text/markdown
 
 # Dara Application Framework
 
-<img src="https://github.com/causalens/dara/blob/v1.14.0-alpha.1/img/dara_light.svg?raw=true">
+<img src="https://github.com/causalens/dara/blob/v1.14.0-alpha.2/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)
@@ -96,7 +96,7 @@ source .venv/bin/activate
 dara start
 ```
 
-![Dara App](https://github.com/causalens/dara/blob/v1.14.0-alpha.1/img/components_gallery.png?raw=true)
+![Dara App](https://github.com/causalens/dara/blob/v1.14.0-alpha.2/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:
 
@@ -113,9 +113,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.14.0-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.14.0-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.14.0-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.14.0-alpha.2/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.14.0-alpha.2/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.14.0-alpha.2/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!
 
@@ -142,9 +142,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.14.0-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.14.0-alpha.2/CONTRIBUTING.md) file.
 
 ## License
 
-Dara is open-source and licensed under the [Apache 2.0 License](https://github.com/causalens/dara/blob/v1.14.0-alpha.1/LICENSE).
+Dara is open-source and licensed under the [Apache 2.0 License](https://github.com/causalens/dara/blob/v1.14.0-alpha.2/LICENSE).
 

{dara_core-1.14.0a1.dist-info → dara_core-1.14.0a2.dist-info}/RECORD

@@ -1,10 +1,10 @@
 dara/core/__init__.py,sha256=w3OUU03lGXA45_Sf99CsNWL6SZ7tr7y4wRYq6pdGmhM,2186
 dara/core/actions.py,sha256=gARcrrtzYuBAVJUCtuHwpFc6PPVPb7x3ITIISCLw0GA,965
 dara/core/auth/__init__.py,sha256=H0bJoXff5wIRZmHvvQ3y9p5SXA9lM8OuLCGceYGqfb0,851
-dara/core/auth/base.py,sha256=EX80DszIaAX276bbqTQuynkfCOD7o_xdzFCrqMTy4bw,3439
+dara/core/auth/base.py,sha256=jZNuCMoBHQcxWeLpTUzcxdbkbWUJ42jbtKgnnrwvNVA,3201
 dara/core/auth/basic.py,sha256=IMkoC1OeeRmnmjIqPHpybs8zSdbLlNKYLRvj08ajirg,4692
 dara/core/auth/definitions.py,sha256=fx-VCsElP9X97gM0Eql-4lFpLa0UryokmGZhQQat2NU,3511
-dara/core/auth/routes.py,sha256=uaytzxMm6aOueRZ2ovQFg9Rx5F4OCu0TtCEI8hEN5h0,7108
+dara/core/auth/routes.py,sha256=x3oFLOkgi7-r0mqFD0GgM3hdS1JkmLHWQ6mNnEKRDDk,7951
 dara/core/auth/utils.py,sha256=ngOi5j71Xu-G59yWxGoejBEmMnVyGS67aF7czt_0i7A,3062
 dara/core/base_definitions.py,sha256=r_W_qk6_VvvskbPEPjTF6xUh3o_lkNBWMFhN1Pic8Ks,14868
 dara/core/cli.py,sha256=ycTB7QHCB-74OnKnjXqkXq-GBqyjBqo7u4v1kTgv2jE,7656
@@ -54,13 +54,13 @@ dara/core/internal/port_utils.py,sha256=AQOUNiFNBYKVUwQ7i9UlY1NQ3sWb5xh5GkO6P1Bm
 dara/core/internal/registries.py,sha256=9WDczIsNeSmzi6aViIq_b14lmmYGGkdsUGHpv0Sg9zo,3278
 dara/core/internal/registry.py,sha256=ONCDusqaL0q59Py_r8-fFVN3vbkkDf5TXzNvbB9SrGQ,4305
 dara/core/internal/registry_lookup.py,sha256=8snHu2wUUsngXjHyHh6eZqL_WwonTTQB6-WBX-R_WZg,2238
-dara/core/internal/routing.py,sha256=pMsvv-a-P8bXK7_4oHXFlHFB8PO7yu8C4qeyultsys8,22863
+dara/core/internal/routing.py,sha256=Wdy11iWDeAf2PyHXZv5mPeJ_BEcoR0XftOl3M8vUhJU,22782
 dara/core/internal/scheduler.py,sha256=z6OYwazBf3GYo8CzMC9IuGC2P96gI7JwxquT8GaoTMk,12944
 dara/core/internal/settings.py,sha256=wAWxl-HXjq7PW3twe_CrR-UuMRw9VBudC3eRmevZAhM,3869
 dara/core/internal/store.py,sha256=qVyU7JfC3zE2vYC2mfjmvECWMlFS9b-nMF1k-alg4Y8,7756
 dara/core/internal/tasks.py,sha256=XK-GTIyge8RBYAfzNs3rmLYVNSKIarCzPdqRSVGg-4M,24728
 dara/core/internal/utils.py,sha256=b1YYkn8qHl6-GY6cCm2MS1NXRS9j_rElYCKMZOxJgrY,8232
-dara/core/internal/websocket.py,sha256=dhvE7KnolBHwPy9E6Ac1tjzOn0fAtdhDdcMUs47WuuQ,20138
+dara/core/internal/websocket.py,sha256=i6QXWHfcWbQDT3dk9F_7yw5CNhkC-lnqMoH7EKHBqC4,21676
 dara/core/jinja/index.html,sha256=iykqiRh3H_HkcjHJeeSRXRu45nZ2y1sZX5FLdPRhlQY,726
 dara/core/jinja/index_autojs.html,sha256=MRF5J0vNfzZQm9kPEeLl23sbr08fVSRd_PAUD6Fkc_0,1253
 dara/core/js_tooling/custom_js_scaffold/index.tsx,sha256=FEzSV5o5Nyzxw6eXvGLi7BkEBkXf3brV34_7ATLnY7o,68
@@ -81,7 +81,7 @@ dara/core/metrics/cache.py,sha256=ybofUhZO0TCHeyhB_AtldWk1QTmTKh7GucTXpOkeTFA,25
 dara/core/metrics/runtime.py,sha256=YP-6Dz0GeI9_Yr7bUk_-OqShyFySGH_AKpDO126l6es,1833
 dara/core/metrics/utils.py,sha256=rYlBinxFc7VehFT5cTNXLk8gC74UEj7ZGq6vLgIDpSg,2247
 dara/core/persistence.py,sha256=TO94rPAN7jxZKVCC5YA4eE7GGDoNlCPe-BkkItV2VUE,10379
-dara/core/umd/dara.core.umd.js,sha256=aoI0q4aTvmfTHfpfm7kibJ5smW0g8fw73Yhm413ivqk,4880827
+dara/core/umd/dara.core.umd.js,sha256=yJvT54abv74o8fFuSoeH1NucuJVl90UFfeM3ZsCp3c8,4877860
 dara/core/umd/style.css,sha256=YQtQ4veiSktnyONl0CU1iU1kKfcQhreH4iASi1MP7Ak,4095007
 dara/core/visual/__init__.py,sha256=QN0wbG9HPQ_vXh8BO8DnBXeYLIENVTNtRmYzZf1lx7c,577
 dara/core/visual/components/__init__.py,sha256=O-Em_glGdZNO0LLl2RWmJSrQiXKxliXg_PuhVXGT81I,1811
@@ -105,8 +105,8 @@ dara/core/visual/themes/__init__.py,sha256=aM4mgoIYo2neBSw5FRzswsht7PUKjLthiHLmF
 dara/core/visual/themes/dark.py,sha256=UQGDooOc8ric73eHs9E0ltYP4UCrwqQ3QxqN_fb4PwY,1942
 dara/core/visual/themes/definitions.py,sha256=m3oN0txs65MZepqjj7AKMMxybf2aq5fTjcTwJmHqEbk,2744
 dara/core/visual/themes/light.py,sha256=-Tviq8oEwGbdFULoDOqPuHO0UpAZGsBy8qFi0kAGolQ,1944
-dara_core-1.14.0a1.dist-info/LICENSE,sha256=r9u1w2RvpLMV6YjuXHIKXRBKzia3fx_roPwboGcLqCc,10944
-dara_core-1.14.0a1.dist-info/METADATA,sha256=JB08LXBABVJNycKVooSE4d8HBimcoqfn4eRVezp8DK0,7457
-dara_core-1.14.0a1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-dara_core-1.14.0a1.dist-info/entry_points.txt,sha256=H__D5sNIGuPIhVam0DChNL-To5k8Y7nY7TAFz9Mz6cc,139
-dara_core-1.14.0a1.dist-info/RECORD,,
+dara_core-1.14.0a2.dist-info/LICENSE,sha256=r9u1w2RvpLMV6YjuXHIKXRBKzia3fx_roPwboGcLqCc,10944
+dara_core-1.14.0a2.dist-info/METADATA,sha256=RLDwxR63x52m9wlBKPA8P5Eg8s8bKifiPIybYPcpTT0,7457
+dara_core-1.14.0a2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+dara_core-1.14.0a2.dist-info/entry_points.txt,sha256=H__D5sNIGuPIhVam0DChNL-To5k8Y7nY7TAFz9Mz6cc,139
+dara_core-1.14.0a2.dist-info/RECORD,,