squirrels 0.5.0rc0__py3-none-any.whl → 0.5.1__py3-none-any.whl

squirrels/{arguments → _arguments}/init_time_args.py

@@ -19,6 +19,11 @@ class ConnectionsArgs:
         return self._env_vars.copy()
 
 
+@dataclass
+class AuthProviderArgs(ConnectionsArgs):
+    pass
+
+
 @dataclass
 class ParametersArgs(ConnectionsArgs):
     pass
@@ -88,14 +93,14 @@ class BuildModelArgs(_WithConnectionDictArgs):
 
     def run_sql_on_dataframes(self, sql_query: str, *, dataframes: dict[str, pl.LazyFrame] | None = None, **kwargs) -> pl.DataFrame:
         """
-        Uses a dictionary of dataframes to execute a SQL query in an embedded in-memory database (sqlite or duckdb based on setting)
+        Uses a dictionary of dataframes to execute a SQL query in an embedded in-memory DuckDB database
 
         Arguments:
             sql_query: The SQL query to run
             dataframes: A dictionary of table names to their polars LazyFrame. If None, uses results of dependent models
         
         Returns:
-            The result as a polars LazyFrame from running the query
+            The result as a polars DataFrame from running the query
         """
         if dataframes is None:
             dataframes = {x: self.ref(x) for x in self._dependencies}

squirrels/{arguments → _arguments}/run_time_args.py

@@ -1,45 +1,23 @@
 from typing import Callable, Any, Coroutine
 import polars as pl
 
-from .init_time_args import _WithConnectionDictArgs, ParametersArgs, BuildModelArgs, ConnectionsArgs
-from .._auth import BaseUser
-from ..parameters import Parameter, TextValue
-
-
-class AuthLoginArgs(_WithConnectionDictArgs):
-
-    def __init__(
-        self, conn_args: ConnectionsArgs, _connections: dict[str, Any], 
-        username: str, 
-        password: str
-    ):
-        super().__init__(conn_args.project_path, conn_args.proj_vars, conn_args.env_vars, _connections)
-        self.username = username
-        self.password = password
-
-
-class AuthTokenArgs(_WithConnectionDictArgs):
-
-    def __init__(
-        self, conn_args: ConnectionsArgs, _connections: dict[str, Any], 
-        token: str
-    ):
-        super().__init__(conn_args.project_path, conn_args.proj_vars, conn_args.env_vars, _connections)
-        self.token = token
+from .init_time_args import ParametersArgs, BuildModelArgs
+from .._schemas.auth_models import AbstractUser
+from .._parameters import Parameter, TextValue
 
 
 class ContextArgs(ParametersArgs):
 
     def __init__(
         self, param_args: ParametersArgs, 
-        user: BaseUser | None, 
-        prms: dict[str, Parameter], 
-        traits: dict[str, Any]
+        user: AbstractUser, 
+        prms: dict[str, Parameter],
+        configurables: dict[str, str]
     ):
         super().__init__(param_args.project_path, param_args.proj_vars, param_args.env_vars)
         self.user = user
         self._prms = prms
-        self._traits = traits
+        self._configurables = configurables
         self._placeholders = {}
 
     @property
@@ -50,14 +28,14 @@ class ContextArgs(ParametersArgs):
         return self._prms.copy()
     
     @property
-    def traits(self) -> dict[str, Any]:
+    def configurables(self) -> dict[str, str]:
         """
-        A dictionary of dataset trait name to value
+        A dictionary of configurable name to value (set by application)
         """
-        return self._traits.copy()
+        return self._configurables.copy()
 
     @property
-    def placeholders(self) -> dict[str, Any]:
+    def _placeholders_copy(self) -> dict[str, Any]:
         """
         A dictionary of placeholder name to placeholder value
         """
@@ -102,8 +80,8 @@ class ModelArgs(BuildModelArgs, ContextArgs):
         self._env_vars = ctx_args.env_vars
         self.user = ctx_args.user
         self._prms = ctx_args.prms
-        self._traits = ctx_args.traits
-        self._placeholders = ctx_args.placeholders
+        self._configurables = ctx_args.configurables
+        self._placeholders = ctx_args._placeholders_copy
         self._connections = build_model_args.connections
         self._dependencies = build_model_args.dependencies
         self._ref = build_model_args.ref