squirrels 0.2.0rc1__tar.gz → 0.2.2__tar.gz

{squirrels-0.2.0rc1 → squirrels-0.2.2}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: squirrels
-Version: 0.2.0rc1
+Version: 0.2.2
 Summary: Squirrels - API Framework for Data Analytics
-Home-page: https://squirrels-nest.github.io/squirrels-docs/
+Home-page: https://squirrels-nest.github.io
 License: MIT
 Author: Tim Huang
 Author-email: tim.yuting@hotmail.com
@@ -17,19 +17,21 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
+Provides-Extra: duckdb
 Requires-Dist: cachetools (>=5.3.2,<6.0.0)
 Requires-Dist: cryptography (>=41.0.7,<42.0.0)
-Requires-Dist: fastapi (>=0.104.1,<0.105.0)
-Requires-Dist: gitpython (>=3.1.40,<4.0.0)
-Requires-Dist: inquirer (>=3.1.4,<4.0.0)
-Requires-Dist: jinja2 (>=3.1.2,<4.0.0)
+Requires-Dist: duckdb (>=0.10.0) ; extra == "duckdb"
+Requires-Dist: fastapi (>=0.109.2,<0.110.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)
 Requires-Dist: pandas (>=2.1.4,<3.0.0)
 Requires-Dist: python-jose (>=3.3.0,<4.0.0)
-Requires-Dist: python-multipart (>=0.0.6,<0.0.7)
+Requires-Dist: python-multipart (>=0.0.9,<0.0.10)
 Requires-Dist: pyyaml (>=6.0.1,<7.0.0)
-Requires-Dist: sqlalchemy (>=2.0.23,<3.0.0)
-Requires-Dist: uvicorn (>=0.24.0.post1,<0.25.0)
-Project-URL: Documentation, https://squirrels-nest.github.io/squirrels-docs/
+Requires-Dist: sqlalchemy (>=2.0.25,<3.0.0)
+Requires-Dist: uvicorn (>=0.27.1,<0.28.0)
+Project-URL: Documentation, https://squirrels-nest.github.io
 Project-URL: Repository, https://github.com/squirrels-nest/squirrels
 Description-Content-Type: text/markdown
 
@@ -37,7 +39,7 @@ Description-Content-Type: text/markdown
 
 Squirrels is an API framework that lets you create REST APIs for dynamic data analytics!
 
-**Documentation**: <a href="https://squirrels-nest.github.io/squirrels-docs" target="_blank">https://squirrels-nest.github.io/squirrels-docs</a>
+**Documentation**: <a href="https://squirrels-nest.github.io/" target="_blank">https://squirrels-nest.github.io/</a>
 
 **Source Code**: <a href="https://github.com/squirrels-nest/squirrels" target="_blank">https://github.com/squirrels-nest/squirrels</a>
 

{squirrels-0.2.0rc1 → squirrels-0.2.2}/README.md

@@ -2,7 +2,7 @@
 
 Squirrels is an API framework that lets you create REST APIs for dynamic data analytics!
 
-**Documentation**: <a href="https://squirrels-nest.github.io/squirrels-docs" target="_blank">https://squirrels-nest.github.io/squirrels-docs</a>
+**Documentation**: <a href="https://squirrels-nest.github.io/" target="_blank">https://squirrels-nest.github.io/</a>
 
 **Source Code**: <a href="https://github.com/squirrels-nest/squirrels" target="_blank">https://github.com/squirrels-nest/squirrels</a>
 

{squirrels-0.2.0rc1 → squirrels-0.2.2}/pyproject.toml

@@ -1,13 +1,13 @@
 [tool.poetry]
 name = "squirrels"
-version = "0.2.0rc1"
+version = "0.2.2"
 description = "Squirrels - API Framework for Data Analytics"
 license = "MIT"
 authors = ["Tim Huang <tim.yuting@hotmail.com>"]
 readme = "README.md"
-homepage = "https://squirrels-nest.github.io/squirrels-docs/"
+homepage = "https://squirrels-nest.github.io"
 repository = "https://github.com/squirrels-nest/squirrels"
