squirrels 0.3.1__tar.gz → 0.3.3__tar.gz

{squirrels-0.3.1 → squirrels-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: squirrels
-Version: 0.3.1
+Version: 0.3.3
 Summary: Squirrels - API Framework for Data Analytics
 Home-page: https://squirrels-analytics.github.io
 License: Apache-2.0
@@ -20,7 +20,7 @@ Classifier: Typing :: Typed
 Provides-Extra: duckdb
 Requires-Dist: cachetools (>=5.3.2,<6.0.0)
 Requires-Dist: duckdb-engine (>=0.13.0,<1.0.0) ; extra == "duckdb"
-Requires-Dist: fastapi (>=0.110.1,<1.0.0)
+Requires-Dist: fastapi (>=0.112.1,<0.113.0)
 Requires-Dist: gitpython (>=3.1.41,<4.0.0)
 Requires-Dist: inquirer (>=3.2.1,<4.0.0)
 Requires-Dist: jinja2 (>=3.1.3,<4.0.0)
@@ -28,9 +28,10 @@ Requires-Dist: matplotlib (>=3.8.3,<4.0.0)
 Requires-Dist: networkx (>=3.2.1,<4.0.0)
 Requires-Dist: pandas (>=2.1.4,<3.0.0)
 Requires-Dist: pyjwt (>=2.8.0,<3.0.0)
+Requires-Dist: python-multipart (>=0.0.9,<0.0.10)
 Requires-Dist: pyyaml (>=6.0.1,<7.0.0)
 Requires-Dist: sqlalchemy (>=2.0.25,<3.0.0)
-Requires-Dist: uvicorn (>=0.29.0,<1.0.0)
+Requires-Dist: uvicorn (>=0.30.6,<0.31.0)
 Project-URL: Documentation, https://squirrels-analytics.github.io
 Project-URL: Repository, https://github.com/squirrels-analytics/squirrels
 Description-Content-Type: text/markdown

{squirrels-0.3.1 → squirrels-0.3.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "squirrels"
-version = "0.3.1"
+version = "0.3.3"
 description = "Squirrels - API Framework for Data Analytics"
 license = "Apache-2.0"
 authors = ["Tim Huang <tim.yuting@hotmail.com>"]
@@ -22,7 +22,7 @@ sqrl = "squirrels._command_line:main"
 [tool.poetry.dependencies]
 python = "^3.9"
 cachetools = "^5.3.2"
-fastapi = ">=0.110.1,<1.0.0"
+fastapi = "^0.112.1"
 gitpython = "^3.1.41"
 inquirer = "^3.2.1"
 jinja2 = "^3.1.3"
@@ -30,10 +30,11 @@ pandas = "^2.1.4"
 pyjwt = "^2.8.0"
 pyyaml = "^6.0.1"
 sqlalchemy = "^2.0.25"
-uvicorn = ">=0.29.0,<1.0.0"
+uvicorn = "^0.30.6"
 duckdb-engine = { version = ">=0.13.0,<1.0.0", optional = true }
 matplotlib = "^3.8.3"
 networkx = "^3.2.1"
+python-multipart = "^0.0.9"
 
 
 [tool.poetry.extras]

{squirrels-0.3.1 → squirrels-0.3.3}/squirrels/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.3.1'
+__version__ = '0.3.3'
 
 from .arguments.init_time_args import ConnectionsArgs, ParametersArgs
 from .arguments.run_time_args import AuthArgs, ContextArgs, ModelDepsArgs, ModelArgs

{squirrels-0.3.1 → squirrels-0.3.3}/squirrels/_api_response_models.py

@@ -33,7 +33,6 @@ class SingleSelectParameterModel(SelectParameterModel):
 class MultiSelectParameterModel(SelectParameterModel):
     widget_type: Annotated[str, Field(examples=["multi_select"])]
     show_select_all: bool
-    is_dropdown: bool
     order_matters: bool
     selected_ids: list[str]
 
@@ -63,7 +62,7 @@ class NumberRangeParameterModel(NumericParameterModel):
 class TextParameterModel(ParameterModelBase):
     widget_type: Annotated[str, Field(examples=["text"])]
     entered_text: str
-    is_textarea: bool
+    input_type: str
 
 class ParametersModel(BaseModel):
     parameters: list[

{squirrels-0.3.1 → squirrels-0.3.3}/squirrels/_api_server.py

@@ -81,19 +81,15 @@ class ApiServer:
             except u.InvalidInputError as exc:
                 traceback.print_exc()
                 return JSONResponse(status_code=status.HTTP_400_BAD_REQUEST, 
-                                    content={"message": f"Invalid user input: {str(exc)}"})
+                                    content={"message": str(exc), "blame": "API client"})
             except u.ConfigurationError as exc:
                 traceback.print_exc()
                 return JSONResponse(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, 
-                                    content={"message": f"Squirrels configuration error: {str(exc)}"})
-            except NotImplementedError as exc:
-                traceback.print_exc()
-                return JSONResponse(status_code=status.HTTP_501_NOT_IMPLEMENTED, 
-                                    content={"message": f"Not implemented error: {str(exc)}"})
+                                    content={"message": f"An unexpected error occurred", "blame": "Squirrels project"})
             except Exception as exc:
                 traceback.print_exc()
                 return JSONResponse(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, 
-                                    content={"message": f"Server error: {str(exc)}"})
+                                    content={"message": f"An unexpected error occurred", "blame": "Squirrels framework"})
 
         app.add_middleware(
             CORSMiddleware, allow_origins=["*"], allow_credentials=True, allow_methods=["*"], allow_headers=["*"], 

{squirrels-0.3.1 → squirrels-0.3.3}/squirrels/_authenticator.py

@@ -39,7 +39,7 @@ class Authenticator:
         try:
             real_user = get_user(self._get_auth_args(username, password)) if get_user is not None else None
         except Exception as e:
-            raise u.FileExecutionError(f'Failed to run "{c.GET_USER_FUNC}" in {c.AUTH_FILE}', e)
+            raise u.FileExecutionError(f'Failed to run "{c.GET_USER_FUNC}" in {c.AUTH_FILE}', e) from e
         
         if isinstance(real_user, User):
             return real_user
@@ -53,7 +53,7 @@ class Authenticator:
                 try:
                     return user_cls.Create(username, is_internal=is_internal, **fake_user)
                 except Exception as e:
-                    raise u.FileExecutionError(f'Failed to create user from User model in {c.AUTH_FILE}', e)
+                    raise u.FileExecutionError(f'Failed to create user from User model in {c.AUTH_FILE}', e) from e
         
         return None
     

{squirrels-0.3.1 → squirrels-0.3.3}/squirrels/_connection_set.py

@@ -31,8 +31,11 @@ class ConnectionSet:
     
     def run_sql_query_from_conn_name(self, query: str, conn_name: str, placeholders: dict = {}) -> pd.DataFrame:
         engine = self._get_engine(conn_name)
-        df = pd.read_sql(query, engine, params=placeholders)
-        return df
+        try:
+            df = pd.read_sql(query, engine, params=placeholders)
+            return df
+        except Exception as e:
+            raise RuntimeError(e) from e
 
     def _dispose(self) -> None:
         """

{squirrels-0.3.1 → squirrels-0.3.3}/squirrels/_models.py

@@ -63,7 +63,7 @@ class _SqlModelConfig:
         elif self.materialized == Materialization.VIEW:
             create_prefix = f"CREATE VIEW {model_name} AS\n"
         else:
-            raise NotImplementedError(f"Materialization option not supported: {self.materialized}")
+            raise u.ConfigurationError(f"Materialization option not supported: {self.materialized}")
         
         return create_prefix + select_query
 
@@ -233,7 +233,7 @@ class _Model(_Referable):
         kwargs = {
             "proj_vars": ctx_args.proj_vars, "env_vars": ctx_args.env_vars, "user": ctx_args.user, "prms": ctx_args.prms, 
             "traits": ctx_args.traits, "ctx": ctx, "is_placeholder": is_placeholder, "set_placeholder": ctx_args.set_placeholder,
-            "config": configuration.set_attribute, "is_param_enabled": ctx_args.param_exists
+            "config": configuration.set_attribute, "param_exists": ctx_args.param_exists
         }
         dependencies = set()
         if self.query_file.model_type == ModelType.FEDERATE:
@@ -245,7 +245,7 @@ class _Model(_Referable):
         try:
             query = await asyncio.to_thread(u.render_string, raw_query, **kwargs)
         except Exception as e:
-            raise u.FileExecutionError(f'Failed to compile sql model "{self.name}"', e)
+            raise u.FileExecutionError(f'Failed to compile sql model "{self.name}"', e) from e
         
         compiled_query = _SqlModelQuery(query, configuration)
         return compiled_query, dependencies
@@ -261,7 +261,7 @@ class _Model(_Referable):
         try:
             dependencies = await asyncio.to_thread(self.query_file.raw_query.dependencies_func, sqrl_args)
         except Exception as e:
-            raise u.FileExecutionError(f'Failed to run "{c.DEP_FUNC}" function for python model "{self.name}"', e)
+            raise u.FileExecutionError(f'Failed to run "{c.DEP_FUNC}" function for python model "{self.name}"', e) from e
         
         dbview_conn_name = self._get_dbview_conn_name()
         connections = ConnectionSetIO.obj.get_engines_as_dict()
@@ -276,7 +276,7 @@ class _Model(_Referable):
                 raw_query: _RawPyQuery = self.query_file.raw_query
                 return raw_query.query(sqrl=sqrl_args)
             except Exception as e:
-                raise u.FileExecutionError(f'Failed to run "{c.MAIN_FUNC}" function for python model "{self.name}"', e)
+                raise u.FileExecutionError(f'Failed to run "{c.MAIN_FUNC}" function for python model "{self.name}"', e) from e
         
         return _PyModelQuery(compiled_query), dependencies
 
@@ -295,7 +295,7 @@ class _Model(_Referable):
         elif self.query_file.query_type == QueryType.PYTHON:
             compiled_query, dependencies = await self._compile_python_model(ctx, ctx_args, placeholders)
         else:
-            raise NotImplementedError(f"Query type not supported: {self.query_file.query_type}")
+            raise u.ConfigurationError(f"Query type not supported: {self.query_file.query_type}")
         
         self.compiled_query = compiled_query
         self.wait_count = len(dependencies)
@@ -344,7 +344,7 @@ class _Model(_Referable):
                 try:
                     return ConnectionSetIO.obj.run_sql_query_from_conn_name(query, config.connection_name, placeholders)
                 except RuntimeError as e:
-                    raise u.FileExecutionError(f'Failed to run dbview sql model "{self.name}"', e)
+                    raise u.FileExecutionError(f'Failed to run dbview sql model "{self.name}"', e) from e
             
             df = await asyncio.to_thread(run_sql_query)
             await asyncio.to_thread(self._load_pandas_to_table, df, conn)
@@ -356,7 +356,7 @@ class _Model(_Referable):
                 try:
                     return conn.execute(text(create_query), placeholders)
                 except Exception as e:
-                    raise u.FileExecutionError(f'Failed to run federate sql model "{self.name}"', e)
+                    raise u.FileExecutionError(f'Failed to run federate sql model "{self.name}"', e) from e
             
             await asyncio.to_thread(create_table)
             if self.needs_pandas or self.is_target:
@@ -419,7 +419,7 @@ class _DAG:
         try:
             context_func(ctx=context, sqrl=args)
         except Exception as e:
-            raise u.FileExecutionError(f'Failed to run {c.CONTEXT_FILE} for dataset "{self.dataset.name}"', e)
+            raise u.FileExecutionError(f'Failed to run {c.CONTEXT_FILE} for dataset "{self.dataset.name}"', e) from e
         timer.add_activity_time(f"running context.py for dataset '{self.dataset.name}'", start)
         return context, args
     
@@ -581,11 +581,11 @@ class ModelsIO:
         elif test_set in ManifestIO.obj.selection_test_sets:
             test_set_conf = ManifestIO.obj.selection_test_sets[test_set]
         else:
-            raise u.InvalidInputError(f"No test set named '{test_set}' was found when compiling dataset '{dataset}'. The test set must be defined if not default for dataset.")
+            raise u.ConfigurationError(f"No test set named '{test_set}' was found when compiling dataset '{dataset}'. The test set must be defined if not default for dataset.")
         
         error_msg_intro = f"Cannot compile dataset '{dataset}' with test set '{test_set}'."
         if test_set_conf.datasets is not None and dataset not in test_set_conf.datasets:
-            raise u.InvalidInputError(f"{error_msg_intro}\n Applicable datasets for test set '{test_set}' does not include dataset '{dataset}'.")
+            raise u.ConfigurationError(f"{error_msg_intro}\n Applicable datasets for test set '{test_set}' does not include dataset '{dataset}'.")
         
         user_attributes = test_set_conf.user_attributes.copy()
         selections = test_set_conf.parameters.copy()

{squirrels-0.3.1 → squirrels-0.3.3}/squirrels/_parameter_configs.py

@@ -1,11 +1,12 @@
 from __future__ import annotations
 from typing import Annotated, Type, Optional, Union, Sequence, Iterator, Any
+from datetime import datetime
 from dataclasses import dataclass, field
 from abc import ABCMeta, abstractmethod
 from copy import copy
 from fastapi import Query
 from pydantic.fields import Field, FieldInfo
-import pandas as pd
+import pandas as pd, re
 
 from . import parameter_options as po, parameters as p, data_sources as d, _api_response_models as arm, _utils as u, _constants as c
 from .user_base import User
@@ -75,11 +76,6 @@ class ParameterConfigBase(metaclass=ABCMeta):
         """
         return copy(self)
 
-    def to_json_dict0(self) -> arm.ParameterModelBase:
-        return {
-            "widget_type": self.widget_type, "name": self.name, "label": self.label, "description": self.description
-        }
-
 
 @dataclass
 class ParameterConfig(ParameterConfigBase):
@@ -171,11 +167,6 @@ class SelectionParameterConfig(ParameterConfig):
         other.children = self.children.copy()
         return other
 
-    def to_json_dict0(self) -> dict:
-        output = super().to_json_dict0()
-        output['trigger_refresh'] = self.trigger_refresh
-        return output
-
 
 @dataclass
 class SingleSelectParameterConfig(SelectionParameterConfig):
@@ -220,19 +211,17 @@ class MultiSelectParameterConfig(SelectionParameterConfig):
     Class to define configurations for multi-select parameter widgets.
     """
     show_select_all: bool # = field(default=True, kw_only=True)
-    is_dropdown: bool # = field(default=True, kw_only=True)
     order_matters: bool # = field(default=False, kw_only=True)
     none_is_all: bool # = field(default=True, kw_only=True)
 
     def __init__(
         self, name: str, label: str, all_options: Sequence[Union[po.SelectParameterOption, dict]], *, description: str = "", 
-        show_select_all: bool = True, is_dropdown: bool = True, order_matters: bool = False, none_is_all: bool = True,
+        show_select_all: bool = True, order_matters: bool = False, none_is_all: bool = True,
         user_attribute: Optional[str] = None, parent_name: Optional[str] = None
     ) -> None:
         super().__init__("multi_select", name, label, all_options, description=description, user_attribute=user_attribute, 
                          parent_name=parent_name)
         self.show_select_all = show_select_all
-        self.is_dropdown = is_dropdown
         self.order_matters = order_matters
         self.none_is_all = none_is_all
     
@@ -250,13 +239,6 @@ class MultiSelectParameterConfig(SelectionParameterConfig):
         else:
             selected_ids = u.load_json_or_comma_delimited_str_as_list(selection)
         return p.MultiSelectParameter(self, options, selected_ids)
-
-    def to_json_dict0(self) -> dict:
-        output = super().to_json_dict0()
-        output['show_select_all'] = self.show_select_all
-        output['is_dropdown'] = self.is_dropdown
-        output['order_matters'] = self.order_matters
-        return output
     
     def get_api_field_info(self) -> APIParamFieldInfo:
         identifiers = [x._identifier for x in self.all_options]
@@ -354,7 +336,7 @@ class DateRangeParameterConfig(_DateTypeParameterConfig):
             try:
                 selected_start_date, selected_end_date = u.load_json_or_comma_delimited_str_as_list(selection)
             except ValueError as e:
-                self._raise_invalid_input_error(selection, "Date range parameter selection must be two dates joined by comma.", e)
+                self._raise_invalid_input_error(selection, "Date range parameter selection must be two dates.", e)
         return p.DateRangeParameter(self, curr_option, selected_start_date, selected_end_date)
     
     def get_api_field_info(self) -> APIParamFieldInfo:
@@ -442,7 +424,7 @@ class NumberRangeParameterConfig(_NumericParameterConfig):
         self, selection: Optional[str], user: Optional[User], parent_param: Optional[p._SelectionParameter],
         *, request_version: Optional[int] = None
     ) -> p.NumberRangeParameter:
-        curr_option: po.NumberRangeParameterOption = next(self._get_options_iterator(user, parent_param), None)
+        curr_option: Optional[po.NumberRangeParameterOption] = next(self._get_options_iterator(user, parent_param), None)
         if selection is None:
             if curr_option is not None:
                 selected_lower_value = curr_option._default_lower_value
@@ -453,7 +435,7 @@ class NumberRangeParameterConfig(_NumericParameterConfig):
             try:
                 selected_lower_value, selected_upper_value = u.load_json_or_comma_delimited_str_as_list(selection)
             except ValueError as e:
-                self._raise_invalid_input_error(selection, "Number range parameter selection must be two numbers joined by comma.", e)
+                self._raise_invalid_input_error(selection, "Number range parameter selection must be two numbers.", e)
         return p.NumberRangeParameter(self, curr_option, selected_lower_value, selected_upper_value)
     
     def get_api_field_info(self) -> APIParamFieldInfo:
@@ -469,16 +451,54 @@ class TextParameterConfig(ParameterConfig):
     Class to define configurations for text parameter widgets.
     """
     all_options: Sequence[po.TextParameterOption] = field(repr=False)
-    is_textarea: bool
+    input_type: str
     
     def __init__(
-        self, name: str, label: str, all_options: Sequence[Union[po.TextParameterOption, dict]], *, 
-        description: str = "", is_textarea: bool = False, user_attribute: Optional[str] = None, 
-        parent_name: Optional[str] = None
+        self, name: str, label: str, all_options: Sequence[Union[po.TextParameterOption, dict]], *, description: str = "", 
+        input_type: str = "text", user_attribute: Optional[str] = None, parent_name: Optional[str] = None
     ) -> None:
         super().__init__("text", name, label, all_options, description=description, user_attribute=user_attribute, 
                          parent_name=parent_name)
-        self.is_textarea = is_textarea
+        
+        allowed_input_types = ["text", "textarea", "number", "date", "datetime-local", "month", "time", "color", "password"]
+        if input_type not in allowed_input_types:
+            raise u.ConfigurationError(f"Invalid input type '{input_type}' for text parameter '{name}'. Must be one of {allowed_input_types}.")
+
+        self.input_type = input_type
+        for option in self.all_options:
+            self.validate_entered_text(option._default_text)
+    
+    def validate_entered_text(self, entered_text: str) -> str:
+        if self.input_type == "number":
+            try:
+                int(entered_text)
+            except ValueError as e:
+                raise self._raise_invalid_input_error(entered_text, "Must be an integer (without decimals).", e)
+        elif self.input_type == "date":
+            try:
+                datetime.strptime(entered_text, "%Y-%m-%d")
+            except ValueError as e:
+                raise self._raise_invalid_input_error(entered_text, "Must be a date in YYYY-MM-DD format.", e)
+        elif self.input_type == "datetime-local":
+            try:
+                datetime.strptime(entered_text, "%Y-%m-%dT%H:%M")
+            except ValueError as e:
+                raise self._raise_invalid_input_error(entered_text, "Must be a date in YYYY-MM-DDThh:mm format (e.g. 2020-01-01T07:00).", e)
+        elif self.input_type == "month":
+            try:
+                datetime.strptime(entered_text, "%Y-%m")
+            except ValueError as e:
+                raise self._raise_invalid_input_error(entered_text, "Must be a date in YYYY-MM format.", e)
+        elif self.input_type == "time":
+            try:
+                datetime.strptime(entered_text, "%H:%M")
+            except ValueError as e:
+                raise self._raise_invalid_input_error(entered_text, "Must be a time in hh:mm format.", e)
+        elif self.input_type == "color":
+            if not re.match(r"^#[0-9a-fA-F]{6}$", entered_text):
+                raise self._raise_invalid_input_error(entered_text, "Must be a valid color hex code (e.g. #000000).")
+        
+        return entered_text
 
     @staticmethod
     def ParameterOption(*args, **kwargs):
@@ -495,11 +515,6 @@ class TextParameterConfig(ParameterConfig):
         curr_option: po.TextParameterOption = next(self._get_options_iterator(user, parent_param), None)
         entered_text = curr_option._default_text if selection is None and curr_option is not None else selection
         return p.TextParameter(self, curr_option, entered_text)
-
-    def to_json_dict0(self) -> dict:
-        output = super().to_json_dict0()
-        output['is_textarea'] = self.is_textarea
-        return output
     
     def get_api_field_info(self) -> APIParamFieldInfo:
         examples = [x._default_text for x in self.all_options]

{squirrels-0.3.1 → squirrels-0.3.3}/squirrels/_py_module.py

@@ -57,4 +57,4 @@ def run_pyconfig_main(filename: str, kwargs: dict[str, Any] = {}) -> None:
         try:
             main_function(**kwargs)
         except Exception as e:
-            raise u.FileExecutionError(f'Failed to run python file "{filepath}"', e)
+            raise u.FileExecutionError(f'Failed to run python file "{filepath}"', e) from e

{squirrels-0.3.1 → squirrels-0.3.3}/squirrels/arguments/run_time_args.py

@@ -5,7 +5,7 @@ import pandas as pd
 
 from .init_time_args import ConnectionsArgs, ParametersArgs
 from ..user_base import User
-from ..parameters import Parameter, _TextValue
+from ..parameters import Parameter, TextValue
 from .._connection_set import ConnectionSetIO
 from .. import _utils as u
 
@@ -24,7 +24,7 @@ class ContextArgs(ParametersArgs):
     traits: dict[str, Any]
     _placeholders: dict[str, Any]
 
-    def set_placeholder(self, placeholder: str, value: Union[_TextValue, Any]) -> None:
+    def set_placeholder(self, placeholder: str, value: Union[TextValue, Any]) -> str:
         """
         Method to set a placeholder value.
 
@@ -32,9 +32,10 @@ class ContextArgs(ParametersArgs):
             placeholder: A string for the name of the placeholder
             value: The value of the placeholder. Can be of any type
         """
-        if isinstance(value, _TextValue):
+        if isinstance(value, TextValue):
             value = value._value_do_not_touch
         self._placeholders[placeholder] = value
+        return ""
     
     def param_exists(self, param_name: str) -> bool:
         """

{squirrels-0.3.1 → squirrels-0.3.3}/squirrels/data_sources.py

@@ -196,7 +196,7 @@ class SelectDataSource(_SelectionDataSource):
         if ds_param.parameter_type == pc.SingleSelectParameterConfig:
             return pc.SingleSelectParameterConfig(
                 ds_param.name, ds_param.label, all_options, description=ds_param.description, 
-                user_attribute=ds_param.user_attribute, parent_name=ds_param.parent_name
+                user_attribute=ds_param.user_attribute, parent_name=ds_param.parent_name, **ds_param.extra_args
             )
         elif ds_param.parameter_type == pc.MultiSelectParameterConfig:
             return pc.MultiSelectParameterConfig(
@@ -250,14 +250,13 @@ class MultiSelectDataSource(_SelectionDataSource):
     DEPRECATED. Use "SelectDataSource" instead.
     """
     _show_select_all: bool # = field(default=True, kw_only=True)
-    _is_dropdown: bool # = field(default=True, kw_only=True)
     _order_matters: bool # = field(default=False, kw_only=True)
     _none_is_all: bool # = field(default=True, kw_only=True)
 
     def __init__(
             self, table_or_query: str, id_col: str, options_col: str, *, order_by_col: Optional[str] = None, 
             is_default_col: Optional[str] = None, custom_cols: dict[str, str] = {}, show_select_all: bool = True, 
-            is_dropdown: bool = True, order_matters: bool = False, none_is_all: bool = True, user_group_col: Optional[str] = None,
+            order_matters: bool = False, none_is_all: bool = True, user_group_col: Optional[str] = None,
             parent_id_col: Optional[str] = None, connection_name: Optional[str] = None, **kwargs
         ) -> None:
         """
@@ -270,7 +269,6 @@ class MultiSelectDataSource(_SelectionDataSource):
                          custom_cols=custom_cols, user_group_col=user_group_col, parent_id_col=parent_id_col, 
                          connection_name=connection_name)
         self._show_select_all = show_select_all
-        self._is_dropdown = is_dropdown
         self._order_matters = order_matters
         self._none_is_all = none_is_all
     
@@ -288,7 +286,7 @@ class MultiSelectDataSource(_SelectionDataSource):
         self._validate_parameter_type(ds_param, pc.MultiSelectParameterConfig)
         all_options = self._get_all_options(df)
         return pc.MultiSelectParameterConfig(
-            ds_param.name, ds_param.label, all_options, show_select_all=self._show_select_all, is_dropdown=self._is_dropdown,
+            ds_param.name, ds_param.label, all_options, show_select_all=self._show_select_all,
             order_matters=self._order_matters, none_is_all=self._none_is_all, description=ds_param.description, 
             user_attribute=ds_param.user_attribute, parent_name=ds_param.parent_name
         )
@@ -353,8 +351,10 @@ class DateDataSource(DataSource):
                                    parent_option_ids=self._get_key_from_record_as_list(self._parent_id_col, record))
             for _, record in records.items()
         )
-        return pc.DateParameterConfig(ds_param.name, ds_param.label, options, description=ds_param.description, 
-                                      user_attribute=ds_param.user_attribute, parent_name=ds_param.parent_name)
+        return pc.DateParameterConfig(
+            ds_param.name, ds_param.label, options, description=ds_param.description, user_attribute=ds_param.user_attribute, 
+            parent_name=ds_param.parent_name, **ds_param.extra_args
+        )
 
 
 @dataclass
@@ -420,8 +420,10 @@ class DateRangeDataSource(DataSource):
                                         parent_option_ids=self._get_key_from_record_as_list(self._parent_id_col, record))
             for _, record in records.items()
         )
-        return pc.DateRangeParameterConfig(ds_param.name, ds_param.label, options, description=ds_param.description, 
-                                           user_attribute=ds_param.user_attribute, parent_name=ds_param.parent_name)
+        return pc.DateRangeParameterConfig(
+            ds_param.name, ds_param.label, options, description=ds_param.description, user_attribute=ds_param.user_attribute, 
+            parent_name=ds_param.parent_name, **ds_param.extra_args
+        )
 
 
 @dataclass
@@ -509,8 +511,10 @@ class NumberDataSource(_NumericDataSource):
                                      parent_option_ids=self._get_key_from_record_as_list(self._parent_id_col, record))
             for _, record in records.items()
         )
-        return pc.NumberParameterConfig(ds_param.name, ds_param.label, options, description=ds_param.description,
-                                        user_attribute=ds_param.user_attribute, parent_name=ds_param.parent_name)
+        return pc.NumberParameterConfig(
+            ds_param.name, ds_param.label, options, description=ds_param.description, user_attribute=ds_param.user_attribute, 
+            parent_name=ds_param.parent_name, **ds_param.extra_args
+        )
 
 
 @dataclass
@@ -579,8 +583,10 @@ class NumberRangeDataSource(_NumericDataSource):
                                        parent_option_ids=self._get_key_from_record_as_list(self._parent_id_col, record))
             for _, record in records.items()
         )
-        return pc.NumberRangeParameterConfig(ds_param.name, ds_param.label, options, description=ds_param.description,
-                                          user_attribute=ds_param.user_attribute, parent_name=ds_param.parent_name)
+        return pc.NumberRangeParameterConfig(
+            ds_param.name, ds_param.label, options, description=ds_param.description, user_attribute=ds_param.user_attribute, 
+            parent_name=ds_param.parent_name, **ds_param.extra_args
+        )
 
 
 @dataclass
@@ -639,5 +645,7 @@ class TextDataSource(DataSource):
                                    parent_option_ids=self._get_key_from_record_as_list(self._parent_id_col, record))
             for _, record in records.items()
         )
-        return pc.TextParameterConfig(ds_param.name, ds_param.label, options, description=ds_param.description, 
-                                      user_attribute=ds_param.user_attribute, parent_name=ds_param.parent_name)
+        return pc.TextParameterConfig(
+            ds_param.name, ds_param.label, options, description=ds_param.description, user_attribute=ds_param.user_attribute, 
+            parent_name=ds_param.parent_name, **ds_param.extra_args
+        )

squirrels-0.3.3/squirrels/package_data/assets/index.css

@@ -0,0 +1 @@
+.padded{padding:8px 20px}.widget{width:100%;box-sizing:border-box;border:1px solid #ccc;border-radius:4px}.widget-label{position:relative;padding-bottom:10px}.widget-container{display:flex;flex-direction:column;gap:20px}input[type=submit]{padding:12px 20px;cursor:pointer}button{cursor:pointer;border-radius:5px;padding:10px}.white-button{background-color:#fff;color:#00f}.white-button:hover{background-color:#d4dae1}.blue-button{background-color:#4285f4;color:#fff;border:none}.blue-button:hover{background-color:#3076c5}.horizontal-container{display:flex}.auth-container{display:flex;align-items:center;gap:10px}#main-container{height:97vh;width:99vw}#left-container{width:250px;min-width:250px;margin-right:20px;padding:10px;overflow-y:auto}#right-container{height:97vh;width:calc(99vw - 300px)}#header-container{background-color:#d4dae1;color:#000;display:flex;align-items:center;justify-content:space-between;padding:10px}#table-container{padding:10px 20px;height:calc(97vh - 70px);overflow-x:auto;overflow-y:auto}.modal-background{position:fixed;z-index:1;left:0;top:0;width:100%;height:100%;overflow:auto;background-color:#0006;padding-top:60px}.modal-content{background-color:#fefefe;padding:30px;margin:5px auto auto;border:2px solid black}#loading-indicator{justify-content:center;align-items:center;text-align:center;font-weight:700;position:absolute;top:0;left:0;width:100%;height:100%;background-color:#ffffff80}.spinner{margin:20px auto;width:40px;height:40px;position:relative;border-radius:50%;border:3px solid transparent;border-top-color:#3498db;animation:spin 1s linear infinite}@keyframes spin{0%{transform:rotate(0)}to{transform:rotate(360deg)}}table{border-collapse:collapse;width:100%}th,td{text-align:left;padding:8px;min-width:50px}th{background-color:#4285f4;color:#fff}tr:nth-child(2n){background-color:#f2f2f2}#result-table{margin:5px 0}.react-daterange-picker{display:inline-flex;position:relative}.react-daterange-picker,.react-daterange-picker *,.react-daterange-picker *:before,.react-daterange-picker *:after{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.react-daterange-picker--disabled{background-color:#f0f0f0;color:#6d6d6d}.react-daterange-picker__wrapper{display:flex;flex-grow:1;flex-shrink:0;align-items:center;border:thin solid gray}.react-daterange-picker__inputGroup{min-width:calc((4px * 3) + .54em * 8 + .217em * 2);height:100%;flex-grow:1;padding:0 2px;box-sizing:content-box}.react-daterange-picker__inputGroup__divider{padding:1px 0;white-space:pre}.react-daterange-picker__inputGroup__divider,.react-daterange-picker__inputGroup__leadingZero{display:inline-block}.react-daterange-picker__inputGroup__input{min-width:.54em;height:100%;position:relative;padding:0 1px;border:0;background:none;color:currentColor;font:inherit;box-sizing:content-box;-webkit-appearance:textfield;-moz-appearance:textfield;appearance:textfield}.react-daterange-picker__inputGroup__input::-webkit-outer-spin-button,.react-daterange-picker__inputGroup__input::-webkit-inner-spin-button{-webkit-appearance:none;-moz-appearance:none;appearance:none;margin:0}.react-daterange-picker__inputGroup__input:invalid{background:#ff00001a}.react-daterange-picker__inputGroup__input--hasLeadingZero{margin-left:-.54em;padding-left:calc(1px + .54em)}.react-daterange-picker__button{border:0;background:transparent;padding:4px 6px}.react-daterange-picker__button:enabled{cursor:pointer}.react-daterange-picker__button:enabled:hover .react-daterange-picker__button__icon,.react-daterange-picker__button:enabled:focus .react-daterange-picker__button__icon{stroke:#0078d7}.react-daterange-picker__button:disabled .react-daterange-picker__button__icon{stroke:#6d6d6d}.react-daterange-picker__button svg{display:inherit}.react-daterange-picker__calendar{width:350px;max-width:100vw;z-index:1}.react-daterange-picker__calendar--closed{display:none}.react-daterange-picker__calendar .react-calendar{border-width:thin}.react-calendar{width:350px;max-width:100%;background:#fff;border:1px solid #a0a096;font-family:Arial,Helvetica,sans-serif;line-height:1.125em}.react-calendar--doubleView{width:700px}.react-calendar--doubleView .react-calendar__viewContainer{display:flex;margin:-.5em}.react-calendar--doubleView .react-calendar__viewContainer>*{width:50%;margin:.5em}.react-calendar,.react-calendar *,.react-calendar *:before,.react-calendar *:after{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.react-calendar button{margin:0;border:0;outline:none}.react-calendar button:enabled:hover{cursor:pointer}.react-calendar__navigation{display:flex;height:44px;margin-bottom:1em}.react-calendar__navigation button{min-width:44px;background:none}.react-calendar__navigation button:disabled{background-color:#f0f0f0}.react-calendar__navigation button:enabled:hover,.react-calendar__navigation button:enabled:focus{background-color:#e6e6e6}.react-calendar__month-view__weekdays{text-align:center;text-transform:uppercase;font:inherit;font-size:.75em;font-weight:700}.react-calendar__month-view__weekdays__weekday{padding:.5em}.react-calendar__month-view__weekNumbers .react-calendar__tile{display:flex;align-items:center;justify-content:center;font:inherit;font-size:.75em;font-weight:700}.react-calendar__month-view__days__day--weekend{color:#d10000}.react-calendar__month-view__days__day--neighboringMonth{color:#757575}.react-calendar__year-view .react-calendar__tile,.react-calendar__decade-view .react-calendar__tile,.react-calendar__century-view .react-calendar__tile{padding:2em .5em}.react-calendar__tile{max-width:100%;padding:10px 6.6667px;background:none;text-align:center;line-height:16px;font:inherit;font-size:.833em}.react-calendar__tile:disabled{background-color:#f0f0f0}.react-calendar__tile:enabled:hover,.react-calendar__tile:enabled:focus{background-color:#e6e6e6}.react-calendar__tile--now{background:#ffff76}.react-calendar__tile--now:enabled:hover,.react-calendar__tile--now:enabled:focus{background:#ffffa9}.react-calendar__tile--hasActive{background:#76baff}.react-calendar__tile--hasActive:enabled:hover,.react-calendar__tile--hasActive:enabled:focus{background:#a9d4ff}.react-calendar__tile--active{background:#006edc;color:#fff}.react-calendar__tile--active:enabled:hover,.react-calendar__tile--active:enabled:focus{background:#1087ff}.react-calendar--selectRange .react-calendar__tile--hover{background-color:#e6e6e6}.rc-slider{position:relative;width:100%;height:14px;padding:5px 0;border-radius:6px;touch-action:none;box-sizing:border-box;-webkit-tap-highlight-color:rgba(0,0,0,0)}.rc-slider *{box-sizing:border-box;-webkit-tap-highlight-color:rgba(0,0,0,0)}.rc-slider-rail{position:absolute;width:100%;height:4px;background-color:#e9e9e9;border-radius:6px}.rc-slider-track,.rc-slider-tracks{position:absolute;height:4px;background-color:#abe2fb;border-radius:6px}.rc-slider-track-draggable{z-index:1;box-sizing:content-box;background-clip:content-box;border-top:5px solid rgba(0,0,0,0);border-bottom:5px solid rgba(0,0,0,0);transform:translateY(-5px)}.rc-slider-handle{position:absolute;z-index:1;width:14px;height:14px;margin-top:-5px;background-color:#fff;border:solid 2px #96dbfa;border-radius:50%;cursor:pointer;cursor:-webkit-grab;cursor:grab;opacity:.8;touch-action:pan-x}.rc-slider-handle-dragging.rc-slider-handle-dragging.rc-slider-handle-dragging{border-color:#57c5f7;box-shadow:0 0 0 5px #96dbfa}.rc-slider-handle:focus{outline:none;box-shadow:none}.rc-slider-handle:focus-visible{border-color:#2db7f5;box-shadow:0 0 0 3px #96dbfa}.rc-slider-handle-click-focused:focus{border-color:#96dbfa;box-shadow:unset}.rc-slider-handle:hover{border-color:#57c5f7}.rc-slider-handle:active{border-color:#57c5f7;box-shadow:0 0 5px #57c5f7;cursor:-webkit-grabbing;cursor:grabbing}.rc-slider-mark{position:absolute;top:18px;left:0;width:100%;font-size:12px}.rc-slider-mark-text{position:absolute;display:inline-block;color:#999;text-align:center;vertical-align:middle;cursor:pointer}.rc-slider-mark-text-active{color:#666}.rc-slider-step{position:absolute;width:100%;height:4px;background:transparent}.rc-slider-dot{position:absolute;bottom:-2px;width:8px;height:8px;vertical-align:middle;background-color:#fff;border:2px solid #e9e9e9;border-radius:50%;cursor:pointer}.rc-slider-dot-active{border-color:#96dbfa}.rc-slider-dot-reverse{margin-right:-4px}.rc-slider-disabled{background-color:#e9e9e9}.rc-slider-disabled .rc-slider-track{background-color:#ccc}.rc-slider-disabled .rc-slider-handle,.rc-slider-disabled .rc-slider-dot{background-color:#fff;border-color:#ccc;box-shadow:none;cursor:not-allowed}.rc-slider-disabled .rc-slider-mark-text,.rc-slider-disabled .rc-slider-dot{cursor:not-allowed!important}.rc-slider-vertical{width:14px;height:100%;padding:0 5px}.rc-slider-vertical .rc-slider-rail{width:4px;height:100%}.rc-slider-vertical .rc-slider-track{bottom:0;left:5px;width:4px}.rc-slider-vertical .rc-slider-track-draggable{border-top:0;border-bottom:0;border-right:5px solid rgba(0,0,0,0);border-left:5px solid rgba(0,0,0,0);transform:translate(-5px)}.rc-slider-vertical .rc-slider-handle{position:absolute;z-index:1;margin-top:0;margin-left:-5px;touch-action:pan-y}.rc-slider-vertical .rc-slider-mark{top:0;left:18px;height:100%}.rc-slider-vertical .rc-slider-step{width:4px;height:100%}.rc-slider-vertical .rc-slider-dot{margin-left:-2px}.rc-slider-tooltip-zoom-down-enter,.rc-slider-tooltip-zoom-down-appear,.rc-slider-tooltip-zoom-down-leave{display:block!important;animation-duration:.3s;animation-fill-mode:both;animation-play-state:paused}.rc-slider-tooltip-zoom-down-enter.rc-slider-tooltip-zoom-down-enter-active,.rc-slider-tooltip-zoom-down-appear.rc-slider-tooltip-zoom-down-appear-active{animation-name:rcSliderTooltipZoomDownIn;animation-play-state:running}.rc-slider-tooltip-zoom-down-leave.rc-slider-tooltip-zoom-down-leave-active{animation-name:rcSliderTooltipZoomDownOut;animation-play-state:running}.rc-slider-tooltip-zoom-down-enter,.rc-slider-tooltip-zoom-down-appear{transform:scale(0);animation-timing-function:cubic-bezier(.23,1,.32,1)}.rc-slider-tooltip-zoom-down-leave{animation-timing-function:cubic-bezier(.755,.05,.855,.06)}@keyframes rcSliderTooltipZoomDownIn{0%{transform:scale(0);transform-origin:50% 100%;opacity:0}to{transform:scale(1);transform-origin:50% 100%}}@keyframes rcSliderTooltipZoomDownOut{0%{transform:scale(1);transform-origin:50% 100%}to{transform:scale(0);transform-origin:50% 100%;opacity:0}}.rc-slider-tooltip{position:absolute;top:-9999px;left:-9999px;visibility:visible;box-sizing:border-box;-webkit-tap-highlight-color:rgba(0,0,0,0)}.rc-slider-tooltip *{box-sizing:border-box;-webkit-tap-highlight-color:rgba(0,0,0,0)}.rc-slider-tooltip-hidden{display:none}.rc-slider-tooltip-placement-top{padding:4px 0 8px}.rc-slider-tooltip-inner{min-width:24px;height:24px;padding:6px 2px;color:#fff;font-size:12px;line-height:1;text-align:center;text-decoration:none;background-color:#6c6c6c;border-radius:6px;box-shadow:0 0 4px #d9d9d9}.rc-slider-tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.rc-slider-tooltip-placement-top .rc-slider-tooltip-arrow{bottom:4px;left:50%;margin-left:-4px;border-width:4px 4px 0;border-top-color:#6c6c6c}.hover-text{position:absolute;z-index:1;background-color:#f9f9f9;border:1px solid #ccc;border-radius:4px}input[type=range]{width:80%;padding:12px 0;border:0px}.slider-info{display:flex;font-size:13px;justify-content:space-between}.react-daterange-picker{margin-bottom:15px;height:40px;font-size:14px}.react-daterange-picker__wrapper{width:200px;border:0}.react-daterange-picker__inputGroup{min-width:0px;text-align:center}.slider-wrapper{display:flex;flex-direction:column;align-items:center}.rc-slider{width:95%;margin:10px 0}.rc-slider-handle{z-index:0;opacity:1;width:20px;height:20px;margin:-7px 0}