dara-core 1.22.4__py3-none-any.whl → 1.23.0a1__py3-none-any.whl

dara/core/auth/utils.py

@@ -17,12 +17,11 @@ limitations under the License.
 
 import asyncio
 import uuid
-from collections.abc import Callable
+from collections.abc import Awaitable, Callable
 from datetime import datetime, timedelta, timezone
 from typing import Any
 
 import jwt
-from anyio import to_thread
 
 from dara.core.auth.definitions import (
     EXPIRED_TOKEN_ERROR,
@@ -187,7 +186,9 @@ Shared token refresh cache instance
 
 
 async def cached_refresh_token(
-    do_refresh_token: Callable[[TokenData, str], tuple[str, str]], old_token_data: TokenData, refresh_token: str
+    do_refresh_token: Callable[[TokenData, str], Awaitable[tuple[str, str]]],
+    old_token_data: TokenData,
+    refresh_token: str,
 ):
     """
     A utility to run a token refresh method with caching to prevent multiple concurrent refreshes
@@ -214,7 +215,7 @@ async def cached_refresh_token(
             return cached_result
 
         # Run the refresh function
-        result = await to_thread.run_sync(do_refresh_token, old_token_data, refresh_token)
+        result = await do_refresh_token(old_token_data, refresh_token)
 
         # update cache
         token_refresh_cache.set_cached_value(cache_key, result)

dara/core/configuration.py

@@ -582,6 +582,10 @@ class ConfigurationBuilder:
         if len(self._errors) > 0:
             raise ValueError('This configuration has errors: \n' + '\n'.join(self._errors))
 
+        # Merge selected auth config's configuration
+        all_startup_functions = [self.auth_config.startup_hook, *self.startup_functions]
+        all_routes = [*self.auth_config.required_routes, *self.routes]
+
         return Configuration(
             actions=self._actions,
             auth_config=self.auth_config,
@@ -595,11 +599,11 @@ class ConfigurationBuilder:
             pages=self._pages,
             powered_by_causalens=self.powered_by_causalens,
             package_tag_processors=self._package_tags_processors,
-            routes=self.routes,
+            routes=all_routes,
             router=self.router,
             static_files_dir=self.static_files_dir,
             scheduled_jobs=self.scheduled_jobs,
-            startup_functions=self.startup_functions,
+            startup_functions=all_startup_functions,
             static_folders=self._static_folders,
             task_module=self.task_module,
             template=self.template,

dara/core/internal/settings.py

@@ -35,15 +35,6 @@ class Settings(BaseSettings):
     # Feature flags
     cgroup_memory_limit_enabled: bool = False
 
-    # SSO envs
-    sso_issuer_url: str = 'https://login.causalens.com/api/authentication'
-    sso_client_id: str = ''
-    sso_client_secret: str = ''
-    sso_redirect_uri: str = ''
-    sso_groups: str = ''
-    sso_jwt_algo: str = 'ES256'
-    sso_verify_audience: bool = False
-    sso_extra_audience: list[str] | None = None
     model_config = SettingsConfigDict(env_file='.env', extra='allow')
 
 
@@ -53,12 +44,6 @@ def generate_env_content():
     """
     env_content = {
         'JWT_SECRET': token_hex(32),
-        'SSO_ISSUER_URL': '',
-        'SSO_CLIENT_ID': '',
-        'SSO_CLIENT_SECRET': '',
-        'SSO_REDIRECT_URI': '',
-        'SSO_GROUPS': 'Everyone',
-        'SSO_VERIFY_AUDIENCE': False,
     }
     return '\n'.join(f'{key}={value}' for key, value in env_content.items())
 
@@ -86,7 +71,8 @@ def get_settings():
 
     env_error = False
 
-    # Generate .env file if it's missing
+    # Generate .env file if it's missing - this is to persistn the JWT_SECRET so
+    # tokens are valid across restarts
     if not os.path.isfile(os.path.join(os.getcwd(), '.env')):
         dev_logger.debug('.env file not found, generating the file...')
         try:
@@ -99,15 +85,4 @@ def get_settings():
     if env_error:
         settings_kwargs['_env_file'] = None
 
-    # If AUDIENCE sso env variants are provided, use them and force verify audience to True
-    # SSO_VERIFY_AUDIENCE can be set explicitly to False to override this behavior.
-    dotenv_vals = dotenv_values(os.path.join(os.getcwd(), '.env')) if not env_error else {}
-    audience_id = os.environ.get('SSO_AUDIENCE_CLIENT_ID', dotenv_vals.get('SSO_AUDIENCE_CLIENT_ID'))
-    audience_secret = os.environ.get('SSO_AUDIENCE_CLIENT_SECRET', dotenv_vals.get('SSO_AUDIENCE_CLIENT_SECRET'))
-    enable_audience_check = os.environ.get('SSO_VERIFY_AUDIENCE', dotenv_vals.get('SSO_VERIFY_AUDIENCE'))
-    if enable_audience_check != 'False' and audience_id is not None and audience_secret is not None:
-        return Settings(
-            sso_client_id=audience_id, sso_client_secret=audience_secret, sso_verify_audience=True, **settings_kwargs
-        )
-
     return Settings(**settings_kwargs)

dara/core/internal/utils.py

@@ -162,15 +162,10 @@ def enforce_sso(conf: ConfigurationBuilder):
 
     Raises if SSO is not used
     """
-    try:
-        from dara.enterprise import SSOAuthConfig  # pyright: ignore[reportMissingImports]
-
-        if conf.auth_config is None or not isinstance(conf.auth_config, SSOAuthConfig):
-            raise ValueError('Config does not have SSO auth enabled. Please update your application to configure SSO.')
-    except ImportError as err:
-        raise ValueError(
-            'SSO is not enabled. Please install the dara_enterprise package and configure SSO to use this feature.'
-        ) from err
+    from dara.core.auth.oidc.config import OIDCAuthConfig
+
+    if conf.auth_config is None or not isinstance(conf.auth_config, OIDCAuthConfig):
+        raise ValueError('Config does not have SSO auth enabled. Please update your application to configure SSO.')
 
 
 P = ParamSpec('P')

dara/core/internal/websocket.py

@@ -39,9 +39,6 @@ from pydantic import (
 )
 from starlette.websockets import WebSocket, WebSocketDisconnect
 
-from dara.core.auth.base import BaseAuthConfig
-from dara.core.auth.definitions import AuthError, TokenData
-from dara.core.auth.utils import decode_token
 from dara.core.base_definitions import DaraBaseModel as BaseModel
 from dara.core.logging import dev_logger, eng_logger
 
@@ -434,7 +431,9 @@ async def ws_handler(websocket: WebSocket, token: str | None = Query(default=Non
     if token is None:
         raise WebSocketException(code=403, reason='Token missing from websocket connection query parameter')
 
-    from dara.core.auth.definitions import ID_TOKEN, SESSION_ID, USER, UserData
+    from dara.core.auth.base import BaseAuthConfig
+    from dara.core.auth.definitions import ID_TOKEN, SESSION_ID, USER, AuthError, TokenData, UserData
+    from dara.core.auth.utils import decode_token
     from dara.core.internal.registries import (
         auth_registry,
         pending_tokens_registry,

{dara_core-1.22.4.dist-info → dara_core-1.23.0a1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dara-core
-Version: 1.22.4
+Version: 1.23.0a1
 Summary: Dara Framework Core
 Home-page: https://dara.causalens.com/
 License: Apache-2.0
@@ -21,10 +21,10 @@ Requires-Dist: cachetools (>=5.0.0)
 Requires-Dist: certifi (>=2024.7.4)
 Requires-Dist: click (>=8.1.3,<9.0.0)
 Requires-Dist: colorama (>=0.4.6,<0.5.0)
-Requires-Dist: create-dara-app (==1.22.4)
+Requires-Dist: create-dara-app (==1.23.0-alpha.1)
 Requires-Dist: croniter (>=6.0.0,<7.0.0)
 Requires-Dist: cryptography (>=42.0.4)
-Requires-Dist: dara-components (==1.22.4) ; extra == "all"
+Requires-Dist: dara-components (==1.23.0-alpha.1) ; extra == "all"
 Requires-Dist: exceptiongroup (>=1.1.3,<2.0.0)
 Requires-Dist: fastapi (>=0.115.0,<0.121.0)
 Requires-Dist: fastapi_vite_dara (==0.4.0)
@@ -55,7 +55,7 @@ Description-Content-Type: text/markdown
 
 # Dara Application Framework
 
-<img src="https://github.com/causalens/dara/blob/v1.22.4/img/dara_light.svg?raw=true">
+<img src="https://github.com/causalens/dara/blob/v1.23.0-alpha.1/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)
@@ -100,7 +100,7 @@ source .venv/bin/activate
 dara start
 ```
 
-![Dara App](https://github.com/causalens/dara/blob/v1.22.4/img/components_gallery.png?raw=true)
+![Dara App](https://github.com/causalens/dara/blob/v1.23.0-alpha.1/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:
 
@@ -117,9 +117,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.22.4/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.22.4/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.22.4/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.23.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.23.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.23.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. |
 
 Check out our [App Gallery](https://dara.causalens.com/gallery) for more inspiration!
 
@@ -146,9 +146,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.22.4/CONTRIBUTING.md) file.
+More information on the repository structure can be found in the [CONTRIBUTING.md](https://github.com/causalens/dara/blob/v1.23.0-alpha.1/CONTRIBUTING.md) file.
 
 ## License
 
-Dara is open-source and licensed under the [Apache 2.0 License](https://github.com/causalens/dara/blob/v1.22.4/LICENSE).
+Dara is open-source and licensed under the [Apache 2.0 License](https://github.com/causalens/dara/blob/v1.23.0-alpha.1/LICENSE).
 

{dara_core-1.22.4.dist-info → dara_core-1.23.0a1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 dara/core/__init__.py,sha256=yTp-lXT0yy9XqLGYWlmjPgFG5g2eEg2KhKo8KheTHoo,1408
 dara/core/_assets/__init__.py,sha256=13vMoWHvl1zcFcjNHh8lbTwWOvu4f7krYSco978qxwM,723
 dara/core/_assets/auto_js/dara.core.css,sha256=yT3PKpi2sKI2-kQIF8xtVbTPQqgpK7-Ua7tfzDPuSsI,4095881
-dara/core/_assets/auto_js/dara.core.umd.cjs,sha256=MAAtfLJqG-7TJoXDMv_PU6_ovsXLNYfsyBtxJk0gsbs,5158199
+dara/core/_assets/auto_js/dara.core.umd.cjs,sha256=T9MOYSRnuHnraSboQ7NcfodV8vrBkNGISoCZQCuc4Ec,5163725
 dara/core/_assets/auto_js/react-dom.development.js,sha256=vR2Fq5LXMKS5JsTo2CMl6oGCJT8scJV2wXSteTtx8aE,1077040
 dara/core/_assets/auto_js/react-is.development.js,sha256=2IRgmaphdMq6wx2MbsmVUQ0UwapGETNjgano3XEkGcc,7932
 dara/core/_assets/auto_js/react-query.development.js,sha256=lI2fTKMvWmjbagGQaVtZYr51_-C_U_so064JwetuDS0,130366
@@ -9,15 +9,21 @@ dara/core/_assets/auto_js/react.development.js,sha256=suVuJ5m2DeVlNaMn0ZXgSNv1Ch
 dara/core/_assets/auto_js/styled-components.min.js,sha256=lkKPu9UEzt3nP-0GdH0T1xG1kJ89GHvB4oAcdU8NG2I,33596
 dara/core/_assets/common/jquery.min.js,sha256=w8CvhFs7iHNVUtnSP0YKEg00p9Ih13rlL9zGqvLdePA,72535
 dara/core/actions.py,sha256=rC5Tu79AFNWMv0CJuchBnoy6pETIFh_1RTSqxrolArI,947
-dara/core/auth/__init__.py,sha256=H0bJoXff5wIRZmHvvQ3y9p5SXA9lM8OuLCGceYGqfb0,851
-dara/core/auth/base.py,sha256=fPkRXmgMYCbsED4SxRu3h729KIPi1PUSTeiGRLhUOm8,3263
+dara/core/auth/__init__.py,sha256=HJoYIVPzbpwzN_RUHjGpSJj4o5TmHz9yFyZGiRiObCk,906
+dara/core/auth/base.py,sha256=NJmUJqA-W8AVKIQbX_0BoHoZqtU1Iz6cJ16RKdcdIyU,3642
 dara/core/auth/basic.py,sha256=sglIaogCslG2HlDMjFsaaJhOJeXUW-QQLTIYPaUPxAU,4927
-dara/core/auth/definitions.py,sha256=DWvhvXTLQyJ0x-P_r4SycVOWht7R_us_ca2a4biJlTY,3379
+dara/core/auth/definitions.py,sha256=OzJshDLuut8MaM_pbfyQFkSlUuMNBWNszA57jRXF0Cg,3848
+dara/core/auth/oidc/__init__.py,sha256=UWdhFvDqLCoILaKVWbmrrJgiMgg9wlVZgCxRvf_HGHM,65
+dara/core/auth/oidc/config.py,sha256=5rDxbr3wVZdjIz8USYNeUmKwKfeucHtLgfXwM3_weaE,20835
+dara/core/auth/oidc/definitions.py,sha256=KLlUl2Y7n6prX0JSAwPde6J43iMs6uUY07OG7kumRPw,17568
+dara/core/auth/oidc/routes.py,sha256=uvNHYUieaXy9hu6MYe_5eZvflX5TmFaIv6EGpCRP-dw,5335
+dara/core/auth/oidc/settings.py,sha256=k1CKDTUKSFoCEp1ASI_R5L_lsNkFzjfAymMMIMmI1AE,2097
+dara/core/auth/oidc/utils.py,sha256=IL17tStRNpkAQI3M17nrzGeb4xr47zSLPo4wT7LMwBQ,5145
 dara/core/auth/routes.py,sha256=dtOxpFotnt4XQ4spW3mbyM7ThYRvfIA_oRK5X5lyYHg,7256
-dara/core/auth/utils.py,sha256=12dbakr4DkZu8PjS57YlV79Oh-SVaqkoYliCSAseywQ,7307
+dara/core/auth/utils.py,sha256=_aHZ98qMJ0VLE9Zfvj5biPARhe973_eyTx2qxnufzRE,7290
 dara/core/base_definitions.py,sha256=mwaeUjmS1SNMcj3IUHw6M4sNq0NkOozMpMQXS0EAD_s,21965
 dara/core/cli.py,sha256=i9-Xtdee80b153TSU9fFSWbHQYCi01ci_Lo8SzwnW7M,8130
-dara/core/configuration.py,sha256=PAxtnIF86kRh3D7DrdB3lxwl2QkA008aKSykvcLGlCE,23353
+dara/core/configuration.py,sha256=Zy9wj2VDZd-mo4xAo3oSe8mJ0NHT6eYxz4hhqIJ9rXo,23565
 dara/core/css.py,sha256=c1TMGzOcXYIy-qU-TxeirGlq2BNEigP80eDG3ItjRbU,1740
 dara/core/data_utils.py,sha256=haR-SPCFm90RfOIndPBGOpFtOEmhiJgizmzcqzZOZBg,12455
 dara/core/defaults.py,sha256=ejSXYKm78vd0_3b-3x6K8lffU-7BWyEhqQuwdBkkWwU,4884
@@ -72,11 +78,11 @@ dara/core/internal/registry.py,sha256=Wqt7tEOmf5bR8D6lFIcLd3W1EtlENT364vRhxSqeOI
 dara/core/internal/registry_lookup.py,sha256=XgZ4PL4RLyKWNTXkh08lL6mmU492xgdPUsvFKA6pKDY,2411
 dara/core/internal/routing.py,sha256=C4_GLsXHueQ2Q4VVDgrY9bezr3YGZFdL6Yfs6C81Op8,26458
 dara/core/internal/scheduler.py,sha256=3LYdWAyFp8N1s9Xfud9XYwUbjcHpI-hCay3jZ5zRAiQ,12991
-dara/core/internal/settings.py,sha256=tlJmmpN_bSwxIZPJcb9EyUcCxicV4LM0xj2G6Qvj_9A,3900
+dara/core/internal/settings.py,sha256=2g-PIoYVLlGoBNKoXTIbkH1FGV8TXUXRdwuhQ6cTrkE,2614
 dara/core/internal/store.py,sha256=aq37Tk4J3DoqzLVHuZRbZFkpghKP-oiCbpQfIE95gCo,6399
 dara/core/internal/tasks.py,sha256=qkJH3cu4o27SBKxkFjS_TUDispq0R0uHICKRbzMYOmU,35989
-dara/core/internal/utils.py,sha256=rlxxLXPVZ0SpzGDHEe2bqSTvOJCRD5Fn6YeUNflrWC4,9007
-dara/core/internal/websocket.py,sha256=etFWnCZwFg9aiLpjB1sMSfJUjPRvSAq_5RyOu_AH_dY,21864
+dara/core/internal/utils.py,sha256=vcrqnV8e4jvewS14w7RizAmerVWBwcqHjTEe5rcgARE,8766
+dara/core/internal/websocket.py,sha256=nkxLdRPzGSNFM_JHKDyT8codIHPtbbziwpOv2i00XiE,21834
 dara/core/jinja/index.html,sha256=O3uyA9Hozwbqh--wQq5IHuLNEFUNf2BykWLGuIZqUjo,3025
 dara/core/jinja/index_autojs.html,sha256=ov9qg_ymClTL9BdhZw86jS4UKC5jy5PufIrb9F7sy9w,3009
 dara/core/js_tooling/custom_js_scaffold/index.tsx,sha256=FEzSV5o5Nyzxw6eXvGLi7BkEBkXf3brV34_7ATLnY7o,68
@@ -128,8 +134,8 @@ dara/core/visual/themes/__init__.py,sha256=aM4mgoIYo2neBSw5FRzswsht7PUKjLthiHLmF
 dara/core/visual/themes/dark.py,sha256=QazCRDqh_SCOyQhdwMkH1wbHf301oL7gCFj91plbLww,2020
 dara/core/visual/themes/definitions.py,sha256=dtET2YUlwXkO6gJ23MqSb8gIq-LxJ343CWsgueWSifM,2787
 dara/core/visual/themes/light.py,sha256=dtHb6Q1HOb5r_AvJfe0vZajikVc-GnBEUrGsTcI5MHA,2022
-dara_core-1.22.4.dist-info/LICENSE,sha256=r9u1w2RvpLMV6YjuXHIKXRBKzia3fx_roPwboGcLqCc,10944
-dara_core-1.22.4.dist-info/METADATA,sha256=kasdTO9djraqpTHeJ3mC-TXl-bVKyD3Fuzz_lmPclwA,7524
-dara_core-1.22.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-dara_core-1.22.4.dist-info/entry_points.txt,sha256=nAT9o1kJCmTK1saDh29PFGFD6cbxDDDjTj31HDEDwfU,197
-dara_core-1.22.4.dist-info/RECORD,,
+dara_core-1.23.0a1.dist-info/LICENSE,sha256=r9u1w2RvpLMV6YjuXHIKXRBKzia3fx_roPwboGcLqCc,10944
+dara_core-1.23.0a1.dist-info/METADATA,sha256=WH9TER9_ycRXWaU40zxhvD5teCWhUbExsBay21YHW_w,7598
+dara_core-1.23.0a1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+dara_core-1.23.0a1.dist-info/entry_points.txt,sha256=nAT9o1kJCmTK1saDh29PFGFD6cbxDDDjTj31HDEDwfU,197
+dara_core-1.23.0a1.dist-info/RECORD,,