-documentation = "https://squirrels-nest.github.io/squirrels-docs/"
+documentation = "https://squirrels-nest.github.io"
 classifiers = [
     "Intended Audience :: Developers",
     "Topic :: Software Development :: Libraries :: Application Frameworks",
@@ -17,28 +17,30 @@ classifiers = [
 
 [tool.poetry.scripts]
 squirrels = "squirrels._command_line:main"
+sqrl = "squirrels._command_line:main"
 
 [tool.poetry.dependencies]
 python = "^3.9"
 cachetools = "^5.3.2"
 cryptography = "^41.0.7"
-fastapi = "^0.104.1"
-gitpython = "^3.1.40"
-inquirer = "^3.1.4"
-jinja2 = "^3.1.2"
+fastapi = "^0.109.2"
+gitpython = "^3.1.41"
+inquirer = "^3.2.1"
+jinja2 = "^3.1.3"
 pandas = "^2.1.4"
 python-jose = "^3.3.0"
-python-multipart = "^0.0.6"
+python-multipart = "^0.0.9"
 pyyaml = "^6.0.1"
-sqlalchemy = "^2.0.23"
-uvicorn = "^0.24.0.post1"
+sqlalchemy = "^2.0.25"
+uvicorn = "^0.27.1"
+duckdb = { version = ">=0.10.0", optional = true }
 
 
-[tool.poetry.group.test.dependencies]
-pytest = "*"
+[tool.poetry.extras]
+duckdb = ["duckdb"]
 
-[tool.poetry.group.dev.dependencies]
-ipykernel = "*"
+[tool.poetry.group.test.dependencies]
+pytest = "^7.4.4"
 
 [build-system]
 requires = ["poetry-core"]

{squirrels-0.2.0rc1 → squirrels-0.2.2}/squirrels/__init__.py

@@ -1,8 +1,8 @@
-__version__ = '0.2.0'
+__version__ = '0.2.2'
 
 from .arguments.init_time_args import ConnectionsArgs, ParametersArgs
 from .arguments.run_time_args import AuthArgs, ContextArgs, ModelDepsArgs, ModelArgs
 from .parameter_options import SelectParameterOption, DateParameterOption, DateRangeParameterOption, NumberParameterOption, NumberRangeParameterOption
-from .parameters import Parameter, SingleSelectParameter, MultiSelectParameter, DateParameter, DateRangeParameter, NumberParameter, NumberRangeParameter
+from .parameters import SingleSelectParameter, MultiSelectParameter, DateParameter, DateRangeParameter, NumberParameter, NumberRangeParameter
 from .data_sources import SingleSelectDataSource, MultiSelectDataSource, DateDataSource, DateRangeDataSource, NumberDataSource, NumberRangeDataSource
 from .user_base import User, WrongPassword

{squirrels-0.2.0rc1 → squirrels-0.2.2}/squirrels/_api_server.py

@@ -1,5 +1,5 @@
-from typing import Iterable, Optional, Mapping, Callable, Coroutine, TypeVar, Any
-from fastapi import Depends, FastAPI, Request, HTTPException, status
+from typing import List, Iterable, Optional, Mapping, Callable, Coroutine, TypeVar, Any
+from fastapi import Depends, FastAPI, Request, HTTPException, Response, status
 from fastapi.responses import HTMLResponse, JSONResponse
 from fastapi.templating import Jinja2Templates
 from fastapi.staticfiles import StaticFiles
@@ -45,36 +45,35 @@ class ApiServer:
         start = time.time()
         app = FastAPI()
 
-        app.add_middleware(CORSMiddleware, allow_origins=["*"], allow_credentials=True, allow_methods=["*"], allow_headers=["*"])
+        @app.middleware("http")
+        async def catch_exceptions_middleware(request: Request, call_next):
+            try:
+                return await call_next(request)
+            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)}"})
+            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)}"})
+            except Exception as exc:
+                traceback.print_exc()
+                return JSONResponse(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, 
+                                    content={"message": f"Server error: {str(exc)}"})
+
+        app.add_middleware(
+            CORSMiddleware, allow_origins=["*"], allow_credentials=True, allow_methods=["*"], allow_headers=["*"], 
+            expose_headers=["Applied-Username"]
+        )
 
         squirrels_version_path = f'/squirrels-v{sq_major_version}'
         partial_base_path = f'/{ManifestIO.obj.project_variables.get_name()}/v{ManifestIO.obj.project_variables.get_major_version()}'
         base_path = squirrels_version_path + u.normalize_name_for_api(partial_base_path)
-
-        static_dir = u.join_paths(os.path.dirname(__file__), c.PACKAGE_DATA_FOLDER, c.ASSETS_FOLDER)
-        app.mount('/'+c.ASSETS_FOLDER, StaticFiles(directory=static_dir), name=c.ASSETS_FOLDER)
-
-        templates_dir = u.join_paths(os.path.dirname(__file__), c.PACKAGE_DATA_FOLDER, c.TEMPLATES_FOLDER)
-        templates = Jinja2Templates(directory=templates_dir)
-
-        # Exception handlers
-        @app.exception_handler(u.InvalidInputError)
-        async def invalid_input_error_handler(request: Request, exc: u.InvalidInputError):
-            traceback.print_exc()
-            return JSONResponse(status_code=status.HTTP_400_BAD_REQUEST, 
-                                content={"message": f"Invalid user input: {str(exc)}"})
-
-        @app.exception_handler(u.ConfigurationError)
-        async def configuration_error_handler(request: Request, exc: u.InvalidInputError):
-            traceback.print_exc()
-            return JSONResponse(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, 
-                                content={"message": f"Squirrels configuration error: {str(exc)}"})
-        
-        @app.exception_handler(NotImplementedError)
-        async def not_implemented_error_handler(request: Request, exc: u.InvalidInputError):
-            traceback.print_exc()
-            return JSONResponse(status_code=status.HTTP_501_NOT_IMPLEMENTED, 
-                                content={"message": f"Not implemented error: {str(exc)}"})
         
         # Helpers
         T = TypeVar('T')
@@ -127,13 +126,21 @@ class ApiServer:
             # Changing selections into a cachable "frozenset" that will later be converted to dictionary
             selections = set()
             for key, val in params.items():
-                if not isinstance(val, str):
+                if isinstance(val, List):
                     val = tuple(val)
                 selections.add((u.normalize_name(key), val))
             selections = frozenset(selections)
             
             return await api_function(user, dataset_normalized, selections, request_version)
 
+        async def do_cachable_action(cache: TTLCache, action: Callable[..., Coroutine[Any, Any, T]], *args) -> T:
+            cache_key = tuple(args)
+            result = cache.get(cache_key)
+            if result is None:
+                result = await action(*args)
+                cache[cache_key] = result
+            return result
+        
         # Login
         token_path = base_path + '/token'
 
@@ -154,20 +161,14 @@ class ApiServer:
                 "expiry_time": expiry
             }
         
-        async def get_current_user(token: str = Depends(oauth2_scheme)) -> Optional[User]:
+        async def get_current_user(response: Response, token: str = Depends(oauth2_scheme)) -> Optional[User]:
             user = self.authenticator.get_user_from_token(token)
+            username = "" if user is None else user.username
+            response.headers["Applied-Username"] = username
             return user
 
-        async def do_cachable_action(cache: TTLCache, action: Callable[..., Coroutine[Any, Any, T]], *args) -> T:
-            cache_key = tuple(args)
-            result = cache.get(cache_key)
-            if result is None:
-                result = await action(*args)
-                cache[cache_key] = result
-            return result
-
         # Parameters API
-        parameters_path = base_path + '/{dataset}/parameters'
+        parameters_path = base_path + '/dataset/{dataset}/parameters'
         
         parameters_cache_size = ManifestIO.obj.settings.get(c.PARAMETERS_CACHE_SIZE_SETTING, 1024)
         parameters_cache_ttl = ManifestIO.obj.settings.get(c.PARAMETERS_CACHE_TTL_SETTING, 0)
@@ -209,7 +210,7 @@ class ApiServer:
             return result
 
         # Results API
-        results_path = base_path + '/{dataset}'
+        results_path = base_path + '/dataset/{dataset}'
 
         results_cache_size = ManifestIO.obj.settings.get(c.RESULTS_CACHE_SIZE_SETTING, 128)
         results_cache_ttl = ManifestIO.obj.settings.get(c.RESULTS_CACHE_TTL_SETTING, 0)
@@ -248,8 +249,10 @@ class ApiServer:
             timer.add_activity_time("POST REQUEST total time for DATASET", start)
             return result
         
-        # Catalog API
-        def get_catalog0(user: Optional[User]):
+        # Datasets Catalog API
+        datasets_path = base_path + '/datasets'
+
+        def get_datasets0(user: Optional[User]):
             datasets_info = []
             for dataset_name, dataset_config in self.dataset_configs.items():
                 if can_user_access_dataset(user, dataset_name):
@@ -258,30 +261,44 @@ class ApiServer:
                         'name': dataset_name,
                         'label': dataset_config.label,
                         'parameters_path': parameters_path.format(dataset=dataset_normalized),
-                        'result_path': results_path.format(dataset=dataset_normalized),
-                        'first_minor_version': 0
+                        'result_path': results_path.format(dataset=dataset_normalized)
                     })
-            
+            return {"datasets": datasets_info}
+        
+        @app.get(datasets_path)
+        def get_datasets(request: Request, user: Optional[User] = Depends(get_current_user)):
+            return process_based_on_response_version_header(request.headers, {
+                0: lambda: get_datasets0(user)
+            })
+        
+        # Projects Catalog API
+        def get_catalog0():
             return {
                 'projects': [{
                     'name': ManifestIO.obj.project_variables.get_name(),
                     'label': ManifestIO.obj.project_variables.get_label(),
                     'versions': [{
                         'major_version': ManifestIO.obj.project_variables.get_major_version(),
-                        'latest_minor_version': ManifestIO.obj.project_variables.get_minor_version(),
+                        'minor_versions': [0],
                         'token_path': token_path,
-                        'datasets': datasets_info
+                        'datasets_path': datasets_path
                     }]
                 }]
             }
         
         @app.get(squirrels_version_path, response_class=JSONResponse)
-        async def get_catalog(request: Request, user: Optional[User] = Depends(get_current_user)):
+        async def get_catalog(request: Request):
             return process_based_on_response_version_header(request.headers, {
-                0: lambda: get_catalog0(user)
+                0: lambda: get_catalog0()
             })
         
         # Squirrels UI
+        static_dir = u.join_paths(os.path.dirname(__file__), c.PACKAGE_DATA_FOLDER, c.ASSETS_FOLDER)
+        app.mount('/'+c.ASSETS_FOLDER, StaticFiles(directory=static_dir), name=c.ASSETS_FOLDER)
+
+        templates_dir = u.join_paths(os.path.dirname(__file__), c.PACKAGE_DATA_FOLDER, c.TEMPLATES_FOLDER)
+        templates = Jinja2Templates(directory=templates_dir)
+
         @app.get('/', response_class=HTMLResponse)
         async def get_ui(request: Request):
             return templates.TemplateResponse('index.html', {

{squirrels-0.2.0rc1 → squirrels-0.2.2}/squirrels/_authenticator.py

@@ -34,7 +34,7 @@ class Authenticator:
         return AuthArgs(conn_args.proj_vars, conn_args.env_vars, conn_args._get_credential, connections, username, password)
 
     def authenticate_user(self, username: str, password: str) -> Optional[User]:
-        user_cls = self.auth_helper.get_func_or_class("User", default_attr=User)
+        user_cls: type[User] = self.auth_helper.get_func_or_class("User", default_attr=User)
         get_user = self.auth_helper.get_func_or_class(c.GET_USER_FUNC, is_required=False)
         try:
             real_user = get_user(self._get_auth_args(username, password)) if get_user is not None else None
@@ -48,9 +48,8 @@ class Authenticator:
             fake_users = EnvironConfigIO.obj.get_users()
             if username in fake_users and secrets.compare_digest(fake_users[username][c.USER_PWD_KEY], password):
                 is_internal = fake_users[username].get("is_internal", False)
-                user: User = user_cls(username, is_internal=is_internal)
                 try:
-                    return user.with_attributes(fake_users[username])
+                    return user_cls.Create(username, fake_users[username], is_internal=is_internal)
                 except Exception as e:
                     raise u.FileExecutionError(f'Failed to create user from User model in {c.AUTH_FILE}', e)
         

{squirrels-0.2.0rc1 → squirrels-0.2.2}/squirrels/_command_line.py

@@ -33,7 +33,7 @@ def main():
 
     compile_parser = subparsers.add_parser(c.COMPILE_CMD, help='Create files for rendered sql queries in the "target/compile" folder', add_help=False)
     compile_parser.add_argument('-h', '--help', action="help", help="Show this help message and exit")
-    compile_parser.add_argument('-d', '--dataset', type=str, help="Select dataset to use for dataset args. If not specified, all models for all datasets are compiled")
+    compile_parser.add_argument('-d', '--dataset', type=str, help="Select dataset to use for dataset traits. If not specified, all models for all datasets are compiled")
     compile_parser.add_argument('-a', '--all-test-sets', action="store_true", help="Compile models for all selection test sets")
     compile_parser.add_argument('-t', '--test-set', type=str, help="The selection test set to use. Default selections are used if not specified. Ignored if using --all-test-sets")
     compile_parser.add_argument('-s', '--select', type=str, help="Select single model to compile. If not specified, all models for the dataset are compiled. Also, ignored if --dataset is not specified")

{squirrels-0.2.0rc1 → squirrels-0.2.2}/squirrels/_constants.py

@@ -9,7 +9,6 @@ PROJ_VARS_KEY = 'project_variables'
 PROJECT_NAME_KEY = 'name'
 PROJECT_LABEL_KEY = 'label'
 MAJOR_VERSION_KEY = 'major_version'
-MINOR_VERSION_KEY = 'minor_version'
 
 PACKAGES_KEY = 'packages'
 PACKAGE_GIT_KEY = 'git'
@@ -48,7 +47,7 @@ DATASET_NAME_KEY = 'name'
 DATASET_LABEL_KEY = 'label'
 DATASET_MODEL_KEY = 'model'
 DATASET_PARAMETERS_KEY = 'parameters'
-DATASET_ARGS_KEY = 'args'
+DATASET_TRAITS_KEY = 'traits'
 
 DATASET_SCOPE_KEY = 'scope'
 PUBLIC_SCOPE = 'public'
@@ -109,14 +108,17 @@ PARAMETERS_OUTPUT = 'parameters.json'
 FINAL_VIEW_OUT_STEM = 'final_view'
 
 # Dataset setting names
-AUTH_TOKEN_EXPIRE_SETTING = 'auth.token.expire.minutes'
+AUTH_TOKEN_EXPIRE_SETTING = 'auth.token.expire_minutes'
 PARAMETERS_CACHE_SIZE_SETTING = 'parameters.cache.size'
-PARAMETERS_CACHE_TTL_SETTING = 'parameters.cache.ttl.minutes'
+PARAMETERS_CACHE_TTL_SETTING = 'parameters.cache.ttl_minutes'
 RESULTS_CACHE_SIZE_SETTING = 'results.cache.size'
-RESULTS_CACHE_TTL_SETTING = 'results.cache.ttl.minutes'
+RESULTS_CACHE_TTL_SETTING = 'results.cache.ttl_minutes'
 TEST_SET_DEFAULT_USED_SETTING = 'selection_test_sets.default_name_used'
 DB_CONN_DEFAULT_USED_SETTING = 'connections.default_name_used'
 DEFAULT_MATERIALIZE_SETTING = 'defaults.federates.materialized'
+IN_MEMORY_DB_SETTING = 'in_memory_database'
+SQLITE = 'sqlite'
+DUCKDB = 'duckdb'
 
 # Selection cfg sections
 USER_ATTRIBUTES_SECTION = 'user_attributes'

{squirrels-0.2.0rc1 → squirrels-0.2.2}/squirrels/_environcfg.py

@@ -43,7 +43,7 @@ class _EnvironConfig:
         return credential[c.USERNAME_KEY], credential[c.PASSWORD_KEY]
     
     def get_secret(self, key: str, *, default_factory: Optional[Callable[[],str]] = None) -> str:
-        if key not in self._secrets and default_factory is not None:
+        if not self._secrets.get(key) and default_factory is not None:
             self._secrets[key] = default_factory()
         return self._secrets.get(key)
 

{squirrels-0.2.0rc1 → squirrels-0.2.2}/squirrels/_initializer.py

@@ -40,7 +40,6 @@ class Initializer:
         options = ["core", "connections", "parameters", "dbview", "federate", "auth", "sample_db"]
         CORE, CONNECTIONS, PARAMETERS, DBVIEW, FEDERATE, AUTH, SAMPLE_DB = options
         TMP_FOLDER = "tmp"
-        IGNORES_FOLDER = "ignores"
 
         answers = { x: getattr(args, x) for x in options }
         if not any(answers.values()):
@@ -136,7 +135,7 @@ class Initializer:
 
             create_manifest_file()
             
-            self._copy_file(".gitignore", src_folder=IGNORES_FOLDER)
+            self._copy_file(".gitignore")
             self._copy_file(c.MANIFEST_FILE, src_folder=TMP_FOLDER)
             
             if connections_use_py:

{squirrels-0.2.0rc1 → squirrels-0.2.2}/squirrels/_manifest.py

@@ -26,10 +26,10 @@ class ProjectVarsConfig(ManifestComponentConfig):
     data: dict
 
     def __post_init__(self):
-        required_keys = [c.PROJECT_NAME_KEY, c.MAJOR_VERSION_KEY, c.MINOR_VERSION_KEY]
+        required_keys = [c.PROJECT_NAME_KEY, c.MAJOR_VERSION_KEY]
         self._validate_required(self.data, required_keys, c.PROJ_VARS_KEY)
         
-        integer_keys = [c.MAJOR_VERSION_KEY, c.MINOR_VERSION_KEY]
+        integer_keys = [c.MAJOR_VERSION_KEY]
         for key in integer_keys:
             if key in self.data and not isinstance(self.data[key], int):
                 raise u.ConfigurationError(f'Project variable "{key}" must be an integer')
@@ -46,9 +46,6 @@ class ProjectVarsConfig(ManifestComponentConfig):
     
     def get_major_version(self) -> int:
         return self.data[c.MAJOR_VERSION_KEY]
-    
-    def get_minor_version(self) -> int:
-        return self.data[c.MINOR_VERSION_KEY]
 
 
 @dataclass
@@ -84,14 +81,13 @@ class DbConnConfig(ManifestComponentConfig):
 
 @dataclass
 class ParametersConfig(ManifestComponentConfig):
-    name: str
     type: str
     factory: str
     arguments: dict
 
     @classmethod
     def from_dict(cls, kwargs: dict):
-        all_keys = [c.PARAMETER_NAME_KEY, c.PARAMETER_TYPE_KEY, c.PARAMETER_FACTORY_KEY, c.PARAMETER_ARGS_KEY]
+        all_keys = [c.PARAMETER_TYPE_KEY, c.PARAMETER_FACTORY_KEY, c.PARAMETER_ARGS_KEY]
         cls._validate_required(kwargs, all_keys, c.PARAMETERS_KEY)
         args = {key: kwargs[key] for key in all_keys}
         return cls(**args)
@@ -150,7 +146,7 @@ class DatasetsConfig(ManifestComponentConfig):
     model: str
     scope: DatasetScope
     parameters: Optional[list[str]]
-    args: dict
+    traits: dict
 
     @classmethod
     def from_dict(cls, kwargs: dict):
@@ -166,8 +162,8 @@ class DatasetsConfig(ManifestComponentConfig):
             raise u.ConfigurationError(f'Scope not found for dataset "{name}". Scope must be one of {scope_list}') from e
         
         parameters = kwargs.get(c.DATASET_PARAMETERS_KEY)
-        args = kwargs.get(c.DATASET_ARGS_KEY, {})
-        return cls(name, label, model, scope, parameters, args)
+        traits = kwargs.get(c.DATASET_TRAITS_KEY, {})
+        return cls(name, label, model, scope, parameters, traits)
 
 
 @dataclass
@@ -175,7 +171,7 @@ class _ManifestConfig:
     project_variables: ProjectVarsConfig
     packages: list[PackageConfig]
     connections: dict[str, DbConnConfig]
-    parameters: dict[str, ParametersConfig]
+    parameters: list[ParametersConfig]
     selection_test_sets: dict[str, TestSetsConfig]
     dbviews: dict[str, DbviewConfig]
     federates: dict[str, FederateConfig]
@@ -209,7 +205,7 @@ class _ManifestConfig:
             all_package_dirs.add(package.directory)
 
         db_conns = cls._create_configs_as_dict(DbConnConfig, kwargs, c.DB_CONNECTIONS_KEY, c.DB_CONN_NAME_KEY)
-        params = cls._create_configs_as_dict(ParametersConfig, kwargs, c.PARAMETERS_KEY, c.PARAMETER_NAME_KEY)
+        params = [ParametersConfig.from_dict(x) for x in kwargs.get(c.PARAMETERS_KEY, [])]
 
         test_sets = cls._create_configs_as_dict(TestSetsConfig, kwargs, c.TEST_SETS_KEY, c.TEST_SET_NAME_KEY)
         default_test_set: str = settings.get(c.TEST_SET_DEFAULT_USED_SETTING, c.DEFAULT_TEST_SET_NAME)