diff --git a/.DS_Store b/.DS_Store
index b3afbf1..a9bcd6a 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/.gitignore b/.gitignore
index 8ec5ae8..7a2aa9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,6 @@ import_graph.svg
 tmp/
 
 *.xlsx
+# Keep the examples
+!inputs/example_input_excel.xlsx
+!examples/example.config.env
diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
index b759d74..140e6cd 100644
--- a/.semaphore/semaphore.yml
+++ b/.semaphore/semaphore.yml
@@ -4,23 +4,24 @@ agent:
   machine:
     type: e1-standard-2
     os_image: ubuntu2004
+
 blocks:
   - name: Test
     task:
-      env_vars:
-        - name: PIPENV_VENV_IN_PROJECT
-          value: 'true'
       prologue:
         commands:
           - sem-version python 3.12
           - pip install --upgrade pip
-          - pip install pipenv
-          - 'export PATH=$HOME/.local/bin:$PATH'
+          - pip install poetry
+          - poetry config virtualenvs.in-project true
+          - export PATH="$HOME/.local/bin:$PATH"
           - checkout
-          - 'cache restore pipenv-$SEMAPHORE_GIT_BRANCH-$(checksum Pipfile.lock),pipenv-$SEMAPHORE_GIT_BRANCH,pipenv-master'
-          - pipenv install --dev --ignore-pipfile
-          - cache store pipenv-$SEMAPHORE_GIT_BRANCH-$(checksum Pipfile.lock) .venv
+          - cache restore poetry-cache-$SEMAPHORE_GIT_BRANCH,poetry-cache-master
+          - cache restore poetry-venv-$SEMAPHORE_GIT_BRANCH-$(checksum poetry.lock),poetry-venv-$SEMAPHORE_GIT_BRANCH
+          - poetry install --with dev
+          - cache store poetry-cache-$SEMAPHORE_GIT_BRANCH ~/.cache/pypoetry
+          - cache store poetry-venv-$SEMAPHORE_GIT_BRANCH-$(checksum poetry.lock) .venv
       jobs:
         - name: Test
           commands:
-            - pipenv run test
+            - poetry run pytest
diff --git a/Pipfile b/Pipfile
deleted file mode 100644
index 13191b6..0000000
--- a/Pipfile
+++ /dev/null
@@ -1,32 +0,0 @@
-[[source]]
-url = "https://pypi.org/simple"
-verify_ssl = true
-name = "pypi"
-
-[packages]
-pydantic = "*"
-pandas = "*"
-requests = "*"
-dotenv = "*"
-pyyaml = "*"
-pydantic-settings = "*"
-pyetm = {file = ".", editable = true}
-xlsxwriter = "*"
-
-[dev-packages]
-pytest = "*"
-pylint = "*"
-requests-mock = "*"
-ipykernel = "*"
-notebook = "*"
-pytest-cov = "*"
-pydeps = "*"
-
-[requires]
-python_version = "3.12"
-
-[scripts]
-test = "python -m pytest"
-test_with_coverage = "python -m pytest --cov=pyetm tests/ --cov-report=term-missing"
-linter = "python -m pylint pyetm"
-deptree = "pydeps src/pyetm --show-cycles --max-bacon=2 -o import_graph.svg -T svg"
diff --git a/Pipfile.lock b/Pipfile.lock
deleted file mode 100644
index 833e859..0000000
--- a/Pipfile.lock
+++ /dev/null
@@ -1,1976 +0,0 @@
-{
-    "_meta": {
-        "hash": {
-            "sha256": "20f4dddea89cfeba955e7c97b967ea5d2ce533161caec9f36c422323c54deb69"
-        },
-        "pipfile-spec": 6,
-        "requires": {
-            "python_version": "3.12"
-        },
-        "sources": [
-            {
-                "name": "pypi",
-                "url": "https://pypi.org/simple",
-                "verify_ssl": true
-            }
-        ]
-    },
-    "default": {
-        "annotated-types": {
-            "hashes": [
-                "sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53",
-                "sha256:aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==0.7.0"
-        },
-        "certifi": {
-            "hashes": [
-                "sha256:2e0c7ce7cb5d8f8634ca55d2ba7e6ec2689a2fd6537d8dec1296a477a4910057",
-                "sha256:d747aa5a8b9bbbb1bb8c22bb13e22bd1f18e9796defa16bab421f7f7a317323b"
-            ],
-            "markers": "python_version >= '3.7'",
-            "version": "==2025.6.15"
-        },
-        "charset-normalizer": {
-            "hashes": [
-                "sha256:005fa3432484527f9732ebd315da8da8001593e2cf46a3d817669f062c3d9ed4",
-                "sha256:046595208aae0120559a67693ecc65dd75d46f7bf687f159127046628178dc45",
-                "sha256:0c29de6a1a95f24b9a1aa7aefd27d2487263f00dfd55a77719b530788f75cff7",
-                "sha256:0c8c57f84ccfc871a48a47321cfa49ae1df56cd1d965a09abe84066f6853b9c0",
-                "sha256:0f5d9ed7f254402c9e7d35d2f5972c9bbea9040e99cd2861bd77dc68263277c7",
-                "sha256:18dd2e350387c87dabe711b86f83c9c78af772c748904d372ade190b5c7c9d4d",
-                "sha256:1b1bde144d98e446b056ef98e59c256e9294f6b74d7af6846bf5ffdafd687a7d",
-                "sha256:1c95a1e2902a8b722868587c0e1184ad5c55631de5afc0eb96bc4b0d738092c0",
-                "sha256:1cad5f45b3146325bb38d6855642f6fd609c3f7cad4dbaf75549bf3b904d3184",
-                "sha256:21b2899062867b0e1fde9b724f8aecb1af14f2778d69aacd1a5a1853a597a5db",
-                "sha256:24498ba8ed6c2e0b56d4acbf83f2d989720a93b41d712ebd4f4979660db4417b",
-                "sha256:25a23ea5c7edc53e0f29bae2c44fcb5a1aa10591aae107f2a2b2583a9c5cbc64",
-                "sha256:289200a18fa698949d2b39c671c2cc7a24d44096784e76614899a7ccf2574b7b",
-                "sha256:28a1005facc94196e1fb3e82a3d442a9d9110b8434fc1ded7a24a2983c9888d8",
-                "sha256:32fc0341d72e0f73f80acb0a2c94216bd704f4f0bce10aedea38f30502b271ff",
-                "sha256:36b31da18b8890a76ec181c3cf44326bf2c48e36d393ca1b72b3f484113ea344",
-                "sha256:3c21d4fca343c805a52c0c78edc01e3477f6dd1ad7c47653241cf2a206d4fc58",
-                "sha256:3fddb7e2c84ac87ac3a947cb4e66d143ca5863ef48e4a5ecb83bd48619e4634e",
-                "sha256:43e0933a0eff183ee85833f341ec567c0980dae57c464d8a508e1b2ceb336471",
-                "sha256:4a476b06fbcf359ad25d34a057b7219281286ae2477cc5ff5e3f70a246971148",
-                "sha256:4e594135de17ab3866138f496755f302b72157d115086d100c3f19370839dd3a",
-                "sha256:50bf98d5e563b83cc29471fa114366e6806bc06bc7a25fd59641e41445327836",
-                "sha256:5a9979887252a82fefd3d3ed2a8e3b937a7a809f65dcb1e068b090e165bbe99e",
-                "sha256:5baececa9ecba31eff645232d59845c07aa030f0c81ee70184a90d35099a0e63",
-                "sha256:5bf4545e3b962767e5c06fe1738f951f77d27967cb2caa64c28be7c4563e162c",
-                "sha256:6333b3aa5a12c26b2a4d4e7335a28f1475e0e5e17d69d55141ee3cab736f66d1",
-                "sha256:65c981bdbd3f57670af8b59777cbfae75364b483fa8a9f420f08094531d54a01",
-                "sha256:68a328e5f55ec37c57f19ebb1fdc56a248db2e3e9ad769919a58672958e8f366",
-                "sha256:6a0289e4589e8bdfef02a80478f1dfcb14f0ab696b5a00e1f4b8a14a307a3c58",
-                "sha256:6b66f92b17849b85cad91259efc341dce9c1af48e2173bf38a85c6329f1033e5",
-                "sha256:6c9379d65defcab82d07b2a9dfbfc2e95bc8fe0ebb1b176a3190230a3ef0e07c",
-                "sha256:6fc1f5b51fa4cecaa18f2bd7a003f3dd039dd615cd69a2afd6d3b19aed6775f2",
-                "sha256:70f7172939fdf8790425ba31915bfbe8335030f05b9913d7ae00a87d4395620a",
-                "sha256:721c76e84fe669be19c5791da68232ca2e05ba5185575086e384352e2c309597",
-                "sha256:7222ffd5e4de8e57e03ce2cef95a4c43c98fcb72ad86909abdfc2c17d227fc1b",
-                "sha256:75d10d37a47afee94919c4fab4c22b9bc2a8bf7d4f46f87363bcf0573f3ff4f5",
-                "sha256:76af085e67e56c8816c3ccf256ebd136def2ed9654525348cfa744b6802b69eb",
-                "sha256:770cab594ecf99ae64c236bc9ee3439c3f46be49796e265ce0cc8bc17b10294f",
-                "sha256:7a6ab32f7210554a96cd9e33abe3ddd86732beeafc7a28e9955cdf22ffadbab0",
-                "sha256:7c48ed483eb946e6c04ccbe02c6b4d1d48e51944b6db70f697e089c193404941",
-                "sha256:7f56930ab0abd1c45cd15be65cc741c28b1c9a34876ce8c17a2fa107810c0af0",
-                "sha256:8075c35cd58273fee266c58c0c9b670947c19df5fb98e7b66710e04ad4e9ff86",
-                "sha256:8272b73e1c5603666618805fe821edba66892e2870058c94c53147602eab29c7",
-                "sha256:82d8fd25b7f4675d0c47cf95b594d4e7b158aca33b76aa63d07186e13c0e0ab7",
-                "sha256:844da2b5728b5ce0e32d863af26f32b5ce61bc4273a9c720a9f3aa9df73b1455",
-                "sha256:8755483f3c00d6c9a77f490c17e6ab0c8729e39e6390328e42521ef175380ae6",
-                "sha256:915f3849a011c1f593ab99092f3cecfcb4d65d8feb4a64cf1bf2d22074dc0ec4",
-                "sha256:926ca93accd5d36ccdabd803392ddc3e03e6d4cd1cf17deff3b989ab8e9dbcf0",
-                "sha256:982bb1e8b4ffda883b3d0a521e23abcd6fd17418f6d2c4118d257a10199c0ce3",
-                "sha256:98f862da73774290f251b9df8d11161b6cf25b599a66baf087c1ffe340e9bfd1",
-                "sha256:9cbfacf36cb0ec2897ce0ebc5d08ca44213af24265bd56eca54bee7923c48fd6",
-                "sha256:a370b3e078e418187da8c3674eddb9d983ec09445c99a3a263c2011993522981",
-                "sha256:a955b438e62efdf7e0b7b52a64dc5c3396e2634baa62471768a64bc2adb73d5c",
-                "sha256:aa6af9e7d59f9c12b33ae4e9450619cf2488e2bbe9b44030905877f0b2324980",
-                "sha256:aa88ca0b1932e93f2d961bf3addbb2db902198dca337d88c89e1559e066e7645",
-                "sha256:aaeeb6a479c7667fbe1099af9617c83aaca22182d6cf8c53966491a0f1b7ffb7",
-                "sha256:aaf27faa992bfee0264dc1f03f4c75e9fcdda66a519db6b957a3f826e285cf12",
-                "sha256:b2680962a4848b3c4f155dc2ee64505a9c57186d0d56b43123b17ca3de18f0fa",
-                "sha256:b2d318c11350e10662026ad0eb71bb51c7812fc8590825304ae0bdd4ac283acd",
-                "sha256:b33de11b92e9f75a2b545d6e9b6f37e398d86c3e9e9653c4864eb7e89c5773ef",
-                "sha256:b3daeac64d5b371dea99714f08ffc2c208522ec6b06fbc7866a450dd446f5c0f",
-                "sha256:be1e352acbe3c78727a16a455126d9ff83ea2dfdcbc83148d2982305a04714c2",
-                "sha256:bee093bf902e1d8fc0ac143c88902c3dfc8941f7ea1d6a8dd2bcb786d33db03d",
-                "sha256:c72fbbe68c6f32f251bdc08b8611c7b3060612236e960ef848e0a517ddbe76c5",
-                "sha256:c9e36a97bee9b86ef9a1cf7bb96747eb7a15c2f22bdb5b516434b00f2a599f02",
-                "sha256:cddf7bd982eaa998934a91f69d182aec997c6c468898efe6679af88283b498d3",
-                "sha256:cf713fe9a71ef6fd5adf7a79670135081cd4431c2943864757f0fa3a65b1fafd",
-                "sha256:d11b54acf878eef558599658b0ffca78138c8c3655cf4f3a4a673c437e67732e",
-                "sha256:d41c4d287cfc69060fa91cae9683eacffad989f1a10811995fa309df656ec214",
-                "sha256:d524ba3f1581b35c03cb42beebab4a13e6cdad7b36246bd22541fa585a56cccd",
-                "sha256:daac4765328a919a805fa5e2720f3e94767abd632ae410a9062dff5412bae65a",
-                "sha256:db4c7bf0e07fc3b7d89ac2a5880a6a8062056801b83ff56d8464b70f65482b6c",
-                "sha256:dc7039885fa1baf9be153a0626e337aa7ec8bf96b0128605fb0d77788ddc1681",
-                "sha256:dccab8d5fa1ef9bfba0590ecf4d46df048d18ffe3eec01eeb73a42e0d9e7a8ba",
-                "sha256:dedb8adb91d11846ee08bec4c8236c8549ac721c245678282dcb06b221aab59f",
-                "sha256:e45ba65510e2647721e35323d6ef54c7974959f6081b58d4ef5d87c60c84919a",
-                "sha256:e53efc7c7cee4c1e70661e2e112ca46a575f90ed9ae3fef200f2a25e954f4b28",
-                "sha256:e635b87f01ebc977342e2697d05b56632f5f879a4f15955dfe8cef2448b51691",
-                "sha256:e70e990b2137b29dc5564715de1e12701815dacc1d056308e2b17e9095372a82",
-                "sha256:e8082b26888e2f8b36a042a58307d5b917ef2b1cacab921ad3323ef91901c71a",
-                "sha256:e8323a9b031aa0393768b87f04b4164a40037fb2a3c11ac06a03ffecd3618027",
-                "sha256:e92fca20c46e9f5e1bb485887d074918b13543b1c2a1185e69bb8d17ab6236a7",
-                "sha256:eb30abc20df9ab0814b5a2524f23d75dcf83cde762c161917a2b4b7b55b1e518",
-                "sha256:eba9904b0f38a143592d9fc0e19e2df0fa2e41c3c3745554761c5f6447eedabf",
-                "sha256:ef8de666d6179b009dce7bcb2ad4c4a779f113f12caf8dc77f0162c29d20490b",
-                "sha256:efd387a49825780ff861998cd959767800d54f8308936b21025326de4b5a42b9",
-                "sha256:f0aa37f3c979cf2546b73e8222bbfa3dc07a641585340179d768068e3455e544",
-                "sha256:f4074c5a429281bf056ddd4c5d3b740ebca4d43ffffe2ef4bf4d2d05114299da",
-                "sha256:f69a27e45c43520f5487f27627059b64aaf160415589230992cec34c5e18a509",
-                "sha256:fb707f3e15060adf5b7ada797624a6c6e0138e2a26baa089df64c68ee98e040f",
-                "sha256:fcbe676a55d7445b22c10967bceaaf0ee69407fbe0ece4d032b6eb8d4565982a",
-                "sha256:fdb20a30fe1175ecabed17cbf7812f7b804b8a315a25f24678bcdf120a90077f"
-            ],
-            "markers": "python_version >= '3.7'",
-            "version": "==3.4.2"
-        },
-        "dotenv": {
-            "hashes": [
-                "sha256:29cf74a087b31dafdb5a446b6d7e11cbce8ed2741540e2339c69fbef92c94ce9"
-            ],
-            "index": "pypi",
-            "version": "==0.9.9"
-        },
-        "idna": {
-            "hashes": [
-                "sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9",
-                "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3"
-            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==3.10"
-        },
-        "numpy": {
-            "hashes": [
-                "sha256:0025048b3c1557a20bc80d06fdeb8cc7fc193721484cca82b2cfa072fec71a93",
-                "sha256:010ce9b4f00d5c036053ca684c77441f2f2c934fd23bee058b4d6f196efd8280",
-                "sha256:0bb3a4a61e1d327e035275d2a993c96fa786e4913aa089843e6a2d9dd205c66a",
-                "sha256:0c4d9e0a8368db90f93bd192bfa771ace63137c3488d198ee21dfb8e7771916e",
-                "sha256:15aa4c392ac396e2ad3d0a2680c0f0dee420f9fed14eef09bdb9450ee6dcb7b7",
-                "sha256:18703df6c4a4fee55fd3d6e5a253d01c5d33a295409b03fda0c86b3ca2ff41a1",
-                "sha256:1ec9ae20a4226da374362cca3c62cd753faf2f951440b0e3b98e93c235441d2b",
-                "sha256:23ab05b2d241f76cb883ce8b9a93a680752fbfcbd51c50eff0b88b979e471d8c",
-                "sha256:25a1992b0a3fdcdaec9f552ef10d8103186f5397ab45e2d25f8ac51b1a6b97e8",
-                "sha256:2959d8f268f3d8ee402b04a9ec4bb7604555aeacf78b360dc4ec27f1d508177d",
-                "sha256:2a809637460e88a113e186e87f228d74ae2852a2e0c44de275263376f17b5bdc",
-                "sha256:2fb86b7e58f9ac50e1e9dd1290154107e47d1eef23a0ae9145ded06ea606f992",
-                "sha256:36890eb9e9d2081137bd78d29050ba63b8dab95dff7912eadf1185e80074b2a0",
-                "sha256:39bff12c076812595c3a306f22bfe49919c5513aa1e0e70fac756a0be7c2a2b8",
-                "sha256:467db865b392168ceb1ef1ffa6f5a86e62468c43e0cfb4ab6da667ede10e58db",
-                "sha256:4e602e1b8682c2b833af89ba641ad4176053aaa50f5cacda1a27004352dde943",
-                "sha256:5902660491bd7a48b2ec16c23ccb9124b8abfd9583c5fdfa123fe6b421e03de1",
-                "sha256:5ccb7336eaf0e77c1635b232c141846493a588ec9ea777a7c24d7166bb8533ae",
-                "sha256:5f1b8f26d1086835f442286c1d9b64bb3974b0b1e41bb105358fd07d20872952",
-                "sha256:6269b9edfe32912584ec496d91b00b6d34282ca1d07eb10e82dfc780907d6c2e",
-                "sha256:6ea9e48336a402551f52cd8f593343699003d2353daa4b72ce8d34f66b722070",
-                "sha256:762e0c0c6b56bdedfef9a8e1d4538556438288c4276901ea008ae44091954e29",
-                "sha256:7be91b2239af2658653c5bb6f1b8bccafaf08226a258caf78ce44710a0160d30",
-                "sha256:7dea630156d39b02a63c18f508f85010230409db5b2927ba59c8ba4ab3e8272e",
-                "sha256:867ef172a0976aaa1f1d1b63cf2090de8b636a7674607d514505fb7276ab08fc",
-                "sha256:8d5ee6eec45f08ce507a6570e06f2f879b374a552087a4179ea7838edbcbfa42",
-                "sha256:8e333040d069eba1652fb08962ec5b76af7f2c7bce1df7e1418c8055cf776f25",
-                "sha256:a5ee121b60aa509679b682819c602579e1df14a5b07fe95671c8849aad8f2115",
-                "sha256:a780033466159c2270531e2b8ac063704592a0bc62ec4a1b991c7c40705eb0e8",
-                "sha256:a894f3816eb17b29e4783e5873f92faf55b710c2519e5c351767c51f79d8526d",
-                "sha256:a8b740f5579ae4585831b3cf0e3b0425c667274f82a484866d2adf9570539369",
-                "sha256:ad506d4b09e684394c42c966ec1527f6ebc25da7f4da4b1b056606ffe446b8a3",
-                "sha256:afed2ce4a84f6b0fc6c1ce734ff368cbf5a5e24e8954a338f3bdffa0718adffb",
-                "sha256:b0b5397374f32ec0649dd98c652a1798192042e715df918c20672c62fb52d4b8",
-                "sha256:bada6058dd886061f10ea15f230ccf7dfff40572e99fef440a4a857c8728c9c0",
-                "sha256:c4913079974eeb5c16ccfd2b1f09354b8fed7e0d6f2cab933104a09a6419b1ee",
-                "sha256:c5bdf2015ccfcee8253fb8be695516ac4457c743473a43290fd36eba6a1777eb",
-                "sha256:c6e0bf9d1a2f50d2b65a7cf56db37c095af17b59f6c132396f7c6d5dd76484df",
-                "sha256:ce2ce9e5de4703a673e705183f64fd5da5bf36e7beddcb63a25ee2286e71ca48",
-                "sha256:cfecc7822543abdea6de08758091da655ea2210b8ffa1faf116b940693d3df76",
-                "sha256:d4580adadc53311b163444f877e0789f1c8861e2698f6b2a4ca852fda154f3ff",
-                "sha256:d70f20df7f08b90a2062c1f07737dd340adccf2068d0f1b9b3d56e2038979fee",
-                "sha256:e344eb79dab01f1e838ebb67aab09965fb271d6da6b00adda26328ac27d4a66e",
-                "sha256:e610832418a2bc09d974cc9fecebfa51e9532d6190223bc5ef6a7402ebf3b5cb",
-                "sha256:e772dda20a6002ef7061713dc1e2585bc1b534e7909b2030b5a46dae8ff077ab",
-                "sha256:e7cbf5a5eafd8d230a3ce356d892512185230e4781a361229bd902ff403bc660",
-                "sha256:eabd7e8740d494ce2b4ea0ff05afa1b7b291e978c0ae075487c51e8bd93c0c68",
-                "sha256:ebb8603d45bc86bbd5edb0d63e52c5fd9e7945d3a503b77e486bd88dde67a19b",
-                "sha256:ec0bdafa906f95adc9a0c6f26a4871fa753f25caaa0e032578a30457bff0af6a",
-                "sha256:eccb9a159db9aed60800187bc47a6d3451553f0e1b08b068d8b277ddfbb9b244",
-                "sha256:ee8340cb48c9b7a5899d1149eece41ca535513a9698098edbade2a8e7a84da77"
-            ],
-            "markers": "python_version >= '3.11'",
-            "version": "==2.3.1"
-        },
-        "pandas": {
-            "hashes": [
-                "sha256:034abd6f3db8b9880aaee98f4f5d4dbec7c4829938463ec046517220b2f8574e",
-                "sha256:094e271a15b579650ebf4c5155c05dcd2a14fd4fdd72cf4854b2f7ad31ea30be",
-                "sha256:14a0cc77b0f089d2d2ffe3007db58f170dae9b9f54e569b299db871a3ab5bf46",
-                "sha256:1a881bc1309f3fce34696d07b00f13335c41f5f5a8770a33b09ebe23261cfc67",
-                "sha256:1d2b33e68d0ce64e26a4acc2e72d747292084f4e8db4c847c6f5f6cbe56ed6d8",
-                "sha256:213cd63c43263dbb522c1f8a7c9d072e25900f6975596f883f4bebd77295d4f3",
-                "sha256:23c2b2dc5213810208ca0b80b8666670eb4660bbfd9d45f58592cc4ddcfd62e1",
-                "sha256:2c7e2fc25f89a49a11599ec1e76821322439d90820108309bf42130d2f36c983",
-                "sha256:2eb4728a18dcd2908c7fccf74a982e241b467d178724545a48d0caf534b38ebf",
-                "sha256:34600ab34ebf1131a7613a260a61dbe8b62c188ec0ea4c296da7c9a06b004133",
-                "sha256:39ff73ec07be5e90330cc6ff5705c651ace83374189dcdcb46e6ff54b4a72cd6",
-                "sha256:404d681c698e3c8a40a61d0cd9412cc7364ab9a9cc6e144ae2992e11a2e77a20",
-                "sha256:40cecc4ea5abd2921682b57532baea5588cc5f80f0231c624056b146887274d2",
-                "sha256:430a63bae10b5086995db1b02694996336e5a8ac9a96b4200572b413dfdfccb9",
-                "sha256:4930255e28ff5545e2ca404637bcc56f031893142773b3468dc021c6c32a1390",
-                "sha256:6021910b086b3ca756755e86ddc64e0ddafd5e58e076c72cb1585162e5ad259b",
-                "sha256:625466edd01d43b75b1883a64d859168e4556261a5035b32f9d743b67ef44634",
-                "sha256:75651c14fde635e680496148a8526b328e09fe0572d9ae9b638648c46a544ba3",
-                "sha256:84141f722d45d0c2a89544dd29d35b3abfc13d2250ed7e68394eda7564bd6324",
-                "sha256:8adff9f138fc614347ff33812046787f7d43b3cef7c0f0171b3340cae333f6ca",
-                "sha256:951805d146922aed8357e4cc5671b8b0b9be1027f0619cea132a9f3f65f2f09c",
-                "sha256:9efc0acbbffb5236fbdf0409c04edce96bec4bdaa649d49985427bd1ec73e085",
-                "sha256:9ff730713d4c4f2f1c860e36c005c7cefc1c7c80c21c0688fd605aa43c9fcf09",
-                "sha256:a6872d695c896f00df46b71648eea332279ef4077a409e2fe94220208b6bb675",
-                "sha256:b198687ca9c8529662213538a9bb1e60fa0bf0f6af89292eb68fea28743fcd5a",
-                "sha256:b9d8c3187be7479ea5c3d30c32a5d73d62a621166675063b2edd21bc47614027",
-                "sha256:ba24af48643b12ffe49b27065d3babd52702d95ab70f50e1b34f71ca703e2c0d",
-                "sha256:bb32dc743b52467d488e7a7c8039b821da2826a9ba4f85b89ea95274f863280f",
-                "sha256:bb3be958022198531eb7ec2008cfc78c5b1eed51af8600c6c5d9160d89d8d249",
-                "sha256:bf5be867a0541a9fb47a4be0c5790a4bccd5b77b92f0a59eeec9375fafc2aa14",
-                "sha256:c06f6f144ad0a1bf84699aeea7eff6068ca5c63ceb404798198af7eb86082e33",
-                "sha256:c6da97aeb6a6d233fb6b17986234cc723b396b50a3c6804776351994f2a658fd",
-                "sha256:e0f51973ba93a9f97185049326d75b942b9aeb472bec616a129806facb129ebb",
-                "sha256:e1991bbb96f4050b09b5f811253c4f3cf05ee89a589379aa36cd623f21a31d6f",
-                "sha256:e5f08eb9a445d07720776df6e641975665c9ea12c9d8a331e0f6890f2dcd76ef",
-                "sha256:e78ad363ddb873a631e92a3c063ade1ecfb34cae71e9a2be6ad100f875ac1042",
-                "sha256:ed16339bc354a73e0a609df36d256672c7d296f3f767ac07257801aa064ff73c",
-                "sha256:f4dd97c19bd06bc557ad787a15b6489d2614ddaab5d104a0310eb314c724b2d2",
-                "sha256:f925f1ef673b4bd0271b1809b72b3270384f2b7d9d14a189b12b7fc02574d575",
-                "sha256:f95a2aef32614ed86216d3c450ab12a4e82084e8102e355707a1d96e33d51c34",
-                "sha256:fa07e138b3f6c04addfeaf56cc7fdb96c3b68a3fe5e5401251f231fce40a0d7a",
-                "sha256:fa35c266c8cd1a67d75971a1912b185b492d257092bdd2709bbdebe574ed228d"
-            ],
-            "index": "pypi",
-            "markers": "python_version >= '3.9'",
-            "version": "==2.3.0"
-        },
-        "pydantic": {
-            "hashes": [
-                "sha256:d989c3c6cb79469287b1569f7447a17848c998458d49ebe294e975b9baf0f0db",
-                "sha256:dde5df002701f6de26248661f6835bbe296a47bf73990135c7d07ce741b9623b"
-            ],
-            "index": "pypi",
-            "markers": "python_version >= '3.9'",
-            "version": "==2.11.7"
-        },
-        "pydantic-core": {
-            "hashes": [
-                "sha256:0069c9acc3f3981b9ff4cdfaf088e98d83440a4c7ea1bc07460af3d4dc22e72d",
-                "sha256:031c57d67ca86902726e0fae2214ce6770bbe2f710dc33063187a68744a5ecac",
-                "sha256:0405262705a123b7ce9f0b92f123334d67b70fd1f20a9372b907ce1080c7ba02",
-                "sha256:04a1a413977ab517154eebb2d326da71638271477d6ad87a769102f7c2488c56",
-                "sha256:09fb9dd6571aacd023fe6aaca316bd01cf60ab27240d7eb39ebd66a3a15293b4",
-                "sha256:0a39979dcbb70998b0e505fb1556a1d550a0781463ce84ebf915ba293ccb7e22",
-                "sha256:0a9f2c9dd19656823cb8250b0724ee9c60a82f3cdf68a080979d13092a3b0fef",
-                "sha256:0e03262ab796d986f978f79c943fc5f620381be7287148b8010b4097f79a39ec",
-                "sha256:0e5b2671f05ba48b94cb90ce55d8bdcaaedb8ba00cc5359f6810fc918713983d",
-                "sha256:0e6116757f7959a712db11f3e9c0a99ade00a5bbedae83cb801985aa154f071b",
-                "sha256:0fb2d542b4d66f9470e8065c5469ec676978d625a8b7a363f07d9a501a9cb36a",
-                "sha256:1082dd3e2d7109ad8b7da48e1d4710c8d06c253cbc4a27c1cff4fbcaa97a9e3f",
-                "sha256:1a8695a8d00c73e50bff9dfda4d540b7dee29ff9b8053e38380426a85ef10052",
-                "sha256:1e063337ef9e9820c77acc768546325ebe04ee38b08703244c1309cccc4f1bab",
-                "sha256:1ea40a64d23faa25e62a70ad163571c0b342b8bf66d5fa612ac0dec4f069d916",
-                "sha256:2058a32994f1fde4ca0480ab9d1e75a0e8c87c22b53a3ae66554f9af78f2fe8c",
-                "sha256:235f45e5dbcccf6bd99f9f472858849f73d11120d76ea8707115415f8e5ebebf",
-                "sha256:2807668ba86cb38c6817ad9bc66215ab8584d1d304030ce4f0887336f28a5e27",
-                "sha256:2b0a451c263b01acebe51895bfb0e1cc842a5c666efe06cdf13846c7418caa9a",
-                "sha256:2b3d326aaef0c0399d9afffeb6367d5e26ddc24d351dbc9c636840ac355dc5d8",
-                "sha256:2bfb5112df54209d820d7bf9317c7a6c9025ea52e49f46b6a2060104bba37de7",
-                "sha256:2f82865531efd18d6e07a04a17331af02cb7a651583c418df8266f17a63c6612",
-                "sha256:329467cecfb529c925cf2bbd4d60d2c509bc2fb52a20c1045bf09bb70971a9c1",
-                "sha256:3a1c81334778f9e3af2f8aeb7a960736e5cab1dfebfb26aabca09afd2906c039",
-                "sha256:3abcd9392a36025e3bd55f9bd38d908bd17962cc49bc6da8e7e96285336e2bca",
-                "sha256:3c6db6e52c6d70aa0d00d45cdb9b40f0433b96380071ea80b09277dba021ddf7",
-                "sha256:3dc625f4aa79713512d1976fe9f0bc99f706a9dee21dfd1810b4bbbf228d0e8a",
-                "sha256:3eb3fe62804e8f859c49ed20a8451342de53ed764150cb14ca71357c765dc2a6",
-                "sha256:44857c3227d3fb5e753d5fe4a3420d6376fa594b07b621e220cd93703fe21782",
-                "sha256:4b25d91e288e2c4e0662b8038a28c6a07eaac3e196cfc4ff69de4ea3db992a1b",
-                "sha256:4c5b0a576fb381edd6d27f0a85915c6daf2f8138dc5c267a57c08a62900758c7",
-                "sha256:4e61206137cbc65e6d5256e1166f88331d3b6238e082d9f74613b9b765fb9025",
-                "sha256:52fb90784e0a242bb96ec53f42196a17278855b0f31ac7c3cc6f5c1ec4811849",
-                "sha256:53a57d2ed685940a504248187d5685e49eb5eef0f696853647bf37c418c538f7",
-                "sha256:572c7e6c8bb4774d2ac88929e3d1f12bc45714ae5ee6d9a788a9fb35e60bb04b",
-                "sha256:5c4aa4e82353f65e548c476b37e64189783aa5384903bfea4f41580f255fddfa",
-                "sha256:5c92edd15cd58b3c2d34873597a1e20f13094f59cf88068adb18947df5455b4e",
-                "sha256:5f483cfb75ff703095c59e365360cb73e00185e01aaea067cd19acffd2ab20ea",
-                "sha256:61c18fba8e5e9db3ab908620af374db0ac1baa69f0f32df4f61ae23f15e586ac",
-                "sha256:6368900c2d3ef09b69cb0b913f9f8263b03786e5b2a387706c5afb66800efd51",
-                "sha256:64632ff9d614e5eecfb495796ad51b0ed98c453e447a76bcbeeb69615079fc7e",
-                "sha256:65132b7b4a1c0beded5e057324b7e16e10910c106d43675d9bd87d4f38dde162",
-                "sha256:6b99022f1d19bc32a4c2a0d544fc9a76e3be90f0b3f4af413f87d38749300e65",
-                "sha256:6bdfe4b3789761f3bcb4b1ddf33355a71079858958e3a552f16d5af19768fef2",
-                "sha256:6fa6dfc3e4d1f734a34710f391ae822e0a8eb8559a85c6979e14e65ee6ba2954",
-                "sha256:73662edf539e72a9440129f231ed3757faab89630d291b784ca99237fb94db2b",
-                "sha256:73cf6373c21bc80b2e0dc88444f41ae60b2f070ed02095754eb5a01df12256de",
-                "sha256:7cb8bc3605c29176e1b105350d2e6474142d7c1bd1d9327c4a9bdb46bf827acc",
-                "sha256:7f92c15cd1e97d4b12acd1cc9004fa092578acfa57b67ad5e43a197175d01a64",
-                "sha256:82f68293f055f51b51ea42fafc74b6aad03e70e191799430b90c13d643059ebb",
-                "sha256:83aa99b1285bc8f038941ddf598501a86f1536789740991d7d8756e34f1e74d9",
-                "sha256:87acbfcf8e90ca885206e98359d7dca4bcbb35abdc0ff66672a293e1d7a19101",
-                "sha256:87b31b6846e361ef83fedb187bb5b4372d0da3f7e28d85415efa92d6125d6e6d",
-                "sha256:881b21b5549499972441da4758d662aeea93f1923f953e9cbaff14b8b9565aef",
-                "sha256:8d55ab81c57b8ff8548c3e4947f119551253f4e3787a7bbc0b6b3ca47498a9d3",
-                "sha256:8f57a69461af2a5fa6e6bbd7a5f60d3b7e6cebb687f55106933188e79ad155c1",
-                "sha256:95237e53bb015f67b63c91af7518a62a8660376a6a0db19b89acc77a4d6199f5",
-                "sha256:96081f1605125ba0855dfda83f6f3df5ec90c61195421ba72223de35ccfb2f88",
-                "sha256:970919794d126ba8645f3837ab6046fb4e72bbc057b3709144066204c19a455d",
-                "sha256:9cb1da0f5a471435a7bc7e439b8a728e8b61e59784b2af70d7c169f8dd8ae290",
-                "sha256:9fcd347d2cc5c23b06de6d3b7b8275be558a0c90549495c699e379a80bf8379e",
-                "sha256:9fdac5d6ffa1b5a83bca06ffe7583f5576555e6c8b3a91fbd25ea7780f825f7d",
-                "sha256:a11c8d26a50bfab49002947d3d237abe4d9e4b5bdc8846a63537b6488e197808",
-                "sha256:a144d4f717285c6d9234a66778059f33a89096dfb9b39117663fd8413d582dcc",
-                "sha256:a2b911a5b90e0374d03813674bf0a5fbbb7741570dcd4b4e85a2e48d17def29d",
-                "sha256:a7ec89dc587667f22b6a0b6579c249fca9026ce7c333fc142ba42411fa243cdc",
-                "sha256:aa9d91b338f2df0508606f7009fde642391425189bba6d8c653afd80fd6bb64e",
-                "sha256:b0379a2b24882fef529ec3b4987cb5d003b9cda32256024e6fe1586ac45fc640",
-                "sha256:bc7aee6f634a6f4a95676fcb5d6559a2c2a390330098dba5e5a5f28a2e4ada30",
-                "sha256:bdc25f3681f7b78572699569514036afe3c243bc3059d3942624e936ec93450e",
-                "sha256:c083a3bdd5a93dfe480f1125926afcdbf2917ae714bdb80b36d34318b2bec5d9",
-                "sha256:c20c462aa4434b33a2661701b861604913f912254e441ab8d78d30485736115a",
-                "sha256:c2fc0a768ef76c15ab9238afa6da7f69895bb5d1ee83aeea2e3509af4472d0b9",
-                "sha256:c52b02ad8b4e2cf14ca7b3d918f3eb0ee91e63b3167c32591e57c4317e134f8f",
-                "sha256:c54c939ee22dc8e2d545da79fc5381f1c020d6d3141d3bd747eab59164dc89fb",
-                "sha256:c8e7af2f4e0194c22b5b37205bfb293d166a7344a5b0d0eaccebc376546d77d5",
-                "sha256:cca3868ddfaccfbc4bfb1d608e2ccaaebe0ae628e1416aeb9c4d88c001bb45ab",
-                "sha256:d3f26877a748dc4251cfcfda9dfb5f13fcb034f5308388066bcfe9031b63ae7d",
-                "sha256:d53b22f2032c42eaaf025f7c40c2e3b94568ae077a606f006d206a463bc69572",
-                "sha256:d87c561733f66531dced0da6e864f44ebf89a8fba55f31407b00c2f7f9449593",
-                "sha256:d946c8bf0d5c24bf4fe333af284c59a19358aa3ec18cb3dc4370080da1e8ad29",
-                "sha256:dac89aea9af8cd672fa7b510e7b8c33b0bba9a43186680550ccf23020f32d535",
-                "sha256:db4b41f9bd95fbe5acd76d89920336ba96f03e149097365afe1cb092fceb89a1",
-                "sha256:dc46a01bf8d62f227d5ecee74178ffc448ff4e5197c756331f71efcc66dc980f",
-                "sha256:dd14041875d09cc0f9308e37a6f8b65f5585cf2598a53aa0123df8b129d481f8",
-                "sha256:de4b83bb311557e439b9e186f733f6c645b9417c84e2eb8203f3f820a4b988bf",
-                "sha256:e799c050df38a639db758c617ec771fd8fb7a5f8eaaa4b27b101f266b216a246",
-                "sha256:e80b087132752f6b3d714f041ccf74403799d3b23a72722ea2e6ba2e892555b9",
-                "sha256:eb8c529b2819c37140eb51b914153063d27ed88e3bdc31b71198a198e921e011",
-                "sha256:eb9b459ca4df0e5c87deb59d37377461a538852765293f9e6ee834f0435a93b9",
-                "sha256:efec8db3266b76ef9607c2c4c419bdb06bf335ae433b80816089ea7585816f6a",
-                "sha256:f481959862f57f29601ccced557cc2e817bce7533ab8e01a797a48b49c9692b3",
-                "sha256:f517ca031dfc037a9c07e748cefd8d96235088b83b4f4ba8939105d20fa1dcd6",
-                "sha256:f889f7a40498cc077332c7ab6b4608d296d852182211787d4f3ee377aaae66e8",
-                "sha256:f8de619080e944347f5f20de29a975c2d815d9ddd8be9b9b7268e2e3ef68605a",
-                "sha256:f941635f2a3d96b2973e867144fde513665c87f13fe0e193c158ac51bfaaa7b2",
-                "sha256:fa754d1850735a0b0e03bcffd9d4b4343eb417e47196e4485d9cca326073a42c",
-                "sha256:fa854f5cf7e33842a892e5c73f45327760bc7bc516339fda888c75ae60edaeb6",
-                "sha256:fe5b32187cbc0c862ee201ad66c30cf218e5ed468ec8dc1cf49dec66e160cc4d"
-            ],
-            "markers": "python_version >= '3.9'",
-            "version": "==2.33.2"
-        },
-        "pydantic-settings": {
-            "hashes": [
-                "sha256:06f0062169818d0f5524420a360d632d5857b83cffd4d42fe29597807a1614ee",
-                "sha256:a60952460b99cf661dc25c29c0ef171721f98bfcb52ef8d9ea4c943d7c8cc796"
-            ],
-            "index": "pypi",
-            "markers": "python_version >= '3.9'",
-            "version": "==2.10.1"
-        },
-        "pyetm": {
-            "editable": true,
-            "file": "."
-        },
-        "python-dateutil": {
-            "hashes": [
-                "sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3",
-                "sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427"
-            ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'",
-            "version": "==2.9.0.post0"
-        },
-        "python-dotenv": {
-            "hashes": [
-                "sha256:31f23644fe2602f88ff55e1f5c79ba497e01224ee7737937930c448e4d0e24dc",
-                "sha256:a8a6399716257f45be6a007360200409fce5cda2661e3dec71d23dc15f6189ab"
-            ],
-            "markers": "python_version >= '3.9'",
-            "version": "==1.1.1"
-        },
-        "pytz": {
-            "hashes": [
-                "sha256:360b9e3dbb49a209c21ad61809c7fb453643e048b38924c765813546746e81c3",
-                "sha256:5ddf76296dd8c44c26eb8f4b6f35488f3ccbf6fbbd7adee0b7262d43f0ec2f00"
-            ],
-            "version": "==2025.2"
-        },
-        "pyyaml": {
-            "hashes": [
-                "sha256:01179a4a8559ab5de078078f37e5c1a30d76bb88519906844fd7bdea1b7729ff",
-                "sha256:0833f8694549e586547b576dcfaba4a6b55b9e96098b36cdc7ebefe667dfed48",
-                "sha256:0a9a2848a5b7feac301353437eb7d5957887edbf81d56e903999a75a3d743086",
-                "sha256:0b69e4ce7a131fe56b7e4d770c67429700908fc0752af059838b1cfb41960e4e",
-                "sha256:0ffe8360bab4910ef1b9e87fb812d8bc0a308b0d0eef8c8f44e0254ab3b07133",
-                "sha256:11d8f3dd2b9c1207dcaf2ee0bbbfd5991f571186ec9cc78427ba5bd32afae4b5",
-                "sha256:17e311b6c678207928d649faa7cb0d7b4c26a0ba73d41e99c4fff6b6c3276484",
-                "sha256:1e2120ef853f59c7419231f3bf4e7021f1b936f6ebd222406c3b60212205d2ee",
-                "sha256:1f71ea527786de97d1a0cc0eacd1defc0985dcf6b3f17bb77dcfc8c34bec4dc5",
-                "sha256:23502f431948090f597378482b4812b0caae32c22213aecf3b55325e049a6c68",
-                "sha256:24471b829b3bf607e04e88d79542a9d48bb037c2267d7927a874e6c205ca7e9a",
-                "sha256:29717114e51c84ddfba879543fb232a6ed60086602313ca38cce623c1d62cfbf",
-                "sha256:2e99c6826ffa974fe6e27cdb5ed0021786b03fc98e5ee3c5bfe1fd5015f42b99",
-                "sha256:39693e1f8320ae4f43943590b49779ffb98acb81f788220ea932a6b6c51004d8",
-                "sha256:3ad2a3decf9aaba3d29c8f537ac4b243e36bef957511b4766cb0057d32b0be85",
-                "sha256:3b1fdb9dc17f5a7677423d508ab4f243a726dea51fa5e70992e59a7411c89d19",
-                "sha256:41e4e3953a79407c794916fa277a82531dd93aad34e29c2a514c2c0c5fe971cc",
-                "sha256:43fa96a3ca0d6b1812e01ced1044a003533c47f6ee8aca31724f78e93ccc089a",
-                "sha256:50187695423ffe49e2deacb8cd10510bc361faac997de9efef88badc3bb9e2d1",
-                "sha256:5ac9328ec4831237bec75defaf839f7d4564be1e6b25ac710bd1a96321cc8317",
-                "sha256:5d225db5a45f21e78dd9358e58a98702a0302f2659a3c6cd320564b75b86f47c",
-                "sha256:6395c297d42274772abc367baaa79683958044e5d3835486c16da75d2a694631",
-                "sha256:688ba32a1cffef67fd2e9398a2efebaea461578b0923624778664cc1c914db5d",
-                "sha256:68ccc6023a3400877818152ad9a1033e3db8625d899c72eacb5a668902e4d652",
-                "sha256:70b189594dbe54f75ab3a1acec5f1e3faa7e8cf2f1e08d9b561cb41b845f69d5",
-                "sha256:797b4f722ffa07cc8d62053e4cff1486fa6dc094105d13fea7b1de7d8bf71c9e",
-                "sha256:7c36280e6fb8385e520936c3cb3b8042851904eba0e58d277dca80a5cfed590b",
-                "sha256:7e7401d0de89a9a855c839bc697c079a4af81cf878373abd7dc625847d25cbd8",
-                "sha256:80bab7bfc629882493af4aa31a4cfa43a4c57c83813253626916b8c7ada83476",
-                "sha256:82d09873e40955485746739bcb8b4586983670466c23382c19cffecbf1fd8706",
-                "sha256:8388ee1976c416731879ac16da0aff3f63b286ffdd57cdeb95f3f2e085687563",
-                "sha256:8824b5a04a04a047e72eea5cec3bc266db09e35de6bdfe34c9436ac5ee27d237",
-                "sha256:8b9c7197f7cb2738065c481a0461e50ad02f18c78cd75775628afb4d7137fb3b",
-                "sha256:9056c1ecd25795207ad294bcf39f2db3d845767be0ea6e6a34d856f006006083",
-                "sha256:936d68689298c36b53b29f23c6dbb74de12b4ac12ca6cfe0e047bedceea56180",
-                "sha256:9b22676e8097e9e22e36d6b7bda33190d0d400f345f23d4065d48f4ca7ae0425",
-                "sha256:a4d3091415f010369ae4ed1fc6b79def9416358877534caf6a0fdd2146c87a3e",
-                "sha256:a8786accb172bd8afb8be14490a16625cbc387036876ab6ba70912730faf8e1f",
-                "sha256:a9f8c2e67970f13b16084e04f134610fd1d374bf477b17ec1599185cf611d725",
-                "sha256:bc2fa7c6b47d6bc618dd7fb02ef6fdedb1090ec036abab80d4681424b84c1183",
-                "sha256:c70c95198c015b85feafc136515252a261a84561b7b1d51e3384e0655ddf25ab",
-                "sha256:cc1c1159b3d456576af7a3e4d1ba7e6924cb39de8f67111c735f6fc832082774",
-                "sha256:ce826d6ef20b1bc864f0a68340c8b3287705cae2f8b4b1d932177dcc76721725",
-                "sha256:d584d9ec91ad65861cc08d42e834324ef890a082e591037abe114850ff7bbc3e",
-                "sha256:d7fded462629cfa4b685c5416b949ebad6cec74af5e2d42905d41e257e0869f5",
-                "sha256:d84a1718ee396f54f3a086ea0a66d8e552b2ab2017ef8b420e92edbc841c352d",
-                "sha256:d8e03406cac8513435335dbab54c0d385e4a49e4945d2909a581c83647ca0290",
-                "sha256:e10ce637b18caea04431ce14fabcf5c64a1c61ec9c56b071a4b7ca131ca52d44",
-                "sha256:ec031d5d2feb36d1d1a24380e4db6d43695f3748343d99434e6f5f9156aaa2ed",
-                "sha256:ef6107725bd54b262d6dedcc2af448a266975032bc85ef0172c5f059da6325b4",
-                "sha256:efdca5630322a10774e8e98e1af481aad470dd62c3170801852d752aa7a783ba",
-                "sha256:f753120cb8181e736c57ef7636e83f31b9c0d1722c516f7e86cf15b7aa57ff12",
-                "sha256:ff3824dc5261f50c9b0dfb3be22b4567a6f938ccce4587b38952d85fd9e9afe4"
-            ],
-            "index": "pypi",
-            "markers": "python_version >= '3.8'",
-            "version": "==6.0.2"
-        },
-        "requests": {
-            "hashes": [
-                "sha256:27babd3cda2a6d50b30443204ee89830707d396671944c998b5975b031ac2b2c",
-                "sha256:27d0316682c8a29834d3264820024b62a36942083d52caf2f14c0591336d3422"
-            ],
-            "index": "pypi",
-            "markers": "python_version >= '3.8'",
-            "version": "==2.32.4"
-        },
-        "six": {
-            "hashes": [
-                "sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274",
-                "sha256:ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81"
-            ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'",
-            "version": "==1.17.0"
-        },
-        "typing-extensions": {
-            "hashes": [
-                "sha256:8676b788e32f02ab42d9e7c61324048ae4c6d844a399eebace3d4979d75ceef4",
-                "sha256:a1514509136dd0b477638fc68d6a91497af5076466ad0fa6c338e44e359944af"
-            ],
-            "markers": "python_version >= '3.9'",
-            "version": "==4.14.0"
-        },
-        "typing-inspection": {
-            "hashes": [
-                "sha256:389055682238f53b04f7badcb49b989835495a96700ced5dab2d8feae4b26f51",
-                "sha256:6ae134cc0203c33377d43188d4064e9b357dba58cff3185f22924610e70a9d28"
-            ],
-            "markers": "python_version >= '3.9'",
-            "version": "==0.4.1"
-        },
-        "tzdata": {
-            "hashes": [
-                "sha256:1a403fada01ff9221ca8044d701868fa132215d84beb92242d9acd2147f667a8",
-                "sha256:b60a638fcc0daffadf82fe0f57e53d06bdec2f36c4df66280ae79bce6bd6f2b9"
-            ],
-            "markers": "python_version >= '2'",
-            "version": "==2025.2"
-        },
-        "urllib3": {
-            "hashes": [
-                "sha256:3fc47733c7e419d4bc3f6b3dc2b4f890bb743906a30d56ba4a5bfa4bbff92760",
-                "sha256:e6b01673c0fa6a13e374b50871808eb3bf7046c4b125b216f6bf1cc604cff0dc"
-            ],
-            "markers": "python_version >= '3.9'",
-            "version": "==2.5.0"
-        },
-        "xlsxwriter": {
-            "hashes": [
-                "sha256:4f4824234e1eaf9d95df9a8fe974585ff91d0f5e3d3f12ace5b71e443c1c6abd",
-                "sha256:7e88469d607cdc920151c0ab3ce9cf1a83992d4b7bc730c5ffdd1a12115a7dbe"
-            ],
-            "index": "pypi",
-            "markers": "python_version >= '3.8'",
-            "version": "==3.2.5"
-        }
-    },
-    "develop": {
-        "anyio": {
-            "hashes": [
-                "sha256:673c0c244e15788651a4ff38710fea9675823028a6f08a5eda409e0c9840a028",
-                "sha256:9f76d541cad6e36af7beb62e978876f3b41e3e04f2c1fbf0884604c0a9c4d93c"
-            ],
-            "markers": "python_version >= '3.9'",
-            "version": "==4.9.0"
-        },
-        "appnope": {
-            "hashes": [
-                "sha256:1de3860566df9caf38f01f86f65e0e13e379af54f9e4bee1e66b48f2efffd1ee",
-                "sha256:502575ee11cd7a28c0205f379b525beefebab9d161b7c964670864014ed7213c"
-            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==0.1.4"
-        },
-        "argon2-cffi": {
-            "hashes": [
-                "sha256:694ae5cc8a42f4c4e2bf2ca0e64e51e23a040c6a517a85074683d3959e1346c1",
-                "sha256:fdc8b074db390fccb6eb4a3604ae7231f219aa669a2652e0f20e16ba513d5741"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==25.1.0"
-        },
-        "argon2-cffi-bindings": {
-            "hashes": [
-                "sha256:20ef543a89dee4db46a1a6e206cd015360e5a75822f76df533845c3cbaf72670",
-                "sha256:2c3e3cc67fdb7d82c4718f19b4e7a87123caf8a93fde7e23cf66ac0337d3cb3f",
-                "sha256:3b9ef65804859d335dc6b31582cad2c5166f0c3e7975f324d9ffaa34ee7e6583",
-                "sha256:3e385d1c39c520c08b53d63300c3ecc28622f076f4c2b0e6d7e796e9f6502194",
-                "sha256:58ed19212051f49a523abb1dbe954337dc82d947fb6e5a0da60f7c8471a8476c",
-                "sha256:5e00316dabdaea0b2dd82d141cc66889ced0cdcbfa599e8b471cf22c620c329a",
-                "sha256:603ca0aba86b1349b147cab91ae970c63118a0f30444d4bc80355937c950c082",
-                "sha256:6a22ad9800121b71099d0fb0a65323810a15f2e292f2ba450810a7316e128ee5",
-                "sha256:8cd69c07dd875537a824deec19f978e0f2078fdda07fd5c42ac29668dda5f40f",
-                "sha256:93f9bf70084f97245ba10ee36575f0c3f1e7d7724d67d8e5b08e61787c320ed7",
-                "sha256:9524464572e12979364b7d600abf96181d3541da11e23ddf565a32e70bd4dc0d",
-                "sha256:b2ef1c30440dbbcba7a5dc3e319408b59676e2e039e2ae11a8775ecf482b192f",
-                "sha256:b746dba803a79238e925d9046a63aa26bf86ab2a2fe74ce6b009a1c3f5c8f2ae",
-                "sha256:bb89ceffa6c791807d1305ceb77dbfacc5aa499891d2c55661c6459651fc39e3",
-                "sha256:bd46088725ef7f58b5a1ef7ca06647ebaf0eb4baff7d1d0d177c6cc8744abd86",
-                "sha256:ccb949252cb2ab3a08c02024acb77cfb179492d5701c7cbdbfd776124d4d2367",
-                "sha256:d4966ef5848d820776f5f562a7d45fdd70c2f330c961d0d745b784034bd9f48d",
-                "sha256:e415e3f62c8d124ee16018e491a009937f8cf7ebf5eb430ffc5de21b900dad93",
-                "sha256:ed2937d286e2ad0cc79a7087d3c272832865f779430e0cc2b4f3718d3159b0cb",
-                "sha256:f1152ac548bd5b8bcecfb0b0371f082037e47128653df2e8ba6e914d384f3c3e",
-                "sha256:f9f8b450ed0547e3d473fdc8612083fd08dd2120d6ac8f73828df9b7d45bb351"
-            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==21.2.0"
-        },
-        "arrow": {
-            "hashes": [
-                "sha256:c728b120ebc00eb84e01882a6f5e7927a53960aa990ce7dd2b10f39005a67f80",
-                "sha256:d4540617648cb5f895730f1ad8c82a65f2dad0166f57b75f3ca54759c4d67a85"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==1.3.0"
-        },
-        "astroid": {
-            "hashes": [
-                "sha256:104fb9cb9b27ea95e847a94c003be03a9e039334a8ebca5ee27dafaf5c5711eb",
-                "sha256:c332157953060c6deb9caa57303ae0d20b0fbdb2e59b4a4f2a6ba49d0a7961ce"
-            ],
-            "markers": "python_full_version >= '3.9.0'",
-            "version": "==3.3.10"
-        },
-        "asttokens": {
-            "hashes": [
-                "sha256:0dcd8baa8d62b0c1d118b399b2ddba3c4aff271d0d7a9e0d4c1681c79035bbc7",
-                "sha256:e3078351a059199dd5138cb1c706e6430c05eff2ff136af5eb4790f9d28932e2"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==3.0.0"
-        },
-        "async-lru": {
-            "hashes": [
-                "sha256:481d52ccdd27275f42c43a928b4a50c3bfb2d67af4e78b170e3e0bb39c66e5bb",
-                "sha256:ab95404d8d2605310d345932697371a5f40def0487c03d6d0ad9138de52c9943"
-            ],
-            "markers": "python_version >= '3.9'",
-            "version": "==2.0.5"
-        },
-        "attrs": {
-            "hashes": [
-                "sha256:427318ce031701fea540783410126f03899a97ffc6f61596ad581ac2e40e3bc3",
-                "sha256:75d7cefc7fb576747b2c81b4442d4d4a1ce0900973527c011d1030fd3bf4af1b"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==25.3.0"
-        },
-        "babel": {
-            "hashes": [
-                "sha256:0c54cffb19f690cdcc52a3b50bcbf71e07a808d1c80d549f2459b9d2cf0afb9d",
-                "sha256:4d0b53093fdfb4b21c92b5213dba5a1b23885afa8383709427046b21c366e5f2"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==2.17.0"
-        },
-        "beautifulsoup4": {
-            "hashes": [
-                "sha256:9bbbb14bfde9d79f38b8cd5f8c7c85f4b8f2523190ebed90e950a8dea4cb1c4b",
-                "sha256:dbb3c4e1ceae6aefebdaf2423247260cd062430a410e38c66f2baa50a8437195"
-            ],
-            "markers": "python_full_version >= '3.7.0'",
-            "version": "==4.13.4"
-        },
-        "bleach": {
-            "extras": [
-                "css"
-            ],
-            "hashes": [
-                "sha256:117d9c6097a7c3d22fd578fcd8d35ff1e125df6736f554da4e432fdd63f31e5e",
-                "sha256:123e894118b8a599fd80d3ec1a6d4cc7ce4e5882b1317a7e1ba69b56e95f991f"
-            ],
-            "markers": "python_version >= '3.9'",
-            "version": "==6.2.0"
-        },
-        "certifi": {
-            "hashes": [
-                "sha256:2e0c7ce7cb5d8f8634ca55d2ba7e6ec2689a2fd6537d8dec1296a477a4910057",
-                "sha256:d747aa5a8b9bbbb1bb8c22bb13e22bd1f18e9796defa16bab421f7f7a317323b"
-            ],
-            "markers": "python_version >= '3.7'",
-            "version": "==2025.6.15"
-        },
-        "cffi": {
-            "hashes": [
-                "sha256:045d61c734659cc045141be4bae381a41d89b741f795af1dd018bfb532fd0df8",
-                "sha256:0984a4925a435b1da406122d4d7968dd861c1385afe3b45ba82b750f229811e2",
-                "sha256:0e2b1fac190ae3ebfe37b979cc1ce69c81f4e4fe5746bb401dca63a9062cdaf1",
-                "sha256:0f048dcf80db46f0098ccac01132761580d28e28bc0f78ae0d58048063317e15",
-                "sha256:1257bdabf294dceb59f5e70c64a3e2f462c30c7ad68092d01bbbfb1c16b1ba36",
-                "sha256:1c39c6016c32bc48dd54561950ebd6836e1670f2ae46128f67cf49e789c52824",
-                "sha256:1d599671f396c4723d016dbddb72fe8e0397082b0a77a4fab8028923bec050e8",
-                "sha256:28b16024becceed8c6dfbc75629e27788d8a3f9030691a1dbf9821a128b22c36",
-                "sha256:2bb1a08b8008b281856e5971307cc386a8e9c5b625ac297e853d36da6efe9c17",
-                "sha256:30c5e0cb5ae493c04c8b42916e52ca38079f1b235c2f8ae5f4527b963c401caf",
-                "sha256:31000ec67d4221a71bd3f67df918b1f88f676f1c3b535a7eb473255fdc0b83fc",
-                "sha256:386c8bf53c502fff58903061338ce4f4950cbdcb23e2902d86c0f722b786bbe3",
-                "sha256:3edc8d958eb099c634dace3c7e16560ae474aa3803a5df240542b305d14e14ed",
-                "sha256:45398b671ac6d70e67da8e4224a065cec6a93541bb7aebe1b198a61b58c7b702",
-                "sha256:46bf43160c1a35f7ec506d254e5c890f3c03648a4dbac12d624e4490a7046cd1",
-                "sha256:4ceb10419a9adf4460ea14cfd6bc43d08701f0835e979bf821052f1805850fe8",
-                "sha256:51392eae71afec0d0c8fb1a53b204dbb3bcabcb3c9b807eedf3e1e6ccf2de903",
-                "sha256:5da5719280082ac6bd9aa7becb3938dc9f9cbd57fac7d2871717b1feb0902ab6",
-                "sha256:610faea79c43e44c71e1ec53a554553fa22321b65fae24889706c0a84d4ad86d",
-                "sha256:636062ea65bd0195bc012fea9321aca499c0504409f413dc88af450b57ffd03b",
-                "sha256:6883e737d7d9e4899a8a695e00ec36bd4e5e4f18fabe0aca0efe0a4b44cdb13e",
-                "sha256:6b8b4a92e1c65048ff98cfe1f735ef8f1ceb72e3d5f0c25fdb12087a23da22be",
-                "sha256:6f17be4345073b0a7b8ea599688f692ac3ef23ce28e5df79c04de519dbc4912c",
-                "sha256:706510fe141c86a69c8ddc029c7910003a17353970cff3b904ff0686a5927683",
-                "sha256:72e72408cad3d5419375fc87d289076ee319835bdfa2caad331e377589aebba9",
-                "sha256:733e99bc2df47476e3848417c5a4540522f234dfd4ef3ab7fafdf555b082ec0c",
-                "sha256:7596d6620d3fa590f677e9ee430df2958d2d6d6de2feeae5b20e82c00b76fbf8",
-                "sha256:78122be759c3f8a014ce010908ae03364d00a1f81ab5c7f4a7a5120607ea56e1",
-                "sha256:805b4371bf7197c329fcb3ead37e710d1bca9da5d583f5073b799d5c5bd1eee4",
-                "sha256:85a950a4ac9c359340d5963966e3e0a94a676bd6245a4b55bc43949eee26a655",
-                "sha256:8f2cdc858323644ab277e9bb925ad72ae0e67f69e804f4898c070998d50b1a67",
-                "sha256:9755e4345d1ec879e3849e62222a18c7174d65a6a92d5b346b1863912168b595",
-                "sha256:98e3969bcff97cae1b2def8ba499ea3d6f31ddfdb7635374834cf89a1a08ecf0",
-                "sha256:a08d7e755f8ed21095a310a693525137cfe756ce62d066e53f502a83dc550f65",
-                "sha256:a1ed2dd2972641495a3ec98445e09766f077aee98a1c896dcb4ad0d303628e41",
-                "sha256:a24ed04c8ffd54b0729c07cee15a81d964e6fee0e3d4d342a27b020d22959dc6",
-                "sha256:a45e3c6913c5b87b3ff120dcdc03f6131fa0065027d0ed7ee6190736a74cd401",
-                "sha256:a9b15d491f3ad5d692e11f6b71f7857e7835eb677955c00cc0aefcd0669adaf6",
-                "sha256:ad9413ccdeda48c5afdae7e4fa2192157e991ff761e7ab8fdd8926f40b160cc3",
-                "sha256:b2ab587605f4ba0bf81dc0cb08a41bd1c0a5906bd59243d56bad7668a6fc6c16",
-                "sha256:b62ce867176a75d03a665bad002af8e6d54644fad99a3c70905c543130e39d93",
-                "sha256:c03e868a0b3bc35839ba98e74211ed2b05d2119be4e8a0f224fba9384f1fe02e",
-                "sha256:c59d6e989d07460165cc5ad3c61f9fd8f1b4796eacbd81cee78957842b834af4",
-                "sha256:c7eac2ef9b63c79431bc4b25f1cd649d7f061a28808cbc6c47b534bd789ef964",
-                "sha256:c9c3d058ebabb74db66e431095118094d06abf53284d9c81f27300d0e0d8bc7c",
-                "sha256:ca74b8dbe6e8e8263c0ffd60277de77dcee6c837a3d0881d8c1ead7268c9e576",
-                "sha256:caaf0640ef5f5517f49bc275eca1406b0ffa6aa184892812030f04c2abf589a0",
-                "sha256:cdf5ce3acdfd1661132f2a9c19cac174758dc2352bfe37d98aa7512c6b7178b3",
-                "sha256:d016c76bdd850f3c626af19b0542c9677ba156e4ee4fccfdd7848803533ef662",
-                "sha256:d01b12eeeb4427d3110de311e1774046ad344f5b1a7403101878976ecd7a10f3",
-                "sha256:d63afe322132c194cf832bfec0dc69a99fb9bb6bbd550f161a49e9e855cc78ff",
-                "sha256:da95af8214998d77a98cc14e3a3bd00aa191526343078b530ceb0bd710fb48a5",
-                "sha256:dd398dbc6773384a17fe0d3e7eeb8d1a21c2200473ee6806bb5e6a8e62bb73dd",
-                "sha256:de2ea4b5833625383e464549fec1bc395c1bdeeb5f25c4a3a82b5a8c756ec22f",
-                "sha256:de55b766c7aa2e2a3092c51e0483d700341182f08e67c63630d5b6f200bb28e5",
-                "sha256:df8b1c11f177bc2313ec4b2d46baec87a5f3e71fc8b45dab2ee7cae86d9aba14",
-                "sha256:e03eab0a8677fa80d646b5ddece1cbeaf556c313dcfac435ba11f107ba117b5d",
-                "sha256:e221cf152cff04059d011ee126477f0d9588303eb57e88923578ace7baad17f9",
-                "sha256:e31ae45bc2e29f6b2abd0de1cc3b9d5205aa847cafaecb8af1476a609a2f6eb7",
-                "sha256:edae79245293e15384b51f88b00613ba9f7198016a5948b5dddf4917d4d26382",
-                "sha256:f1e22e8c4419538cb197e4dd60acc919d7696e5ef98ee4da4e01d3f8cfa4cc5a",
-                "sha256:f3a2b4222ce6b60e2e8b337bb9596923045681d71e5a082783484d845390938e",
-                "sha256:f6a16c31041f09ead72d69f583767292f750d24913dadacf5756b966aacb3f1a",
-                "sha256:f75c7ab1f9e4aca5414ed4d8e5c0e303a34f4421f8a0d47a4d019ceff0ab6af4",
-                "sha256:f79fc4fc25f1c8698ff97788206bb3c2598949bfe0fef03d299eb1b5356ada99",
-                "sha256:f7f5baafcc48261359e14bcd6d9bff6d4b28d9103847c9e136694cb0501aef87",
-                "sha256:fc48c783f9c87e60831201f2cce7f3b2e4846bf4d8728eabe54d60700b318a0b"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==1.17.1"
-        },
-        "charset-normalizer": {
-            "hashes": [
-                "sha256:005fa3432484527f9732ebd315da8da8001593e2cf46a3d817669f062c3d9ed4",
-                "sha256:046595208aae0120559a67693ecc65dd75d46f7bf687f159127046628178dc45",
-                "sha256:0c29de6a1a95f24b9a1aa7aefd27d2487263f00dfd55a77719b530788f75cff7",
-                "sha256:0c8c57f84ccfc871a48a47321cfa49ae1df56cd1d965a09abe84066f6853b9c0",
-                "sha256:0f5d9ed7f254402c9e7d35d2f5972c9bbea9040e99cd2861bd77dc68263277c7",
-                "sha256:18dd2e350387c87dabe711b86f83c9c78af772c748904d372ade190b5c7c9d4d",
-                "sha256:1b1bde144d98e446b056ef98e59c256e9294f6b74d7af6846bf5ffdafd687a7d",
-                "sha256:1c95a1e2902a8b722868587c0e1184ad5c55631de5afc0eb96bc4b0d738092c0",
-                "sha256:1cad5f45b3146325bb38d6855642f6fd609c3f7cad4dbaf75549bf3b904d3184",
-                "sha256:21b2899062867b0e1fde9b724f8aecb1af14f2778d69aacd1a5a1853a597a5db",
-                "sha256:24498ba8ed6c2e0b56d4acbf83f2d989720a93b41d712ebd4f4979660db4417b",
-                "sha256:25a23ea5c7edc53e0f29bae2c44fcb5a1aa10591aae107f2a2b2583a9c5cbc64",
-                "sha256:289200a18fa698949d2b39c671c2cc7a24d44096784e76614899a7ccf2574b7b",
-                "sha256:28a1005facc94196e1fb3e82a3d442a9d9110b8434fc1ded7a24a2983c9888d8",
-                "sha256:32fc0341d72e0f73f80acb0a2c94216bd704f4f0bce10aedea38f30502b271ff",
-                "sha256:36b31da18b8890a76ec181c3cf44326bf2c48e36d393ca1b72b3f484113ea344",
-                "sha256:3c21d4fca343c805a52c0c78edc01e3477f6dd1ad7c47653241cf2a206d4fc58",
-                "sha256:3fddb7e2c84ac87ac3a947cb4e66d143ca5863ef48e4a5ecb83bd48619e4634e",
-                "sha256:43e0933a0eff183ee85833f341ec567c0980dae57c464d8a508e1b2ceb336471",
-                "sha256:4a476b06fbcf359ad25d34a057b7219281286ae2477cc5ff5e3f70a246971148",
-                "sha256:4e594135de17ab3866138f496755f302b72157d115086d100c3f19370839dd3a",
-                "sha256:50bf98d5e563b83cc29471fa114366e6806bc06bc7a25fd59641e41445327836",
-                "sha256:5a9979887252a82fefd3d3ed2a8e3b937a7a809f65dcb1e068b090e165bbe99e",
-                "sha256:5baececa9ecba31eff645232d59845c07aa030f0c81ee70184a90d35099a0e63",
-                "sha256:5bf4545e3b962767e5c06fe1738f951f77d27967cb2caa64c28be7c4563e162c",
-                "sha256:6333b3aa5a12c26b2a4d4e7335a28f1475e0e5e17d69d55141ee3cab736f66d1",
-                "sha256:65c981bdbd3f57670af8b59777cbfae75364b483fa8a9f420f08094531d54a01",
-                "sha256:68a328e5f55ec37c57f19ebb1fdc56a248db2e3e9ad769919a58672958e8f366",
-                "sha256:6a0289e4589e8bdfef02a80478f1dfcb14f0ab696b5a00e1f4b8a14a307a3c58",
-                "sha256:6b66f92b17849b85cad91259efc341dce9c1af48e2173bf38a85c6329f1033e5",
-                "sha256:6c9379d65defcab82d07b2a9dfbfc2e95bc8fe0ebb1b176a3190230a3ef0e07c",
-                "sha256:6fc1f5b51fa4cecaa18f2bd7a003f3dd039dd615cd69a2afd6d3b19aed6775f2",
-                "sha256:70f7172939fdf8790425ba31915bfbe8335030f05b9913d7ae00a87d4395620a",
-                "sha256:721c76e84fe669be19c5791da68232ca2e05ba5185575086e384352e2c309597",
-                "sha256:7222ffd5e4de8e57e03ce2cef95a4c43c98fcb72ad86909abdfc2c17d227fc1b",
-                "sha256:75d10d37a47afee94919c4fab4c22b9bc2a8bf7d4f46f87363bcf0573f3ff4f5",
-                "sha256:76af085e67e56c8816c3ccf256ebd136def2ed9654525348cfa744b6802b69eb",
-                "sha256:770cab594ecf99ae64c236bc9ee3439c3f46be49796e265ce0cc8bc17b10294f",
-                "sha256:7a6ab32f7210554a96cd9e33abe3ddd86732beeafc7a28e9955cdf22ffadbab0",
-                "sha256:7c48ed483eb946e6c04ccbe02c6b4d1d48e51944b6db70f697e089c193404941",
-                "sha256:7f56930ab0abd1c45cd15be65cc741c28b1c9a34876ce8c17a2fa107810c0af0",
-                "sha256:8075c35cd58273fee266c58c0c9b670947c19df5fb98e7b66710e04ad4e9ff86",
-                "sha256:8272b73e1c5603666618805fe821edba66892e2870058c94c53147602eab29c7",
-                "sha256:82d8fd25b7f4675d0c47cf95b594d4e7b158aca33b76aa63d07186e13c0e0ab7",
-                "sha256:844da2b5728b5ce0e32d863af26f32b5ce61bc4273a9c720a9f3aa9df73b1455",
-                "sha256:8755483f3c00d6c9a77f490c17e6ab0c8729e39e6390328e42521ef175380ae6",
-                "sha256:915f3849a011c1f593ab99092f3cecfcb4d65d8feb4a64cf1bf2d22074dc0ec4",
-                "sha256:926ca93accd5d36ccdabd803392ddc3e03e6d4cd1cf17deff3b989ab8e9dbcf0",
-                "sha256:982bb1e8b4ffda883b3d0a521e23abcd6fd17418f6d2c4118d257a10199c0ce3",
-                "sha256:98f862da73774290f251b9df8d11161b6cf25b599a66baf087c1ffe340e9bfd1",
-                "sha256:9cbfacf36cb0ec2897ce0ebc5d08ca44213af24265bd56eca54bee7923c48fd6",
-                "sha256:a370b3e078e418187da8c3674eddb9d983ec09445c99a3a263c2011993522981",
-                "sha256:a955b438e62efdf7e0b7b52a64dc5c3396e2634baa62471768a64bc2adb73d5c",
-                "sha256:aa6af9e7d59f9c12b33ae4e9450619cf2488e2bbe9b44030905877f0b2324980",
-                "sha256:aa88ca0b1932e93f2d961bf3addbb2db902198dca337d88c89e1559e066e7645",
-                "sha256:aaeeb6a479c7667fbe1099af9617c83aaca22182d6cf8c53966491a0f1b7ffb7",
-                "sha256:aaf27faa992bfee0264dc1f03f4c75e9fcdda66a519db6b957a3f826e285cf12",
-                "sha256:b2680962a4848b3c4f155dc2ee64505a9c57186d0d56b43123b17ca3de18f0fa",
-                "sha256:b2d318c11350e10662026ad0eb71bb51c7812fc8590825304ae0bdd4ac283acd",
-                "sha256:b33de11b92e9f75a2b545d6e9b6f37e398d86c3e9e9653c4864eb7e89c5773ef",
-                "sha256:b3daeac64d5b371dea99714f08ffc2c208522ec6b06fbc7866a450dd446f5c0f",
-                "sha256:be1e352acbe3c78727a16a455126d9ff83ea2dfdcbc83148d2982305a04714c2",
-                "sha256:bee093bf902e1d8fc0ac143c88902c3dfc8941f7ea1d6a8dd2bcb786d33db03d",
-                "sha256:c72fbbe68c6f32f251bdc08b8611c7b3060612236e960ef848e0a517ddbe76c5",
-                "sha256:c9e36a97bee9b86ef9a1cf7bb96747eb7a15c2f22bdb5b516434b00f2a599f02",
-                "sha256:cddf7bd982eaa998934a91f69d182aec997c6c468898efe6679af88283b498d3",
-                "sha256:cf713fe9a71ef6fd5adf7a79670135081cd4431c2943864757f0fa3a65b1fafd",
-                "sha256:d11b54acf878eef558599658b0ffca78138c8c3655cf4f3a4a673c437e67732e",
-                "sha256:d41c4d287cfc69060fa91cae9683eacffad989f1a10811995fa309df656ec214",
-                "sha256:d524ba3f1581b35c03cb42beebab4a13e6cdad7b36246bd22541fa585a56cccd",
-                "sha256:daac4765328a919a805fa5e2720f3e94767abd632ae410a9062dff5412bae65a",
-                "sha256:db4c7bf0e07fc3b7d89ac2a5880a6a8062056801b83ff56d8464b70f65482b6c",
-                "sha256:dc7039885fa1baf9be153a0626e337aa7ec8bf96b0128605fb0d77788ddc1681",
-                "sha256:dccab8d5fa1ef9bfba0590ecf4d46df048d18ffe3eec01eeb73a42e0d9e7a8ba",
-                "sha256:dedb8adb91d11846ee08bec4c8236c8549ac721c245678282dcb06b221aab59f",
-                "sha256:e45ba65510e2647721e35323d6ef54c7974959f6081b58d4ef5d87c60c84919a",
-                "sha256:e53efc7c7cee4c1e70661e2e112ca46a575f90ed9ae3fef200f2a25e954f4b28",
-                "sha256:e635b87f01ebc977342e2697d05b56632f5f879a4f15955dfe8cef2448b51691",
-                "sha256:e70e990b2137b29dc5564715de1e12701815dacc1d056308e2b17e9095372a82",
-                "sha256:e8082b26888e2f8b36a042a58307d5b917ef2b1cacab921ad3323ef91901c71a",
-                "sha256:e8323a9b031aa0393768b87f04b4164a40037fb2a3c11ac06a03ffecd3618027",
-                "sha256:e92fca20c46e9f5e1bb485887d074918b13543b1c2a1185e69bb8d17ab6236a7",
-                "sha256:eb30abc20df9ab0814b5a2524f23d75dcf83cde762c161917a2b4b7b55b1e518",
-                "sha256:eba9904b0f38a143592d9fc0e19e2df0fa2e41c3c3745554761c5f6447eedabf",
-                "sha256:ef8de666d6179b009dce7bcb2ad4c4a779f113f12caf8dc77f0162c29d20490b",
-                "sha256:efd387a49825780ff861998cd959767800d54f8308936b21025326de4b5a42b9",
-                "sha256:f0aa37f3c979cf2546b73e8222bbfa3dc07a641585340179d768068e3455e544",
-                "sha256:f4074c5a429281bf056ddd4c5d3b740ebca4d43ffffe2ef4bf4d2d05114299da",
-                "sha256:f69a27e45c43520f5487f27627059b64aaf160415589230992cec34c5e18a509",
-                "sha256:fb707f3e15060adf5b7ada797624a6c6e0138e2a26baa089df64c68ee98e040f",
-                "sha256:fcbe676a55d7445b22c10967bceaaf0ee69407fbe0ece4d032b6eb8d4565982a",
-                "sha256:fdb20a30fe1175ecabed17cbf7812f7b804b8a315a25f24678bcdf120a90077f"
-            ],
-            "markers": "python_version >= '3.7'",
-            "version": "==3.4.2"
-        },
-        "comm": {
-            "hashes": [
-                "sha256:3fd7a84065306e07bea1773df6eb8282de51ba82f77c72f9c85716ab11fe980e",
-                "sha256:e6fb86cb70ff661ee8c9c14e7d36d6de3b4066f1441be4063df9c5009f0a64d3"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==0.2.2"
-        },
-        "coverage": {
-            "extras": [
-                "toml"
-            ],
-            "hashes": [
-                "sha256:02532fd3290bb8fa6bec876520842428e2a6ed6c27014eca81b031c2d30e3f71",
-                "sha256:0a4be2a28656afe279b34d4f91c3e26eccf2f85500d4a4ff0b1f8b54bf807338",
-                "sha256:0b3496922cb5f4215bf5caaef4cf12364a26b0be82e9ed6d050f3352cf2d7ef0",
-                "sha256:0c804506d624e8a20fb3108764c52e0eef664e29d21692afa375e0dd98dc384f",
-                "sha256:0f16649a7330ec307942ed27d06ee7e7a38417144620bb3d6e9a18ded8a2d3e5",
-                "sha256:16aa0830d0c08a2c40c264cef801db8bc4fc0e1892782e45bcacbd5889270509",
-                "sha256:18a0912944d70aaf5f399e350445738a1a20b50fbea788f640751c2ed9208b6c",
-                "sha256:1c503289ffef1d5105d91bbb4d62cbe4b14bec4d13ca225f9c73cde9bb46207d",
-                "sha256:2241ad5dbf79ae1d9c08fe52b36d03ca122fb9ac6bca0f34439e99f8327ac89f",
-                "sha256:25308bd3d00d5eedd5ae7d4357161f4df743e3c0240fa773ee1b0f75e6c7c0f1",
-                "sha256:2a876e4c3e5a2a1715a6608906aa5a2e0475b9c0f68343c2ada98110512ab1d8",
-                "sha256:2d04b16a6062516df97969f1ae7efd0de9c31eb6ebdceaa0d213b21c0ca1a683",
-                "sha256:30f445f85c353090b83e552dcbbdad3ec84c7967e108c3ae54556ca69955563e",
-                "sha256:31324f18d5969feef7344a932c32428a2d1a3e50b15a6404e97cba1cc9b2c631",
-                "sha256:34ed2186fe52fcc24d4561041979a0dec69adae7bce2ae8d1c49eace13e55c43",
-                "sha256:37ab6be0859141b53aa89412a82454b482c81cf750de4f29223d52268a86de67",
-                "sha256:37ae0383f13cbdcf1e5e7014489b0d71cc0106458878ccde52e8a12ced4298ed",
-                "sha256:382e7ddd5289f140259b610e5f5c58f713d025cb2f66d0eb17e68d0a94278875",
-                "sha256:3bb5838701ca68b10ebc0937dbd0eb81974bac54447c55cd58dea5bca8451029",
-                "sha256:437c576979e4db840539674e68c84b3cda82bc824dd138d56bead1435f1cb5d7",
-                "sha256:49f1d0788ba5b7ba65933f3a18864117c6506619f5ca80326b478f72acf3f385",
-                "sha256:52e92b01041151bf607ee858e5a56c62d4b70f4dac85b8c8cb7fb8a351ab2c10",
-                "sha256:535fde4001b2783ac80865d90e7cc7798b6b126f4cd8a8c54acfe76804e54e58",
-                "sha256:56f5eb308b17bca3bbff810f55ee26d51926d9f89ba92707ee41d3c061257e55",
-                "sha256:5add197315a054e92cee1b5f686a2bcba60c4c3e66ee3de77ace6c867bdee7cb",
-                "sha256:5f646a99a8c2b3ff4c6a6e081f78fad0dde275cd59f8f49dc4eab2e394332e74",
-                "sha256:600a1d4106fe66f41e5d0136dfbc68fe7200a5cbe85610ddf094f8f22e1b0300",
-                "sha256:60c458224331ee3f1a5b472773e4a085cc27a86a0b48205409d364272d67140d",
-                "sha256:64bdd969456e2d02a8b08aa047a92d269c7ac1f47e0c977675d550c9a0863643",
-                "sha256:66b974b145aa189516b6bf2d8423e888b742517d37872f6ee4c5be0073bd9a3c",
-                "sha256:684e2110ed84fd1ca5f40e89aa44adf1729dc85444004111aa01866507adf363",
-                "sha256:68cd53aec6f45b8e4724c0950ce86eacb775c6be01ce6e3669fe4f3a21e768ed",
-                "sha256:69aa417a030bf11ec46149636314c24c8d60fadb12fc0ee8f10fda0d918c879d",
-                "sha256:6ad935f0016be24c0e97fc8c40c465f9c4b85cbbe6eac48934c0dc4d2568321e",
-                "sha256:6b55ad10a35a21b8015eabddc9ba31eb590f54adc9cd39bcf09ff5349fd52125",
-                "sha256:6cf43c78c4282708a28e466316935ec7489a9c487518a77fa68f716c67909cec",
-                "sha256:6f424507f57878e424d9a95dc4ead3fbdd72fd201e404e861e465f28ea469951",
-                "sha256:70760b4c5560be6ca70d11f8988ee6542b003f982b32f83d5ac0b72476607b70",
-                "sha256:73e9439310f65d55a5a1e0564b48e34f5369bee943d72c88378f2d576f5a5751",
-                "sha256:7931b9e249edefb07cd6ae10c702788546341d5fe44db5b6108a25da4dca513f",
-                "sha256:81f34346dd63010453922c8e628a52ea2d2ccd73cb2487f7700ac531b247c8a5",
-                "sha256:888f8eee13f2377ce86d44f338968eedec3291876b0b8a7289247ba52cb984cd",
-                "sha256:95335095b6c7b1cc14c3f3f17d5452ce677e8490d101698562b2ffcacc304c8d",
-                "sha256:9565c3ab1c93310569ec0d86b017f128f027cab0b622b7af288696d7ed43a16d",
-                "sha256:95c765060e65c692da2d2f51a9499c5e9f5cf5453aeaf1420e3fc847cc060582",
-                "sha256:9969ef1e69b8c8e1e70d591f91bbc37fc9a3621e447525d1602801a24ceda898",
-                "sha256:9ca8e220006966b4a7b68e8984a6aee645a0384b0769e829ba60281fe61ec4f7",
-                "sha256:a39d18b3f50cc121d0ce3838d32d58bd1d15dab89c910358ebefc3665712256c",
-                "sha256:a66e8f628b71f78c0e0342003d53b53101ba4e00ea8dabb799d9dba0abbbcebe",
-                "sha256:a8de12b4b87c20de895f10567639c0797b621b22897b0af3ce4b4e204a743626",
-                "sha256:af41da5dca398d3474129c58cb2b106a5d93bbb196be0d307ac82311ca234342",
-                "sha256:b30a25f814591a8c0c5372c11ac8967f669b97444c47fd794926e175c4047ece",
-                "sha256:ba383dc6afd5ec5b7a0d0c23d38895db0e15bcba7fb0fa8901f245267ac30d86",
-                "sha256:bb4fbcab8764dc072cb651a4bcda4d11fb5658a1d8d68842a862a6610bd8cfa3",
-                "sha256:be9e3f68ca9edb897c2184ad0eee815c635565dbe7a0e7e814dc1f7cbab92c0a",
-                "sha256:bfa447506c1a52271f1b0de3f42ea0fa14676052549095e378d5bff1c505ff7b",
-                "sha256:cc94d7c5e8423920787c33d811c0be67b7be83c705f001f7180c7b186dcf10ca",
-                "sha256:cea0a27a89e6432705fffc178064503508e3c0184b4f061700e771a09de58187",
-                "sha256:cf95981b126f23db63e9dbe4cf65bd71f9a6305696fa5e2262693bc4e2183f5b",
-                "sha256:d4fe2348cc6ec372e25adec0219ee2334a68d2f5222e0cba9c0d613394e12d86",
-                "sha256:db0f04118d1db74db6c9e1cb1898532c7dcc220f1d2718f058601f7c3f499514",
-                "sha256:dd24bd8d77c98557880def750782df77ab2b6885a18483dc8588792247174b32",
-                "sha256:e1b5191d1648acc439b24721caab2fd0c86679d8549ed2c84d5a7ec1bedcc244",
-                "sha256:e5532482344186c543c37bfad0ee6069e8ae4fc38d073b8bc836fc8f03c9e250",
-                "sha256:e980b53a959fa53b6f05343afbd1e6f44a23ed6c23c4b4c56c6662bbb40c82ce",
-                "sha256:ef64c27bc40189f36fcc50c3fb8f16ccda73b6a0b80d9bd6e6ce4cffcd810bbd",
-                "sha256:f05031cf21699785cd47cb7485f67df619e7bcdae38e0fde40d23d3d0210d3c3"
-            ],
-            "markers": "python_version >= '3.9'",
-            "version": "==7.9.1"
-        },
-        "debugpy": {
-            "hashes": [
-                "sha256:0f920c7f9af409d90f5fd26e313e119d908b0dd2952c2393cd3247a462331f15",
-                "sha256:1b2ac8c13b2645e0b1eaf30e816404990fbdb168e193322be8f545e8c01644a9",
-                "sha256:281d44d248a0e1791ad0eafdbbd2912ff0de9eec48022a5bfbc332957487ed3f",
-                "sha256:329a15d0660ee09fec6786acdb6e0443d595f64f5d096fc3e3ccf09a4259033f",
-                "sha256:3784ec6e8600c66cbdd4ca2726c72d8ca781e94bce2f396cc606d458146f8f4e",
-                "sha256:3d937d93ae4fa51cdc94d3e865f535f185d5f9748efb41d0d49e33bf3365bd79",
-                "sha256:413512d35ff52c2fb0fd2d65e69f373ffd24f0ecb1fac514c04a668599c5ce7f",
-                "sha256:4c9156f7524a0d70b7a7e22b2e311d8ba76a15496fb00730e46dcdeedb9e1eea",
-                "sha256:5349b7c3735b766a281873fbe32ca9cca343d4cc11ba4a743f84cb854339ff35",
-                "sha256:5aa56ef8538893e4502a7d79047fe39b1dae08d9ae257074c6464a7b290b806f",
-                "sha256:5cd9a579d553b6cb9759a7908a41988ee6280b961f24f63336835d9418216a20",
-                "sha256:684eaf43c95a3ec39a96f1f5195a7ff3d4144e4a18d69bb66beeb1a6de605d6e",
-                "sha256:7118d462fe9724c887d355eef395fae68bc764fd862cdca94e70dcb9ade8a23d",
-                "sha256:7816acea4a46d7e4e50ad8d09d963a680ecc814ae31cdef3622eb05ccacf7b01",
-                "sha256:7cd287184318416850aa8b60ac90105837bb1e59531898c07569d197d2ed5322",
-                "sha256:8899c17920d089cfa23e6005ad9f22582fd86f144b23acb9feeda59e84405b84",
-                "sha256:93fee753097e85623cab1c0e6a68c76308cd9f13ffdf44127e6fab4fbf024339",
-                "sha256:b1528cfee6c1b1c698eb10b6b096c598738a8238822d218173d21c3086de8123",
-                "sha256:b44985f97cc3dd9d52c42eb59ee9d7ee0c4e7ecd62bca704891f997de4cef23d",
-                "sha256:c442f20577b38cc7a9aafecffe1094f78f07fb8423c3dddb384e6b8f49fd2987",
-                "sha256:c99295c76161ad8d507b413cd33422d7c542889fbb73035889420ac1fad354f2",
-                "sha256:cf431c343a99384ac7eab2f763980724834f933a271e90496944195318c619e2",
-                "sha256:d235e4fa78af2de4e5609073972700523e372cf5601742449970110d565ca28c",
-                "sha256:d5582bcbe42917bc6bbe5c12db1bffdf21f6bfc28d4554b738bf08d50dc0c8c3",
-                "sha256:f117dedda6d969c5c9483e23f573b38f4e39412845c7bc487b6f2648df30fe84",
-                "sha256:f6bb5c0dcf80ad5dbc7b7d6eac484e2af34bdacdf81df09b6a3e62792b722826"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==1.8.14"
-        },
-        "decorator": {
-            "hashes": [
-                "sha256:65f266143752f734b0a7cc83c46f4618af75b8c5911b00ccb61d0ac9b6da0360",
-                "sha256:d316bb415a2d9e2d2b3abcc4084c6502fc09240e292cd76a76afc106a1c8e04a"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==5.2.1"
-        },
-        "defusedxml": {
-            "hashes": [
-                "sha256:1bb3032db185915b62d7c6209c5a8792be6a32ab2fedacc84e01b52c51aa3e69",
-                "sha256:a352e7e428770286cc899e2542b6cdaedb2b4953ff269a210103ec58f6198a61"
-            ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
-            "version": "==0.7.1"
-        },
-        "dill": {
-            "hashes": [
-                "sha256:0633f1d2df477324f53a895b02c901fb961bdbf65a17122586ea7019292cbcf0",
-                "sha256:44f54bf6412c2c8464c14e8243eb163690a9800dbe2c367330883b19c7561049"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==0.4.0"
-        },
-        "executing": {
-            "hashes": [
-                "sha256:11387150cad388d62750327a53d3339fad4888b39a6fe233c3afbb54ecffd3aa",
-                "sha256:5d108c028108fe2551d1a7b2e8b713341e2cb4fc0aa7dcf966fa4327a5226755"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==2.2.0"
-        },
-        "fastjsonschema": {
-            "hashes": [
-                "sha256:794d4f0a58f848961ba16af7b9c85a3e88cd360df008c59aac6fc5ae9323b5d4",
-                "sha256:c9e5b7e908310918cf494a434eeb31384dd84a98b57a30bcb1f535015b554667"
-            ],
-            "version": "==2.21.1"
-        },
-        "fqdn": {
-            "hashes": [
-                "sha256:105ed3677e767fb5ca086a0c1f4bb66ebc3c100be518f0e0d755d9eae164d89f",
-                "sha256:3a179af3761e4df6eb2e026ff9e1a3033d3587bf980a0b1b2e1e5d08d7358014"
-            ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'",
-            "version": "==1.5.1"
-        },
-        "h11": {
-            "hashes": [
-                "sha256:4e35b956cf45792e4caa5885e69fba00bdbc6ffafbfa020300e549b208ee5ff1",
-                "sha256:63cf8bbe7522de3bf65932fda1d9c2772064ffb3dae62d55932da54b31cb6c86"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==0.16.0"
-        },
-        "httpcore": {
-            "hashes": [
-                "sha256:2d400746a40668fc9dec9810239072b40b4484b640a8c38fd654a024c7a1bf55",
-                "sha256:6e34463af53fd2ab5d807f399a9b45ea31c3dfa2276f15a2c3f00afff6e176e8"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==1.0.9"
-        },
-        "httpx": {
-            "hashes": [
-                "sha256:75e98c5f16b0f35b567856f597f06ff2270a374470a5c2392242528e3e3e42fc",
-                "sha256:d909fcccc110f8c7faf814ca82a9a4d816bc5a6dbfea25d6591d6985b8ba59ad"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==0.28.1"
-        },
-        "idna": {
-            "hashes": [
-                "sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9",
-                "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3"
-            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==3.10"
-        },
-        "iniconfig": {
-            "hashes": [
-                "sha256:3abbd2e30b36733fee78f9c7f7308f2d0050e88f0087fd25c2645f63c773e1c7",
-                "sha256:9deba5723312380e77435581c6bf4935c94cbfab9b1ed33ef8d238ea168eb760"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==2.1.0"
-        },
-        "ipykernel": {
-            "hashes": [
-                "sha256:afdb66ba5aa354b09b91379bac28ae4afebbb30e8b39510c9690afb7a10421b5",
-                "sha256:f093a22c4a40f8828f8e330a9c297cb93dcab13bd9678ded6de8e5cf81c56215"
-            ],
-            "index": "pypi",
-            "markers": "python_version >= '3.8'",
-            "version": "==6.29.5"
-        },
-        "ipython": {
-            "hashes": [
-                "sha256:1a0b6dd9221a1f5dddf725b57ac0cb6fddc7b5f470576231ae9162b9b3455a04",
-                "sha256:79eb896f9f23f50ad16c3bc205f686f6e030ad246cc309c6279a242b14afe9d8"
-            ],
-            "markers": "python_version >= '3.11'",
-            "version": "==9.3.0"
-        },
-        "ipython-pygments-lexers": {
-            "hashes": [
-                "sha256:09c0138009e56b6854f9535736f4171d855c8c08a563a0dcd8022f78355c7e81",
-                "sha256:a9462224a505ade19a605f71f8fa63c2048833ce50abc86768a0d81d876dc81c"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==1.1.1"
-        },
-        "isoduration": {
-            "hashes": [
-                "sha256:ac2f9015137935279eac671f94f89eb00584f940f5dc49462a0c4ee692ba1bd9",
-                "sha256:b2904c2a4228c3d44f409c8ae8e2370eb21a26f7ac2ec5446df141dde3452042"
-            ],
-            "markers": "python_version >= '3.7'",
-            "version": "==20.11.0"
-        },
-        "isort": {
-            "hashes": [
-                "sha256:1cb5df28dfbc742e490c5e41bad6da41b805b0a8be7bc93cd0fb2a8a890ac450",
-                "sha256:2dc5d7f65c9678d94c88dfc29161a320eec67328bc97aad576874cb4be1e9615"
-            ],
-            "markers": "python_full_version >= '3.9.0'",
-            "version": "==6.0.1"
-        },
-        "jedi": {
-            "hashes": [
-                "sha256:4770dc3de41bde3966b02eb84fbcf557fb33cce26ad23da12c742fb50ecb11f0",
-                "sha256:a8ef22bde8490f57fe5c7681a3c83cb58874daf72b4784de3cce5b6ef6edb5b9"
-            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==0.19.2"
-        },
-        "jinja2": {
-            "hashes": [
-                "sha256:0137fb05990d35f1275a587e9aee6d56da821fc83491a0fb838183be43f66d6d",
-                "sha256:85ece4451f492d0c13c5dd7c13a64681a86afae63a5f347908daf103ce6d2f67"
-            ],
-            "markers": "python_version >= '3.7'",
-            "version": "==3.1.6"
-        },
-        "json5": {
-            "hashes": [
-                "sha256:0b4b6ff56801a1c7dc817b0241bca4ce474a0e6a163bfef3fc594d3fd263ff3a",
-                "sha256:6d37aa6c08b0609f16e1ec5ff94697e2cbbfbad5ac112afa05794da9ab7810db"
-            ],
-            "markers": "python_full_version >= '3.8.0'",
-            "version": "==0.12.0"
-        },
-        "jsonpointer": {
-            "hashes": [
-                "sha256:13e088adc14fca8b6aa8177c044e12701e6ad4b28ff10e65f2267a90109c9942",
-                "sha256:2b2d729f2091522d61c3b31f82e11870f60b68f43fbc705cb76bf4b832af59ef"
-            ],
-            "markers": "python_version >= '3.7'",
-            "version": "==3.0.0"
-        },
-        "jsonschema": {
-            "extras": [
-                "format-nongpl"
-            ],
-            "hashes": [
-                "sha256:0b4e8069eb12aedfa881333004bccaec24ecef5a8a6a4b6df142b2cc9599d196",
-                "sha256:a462455f19f5faf404a7902952b6f0e3ce868f3ee09a359b05eca6673bd8412d"
-            ],
-            "markers": "python_version >= '3.9'",
-            "version": "==4.24.0"
-        },
-        "jsonschema-specifications": {
-            "hashes": [
-                "sha256:4653bffbd6584f7de83a67e0d620ef16900b390ddc7939d56684d6c81e33f1af",
-                "sha256:630159c9f4dbea161a6a2205c3011cc4f18ff381b189fff48bb39b9bf26ae608"
-            ],
-            "markers": "python_version >= '3.9'",
-            "version": "==2025.4.1"
-        },
-        "jupyter-client": {
-            "hashes": [
-                "sha256:35b3a0947c4a6e9d589eb97d7d4cd5e90f910ee73101611f01283732bd6d9419",
-                "sha256:e8a19cc986cc45905ac3362915f410f3af85424b4c0905e94fa5f2cb08e8f23f"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==8.6.3"
-        },
-        "jupyter-core": {
-            "hashes": [
-                "sha256:0a5f9706f70e64786b75acba995988915ebd4601c8a52e534a40b51c95f59941",
-                "sha256:c28d268fc90fb53f1338ded2eb410704c5449a358406e8a948b75706e24863d0"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==5.8.1"
-        },
-        "jupyter-events": {
-            "hashes": [
-                "sha256:6464b2fa5ad10451c3d35fabc75eab39556ae1e2853ad0c0cc31b656731a97fb",
-                "sha256:fc3fce98865f6784c9cd0a56a20644fc6098f21c8c33834a8d9fe383c17e554b"
-            ],
-            "markers": "python_version >= '3.9'",
-            "version": "==0.12.0"
-        },
-        "jupyter-lsp": {
-            "hashes": [
-                "sha256:45fbddbd505f3fbfb0b6cb2f1bc5e15e83ab7c79cd6e89416b248cb3c00c11da",
-                "sha256:793147a05ad446f809fd53ef1cd19a9f5256fd0a2d6b7ce943a982cb4f545001"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==2.2.5"
-        },
-        "jupyter-server": {
-            "hashes": [
-                "sha256:3d8db5be3bc64403b1c65b400a1d7f4647a5ce743f3b20dbdefe8ddb7b55af9e",
-                "sha256:65d4b44fdf2dcbbdfe0aa1ace4a842d4aaf746a2b7b168134d5aaed35621b7f6"
-            ],
-            "markers": "python_version >= '3.9'",
-            "version": "==2.16.0"
-        },
-        "jupyter-server-terminals": {
-            "hashes": [
-                "sha256:41ee0d7dc0ebf2809c668e0fc726dfaf258fcd3e769568996ca731b6194ae9aa",
-                "sha256:5ae0295167220e9ace0edcfdb212afd2b01ee8d179fe6f23c899590e9b8a5269"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==0.5.3"
-        },
-        "jupyterlab": {
-            "hashes": [
-                "sha256:164302f6d4b6c44773dfc38d585665a4db401a16e5296c37df5cba63904fbdea",
-                "sha256:a94c32fd7f8b93e82a49dc70a6ec45a5c18281ca2a7228d12765e4e210e5bca2"
-            ],
-            "markers": "python_version >= '3.9'",
-            "version": "==4.4.3"
-        },
-        "jupyterlab-pygments": {
-            "hashes": [
-                "sha256:721aca4d9029252b11cfa9d185e5b5af4d54772bb8072f9b7036f4170054d35d",
-                "sha256:841a89020971da1d8693f1a99997aefc5dc424bb1b251fd6322462a1b8842780"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==0.3.0"
-        },
-        "jupyterlab-server": {
-            "hashes": [
-                "sha256:e697488f66c3db49df675158a77b3b017520d772c6e1548c7d9bcc5df7944ee4",
-                "sha256:eb36caca59e74471988f0ae25c77945610b887f777255aa21f8065def9e51ed4"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==2.27.3"
-        },
-        "markupsafe": {
-            "hashes": [
-                "sha256:0bff5e0ae4ef2e1ae4fdf2dfd5b76c75e5c2fa4132d05fc1b0dabcd20c7e28c4",
-                "sha256:0f4ca02bea9a23221c0182836703cbf8930c5e9454bacce27e767509fa286a30",
-                "sha256:1225beacc926f536dc82e45f8a4d68502949dc67eea90eab715dea3a21c1b5f0",
-                "sha256:131a3c7689c85f5ad20f9f6fb1b866f402c445b220c19fe4308c0b147ccd2ad9",
-                "sha256:15ab75ef81add55874e7ab7055e9c397312385bd9ced94920f2802310c930396",
-                "sha256:1a9d3f5f0901fdec14d8d2f66ef7d035f2157240a433441719ac9a3fba440b13",
-                "sha256:1c99d261bd2d5f6b59325c92c73df481e05e57f19837bdca8413b9eac4bd8028",
-                "sha256:1e084f686b92e5b83186b07e8a17fc09e38fff551f3602b249881fec658d3eca",
-                "sha256:2181e67807fc2fa785d0592dc2d6206c019b9502410671cc905d132a92866557",
-                "sha256:2cb8438c3cbb25e220c2ab33bb226559e7afb3baec11c4f218ffa7308603c832",
-                "sha256:3169b1eefae027567d1ce6ee7cae382c57fe26e82775f460f0b2778beaad66c0",
-                "sha256:3809ede931876f5b2ec92eef964286840ed3540dadf803dd570c3b7e13141a3b",
-                "sha256:38a9ef736c01fccdd6600705b09dc574584b89bea478200c5fbf112a6b0d5579",
-                "sha256:3d79d162e7be8f996986c064d1c7c817f6df3a77fe3d6859f6f9e7be4b8c213a",
-                "sha256:444dcda765c8a838eaae23112db52f1efaf750daddb2d9ca300bcae1039adc5c",
-                "sha256:48032821bbdf20f5799ff537c7ac3d1fba0ba032cfc06194faffa8cda8b560ff",
-                "sha256:4aa4e5faecf353ed117801a068ebab7b7e09ffb6e1d5e412dc852e0da018126c",
-                "sha256:52305740fe773d09cffb16f8ed0427942901f00adedac82ec8b67752f58a1b22",
-                "sha256:569511d3b58c8791ab4c2e1285575265991e6d8f8700c7be0e88f86cb0672094",
-                "sha256:57cb5a3cf367aeb1d316576250f65edec5bb3be939e9247ae594b4bcbc317dfb",
-                "sha256:5b02fb34468b6aaa40dfc198d813a641e3a63b98c2b05a16b9f80b7ec314185e",
-                "sha256:6381026f158fdb7c72a168278597a5e3a5222e83ea18f543112b2662a9b699c5",
-                "sha256:6af100e168aa82a50e186c82875a5893c5597a0c1ccdb0d8b40240b1f28b969a",
-                "sha256:6c89876f41da747c8d3677a2b540fb32ef5715f97b66eeb0c6b66f5e3ef6f59d",
-                "sha256:6e296a513ca3d94054c2c881cc913116e90fd030ad1c656b3869762b754f5f8a",
-                "sha256:70a87b411535ccad5ef2f1df5136506a10775d267e197e4cf531ced10537bd6b",
-                "sha256:7e94c425039cde14257288fd61dcfb01963e658efbc0ff54f5306b06054700f8",
-                "sha256:846ade7b71e3536c4e56b386c2a47adf5741d2d8b94ec9dc3e92e5e1ee1e2225",
-                "sha256:88416bd1e65dcea10bc7569faacb2c20ce071dd1f87539ca2ab364bf6231393c",
-                "sha256:88b49a3b9ff31e19998750c38e030fc7bb937398b1f78cfa599aaef92d693144",
-                "sha256:8c4e8c3ce11e1f92f6536ff07154f9d49677ebaaafc32db9db4620bc11ed480f",
-                "sha256:8e06879fc22a25ca47312fbe7c8264eb0b662f6db27cb2d3bbbc74b1df4b9b87",
-                "sha256:9025b4018f3a1314059769c7bf15441064b2207cb3f065e6ea1e7359cb46db9d",
-                "sha256:93335ca3812df2f366e80509ae119189886b0f3c2b81325d39efdb84a1e2ae93",
-                "sha256:9778bd8ab0a994ebf6f84c2b949e65736d5575320a17ae8984a77fab08db94cf",
-                "sha256:9e2d922824181480953426608b81967de705c3cef4d1af983af849d7bd619158",
-                "sha256:a123e330ef0853c6e822384873bef7507557d8e4a082961e1defa947aa59ba84",
-                "sha256:a904af0a6162c73e3edcb969eeeb53a63ceeb5d8cf642fade7d39e7963a22ddb",
-                "sha256:ad10d3ded218f1039f11a75f8091880239651b52e9bb592ca27de44eed242a48",
-                "sha256:b424c77b206d63d500bcb69fa55ed8d0e6a3774056bdc4839fc9298a7edca171",
-                "sha256:b5a6b3ada725cea8a5e634536b1b01c30bcdcd7f9c6fff4151548d5bf6b3a36c",
-                "sha256:ba8062ed2cf21c07a9e295d5b8a2a5ce678b913b45fdf68c32d95d6c1291e0b6",
-                "sha256:ba9527cdd4c926ed0760bc301f6728ef34d841f405abf9d4f959c478421e4efd",
-                "sha256:bbcb445fa71794da8f178f0f6d66789a28d7319071af7a496d4d507ed566270d",
-                "sha256:bcf3e58998965654fdaff38e58584d8937aa3096ab5354d493c77d1fdd66d7a1",
-                "sha256:c0ef13eaeee5b615fb07c9a7dadb38eac06a0608b41570d8ade51c56539e509d",
-                "sha256:cabc348d87e913db6ab4aa100f01b08f481097838bdddf7c7a84b7575b7309ca",
-                "sha256:cdb82a876c47801bb54a690c5ae105a46b392ac6099881cdfb9f6e95e4014c6a",
-                "sha256:cfad01eed2c2e0c01fd0ecd2ef42c492f7f93902e39a42fc9ee1692961443a29",
-                "sha256:d16a81a06776313e817c951135cf7340a3e91e8c1ff2fac444cfd75fffa04afe",
-                "sha256:d8213e09c917a951de9d09ecee036d5c7d36cb6cb7dbaece4c71a60d79fb9798",
-                "sha256:e07c3764494e3776c602c1e78e298937c3315ccc9043ead7e685b7f2b8d47b3c",
-                "sha256:e17c96c14e19278594aa4841ec148115f9c7615a47382ecb6b82bd8fea3ab0c8",
-                "sha256:e444a31f8db13eb18ada366ab3cf45fd4b31e4db1236a4448f68778c1d1a5a2f",
-                "sha256:e6a2a455bd412959b57a172ce6328d2dd1f01cb2135efda2e4576e8a23fa3b0f",
-                "sha256:eaa0a10b7f72326f1372a713e73c3f739b524b3af41feb43e4921cb529f5929a",
-                "sha256:eb7972a85c54febfb25b5c4b4f3af4dcc731994c7da0d8a0b4a6eb0640e1d178",
-                "sha256:ee55d3edf80167e48ea11a923c7386f4669df67d7994554387f84e7d8b0a2bf0",
-                "sha256:f3818cb119498c0678015754eba762e0d61e5b52d34c8b13d770f0719f7b1d79",
-                "sha256:f8b3d067f2e40fe93e1ccdd6b2e1d16c43140e76f02fb1319a05cf2b79d99430",
-                "sha256:fcabf5ff6eea076f859677f5f0b6b5c1a51e70a376b0579e0eadef8db48c6b50"
-            ],
-            "markers": "python_version >= '3.9'",
-            "version": "==3.0.2"
-        },
-        "matplotlib-inline": {
-            "hashes": [
-                "sha256:8423b23ec666be3d16e16b60bdd8ac4e86e840ebd1dd11a30b9f117f2fa0ab90",
-                "sha256:df192d39a4ff8f21b1895d72e6a13f5fcc5099f00fa84384e0ea28c2cc0653ca"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==0.1.7"
-        },
-        "mccabe": {
-            "hashes": [
-                "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325",
-                "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e"
-            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==0.7.0"
-        },
-        "mistune": {
-            "hashes": [
-                "sha256:1a32314113cff28aa6432e99e522677c8587fd83e3d51c29b82a52409c842bd9",
-                "sha256:a7035c21782b2becb6be62f8f25d3df81ccb4d6fa477a6525b15af06539f02a0"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==3.1.3"
-        },
-        "nbclient": {
-            "hashes": [
-                "sha256:4ffee11e788b4a27fabeb7955547e4318a5298f34342a4bfd01f2e1faaeadc3d",
-                "sha256:90b7fc6b810630db87a6d0c2250b1f0ab4cf4d3c27a299b0cde78a4ed3fd9193"
-            ],
-            "markers": "python_full_version >= '3.9.0'",
-            "version": "==0.10.2"
-        },
-        "nbconvert": {
-            "hashes": [
-                "sha256:1375a7b67e0c2883678c48e506dc320febb57685e5ee67faa51b18a90f3a712b",
-                "sha256:576a7e37c6480da7b8465eefa66c17844243816ce1ccc372633c6b71c3c0f582"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==7.16.6"
-        },
-        "nbformat": {
-            "hashes": [
-                "sha256:322168b14f937a5d11362988ecac2a4952d3d8e3a2cbeb2319584631226d5b3a",
-                "sha256:3b48d6c8fbca4b299bf3982ea7db1af21580e4fec269ad087b9e81588891200b"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==5.10.4"
-        },
-        "nest-asyncio": {
-            "hashes": [
-                "sha256:6f172d5449aca15afd6c646851f4e31e02c598d553a667e38cafa997cfec55fe",
-                "sha256:87af6efd6b5e897c81050477ef65c62e2b2f35d51703cae01aff2905b1852e1c"
-            ],
-            "markers": "python_version >= '3.5'",
-            "version": "==1.6.0"
-        },
-        "notebook": {
-            "hashes": [
-                "sha256:9cdeee954e04101cadb195d90e2ab62b7c9286c1d4f858bf3bb54e40df16c0c3",
-                "sha256:a1567481cd3853f2610ee0ecf5dfa12bb508e878ee8f92152c134ef7f0568a76"
-            ],
-            "index": "pypi",
-            "markers": "python_version >= '3.8'",
-            "version": "==7.4.3"
-        },
-        "notebook-shim": {
-            "hashes": [
-                "sha256:411a5be4e9dc882a074ccbcae671eda64cceb068767e9a3419096986560e1cef",
-                "sha256:b4b2cfa1b65d98307ca24361f5b30fe785b53c3fd07b7a47e89acb5e6ac638cb"
-            ],
-            "markers": "python_version >= '3.7'",
-            "version": "==0.2.4"
-        },
-        "overrides": {
-            "hashes": [
-                "sha256:55158fa3d93b98cc75299b1e67078ad9003ca27945c76162c1c0766d6f91820a",
-                "sha256:c7ed9d062f78b8e4c1a7b70bd8796b35ead4d9f510227ef9c5dc7626c60d7e49"
-            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==7.7.0"
-        },
-        "packaging": {
-            "hashes": [
-                "sha256:29572ef2b1f17581046b3a2227d5c611fb25ec70ca1ba8554b24b0e69331a484",
-                "sha256:d443872c98d677bf60f6a1f2f8c1cb748e8fe762d2bf9d3148b5599295b0fc4f"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==25.0"
-        },
-        "pandocfilters": {
-            "hashes": [
-                "sha256:002b4a555ee4ebc03f8b66307e287fa492e4a77b4ea14d3f934328297bb4939e",
-                "sha256:93be382804a9cdb0a7267585f157e5d1731bbe5545a85b268d6f5fe6232de2bc"
-            ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-            "version": "==1.5.1"
-        },
-        "parso": {
-            "hashes": [
-                "sha256:a418670a20291dacd2dddc80c377c5c3791378ee1e8d12bffc35420643d43f18",
-                "sha256:eb3a7b58240fb99099a345571deecc0f9540ea5f4dd2fe14c2a99d6b281ab92d"
-            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==0.8.4"
-        },
-        "pexpect": {
-            "hashes": [
-                "sha256:7236d1e080e4936be2dc3e326cec0af72acf9212a7e1d060210e70a47e253523",
-                "sha256:ee7d41123f3c9911050ea2c2dac107568dc43b2d3b0c7557a33212c398ead30f"
-            ],
-            "markers": "sys_platform != 'win32' and sys_platform != 'emscripten'",
-            "version": "==4.9.0"
-        },
-        "platformdirs": {
-            "hashes": [
-                "sha256:3d512d96e16bcb959a814c9f348431070822a6496326a4be0911c40b5a74c2bc",
-                "sha256:ff7059bb7eb1179e2685604f4aaf157cfd9535242bd23742eadc3c13542139b4"
-            ],
-            "markers": "python_version >= '3.9'",
-            "version": "==4.3.8"
-        },
-        "pluggy": {
-            "hashes": [
-                "sha256:7dcc130b76258d33b90f61b658791dede3486c3e6bfb003ee5c9bfb396dd22f3",
-                "sha256:e920276dd6813095e9377c0bc5566d94c932c33b27a3e3945d8389c374dd4746"
-            ],
-            "markers": "python_version >= '3.9'",
-            "version": "==1.6.0"
-        },
-        "prometheus-client": {
-            "hashes": [
-                "sha256:190f1331e783cf21eb60bca559354e0a4d4378facecf78f5428c39b675d20d28",
-                "sha256:cca895342e308174341b2cbf99a56bef291fbc0ef7b9e5412a0f26d653ba7094"
-            ],
-            "markers": "python_version >= '3.9'",
-            "version": "==0.22.1"
-        },
-        "prompt-toolkit": {
-            "hashes": [
-                "sha256:52742911fde84e2d423e2f9a4cf1de7d7ac4e51958f648d9540e0fb8db077b07",
-                "sha256:931a162e3b27fc90c86f1b48bb1fb2c528c2761475e57c9c06de13311c7b54ed"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==3.0.51"
-        },
-        "psutil": {
-            "hashes": [
-                "sha256:101d71dc322e3cffd7cea0650b09b3d08b8e7c4109dd6809fe452dfd00e58b25",
-                "sha256:1e744154a6580bc968a0195fd25e80432d3afec619daf145b9e5ba16cc1d688e",
-                "sha256:1fcee592b4c6f146991ca55919ea3d1f8926497a713ed7faaf8225e174581e91",
-                "sha256:39db632f6bb862eeccf56660871433e111b6ea58f2caea825571951d4b6aa3da",
-                "sha256:4b1388a4f6875d7e2aff5c4ca1cc16c545ed41dd8bb596cefea80111db353a34",
-                "sha256:4cf3d4eb1aa9b348dec30105c55cd9b7d4629285735a102beb4441e38db90553",
-                "sha256:7be9c3eba38beccb6495ea33afd982a44074b78f28c434a1f51cc07fd315c456",
-                "sha256:84df4eb63e16849689f76b1ffcb36db7b8de703d1bc1fe41773db487621b6c17",
-                "sha256:a5f098451abc2828f7dc6b58d44b532b22f2088f4999a937557b603ce72b1993",
-                "sha256:ba3fcef7523064a6c9da440fc4d6bd07da93ac726b5733c29027d7dc95b39d99"
-            ],
-            "markers": "python_version >= '3.6'",
-            "version": "==7.0.0"
-        },
-        "ptyprocess": {
-            "hashes": [
-                "sha256:4b41f3967fce3af57cc7e94b888626c18bf37a083e3651ca8feeb66d492fef35",
-                "sha256:5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347423220"
-            ],
-            "version": "==0.7.0"
-        },
-        "pure-eval": {
-            "hashes": [
-                "sha256:1db8e35b67b3d218d818ae653e27f06c3aa420901fa7b081ca98cbedc874e0d0",
-                "sha256:5f4e983f40564c576c7c8635ae88db5956bb2229d7e9237d03b3c0b0190eaf42"
-            ],
-            "version": "==0.2.3"
-        },
-        "pycparser": {
-            "hashes": [
-                "sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6",
-                "sha256:c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==2.22"
-        },
-        "pydeps": {
-            "hashes": [
-                "sha256:7c86ee63c9ee6ddd088c840364981c5aa214a994d323bb7fa4724fca30829bee",
-                "sha256:a57415a8fae2ff6840a199b7dfcfecb90c37e4b9b54b58a111808a3440bc03bc"
-            ],
-            "index": "pypi",
-            "markers": "python_version >= '3.8'",
-            "version": "==3.0.1"
-        },
-        "pygments": {
-            "hashes": [
-                "sha256:636cb2477cec7f8952536970bc533bc43743542f70392ae026374600add5b887",
-                "sha256:86540386c03d588bb81d44bc3928634ff26449851e99741617ecb9037ee5ec0b"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==2.19.2"
-        },
-        "pylint": {
-            "hashes": [
-                "sha256:2b11de8bde49f9c5059452e0c310c079c746a0a8eeaa789e5aa966ecc23e4559",
-                "sha256:43860aafefce92fca4cf6b61fe199cdc5ae54ea28f9bf4cd49de267b5195803d"
-            ],
-            "index": "pypi",
-            "markers": "python_full_version >= '3.9.0'",
-            "version": "==3.3.7"
-        },
-        "pytest": {
-            "hashes": [
-                "sha256:539c70ba6fcead8e78eebbf1115e8b589e7565830d7d006a8723f19ac8a0afb7",
-                "sha256:7c67fd69174877359ed9371ec3af8a3d2b04741818c51e5e99cc1742251fa93c"
-            ],
-            "index": "pypi",
-            "markers": "python_version >= '3.9'",
-            "version": "==8.4.1"
-        },
-        "pytest-cov": {
-            "hashes": [
-                "sha256:25cc6cc0a5358204b8108ecedc51a9b57b34cc6b8c967cc2c01a4e00d8a67da2",
-                "sha256:f5bc4c23f42f1cdd23c70b1dab1bbaef4fc505ba950d53e0081d0730dd7e86d5"
-            ],
-            "index": "pypi",
-            "markers": "python_version >= '3.9'",
-            "version": "==6.2.1"
-        },
-        "python-dateutil": {
-            "hashes": [
-                "sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3",
-                "sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427"
-            ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'",
-            "version": "==2.9.0.post0"
-        },
-        "python-json-logger": {
-            "hashes": [
-                "sha256:12b7e74b17775e7d565129296105bbe3910842d9d0eb083fc83a6a617aa8df84",
-                "sha256:dd980fae8cffb24c13caf6e158d3d61c0d6d22342f932cb6e9deedab3d35eec7"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==3.3.0"
-        },
-        "pyyaml": {
-            "hashes": [
-                "sha256:01179a4a8559ab5de078078f37e5c1a30d76bb88519906844fd7bdea1b7729ff",
-                "sha256:0833f8694549e586547b576dcfaba4a6b55b9e96098b36cdc7ebefe667dfed48",
-                "sha256:0a9a2848a5b7feac301353437eb7d5957887edbf81d56e903999a75a3d743086",
-                "sha256:0b69e4ce7a131fe56b7e4d770c67429700908fc0752af059838b1cfb41960e4e",
-                "sha256:0ffe8360bab4910ef1b9e87fb812d8bc0a308b0d0eef8c8f44e0254ab3b07133",
-                "sha256:11d8f3dd2b9c1207dcaf2ee0bbbfd5991f571186ec9cc78427ba5bd32afae4b5",
-                "sha256:17e311b6c678207928d649faa7cb0d7b4c26a0ba73d41e99c4fff6b6c3276484",
-                "sha256:1e2120ef853f59c7419231f3bf4e7021f1b936f6ebd222406c3b60212205d2ee",
-                "sha256:1f71ea527786de97d1a0cc0eacd1defc0985dcf6b3f17bb77dcfc8c34bec4dc5",
-                "sha256:23502f431948090f597378482b4812b0caae32c22213aecf3b55325e049a6c68",
-                "sha256:24471b829b3bf607e04e88d79542a9d48bb037c2267d7927a874e6c205ca7e9a",
-                "sha256:29717114e51c84ddfba879543fb232a6ed60086602313ca38cce623c1d62cfbf",
-                "sha256:2e99c6826ffa974fe6e27cdb5ed0021786b03fc98e5ee3c5bfe1fd5015f42b99",
-                "sha256:39693e1f8320ae4f43943590b49779ffb98acb81f788220ea932a6b6c51004d8",
-                "sha256:3ad2a3decf9aaba3d29c8f537ac4b243e36bef957511b4766cb0057d32b0be85",
-                "sha256:3b1fdb9dc17f5a7677423d508ab4f243a726dea51fa5e70992e59a7411c89d19",
-                "sha256:41e4e3953a79407c794916fa277a82531dd93aad34e29c2a514c2c0c5fe971cc",
-                "sha256:43fa96a3ca0d6b1812e01ced1044a003533c47f6ee8aca31724f78e93ccc089a",
-                "sha256:50187695423ffe49e2deacb8cd10510bc361faac997de9efef88badc3bb9e2d1",
-                "sha256:5ac9328ec4831237bec75defaf839f7d4564be1e6b25ac710bd1a96321cc8317",
-                "sha256:5d225db5a45f21e78dd9358e58a98702a0302f2659a3c6cd320564b75b86f47c",
-                "sha256:6395c297d42274772abc367baaa79683958044e5d3835486c16da75d2a694631",
-                "sha256:688ba32a1cffef67fd2e9398a2efebaea461578b0923624778664cc1c914db5d",
-                "sha256:68ccc6023a3400877818152ad9a1033e3db8625d899c72eacb5a668902e4d652",
-                "sha256:70b189594dbe54f75ab3a1acec5f1e3faa7e8cf2f1e08d9b561cb41b845f69d5",
-                "sha256:797b4f722ffa07cc8d62053e4cff1486fa6dc094105d13fea7b1de7d8bf71c9e",
-                "sha256:7c36280e6fb8385e520936c3cb3b8042851904eba0e58d277dca80a5cfed590b",
-                "sha256:7e7401d0de89a9a855c839bc697c079a4af81cf878373abd7dc625847d25cbd8",
-                "sha256:80bab7bfc629882493af4aa31a4cfa43a4c57c83813253626916b8c7ada83476",
-                "sha256:82d09873e40955485746739bcb8b4586983670466c23382c19cffecbf1fd8706",
-                "sha256:8388ee1976c416731879ac16da0aff3f63b286ffdd57cdeb95f3f2e085687563",
-                "sha256:8824b5a04a04a047e72eea5cec3bc266db09e35de6bdfe34c9436ac5ee27d237",
-                "sha256:8b9c7197f7cb2738065c481a0461e50ad02f18c78cd75775628afb4d7137fb3b",
-                "sha256:9056c1ecd25795207ad294bcf39f2db3d845767be0ea6e6a34d856f006006083",
-                "sha256:936d68689298c36b53b29f23c6dbb74de12b4ac12ca6cfe0e047bedceea56180",
-                "sha256:9b22676e8097e9e22e36d6b7bda33190d0d400f345f23d4065d48f4ca7ae0425",
-                "sha256:a4d3091415f010369ae4ed1fc6b79def9416358877534caf6a0fdd2146c87a3e",
-                "sha256:a8786accb172bd8afb8be14490a16625cbc387036876ab6ba70912730faf8e1f",
-                "sha256:a9f8c2e67970f13b16084e04f134610fd1d374bf477b17ec1599185cf611d725",
-                "sha256:bc2fa7c6b47d6bc618dd7fb02ef6fdedb1090ec036abab80d4681424b84c1183",
-                "sha256:c70c95198c015b85feafc136515252a261a84561b7b1d51e3384e0655ddf25ab",
-                "sha256:cc1c1159b3d456576af7a3e4d1ba7e6924cb39de8f67111c735f6fc832082774",
-                "sha256:ce826d6ef20b1bc864f0a68340c8b3287705cae2f8b4b1d932177dcc76721725",
-                "sha256:d584d9ec91ad65861cc08d42e834324ef890a082e591037abe114850ff7bbc3e",
-                "sha256:d7fded462629cfa4b685c5416b949ebad6cec74af5e2d42905d41e257e0869f5",
-                "sha256:d84a1718ee396f54f3a086ea0a66d8e552b2ab2017ef8b420e92edbc841c352d",
-                "sha256:d8e03406cac8513435335dbab54c0d385e4a49e4945d2909a581c83647ca0290",
-                "sha256:e10ce637b18caea04431ce14fabcf5c64a1c61ec9c56b071a4b7ca131ca52d44",
-                "sha256:ec031d5d2feb36d1d1a24380e4db6d43695f3748343d99434e6f5f9156aaa2ed",
-                "sha256:ef6107725bd54b262d6dedcc2af448a266975032bc85ef0172c5f059da6325b4",
-                "sha256:efdca5630322a10774e8e98e1af481aad470dd62c3170801852d752aa7a783ba",
-                "sha256:f753120cb8181e736c57ef7636e83f31b9c0d1722c516f7e86cf15b7aa57ff12",
-                "sha256:ff3824dc5261f50c9b0dfb3be22b4567a6f938ccce4587b38952d85fd9e9afe4"
-            ],
-            "index": "pypi",
-            "markers": "python_version >= '3.8'",
-            "version": "==6.0.2"
-        },
-        "pyzmq": {
-            "hashes": [
-                "sha256:00387d12a8af4b24883895f7e6b9495dc20a66027b696536edac35cb988c38f3",
-                "sha256:04cd50ef3b28e35ced65740fb9956a5b3f77a6ff32fcd887e3210433f437dd0f",
-                "sha256:0546a720c1f407b2172cb04b6b094a78773491497e3644863cf5c96c42df8cff",
-                "sha256:096af9e133fec3a72108ddefba1e42985cb3639e9de52cfd336b6fc23aa083e9",
-                "sha256:100f6e5052ba42b2533011d34a018a5ace34f8cac67cb03cfa37c8bdae0ca617",
-                "sha256:10f70c1d9a446a85013a36871a296007f6fe4232b530aa254baf9da3f8328bc0",
-                "sha256:111db5f395e09f7e775f759d598f43cb815fc58e0147623c4816486e1a39dc22",
-                "sha256:14fe7aaac86e4e93ea779a821967360c781d7ac5115b3f1a171ced77065a0174",
-                "sha256:15f39d50bd6c9091c67315ceb878a4f531957b121d2a05ebd077eb35ddc5efed",
-                "sha256:1958947983fef513e6e98eff9cb487b60bf14f588dc0e6bf35fa13751d2c8251",
-                "sha256:20d5cb29e8c5f76a127c75b6e7a77e846bc4b655c373baa098c26a61b7ecd0ef",
-                "sha256:21457825249b2a53834fa969c69713f8b5a79583689387a5e7aed880963ac564",
-                "sha256:2524c40891be6a3106885a3935d58452dd83eb7a5742a33cc780a1ad4c49dec0",
-                "sha256:26b72c5ae20bf59061c3570db835edb81d1e0706ff141747055591c4b41193f8",
-                "sha256:26d542258c7a1f35a9cff3d887687d3235006134b0ac1c62a6fe1ad3ac10440e",
-                "sha256:29f44e3c26b9783816ba9ce274110435d8f5b19bbd82f7a6c7612bb1452a3597",
-                "sha256:2c386339d7e3f064213aede5d03d054b237937fbca6dd2197ac8cf3b25a6b14e",
-                "sha256:39ddd3ba0a641f01d8f13a3cfd4c4924eb58e660d8afe87e9061d6e8ca6f7ac3",
-                "sha256:42c7555123679637c99205b1aa9e8f7d90fe29d4c243c719e347d4852545216c",
-                "sha256:4c19d39c04c29a6619adfeb19e3735c421b3bfee082f320662f52e59c47202ba",
-                "sha256:4e7d0a8d460fba526cc047333bdcbf172a159b8bd6be8c3eb63a416ff9ba1477",
-                "sha256:50360fb2a056ffd16e5f4177eee67f1dd1017332ea53fb095fe7b5bf29c70246",
-                "sha256:51f5726de3532b8222e569990c8aa34664faa97038304644679a51d906e60c6e",
-                "sha256:53a48f0228eab6cbf69fde3aa3c03cbe04e50e623ef92ae395fce47ef8a76152",
-                "sha256:55a0155b148fe0428285a30922f7213539aa84329a5ad828bca4bbbc665c70a4",
-                "sha256:56e46bbb85d52c1072b3f809cc1ce77251d560bc036d3a312b96db1afe76db2e",
-                "sha256:5b10bd6f008937705cf6e7bf8b6ece5ca055991e3eb130bca8023e20b86aa9a3",
-                "sha256:5cd11d46d7b7e5958121b3eaf4cd8638eff3a720ec527692132f05a57f14341d",
-                "sha256:5d5ef4718ecab24f785794e0e7536436698b459bfbc19a1650ef55280119d93b",
-                "sha256:60e8cc82d968174650c1860d7b716366caab9973787a1c060cf8043130f7d0f7",
-                "sha256:63af72b2955fc77caf0a77444baa2431fcabb4370219da38e1a9f8d12aaebe28",
-                "sha256:656c1866505a5735d0660b7da6d7147174bbf59d4975fc2b7f09f43c9bc25745",
-                "sha256:661942bc7cd0223d569d808f2e5696d9cc120acc73bf3e88a1f1be7ab648a7e4",
-                "sha256:67855c14173aec36395d7777aaba3cc527b393821f30143fd20b98e1ff31fd38",
-                "sha256:67bfbcbd0a04c575e8103a6061d03e393d9f80ffdb9beb3189261e9e9bc5d5e9",
-                "sha256:6a56e3e5bd2d62a01744fd2f1ce21d760c7c65f030e9522738d75932a14ab62a",
-                "sha256:6ad0562d4e6abb785be3e4dd68599c41be821b521da38c402bc9ab2a8e7ebc7e",
-                "sha256:6b0397b0be277b46762956f576e04dc06ced265759e8c2ff41a0ee1aa0064198",
-                "sha256:6e435540fa1da54667f0026cf1e8407fe6d8a11f1010b7f06b0b17214ebfcf5e",
-                "sha256:7011ade88c8e535cf140f8d1a59428676fbbce7c6e54fefce58bf117aefb6667",
-                "sha256:74175b9e12779382432dd1d1f5960ebe7465d36649b98a06c6b26be24d173fab",
-                "sha256:7cdf07fe0a557b131366f80727ec8ccc4b70d89f1e3f920d94a594d598d754f0",
-                "sha256:8617c7d43cd8ccdb62aebe984bfed77ca8f036e6c3e46dd3dddda64b10f0ab7a",
-                "sha256:88b4e43cab04c3c0f0d55df3b1eef62df2b629a1a369b5289a58f6fa8b07c4f4",
-                "sha256:8c86ea8fe85e2eb0ffa00b53192c401477d5252f6dd1db2e2ed21c1c30d17e5e",
-                "sha256:8ca7e6a0388dd9e1180b14728051068f4efe83e0d2de058b5ff92c63f399a73f",
-                "sha256:90252fa2ff3a104219db1f5ced7032a7b5fc82d7c8d2fec2b9a3e6fd4e25576b",
-                "sha256:9df43a2459cd3a3563404c1456b2c4c69564daa7dbaf15724c09821a3329ce46",
-                "sha256:a20528da85c7ac7a19b7384e8c3f8fa707841fd85afc4ed56eda59d93e3d98ad",
-                "sha256:a979b7cf9e33d86c4949df527a3018767e5f53bc3b02adf14d4d8db1db63ccc0",
-                "sha256:ae2b34bcfaae20c064948a4113bf8709eee89fd08317eb293ae4ebd69b4d9740",
-                "sha256:b1f08eeb9ce1510e6939b6e5dcd46a17765e2333daae78ecf4606808442e52cf",
-                "sha256:b801c2e40c5aa6072c2f4876de8dccd100af6d9918d4d0d7aa54a1d982fd4f44",
-                "sha256:b973ee650e8f442ce482c1d99ca7ab537c69098d53a3d046676a484fd710c87a",
-                "sha256:bf6c6b061efd00404b9750e2cfbd9507492c8d4b3721ded76cb03786131be2ed",
-                "sha256:c0dc628b5493f9a8cd9844b8bee9732ef587ab00002157c9329e4fc0ef4d3afa",
-                "sha256:c0ed2c1f335ba55b5fdc964622254917d6b782311c50e138863eda409fbb3b6d",
-                "sha256:c2dace4a7041cca2fba5357a2d7c97c5effdf52f63a1ef252cfa496875a3762d",
-                "sha256:c36ad534c0c29b4afa088dc53543c525b23c0797e01b69fef59b1a9c0e38b688",
-                "sha256:c45fee3968834cd291a13da5fac128b696c9592a9493a0f7ce0b47fa03cc574d",
-                "sha256:c5817641eebb391a2268c27fecd4162448e03538387093cdbd8bf3510c316b38",
-                "sha256:c644aaacc01d0df5c7072826df45e67301f191c55f68d7b2916d83a9ddc1b551",
-                "sha256:c8878011653dcdc27cc2c57e04ff96f0471e797f5c19ac3d7813a245bcb24371",
-                "sha256:cae73bb6898c4e045fbed5024cb587e4110fddb66f6163bcab5f81f9d4b9c496",
-                "sha256:cb0ac5179cba4b2f94f1aa208fbb77b62c4c9bf24dd446278b8b602cf85fcda3",
-                "sha256:cbabc59dcfaac66655c040dfcb8118f133fb5dde185e5fc152628354c1598e52",
-                "sha256:cd1dc59763effd1576f8368047c9c31468fce0af89d76b5067641137506792ae",
-                "sha256:cf209a6dc4b420ed32a7093642843cbf8703ed0a7d86c16c0b98af46762ebefb",
-                "sha256:d8229f2efece6a660ee211d74d91dbc2a76b95544d46c74c615e491900dc107f",
-                "sha256:d8c6de908465697a8708e4d6843a1e884f567962fc61eb1706856545141d0cbb",
-                "sha256:dc1091f59143b471d19eb64f54bae4f54bcf2a466ffb66fe45d94d8d734eb495",
-                "sha256:dce4199bf5f648a902ce37e7b3afa286f305cd2ef7a8b6ec907470ccb6c8b371",
-                "sha256:e40609380480b3d12c30f841323f42451c755b8fece84235236f5fe5ffca8c1c",
-                "sha256:e8c4adce8e37e75c4215297d7745551b8dcfa5f728f23ce09bf4e678a9399413",
-                "sha256:e918d70862d4cfd4b1c187310015646a14e1f5917922ab45b29f28f345eeb6be",
-                "sha256:ea6d441c513bf18c578c73c323acf7b4184507fc244762193aa3a871333c9045",
-                "sha256:ee05728c0b0b2484a9fc20466fa776fffb65d95f7317a3419985b8c908563861",
-                "sha256:f4162dbbd9c5c84fb930a36f290b08c93e35fce020d768a16fc8891a2f72bab8",
-                "sha256:f7bbe9e1ed2c8d3da736a15694d87c12493e54cc9dc9790796f0321794bbc91f"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==27.0.0"
-        },
-        "referencing": {
-            "hashes": [
-                "sha256:df2e89862cd09deabbdba16944cc3f10feb6b3e6f18e902f7cc25609a34775aa",
-                "sha256:e8699adbbf8b5c7de96d8ffa0eb5c158b3beafce084968e2ea8bb08c6794dcd0"
-            ],
-            "markers": "python_version >= '3.9'",
-            "version": "==0.36.2"
-        },
-        "requests": {
-            "hashes": [
-                "sha256:27babd3cda2a6d50b30443204ee89830707d396671944c998b5975b031ac2b2c",
-                "sha256:27d0316682c8a29834d3264820024b62a36942083d52caf2f14c0591336d3422"
-            ],
-            "index": "pypi",
-            "markers": "python_version >= '3.8'",
-            "version": "==2.32.4"
-        },
-        "requests-mock": {
-            "hashes": [
-                "sha256:b1e37054004cdd5e56c84454cc7df12b25f90f382159087f4b6915aaeef39563",
-                "sha256:e9e12e333b525156e82a3c852f22016b9158220d2f47454de9cae8a77d371401"
-            ],
-            "index": "pypi",
-            "markers": "python_version >= '3.5'",
-            "version": "==1.12.1"
-        },
-        "rfc3339-validator": {
-            "hashes": [
-                "sha256:138a2abdf93304ad60530167e51d2dfb9549521a836871b88d7f4695d0022f6b",
-                "sha256:24f6ec1eda14ef823da9e36ec7113124b39c04d50a4d3d3a3c2859577e7791fa"
-            ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
-            "version": "==0.1.4"
-        },
-        "rfc3986-validator": {
-            "hashes": [
-                "sha256:2f235c432ef459970b4306369336b9d5dbdda31b510ca1e327636e01f528bfa9",
-                "sha256:3d44bde7921b3b9ec3ae4e3adca370438eccebc676456449b145d533b240d055"
-            ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
-            "version": "==0.1.1"
-        },
-        "rpds-py": {
-            "hashes": [
-                "sha256:0317177b1e8691ab5879f4f33f4b6dc55ad3b344399e23df2e499de7b10a548d",
-                "sha256:036ded36bedb727beeabc16dc1dad7cb154b3fa444e936a03b67a86dc6a5066e",
-                "sha256:048893e902132fd6548a2e661fb38bf4896a89eea95ac5816cf443524a85556f",
-                "sha256:0701942049095741a8aeb298a31b203e735d1c61f4423511d2b1a41dcd8a16da",
-                "sha256:083a9513a33e0b92cf6e7a6366036c6bb43ea595332c1ab5c8ae329e4bcc0a9c",
-                "sha256:09eab132f41bf792c7a0ea1578e55df3f3e7f61888e340779b06050a9a3f16e9",
-                "sha256:0e6a327af8ebf6baba1c10fadd04964c1965d375d318f4435d5f3f9651550f4a",
-                "sha256:0eb90e94f43e5085623932b68840b6f379f26db7b5c2e6bcef3179bd83c9330f",
-                "sha256:114a07e85f32b125404f28f2ed0ba431685151c037a26032b213c882f26eb908",
-                "sha256:115874ae5e2fdcfc16b2aedc95b5eef4aebe91b28e7e21951eda8a5dc0d3461b",
-                "sha256:140f61d9bed7839446bdd44852e30195c8e520f81329b4201ceead4d64eb3a9f",
-                "sha256:1521031351865e0181bc585147624d66b3b00a84109b57fcb7a779c3ec3772cd",
-                "sha256:1c0c434a53714358532d13539272db75a5ed9df75a4a090a753ac7173ec14e11",
-                "sha256:1d1fadd539298e70cac2f2cb36f5b8a65f742b9b9f1014dd4ea1f7785e2470bf",
-                "sha256:1de336a4b164c9188cb23f3703adb74a7623ab32d20090d0e9bf499a2203ad65",
-                "sha256:1ee3e26eb83d39b886d2cb6e06ea701bba82ef30a0de044d34626ede51ec98b0",
-                "sha256:245550f5a1ac98504147cba96ffec8fabc22b610742e9150138e5d60774686d7",
-                "sha256:2a40046a529cc15cef88ac5ab589f83f739e2d332cb4d7399072242400ed68c9",
-                "sha256:2c2cd1a4b0c2b8c5e31ffff50d09f39906fe351389ba143c195566056c13a7ea",
-                "sha256:2cb9e5b5e26fc02c8a4345048cd9998c2aca7c2712bd1b36da0c72ee969a3523",
-                "sha256:33358883a4490287e67a2c391dfaea4d9359860281db3292b6886bf0be3d8692",
-                "sha256:35634369325906bcd01577da4c19e3b9541a15e99f31e91a02d010816b49bfda",
-                "sha256:35a8d1a24b5936b35c5003313bc177403d8bdef0f8b24f28b1c4a255f94ea992",
-                "sha256:3af5b4cc10fa41e5bc64e5c198a1b2d2864337f8fcbb9a67e747e34002ce812b",
-                "sha256:3bcce0edc1488906c2d4c75c94c70a0417e83920dd4c88fec1078c94843a6ce9",
-                "sha256:3c5b317ecbd8226887994852e85de562f7177add602514d4ac40f87de3ae45a8",
-                "sha256:3c6564c0947a7f52e4792983f8e6cf9bac140438ebf81f527a21d944f2fd0a40",
-                "sha256:3ebd879ab996537fc510a2be58c59915b5dd63bccb06d1ef514fee787e05984a",
-                "sha256:3f0b1798cae2bbbc9b9db44ee068c556d4737911ad53a4e5093d09d04b3bbc24",
-                "sha256:401ca1c4a20cc0510d3435d89c069fe0a9ae2ee6495135ac46bdd49ec0495763",
-                "sha256:454601988aab2c6e8fd49e7634c65476b2b919647626208e376afcd22019eeb8",
-                "sha256:4593c4eae9b27d22df41cde518b4b9e4464d139e4322e2127daa9b5b981b76be",
-                "sha256:45e484db65e5380804afbec784522de84fa95e6bb92ef1bd3325d33d13efaebd",
-                "sha256:48d64155d02127c249695abb87d39f0faf410733428d499867606be138161d65",
-                "sha256:4fbb0dbba559959fcb5d0735a0f87cdbca9e95dac87982e9b95c0f8f7ad10255",
-                "sha256:4fd52d3455a0aa997734f3835cbc4c9f32571345143960e7d7ebfe7b5fbfa3b2",
-                "sha256:50f2c501a89c9a5f4e454b126193c5495b9fb441a75b298c60591d8a2eb92e1b",
-                "sha256:58f77c60956501a4a627749a6dcb78dac522f249dd96b5c9f1c6af29bfacfb66",
-                "sha256:5a3ddb74b0985c4387719fc536faced33cadf2172769540c62e2a94b7b9be1c4",
-                "sha256:5c4a128527fe415d73cf1f70a9a688d06130d5810be69f3b553bf7b45e8acf79",
-                "sha256:5d473be2b13600b93a5675d78f59e63b51b1ba2d0476893415dfbb5477e65b31",
-                "sha256:5d9e40f32745db28c1ef7aad23f6fc458dc1e29945bd6781060f0d15628b8ddf",
-                "sha256:5f048bbf18b1f9120685c6d6bb70cc1a52c8cc11bdd04e643d28d3be0baf666d",
-                "sha256:605ffe7769e24b1800b4d024d24034405d9404f0bc2f55b6db3362cd34145a6f",
-                "sha256:6099263f526efff9cf3883dfef505518730f7a7a93049b1d90d42e50a22b4793",
-                "sha256:659d87430a8c8c704d52d094f5ba6fa72ef13b4d385b7e542a08fc240cb4a559",
-                "sha256:666fa7b1bd0a3810a7f18f6d3a25ccd8866291fbbc3c9b912b917a6715874bb9",
-                "sha256:68f6f060f0bbdfb0245267da014d3a6da9be127fe3e8cc4a68c6f833f8a23bb1",
-                "sha256:6d273f136e912aa101a9274c3145dcbddbe4bac560e77e6d5b3c9f6e0ed06d34",
-                "sha256:6d50841c425d16faf3206ddbba44c21aa3310a0cebc3c1cdfc3e3f4f9f6f5728",
-                "sha256:771c16060ff4e79584dc48902a91ba79fd93eade3aa3a12d6d2a4aadaf7d542b",
-                "sha256:785ffacd0ee61c3e60bdfde93baa6d7c10d86f15655bd706c89da08068dc5038",
-                "sha256:796ad874c89127c91970652a4ee8b00d56368b7e00d3477f4415fe78164c8000",
-                "sha256:79dc317a5f1c51fd9c6a0c4f48209c6b8526d0524a6904fc1076476e79b00f98",
-                "sha256:7c9409b47ba0650544b0bb3c188243b83654dfe55dcc173a86832314e1a6a35d",
-                "sha256:7d779b325cc8238227c47fbc53964c8cc9a941d5dbae87aa007a1f08f2f77b23",
-                "sha256:816568614ecb22b18a010c7a12559c19f6fe993526af88e95a76d5a60b8b75fb",
-                "sha256:8378fa4a940f3fb509c081e06cb7f7f2adae8cf46ef258b0e0ed7519facd573e",
-                "sha256:85608eb70a659bf4c1142b2781083d4b7c0c4e2c90eff11856a9754e965b2540",
-                "sha256:85fc223d9c76cabe5d0bff82214459189720dc135db45f9f66aa7cffbf9ff6c1",
-                "sha256:88ec04afe0c59fa64e2f6ea0dd9657e04fc83e38de90f6de201954b4d4eb59bd",
-                "sha256:8960b6dac09b62dac26e75d7e2c4a22efb835d827a7278c34f72b2b84fa160e3",
-                "sha256:89706d0683c73a26f76a5315d893c051324d771196ae8b13e6ffa1ffaf5e574f",
-                "sha256:89c24300cd4a8e4a51e55c31a8ff3918e6651b241ee8876a42cc2b2a078533ba",
-                "sha256:8c742af695f7525e559c16f1562cf2323db0e3f0fbdcabdf6865b095256b2d40",
-                "sha256:8dbd586bfa270c1103ece2109314dd423df1fa3d9719928b5d09e4840cec0d72",
-                "sha256:8eb8c84ecea987a2523e057c0d950bcb3f789696c0499290b8d7b3107a719d78",
-                "sha256:921954d7fbf3fccc7de8f717799304b14b6d9a45bbeec5a8d7408ccbf531faf5",
-                "sha256:9a46c2fb2545e21181445515960006e85d22025bd2fe6db23e76daec6eb689fe",
-                "sha256:9c006f3aadeda131b438c3092124bd196b66312f0caa5823ef09585a669cf449",
-                "sha256:9ceca1cf097ed77e1a51f1dbc8d174d10cb5931c188a4505ff9f3e119dfe519b",
-                "sha256:9e5fc7484fa7dce57e25063b0ec9638ff02a908304f861d81ea49273e43838c1",
-                "sha256:9f2f48ab00181600ee266a095fe815134eb456163f7d6699f525dee471f312cf",
-                "sha256:9fca84a15333e925dd59ce01da0ffe2ffe0d6e5d29a9eeba2148916d1824948c",
-                "sha256:a49e1d7a4978ed554f095430b89ecc23f42014a50ac385eb0c4d163ce213c325",
-                "sha256:a58d1ed49a94d4183483a3ce0af22f20318d4a1434acee255d683ad90bf78129",
-                "sha256:a61d0b2c7c9a0ae45732a77844917b427ff16ad5464b4d4f5e4adb955f582890",
-                "sha256:a714bf6e5e81b0e570d01f56e0c89c6375101b8463999ead3a93a5d2a4af91fa",
-                "sha256:a7b74e92a3b212390bdce1d93da9f6488c3878c1d434c5e751cbc202c5e09500",
-                "sha256:a8bd2f19e312ce3e1d2c635618e8a8d8132892bb746a7cf74780a489f0f6cdcb",
-                "sha256:b0be9965f93c222fb9b4cc254235b3b2b215796c03ef5ee64f995b1b69af0762",
-                "sha256:b24bf3cd93d5b6ecfbedec73b15f143596c88ee249fa98cefa9a9dc9d92c6f28",
-                "sha256:b5ffe453cde61f73fea9430223c81d29e2fbf412a6073951102146c84e19e34c",
-                "sha256:bc120d1132cff853ff617754196d0ac0ae63befe7c8498bd67731ba368abe451",
-                "sha256:bd035756830c712b64725a76327ce80e82ed12ebab361d3a1cdc0f51ea21acb0",
-                "sha256:bffcf57826d77a4151962bf1701374e0fc87f536e56ec46f1abdd6a903354042",
-                "sha256:c2013ee878c76269c7b557a9a9c042335d732e89d482606990b70a839635feb7",
-                "sha256:c4feb9211d15d9160bc85fa72fed46432cdc143eb9cf6d5ca377335a921ac37b",
-                "sha256:c8980cde3bb8575e7c956a530f2c217c1d6aac453474bf3ea0f9c89868b531b6",
-                "sha256:c98f126c4fc697b84c423e387337d5b07e4a61e9feac494362a59fd7a2d9ed80",
-                "sha256:ccc6f3ddef93243538be76f8e47045b4aad7a66a212cd3a0f23e34469473d36b",
-                "sha256:ccfa689b9246c48947d31dd9d8b16d89a0ecc8e0e26ea5253068efb6c542b76e",
-                "sha256:cda776f1967cb304816173b30994faaf2fd5bcb37e73118a47964a02c348e1bc",
-                "sha256:ce4c8e485a3c59593f1a6f683cf0ea5ab1c1dc94d11eea5619e4fb5228b40fbd",
-                "sha256:d3c10228d6cf6fe2b63d2e7985e94f6916fa46940df46b70449e9ff9297bd3d1",
-                "sha256:d4ca54b9cf9d80b4016a67a0193ebe0bcf29f6b0a96f09db942087e294d3d4c2",
-                "sha256:d4cb2b3ddc16710548801c6fcc0cfcdeeff9dafbc983f77265877793f2660309",
-                "sha256:d50e4864498a9ab639d6d8854b25e80642bd362ff104312d9770b05d66e5fb13",
-                "sha256:d74ec9bc0e2feb81d3f16946b005748119c0f52a153f6db6a29e8cd68636f295",
-                "sha256:d8222acdb51a22929c3b2ddb236b69c59c72af4019d2cba961e2f9add9b6e634",
-                "sha256:db58483f71c5db67d643857404da360dce3573031586034b7d59f245144cc192",
-                "sha256:dc3c1ff0abc91444cd20ec643d0f805df9a3661fcacf9c95000329f3ddf268a4",
-                "sha256:dd326a81afe332ede08eb39ab75b301d5676802cdffd3a8f287a5f0b694dc3f5",
-                "sha256:dec21e02e6cc932538b5203d3a8bd6aa1480c98c4914cb88eea064ecdbc6396a",
-                "sha256:e1dafef8df605fdb46edcc0bf1573dea0d6d7b01ba87f85cd04dc855b2b4479e",
-                "sha256:e2f6a2347d3440ae789505693a02836383426249d5293541cd712e07e7aecf54",
-                "sha256:e37caa8cdb3b7cf24786451a0bdb853f6347b8b92005eeb64225ae1db54d1c2b",
-                "sha256:e43a005671a9ed5a650f3bc39e4dbccd6d4326b24fb5ea8be5f3a43a6f576c72",
-                "sha256:e5e2f7280d8d0d3ef06f3ec1b4fd598d386cc6f0721e54f09109a8132182fbfe",
-                "sha256:e87798852ae0b37c88babb7f7bbbb3e3fecc562a1c340195b44c7e24d403e380",
-                "sha256:ee86d81551ec68a5c25373c5643d343150cc54672b5e9a0cafc93c1870a53954",
-                "sha256:f251bf23deb8332823aef1da169d5d89fa84c89f67bdfb566c49dea1fccfd50d",
-                "sha256:f3d86373ff19ca0441ebeb696ef64cb58b8b5cbacffcda5a0ec2f3911732a194",
-                "sha256:f4ad628b5174d5315761b67f212774a32f5bad5e61396d38108bd801c0a8f5d9",
-                "sha256:f70316f760174ca04492b5ab01be631a8ae30cadab1d1081035136ba12738cfa",
-                "sha256:f73ce1512e04fbe2bc97836e89830d6b4314c171587a99688082d090f934d20a",
-                "sha256:ff7c23ba0a88cb7b104281a99476cccadf29de2a0ef5ce864959a52675b1ca83"
-            ],
-            "markers": "python_version >= '3.9'",
-            "version": "==0.25.1"
-        },
-        "send2trash": {
-            "hashes": [
-                "sha256:0c31227e0bd08961c7665474a3d1ef7193929fedda4233843689baa056be46c9",
-                "sha256:b18e7a3966d99871aefeb00cfbcfdced55ce4871194810fc71f4aa484b953abf"
-            ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'",
-            "version": "==1.8.3"
-        },
-        "setuptools": {
-            "hashes": [
-                "sha256:062d34222ad13e0cc312a4c02d73f059e86a4acbfbdea8f8f76b28c99f306922",
-                "sha256:f36b47402ecde768dbfafc46e8e4207b4360c654f1f3bb84475f0a28628fb19c"
-            ],
-            "markers": "python_version >= '3.9'",
-            "version": "==80.9.0"
-        },
-        "six": {
-            "hashes": [
-                "sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274",
-                "sha256:ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81"
-            ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'",
-            "version": "==1.17.0"
-        },
-        "sniffio": {
-            "hashes": [
-                "sha256:2f6da418d1f1e0fddd844478f41680e794e6051915791a034ff65e5f100525a2",
-                "sha256:f4324edc670a0f49750a81b895f35c3adb843cca46f0530f79fc1babb23789dc"
-            ],
-            "markers": "python_version >= '3.7'",
-            "version": "==1.3.1"
-        },
-        "soupsieve": {
-            "hashes": [
-                "sha256:6e60cc5c1ffaf1cebcc12e8188320b72071e922c2e897f737cadce79ad5d30c4",
-                "sha256:ad282f9b6926286d2ead4750552c8a6142bc4c783fd66b0293547c8fe6ae126a"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==2.7"
-        },
-        "stack-data": {
-            "hashes": [
-                "sha256:836a778de4fec4dcd1dcd89ed8abff8a221f58308462e1c4aa2a3cf30148f0b9",
-                "sha256:d5558e0c25a4cb0853cddad3d77da9891a08cb85dd9f9f91b9f8cd66e511e695"
-            ],
-            "version": "==0.6.3"
-        },
-        "stdlib-list": {
-            "hashes": [
-                "sha256:9029ea5e3dfde8cd4294cfd4d1797be56a67fc4693c606181730148c3fd1da29",
-                "sha256:95ebd1d73da9333bba03ccc097f5bac05e3aa03e6822a0c0290f87e1047f1857"
-            ],
-            "markers": "python_version >= '3.9'",
-            "version": "==0.11.1"
-        },
-        "terminado": {
-            "hashes": [
-                "sha256:a4468e1b37bb318f8a86514f65814e1afc977cf29b3992a4500d9dd305dcceb0",
-                "sha256:de09f2c4b85de4765f7714688fff57d3e75bad1f909b589fde880460c753fd2e"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==0.18.1"
-        },
-        "tinycss2": {
-            "hashes": [
-                "sha256:10c0972f6fc0fbee87c3edb76549357415e94548c1ae10ebccdea16fb404a9b7",
-                "sha256:3a49cf47b7675da0b15d0c6e1df8df4ebd96e9394bb905a5775adb0d884c5289"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==1.4.0"
-        },
-        "tomlkit": {
-            "hashes": [
-                "sha256:430cf247ee57df2b94ee3fbe588e71d362a941ebb545dec29b53961d61add2a1",
-                "sha256:c89c649d79ee40629a9fda55f8ace8c6a1b42deb912b2a8fd8d942ddadb606b0"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==0.13.3"
-        },
-        "tornado": {
-            "hashes": [
-                "sha256:02420a0eb7bf617257b9935e2b754d1b63897525d8a289c9d65690d580b4dcf7",
-                "sha256:13ce6e3396c24e2808774741331638ee6c2f50b114b97a55c5b442df65fd9692",
-                "sha256:253b76040ee3bab8bcf7ba9feb136436a3787208717a1fb9f2c16b744fba7331",
-                "sha256:308473f4cc5a76227157cdf904de33ac268af770b2c5f05ca6c1161d82fdd95e",
-                "sha256:5cae6145f4cdf5ab24744526cc0f55a17d76f02c98f4cff9daa08ae9a217448a",
-                "sha256:84ceece391e8eb9b2b95578db65e920d2a61070260594819589609ba9bc6308c",
-                "sha256:908e7d64567cecd4c2b458075589a775063453aeb1d2a1853eedb806922f568b",
-                "sha256:9e9ca370f717997cb85606d074b0e5b247282cf5e2e1611568b8821afe0342d6",
-                "sha256:b77e9dfa7ed69754a54c89d82ef746398be82f749df69c4d3abe75c4d1ff4888",
-                "sha256:caec6314ce8a81cf69bd89909f4b633b9f523834dc1a352021775d45e51d9401",
-                "sha256:d50065ba7fd11d3bd41bcad0825227cc9a95154bad83239357094c36708001f7",
-                "sha256:e0a36e1bc684dca10b1aa75a31df8bdfed656831489bc1e6a6ebed05dc1ec365"
-            ],
-            "markers": "python_version >= '3.9'",
-            "version": "==6.5.1"
-        },
-        "traitlets": {
-            "hashes": [
-                "sha256:9ed0579d3502c94b4b3732ac120375cda96f923114522847de4b3bb98b96b6b7",
-                "sha256:b74e89e397b1ed28cc831db7aea759ba6640cb3de13090ca145426688ff1ac4f"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==5.14.3"
-        },
-        "types-python-dateutil": {
-            "hashes": [
-                "sha256:13e80d6c9c47df23ad773d54b2826bd52dbbb41be87c3f339381c1700ad21ee5",
-                "sha256:2b2b3f57f9c6a61fba26a9c0ffb9ea5681c9b83e69cd897c6b5f668d9c0cab93"
-            ],
-            "markers": "python_version >= '3.9'",
-            "version": "==2.9.0.20250516"
-        },
-        "typing-extensions": {
-            "hashes": [
-                "sha256:8676b788e32f02ab42d9e7c61324048ae4c6d844a399eebace3d4979d75ceef4",
-                "sha256:a1514509136dd0b477638fc68d6a91497af5076466ad0fa6c338e44e359944af"
-            ],
-            "markers": "python_version >= '3.9'",
-            "version": "==4.14.0"
-        },
-        "uri-template": {
-            "hashes": [
-                "sha256:0e00f8eb65e18c7de20d595a14336e9f337ead580c70934141624b6d1ffdacc7",
-                "sha256:a44a133ea12d44a0c0f06d7d42a52d71282e77e2f937d8abd5655b8d56fc1363"
-            ],
-            "markers": "python_version >= '3.7'",
-            "version": "==1.3.0"
-        },
-        "urllib3": {
-            "hashes": [
-                "sha256:3fc47733c7e419d4bc3f6b3dc2b4f890bb743906a30d56ba4a5bfa4bbff92760",
-                "sha256:e6b01673c0fa6a13e374b50871808eb3bf7046c4b125b216f6bf1cc604cff0dc"
-            ],
-            "markers": "python_version >= '3.9'",
-            "version": "==2.5.0"
-        },
-        "wcwidth": {
-            "hashes": [
-                "sha256:3da69048e4540d84af32131829ff948f1e022c1c6bdb8d6102117aac784f6859",
-                "sha256:72ea0c06399eb286d978fdedb6923a9eb47e1c486ce63e9b4e64fc18303972b5"
-            ],
-            "version": "==0.2.13"
-        },
-        "webcolors": {
-            "hashes": [
-                "sha256:515291393b4cdf0eb19c155749a096f779f7d909f7cceea072791cb9095b92e9",
-                "sha256:ecb3d768f32202af770477b8b65f318fa4f566c22948673a977b00d589dd80f6"
-            ],
-            "markers": "python_version >= '3.9'",
-            "version": "==24.11.1"
-        },
-        "webencodings": {
-            "hashes": [
-                "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78",
-                "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"
-            ],
-            "version": "==0.5.1"
-        },
-        "websocket-client": {
-            "hashes": [
-                "sha256:17b44cc997f5c498e809b22cdf2d9c7a9e71c02c8cc2b6c56e7c2d1239bfa526",
-                "sha256:3239df9f44da632f96012472805d40a23281a991027ce11d2f45a6f24ac4c3da"
-            ],
-            "markers": "python_version >= '3.8'",
-            "version": "==1.8.0"
-        }
-    }
-}
diff --git a/README.md b/README.md
index 385b7ff..e28284b 100644
--- a/README.md
+++ b/README.md
@@ -1,80 +1,156 @@
 # pyetm
 
-This package provides a set of tools for interaction with the Energy Transition Model's API. Learn more
-about the Energy Transition Model [here](https://energytransitionmodel.com/). The
-package is designed to be a modular tool that advanced users can incorporate into their workflows. The
-complete documentation is available [via the ETM documentation page](https://docs.energytransitionmodel.com/main/pyetm/introduction).
+This package provides a set of tools for interaction with the Energy Transition Model's API.
+Learn more about the Energy Transition Model [here](https://energytransitionmodel.com/).
+
+The package is designed to be a modular tool that advanced users can incorporate into their scenario workflows.
+The complete documentation is available [via the ETM documentation page](https://docs.energytransitionmodel.com/main/pyetm/introduction).
+
+---
 
 ## Installation
 
-You can clone the pyetm from [our Github](https://github.com/quintel/pyetm). The package is also
-available via pip like any other python package - install it and use it in your project!
-```
+You can install **pyetm** directly from PyPI:
+```bash
 pip install pyetm
 ```
 
-## Just running the Jupyter Notebooks - or a beginner friendly guide to PyETM
-If you are not planning on developing the tool, but would like to open and run our Jupyter notebooks
-in VS Code, follow the beginner friendly guide at [Running notebooks](running_notebooks.md).
+Or clone from [our GitHub repository](https://github.com/quintel/pyetm) if you want the latest development version:
+```bash
+git clone https://github.com/quintel/pyetm.git
+cd pyetm
+```
 
-## Getting started
-Make sure you have [Python 3](https://www.python.org/downloads/) installed. Then, install all required
-libraries by opening a terminal/command-prompt window in the `pyetm` folder (or navigate to this folder
-in the terminal using `cd "path/to/scenario-tools-folder"`). All following examples of running the tool
-expect you to be in this folder.
+---
 
-#### Using pipenv
-It is recommended (but not required) that you use [`pipenv`](https://pipenv.pypa.io/en/latest/) for
-running these tools. When using `pipenv` it will create a virtual environment for you. A virtual
-environment helps with keeping the libraries you install here separate of your global libraries (in
-other words your `pyetm` will be in a stable and isolated environment and are thus less
-likely to break when updating things elsewhere on your computer).
+## Running Jupyter Notebooks (Beginner Friendly)
 
-You can install `pipenv` with `pip` or `pip3` if you don't have it installed yet.
-```
-pip3 install pipenv
-```
+If you only want to open and run our Jupyter notebooks in VS Code without developing the package,
+follow the beginner guide here: [Running notebooks](running_notebooks.md).
 
-Then you can create a new environment and install all the libraries in one go by running:
-```
-pipenv install
-```
+---
 
-If you plan to develop with the tool, install the dev dependencies too:
-```
-pipenv install --dev
+## Development Setup (Using Poetry)
+
+We recommend using [Poetry](https://python-poetry.org/) to manage dependencies and virtual environments.
+Poetry ensures all dependencies are installed in an isolated environment, keeping your system clean.
+
+### Python
+Make sure you have **Python 3.12** or later installed:
+- **Windows**: [Download from python.org](https://www.python.org/downloads/windows/)
+- **macOS**: Install via [Homebrew](https://brew.sh/)
+  ```bash
+  brew install python@3.12
+  ```
+- **Linux**: Use your package manager or install from source.
+
+Check your version:
+```bash
+python3 --version
 ```
 
-#### Configuring your settings
+---
 
-You can set your API token and the base url for your requests (depending which
-[environment](https://docs.energytransitionmodel.com/api/intro#environments) you want to interact with)
-either directly in the ENV or via a config.yml file.
+### Poetry
+Follow the [official instructions](https://python-poetry.org/docs/#installation):
 
-##### config.yml
-pyetm uses a `config.yml` file in the project root to store your personal settings:
+```bash
+curl -sSL https://install.python-poetry.org | python3 -
+```
 
-1. Duplicate the example file provided (`examples/config.example.yml`) and rename it to `config.yml`.
-2. Open `config.yml` and fill in your values:
-   - **etm_api_token**: Your personal ETM API token (overridden by the `$ETM_API_TOKEN` environment variable if set).
-   - **base_url**: The API base URL for the target environment (overridden by the `$BASE_URL` environment
-    variable if set) e.g., default pro, a stable engine at `https://2025-01.engine.energytransitionmodel.com/api/v3`,
-    or beta at `https://beta.engine.energytransitionmodel.com/api/v3`.
-   - **local_engine_url** and **local_model_url**: URLs for a local ETM instance, if running locally.
-   - **proxy_servers**: (Optional) HTTP/HTTPS proxy URLs, if required by your network.
-   - **csv_separator** and **decimal_separator**: Defaults are `,` and `.`; adjust if your CSV exports
-    use different separators.
+After installation, ensure Poetry is available:
+```bash
+poetry --version
+```
 
-Your `config.yml` should reside in the root `pyetm/` folder.
 
-##### ENV variables
-If you use pyetm as a package, you may want to set your ENV variables using a custom flow. In that
-case, the variables you need to set are:
+#### Install Dependencies
 
-    $ETM_API_TOKEN - Your api token (specific to the environment you are interacting with)
-    $BASE_URL - The base url of the environment you are interacting with.
-    $LOCAL_ENGINE_URL - The local url of the engine if running locally.
-    $LOCAL_MODEL_URL - The local url of the model if running locally.
+Navigate to the `pyetm` folder and install all dependencies:
+```bash
+poetry install
+```
 
+This will:
+- Create a virtual environment
+- Install runtime dependencies
+If you want development dependencies (testing, linting, etc.) then append the
+"--with dev" flag to the install command.
+
+
+#### How to use the environment:
+You can either:
+- Run commands inside Poetry's environment:
+  ```bash
+  poetry run pytest
+  poetry run pyetm
+  ```
+- Or activate the shell:
+  ```bash
+  eval $(poetry env activate)
+  ```
+  Then run you can commands normally (e.g.):
+  ```bash
+  pytest
+  ```
+
+
+## Configuring Your Settings
+
+You can configure your API token and base URL either with a **config.env** file or environment variables. You can simply set an `environment` and the base URL will be inferred for you.
+
+### Option 1: `config.env` (Recommended)
+1. Copy the example file (`example.config.env`) and rename it to `config.env`.
+2. Edit `config.env`:
+   ```bash
+   # Your ETM API token (required)
+   ETM_API_TOKEN=your.token.here
+
+   # Environment (default: pro)
+   ENVIRONMENT=pro
+
+   # Optional: Override base URL directly
+   # BASE_URL=https://engine.energytransitionmodel.com/api/v3
+
+   # Optional: Proxy settings
+   # PROXY_SERVERS_HTTP=http://user:pass@proxy.example.com:8080
+   # PROXY_SERVERS_HTTPS=http://user:pass@secureproxy.example.com:8080
+
+   # CSV settings (optional)
+   CSV_SEPARATOR=,
+   DECIMAL_SEPARATOR=.
+   ```
+
+Place `config.env` in the project root (`pyetm/` folder).
+
+**Environment Options:**
+- `pro` (default): Production environment
+- `beta`: Staging environment
+- `local`: Local development environment
+- `YYYY-MM`: Stable tagged environment (e.g., `2025-01`)
+
+### Option 2: Environment Variables
+If you prefer, set these environment variables directly:
+```bash
+ETM_API_TOKEN=<your token>
+ENVIRONMENT=<pro|beta|local|YYYY-MM>
+# or provide a direct override instead of ENVIRONMENT
+BASE_URL=<api url>
+```
 
-#TODO - check links
+---
+
+### Notes
+- **Windows**:
+  - Use `py` instead of `python3` if `python3` is not recognized.
+  - In PowerShell, set environment variables with:
+    ```powershell
+    $env:ETM_API_TOKEN="your-token"
+    ```
+- **macOS/Linux**:
+  - Use `python3` in commands.
+  - Set environment variables with:
+    ```bash
+    export ETM_API_TOKEN="your-token"
+    export ENVIRONMENT=beta
+    ```
diff --git a/examples/.gitkeep b/examples/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/examples/advanced_scenario_example.ipynb b/examples/advanced_scenario_example.ipynb
deleted file mode 100644
index e9baefc..0000000
--- a/examples/advanced_scenario_example.ipynb
+++ /dev/null
@@ -1,689 +0,0 @@
-{
- "cells": [
-  {
-   "cell_type": "markdown",
-   "id": "ddbe7ab2",
-   "metadata": {},
-   "source": [
-    "# Advanced Scenario Examples\n",
-    "\n",
-    "This notebook demonstrates how to use the `Scenario` object within the pyetm package to retrieve and \n",
-    "inspect data from an ETM scenario. These examples are slightly more advanced, including analytics and\n",
-    "data operations on the scenario object and its sub-models.\n",
-    "\n",
-    "Make sure you have a valid `ETM_API_TOKEN` set in your environment.\n",
-    "\n",
-    "## Structure\n",
-    "\n",
-    "This notebook is organized into two main sections:\n",
-    "1. **Setup & Initialization** - Run these cells first to set up your environment and load a scenario\n",
-    "2. **Exploration Examples** - After setup is complete, these cells can be run in any order to explore different aspects of scenario data"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "setup_header",
-   "metadata": {},
-   "source": [
-    "## Setup & Initialization\n",
-    "\n",
-    "**Run these cells first!** The following cells set up your environment and load a scenario. Complete this section before exploring the examples below."
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "5ba2f542",
-   "metadata": {},
-   "source": [
-    "##### Environment Setup"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "dfa34991",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "from example_helpers import setup_notebook\n",
-    "from pyetm.models import Scenario\n",
-    "\n",
-    "setup_notebook()"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "f579be0a",
-   "metadata": {},
-   "source": [
-    "##### Load a scenario\n",
-    "\n",
-    "This cell connects to a specific scenario using its session ID and loads all its data.\n",
-    "\n",
-    "The scenario object will contain inputs, outputs, custom curves, and other configuration data."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "6a514b5d",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Connect to your scenario by supplying the session ID\n",
-    "scenario = Scenario.load(2690288)\n",
-    "\n",
-    "print(f\"  Scenario {scenario.id} loaded successfully\")\n",
-    "print(f\"  Total inputs: {len(scenario.inputs)}\")\n",
-    "print(f\"  User-modified inputs: {len(scenario.user_values())}\")\n",
-    "print(\"\\n Setup complete! You can now run any of the exploration examples below in any order.\")"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "exploration_header",
-   "metadata": {},
-   "source": [
-    "## Exploration Examples\n",
-    "\n",
-    "**The cells below can be run in any order** after completing the setup section above. Each cell demonstrates different ways to explore and analyze scenario data using the pyetm package to connect to the Energy Transition Model's API."
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "basic_properties_section",
-   "metadata": {},
-   "source": [
-    "### Basic Scenario Properties"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "basic_properties",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Display basic scenario properties\n",
-    "# These properties define the fundamental characteristics of the scenario\n",
-    "\n",
-    "print(f\"Scenario ID:        {scenario.id}\")\n",
-    "print(f\"Area Code:          {scenario.area_code}\")\n",
-    "print(f\"End Year:           {scenario.end_year}\")\n",
-    "print(f\"Start Year:         {scenario.start_year}\")\n",
-    "print(f\"Created:            {scenario.created_at}\")\n",
-    "print(f\"Updated:            {scenario.updated_at}\")\n",
-    "print(f\"Private:            {scenario.private}\")\n",
-    "print(f\"Template:           {scenario.template}\")\n",
-    "print(f\"Source:             {scenario.source}\")\n",
-    "print(f\"URL:                {scenario.url}\")\n",
-    "print(f\"Keep Compatible:    {scenario.keep_compatible}\")\n",
-    "print(f\"Scaling:            {scenario.scaling}\")\n",
-    "print(f\"Version:            {scenario.version}\")\n",
-    "\n",
-    "# Show metadata if available\n",
-    "if scenario.metadata:\n",
-    "    print(\"\\nMetadata:\")\n",
-    "    print(scenario.metadata)\n",
-    "else:\n",
-    "    print(\"\\nNo additional metadata available\")"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "7418c5e1",
-   "metadata": {},
-   "source": [
-    "### Complete Scenario Metadata Export\n",
-    "\n",
-    "The `model_dump()` method provides a complete export of all scenario metadata in a structured format. This includes all properties and their current values."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "972bd7c5",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Export complete scenario metadata\n",
-    "# model_dump() returns a comprehensive dictionary containing all scenario metadata\n",
-    "\n",
-    "full_data = scenario.model_dump()\n",
-    "print(f\"Complete scenario metadata ({len(full_data)} fields):\")\n",
-    "print(\"\\n\" + \"-\"*70)\n",
-    "print(full_data)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "user_values_section",
-   "metadata": {},
-   "source": [
-    "### Exploring User-Modified Values\n",
-    "\n",
-    "The `user_values()` method returns a dictionary of all inputs that have been modified from their default values."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "user_values_example",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Display all user-modified input values\n",
-    "# This shows only the inputs that have been changed from their default values\n",
-    "# The format is {input_key: user_value}\n",
-    "\n",
-    "user_values = scenario.user_values()\n",
-    "print(f\"Found {len(user_values)} user-modified inputs:\")\n",
-    "print(\"\\n\" + \"-\"*70)\n",
-    "print(user_values)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "input_analysis_section",
-   "metadata": {},
-   "source": [
-    "### Analyzing Input Properties\n",
-    "\n",
-    "Each input in a scenario has various properties that define its behavior:\n",
-    "- `key`: Unique identifier for the input\n",
-    "- `unit`: The unit of measurement (e.g., 'MW', '%', 'PJ')\n",
-    "- `disabled`: Whether the input is currently disabled\n",
-    "- `user`: The value set by the user (if any)\n",
-    "- `default`: The default value for this input\n",
-    "\n",
-    "Additional properties for specific input types:\n",
-    "- **Float inputs**: `min` and `max` values defining valid ranges\n",
-    "- **Enumerable inputs**: `permitted_values` showing available options"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "input_collection_overview",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Overview of the input collection\n",
-    "# The inputs property provides access to all scenario inputs through an InputCollection\n",
-    "\n",
-    "print(f\"Input Collection Overview:\")\n",
-    "print(f\"  Total inputs: {len(scenario.inputs)}\")\n",
-    "print(f\"  Input collection type: {type(scenario.inputs)}\")\n",
-    "print(f\"  User-modified inputs: {len([inp for inp in scenario.inputs if inp.user is not None])}\")\n",
-    "print(f\"  Disabled inputs: {len([inp for inp in scenario.inputs if inp.disabled])}\")"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "6c4825ba",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Analyze units used across all inputs\n",
-    "# This gives you an overview of what types of measurements are used in the scenario\n",
-    "\n",
-    "# Count inputs by unit type\n",
-    "unit_counts = {}\n",
-    "for input in scenario.inputs:\n",
-    "    unit = input.unit or 'No unit'\n",
-    "    unit_counts[unit] = unit_counts.get(unit, 0) + 1\n",
-    "\n",
-    "total_inputs = len(scenario.inputs)\n",
-    "print(f\"Found {len(unit_counts)} different units used across {total_inputs:,} inputs:\")\n",
-    "print(\"\\n\" + \"-\"*70)\n",
-    "\n",
-    "# Sort by count (most common first) and show percentages\n",
-    "sorted_units = sorted(unit_counts.items(), key=lambda x: x[1], reverse=True)\n",
-    "for unit, count in sorted_units:\n",
-    "    percentage = (count / total_inputs) * 100\n",
-    "    print(f\"{unit:15}: {count:4,} inputs ({percentage:5.1f}%)\")"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "38fd7d1c",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Identify disabled inputs\n",
-    "# Disabled inputs are those that do not impact the scenario because of a coupling,\n",
-    "# or if you are not the owner/editor of the scenario\n",
-    "\n",
-    "disabled_inputs = [input.key for input in scenario.inputs if input.disabled]\n",
-    "print(f\"Found {len(disabled_inputs)} disabled inputs:\")\n",
-    "print(\"\\n\" + \"-\"*70)\n",
-    "print(disabled_inputs)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "f44d29ef",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Display default values for all inputs\n",
-    "# Default values represent the baseline scenario before user modifications\n",
-    "\n",
-    "default_values = { input.key: input.default for input in scenario.inputs }\n",
-    "print(f\"Default values for {len(default_values)} inputs:\")\n",
-    "print(\"\\n\" + \"-\"*70)\n",
-    "print(default_values)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "d980ed9b",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Explore Float input constraints\n",
-    "# Float inputs have minimum and maximum values that define valid ranges\n",
-    "# This information helps to understand input range-limitations and validation rules\n",
-    "\n",
-    "from pyetm.models.inputs import FloatInput\n",
-    "\n",
-    "float_inputs = [input for input in scenario.inputs if isinstance(input, FloatInput)]\n",
-    "print(f\"Found {len(float_inputs)} float inputs:\")\n",
-    "print(\"\\n\" + \"-\"*70)\n",
-    "\n",
-    "float_details = [input.model_dump() for input in float_inputs]\n",
-    "print(float_details)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "enumerable_inputs",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Explore Enumerable input options\n",
-    "# Some inputs have a limited set of permitted values (like dropdown selections)\n",
-    "# This is useful for understanding available choices for categorical inputs\n",
-    "\n",
-    "from pyetm.models.inputs import EnumInput\n",
-    "\n",
-    "enum_inputs = [input for input in scenario.inputs if isinstance(input, EnumInput)]\n",
-    "print(f\"Found {len(enum_inputs)} enumerable inputs:\")\n",
-    "print(\"\\n\" + \"-\"*70)\n",
-    "\n",
-    "enum_details = [input.model_dump() for input in enum_inputs]\n",
-    "print(enum_details)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "curves_section",
-   "metadata": {},
-   "source": [
-    "### Working with Custom Curves\n",
-    "\n",
-    "Custom curves represent time-series data that can be attached to specific inputs. These are typically used for:\n",
-    "- Load profiles (electricity demand over time)\n",
-    "- Production profiles (renewable energy output patterns)\n",
-    "- Availability curves (when technologies are available)\n",
-    "- Price curves (energy prices over time)\n",
-    "\n",
-    "The curves contain hourly data points for an entire year (8760 hours)."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "custom_curves_overview",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Overview of custom curves collection\n",
-    "# Custom curves are hourly time-series data used to define dynamic behaviour across a year\n",
-    "\n",
-    "print(f\"Custom Curves Collection Overview:\")\n",
-    "print(f\"  Collection type: {type(scenario.custom_curves)}\")\n",
-    "\n",
-    "# Show attached custom curves\n",
-    "attached_curves = list(scenario.custom_curves.attached_keys())\n",
-    "print(f\"\\nAttached custom curves ({len(attached_curves)}):\")\n",
-    "for i, curve_key in enumerate(attached_curves[:10]):\n",
-    "    print(f\"  {i+1}. {curve_key}\")\n",
-    "if len(attached_curves) > 10:\n",
-    "    print(f\"  ... and {len(attached_curves) - 10} more\")"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "f18f67df",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Example: Display data from a specific curve\n",
-    "# This shows how to access the actual time-series data from a custom curve\n",
-    "# The custom_curve_series() method returns the hourly values for the specified curve\n",
-    "# The curve is stored as a pandas Series\n",
-    "\n",
-    "curve_key = 'interconnector_1_import_availability'\n",
-    "if curve_key in scenario.custom_curves.attached_keys():\n",
-    "    curve_data = scenario.custom_curve_series(curve_key)\n",
-    "    print(f\"Curve data for '{curve_key}':\")\n",
-    "    print(f\"  Data points: {len(curve_data)}\")\n",
-    "    print(f\"  First 10 values: {curve_data.head(10).tolist()}\")\n",
-    "    print(f\"  Data type: {type(curve_data)}\")\n",
-    "    print(f\"  Min value: {curve_data.min()}\")\n",
-    "    print(f\"  Max value: {curve_data.max()}\")\n",
-    "    print(f\"  Mean value: {curve_data.mean():.4f}\")\n",
-    "else:\n",
-    "    print(f\"Curve '{curve_key}' not found in this scenario.\")\n",
-    "    print(\"Available curves:\", list(scenario.custom_curves.attached_keys()))"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "all_custom_curves_analysis",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Analyze all custom curves in the scenario\n",
-    "# This iterates through max 5 attached curves and provides summary statistics\n",
-    "\n",
-    "print(\"Analysis of all custom curves in the scenario:\")\n",
-    "print(\"\\n\" + \"-\"*70)\n",
-    "\n",
-    "curve_count = 0\n",
-    "for curve_series in scenario.custom_curves_series():\n",
-    "    curve_count += 1\n",
-    "    print(f\"\\nCurve {curve_count}:\")\n",
-    "    print(f\"  Length: {len(curve_series)}\")\n",
-    "    print(f\"  Min: {curve_series.min():.4f}\")\n",
-    "    print(f\"  Max: {curve_series.max():.4f}\")\n",
-    "    print(f\"  Mean: {curve_series.mean():.4f}\")\n",
-    "    print(f\"  Standard deviation: {curve_series.std():.4f}\")\n",
-    "\n",
-    "    # Stop after first 5 to avoid overwhelming output\n",
-    "    if curve_count >= 5:\n",
-    "        total_curves = len(list(scenario.custom_curves.attached_keys()))\n",
-    "        if total_curves > 5:\n",
-    "            print(f\"\\n... {total_curves - 5} more curves\")\n",
-    "        break\n",
-    "\n",
-    "if curve_count == 0:\n",
-    "    print(\"No custom curves found in this scenario.\")"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "output_curves_section",
-   "metadata": {},
-   "source": [
-    "### Working with Output Curves\n",
-    "\n",
-    "Output curves represent time-series data for energy carriers (electricity, heat, gas, etc.) within the energy system. \n",
-    "\n",
-    "Each output curve represents an export from your scenario, so they are actually sets of curves, stored as a dataframe where each column is a curve and the index is a time series for each hour."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "output_curves_overview",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Overview of output curves collection\n",
-    "# Output curves represent energy flows and storage for different energy carriers\n",
-    "\n",
-    "print(f\"Output Curves Collection Overview:\")\n",
-    "print(f\"  Collection type: {type(scenario.output_curves)}\")\n",
-    "\n",
-    "# Show first 10 available output curve types\n",
-    "attached_output_curves = list(scenario.output_curves.attached_keys())\n",
-    "print(f\"\\nAttached output curves ({len(attached_output_curves)}):\")\n",
-    "for i, curve_key in enumerate(attached_output_curves[:10]):\n",
-    "    print(f\"  {i+1}. {curve_key}\")\n",
-    "if len(attached_output_curves) > 10:\n",
-    "    print(f\"  ... {len(attached_output_curves) - 10} more\")"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "all_output_curves_analysis",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Analyze all output curves in the scenario\n",
-    "# This provides a comprehensive overview of output curve behaviour and format\n",
-    "\n",
-    "print(\"Analysis of all output curves in the scenario:\")\n",
-    "print(\"\\n\" + \"-\"*70)\n",
-    "\n",
-    "curve_count = 0\n",
-    "attached_curve_keys = list(scenario.output_curves.attached_keys())\n",
-    "for curve_data in scenario.all_output_curves():\n",
-    "    curve_name = attached_curve_keys[curve_count] if curve_count < len(attached_curve_keys) else f\"Unknown Curve {curve_count + 1}\"\n",
-    "    curve_count += 1\n",
-    "    print(f\"\\n{curve_name}:\")\n",
-    "\n",
-    "    if curve_data is not None and not curve_data.empty:\n",
-    "        print(f\"  Shape (rows × columns): {curve_data.shape}\")\n",
-    "        print(f\"  Columns: {list(curve_data.columns)}\")\n",
-    "\n",
-    "        # For DataFrames, show summary stats differently\n",
-    "        numeric_cols = curve_data.select_dtypes(include=[float, int]).columns\n",
-    "        if len(numeric_cols) > 0:\n",
-    "            print(f\"  Summary for numeric columns:\")\n",
-    "            for col in numeric_cols[:3]:  # Show first 3 columns to avoid clutter\n",
-    "                col_data = curve_data[col]\n",
-    "                print(f\"    {col}:\")\n",
-    "                print(f\"      Min: {float(col_data.min()):.4f}\")\n",
-    "                print(f\"      Max: {float(col_data.max()):.4f}\")\n",
-    "                print(f\"      Mean: {float(col_data.mean()):.4f}\")\n",
-    "                print(f\"      Std: {float(col_data.std()):.4f}\")\n",
-    "            if len(numeric_cols) > 3:\n",
-    "                print(f\"    ... and {len(numeric_cols) - 3} more columns\")\n",
-    "        else:\n",
-    "            print(f\"  No numeric data available\")\n",
-    "    else:\n",
-    "        print(f\"  No data available\")\n",
-    "\n",
-    "    # Stop after first 5 to avoid overwhelming output\n",
-    "    if curve_count >= 5:\n",
-    "        total_curves = len(attached_curve_keys)\n",
-    "        if total_curves > 5:\n",
-    "            print(f\"\\n... and {total_curves - 5} more output curve exports\")\n",
-    "        break\n",
-    "\n",
-    "if curve_count == 0:\n",
-    "    print(\"No output curves found in this scenario.\")"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "sortables_section",
-   "metadata": {},
-   "source": [
-    "### Exploring Sortables\n",
-    "\n",
-    "Sortables represent ordered lists of technologies or components within the energy system. They define priority orders for:\n",
-    "- Merit order\n",
-    "- Forecast order\n",
-    "- Heat network order\n",
-    "- Hydrogen supply/demand\n",
-    "\n",
-    "The order of items in sortables affects how the energy system model calculates results."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "sortables_overview",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Overview of sortables collection\n",
-    "# Sortables define ordering and priority for various energy system components\n",
-    "\n",
-    "print(f\"Sortables Overview:\")\n",
-    "print(f\"  Data type: {type(scenario.sortables)}\")\n",
-    "\n",
-    "# Show all sortables\n",
-    "sortable_keys = list(scenario.sortables.as_dict().keys())\n",
-    "print(f\"\\nSortables ({len(sortable_keys)}):\")\n",
-    "for i, sortable_key in enumerate(sortable_keys):\n",
-    "    print(f\"  {i+1}. {sortable_key}\")"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "4c90688f",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Display sortable configurations\n",
-    "# Sortables define the order/priority of different technologies in the energy system\n",
-    "# For example, merit order determines which power plants are dispatched first\n",
-    "# The order directly affects energy system calculations and results\n",
-    "\n",
-    "sortables_data = scenario.sortables.as_dict()\n",
-    "print(f\"Found {len(sortables_data)} sortable orders:\")\n",
-    "print(\"\\n\" + \"-\"*70)\n",
-    "print(sortables_data)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "sortables_detailed_analysis",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Analysis of each sortable category\n",
-    "# This examines the structure and content of each sortable configuration\n",
-    "\n",
-    "sortables_data = scenario.sortables.as_dict()\n",
-    "print(\"Detailed analysis of sortables:\")\n",
-    "print(\"\\n\" + \"-\"*70)\n",
-    "\n",
-    "for category, sortables in sortables_data.items():\n",
-    "    print(f\"\\n{category.upper()}:\")\n",
-    "\n",
-    "    if sortables:\n",
-    "        print(f\"  Number of items: {len(sortables)}\")\n",
-    "        print(f\"  Sortables:\")\n",
-    "        for i, order in enumerate(sortables):\n",
-    "            print(f\"    {i+1}. {order}\")"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "f1f53bd1",
-   "metadata": {},
-   "source": [
-    "### Working with Gqueries\n",
-    "\n",
-    "Gqueries allow you to extract specific calculated values from the ETM.\n",
-    "\n",
-    "You can request multiple queries and execute them together for efficiency."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "6942e344",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "scenario.add_queries([\n",
-    "    \"dashboard_emissions\",\n",
-    "    \"dashboard_total_costs\",\n",
-    "    \"dashboard_renewability\"\n",
-    "])\n",
-    "\n",
-    "print(f\"Added {len(scenario._queries.query_keys())} queries:\")\n",
-    "for i, query in enumerate(scenario._queries.query_keys(), 1):\n",
-    "    print(f\"  {i}. {query}\")\n",
-    "\n",
-    "print(f\"\\nQueries ready: {scenario._queries.is_ready()}\")\n",
-    "\n",
-    "print(\"Gqueries Overview:\")\n",
-    "print(f\"  Queries requested: {scenario.queries_requested()}\")\n",
-    "\n",
-    "if scenario.queries_requested():\n",
-    "    print(f\"  Query keys: {scenario._queries.query_keys()}\")\n",
-    "    print(f\"  Queries ready: {scenario._queries.is_ready()}\")\n",
-    "\n",
-    "    # Get results if available\n",
-    "    results = scenario.results()\n",
-    "    if results is not None and not results.empty:\n",
-    "        print(f\"\\nQuery Results:\")\n",
-    "        print(f\"  Results shape: {results.shape}\")\n",
-    "        print(f\"  Columns: {list(results.columns)}\")\n",
-    "        print(f\"   \")\n",
-    "        print(results.head())\n",
-    "    else:\n",
-    "        print(\"\\nNo query results available\")"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "warnings_errors_section",
-   "metadata": {},
-   "source": [
-    "### Handling Warnings and Errors\n",
-    "\n",
-    "The scenario object can accumulate warnings during data fetching and processing. These warnings provide important information about non-breaking issues with data quality, your API configuration, or service-level issues."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "warnings_analysis",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Check for warnings and errors in the scenario\n",
-    "# Warnings can accumulate from API calls, data validation, or processing issues\n",
-    "\n",
-    "# Check if the scenario object has any warnings\n",
-    "if hasattr(scenario, 'warnings') and scenario.warnings:\n",
-    "    print(f\"  Total warnings: {len(scenario.warnings)}\")\n",
-    "    print(\"\\nWarnings:\")\n",
-    "    for i, warning in enumerate(scenario.warnings, 1):\n",
-    "        print(f\"  {i}. {warning}\")\n",
-    "else:\n",
-    "    print(f\"  No warnings found\")"
-   ]
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "pyetm-qKH2ozgc",
-   "language": "python",
-   "name": "python3"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.12.9"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 5
-}
diff --git a/examples/create_and_update_a_scenario.ipynb b/examples/create_and_update_a_scenario.ipynb
deleted file mode 100644
index 380ce50..0000000
--- a/examples/create_and_update_a_scenario.ipynb
+++ /dev/null
@@ -1,239 +0,0 @@
-{
- "cells": [
-  {
-   "cell_type": "markdown",
-   "id": "d9bff682",
-   "metadata": {},
-   "source": [
-    "Creating / Updating a scenario flow:\n",
-    "\n",
-    "#TODO: Expand descriptions etc, this is just to show the funnctionality"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "21347fc1",
-   "metadata": {},
-   "source": [
-    "# SETUP"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 1,
-   "id": "3ada4b30",
-   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Environment setup complete\n",
-      "  Using ETM API at     https://beta.engine.energytransitionmodel.com/api/v3\n",
-      "  Token loaded?        True\n",
-      "API connection ready\n"
-     ]
-    }
-   ],
-   "source": [
-    "from example_helpers import setup_notebook\n",
-    "from pyetm.models import Scenario\n",
-    "\n",
-    "setup_notebook()"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "84571cab",
-   "metadata": {},
-   "source": [
-    "Create a new scenario:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 2,
-   "id": "4770e6a9",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# scenario = Scenario.new(\"nl\", 2050, True)\n",
-    "\n",
-    "scenario = Scenario.new(\n",
-    "    area_code=\"nl2019\",\n",
-    "    end_year=2050,\n",
-    "    private=False,\n",
-    "    keep_compatible=False,\n",
-    "    source=\"pyetm\")"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "07461117",
-   "metadata": {},
-   "source": [
-    "Update inputs for a scenario:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 6,
-   "id": "5a1549ac",
-   "metadata": {},
-   "outputs": [
-    {
-     "ename": "ScenarioError",
-     "evalue": "Could not update user values: {'external_coupling_industry_chemical_other_burner_crude_oil_share': ['user: Input should be a valid number, unable to parse string as a number']}",
-     "output_type": "error",
-     "traceback": [
-      "\u001b[31mScenarioError\u001b[39m\u001b[31m:\u001b[39m Could not update user values: {'external_coupling_industry_chemical_other_burner_crude_oil_share': ['user: Input should be a valid number, unable to parse string as a number']}\n"
-     ]
-    }
-   ],
-   "source": [
-    "scenario.update_user_values({\n",
-    "    \"co_firing_biocoal_share\": 80.0,\n",
-    "    \"external_coupling_industry_chemical_other_burner_crude_oil_share\": \"hello\"\n",
-    "})\n"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "af9d11bd",
-   "metadata": {},
-   "source": [
-    "View the changes (so you know it happened):"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 4,
-   "id": "7fc4dc21",
-   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Area: nl2019\n",
-      "End year: 2050\n",
-      "Start year: 2019\n",
-      "Version: beta\n",
-      "Modified inputs: 1\n",
-      "First input: co_firing_biocoal_share = 80.0\n"
-     ]
-    },
-    {
-     "ename": "IndexError",
-     "evalue": "list index out of range",
-     "output_type": "error",
-     "traceback": [
-      "\u001b[31mIndexError\u001b[39m\u001b[31m:\u001b[39m list index out of range\n"
-     ]
-    }
-   ],
-   "source": [
-    "print(f\"Area: {scenario.area_code}\")\n",
-    "print(f\"End year: {scenario.end_year}\")\n",
-    "print(f\"Start year: {scenario.start_year}\")\n",
-    "print(f\"Version: {scenario.version}\")\n",
-    "user_vals = scenario.user_values()\n",
-    "print(f\"Modified inputs: {len(user_vals)}\")\n",
-    "print(f\"First input: {list(user_vals.keys())[0]} = {list(user_vals.values())[0]}\")\n",
-    "print(f\"Second input: {list(user_vals.keys())[1]} = {list(user_vals.values())[1]}\")"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "4dba3824",
-   "metadata": {},
-   "source": [
-    "Update the metadata for the scenario:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 7,
-   "id": "c6a65f6a",
-   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "False\n"
-     ]
-    }
-   ],
-   "source": [
-    "scenario.update_metadata(\n",
-    "    private= True,\n",
-    "    keep_compatible= True,\n",
-    "    source= \"test_change_source\",\n",
-    "    end_year= 2040\n",
-    ")\n",
-    "\n",
-    "# You can also update the metadata attribute\n",
-    "scenario.update_metadata(\n",
-    "    metadata= {\n",
-    "        \"title\": \"Test scenario!\",\n",
-    "        \"description\": \"Updated scenario description\",\n",
-    "        \"author\": \"Ernie\"\n",
-    "    }\n",
-    "})\n",
-    "\n",
-    "print(scenario.private)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "3cd56ce2",
-   "metadata": {},
-   "source": [
-    "You can also remove inputs, which means the default value is then used."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 5,
-   "id": "98ab2f5c",
-   "metadata": {},
-   "outputs": [
-    {
-     "ename": "AttributeError",
-     "evalue": "'Scenario' object has no attribute 'remove_inputs'",
-     "output_type": "error",
-     "traceback": [
-      "\u001b[31mAttributeError\u001b[39m\u001b[31m:\u001b[39m 'Scenario' object has no attribute 'remove_inputs'\n"
-     ]
-    }
-   ],
-   "source": [
-    "scenario.remove_user_values([\"co_firing_biocoal_share\"])\n",
-    "user_vals = scenario.user_values()\n",
-    "print(f\"Modified inputs: {len(user_vals)}\")"
-   ]
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "pyetm-FWBOHxp3",
-   "language": "python",
-   "name": "python3"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.12.11"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 5
-}
diff --git a/examples/create_or_query_scenarios.ipynb b/examples/create_or_query_scenarios.ipynb
new file mode 100644
index 0000000..dfaaa58
--- /dev/null
+++ b/examples/create_or_query_scenarios.ipynb
@@ -0,0 +1,207 @@
+{
+ "cells": [
+  {
+   "cell_type": "markdown",
+   "id": "268e5f69",
+   "metadata": {},
+   "source": [
+    "This workbook demonstrates the complete flow from excel created / loaded scenarios to the API, including demonstrating how you can work with scenarios in pandas along the way.\n",
+    "\n",
+    "Before you begin you will need to place a config.yml in your root directory. An example.config.yml is available in /examples and will guide you through the setup. The README.md has additional details on environment management if you're setting up for the first time."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "7ad85ac7",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# Check the environment is properly configured.\n",
+    "from example_helpers import setup_notebook\n",
+    "setup_notebook(debug=True)"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "2884d014",
+   "metadata": {},
+   "source": [
+    "For the purposes of this demonstration workbook, we will use the pre-filled template 'example_input_excel.xlsx' which demonstrates a few of the possibilities afforded by the pyetm package. If it's your first time using the tool, have a look at the excel to get a sense of the structure. The input excel is available in the /inputs folder. In pyetm, by default files will be read from the /inputs folder and written to the /outputs folder.\n",
+    "\n",
+    "In the example, there are two scenarios, with short names scen_a and scen_b. You can use short names in the slider_settings sheet to specify which inputs belong to which scenario. Because scen_b has no scenario_id, it is being created. It will be created with all the metadata included in the sheet, plus any of the inputs under the column with its short_name and any sortables and curves specified in the sheets named beside the sortables and custom_curves rows. The same goes for scen_a, but because it has a scenario_id (1357395) that scenario will be loaded, and then updated with anything as set in the excel.\n",
+    "\n",
+    "The example scenario ids are scenarios on pro. It's recommended to change the scenario_ids in the example and experiment with scenarios you own."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "077ae081",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "from pyetm.models.scenarios import Scenarios\n",
+    "from pyetm.models.scenario import Scenario\n",
+    "\n",
+    "\n",
+    "scenarios = Scenarios.from_excel(\"example_input_excel.xlsx\")\n",
+    "\n",
+    "# Here we're also loading a scenario directly from the API and adding it to the scenarios loaded/created via the excel\n",
+    "scenario_a = Scenario.load(2690439)\n",
+    "scenarios.add(scenario_a)"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "fb319a38",
+   "metadata": {},
+   "source": [
+    "Now we have the 'scenarios' in pyetm which represent actual real scenarios in the ETM, one created and one loaded.\n",
+    "\n",
+    "The following blocks show how you can explore these scenarios' attributes - run some if you want to explore the data structures."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "17bff6db",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# Metadata\n",
+    "for scenario in scenarios:\n",
+    "    print(f\"Title: {scenario.title}\")\n",
+    "    print(f\"ID: {scenario.id}\")\n",
+    "    print(f\"Area: {scenario.area_code}\")\n",
+    "    print(f\"End year: {scenario.end_year}\")\n",
+    "    print(f\"Version: {scenario.version}\")\n",
+    "    print(f\"Source: {scenario.source}\")\n",
+    "    print(f\"Metadata: {scenario.metadata}\")\n",
+    "    print(\"\")"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "1f9a4600",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# Inputs\n",
+    "for scenario in scenarios:\n",
+    "    inputs = scenario.inputs.to_dataframe(columns=[\"user\", \"default\", \"min\", \"max\"]).head(15)\n",
+    "    print(inputs)\n",
+    "    print(\"\")"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "b493a801",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# The example includes a coupled input in the parameters for scen_b\n",
+    "for scenario in scenarios:\n",
+    "    couplings = scenario.couplings\n",
+    "    print(couplings)\n",
+    "    print(\"\")"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "6e9bf837",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# Sortables\n",
+    "for scenario in scenarios:\n",
+    "    sortables = scenario.sortables.to_dataframe()\n",
+    "    print(sortables)\n",
+    "    print(\"\")"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "9ef38d18",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# Custom Curves\n",
+    "for scenario in scenarios:\n",
+    "    curves = scenario.custom_curves.to_dataframe().head(20)\n",
+    "    print(curves)\n",
+    "    print(\"\")"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "aa4e8ee8",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# Queries\n",
+    "for scenario in scenarios:\n",
+    "    print(scenario.results())\n",
+    "    print(\"\")"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "9a63a0a6",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# Warnings - did anything go wrong?\n",
+    "for scenario in scenarios:\n",
+    "    print(scenario.show_all_warnings())\n",
+    "    print()"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "id": "86643b22",
+   "metadata": {},
+   "source": [
+    "We can directly modify any of the attributes using Pandas, or we can re-export the scenarios to excel and make modifications that way. When exporting to excel, more data will be available than was in the input, because the ETM results will be included by default. The 'output curves' or 'exports' will be stored in a separate excel workbook, separated by carrier type. By default everything is included, but you can also specify what you want."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "d24ad5e1",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# Export the scenarios to excel\n",
+    "scenarios.to_excel(\"scenarios.xlsx\") # This will create scenarios.xlsx and scenarios_exports.xlsx (if you've set exports to true in the output config)."
+   ]
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "pyetm-Rh4Np-o3-py3.12",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.12.9"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 5
+}
diff --git a/examples/example.config.env b/examples/example.config.env
new file mode 100644
index 0000000..951bebd
--- /dev/null
+++ b/examples/example.config.env
@@ -0,0 +1,36 @@
+# ETM API Configuration
+# Copy this file to .env and update with your personal settings
+# Never commit your .env file to version control!
+
+# Your personal ETM API Token (REQUIRED)
+# Get your token from: https://docs.energytransitionmodel.com/api/authentication
+# Format: etm_<JWT> or etm_beta_<JWT>
+ETM_API_TOKEN=your.token.here
+
+# ETM Environment (default: pro)
+# Options: pro, beta, local, or stable tags like 2025-01
+ENVIRONMENT=pro
+
+# Override API base URL (optional - will be inferred from ENVIRONMENT if not set)
+# Examples:
+# BASE_URL=https://engine.energytransitionmodel.com/api/v3
+# BASE_URL=https://beta.engine.energytransitionmodel.com/api/v3
+# BASE_URL=http://localhost:3000/api/v3
+# BASE_URL=https://2025-01.engine.energytransitionmodel.com/api/v3
+# BASE_URL=
+
+# Logging level (default: INFO)
+# Options: DEBUG, INFO, WARNING, ERROR, CRITICAL
+LOG_LEVEL=INFO
+
+# Proxy Settings (optional)
+# Never commit authenticated proxy URLs to version control!
+# PROXY_SERVERS_HTTP=http://user:pass@proxy.example.com:8080
+# PROXY_SERVERS_HTTPS=http://user:pass@secureproxy.example.com:8080
+
+# CSV File Settings
+# CSV separator character (default: ,)
+CSV_SEPARATOR=,
+
+# Decimal separator character (default: .)
+DECIMAL_SEPARATOR=.
diff --git a/examples/example.config.yml b/examples/example.config.yml
deleted file mode 100644
index 75d6259..0000000
--- a/examples/example.config.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-# To update this file with your personal settings, please duplicate this file
-# and name it 'config.yml'. This way your personal tokens will be safe.
-# Store the config.yml file in the root of the directory (pyetm/config.yml).
-
-# Paste your personal ETM API Token in this field. Never push this to GitHub!
-# will be overridden by $ETM_API_TOKEN if you set that in env.
-# The same token will work for beta and pro environments, but if you are interacting with beta or local,
-# you will need the correct token for that environment.
-# For more information, see: https://docs.energytransitionmodel.com/api/authentication#tokens-are-environment-specific
-#
-etm_api_token: your.token.here
-
-# Override the API base URL - here you can set which environment of the ETM you want to interact with.
-# Options include the default (pro), https://2025-01.engine.energytransitionmodel.com/api/v3 (a stable version) or
-# https://beta.engine.energytransitionmodel.com/api/v3	(the staging environment), or http://localhost:3000/api/v3
-# (your local environment).
-# For more information, see: https://docs.energytransitionmodel.com/api/intro#environments
-#
-BASE_URL: https://engine.energytransitionmodel.com/api/v3
-
-#TODO: Setup so the below is actually used
-# URLs of your proxy server addresses (replace the examples below by your own settings)
-# Never push authenticated servers (including user name and password) to Github!
-proxy_servers:
-  # http: http://user:pass@proxy.sample.com:8080
-  # https: http://user:pass@secureproxy.sample.com:8080
-
-# The separator your CSV files are using. The default is ',', but many European computers
-# export CSV with a ';' as separator from Excel instead.
-csv_separator: ','
-
-# The decimal separator your CSV files are using. The default is '.', but depending on the
-# national conventions, comma could be used as a decimal seperator instead.
-decimal_seperator: '.'
diff --git a/examples/example_helpers.py b/examples/example_helpers.py
index af9c768..21cfdfa 100644
--- a/examples/example_helpers.py
+++ b/examples/example_helpers.py
@@ -1,39 +1,138 @@
 # Setting up everything for you!
 
 
-def setup_notebook():
+def setup_notebook(debug=False):
+    """
+    Set up the notebook environment for ETM API usage.
+
+    Args:
+        debug (bool): If True, shows full tracebacks. If False, hides them for cleaner output.
+    """
     import sys
+    import builtins
     from pyetm.config.settings import get_settings
     from IPython import get_ipython
+    from IPython.display import display, HTML
 
-    # Hide the trackback for now
-
+    # Handle traceback display based on debug mode
     ipython = get_ipython()
 
-    def hide_traceback(
-        exc_tuple=None,
-        filename=None,
-        tb_offset=None,
-        exception_only=False,
-        running_compiled_code=False,
-    ):
-        etype, value, tb = sys.exc_info()
-        return ipython._showtraceback(
-            etype, value, ipython.InteractiveTB.get_exception_only(etype, value)
-        )
+    if not debug:
+        # Hide the traceback for a cleaner demo experience
+        def hide_traceback(
+            exc_tuple=None,
+            filename=None,
+            tb_offset=None,
+            exception_only=False,
+            running_compiled_code=False,
+        ):
+            etype, value, tb = sys.exc_info()
+            return ipython._showtraceback(
+                etype, value, ipython.InteractiveTB.get_exception_only(etype, value)
+            )
+
+        ipython.showtraceback = hide_traceback
+    else:
+        if hasattr(ipython, "_original_showtraceback"):
+            ipython.showtraceback = ipython._original_showtraceback
+        else:
+            ipython._original_showtraceback = ipython.showtraceback
+
+    try:
+        import pandas as pd
+
+        pd.set_option("display.max_rows", 60)
+        pd.set_option("display.max_columns", None)
+        pd.set_option("display.width", None)
+        pd.set_option("display.max_colwidth", None)
+        pd.options.display.float_format = "{:,.3f}".format
+
+        try:
+            pd.options.styler.render.max_elements = 200000
+        except Exception:
+            pass
+
+        def show(obj, *, index=False):
+            """Pretty-display DataFrames/Series (HTML) or fall back to normal display."""
 
-    ipython.showtraceback = hide_traceback
+            if isinstance(obj, (pd.DataFrame, pd.Series)):
+                try:
+                    if getattr(obj, "empty", False):
+                        from html import escape
+
+                        if isinstance(obj, pd.DataFrame):
+                            cols = [str(c) for c in obj.columns]
+                            preview = ", ".join(cols[:8]) + (
+                                "…" if len(cols) > 8 else ""
+                            )
+                            meta = f" — 0 rows, {obj.shape[1]} columns"
+                            extra = f" (columns: {escape(preview)})" if cols else ""
+                            msg = f"Empty DataFrame{meta}{extra}"
+                        else:
+                            msg = "Empty Series — 0 rows"
+                        display(
+                            HTML(
+                                "<div style='font-family: ui-monospace, SFMono-Regular, Menlo, monospace; font-size: 13px; color: #374151; margin: 4px 0;'>"
+                                + escape(msg)
+                                + "</div>"
+                            )
+                        )
+                        return
+
+                    styler = obj.style
+                    styler = styler.format(precision=3)
+                    if not index and isinstance(obj, pd.DataFrame):
+                        try:
+                            styler = styler.hide(axis="index")
+                        except Exception:
+                            pass
+                    display(styler)
+                except Exception:
+                    display(obj)
+            else:
+                display(obj)
+
+        # Make 'show' available in the notebook namespace
+        ipython.user_ns.setdefault("show", show)
+        _orig_print = builtins.print
+
+        def _smart_print(*args, **kwargs):
+            if (
+                len(args) == 1
+                and not kwargs
+                and isinstance(args[0], (pd.DataFrame, pd.Series))
+            ):
+                show(args[0])
+            else:
+                _orig_print(*args, **kwargs)
+
+        builtins.print = _smart_print
+
+    except Exception as e:
+        if debug:
+            print(f"Error setting up pandas features: {e}")
+            import traceback
+
+            traceback.print_exc()
 
     print("Environment setup complete")
 
     # Check if our API is ready!
+    try:
+        print("  Using ETM API at    ", get_settings().base_url)
+        print("  Token loaded?       ", bool(get_settings().etm_api_token))
 
-    print("  Using ETM API at    ", get_settings().base_url)
-    print("  Token loaded?       ", bool(get_settings().etm_api_token))
+        if not get_settings().etm_api_token:
+            print(
+                " Warning: No ETM_API_TOKEN found. Please set your token in the environment."
+            )
+        else:
+            print("API connection ready")
+    except Exception as e:
+        if debug:
+            print(f"Error checking API settings: {e}")
+            import traceback
 
-    if not get_settings().etm_api_token:
-        print(
-            " Warning: No ETM_API_TOKEN found. Please set your token in the environment."
-        )
-    else:
-        print("API connection ready")
+            traceback.print_exc()
+        else:
+            print("Error checking API settings. Run with debug=True for details.")
diff --git a/examples/exploring_a_scenario.ipynb b/examples/exploring_a_scenario.ipynb
deleted file mode 100644
index 168fec0..0000000
--- a/examples/exploring_a_scenario.ipynb
+++ /dev/null
@@ -1,192 +0,0 @@
-{
- "cells": [
-  {
-   "cell_type": "markdown",
-   "id": "ddbe7ab2",
-   "metadata": {},
-   "source": [
-    "# Scenario Examples\n",
-    "\n",
-    "This notebook demonstrates how to use the `Scenario` object within the pyetm package to retrieve and \n",
-    "inspect data from an ETM scenario.\n",
-    "\n",
-    "Make sure you have a valid `ETM_API_TOKEN` set in your environment.\n",
-    "\n",
-    "## Structure\n",
-    "\n",
-    "This notebook is organized into two main sections:\n",
-    "1. **Setup** - Run these cells first to set up your environment and load a scenario\n",
-    "2. **Examples** - After setup is complete, these cells can be run in any order to explore different aspects of scenario data\n",
-    "\n",
-    "## Setup:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "59514b1f",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "from example_helpers import setup_notebook\n",
-    "from pyetm.models import Scenario\n",
-    "\n",
-    "setup_notebook()\n",
-    "\n",
-    "# Change the scenario id to anything you want! This is a scenario on pro.\n",
-    "scenario = Scenario.load(2690288)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "4056266c",
-   "metadata": {},
-   "source": [
-    "## Examples\n",
-    "\n",
-    "Basic scenario info:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "aca02e6c",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "print(f\"Area: {scenario.area_code}\")\n",
-    "print(f\"End year: {scenario.end_year}\")\n",
-    "print(f\"Version: {scenario.version}\")"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "b3026722",
-   "metadata": {},
-   "source": [
-    "User inputs"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "7b529ffa",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "user_vals = scenario.user_values()\n",
-    "print(f\"Modified inputs: {len(user_vals)}\")\n",
-    "print(f\"First input: {list(user_vals.keys())[0]} = {list(user_vals.values())[0]}\")"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "625977af",
-   "metadata": {},
-   "source": [
-    "Example Input"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "f9c453cf",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "first_input = next(iter(scenario.inputs))\n",
-    "print(f\"Key: {first_input.key}\")\n",
-    "print(f\"Unit: {first_input.unit}\")\n",
-    "print(f\"Default: {first_input.default}\")"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "50ef3d36",
-   "metadata": {},
-   "source": [
-    "Output curve (an export from the scenario)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "4289f9c4",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "carrier_keys = list(scenario.output_curves.attached_keys())\n",
-    "if carrier_keys:\n",
-    "    first_carrier = carrier_keys[0]\n",
-    "    carrier_data = list(scenario.all_output_curves())[0]\n",
-    "    print(f\"Carrier curve: {first_carrier}\")\n",
-    "    print(f\"Shape: {carrier_data.shape}\")"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "af75d6e6",
-   "metadata": {},
-   "source": [
-    "Sortables"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "411ce7e1",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "sortables = scenario.sortables.as_dict()\n",
-    "if sortables:\n",
-    "    first_sortable = list(sortables.keys())[0]\n",
-    "    print(f\"Sortable: {first_sortable}\")\n",
-    "    print(f\"Items: {len(sortables[first_sortable])}\")"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "73192cdf",
-   "metadata": {},
-   "source": [
-    "Gqueries"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "1dbe4e91",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "scenario.add_queries([\"dashboard_emissions\"])\n",
-    "results = scenario.results()\n",
-    "if results is not None:\n",
-    "    print(f\"Query present result: {results['present'].iloc[0]:.2f}\")\n",
-    "    print(f\"Query future result: {results['future'].iloc[0]:.2f}\")"
-   ]
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "pyetm-qKH2ozgc",
-   "language": "python",
-   "name": "python3"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.12.9"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 5
-}
diff --git a/examples/get_info.ipynb b/examples/get_info.ipynb
new file mode 100644
index 0000000..05ad606
--- /dev/null
+++ b/examples/get_info.ipynb
@@ -0,0 +1,107 @@
+{
+ "cells": [
+  {
+   "cell_type": "markdown",
+   "id": "e1993731",
+   "metadata": {},
+   "source": [
+    "# Fetch available info\n",
+    "\n",
+    "This workbook shows how to:\n",
+    "\n",
+    "- Fetch inputs\n",
+    "- Fetch couplings and coupling inputs\n",
+    "- Fetch sortables"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "38024f5a",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# Check the environment is properly configured.\n",
+    "from example_helpers import setup_notebook\n",
+    "setup_notebook()\n",
+    "from pyetm.models.scenario import Scenario\n",
+    "\n",
+    "scenario = Scenario.load(2690439)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "5aa1b657",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# Total available inputs, their min, max and default values\n",
+    "inputs = scenario.inputs\n",
+    "print(inputs.to_dataframe(columns=[\"key\", \"default\", \"min\", \"max\"]))"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "17ed6ba8",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# What are the available couplings? curves?"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "c2b47fc3",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# Available Sortables and their current order\n",
+    "sortables = scenario.sortables\n",
+    "print(\"Sortable groups:\", sortables.names())\n",
+    "\n",
+    "# Show sortables as dataframe if available\n",
+    "try:\n",
+    "    df_sortables = sortables.to_dataframe()\n",
+    "    display(df_sortables.head(10))\n",
+    "except Exception as e:\n",
+    "    print(\"Failed to build sortables dataframe:\", e)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "c553c572",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# Output curves: sample access by carrier type\n",
+    "from pyetm.models.scenario import OutputCurves\n",
+    "OutputCurves._load_carrier_mappings()"
+   ]
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "pyetm-Rh4Np-o3-py3.12",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.12.9"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 5
+}
diff --git a/examples/myc_notebook_for_tim.ipynb b/examples/myc_notebook_for_tim.ipynb
deleted file mode 100644
index df330f1..0000000
--- a/examples/myc_notebook_for_tim.ipynb
+++ /dev/null
@@ -1,1632 +0,0 @@
-{
- "cells": [
-  {
-   "cell_type": "markdown",
-   "id": "8128efd6",
-   "metadata": {},
-   "source": [
-    "This notebook mimics the myc_notebook from pyetm v1 to demonstrate how functionalities remain the same, despite being dressed up differently."
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "53e5210e",
-   "metadata": {},
-   "source": [
-    "**Multi-year charts**\n",
-    "\n",
-    "The MYC function within the ETM allows users to view and edit multiple scenarios at once. This \n",
-    "feature is useful to compare different scenarios or to built a transition path that contains \n",
-    "scenarios with different end years, see https://myc.energytransitionmodel.com/\n"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "205371e8",
-   "metadata": {},
-   "source": [
-    "**Model Initialisation**\n",
-    "\n",
-    "Where you used to initialize the 'model' with the `model.from_excel()` function, now we work with a 'scenario' or 'scenarios' (TBC - what will we call the multiple scenario object?).\n",
-    "\n",
-    "You need to run the setup_notebook() command to get the API ready - this will also validate that you've set your API token correctly. You determine whether you connect with the beta, stable or live version of the ETM via the ETM_URL in the config."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "e3d108b6",
-   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Environment setup complete\n",
-      "  Using ETM API at     https://beta.engine.energytransitionmodel.com/api/v3\n",
-      "  Token loaded?        True\n",
-      "API connection ready\n"
-     ]
-    }
-   ],
-   "source": [
-    "from example_helpers import setup_notebook\n",
-    "from pyetm.models import Scenario\n",
-    "\n",
-    "setup_notebook()\n",
-    "# put a comment how to make the setup"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "f87a2eef",
-   "metadata": {},
-   "source": [
-    "Then, you can create a scenario (or scenarios) with the Scenario.from_excel. For now this functionality is not implemented, so the example will continue by loading an individual scenario. Note that when multi-scenario functionality has been implemented, these same steps should work exactly the same way, but on the Scenarios object, rather than the Scenario object."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "76dce178",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/html": [
-       "<div>\n",
-       "<style scoped>\n",
-       "    .dataframe tbody tr th:only-of-type {\n",
-       "        vertical-align: middle;\n",
-       "    }\n",
-       "\n",
-       "    .dataframe tbody tr th {\n",
-       "        vertical-align: top;\n",
-       "    }\n",
-       "\n",
-       "    .dataframe thead th {\n",
-       "        text-align: right;\n",
-       "    }\n",
-       "</style>\n",
-       "<table border=\"1\" class=\"dataframe\">\n",
-       "  <thead>\n",
-       "    <tr style=\"text-align: right;\">\n",
-       "      <th></th>\n",
-       "      <th>2690499</th>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>scenario</th>\n",
-       "      <th></th>\n",
-       "    </tr>\n",
-       "  </thead>\n",
-       "  <tbody>\n",
-       "    <tr>\n",
-       "      <th>end_year</th>\n",
-       "      <td>2040</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>private</th>\n",
-       "      <td>False</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>area_code</th>\n",
-       "      <td>nl2019</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>template</th>\n",
-       "      <td>2402157</td>\n",
-       "    </tr>\n",
-       "  </tbody>\n",
-       "</table>\n",
-       "</div>"
-      ],
-      "text/plain": [
-       "           2690499\n",
-       "scenario          \n",
-       "end_year      2040\n",
-       "private      False\n",
-       "area_code   nl2019\n",
-       "template   2402157"
-      ]
-     },
-     "execution_count": 13,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "scenario = Scenario.load(2690499)\n",
-    "# maybe add a tag for a study name / scenario name\n",
-    "scenario.to_dataframe()"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "5c8a7628",
-   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "                                                    max  min user\n",
-      "input                                       unit                 \n",
-      "climate_relevant_co2_biomass_gas_future     %     100.0  0.0  0.0\n",
-      "climate_relevant_co2_biomass_gas_present    %     100.0  0.0  0.0\n",
-      "climate_relevant_co2_biomass_liquid_future  %     100.0  0.0  0.0\n",
-      "climate_relevant_co2_biomass_liquid_present %     100.0  0.0  0.0\n",
-      "climate_relevant_co2_biomass_solid_future   %     100.0  0.0  0.0\n"
-     ]
-    }
-   ],
-   "source": [
-    "# Get scenario input parameters (incl. units)\n",
-    "inputs = scenario.inputs\n",
-    "# Give an explanation of available columns\n",
-    "print(inputs.to_dataframe(columns=['max', 'min', 'user']).head())"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "ba56a5f2",
-   "metadata": {},
-   "source": [
-    "You will notice that in the original pyetm this call was:\n",
-    "```\n",
-    "inputs = model.get_parameters(exclude=True)\n",
-    "inputs.head()\n",
-    "```\n",
-    "Pyetm v2 is more developer friendly, which means that each of the 'objects' on the model (for example the inputs) are still python objects until you call **to_dataframe()** on them. This is one of the more significant changes - you will have to specify (in the notebooks) what format you want the data in. For the flows from Excel --> ETM and ETM --> Excel, this is all taken care of internally."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "e3a3bfab",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "{'climate_relevant_co2_biomass_gas_future': 0.0,\n",
-       " 'climate_relevant_co2_biomass_gas_present': 0.0,\n",
-       " 'climate_relevant_co2_biomass_liquid_future': 0.0,\n",
-       " 'climate_relevant_co2_biomass_liquid_present': 0.0,\n",
-       " 'climate_relevant_co2_biomass_solid_future': 0.0,\n",
-       " 'climate_relevant_co2_biomass_solid_present': 0.0,\n",
-       " 'capacity_costs_energy_flexibility_flow_batteries_electricity': 0.0,\n",
-       " 'costs_bio_ethanol': 0.9482455192,\n",
-       " 'costs_biodiesel': 0.9588091368,\n",
-       " 'costs_biogas': 58.0,\n",
-       " 'costs_captured_biogenic_co2': 0.0,\n",
-       " 'costs_co2': 123.0,\n",
-       " 'costs_co2_free_allocation': 0.0,\n",
-       " 'costs_coal': 56.0,\n",
-       " 'costs_electricity_fallback_price': 3000.0,\n",
-       " 'costs_gas': 15.0,\n",
-       " 'costs_greengas': 61.0,\n",
-       " 'costs_heat_infra_indoors': 100.0,\n",
-       " 'costs_heat_infra_outdoors': 100.0,\n",
-       " 'costs_heat_network_storage_ht_steam_hot_water': 43.2,\n",
-       " 'costs_hydrogen': 30.0,\n",
-       " 'costs_hydrogen_transport_compressed_trucks': 50.0822647794,\n",
-       " 'costs_hydrogen_transport_pipelines': 1.5706418062,\n",
-       " 'costs_imported_ammonia': 43.2145152,\n",
-       " 'costs_imported_heat': 11.569444,\n",
-       " 'costs_industry_residual_heat': 0.0,\n",
-       " 'costs_infrastructure_electricity_hv_net': 364.0,\n",
-       " 'costs_infrastructure_electricity_interconnector_net': 364.0,\n",
-       " 'costs_infrastructure_electricity_lv_mv_trafo': 200.0,\n",
-       " 'costs_infrastructure_electricity_lv_net': 916.0,\n",
-       " 'costs_infrastructure_electricity_mv_hv_trafo': 250.0,\n",
-       " 'costs_infrastructure_electricity_mv_net': 690.0,\n",
-       " 'costs_infrastructure_electricity_offshore_net': 1159.0,\n",
-       " 'costs_oil': 61.0,\n",
-       " 'costs_uranium': 69.100026,\n",
-       " 'costs_wacc_households': 2.0,\n",
-       " 'costs_wacc_proven_technologies': 4.0,\n",
-       " 'costs_wacc_public_infrastructure': 3.0,\n",
-       " 'costs_wacc_unproven_technologies': 7.0,\n",
-       " 'costs_wood': 149.7799980001,\n",
-       " 'efficiency_agriculture_heatpump_water_water_electricity': 4.5,\n",
-       " 'efficiency_agriculture_heatpump_water_water_ts_electricity': 23.0000000001,\n",
-       " 'efficiency_ammonia_reforming': 68.5,\n",
-       " 'efficiency_buildings_space_heater_collective_heatpump_water_water_ts_electricity': 3.76,\n",
-       " 'efficiency_buildings_space_heater_combined_hydrogen': 108.6956522,\n",
-       " 'efficiency_buildings_space_heater_crude_oil': 85.0,\n",
-       " 'efficiency_buildings_space_heater_electricity': 100.0,\n",
-       " 'efficiency_buildings_space_heater_heatpump_air_water_electricity': 100.0,\n",
-       " 'efficiency_buildings_space_heater_hybrid_heatpump_air_water_electricity': 100.0,\n",
-       " 'efficiency_buildings_space_heater_hybrid_hydrogen_heatpump_air_water_electricity': 100.0,\n",
-       " 'efficiency_buildings_space_heater_network_gas': 106.7,\n",
-       " 'efficiency_buildings_space_heater_wood_pellets': 82.0,\n",
-       " 'efficiency_energy_chp_combined_cycle_network_gas_electricity': 43.3,\n",
-       " 'efficiency_energy_chp_combined_cycle_network_gas_heat': 30.5,\n",
-       " 'efficiency_energy_chp_local_engine_biogas_electricity': 42.0,\n",
-       " 'efficiency_energy_chp_local_engine_biogas_heat': 39.0,\n",
-       " 'efficiency_energy_chp_local_engine_network_gas_electricity': 42.0,\n",
-       " 'efficiency_energy_chp_local_engine_network_gas_heat': 50.0,\n",
-       " 'efficiency_energy_chp_local_wood_pellets_electricity': 18.3,\n",
-       " 'efficiency_energy_chp_local_wood_pellets_heat': 47.0,\n",
-       " 'efficiency_energy_chp_supercritical_waste_mix_electricity': 20.45,\n",
-       " 'efficiency_energy_chp_supercritical_waste_mix_heat': 19.9500000001,\n",
-       " 'efficiency_energy_chp_ultra_supercritical_coal_electricity': 44.0,\n",
-       " 'efficiency_energy_chp_ultra_supercritical_coal_heat': 13.0,\n",
-       " 'efficiency_energy_chp_ultra_supercritical_cofiring_coal_electricity': 40.0,\n",
-       " 'efficiency_energy_chp_ultra_supercritical_cofiring_coal_heat': 15.0,\n",
-       " 'efficiency_energy_power_combined_cycle_coal': 45.3000000001,\n",
-       " 'efficiency_energy_power_combined_cycle_hydrogen': 60.0,\n",
-       " 'efficiency_energy_power_combined_cycle_network_gas': 60.0,\n",
-       " 'efficiency_energy_power_engine_diesel': 38.0,\n",
-       " 'efficiency_energy_power_engine_network_gas': 48.0,\n",
-       " 'efficiency_energy_power_nuclear_gen2_uranium_oxide': 36.93,\n",
-       " 'efficiency_energy_power_nuclear_gen3_uranium_oxide': 36.93,\n",
-       " 'efficiency_energy_power_nuclear_small_modular_reactor_uranium_oxide': 28.0000000001,\n",
-       " 'efficiency_energy_power_solar_pv_solar_radiation': 23.0,\n",
-       " 'efficiency_energy_power_supercritical_coal': 36.0,\n",
-       " 'efficiency_energy_power_supercritical_waste_mix': 25.0,\n",
-       " 'efficiency_energy_power_turbine_hydrogen': 34.0,\n",
-       " 'efficiency_energy_power_turbine_network_gas': 34.0,\n",
-       " 'efficiency_energy_power_ultra_supercritical_coal': 46.0,\n",
-       " 'efficiency_energy_power_ultra_supercritical_cofiring_coal': 42.0,\n",
-       " 'efficiency_energy_power_ultra_supercritical_crude_oil': 45.0,\n",
-       " 'efficiency_energy_power_ultra_supercritical_network_gas': 40.0,\n",
-       " 'efficiency_households_space_heater_combined_hydrogen': 110.0000000001,\n",
-       " 'efficiency_households_space_heater_combined_network_gas': 107.0,\n",
-       " 'efficiency_households_space_heater_crude_oil': 85.0,\n",
-       " 'efficiency_households_space_heater_electricity': 100.0,\n",
-       " 'efficiency_households_space_heater_heatpump_air_water_electricity': 100.0,\n",
-       " 'efficiency_households_space_heater_heatpump_ground_water_electricity': 4.8000000001,\n",
-       " 'efficiency_households_space_heater_hybrid_heatpump_air_water_electricity': 100.0,\n",
-       " 'efficiency_households_space_heater_hybrid_hydrogen_heatpump_air_water_electricity': 100.0,\n",
-       " 'efficiency_households_space_heater_network_gas': 80.0,\n",
-       " 'efficiency_households_space_heater_wood_pellets': 82.0,\n",
-       " 'efficiency_hydrogen_electrolysis': 66.0,\n",
-       " 'efficiency_industry_chp_turbine_hydrogen_electricity': 33.4448160536,\n",
-       " 'efficiency_industry_chp_turbine_hydrogen_heat': 41.4715719064,\n",
-       " 'investment_costs_ammonia_reforming': 0.0,\n",
-       " 'investment_costs_co2_capture_industry': 0.0,\n",
-       " 'investment_costs_co2_ccs': 0.0,\n",
-       " 'investment_costs_co2_storage': 0.0,\n",
-       " 'investment_costs_co2_transport': 0.0,\n",
-       " 'investment_costs_co2_utilisation': 0.0,\n",
-       " 'investment_costs_combustion_biomass_plants': 0.0,\n",
-       " 'investment_costs_combustion_coal_plant': 0.0,\n",
-       " 'investment_costs_combustion_gas_plant': 0.0,\n",
-       " 'investment_costs_combustion_hydrogen_plant': 0.0,\n",
-       " 'investment_costs_combustion_oil_plant': 0.0,\n",
-       " 'investment_costs_combustion_waste_incinerator': 0.0,\n",
-       " 'investment_costs_electric_heat_pumps': 0.0,\n",
-       " 'investment_costs_electrolyzers': 0.0,\n",
-       " 'investment_costs_energy_flexibility_hv_opac_electricity': 0.0,\n",
-       " 'investment_costs_energy_flexibility_mv_batteries_electricity': 0.0,\n",
-       " 'investment_costs_flexibility_p2h_electricity': 0.0,\n",
-       " 'investment_costs_gas_heat_pumps': 0.0,\n",
-       " 'investment_costs_geothermal': 0.0,\n",
-       " 'investment_costs_households_flexibility_p2p_electricity': 0.0,\n",
-       " 'investment_costs_households_storage_space_heating': 154.7368,\n",
-       " 'investment_costs_households_storage_water_heating': 50.71375,\n",
-       " 'investment_costs_hydrogen_electrolysis': 0.0,\n",
-       " 'investment_costs_nuclear_nuclear_plant': 0.0,\n",
-       " 'investment_costs_nuclear_small_modular_reactor': 0.0,\n",
-       " 'investment_costs_solar_concentrated_solar_power': 0.0,\n",
-       " 'investment_costs_solar_solar_panels': 0.0,\n",
-       " 'investment_costs_solar_thermal': 0.0,\n",
-       " 'investment_costs_water_river': 0.0,\n",
-       " 'investment_costs_wind_offshore': 0.0,\n",
-       " 'investment_costs_wind_onshore': 0.0,\n",
-       " 'om_costs_co2_capture_industry': 0.0,\n",
-       " 'om_costs_co2_ccs': 0.0,\n",
-       " 'om_costs_co2_storage': 0.0,\n",
-       " 'om_costs_co2_transport': 0.0,\n",
-       " 'om_costs_co2_utilisation': 0.0,\n",
-       " 'om_costs_combustion_biomass_plant': 0.0,\n",
-       " 'om_costs_combustion_coal_plant': 0.0,\n",
-       " 'om_costs_combustion_gas_plant': 0.0,\n",
-       " 'om_costs_combustion_hydrogen_plant': 0.0,\n",
-       " 'om_costs_combustion_oil_plant': 0.0,\n",
-       " 'om_costs_combustion_waste_incinerator': 0.0,\n",
-       " 'om_costs_geothermal': 0.0,\n",
-       " 'om_costs_nuclear_nuclear_plant': 0.0,\n",
-       " 'om_costs_nuclear_small_modular_reactor': 0.0,\n",
-       " 'om_costs_solar_thermal': 0.0,\n",
-       " 'om_costs_water_river': 0.0,\n",
-       " 'om_costs_wind_offshore': 0.0,\n",
-       " 'om_costs_wind_onshore': 0.0,\n",
-       " 'volume_costs_energy_flexibility_flow_batteries_electricity': 0.0,\n",
-       " 'agriculture_burner_crude_oil_share': 0.0,\n",
-       " 'agriculture_burner_hydrogen_share': 0.0,\n",
-       " 'agriculture_burner_network_gas_share': 0.0,\n",
-       " 'agriculture_burner_wood_pellets_share': 10.0,\n",
-       " 'agriculture_final_demand_ht_central_steam_hot_water_share': 48.0,\n",
-       " 'agriculture_final_demand_local_steam_hot_water_share': 0.0,\n",
-       " 'agriculture_geothermal_share': 20.0,\n",
-       " 'agriculture_heatpump_water_water_electricity_share': 5.0,\n",
-       " 'agriculture_heatpump_water_water_ts_electricity_share': 17.0,\n",
-       " 'agriculture_useful_demand_electricity': 0.6,\n",
-       " 'agriculture_useful_demand_useable_heat': -1.7,\n",
-       " 'capacity_of_agriculture_flexibility_p2h_electricity': 0.0,\n",
-       " 'buildings_cooling_airconditioning_share': 82.0,\n",
-       " 'buildings_cooling_collective_heatpump_water_water_ts_electricity_share': 18.0,\n",
-       " 'buildings_cooling_heatpump_air_water_electricity_share': 0.0,\n",
-       " 'buildings_cooling_heatpump_air_water_network_gas_share': 0.0,\n",
-       " 'buildings_space_heater_coal_share': 0.0,\n",
-       " 'buildings_space_heater_collective_heatpump_water_water_ts_electricity_share': 4.56,\n",
-       " 'buildings_space_heater_combined_hydrogen_share': 0.0,\n",
-       " 'buildings_space_heater_crude_oil_share': 0.0,\n",
-       " 'buildings_space_heater_district_heating_ht_steam_hot_water_share': 18.05,\n",
-       " 'buildings_space_heater_electricity_share': 0.0,\n",
-       " 'buildings_space_heater_heatpump_air_water_electricity_share': 41.8,\n",
-       " 'buildings_space_heater_heatpump_air_water_network_gas_share': 0.0,\n",
-       " 'buildings_space_heater_hybrid_heatpump_air_water_electricity_share': 19.45,\n",
-       " 'buildings_space_heater_hybrid_hydrogen_heatpump_air_water_electricity_share': 0.0,\n",
-       " 'buildings_space_heater_network_gas_share': 14.75,\n",
-       " 'buildings_space_heater_solar_thermal_share': 40.0,\n",
-       " 'buildings_space_heater_wood_pellets_share': 1.39,\n",
-       " 'buildings_insulation_level_buildings_future': 169.44532976497808,\n",
-       " 'buildings_insulation_level_buildings_present': 217.2208864009762,\n",
-       " 'buildings_lighting_efficient_fluorescent_electricity_share': 2.0,\n",
-       " 'buildings_lighting_led_electricity_share': 98.0,\n",
-       " 'buildings_lighting_standard_fluorescent_electricity_share': 0.0,\n",
-       " 'buildings_lighting_savings_from_daylight_control_light': 45.0,\n",
-       " 'buildings_lighting_savings_from_motion_detection_light': 49.0,\n",
-       " 'buildings_useful_demand_cooling': -0.2972159969666939,\n",
-       " 'buildings_useful_demand_electricity': 0.0,\n",
-       " 'buildings_useful_demand_for_appliances': 1.1,\n",
-       " 'buildings_number_of_buildings_future': 122142.46602400357,\n",
-       " 'bunkers_allocated_percentage_aviation': 0.0,\n",
-       " 'bunkers_allocated_percentage_shipping': 0.0,\n",
-       " 'bunkers_plane_using_bio_kerosene_share': 42.67,\n",
-       " 'bunkers_plane_using_kerosene_share': 57.33,\n",
-       " 'bunkers_ship_using_ammonia_share': 0.0,\n",
-       " 'bunkers_ship_using_heavy_fuel_oil_share': 67.0,\n",
-       " 'bunkers_ship_using_hydrogen_share': 0.0,\n",
-       " 'bunkers_ship_using_lng_share': 33.0,\n",
-       " 'bunkers_useful_demand_planes': 0.0,\n",
-       " 'bunkers_useful_demand_ships': 0.0,\n",
-       " 'volume_of_baseload_export_hydrogen': 134.63050808711347,\n",
-       " 'households_cooker_halogen_electricity_share': 0.0,\n",
-       " 'households_cooker_induction_electricity_share': 88.35,\n",
-       " 'households_cooker_network_gas_share': 9.5,\n",
-       " 'households_cooker_resistive_electricity_share': 2.15,\n",
-       " 'households_cooker_wood_pellets_share': 0.0,\n",
-       " 'households_cooling_airconditioning_electricity_share': 81.9300000001,\n",
-       " 'households_cooling_heatpump_air_water_electricity_share': 9.67,\n",
-       " 'households_cooling_heatpump_ground_water_electricity_share': 8.4,\n",
-       " 'households_useful_demand_for_cooling': 0.0,\n",
-       " 'households_useful_demand_cooking_per_person': 0.0,\n",
-       " 'households_useful_demand_electric_appliances': 0.0,\n",
-       " 'households_useful_demand_lighting': 0.0,\n",
-       " 'households_appliances_electricity_efficiency': 13.770491803278606,\n",
-       " 'households_heater_coal_share': 0.0,\n",
-       " 'households_heater_combined_hydrogen_share': 0.0,\n",
-       " 'households_heater_combined_network_gas_share': 15.0,\n",
-       " 'households_heater_crude_oil_share': 0.0,\n",
-       " 'households_heater_district_heating_ht_steam_hot_water_share': 18.0,\n",
-       " 'households_heater_electricity_share': 2.8,\n",
-       " 'households_heater_heatpump_air_water_electricity_share': 33.6,\n",
-       " 'households_heater_heatpump_ground_water_electricity_share': 8.2,\n",
-       " 'households_heater_heatpump_pvt_electricity_share': 0.0,\n",
-       " 'households_heater_hybrid_heatpump_air_water_electricity_share': 19.5,\n",
-       " 'households_heater_hybrid_hydrogen_heatpump_air_water_electricity_share': 0.0,\n",
-       " 'households_heater_network_gas_share': 0.0,\n",
-       " 'households_heater_wood_pellets_share': 2.9,\n",
-       " 'households_useful_demand_hot_water_share': 0.0,\n",
-       " 'households_water_heater_solar_thermal_share': 32.5,\n",
-       " 'households_insulation_level_apartments_1945_1964': 187.26134107628562,\n",
-       " 'households_insulation_level_apartments_1965_1984': 160.57671114919341,\n",
-       " 'households_insulation_level_apartments_1985_2004': 128.26307690023407,\n",
-       " 'households_insulation_level_apartments_2005_present': 96.18100458657419,\n",
-       " 'households_insulation_level_apartments_before_1945': 256.6002436636793,\n",
-       " 'households_insulation_level_apartments_future': 53.92879181106722,\n",
-       " 'households_insulation_level_detached_houses_1945_1964': 194.75462565741475,\n",
-       " 'households_insulation_level_detached_houses_1965_1984': 162.1440300736066,\n",
-       " 'households_insulation_level_detached_houses_1985_2004': 128.41872640805985,\n",
-       " 'households_insulation_level_detached_houses_2005_present': 93.16911568453558,\n",
-       " 'households_insulation_level_detached_houses_before_1945': 237.0837495697443,\n",
-       " 'households_insulation_level_detached_houses_future': 44.03429181614837,\n",
-       " 'households_insulation_level_semi_detached_houses_1945_1964': 180.82152900785633,\n",
-       " 'households_insulation_level_semi_detached_houses_1965_1984': 156.09290631617938,\n",
-       " 'households_insulation_level_semi_detached_houses_1985_2004': 128.38268907671798,\n",
-       " 'households_insulation_level_semi_detached_houses_2005_present': 95.1754172419351,\n",
-       " 'households_insulation_level_semi_detached_houses_before_1945': 224.08322620338217,\n",
-       " 'households_insulation_level_semi_detached_houses_future': 45.8219794702538,\n",
-       " 'households_insulation_level_terraced_houses_1945_1964': 244.77387685870463,\n",
-       " 'households_insulation_level_terraced_houses_1965_1984': 190.10073010677155,\n",
-       " 'households_insulation_level_terraced_houses_1985_2004': 131.53138563876874,\n",
-       " 'households_insulation_level_terraced_houses_2005_present': 101.4220246175114,\n",
-       " 'households_insulation_level_terraced_houses_before_1945': 266.01945785021763,\n",
-       " 'households_insulation_level_terraced_houses_future': 47.969841149677144,\n",
-       " 'households_lighting_efficient_fluorescent_electricity_share': 8.25,\n",
-       " 'households_lighting_incandescent_electricity_share': 0.0,\n",
-       " 'households_lighting_led_electricity_share': 91.75,\n",
-       " 'households_number_of_apartments_future': 407270.7379999999,\n",
-       " 'households_number_of_detached_houses_future': 141946.5721,\n",
-       " 'households_number_of_inhabitants': 19.1,\n",
-       " 'households_number_of_semi_detached_houses_future': 246876.06719999993,\n",
-       " 'households_number_of_terraced_houses_future': 334197.6226999997,\n",
-       " 'capacity_of_industry_chemicals_fertilizers_flexibility_p2h_electricity': 0.0,\n",
-       " 'capacity_of_industry_chemicals_other_flexibility_p2h_electricity': 0.0,\n",
-       " 'capacity_of_industry_chemicals_refineries_flexibility_p2h_electricity': 0.0,\n",
-       " 'capacity_of_industry_other_food_flexibility_p2h_electricity': 700.0,\n",
-       " 'capacity_of_industry_other_paper_flexibility_p2h_electricity': 175.0,\n",
-       " 'industry_aggregated_other_industry_coal_share_energetic': 0.0,\n",
-       " 'industry_aggregated_other_industry_cokes_share_energetic': 0.0,\n",
-       " 'industry_aggregated_other_industry_crude_oil_share_energetic': 0.0,\n",
-       " 'industry_aggregated_other_industry_electricity_share': 80.0,\n",
-       " 'industry_aggregated_other_industry_hydrogen_share_energetic': 3.0,\n",
-       " 'industry_aggregated_other_industry_hydrogen_share_non_energetic': 0.0,\n",
-       " 'industry_aggregated_other_industry_network_gas_share_energetic': 17.0,\n",
-       " 'industry_aggregated_other_industry_useable_heat_share': 0.0,\n",
-       " 'industry_aggregated_other_industry_wood_pellets_share_energetic': 0.0,\n",
-       " 'industry_aluminium_carbothermalreduction_electricity_share': 0.0,\n",
-       " 'industry_aluminium_electrolysis_bat_electricity_share': 16.66666667,\n",
-       " 'industry_aluminium_electrolysis_current_electricity_share': 42.8571428601,\n",
-       " 'industry_aluminium_production': 0.0,\n",
-       " 'industry_aluminium_smeltoven_electricity_share': 40.47619048,\n",
-       " 'industry_chemicals_fertilizers_burner_coal_share': 0.0,\n",
-       " 'industry_chemicals_fertilizers_burner_crude_oil_share': 0.0,\n",
-       " 'industry_chemicals_fertilizers_burner_hydrogen_share': 0.0,\n",
-       " 'industry_chemicals_fertilizers_burner_network_gas_share': 78.7151702787,\n",
-       " 'industry_chemicals_fertilizers_burner_wood_pellets_share': 0.0,\n",
-       " 'industry_chemicals_fertilizers_central_ammonia_share': 0.0,\n",
-       " 'industry_chemicals_fertilizers_hydrogen_network_share': 0.0,\n",
-       " 'industry_chemicals_fertilizers_local_ammonia_central_hydrogen_share': 0.0,\n",
-       " 'industry_chemicals_fertilizers_local_ammonia_local_hydrogen_share': 100.0,\n",
-       " 'industry_chemicals_fertilizers_steam_methane_reformer_hydrogen_share': 100.0,\n",
-       " 'industry_chemicals_other_burner_coal_share': 0.0,\n",
-       " 'industry_chemicals_other_burner_crude_oil_share': 45.3258609475,\n",
-       " 'industry_chemicals_other_burner_hydrogen_share': 0.0,\n",
-       " 'industry_chemicals_other_burner_network_gas_share': 24.2727467215,\n",
-       " 'industry_chemicals_other_burner_wood_pellets_share': 0.0,\n",
-       " 'industry_chemicals_other_coal_non_energetic_share': 0.0,\n",
-       " 'industry_chemicals_other_crude_oil_non_energetic_share': 88.8015390165,\n",
-       " 'industry_chemicals_other_heater_electricity_share': 0.0,\n",
-       " 'industry_chemicals_other_heatpump_water_water_electricity_share': 0.0,\n",
-       " 'industry_chemicals_other_hydrogen_non_energetic_share': 0.0,\n",
-       " 'industry_chemicals_other_network_gas_non_energetic_share': 11.1984609836,\n",
-       " 'industry_chemicals_other_steam_recompression_electricity_share': 0.0,\n",
-       " 'industry_chemicals_other_wood_pellets_non_energetic_share': 0.0,\n",
-       " 'industry_chemicals_refineries_burner_coal_share': 0.0,\n",
-       " 'industry_chemicals_refineries_burner_crude_oil_share': 64.2192843659,\n",
-       " 'industry_chemicals_refineries_burner_hydrogen_share': 0.0,\n",
-       " 'industry_chemicals_refineries_burner_network_gas_share': 27.8138338165,\n",
-       " 'industry_chemicals_refineries_burner_wood_pellets_share': 0.0,\n",
-       " 'industry_final_demand_for_chemical_fertilizers_steam_hot_water_share': 21.2848297214,\n",
-       " 'industry_final_demand_for_chemical_other_steam_hot_water_share': 30.4013923311,\n",
-       " 'industry_final_demand_for_chemical_refineries_steam_hot_water_share': 7.9668818178,\n",
-       " 'industry_final_demand_for_other_food_steam_hot_water_share': 0.0,\n",
-       " 'industry_final_demand_for_other_paper_steam_hot_water_share': 0.0,\n",
-       " 'industry_other_food_burner_coal_share': 0.0,\n",
-       " 'industry_other_food_burner_crude_oil_share': 0.0,\n",
-       " 'industry_other_food_burner_hydrogen_share': 0.0,\n",
-       " 'industry_other_food_burner_network_gas_share': 57.6,\n",
-       " 'industry_other_food_burner_wood_pellets_share': 0.0,\n",
-       " 'industry_other_food_heater_electricity_share': 42.4,\n",
-       " 'industry_other_metals_process_electricity_efficiency': 0.0,\n",
-       " 'industry_other_metals_process_heat_useable_heat_efficiency': 13.023776445487979,\n",
-       " 'industry_other_metals_production': 0.0,\n",
-       " 'industry_other_paper_burner_coal_share': 0.0,\n",
-       " 'industry_other_paper_burner_crude_oil_share': 0.0,\n",
-       " 'industry_other_paper_burner_hydrogen_share': 0.0,\n",
-       " 'industry_other_paper_burner_network_gas_share': 60.0,\n",
-       " 'industry_other_paper_burner_wood_pellets_share': 0.0,\n",
-       " 'industry_other_paper_heater_electricity_share': 40.0,\n",
-       " 'industry_steel_blastfurnace_bof_share': 100.0,\n",
-       " 'industry_steel_cyclonefurnace_bof_share': 0.0,\n",
-       " 'industry_steel_cyclonefurnace_bof_wood_pellets_share': 0.0,\n",
-       " 'industry_steel_dri_hydrogen_share': 0.0,\n",
-       " 'industry_steel_dri_network_gas_share': 0.0,\n",
-       " 'industry_steel_production': 100.0,\n",
-       " 'industry_steel_scrap_hbi_eaf_share': 0.0,\n",
-       " 'industry_useful_demand_for_aggregated_other_energetic': 89.0,\n",
-       " 'industry_useful_demand_for_aggregated_other_non_energetic': 89.0,\n",
-       " 'industry_useful_demand_for_chemical_fertilizers': 100.0,\n",
-       " 'industry_useful_demand_for_chemical_fertilizers_electricity_efficiency': 0.0,\n",
-       " 'industry_useful_demand_for_chemical_fertilizers_useable_heat_efficiency': 0.0,\n",
-       " 'industry_useful_demand_for_chemical_other': 100.0,\n",
-       " 'industry_useful_demand_for_chemical_other_electricity_efficiency': 0.0,\n",
-       " 'industry_useful_demand_for_chemical_other_useable_heat_efficiency': 0.0,\n",
-       " 'industry_useful_demand_for_chemical_refineries': 100.0,\n",
-       " 'industry_useful_demand_for_chemical_refineries_electricity_efficiency': 0.0,\n",
-       " 'industry_useful_demand_for_chemical_refineries_useable_heat_efficiency': 0.0,\n",
-       " 'industry_useful_demand_for_other_food': 100.0,\n",
-       " 'industry_useful_demand_for_other_food_electricity_efficiency': 25.320234587005388,\n",
-       " 'industry_useful_demand_for_other_food_useable_heat_efficiency': 25.320234587005388,\n",
-       " 'industry_useful_demand_for_other_ict': 329.0,\n",
-       " 'industry_useful_demand_for_other_ict_efficiency': 0.0,\n",
-       " 'industry_useful_demand_for_other_paper': 100.0,\n",
-       " 'industry_useful_demand_for_other_paper_electricity_efficiency': 31.246207044055573,\n",
-       " 'industry_useful_demand_for_other_paper_useable_heat_efficiency': 31.246207044055573,\n",
-       " 'other_useful_demand_electricity': 0.0,\n",
-       " 'other_useful_demand_non_energetic': 0.0,\n",
-       " 'other_useful_demand_useable_heat': 0.0,\n",
-       " 'transport_planes_efficiency': 0.0,\n",
-       " 'transport_ships_efficiency': 0.4,\n",
-       " 'transport_trains_efficiency': 0.1,\n",
-       " 'transport_vehicle_combustion_engine_efficiency': 0.4,\n",
-       " 'transport_vehicle_using_electricity_efficiency': 0.3,\n",
-       " 'transport_vehicle_using_hydrogen_efficiency': 0.3,\n",
-       " 'transport_freight_train_using_coal_share': 0.0,\n",
-       " 'transport_freight_train_using_diesel_mix_share': 0.66,\n",
-       " 'transport_freight_train_using_electricity_share': 98.68,\n",
-       " 'transport_freight_train_using_hydrogen_share': 0.66,\n",
-       " 'transport_freight_trains_share': 1.7501397973,\n",
-       " 'transport_ship_using_ammonia_share': 0.0,\n",
-       " 'transport_ship_using_diesel_mix_share': 64.68,\n",
-       " 'transport_ship_using_electricity_share': 9.93,\n",
-       " 'transport_ship_using_hydrogen_share': 16.66,\n",
-       " 'transport_ship_using_lng_mix_share': 8.73,\n",
-       " 'transport_ships_share': 19.9593814327,\n",
-       " 'transport_truck_using_compressed_natural_gas_share': 2.33,\n",
-       " 'transport_truck_using_diesel_mix_share': 29.15,\n",
-       " 'transport_truck_using_electricity_share': 45.07,\n",
-       " 'transport_truck_using_gasoline_mix_share': 0.0,\n",
-       " 'transport_truck_using_hydrogen_share': 19.12,\n",
-       " 'transport_truck_using_lng_mix_share': 4.33,\n",
-       " 'transport_trucks_share': 77.6037449859,\n",
-       " 'transport_useful_demand_freight_tonne_kms': 0.5,\n",
-       " 'transport_van_using_compressed_natural_gas_share': 0.0,\n",
-       " 'transport_van_using_diesel_mix_share': 23.2,\n",
-       " 'transport_van_using_electricity_share': 74.81,\n",
-       " 'transport_van_using_gasoline_mix_share': 0.44,\n",
-       " 'transport_van_using_hydrogen_share': 0.0,\n",
-       " 'transport_van_using_lpg_share': 1.55,\n",
-       " 'transport_vans_share': 0.6867337843,\n",
-       " 'transport_rail_mixer_diesel_diesel_share': 55.24,\n",
-       " 'transport_road_mixer_diesel_biodiesel_share': 44.81,\n",
-       " 'transport_road_mixer_diesel_diesel_share': 55.19,\n",
-       " 'transport_road_mixer_gasoline_ethanol_share': 45.69,\n",
-       " 'transport_road_mixer_gasoline_gasoline_share': 54.31,\n",
-       " 'transport_road_mixer_lng_bio_lng_share': 33.0,\n",
-       " 'transport_road_mixer_lng_lng_share': 67.0,\n",
-       " 'transport_shipping_mixer_diesel_bio_ethanol_share': 0.0,\n",
-       " 'transport_shipping_mixer_diesel_bio_lng_share': 33.0,\n",
-       " 'transport_shipping_mixer_diesel_biodiesel_share': 14.7,\n",
-       " 'transport_shipping_mixer_diesel_diesel_share': 52.3,\n",
-       " 'transport_shipping_mixer_diesel_heavy_fuel_oil_share': 0.0,\n",
-       " 'transport_shipping_mixer_diesel_lng_share': 0.0,\n",
-       " 'transport_shipping_mixer_lng_bio_lng_share': 42.67,\n",
-       " 'transport_shipping_mixer_lng_lng_share': 57.33,\n",
-       " 'transport_bicycle_using_electricity_share': 40.67,\n",
-       " 'transport_bicycle_using_human_power_share': 59.33,\n",
-       " 'transport_bicycles_share': 8.5,\n",
-       " 'transport_bus_using_compressed_natural_gas_share': 0.0,\n",
-       " 'transport_bus_using_diesel_mix_share': 0.0,\n",
-       " 'transport_bus_using_electricity_share': 96.67,\n",
-       " 'transport_bus_using_gasoline_mix_share': 0.0,\n",
-       " 'transport_bus_using_hydrogen_share': 3.33,\n",
-       " 'transport_bus_using_lng_share': 0.0,\n",
-       " 'transport_busses_share': 7.34,\n",
-       " 'transport_car_using_compressed_natural_gas_share': 0.0,\n",
-       " 'transport_car_using_diesel_mix_share': 0.0,\n",
-       " 'transport_car_using_electricity_share': 67.97,\n",
-       " 'transport_car_using_gasoline_mix_share': 28.27,\n",
-       " 'transport_car_using_hydrogen_share': 3.76,\n",
-       " 'transport_car_using_lpg_share': 0.0,\n",
-       " 'transport_cars_share': 69.0717377,\n",
-       " 'transport_motorcycle_using_electricity_share': 63.0,\n",
-       " 'transport_motorcycle_using_gasoline_mix_share': 37.0,\n",
-       " 'transport_motorcycles_share': 2.9115407598,\n",
-       " 'transport_passenger_train_using_coal_share': 0.0,\n",
-       " 'transport_passenger_train_using_diesel_mix_share': 0.7,\n",
-       " 'transport_passenger_train_using_electricity_share': 98.6,\n",
-       " 'transport_passenger_train_using_hydrogen_share': 0.7,\n",
-       " 'transport_passenger_trains_share': 12.0,\n",
-       " 'transport_rail_mixer_diesel_biodiesel_share': 44.76,\n",
-       " 'transport_plane_using_bio_ethanol_share': 0.0,\n",
-       " 'transport_plane_using_electricity_share': 16.7,\n",
-       " 'transport_plane_using_gasoline_share': 3.28,\n",
-       " 'transport_plane_using_hydrogen_share': 16.7,\n",
-       " 'transport_plane_using_kerosene_share': 63.32,\n",
-       " 'transport_planes_share': 0.0787128481,\n",
-       " 'transport_trams_share': 0.0980087341,\n",
-       " 'transport_useful_demand_passenger_kms': 1.0,\n",
-       " 'demand_of_molecules_direct_air_capture_co2': 0.0,\n",
-       " 'share_of_energy_chp_supercritical_ccs_ht_waste_mix': 0.0,\n",
-       " 'share_of_energy_hydrogen_autothermal_reformer_ccs_must_run': 0.0,\n",
-       " 'share_of_energy_hydrogen_biomass_gasification_ccs': 100.0,\n",
-       " 'share_of_energy_hydrogen_steam_methane_reformer_ccs_must_run': 100.0,\n",
-       " 'share_of_energy_power_combined_cycle_ccs_coal': 0.0,\n",
-       " 'share_of_energy_power_combined_cycle_ccs_network_gas': 0.0,\n",
-       " 'share_of_energy_power_supercritical_ccs_waste_mix': 0.0,\n",
-       " 'share_of_energy_power_ultra_supercritical_ccs_coal': 0.0,\n",
-       " 'share_of_energy_power_ultra_supercritical_oxyfuel_ccs_lignite': 0.0,\n",
-       " 'share_of_industry_chemicals_fertilizers_captured_combustion_co2': 0.0,\n",
-       " 'share_of_industry_chemicals_fertilizers_captured_processes_co2': 65.0,\n",
-       " 'share_of_industry_chemicals_other_captured_co2': 0.0,\n",
-       " 'share_of_industry_chemicals_refineries_captured_co2': 0.0,\n",
-       " 'share_of_industry_other_food_captured_co2': 0.0,\n",
-       " 'share_of_industry_other_paper_captured_co2': 0.0,\n",
-       " 'share_of_industry_steel_captured_co2': 0.0,\n",
-       " 'share_of_energy_steel_chemical_feedstock_coal_gas': 0.0,\n",
-       " 'share_of_energy_steel_energy_production_coal_gas': 100.0,\n",
-       " 'share_of_molecules_transport_pipelines_co2': 50.0,\n",
-       " 'share_of_molecules_transport_ships_co2': 50.0,\n",
-       " 'demand_of_molecules_offshore_sequestration_co2': 5.9,\n",
-       " 'demand_of_molecules_other_utilisation_co2': 2.342574,\n",
-       " 'output_of_energy_production_synthetic_methanol': 0.0,\n",
-       " 'share_of_molecules_other_utilisation_delayed_emitted_co2': 100.0,\n",
-       " 'share_of_molecules_other_utilisation_delayed_indefinitely_co2': 0.0,\n",
-       " 'co2_emissions_of_imported_ammonia_future': 348.3870984,\n",
-       " 'co2_emissions_of_imported_hydrogen_future': 0.0,\n",
-       " 'change_in_energetic_emissions_other_ghg_agriculture': 117.0,\n",
-       " 'change_in_energetic_emissions_other_ghg_buildings': 100.0,\n",
-       " 'change_in_energetic_emissions_other_ghg_energy': 100.0,\n",
-       " 'change_in_energetic_emissions_other_ghg_households': 100.0,\n",
-       " 'change_in_energetic_emissions_other_ghg_industry': 34.0,\n",
-       " 'change_in_energetic_emissions_other_ghg_transport': 20.0,\n",
-       " 'change_in_indirect_emissions_co2': 100.0,\n",
-       " 'change_in_non_energetic_emissions_co2_agriculture_manure': 50.0,\n",
-       " 'change_in_non_energetic_emissions_co2_agriculture_soil_cultivation': 50.0,\n",
-       " 'change_in_non_energetic_emissions_co2_chemical_industry': 66.66666667,\n",
-       " 'change_in_non_energetic_emissions_co2_other_industry': 40.0,\n",
-       " 'change_in_non_energetic_emissions_co2_waste_management': 50.0,\n",
-       " 'change_in_non_energetic_emissions_other_ghg_agriculture_fermentation': 48.0,\n",
-       " 'change_in_non_energetic_emissions_other_ghg_agriculture_manure': 102.0,\n",
-       " 'change_in_non_energetic_emissions_other_ghg_agriculture_other': 48.0,\n",
-       " 'change_in_non_energetic_emissions_other_ghg_agriculture_soil_cultivation': 64.0,\n",
-       " 'change_in_non_energetic_emissions_other_ghg_chemical_industry': 34.0,\n",
-       " 'change_in_non_energetic_emissions_other_ghg_other_industry': 34.0,\n",
-       " 'change_in_non_energetic_emissions_other_ghg_waste_management': 34.0,\n",
-       " 'battery_capacity_always_on_solar_pv_solar_radiation': 100.0,\n",
-       " 'battery_capacity_always_on_wind_turbine_inland': 100.0,\n",
-       " 'capacity_of_energy_flexibility_flow_batteries_electricity': 6500.0,\n",
-       " 'capacity_of_energy_flexibility_hv_opac_electricity': 0.0,\n",
-       " 'capacity_of_energy_flexibility_mv_batteries_electricity': 18500.0,\n",
-       " 'capacity_of_energy_flexibility_pumped_storage_electricity': 0.0,\n",
-       " 'capacity_of_energy_heat_flexibility_p2h_boiler_electricity': 4500.0,\n",
-       " 'capacity_of_energy_heat_flexibility_p2h_heatpump_electricity': 3500.0,\n",
-       " 'capacity_of_energy_hydrogen_flexibility_p2g_electricity': 14475.0,\n",
-       " 'connection_capacity_always_on_solar_pv_solar_radiation': 25.0,\n",
-       " 'connection_capacity_always_on_wind_turbine_inland': 75.0,\n",
-       " 'settings_enable_storage_optimisation_energy_flexibility_flow_batteries_electricity': 1.0,\n",
-       " 'settings_enable_storage_optimisation_energy_flexibility_hv_opac_electricity': 0.0,\n",
-       " 'settings_enable_storage_optimisation_energy_flexibility_mv_batteries_electricity': 1.0,\n",
-       " 'settings_enable_storage_optimisation_energy_flexibility_pumped_storage_electricity': 0.0,\n",
-       " 'volume_of_energy_flexibility_flow_batteries_electricity': 41.052631579,\n",
-       " 'wta_of_energy_flexibility_flow_batteries_electricity': 6.4285714286,\n",
-       " 'wta_of_energy_flexibility_hv_opac_electricity': 5.375,\n",
-       " 'wta_of_energy_flexibility_mv_batteries_electricity': 4.9411764706,\n",
-       " 'wta_of_energy_flexibility_pumped_storage_electricity': 5.5,\n",
-       " 'wtp_of_agriculture_flexibility_p2h_electricity': 22.0,\n",
-       " 'wtp_of_energy_flexibility_flow_batteries_electricity': 4.5,\n",
-       " 'wtp_of_energy_flexibility_hv_opac_electricity': 4.3,\n",
-       " 'wtp_of_energy_flexibility_mv_batteries_electricity': 4.2,\n",
-       " 'wtp_of_energy_flexibility_pumped_storage_electricity': 4.4,\n",
-       " 'wtp_of_energy_heat_flexibility_p2h_boiler_electricity': 25.0,\n",
-       " 'wtp_of_energy_heat_flexibility_p2h_heatpump_electricity': 25.0,\n",
-       " 'wtp_of_energy_hydrogen_flexibility_p2g_electricity': 30.0,\n",
-       " 'flexibility_heat_pump_space_heating_cop_cutoff_gas': 2.6,\n",
-       " 'flexibility_heat_pump_water_heating_cop_cutoff': 6.0,\n",
-       " 'households_flexibility_consumer_electricity_price': 22.5,\n",
-       " 'households_flexibility_consumer_gas_price': 81.4,\n",
-       " 'households_flexibility_p2p_electricity_market_penetration': 30.0,\n",
-       " 'settings_enable_storage_optimisation_households_flexibility_p2p_electricity': 'optimizing_storage',\n",
-       " 'wta_of_households_flexibility_p2p_electricity': 10.0,\n",
-       " 'wtp_of_households_flexibility_p2p_electricity': 5.0,\n",
-       " 'electricity_interconnector_1_capacity': 4400.0,\n",
-       " 'electricity_interconnector_1_co2_emissions_future': 0.0,\n",
-       " 'electricity_interconnector_1_co2_emissions_present': 0.0,\n",
-       " 'electricity_interconnector_1_export_availability': 100.0,\n",
-       " 'electricity_interconnector_1_import_availability': 100.0,\n",
-       " 'electricity_interconnector_1_marginal_costs': 37.5999984001,\n",
-       " 'electricity_interconnector_10_capacity': 0.0,\n",
-       " 'electricity_interconnector_10_co2_emissions_future': 370.0000008,\n",
-       " 'electricity_interconnector_10_co2_emissions_present': 370.0000008,\n",
-       " 'electricity_interconnector_10_export_availability': 100.0,\n",
-       " 'electricity_interconnector_10_import_availability': 100.0,\n",
-       " 'electricity_interconnector_10_marginal_costs': 37.5999984001,\n",
-       " 'electricity_interconnector_11_capacity': 0.0,\n",
-       " 'electricity_interconnector_11_co2_emissions_future': 370.0000008,\n",
-       " 'electricity_interconnector_11_co2_emissions_present': 370.0000008,\n",
-       " 'electricity_interconnector_11_export_availability': 100.0,\n",
-       " 'electricity_interconnector_11_import_availability': 100.0,\n",
-       " 'electricity_interconnector_11_marginal_costs': 37.5999984001,\n",
-       " 'electricity_interconnector_12_capacity': 0.0,\n",
-       " 'electricity_interconnector_12_co2_emissions_future': 370.0000008,\n",
-       " 'electricity_interconnector_12_co2_emissions_present': 370.0000008,\n",
-       " 'electricity_interconnector_12_export_availability': 100.0,\n",
-       " 'electricity_interconnector_12_import_availability': 100.0,\n",
-       " 'electricity_interconnector_12_marginal_costs': 37.5999984001,\n",
-       " 'electricity_interconnector_2_capacity': 6000.0,\n",
-       " 'electricity_interconnector_2_co2_emissions_future': 369.0,\n",
-       " 'electricity_interconnector_2_co2_emissions_present': 370.0000008,\n",
-       " 'electricity_interconnector_2_export_availability': 100.0,\n",
-       " 'electricity_interconnector_2_import_availability': 100.0,\n",
-       " 'electricity_interconnector_2_marginal_costs': 37.5999984001,\n",
-       " 'electricity_interconnector_3_capacity': 700.0,\n",
-       " 'electricity_interconnector_3_co2_emissions_future': 0.0,\n",
-       " 'electricity_interconnector_3_co2_emissions_present': 370.0000008,\n",
-       " 'electricity_interconnector_3_export_availability': 100.0,\n",
-       " 'electricity_interconnector_3_import_availability': 100.0,\n",
-       " 'electricity_interconnector_3_marginal_costs': 37.5999984001,\n",
-       " 'electricity_interconnector_4_capacity': 0.0,\n",
-       " 'electricity_interconnector_4_co2_emissions_future': 0.0,\n",
-       " 'electricity_interconnector_4_co2_emissions_present': 370.0000008,\n",
-       " 'electricity_interconnector_4_export_availability': 100.0,\n",
-       " 'electricity_interconnector_4_import_availability': 100.0,\n",
-       " 'electricity_interconnector_4_marginal_costs': 37.5999984001,\n",
-       " 'electricity_interconnector_5_capacity': 700.0,\n",
-       " 'electricity_interconnector_5_co2_emissions_future': 0.0,\n",
-       " 'electricity_interconnector_5_co2_emissions_present': 370.0000008,\n",
-       " 'electricity_interconnector_5_export_availability': 100.0,\n",
-       " 'electricity_interconnector_5_import_availability': 100.0,\n",
-       " 'electricity_interconnector_5_marginal_costs': 37.5999984001,\n",
-       " 'electricity_interconnector_6_capacity': 0.0,\n",
-       " 'electricity_interconnector_6_co2_emissions_future': 0.0,\n",
-       " 'electricity_interconnector_6_co2_emissions_present': 370.0000008,\n",
-       " 'electricity_interconnector_6_export_availability': 100.0,\n",
-       " 'electricity_interconnector_6_import_availability': 100.0,\n",
-       " 'electricity_interconnector_6_marginal_costs': 37.5999984001,\n",
-       " 'electricity_interconnector_7_capacity': 1000.0,\n",
-       " 'electricity_interconnector_7_co2_emissions_future': 0.0,\n",
-       " 'electricity_interconnector_7_co2_emissions_present': 370.0000008,\n",
-       " 'electricity_interconnector_7_export_availability': 100.0,\n",
-       " 'electricity_interconnector_7_import_availability': 100.0,\n",
-       " 'electricity_interconnector_7_marginal_costs': 37.5999984001,\n",
-       " 'electricity_interconnector_8_capacity': 2000.0,\n",
-       " 'electricity_interconnector_8_co2_emissions_future': 0.0,\n",
-       " 'electricity_interconnector_8_co2_emissions_present': 370.0000008,\n",
-       " 'electricity_interconnector_8_export_availability': 100.0,\n",
-       " 'electricity_interconnector_8_import_availability': 100.0,\n",
-       " 'electricity_interconnector_8_marginal_costs': 37.5999984001,\n",
-       " 'electricity_interconnector_9_capacity': 0.0,\n",
-       " 'electricity_interconnector_9_co2_emissions_future': 370.0000008,\n",
-       " 'electricity_interconnector_9_co2_emissions_present': 370.0000008,\n",
-       " 'electricity_interconnector_9_export_availability': 100.0,\n",
-       " 'electricity_interconnector_9_import_availability': 100.0,\n",
-       " 'electricity_interconnector_9_marginal_costs': 37.5999984001,\n",
-       " 'capacity_of_industry_chemical_flexibility_load_shifting_electricity': 35.0,\n",
-       " 'capacity_of_industry_metal_flexibility_load_shifting_electricity': 35.0,\n",
-       " 'capacity_of_industry_other_flexibility_load_shifting_electricity': 35.0,\n",
-       " 'capacity_of_industry_other_ict_flexibility_load_shifting_electricity': 30.0,\n",
-       " 'deficit_limit_of_industry_chemical_flexibility_load_shifting_electricity': 72.0,\n",
-       " 'deficit_limit_of_industry_metal_flexibility_load_shifting_electricity': 72.0,\n",
-       " 'deficit_limit_of_industry_other_flexibility_load_shifting_electricity': 72.0,\n",
-       " 'deficit_limit_of_industry_other_ict_flexibility_load_shifting_electricity': 24.0,\n",
-       " 'input_capacity_of_industry_chemical_flexibility_load_shifting_electricity': 35.0,\n",
-       " 'input_capacity_of_industry_metal_flexibility_load_shifting_electricity': 35.0,\n",
-       " 'input_capacity_of_industry_other_flexibility_load_shifting_electricity': 35.0,\n",
-       " 'input_capacity_of_industry_other_ict_flexibility_load_shifting_electricity': 30.0,\n",
-       " 'wta_of_industry_chemical_flexibility_load_shifting_electricity': 100.0,\n",
-       " 'wta_of_industry_metal_flexibility_load_shifting_electricity': 100.0,\n",
-       " 'wta_of_industry_other_flexibility_load_shifting_electricity': 100.0,\n",
-       " 'wta_of_industry_other_ict_flexibility_load_shifting_electricity': 100.0,\n",
-       " 'wtp_of_industry_chemicals_fertilizers_flexibility_p2h_electricity': 22.0,\n",
-       " 'wtp_of_industry_chemicals_other_flexibility_p2h_electricity': 22.0,\n",
-       " 'wtp_of_industry_chemicals_refineries_flexibility_p2h_electricity': 22.0,\n",
-       " 'wtp_of_industry_other_food_flexibility_p2h_electricity': 22.0,\n",
-       " 'wtp_of_industry_other_paper_flexibility_p2h_electricity': 22.0,\n",
-       " 'flexibility_residual_load_curve_moving_average': 72.0,\n",
-       " 'curtailment_of_buildings_solar_pv_solar_radiation': 55.0,\n",
-       " 'curtailment_of_energy_power_solar_pv_offshore': 55.0,\n",
-       " 'curtailment_of_energy_power_solar_pv_solar_radiation': 55.0,\n",
-       " 'curtailment_of_households_solar_pv_solar_radiation': 45.0,\n",
-       " 'settings_enable_storage_optimisation_transport_car_flexibility_p2p_electricity': 1.0,\n",
-       " 'transport_bus_using_electricity_availability': 0.0,\n",
-       " 'transport_car_using_electricity_availability': 17.5,\n",
-       " 'transport_car_using_electricity_custom_profile_charging_share': 100.0,\n",
-       " 'transport_car_using_electricity_fast_charging_share': 0.0,\n",
-       " 'transport_car_using_electricity_home_charging_share': 0.0,\n",
-       " 'transport_car_using_electricity_public_charging_share': 0.0,\n",
-       " 'transport_car_using_electricity_work_charging_share': 0.0,\n",
-       " 'transport_truck_using_electricity_availability': 0.0,\n",
-       " 'transport_van_using_electricity_availability': 0.0,\n",
-       " 'wta_of_transport_car_flexibility_p2p_electricity': 10.0,\n",
-       " 'wtp_of_transport_car_flexibility_p2p_electricity': 5.0,\n",
-       " 'flexibility_outdoor_temperature': 0.2125175493,\n",
-       " 'settings_weather_curve_set': 'default',\n",
-       " 'flh_of_energy_hydrogen_wind_turbine_offshore': 4000.0,\n",
-       " 'flh_of_energy_power_wind_turbine_coastal': 3200.000003,\n",
-       " 'flh_of_energy_power_wind_turbine_coastal_user_curve': 3200.000003,\n",
-       " 'flh_of_energy_power_wind_turbine_inland': 3200.000003,\n",
-       " 'flh_of_energy_power_wind_turbine_inland_user_curve': 3200.000003,\n",
-       " 'flh_of_energy_power_wind_turbine_offshore': 4750.000003461496,\n",
-       " 'flh_of_energy_power_wind_turbine_offshore_user_curve': 4750.000003461496,\n",
-       " 'flh_of_solar_pv_solar_radiation': 1012.334936,\n",
-       " 'flh_of_solar_pv_solar_radiation_user_curve': 1012.334936,\n",
-       " 'initial_updates_interconnector_curves': 0.0,\n",
-       " 'initial_updates_interconnector_prices': 0.0,\n",
-       " 'settings_enable_merit_order': 1.0,\n",
-       " 'energy_mix_capacity_per_unit_wind_turbine_inland': 3.0,\n",
-       " 'external_coupling_energy_production_synthetic_kerosene_demand': 0.0,\n",
-       " 'external_coupling_energy_production_synthetic_methanol_demand': 0.0,\n",
-       " 'external_coupling_molecules_other_utilisation_demand': 3.29209488358461,\n",
-       " 'external_coupling_industry_chemical_fertilizers_burner_coal_share': 0.0,\n",
-       " 'external_coupling_industry_chemical_fertilizers_burner_crude_oil_share': 0.0,\n",
-       " 'external_coupling_industry_chemical_fertilizers_burner_hydrogen_share': 50.6732983222066,\n",
-       " 'external_coupling_industry_chemical_fertilizers_burner_network_gas_share': 46.3963051101963,\n",
-       " 'external_coupling_industry_chemical_fertilizers_burner_wood_pellets_share': 0.0,\n",
-       " 'external_coupling_industry_chemical_fertilizers_combustion_ccus_capture_potential': 100.0,\n",
-       " 'external_coupling_industry_chemical_fertilizers_combustion_ccus_captured_co2': 0.0,\n",
-       " 'external_coupling_industry_chemical_fertilizers_combustion_ccus_electricity_use': 0.229514968527056,\n",
-       " 'external_coupling_industry_chemical_fertilizers_electricity': 475.351855618162,\n",
-       " 'external_coupling_industry_chemical_fertilizers_non_energetic_coal_share': 0.0,\n",
-       " 'external_coupling_industry_chemical_fertilizers_non_energetic_crude_oil_share': 0.0,\n",
-       " 'external_coupling_industry_chemical_fertilizers_non_energetic_hydrogen_share': 83.584159630957,\n",
-       " 'external_coupling_industry_chemical_fertilizers_non_energetic_network_gas_share': 16.415840369043,\n",
-       " 'external_coupling_industry_chemical_fertilizers_non_energetic_wood_pellets_share': 0.0,\n",
-       " 'external_coupling_industry_chemical_fertilizers_p2h_capacity': 0.0,\n",
-       " 'external_coupling_industry_chemical_fertilizers_processes_ccus_capture_potential': 100.0,\n",
-       " 'external_coupling_industry_chemical_fertilizers_processes_ccus_captured_co2': 100.0,\n",
-       " 'external_coupling_industry_chemical_fertilizers_processes_ccus_electricity_use': 0.229514968527056,\n",
-       " 'external_coupling_industry_chemical_fertilizers_residual_heat_share': 18.520027186658,\n",
-       " 'external_coupling_industry_chemical_fertilizers_steam_hot_water_share': 2.93039656759714,\n",
-       " 'external_coupling_industry_chemical_fertilizers_total_excluding_electricity': 94.05517289851,\n",
-       " 'external_coupling_industry_chemical_fertilizers_total_useable_heat_share': 15.4869053374752,\n",
-       " 'external_coupling_energy_chemical_other_transformation_external_coupling_node_ammonia_input_share': 0.0,\n",
-       " 'external_coupling_energy_chemical_other_transformation_external_coupling_node_ammonia_output_share': 0.0,\n",
-       " 'external_coupling_energy_chemical_other_transformation_external_coupling_node_crude_oil_input_share': 0.0,\n",
-       " 'external_coupling_energy_chemical_other_transformation_external_coupling_node_diesel_output_share': 0.0,\n",
-       " 'external_coupling_energy_chemical_other_transformation_external_coupling_node_electricity_input_share': 0.0,\n",
-       " 'external_coupling_energy_chemical_other_transformation_external_coupling_node_gasoline_output_share': 0.0,\n",
-       " 'external_coupling_energy_chemical_other_transformation_external_coupling_node_greengas_input_share': 0.0,\n",
-       " 'external_coupling_energy_chemical_other_transformation_external_coupling_node_greengas_output_share': 2.5662122493785073,\n",
-       " 'external_coupling_energy_chemical_other_transformation_external_coupling_node_heavy_fuel_oil_output_share': 0.0,\n",
-       " 'external_coupling_energy_chemical_other_transformation_external_coupling_node_hydrogen_input_share': 0.0,\n",
-       " 'external_coupling_energy_chemical_other_transformation_external_coupling_node_hydrogen_output_share': 28.3253720842459,\n",
-       " 'external_coupling_energy_chemical_other_transformation_external_coupling_node_kerosene_output_share': 0.0,\n",
-       " 'external_coupling_energy_chemical_other_transformation_external_coupling_node_loss_output_share': 0.0,\n",
-       " 'external_coupling_energy_chemical_other_transformation_external_coupling_node_lpg_output_share': 0.0,\n",
-       " 'external_coupling_energy_chemical_other_transformation_external_coupling_node_methanol_input_share': 0.0,\n",
-       " 'external_coupling_energy_chemical_other_transformation_external_coupling_node_methanol_output_share': 0.0,\n",
-       " 'external_coupling_energy_chemical_other_transformation_external_coupling_node_natural_gas_input_share': 0.0,\n",
-       " 'external_coupling_energy_chemical_other_transformation_external_coupling_node_natural_gas_output_share': 69.10841566637559,\n",
-       " 'external_coupling_energy_chemical_other_transformation_external_coupling_node_not_defined_input_share': 100.0,\n",
-       " 'external_coupling_energy_chemical_other_transformation_external_coupling_node_steam_hot_water_input_share': 0.0,\n",
-       " 'external_coupling_energy_chemical_other_transformation_external_coupling_node_total_demand': 145.02798773572636,\n",
-       " 'external_coupling_energy_chemical_other_transformation_external_coupling_node_waste_mix_input_share': 0.0,\n",
-       " 'external_coupling_energy_chemical_other_transformation_external_coupling_node_wood_pellets_input_share': 0.0,\n",
-       " 'external_coupling_industry_chemical_other_burner_coal_share': 0.0,\n",
-       " 'external_coupling_industry_chemical_other_burner_crude_oil_share': 4.15140444622588,\n",
-       " 'external_coupling_industry_chemical_other_burner_hydrogen_share': 38.163121847451,\n",
-       " 'external_coupling_industry_chemical_other_burner_network_gas_share': 44.1422501321988,\n",
-       " 'external_coupling_industry_chemical_other_burner_wood_pellets_share': 0.0,\n",
-       " 'external_coupling_industry_chemical_other_ccus_capture_potential': 100.0,\n",
-       " 'external_coupling_industry_chemical_other_ccus_captured_co2': 6.11129600882643,\n",
-       " 'external_coupling_industry_chemical_other_ccus_electricity_use': 0.124294429762498,\n",
-       " 'external_coupling_industry_chemical_other_electricity': 277.599988376699,\n",
-       " 'external_coupling_industry_chemical_other_heater_electricity_share': 0.0,\n",
-       " 'external_coupling_industry_chemical_other_heatpump_water_water_electricity_share': 0.0,\n",
-       " 'external_coupling_industry_chemical_other_non_energetic_coal_share': 0.0,\n",
-       " 'external_coupling_industry_chemical_other_non_energetic_crude_oil_share': 56.6568218227432,\n",
-       " 'external_coupling_industry_chemical_other_non_energetic_hydrogen_share': 6.74856929748537,\n",
-       " 'external_coupling_industry_chemical_other_non_energetic_network_gas_share': 11.3846995406033,\n",
-       " 'external_coupling_industry_chemical_other_non_energetic_wood_pellets_share': 25.2099093391682,\n",
-       " 'external_coupling_industry_chemical_other_p2h_capacity': 522.183604084003,\n",
-       " 'external_coupling_industry_chemical_other_residual_heat_share': 15.4433084571522,\n",
-       " 'external_coupling_industry_chemical_other_steam_hot_water_share': 13.5432235741243,\n",
-       " 'external_coupling_industry_chemical_other_steam_recompression_electricity_share': 0.0,\n",
-       " 'external_coupling_industry_chemical_other_total_non_energetic': 45.7297367916897,\n",
-       " 'external_coupling_industry_chemical_other_useable_heat': 33.9923944655155,\n",
-       " 'external_coupling_energy_chemical_refineries_transformation_external_coupling_node_ammonia_input_share': 0.0,\n",
-       " 'external_coupling_energy_chemical_refineries_transformation_external_coupling_node_ammonia_output_share': 0.0,\n",
-       " 'external_coupling_energy_chemical_refineries_transformation_external_coupling_node_crude_oil_input_share': 100.0,\n",
-       " 'external_coupling_energy_chemical_refineries_transformation_external_coupling_node_diesel_output_share': 28.8754407902916,\n",
-       " 'external_coupling_energy_chemical_refineries_transformation_external_coupling_node_electricity_input_share': 0.0,\n",
-       " 'external_coupling_energy_chemical_refineries_transformation_external_coupling_node_gasoline_output_share': 6.23530119017238,\n",
-       " 'external_coupling_energy_chemical_refineries_transformation_external_coupling_node_greengas_input_share': 0.0,\n",
-       " 'external_coupling_energy_chemical_refineries_transformation_external_coupling_node_greengas_output_share': 0.0,\n",
-       " 'external_coupling_energy_chemical_refineries_transformation_external_coupling_node_heavy_fuel_oil_output_share': 14.7654523402727,\n",
-       " 'external_coupling_energy_chemical_refineries_transformation_external_coupling_node_hydrogen_input_share': 0.0,\n",
-       " 'external_coupling_energy_chemical_refineries_transformation_external_coupling_node_hydrogen_output_share': 0.0,\n",
-       " 'external_coupling_energy_chemical_refineries_transformation_external_coupling_node_kerosene_output_share': 14.7523934475443,\n",
-       " 'external_coupling_energy_chemical_refineries_transformation_external_coupling_node_loss_output_share': 0.0,\n",
-       " 'external_coupling_energy_chemical_refineries_transformation_external_coupling_node_lpg_output_share': 2.25239174447402,\n",
-       " 'external_coupling_energy_chemical_refineries_transformation_external_coupling_node_methanol_input_share': 0.0,\n",
-       " 'external_coupling_energy_chemical_refineries_transformation_external_coupling_node_methanol_output_share': 0.0,\n",
-       " 'external_coupling_energy_chemical_refineries_transformation_external_coupling_node_natural_gas_input_share': 0.0,\n",
-       " 'external_coupling_energy_chemical_refineries_transformation_external_coupling_node_natural_gas_output_share': 0.0,\n",
-       " 'external_coupling_energy_chemical_refineries_transformation_external_coupling_node_not_defined_input_share': 0.0,\n",
-       " 'external_coupling_energy_chemical_refineries_transformation_external_coupling_node_not_defined_output_share': 3.58796542047281,\n",
-       " 'external_coupling_energy_chemical_refineries_transformation_external_coupling_node_steam_hot_water_input_share': 0.0,\n",
-       " 'external_coupling_energy_chemical_refineries_transformation_external_coupling_node_total_demand': 1889.958629148879,\n",
-       " 'external_coupling_energy_chemical_refineries_transformation_external_coupling_node_waste_mix_input_share': 0.0,\n",
-       " 'external_coupling_energy_chemical_refineries_transformation_external_coupling_node_wood_pellets_input_share': 0.0,\n",
-       " 'external_coupling_industry_chemical_refineries_burner_coal_share': 0.0,\n",
-       " 'external_coupling_industry_chemical_refineries_burner_crude_oil_share': 8.55291494528118,\n",
-       " 'external_coupling_industry_chemical_refineries_burner_hydrogen_share': 80.3160063659157,\n",
-       " 'external_coupling_industry_chemical_refineries_burner_network_gas_share': 10.7766510976364,\n",
-       " 'external_coupling_industry_chemical_refineries_burner_wood_pellets_share': 0.0,\n",
-       " 'external_coupling_industry_chemical_refineries_ccus_capture_potential': 100.0,\n",
-       " 'external_coupling_industry_chemical_refineries_ccus_captured_co2': 100.0,\n",
-       " 'external_coupling_industry_chemical_refineries_ccus_electricity_use': 0.030510017109512,\n",
-       " 'external_coupling_industry_chemical_refineries_electricity': 105.933269100756,\n",
-       " 'external_coupling_industry_chemical_refineries_p2h_capacity': 455.06386174751,\n",
-       " 'external_coupling_industry_chemical_refineries_residual_heat_share': 28.7767084382513,\n",
-       " 'external_coupling_industry_chemical_refineries_steam_hot_water_share': 0.354427591166749,\n",
-       " 'external_coupling_industry_chemical_refineries_useable_heat': 62.5640162386857,\n",
-       " 'external_coupling_energy_distribution_coal_gas_chemical_feedstock_share': 0.0,\n",
-       " 'external_coupling_energy_distribution_coal_gas_energy_production_share': 99.99,\n",
-       " 'external_coupling_energy_distribution_coal_gas_final_demand_share': 0.010000000000005116,\n",
-       " 'external_coupling_industry_metal_steel_blastfurnace_bof_share': 0.0,\n",
-       " 'external_coupling_industry_metal_steel_ccus_capture_potential': 100.0,\n",
-       " 'external_coupling_industry_metal_steel_ccus_captured_co2': 52.5547546810199,\n",
-       " 'external_coupling_industry_metal_steel_ccus_electricity_use': 0.57,\n",
-       " 'external_coupling_industry_metal_steel_cyclonefurnace_bof_share': 0.0,\n",
-       " 'external_coupling_industry_metal_steel_dri_hydrogen_share': 0.0,\n",
-       " 'external_coupling_industry_metal_steel_dri_network_gas_share': 0.0,\n",
-       " 'external_coupling_industry_metal_steel_efficiency': 7.31410052617644,\n",
-       " 'external_coupling_industry_metal_steel_energetic_coal_gas_share': 0.0,\n",
-       " 'external_coupling_industry_metal_steel_energetic_coal_share': 7.76726831346224,\n",
-       " 'external_coupling_industry_metal_steel_energetic_cokes_share': 0.0,\n",
-       " 'external_coupling_industry_metal_steel_energetic_crude_oil_share': 0.0,\n",
-       " 'external_coupling_industry_metal_steel_energetic_electricity_share': 22.7926669333398,\n",
-       " 'external_coupling_industry_metal_steel_energetic_hydrogen_share': 23.6267669198569,\n",
-       " 'external_coupling_industry_metal_steel_energetic_network_gas_share': 45.813297833341,\n",
-       " 'external_coupling_industry_metal_steel_energetic_steam_hot_water_share': 0.0,\n",
-       " 'external_coupling_industry_metal_steel_energetic_wood_pellets_share': 0.0,\n",
-       " 'external_coupling_industry_metal_steel_external_coupling_share': 100.0,\n",
-       " 'external_coupling_industry_metal_steel_fixed_om_costs': 316684316.043427,\n",
-       " 'external_coupling_industry_metal_steel_investment_costs': 4309820685.96129,\n",
-       " 'external_coupling_industry_metal_steel_scrap_hbi_eaf_share': 0.0,\n",
-       " 'external_coupling_industry_metal_steel_technical_lifetime': 19.0,\n",
-       " 'external_coupling_industry_metal_steel_total_demand': 97.33,\n",
-       " 'external_coupling_industry_metal_steel_wacc': 0.08,\n",
-       " 'external_coupling_biogenic_waste_max_demand': 27.8493698855199,\n",
-       " 'external_coupling_energy_chp_supercritical_ccs_waste_mix_captured_co2': 58.8235294117647,\n",
-       " 'external_coupling_energy_chp_supercritical_ccs_waste_mix_electrical_efficiency': 15.3827945040516,\n",
-       " 'external_coupling_energy_chp_supercritical_ccs_waste_mix_heat_efficiency': 1.23427917997262,\n",
-       " 'external_coupling_energy_chp_supercritical_waste_mix_capacity': 133.04294558354,\n",
-       " 'external_coupling_energy_chp_supercritical_waste_mix_electrical_efficiency': 15.3827945040516,\n",
-       " 'external_coupling_energy_chp_supercritical_waste_mix_heat_efficiency': 1.23427917997262,\n",
-       " 'external_coupling_non_biogenic_waste_max_demand': 23.3679305603854,\n",
-       " 'external_coupling_waste_mix_biogenic_waste_share': 54.9694458639823,\n",
-       " 'external_coupling_waste_mix_non_biogenic_waste_share': 45.0305541360177,\n",
-       " 'capacity_of_energy_imported_ammonia_baseload': 0.0,\n",
-       " 'max_demand_of_biogenic_waste': 21.38166,\n",
-       " 'max_demand_of_dry_biomass': 62.16023,\n",
-       " 'max_demand_of_oily_biomass': 10.5,\n",
-       " 'max_demand_of_wet_biomass': 109.873,\n",
-       " 'co_firing_biocoal_share': 0.0,\n",
-       " 'co_firing_coal_share': 100.0,\n",
-       " 'capacity_of_energy_chp_ultra_supercritical_coal': 0.0,\n",
-       " 'capacity_of_energy_chp_ultra_supercritical_cofiring_coal': 0.0,\n",
-       " 'capacity_of_energy_power_combined_cycle_coal': 0.0,\n",
-       " 'capacity_of_energy_power_supercritical_coal': 0.0,\n",
-       " 'capacity_of_energy_power_ultra_supercritical_coal': 0.0,\n",
-       " 'capacity_of_energy_power_ultra_supercritical_cofiring_coal': 0.0,\n",
-       " 'capacity_of_energy_power_ultra_supercritical_lignite': 0.0,\n",
-       " 'capacity_of_energy_chp_combined_cycle_network_gas': 56.0,\n",
-       " 'capacity_of_energy_chp_local_engine_network_gas': 0.0,\n",
-       " 'capacity_of_energy_power_combined_cycle_network_gas': 5280.0,\n",
-       " 'capacity_of_energy_power_engine_network_gas': 0.0,\n",
-       " 'capacity_of_energy_power_turbine_network_gas': 9.0,\n",
-       " 'capacity_of_energy_power_ultra_supercritical_network_gas': 11.0,\n",
-       " 'capacity_of_energy_power_nuclear_gen2_uranium_oxide': 0.0,\n",
-       " 'capacity_of_energy_power_nuclear_gen3_uranium_oxide': 0.0,\n",
-       " 'capacity_of_energy_power_nuclear_small_modular_reactor_uranium_oxide': 0.0,\n",
-       " 'merit_order_subtype_of_energy_power_nuclear_uranium_oxide': 0.0,\n",
-       " 'capacity_of_energy_power_engine_diesel': 0.0,\n",
-       " 'capacity_of_energy_power_ultra_supercritical_crude_oil': 0.0,\n",
-       " 'energy_mixer_for_gas_power_fuel_bio_oil_share': 0.0,\n",
-       " 'energy_mixer_for_gas_power_fuel_crude_oil_share': 7.9728731956,\n",
-       " 'energy_mixer_for_gas_power_fuel_natural_gas_share': 92.0271268045,\n",
-       " 'fuel_production_coal': 0.0,\n",
-       " 'fuel_production_crude_oil': 0.0,\n",
-       " 'fuel_production_lignite': 0.0,\n",
-       " 'fuel_production_natural_gas': 26.0,\n",
-       " 'fuel_production_uranium_oxide': 0.0,\n",
-       " 'green_gas_total_share': 37.7,\n",
-       " 'natural_gas_total_share': 62.3,\n",
-       " 'energy_biogas_fermentation_share': 50.0,\n",
-       " 'energy_greengas_gasification_dry_biomass_share': 25.0259259,\n",
-       " 'energy_greengas_gasification_wet_biomass_share': 24.9740741,\n",
-       " 'energy_regasification_lng_share': 1.4544312017,\n",
-       " 'energy_treatment_natural_gas_share': 98.5455687984,\n",
-       " 'capacity_of_agriculture_chp_engine_biogas': 0.0,\n",
-       " 'capacity_of_agriculture_chp_engine_network_gas_dispatchable': 207.0,\n",
-       " 'capacity_of_agriculture_chp_engine_network_gas_must_run': 0.0,\n",
-       " 'capacity_of_agriculture_chp_wood_pellets': 0.0,\n",
-       " 'capacity_of_energy_heat_burner_ht_coal': 0.0,\n",
-       " 'capacity_of_energy_heat_burner_ht_crude_oil': 0.0,\n",
-       " 'capacity_of_energy_heat_burner_ht_hydrogen': 0.0,\n",
-       " 'capacity_of_energy_heat_burner_ht_network_gas': 1000.0,\n",
-       " 'capacity_of_energy_heat_burner_ht_waste_mix': 0.0,\n",
-       " 'capacity_of_energy_heat_burner_ht_wood_pellets': 200.0,\n",
-       " 'capacity_of_energy_heat_heatpump_water_water_ht_electricity': 1500.0,\n",
-       " 'capacity_of_energy_heat_solar_ht_solar_thermal': 2500.0,\n",
-       " 'capacity_of_energy_heat_well_deep_ht_geothermal': 1400.0,\n",
-       " 'volume_of_ht_imported_heat': 0.0,\n",
-       " 'volume_of_ht_residual_heat': 25.714236461457922,\n",
-       " 'energy_heat_network_storage_ht_loss_share': 30.0000068049,\n",
-       " 'energy_heat_network_storage_ht_steam_hot_water_output_capacity_share': 200.0,\n",
-       " 'heat_storage_enabled_ht': 1.0,\n",
-       " 'energy_heat_distribution_ht_loss_share': 15.0,\n",
-       " 'co2_emissions_of_imported_heat': 35.97,\n",
-       " 'capacity_of_industry_chp_combined_cycle_gas_power_fuelmix': 478.0,\n",
-       " 'capacity_of_industry_chp_engine_gas_power_fuelmix': 62.0,\n",
-       " 'capacity_of_industry_chp_turbine_gas_power_fuelmix': 647.0,\n",
-       " 'capacity_of_industry_chp_turbine_hydrogen': 0.0,\n",
-       " 'capacity_of_industry_chp_ultra_supercritical_coal': 0.0,\n",
-       " 'capacity_of_industry_chp_wood_pellets': 0.0,\n",
-       " 'capacity_of_industry_heat_burner_coal': 0.0,\n",
-       " 'capacity_of_industry_heat_burner_crude_oil': 0.0,\n",
-       " 'capacity_of_industry_heat_burner_hydrogen': 0.0,\n",
-       " 'capacity_of_industry_heat_burner_lignite': 0.0,\n",
-       " 'capacity_of_industry_heat_well_geothermal': 0.0,\n",
-       " 'capacity_of_energy_hydrogen_ammonia_reformer_must_run': 0.0,\n",
-       " 'capacity_of_energy_hydrogen_autothermal_reformer_must_run': 0.0,\n",
-       " 'capacity_of_energy_hydrogen_biomass_gasification': 201.59999999999997,\n",
-       " 'capacity_of_energy_hydrogen_solar_pv_solar_radiation': 0.0,\n",
-       " 'capacity_of_energy_hydrogen_steam_methane_reformer_must_run': 2422.711775504852,\n",
-       " 'capacity_of_energy_hydrogen_wind_turbine_offshore': 2640.0,\n",
-       " 'capacity_of_energy_imported_hydrogen_baseload': 5459.0,\n",
-       " 'capacity_of_energy_hydrogen_storage_salt_cavern': 428.64444379753854,\n",
-       " 'volume_of_energy_hydrogen_storage_salt_cavern': 11.151657026441995,\n",
-       " 'energy_hydrogen_distribution_compressed_trucks_share': 1.0,\n",
-       " 'energy_hydrogen_transport_pipelines_share': 99.0,\n",
-       " 'agriculture_bio_kerosene_in_crude_oil_share': 0.0,\n",
-       " 'agriculture_biodiesel_in_crude_oil_share': 53.5628368135,\n",
-       " 'agriculture_diesel_in_crude_oil_share': 42.975430639,\n",
-       " 'agriculture_kerosene_in_crude_oil_share': 0.0,\n",
-       " 'agriculture_lpg_in_crude_oil_share': 3.4617325477,\n",
-       " 'agriculture_other_bio_oil_in_crude_oil_share': 0.0,\n",
-       " 'agriculture_other_oil_in_crude_oil_share': 0.0,\n",
-       " 'buildings_bio_kerosene_in_crude_oil_share': 0.0,\n",
-       " 'buildings_biodiesel_in_crude_oil_share': 0.0,\n",
-       " 'buildings_diesel_in_crude_oil_share': 54.3798623065,\n",
-       " 'buildings_kerosene_in_crude_oil_share': 0.114329433,\n",
-       " 'buildings_lpg_in_crude_oil_share': 42.7920472269,\n",
-       " 'buildings_other_bio_oil_in_crude_oil_share': 2.3839238021,\n",
-       " 'buildings_other_oil_in_crude_oil_share': 0.3298372318,\n",
-       " 'households_bio_kerosene_in_crude_oil_share': 0.0,\n",
-       " 'households_biodiesel_in_crude_oil_share': 0.0,\n",
-       " 'households_diesel_in_crude_oil_share': 20.1462563364,\n",
-       " 'households_kerosene_in_crude_oil_share': 15.5535857733,\n",
-       " 'households_lpg_in_crude_oil_share': 64.3001578904,\n",
-       " 'households_other_bio_oil_in_crude_oil_share': 0.0,\n",
-       " 'households_other_oil_in_crude_oil_share': 0.0,\n",
-       " 'industry_bio_kerosene_in_crude_oil_share': 0.0,\n",
-       " 'industry_biodiesel_in_crude_oil_share': 0.035695073,\n",
-       " 'industry_diesel_in_crude_oil_share': 0.006797406,\n",
-       " 'industry_kerosene_in_crude_oil_share': 0.0,\n",
-       " 'industry_lpg_in_crude_oil_share': 0.526530287,\n",
-       " 'industry_other_bio_oil_in_crude_oil_share': 33.70284273,\n",
-       " 'industry_other_oil_in_crude_oil_share': 65.72813451,\n",
-       " 'capacity_of_energy_chp_local_engine_biogas': 105.2173341123,\n",
-       " 'capacity_of_energy_chp_local_wood_pellets_dispatchable': 49.4967396253,\n",
-       " 'capacity_of_energy_power_geothermal': 0.0,\n",
-       " 'capacity_of_energy_power_hydro_river': 37.0013815462,\n",
-       " 'capacity_of_energy_power_combined_cycle_hydrogen': 3520.0,\n",
-       " 'capacity_of_energy_power_turbine_hydrogen': 7040.0,\n",
-       " 'capacity_of_buildings_solar_pv_solar_radiation': 44300.0,\n",
-       " 'capacity_of_energy_battery_solar_pv_solar_radiation': 0.0,\n",
-       " 'capacity_of_energy_power_solar_pv_offshore': 0.0,\n",
-       " 'capacity_of_energy_power_solar_pv_solar_radiation': 41800.0,\n",
-       " 'capacity_of_households_solar_pv_solar_radiation': 40000.0,\n",
-       " 'capacity_of_energy_chp_supercritical_waste_mix': 894.6490091117,\n",
-       " 'capacity_of_energy_power_supercritical_waste_mix': 0.0,\n",
-       " 'capacity_of_energy_battery_wind_turbine_inland': 0.0,\n",
-       " 'capacity_of_energy_power_wind_turbine_coastal': 4000.0,\n",
-       " 'capacity_of_energy_power_wind_turbine_inland': 8100.0,\n",
-       " 'capacity_of_energy_power_wind_turbine_offshore': 32000.0}"
-      ]
-     },
-     "execution_count": 18,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "# We also distinguish between inputs and user_values. Usually user values are more interesting:\n",
-    "user_values = scenario.user_values()\n",
-    "# Check if we can make this also to_dataframe\n",
-    "user_values"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 19,
-   "id": "fca99519",
-   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Empty DataFrame\n",
-      "Columns: []\n",
-      "Index: []\n"
-     ]
-    }
-   ],
-   "source": [
-    "# Execute gqueries to fetch data from ETM (incl. units)\n",
-    "gqueries = scenario.results()\n",
-    "print(gqueries)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "fd5267db",
-   "metadata": {},
-   "source": [
-    "There are no default gqueries, you need to specify them yourself - hence the empty dataframe ."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 20,
-   "id": "ed984767",
-   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "                              future\n",
-      "gquery              unit            \n",
-      "dashboard_emissions factor -0.780545\n"
-     ]
-    }
-   ],
-   "source": [
-    "scenario.add_queries([\"dashboard_emissions\"])\n",
-    "gqueries = scenario.results()\n",
-    "print(gqueries)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "5b0d61ec",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Optional: Fetch hourly electricity price profiles from ETM\n",
-    "custom_curves = scenario.custom_curves_series()\n",
-    "for key in custom_curves: print(key)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "ddd8fa69",
-   "metadata": {},
-   "source": [
-    "#TODO: Discuss\n",
-    "\n",
-    "Do you want a convenient way to only get the custom curves related to electricity price? Or are you more interested in the carrier curves? "
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "6a57a5bf",
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "{'merit_order':       agriculture_chp_engine_biogas.output (MW)  \\\n",
-       " 0                                           0.0   \n",
-       " 1                                           0.0   \n",
-       " 2                                           0.0   \n",
-       " 3                                           0.0   \n",
-       " 4                                           0.0   \n",
-       " ...                                         ...   \n",
-       " 8755                                        0.0   \n",
-       " 8756                                        0.0   \n",
-       " 8757                                        0.0   \n",
-       " 8758                                        0.0   \n",
-       " 8759                                        0.0   \n",
-       " \n",
-       "       agriculture_chp_engine_network_gas_dispatchable.output (MW)  \\\n",
-       " 0                                                   0.0             \n",
-       " 1                                                   0.0             \n",
-       " 2                                                   0.0             \n",
-       " 3                                                   0.0             \n",
-       " 4                                                   0.0             \n",
-       " ...                                                 ...             \n",
-       " 8755                                                0.0             \n",
-       " 8756                                                0.0             \n",
-       " 8757                                                0.0             \n",
-       " 8758                                                0.0             \n",
-       " 8759                                                0.0             \n",
-       " \n",
-       "       agriculture_chp_engine_network_gas_must_run.output (MW)  \\\n",
-       " 0                                                   0.0         \n",
-       " 1                                                   0.0         \n",
-       " 2                                                   0.0         \n",
-       " 3                                                   0.0         \n",
-       " 4                                                   0.0         \n",
-       " ...                                                 ...         \n",
-       " 8755                                                0.0         \n",
-       " 8756                                                0.0         \n",
-       " 8757                                                0.0         \n",
-       " 8758                                                0.0         \n",
-       " 8759                                                0.0         \n",
-       " \n",
-       "       agriculture_chp_wood_pellets.output (MW)  \\\n",
-       " 0                                          0.0   \n",
-       " 1                                          0.0   \n",
-       " 2                                          0.0   \n",
-       " 3                                          0.0   \n",
-       " 4                                          0.0   \n",
-       " ...                                        ...   \n",
-       " 8755                                       0.0   \n",
-       " 8756                                       0.0   \n",
-       " 8757                                       0.0   \n",
-       " 8758                                       0.0   \n",
-       " 8759                                       0.0   \n",
-       " \n",
-       "       agriculture_flexibility_p2h_hydrogen_electricity.output (MW)  \\\n",
-       " 0                                                   0.0              \n",
-       " 1                                                   0.0              \n",
-       " 2                                                   0.0              \n",
-       " 3                                                   0.0              \n",
-       " 4                                                   0.0              \n",
-       " ...                                                 ...              \n",
-       " 8755                                                0.0              \n",
-       " 8756                                                0.0              \n",
-       " 8757                                                0.0              \n",
-       " 8758                                                0.0              \n",
-       " 8759                                                0.0              \n",
-       " \n",
-       "       agriculture_flexibility_p2h_network_gas_electricity.output (MW)  \\\n",
-       " 0                                                   0.0                 \n",
-       " 1                                                   0.0                 \n",
-       " 2                                                   0.0                 \n",
-       " 3                                                   0.0                 \n",
-       " 4                                                   0.0                 \n",
-       " ...                                                 ...                 \n",
-       " 8755                                                0.0                 \n",
-       " 8756                                                0.0                 \n",
-       " 8757                                                0.0                 \n",
-       " 8758                                                0.0                 \n",
-       " 8759                                                0.0                 \n",
-       " \n",
-       "       buildings_solar_pv_solar_radiation.output (MW)  \\\n",
-       " 0                                                0.0   \n",
-       " 1                                                0.0   \n",
-       " 2                                                0.0   \n",
-       " 3                                                0.0   \n",
-       " 4                                                0.0   \n",
-       " ...                                              ...   \n",
-       " 8755                                             0.0   \n",
-       " 8756                                             0.0   \n",
-       " 8757                                             0.0   \n",
-       " 8758                                             0.0   \n",
-       " 8759                                             0.0   \n",
-       " \n",
-       "       energy_battery_solar_electricity.output (MW)  \\\n",
-       " 0                                              0.0   \n",
-       " 1                                              0.0   \n",
-       " 2                                              0.0   \n",
-       " 3                                              0.0   \n",
-       " 4                                              0.0   \n",
-       " ...                                            ...   \n",
-       " 8755                                           0.0   \n",
-       " 8756                                           0.0   \n",
-       " 8757                                           0.0   \n",
-       " 8758                                           0.0   \n",
-       " 8759                                           0.0   \n",
-       " \n",
-       "       energy_battery_wind_electricity.output (MW)  \\\n",
-       " 0                                             0.0   \n",
-       " 1                                             0.0   \n",
-       " 2                                             0.0   \n",
-       " 3                                             0.0   \n",
-       " 4                                             0.0   \n",
-       " ...                                           ...   \n",
-       " 8755                                          0.0   \n",
-       " 8756                                          0.0   \n",
-       " 8757                                          0.0   \n",
-       " 8758                                          0.0   \n",
-       " 8759                                          0.0   \n",
-       " \n",
-       "       energy_chp_coal_gas.output (MW)  ...  \\\n",
-       " 0                                 0.0  ...   \n",
-       " 1                                 0.0  ...   \n",
-       " 2                                 0.0  ...   \n",
-       " 3                                 0.0  ...   \n",
-       " 4                                 0.0  ...   \n",
-       " ...                               ...  ...   \n",
-       " 8755                              0.0  ...   \n",
-       " 8756                              0.0  ...   \n",
-       " 8757                              0.0  ...   \n",
-       " 8758                              0.0  ...   \n",
-       " 8759                              0.0  ...   \n",
-       " \n",
-       "       transport_motorcycle_using_electricity.input (MW)  \\\n",
-       " 0                                                6.0868   \n",
-       " 1                                                2.2664   \n",
-       " 2                                                1.0671   \n",
-       " 3                                                0.7418   \n",
-       " 4                                                0.7422   \n",
-       " ...                                                 ...   \n",
-       " 8755                                            29.4081   \n",
-       " 8756                                            19.4375   \n",
-       " 8757                                            11.9942   \n",
-       " 8758                                            10.6178   \n",
-       " 8759                                             9.7232   \n",
-       " \n",
-       "       transport_passenger_train_using_electricity.input (MW)  \\\n",
-       " 0                                              100.6524        \n",
-       " 1                                               37.4773        \n",
-       " 2                                               17.6460        \n",
-       " 3                                               12.2670        \n",
-       " 4                                               12.2725        \n",
-       " ...                                                 ...        \n",
-       " 8755                                           486.2939        \n",
-       " 8756                                           321.4203        \n",
-       " 8757                                           198.3364        \n",
-       " 8758                                           175.5763        \n",
-       " 8759                                           160.7839        \n",
-       " \n",
-       "       transport_plane_using_electricity.input (MW)  \\\n",
-       " 0                                           2.0642   \n",
-       " 1                                           2.0642   \n",
-       " 2                                           2.0642   \n",
-       " 3                                           2.0642   \n",
-       " 4                                           2.0642   \n",
-       " ...                                            ...   \n",
-       " 8755                                        2.0642   \n",
-       " 8756                                        2.0642   \n",
-       " 8757                                        2.0642   \n",
-       " 8758                                        2.0642   \n",
-       " 8759                                        2.0642   \n",
-       " \n",
-       "       transport_ship_using_electricity.input (MW)  \\\n",
-       " 0                                         29.8321   \n",
-       " 1                                         30.9370   \n",
-       " 2                                         30.9370   \n",
-       " 3                                         30.9370   \n",
-       " 4                                         30.9370   \n",
-       " ...                                           ...   \n",
-       " 8755                                      33.7494   \n",
-       " 8756                                      31.9414   \n",
-       " 8757                                      26.5174   \n",
-       " 8758                                      26.5174   \n",
-       " 8759                                      26.5174   \n",
-       " \n",
-       "       transport_tram_using_electricity.input (MW)  \\\n",
-       " 0                                          1.8122   \n",
-       " 1                                          0.6748   \n",
-       " 2                                          0.3177   \n",
-       " 3                                          0.2209   \n",
-       " 4                                          0.2210   \n",
-       " ...                                           ...   \n",
-       " 8755                                       8.7557   \n",
-       " 8756                                       5.7871   \n",
-       " 8757                                       3.5710   \n",
-       " 8758                                       3.1612   \n",
-       " 8759                                       2.8949   \n",
-       " \n",
-       "       transport_truck_flexibility_p2p_electricity.input (MW)  \\\n",
-       " 0                                                   0.0        \n",
-       " 1                                                   0.0        \n",
-       " 2                                                   0.0        \n",
-       " 3                                                   0.0        \n",
-       " 4                                                   0.0        \n",
-       " ...                                                 ...        \n",
-       " 8755                                                0.0        \n",
-       " 8756                                                0.0        \n",
-       " 8757                                                0.0        \n",
-       " 8758                                                0.0        \n",
-       " 8759                                                0.0        \n",
-       " \n",
-       "       transport_truck_using_electricity.input (MW)  \\\n",
-       " 0                                         301.1724   \n",
-       " 1                                         255.8993   \n",
-       " 2                                         255.7102   \n",
-       " 3                                         255.7102   \n",
-       " 4                                         255.7562   \n",
-       " ...                                            ...   \n",
-       " 8755                                     3632.1744   \n",
-       " 8756                                     3654.7956   \n",
-       " 8757                                     3290.3259   \n",
-       " 8758                                     2912.0708   \n",
-       " 8759                                     2633.8673   \n",
-       " \n",
-       "       transport_van_flexibility_p2p_electricity.input (MW)  \\\n",
-       " 0                                                   0.0      \n",
-       " 1                                                   0.0      \n",
-       " 2                                                   0.0      \n",
-       " 3                                                   0.0      \n",
-       " 4                                                   0.0      \n",
-       " ...                                                 ...      \n",
-       " 8755                                                0.0      \n",
-       " 8756                                                0.0      \n",
-       " 8757                                                0.0      \n",
-       " 8758                                                0.0      \n",
-       " 8759                                                0.0      \n",
-       " \n",
-       "       transport_van_using_electricity.input (MW)  deficit  \n",
-       " 0                                       225.7143      0.0  \n",
-       " 1                                       183.4868      0.0  \n",
-       " 2                                       164.2823      0.0  \n",
-       " 3                                       152.3737      0.0  \n",
-       " 4                                       145.7294      0.0  \n",
-       " ...                                          ...      ...  \n",
-       " 8755                                   1951.6292      0.0  \n",
-       " 8756                                   1756.9386      0.0  \n",
-       " 8757                                   1423.4249      0.0  \n",
-       " 8758                                   1141.5322      0.0  \n",
-       " 8759                                   1016.2915      0.0  \n",
-       " \n",
-       " [8760 rows x 284 columns],\n",
-       " 'electricity_price':       Price (Euros)\n",
-       " 0             22.00\n",
-       " 1             22.00\n",
-       " 2             14.48\n",
-       " 3              0.01\n",
-       " 4              0.02\n",
-       " ...             ...\n",
-       " 8755           0.01\n",
-       " 8756           0.01\n",
-       " 8757           0.01\n",
-       " 8758           0.02\n",
-       " 8759           0.00\n",
-       " \n",
-       " [8760 rows x 1 columns],\n",
-       " 'residual_load':       Electricity imbalance (MW)  Heat network imbalance (MW)  \\\n",
-       " 0                  -13983.316952                 -7650.762461   \n",
-       " 1                  -15074.662973                 -2063.605451   \n",
-       " 2                  -16392.624827                  -236.749238   \n",
-       " 3                  -18084.064350                 -7257.637108   \n",
-       " 4                  -18698.295084                 -6777.697551   \n",
-       " ...                          ...                          ...   \n",
-       " 8755               -10461.245439                 -2908.084718   \n",
-       " 8756               -12120.991687                 -3196.334417   \n",
-       " 8757               -14277.783965                 -3698.939229   \n",
-       " 8758               -12769.564116                 -4265.195281   \n",
-       " 8759               -14036.141852                 -5382.621751   \n",
-       " \n",
-       "       Network gas imbalance (MW)  Hydrogen imbalance (MW)  \\\n",
-       " 0                   -4781.342416            -10122.196681   \n",
-       " 1                   -3483.696797             -9409.232452   \n",
-       " 2                   -3475.263835             -9413.765713   \n",
-       " 3                   -4570.081283            -10137.602583   \n",
-       " 4                   -4175.876527            -10138.862839   \n",
-       " ...                          ...                      ...   \n",
-       " 8755                -1895.359218            -10120.066139   \n",
-       " 8756                -2098.834088            -10121.282579   \n",
-       " 8757                -2551.241935            -10122.752998   \n",
-       " 8758                -2865.165589            -10123.043235   \n",
-       " 8759                -3823.803492            -10123.672193   \n",
-       " \n",
-       "       Network gas imbalance (short timescale) (MW)  \\\n",
-       " 0                                     -1833.873449   \n",
-       " 1                                      -574.860579   \n",
-       " 2                                      -605.611833   \n",
-       " 3                                     -1739.687791   \n",
-       " 4                                     -1383.891692   \n",
-       " ...                                            ...   \n",
-       " 8755                                   1241.238351   \n",
-       " 8756                                   1013.073005   \n",
-       " 8757                                    519.009108   \n",
-       " 8758                                    160.843578   \n",
-       " 8759                                   -837.070806   \n",
-       " \n",
-       "       Network gas imbalance (long timescale) (MW)  \\\n",
-       " 0                                    -2947.468967   \n",
-       " 1                                    -2908.836218   \n",
-       " 2                                    -2869.652003   \n",
-       " 3                                    -2830.393493   \n",
-       " 4                                    -2791.984835   \n",
-       " ...                                           ...   \n",
-       " 8755                                 -3136.597568   \n",
-       " 8756                                 -3111.907093   \n",
-       " 8757                                 -3070.251043   \n",
-       " 8758                                 -3026.009167   \n",
-       " 8759                                 -2986.732687   \n",
-       " \n",
-       "       Hydrogen imblanace (short timescale) (MW)  \\\n",
-       " 0                                   -171.967531   \n",
-       " 1                                    529.822127   \n",
-       " 2                                    514.208089   \n",
-       " 3                                   -220.919672   \n",
-       " 4                                   -232.647398   \n",
-       " ...                                         ...   \n",
-       " 8755                                 -83.391025   \n",
-       " 8756                                -103.105800   \n",
-       " 8757                                -122.762259   \n",
-       " 8758                                -140.510517   \n",
-       " 8759                                -159.955285   \n",
-       " \n",
-       "       Hydrogen imblanace (long timescale) (MW)  \n",
-       " 0                                 -9950.229150  \n",
-       " 1                                 -9939.054580  \n",
-       " 2                                 -9927.973802  \n",
-       " 3                                 -9916.682911  \n",
-       " 4                                 -9906.215441  \n",
-       " ...                                        ...  \n",
-       " 8755                             -10036.675114  \n",
-       " 8756                             -10018.176778  \n",
-       " 8757                              -9999.990739  \n",
-       " 8758                              -9982.532718  \n",
-       " 8759                              -9963.716908  \n",
-       " \n",
-       " [8760 rows x 8 columns]}"
-      ]
-     },
-     "execution_count": 21,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "# Optional: Fetch hourly carrier profiles from ETM\n",
-    "output_curves = scenario.get_output_curves(carrier_type='electricity')\n",
-    "# Also serval carriers at ones. One carrier per sheet, with carrier name as sheet name\n",
-    "output_curves"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "f29ee72f",
-   "metadata": {},
-   "source": [
-    "As you can see, this returns a dictionary of dataframes, including the merit_order, electricity_price and residual_load dataframes. If you want a specific output, just request it:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "5366a81c",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "electricity_price = scenario.output_curve(curve_name='electricity_price')\n",
-    "# Also in it's own sheet\n",
-    "# Hydrogen price also in it's own sheet\n",
-    "\n",
-    "# Nice to have: also make other downloads like sankey and energy_flows available\n",
-    "electricity_price"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "638116c5",
-   "metadata": {},
-   "source": [
-    "**Export scenarios to Excel**\n",
-    "\n",
-    "Just like with the original implementation, everything in the scenario can be exported to an excel file. This is done via a \"Scenario Packer\" which organises the data usefully to display via excel.\n",
-    "\n",
-    "This example is simplified in the sense that we just add everything in the scenario to the packer, but you can also add specific inputs, gqueries curves etc to a packer (see more examples in the scenario_to_excel notebook)."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "4266f27d",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "from pyetm.models import ScenarioPacker\n",
-    "\n",
-    "packer = ScenarioPacker()\n",
-    "packer.add(scenario, scenario2, scenario3)\n",
-    "packer.to_excel('folder/my_excel.xlsx')\n",
-    "\n",
-    "# Specify explicitly what to export in to_excel\n",
-    "packer.to_excel('folder/my_excel.xlsx', include_curves=True)"
-   ]
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "pyetm-FWBOHxp3",
-   "language": "python",
-   "name": "python3"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.12.11"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 5
-}
diff --git a/examples/scenario_to_excel.ipynb b/examples/scenario_to_excel.ipynb
deleted file mode 100644
index 641f69b..0000000
--- a/examples/scenario_to_excel.ipynb
+++ /dev/null
@@ -1,282 +0,0 @@
-{
- "cells": [
-  {
-   "cell_type": "markdown",
-   "id": "930300db",
-   "metadata": {},
-   "source": [
-    "## Preamble"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 1,
-   "id": "4e9a9e7c",
-   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Environment setup complete\n",
-      "  Using ETM API at     https://beta.engine.energytransitionmodel.com/api/v3\n",
-      "  Token loaded?        True\n",
-      "API connection ready\n"
-     ]
-    }
-   ],
-   "source": [
-    "from example_helpers import setup_notebook\n",
-    "from pyetm.models import Scenario\n",
-    "\n",
-    "setup_notebook()"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "1f4414c0",
-   "metadata": {},
-   "source": [
-    "## Picking my scenario"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "c3cd461f",
-   "metadata": {},
-   "source": [
-    "Use an API session ID to load up one of your scenarios.\n"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 2,
-   "id": "c4f42def",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# Example beta scenario\n",
-    "scenario = Scenario.load(2704433)\n",
-    "\n",
-    "# Example pro scenario\n",
-    "# scenario = Scenario.load(1340415)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "8d946757",
-   "metadata": {},
-   "source": [
-    "## Create a Packer\n",
-    "\n",
-    "The scenario packer allows you to collect scenarios and define what information you want to extract from all of them. It helps to collect all info into dataframes or Excel.\n",
-    "\n",
-    "- **Main info** with `main_info()` you display all meta information about the scenarios, like area code and end years;\n",
-    "\n",
-    "- Input settings\n",
-    "    - **Inputs** `inputs()` displays all inputs for the scenario including their unit, default and user-set values;\n",
-    "    - **Custom curves** using `custom_curves()` you can retrieve and display the curves uploaded to the scenario;\n",
-    "    - **Sortables** `sortables()` shows all user sortables set for the scenario, like heat network orders, etc;\n",
-    "- Outputs:\n",
-    "    - **GQuery results** with `gquery_results()` you can retrieve the queries that were prepared for the scenarios;\n",
-    "    - **Output curves** `output_curves()` downloads and shows the carreir curves requested for the scenarios.\n",
-    "\n",
-    "\n",
-    "Scenarios can be added to a packer in multiple ways:\n",
-    "\n",
-    "- `add(*scenarios)`  will ready the scenario for all 6 packs (or Excel tabs) described above\n",
-    "- `add_inputs(*scenarios)` will only ready the scenarios for the inputs dataframe or Excel tab\n",
-    "- `add_sortables(*scenarios)` will only ready the scenarios for the sortables dataframe or Excel tab\n",
-    "- `add_custom_curves(*scenarios)` will only ready the scenarios for the custom_curves dataframe or Excel tab\n",
-    "- `add_output_curves(*scenarios)` will only ready the scenarios for the output_curves dataframe or Excel tab\n",
-    "\n",
-    "If a scenario is added in any of the individual packs, it will be automatically added for main info and prepared gqueries."
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "a9d9214a",
-   "metadata": {},
-   "source": [
-    "-----------------\n",
-    "\n",
-    "NOTE: the packer currently only works for a single scenario!\n",
-    "\n",
-    "-----------------"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 3,
-   "id": "fa8ac6ab",
-   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "                                                        2704434               \\\n",
-      "                                                          value      default   \n",
-      "input                                              unit                        \n",
-      "climate_relevant_co2_biomass_gas_future            %       None          0.0   \n",
-      "climate_relevant_co2_biomass_gas_present           %       None          0.0   \n",
-      "climate_relevant_co2_biomass_liquid_future         %       None          0.0   \n",
-      "climate_relevant_co2_biomass_liquid_present        %       None          0.0   \n",
-      "climate_relevant_co2_biomass_solid_future          %       None          0.0   \n",
-      "...                                                         ...          ...   \n",
-      "capacity_of_energy_battery_wind_turbine_inland     MW      None          0.0   \n",
-      "capacity_of_energy_power_hybrid_wind_turbine_of... MW      None          0.0   \n",
-      "capacity_of_energy_power_wind_turbine_coastal      MW      None  1106.189347   \n",
-      "capacity_of_energy_power_wind_turbine_inland       MW      None   2421.16051   \n",
-      "capacity_of_energy_power_wind_turbine_offshore     MW      None   956.994305   \n",
-      "\n",
-      "                                                         2704433           \n",
-      "                                                           value  default  \n",
-      "input                                              unit                    \n",
-      "climate_relevant_co2_biomass_gas_future            %         0.0      0.0  \n",
-      "climate_relevant_co2_biomass_gas_present           %         0.0      0.0  \n",
-      "climate_relevant_co2_biomass_liquid_future         %         0.0      0.0  \n",
-      "climate_relevant_co2_biomass_liquid_present        %         0.0      0.0  \n",
-      "climate_relevant_co2_biomass_solid_future          %         0.0      0.0  \n",
-      "...                                                          ...      ...  \n",
-      "capacity_of_energy_battery_wind_turbine_inland     MW        0.0      0.0  \n",
-      "capacity_of_energy_power_hybrid_wind_turbine_of... MW       None      0.0  \n",
-      "capacity_of_energy_power_wind_turbine_coastal      MW        0.0      0.0  \n",
-      "capacity_of_energy_power_wind_turbine_inland       MW    10000.0  10000.0  \n",
-      "capacity_of_energy_power_wind_turbine_offshore     MW    38000.0  38000.0  \n",
-      "\n",
-      "[1318 rows x 4 columns]\n",
-      "          2704434  2704433\n",
-      "end_year     2050     2050\n",
-      "private     False    False\n",
-      "area_code  nl2019   nl2019\n",
-      "template     None  2402170\n"
-     ]
-    }
-   ],
-   "source": [
-    "from pyetm.models import ScenarioPacker\n",
-    "\n",
-    "packer = ScenarioPacker()\n",
-    "\n",
-    "scenario2 = Scenario.load(2704434)\n",
-    "# Ready the scenario for inputs\n",
-    "packer.add_inputs(scenario)\n",
-    "packer.add_inputs(scenario2)\n",
-    "\n",
-    "# Main info is automatically readied\n",
-    "print(packer.inputs())\n",
-    "print(packer.main_info())\n"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "ed1cefd4",
-   "metadata": {},
-   "source": [
-    "When you add gqueries to a scenario which is connected to the packer, these queries will be readied for the pack."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 4,
-   "id": "739e2a12",
-   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "                                                      2704433\n",
-      "                                                       future\n",
-      "dashboard_total_costs                     bln_euro  64.226691\n",
-      "dashboard_co2_emissions_versus_start_year factor    -1.026581\n"
-     ]
-    }
-   ],
-   "source": [
-    "scenario.add_queries(\n",
-    "    [\"dashboard_total_costs\", \"dashboard_co2_emissions_versus_start_year\"]\n",
-    ")\n",
-    "\n",
-    "print(packer.gquery_results())"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "c924ac3d",
-   "metadata": {},
-   "source": [
-    "Queries can be added on-the-go. When the packer is exported to Excel, all requested queries will show up."
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 5,
-   "id": "ce5e2bdb",
-   "metadata": {},
-   "outputs": [
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "/Users/noracato/code/work/packages/pyetm/src/pyetm/models/scenario_packer.py:245: FutureWarning: Downcasting object dtype arrays on .fillna, .ffill, .bfill is deprecated and will change in a future version. Call result.infer_objects(copy=False) instead. To opt-in to the future behavior, set `pd.set_option('future.no_silent_downcasting', True)`\n",
-      "  add_frame(sheet_name, df.fillna(''), workbook, column_width=18)\n"
-     ]
-    }
-   ],
-   "source": [
-    "scenario.add_queries(\n",
-    "    [\"dashboard_emissions\"]\n",
-    ")\n",
-    "\n",
-    "scenario2.add_queries(\n",
-    "    [\"dashboard_emissions\"]\n",
-    ")\n",
-    "\n",
-    "packer.to_excel('my_excel.xlsx')"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "68ce86c3",
-   "metadata": {},
-   "source": [
-    "Output curves are still not packing nicely:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "bffd54b8",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "packer.add_output_curves(scenario)\n",
-    "\n",
-    "packer.to_excel('testing_output_curves.xlsx')"
-   ]
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "pyetm-qKH2ozgc",
-   "language": "python",
-   "name": "python3"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.12.9"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 5
-}
diff --git a/examples/serialization_deserialization.ipynb b/examples/serialization_deserialization.ipynb
deleted file mode 100644
index 0725fbb..0000000
--- a/examples/serialization_deserialization.ipynb
+++ /dev/null
@@ -1,241 +0,0 @@
-{
- "cells": [
-  {
-   "cell_type": "markdown",
-   "id": "a1b2c3d4",
-   "metadata": {},
-   "source": [
-    "# Input Serialization/Deserialization\n",
-    "\n",
-    "This notebook demonstrates the serialization and deserialization capabilities of the `Inputs` model.\n",
-    "We'll load a scenario, serialize its inputs to a DataFrame, deserialize them back to objects,\n",
-    "and verify with some stats.\n",
-    "\n",
-    "## Setup"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 6,
-   "id": "setup_cell",
-   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Environment setup complete\n",
-      "  Using ETM API at     https://beta.engine.energytransitionmodel.com/api/v3\n",
-      "  Token loaded?        True\n",
-      "API connection ready\n"
-     ]
-    }
-   ],
-   "source": [
-    "from example_helpers import setup_notebook\n",
-    "from pyetm.models import Scenario\n",
-    "\n",
-    "setup_notebook()\n",
-    "scenario = Scenario.load(2690288)\n",
-    "scenario.update_user_values({\n",
-    "    \"climate_relevant_co2_biomass_gas_future\": 20.0\n",
-    "})"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "original_data",
-   "metadata": {},
-   "source": [
-    "## Step 1: Examine Original Inputs\n",
-    "\n",
-    "Let's look at the original inputs and collect some basic statistics:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 7,
-   "id": "examine_original",
-   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Some inputs:\n",
-      "  climate_relevant_co2_biomass_gas_future (%): default=0.0, user=20.0\n",
-      "  climate_relevant_co2_biomass_gas_present (%): default=0.0, user=None\n",
-      "  climate_relevant_co2_biomass_liquid_future (%): default=0.0, user=None\n"
-     ]
-    }
-   ],
-   "source": [
-    "original_inputs = scenario.inputs\n",
-    "\n",
-    "print(\"Some inputs:\")\n",
-    "for i, input in enumerate(original_inputs):\n",
-    "    if i < 3:\n",
-    "        print(f\"  {input.key} ({input.unit}): default={input.default}, user={input.user}\")\n",
-    "    elif i == 3:\n",
-    "        break"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "serialization",
-   "metadata": {},
-   "source": [
-    "## Step 2: Serialize to DataFrame\n",
-    "\n",
-    "Convert the inputs to a DataFrame for inspection and storage:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 9,
-   "id": "serialize",
-   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "DataFrame shape: (1318, 5)\n",
-      "DataFrame index: ['input', 'unit']\n",
-      "DataFrame columns: ['user', 'default', 'min', 'max', 'disabled']\n",
-      "                                                  user default  min    max  \\\n",
-      "input                                       unit                             \n",
-      "climate_relevant_co2_biomass_gas_future     %     20.0     0.0  0.0  100.0   \n",
-      "climate_relevant_co2_biomass_gas_present    %      NaN     0.0  0.0  100.0   \n",
-      "climate_relevant_co2_biomass_liquid_future  %      NaN     0.0  0.0  100.0   \n",
-      "climate_relevant_co2_biomass_liquid_present %      NaN     0.0  0.0  100.0   \n",
-      "climate_relevant_co2_biomass_solid_future   %      NaN     0.0  0.0  100.0   \n",
-      "\n",
-      "                                                  disabled  \n",
-      "input                                       unit            \n",
-      "climate_relevant_co2_biomass_gas_future     %        False  \n",
-      "climate_relevant_co2_biomass_gas_present    %        False  \n",
-      "climate_relevant_co2_biomass_liquid_future  %        False  \n",
-      "climate_relevant_co2_biomass_liquid_present %        False  \n",
-      "climate_relevant_co2_biomass_solid_future   %        False  \n"
-     ]
-    }
-   ],
-   "source": [
-    "# Serialize to DataFrame with multiple columns\n",
-    "df = original_inputs.to_df(columns=[\"user\", \"default\", \"min\", \"max\", \"disabled\"])\n",
-    "\n",
-    "print(f\"DataFrame shape: {df.shape}\")\n",
-    "print(f\"DataFrame index: {df.index.names}\")\n",
-    "print(f\"DataFrame columns: {list(df.columns)}\")\n",
-    "\n",
-    "print(df.head())"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "deserialization",
-   "metadata": {},
-   "source": [
-    "## Step 3: Deserialize from DataFrame\n",
-    "\n",
-    "Convert the DataFrame back to Input objects:"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "deserialize",
-   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "DataFrame shape: (1318, 1)\n",
-      "DataFrame index: ['input', 'unit']\n",
-      "DataFrame columns: ['user']\n",
-      "                                                  user\n",
-      "input                                       unit      \n",
-      "climate_relevant_co2_biomass_gas_future     %     20.0\n",
-      "climate_relevant_co2_biomass_gas_present    %      NaN\n",
-      "climate_relevant_co2_biomass_liquid_future  %      NaN\n",
-      "climate_relevant_co2_biomass_liquid_present %      NaN\n",
-      "climate_relevant_co2_biomass_solid_future   %      NaN\n",
-      "                                                  user default  min    max  \\\n",
-      "input                                       unit                             \n",
-      "climate_relevant_co2_biomass_gas_future     %     20.0     0.0  0.0  100.0   \n",
-      "climate_relevant_co2_biomass_gas_present    %      NaN     0.0  0.0  100.0   \n",
-      "climate_relevant_co2_biomass_liquid_future  %      NaN     0.0  0.0  100.0   \n",
-      "climate_relevant_co2_biomass_liquid_present %      NaN     0.0  0.0  100.0   \n",
-      "climate_relevant_co2_biomass_solid_future   %      NaN     0.0  0.0  100.0   \n",
-      "\n",
-      "                                                  disabled  \n",
-      "input                                       unit            \n",
-      "climate_relevant_co2_biomass_gas_future     %        False  \n",
-      "climate_relevant_co2_biomass_gas_present    %        False  \n",
-      "climate_relevant_co2_biomass_liquid_future  %        False  \n",
-      "climate_relevant_co2_biomass_liquid_present %        False  \n",
-      "climate_relevant_co2_biomass_solid_future   %        False  \n",
-      "\n",
-      "No deserialization warnings!\n",
-      "Same inputs:\n",
-      "  climate_relevant_co2_biomass_gas_future (%): default=0.0, user=20.0\n",
-      "  climate_relevant_co2_biomass_gas_present (%): default=0.0, user=None\n",
-      "  climate_relevant_co2_biomass_liquid_future (%): default=0.0, user=None\n"
-     ]
-    }
-   ],
-   "source": [
-    "scenario.set_user_values_from_dataframe(df)\n",
-    "reconstructed_inputs = scenario.inputs\n",
-    "\n",
-    "print(f\"DataFrame shape: {reconstructed_inputs.to_df().shape}\")\n",
-    "print(f\"DataFrame index: {reconstructed_inputs.to_df().index.names}\")\n",
-    "print(f\"DataFrame columns: {list(reconstructed_inputs.to_df().columns)}\")\n",
-    "\n",
-    "print(reconstructed_inputs.to_df().head())\n",
-    "\n",
-    "df_again = reconstructed_inputs.to_df(columns=[\"user\", \"default\", \"min\", \"max\", \"disabled\"])\n",
-    "\n",
-    "print(df_again.head())\n",
-    "\n",
-    "# Check for warnings during deserialization\n",
-    "if reconstructed_inputs.warnings:\n",
-    "    print(f\"\\nDeserialization warnings ({len(reconstructed_inputs.warnings)}):\")\n",
-    "    reconstructed_inputs.show_warnings()\n",
-    "else:\n",
-    "    print(\"\\nNo deserialization warnings!\")\n",
-    "\n",
-    "\n",
-    "print(\"Same inputs:\")\n",
-    "for i, input in enumerate(reconstructed_inputs):\n",
-    "    if i < 3:\n",
-    "        print(f\"  {input.key} ({input.unit}): default={input.default}, user={input.user}\")\n",
-    "    elif i == 3:\n",
-    "        break"
-   ]
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "pyetm-FWBOHxp3",
-   "language": "python",
-   "name": "python3"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.12.11"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 5
-}
diff --git a/inputs/example_input_excel.xlsx b/inputs/example_input_excel.xlsx
new file mode 100644
index 0000000..6e6973e
Binary files /dev/null and b/inputs/example_input_excel.xlsx differ
diff --git a/poetry.lock b/poetry.lock
new file mode 100644
index 0000000..8751606
--- /dev/null
+++ b/poetry.lock
@@ -0,0 +1,3036 @@
+# This file is automatically @generated by Poetry 2.1.1 and should not be changed by hand.
+
+[[package]]
+name = "annotated-types"
+version = "0.7.0"
+description = "Reusable constraint types to use with typing.Annotated"
+optional = false
+python-versions = ">=3.8"
+groups = ["main"]
+files = [
+    {file = "annotated_types-0.7.0-py3-none-any.whl", hash = "sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53"},
+    {file = "annotated_types-0.7.0.tar.gz", hash = "sha256:aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89"},
+]
+
+[[package]]
+name = "anyio"
+version = "4.10.0"
+description = "High-level concurrency and networking framework on top of asyncio or Trio"
+optional = false
+python-versions = ">=3.9"
+groups = ["dev"]
+files = [
+    {file = "anyio-4.10.0-py3-none-any.whl", hash = "sha256:60e474ac86736bbfd6f210f7a61218939c318f43f9972497381f1c5e930ed3d1"},
+    {file = "anyio-4.10.0.tar.gz", hash = "sha256:3f3fae35c96039744587aa5b8371e7e8e603c0702999535961dd336026973ba6"},
+]
+
+[package.dependencies]
+idna = ">=2.8"
+sniffio = ">=1.1"
+typing_extensions = {version = ">=4.5", markers = "python_version < \"3.13\""}
+
+[package.extras]
+trio = ["trio (>=0.26.1)"]
+
+[[package]]
+name = "appnope"
+version = "0.1.4"
+description = "Disable App Nap on macOS >= 10.9"
+optional = false
+python-versions = ">=3.6"
+groups = ["dev"]
+markers = "platform_system == \"Darwin\""
+files = [
+    {file = "appnope-0.1.4-py2.py3-none-any.whl", hash = "sha256:502575ee11cd7a28c0205f379b525beefebab9d161b7c964670864014ed7213c"},
+    {file = "appnope-0.1.4.tar.gz", hash = "sha256:1de3860566df9caf38f01f86f65e0e13e379af54f9e4bee1e66b48f2efffd1ee"},
+]
+
+[[package]]
+name = "argon2-cffi"
+version = "25.1.0"
+description = "Argon2 for Python"
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "argon2_cffi-25.1.0-py3-none-any.whl", hash = "sha256:fdc8b074db390fccb6eb4a3604ae7231f219aa669a2652e0f20e16ba513d5741"},
+    {file = "argon2_cffi-25.1.0.tar.gz", hash = "sha256:694ae5cc8a42f4c4e2bf2ca0e64e51e23a040c6a517a85074683d3959e1346c1"},
+]
+
+[package.dependencies]
+argon2-cffi-bindings = "*"
+
+[[package]]
+name = "argon2-cffi-bindings"
+version = "21.2.0"
+description = "Low-level CFFI bindings for Argon2"
+optional = false
+python-versions = ">=3.6"
+groups = ["dev"]
+markers = "python_version >= \"3.14\""
+files = [
+    {file = "argon2-cffi-bindings-21.2.0.tar.gz", hash = "sha256:bb89ceffa6c791807d1305ceb77dbfacc5aa499891d2c55661c6459651fc39e3"},
+    {file = "argon2_cffi_bindings-21.2.0-cp36-abi3-macosx_10_9_x86_64.whl", hash = "sha256:ccb949252cb2ab3a08c02024acb77cfb179492d5701c7cbdbfd776124d4d2367"},
+    {file = "argon2_cffi_bindings-21.2.0-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9524464572e12979364b7d600abf96181d3541da11e23ddf565a32e70bd4dc0d"},
+    {file = "argon2_cffi_bindings-21.2.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b746dba803a79238e925d9046a63aa26bf86ab2a2fe74ce6b009a1c3f5c8f2ae"},
+    {file = "argon2_cffi_bindings-21.2.0-cp36-abi3-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:58ed19212051f49a523abb1dbe954337dc82d947fb6e5a0da60f7c8471a8476c"},
+    {file = "argon2_cffi_bindings-21.2.0-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:bd46088725ef7f58b5a1ef7ca06647ebaf0eb4baff7d1d0d177c6cc8744abd86"},
+    {file = "argon2_cffi_bindings-21.2.0-cp36-abi3-musllinux_1_1_i686.whl", hash = "sha256:8cd69c07dd875537a824deec19f978e0f2078fdda07fd5c42ac29668dda5f40f"},
+    {file = "argon2_cffi_bindings-21.2.0-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:f1152ac548bd5b8bcecfb0b0371f082037e47128653df2e8ba6e914d384f3c3e"},
+    {file = "argon2_cffi_bindings-21.2.0-cp36-abi3-win32.whl", hash = "sha256:603ca0aba86b1349b147cab91ae970c63118a0f30444d4bc80355937c950c082"},
+    {file = "argon2_cffi_bindings-21.2.0-cp36-abi3-win_amd64.whl", hash = "sha256:b2ef1c30440dbbcba7a5dc3e319408b59676e2e039e2ae11a8775ecf482b192f"},
+    {file = "argon2_cffi_bindings-21.2.0-cp38-abi3-macosx_10_9_universal2.whl", hash = "sha256:e415e3f62c8d124ee16018e491a009937f8cf7ebf5eb430ffc5de21b900dad93"},
+    {file = "argon2_cffi_bindings-21.2.0-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:3e385d1c39c520c08b53d63300c3ecc28622f076f4c2b0e6d7e796e9f6502194"},
+    {file = "argon2_cffi_bindings-21.2.0-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2c3e3cc67fdb7d82c4718f19b4e7a87123caf8a93fde7e23cf66ac0337d3cb3f"},
+    {file = "argon2_cffi_bindings-21.2.0-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6a22ad9800121b71099d0fb0a65323810a15f2e292f2ba450810a7316e128ee5"},
+    {file = "argon2_cffi_bindings-21.2.0-pp37-pypy37_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f9f8b450ed0547e3d473fdc8612083fd08dd2120d6ac8f73828df9b7d45bb351"},
+    {file = "argon2_cffi_bindings-21.2.0-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:93f9bf70084f97245ba10ee36575f0c3f1e7d7724d67d8e5b08e61787c320ed7"},
+    {file = "argon2_cffi_bindings-21.2.0-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:3b9ef65804859d335dc6b31582cad2c5166f0c3e7975f324d9ffaa34ee7e6583"},
+    {file = "argon2_cffi_bindings-21.2.0-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d4966ef5848d820776f5f562a7d45fdd70c2f330c961d0d745b784034bd9f48d"},
+    {file = "argon2_cffi_bindings-21.2.0-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:20ef543a89dee4db46a1a6e206cd015360e5a75822f76df533845c3cbaf72670"},
+    {file = "argon2_cffi_bindings-21.2.0-pp38-pypy38_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ed2937d286e2ad0cc79a7087d3c272832865f779430e0cc2b4f3718d3159b0cb"},
+    {file = "argon2_cffi_bindings-21.2.0-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:5e00316dabdaea0b2dd82d141cc66889ced0cdcbfa599e8b471cf22c620c329a"},
+]
+
+[package.dependencies]
+cffi = ">=1.0.1"
+
+[package.extras]
+dev = ["cogapp", "pre-commit", "pytest", "wheel"]
+tests = ["pytest"]
+
+[[package]]
+name = "argon2-cffi-bindings"
+version = "25.1.0"
+description = "Low-level CFFI bindings for Argon2"
+optional = false
+python-versions = ">=3.9"
+groups = ["dev"]
+markers = "python_version < \"3.14\""
+files = [
+    {file = "argon2_cffi_bindings-25.1.0-cp314-cp314t-macosx_10_13_universal2.whl", hash = "sha256:3d3f05610594151994ca9ccb3c771115bdb4daef161976a266f0dd8aa9996b8f"},
+    {file = "argon2_cffi_bindings-25.1.0-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:8b8efee945193e667a396cbc7b4fb7d357297d6234d30a489905d96caabde56b"},
+    {file = "argon2_cffi_bindings-25.1.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:3c6702abc36bf3ccba3f802b799505def420a1b7039862014a65db3205967f5a"},
+    {file = "argon2_cffi_bindings-25.1.0-cp314-cp314t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a1c70058c6ab1e352304ac7e3b52554daadacd8d453c1752e547c76e9c99ac44"},
+    {file = "argon2_cffi_bindings-25.1.0-cp314-cp314t-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e2fd3bfbff3c5d74fef31a722f729bf93500910db650c925c2d6ef879a7e51cb"},
+    {file = "argon2_cffi_bindings-25.1.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:c4f9665de60b1b0e99bcd6be4f17d90339698ce954cfd8d9cf4f91c995165a92"},
+    {file = "argon2_cffi_bindings-25.1.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:ba92837e4a9aa6a508c8d2d7883ed5a8f6c308c89a4790e1e447a220deb79a85"},
+    {file = "argon2_cffi_bindings-25.1.0-cp314-cp314t-win32.whl", hash = "sha256:84a461d4d84ae1295871329b346a97f68eade8c53b6ed9a7ca2d7467f3c8ff6f"},
+    {file = "argon2_cffi_bindings-25.1.0-cp314-cp314t-win_amd64.whl", hash = "sha256:b55aec3565b65f56455eebc9b9f34130440404f27fe21c3b375bf1ea4d8fbae6"},
+    {file = "argon2_cffi_bindings-25.1.0-cp314-cp314t-win_arm64.whl", hash = "sha256:87c33a52407e4c41f3b70a9c2d3f6056d88b10dad7695be708c5021673f55623"},
+    {file = "argon2_cffi_bindings-25.1.0-cp39-abi3-macosx_10_9_universal2.whl", hash = "sha256:aecba1723ae35330a008418a91ea6cfcedf6d31e5fbaa056a166462ff066d500"},
+    {file = "argon2_cffi_bindings-25.1.0-cp39-abi3-macosx_10_9_x86_64.whl", hash = "sha256:2630b6240b495dfab90aebe159ff784d08ea999aa4b0d17efa734055a07d2f44"},
+    {file = "argon2_cffi_bindings-25.1.0-cp39-abi3-macosx_11_0_arm64.whl", hash = "sha256:7aef0c91e2c0fbca6fc68e7555aa60ef7008a739cbe045541e438373bc54d2b0"},
+    {file = "argon2_cffi_bindings-25.1.0-cp39-abi3-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1e021e87faa76ae0d413b619fe2b65ab9a037f24c60a1e6cc43457ae20de6dc6"},
+    {file = "argon2_cffi_bindings-25.1.0-cp39-abi3-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:d3e924cfc503018a714f94a49a149fdc0b644eaead5d1f089330399134fa028a"},
+    {file = "argon2_cffi_bindings-25.1.0-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:c87b72589133f0346a1cb8d5ecca4b933e3c9b64656c9d175270a000e73b288d"},
+    {file = "argon2_cffi_bindings-25.1.0-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:1db89609c06afa1a214a69a462ea741cf735b29a57530478c06eb81dd403de99"},
+    {file = "argon2_cffi_bindings-25.1.0-cp39-abi3-win32.whl", hash = "sha256:473bcb5f82924b1becbb637b63303ec8d10e84c8d241119419897a26116515d2"},
+    {file = "argon2_cffi_bindings-25.1.0-cp39-abi3-win_amd64.whl", hash = "sha256:a98cd7d17e9f7ce244c0803cad3c23a7d379c301ba618a5fa76a67d116618b98"},
+    {file = "argon2_cffi_bindings-25.1.0-cp39-abi3-win_arm64.whl", hash = "sha256:b0fdbcf513833809c882823f98dc2f931cf659d9a1429616ac3adebb49f5db94"},
+    {file = "argon2_cffi_bindings-25.1.0-pp310-pypy310_pp73-macosx_10_15_x86_64.whl", hash = "sha256:6dca33a9859abf613e22733131fc9194091c1fa7cb3e131c143056b4856aa47e"},
+    {file = "argon2_cffi_bindings-25.1.0-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:21378b40e1b8d1655dd5310c84a40fc19a9aa5e6366e835ceb8576bf0fea716d"},
+    {file = "argon2_cffi_bindings-25.1.0-pp310-pypy310_pp73-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5d588dec224e2a83edbdc785a5e6f3c6cd736f46bfd4b441bbb5aa1f5085e584"},
+    {file = "argon2_cffi_bindings-25.1.0-pp310-pypy310_pp73-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5acb4e41090d53f17ca1110c3427f0a130f944b896fc8c83973219c97f57b690"},
+    {file = "argon2_cffi_bindings-25.1.0-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:da0c79c23a63723aa5d782250fbf51b768abca630285262fb5144ba5ae01e520"},
+    {file = "argon2_cffi_bindings-25.1.0.tar.gz", hash = "sha256:b957f3e6ea4d55d820e40ff76f450952807013d361a65d7f28acc0acbf29229d"},
+]
+
+[package.dependencies]
+cffi = {version = ">=1.0.1", markers = "python_version < \"3.14\""}
+
+[[package]]
+name = "arrow"
+version = "1.3.0"
+description = "Better dates & times for Python"
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "arrow-1.3.0-py3-none-any.whl", hash = "sha256:c728b120ebc00eb84e01882a6f5e7927a53960aa990ce7dd2b10f39005a67f80"},
+    {file = "arrow-1.3.0.tar.gz", hash = "sha256:d4540617648cb5f895730f1ad8c82a65f2dad0166f57b75f3ca54759c4d67a85"},
+]
+
+[package.dependencies]
+python-dateutil = ">=2.7.0"
+types-python-dateutil = ">=2.8.10"
+
+[package.extras]
+doc = ["doc8", "sphinx (>=7.0.0)", "sphinx-autobuild", "sphinx-autodoc-typehints", "sphinx_rtd_theme (>=1.3.0)"]
+test = ["dateparser (==1.*)", "pre-commit", "pytest", "pytest-cov", "pytest-mock", "pytz (==2021.1)", "simplejson (==3.*)"]
+
+[[package]]
+name = "astroid"
+version = "3.3.11"
+description = "An abstract syntax tree for Python with inference support."
+optional = false
+python-versions = ">=3.9.0"
+groups = ["dev"]
+files = [
+    {file = "astroid-3.3.11-py3-none-any.whl", hash = "sha256:54c760ae8322ece1abd213057c4b5bba7c49818853fc901ef09719a60dbf9dec"},
+    {file = "astroid-3.3.11.tar.gz", hash = "sha256:1e5a5011af2920c7c67a53f65d536d65bfa7116feeaf2354d8b94f29573bb0ce"},
+]
+
+[[package]]
+name = "asttokens"
+version = "3.0.0"
+description = "Annotate AST trees with source code positions"
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "asttokens-3.0.0-py3-none-any.whl", hash = "sha256:e3078351a059199dd5138cb1c706e6430c05eff2ff136af5eb4790f9d28932e2"},
+    {file = "asttokens-3.0.0.tar.gz", hash = "sha256:0dcd8baa8d62b0c1d118b399b2ddba3c4aff271d0d7a9e0d4c1681c79035bbc7"},
+]
+
+[package.extras]
+astroid = ["astroid (>=2,<4)"]
+test = ["astroid (>=2,<4)", "pytest", "pytest-cov", "pytest-xdist"]
+
+[[package]]
+name = "async-lru"
+version = "2.0.5"
+description = "Simple LRU cache for asyncio"
+optional = false
+python-versions = ">=3.9"
+groups = ["dev"]
+files = [
+    {file = "async_lru-2.0.5-py3-none-any.whl", hash = "sha256:ab95404d8d2605310d345932697371a5f40def0487c03d6d0ad9138de52c9943"},
+    {file = "async_lru-2.0.5.tar.gz", hash = "sha256:481d52ccdd27275f42c43a928b4a50c3bfb2d67af4e78b170e3e0bb39c66e5bb"},
+]
+
+[[package]]
+name = "attrs"
+version = "25.3.0"
+description = "Classes Without Boilerplate"
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "attrs-25.3.0-py3-none-any.whl", hash = "sha256:427318ce031701fea540783410126f03899a97ffc6f61596ad581ac2e40e3bc3"},
+    {file = "attrs-25.3.0.tar.gz", hash = "sha256:75d7cefc7fb576747b2c81b4442d4d4a1ce0900973527c011d1030fd3bf4af1b"},
+]
+
+[package.extras]
+benchmark = ["cloudpickle ; platform_python_implementation == \"CPython\"", "hypothesis", "mypy (>=1.11.1) ; platform_python_implementation == \"CPython\" and python_version >= \"3.10\"", "pympler", "pytest (>=4.3.0)", "pytest-codspeed", "pytest-mypy-plugins ; platform_python_implementation == \"CPython\" and python_version >= \"3.10\"", "pytest-xdist[psutil]"]
+cov = ["cloudpickle ; platform_python_implementation == \"CPython\"", "coverage[toml] (>=5.3)", "hypothesis", "mypy (>=1.11.1) ; platform_python_implementation == \"CPython\" and python_version >= \"3.10\"", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins ; platform_python_implementation == \"CPython\" and python_version >= \"3.10\"", "pytest-xdist[psutil]"]
+dev = ["cloudpickle ; platform_python_implementation == \"CPython\"", "hypothesis", "mypy (>=1.11.1) ; platform_python_implementation == \"CPython\" and python_version >= \"3.10\"", "pre-commit-uv", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins ; platform_python_implementation == \"CPython\" and python_version >= \"3.10\"", "pytest-xdist[psutil]"]
+docs = ["cogapp", "furo", "myst-parser", "sphinx", "sphinx-notfound-page", "sphinxcontrib-towncrier", "towncrier"]
+tests = ["cloudpickle ; platform_python_implementation == \"CPython\"", "hypothesis", "mypy (>=1.11.1) ; platform_python_implementation == \"CPython\" and python_version >= \"3.10\"", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins ; platform_python_implementation == \"CPython\" and python_version >= \"3.10\"", "pytest-xdist[psutil]"]
+tests-mypy = ["mypy (>=1.11.1) ; platform_python_implementation == \"CPython\" and python_version >= \"3.10\"", "pytest-mypy-plugins ; platform_python_implementation == \"CPython\" and python_version >= \"3.10\""]
+
+[[package]]
+name = "babel"
+version = "2.17.0"
+description = "Internationalization utilities"
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "babel-2.17.0-py3-none-any.whl", hash = "sha256:4d0b53093fdfb4b21c92b5213dba5a1b23885afa8383709427046b21c366e5f2"},
+    {file = "babel-2.17.0.tar.gz", hash = "sha256:0c54cffb19f690cdcc52a3b50bcbf71e07a808d1c80d549f2459b9d2cf0afb9d"},
+]
+
+[package.extras]
+dev = ["backports.zoneinfo ; python_version < \"3.9\"", "freezegun (>=1.0,<2.0)", "jinja2 (>=3.0)", "pytest (>=6.0)", "pytest-cov", "pytz", "setuptools", "tzdata ; sys_platform == \"win32\""]
+
+[[package]]
+name = "beautifulsoup4"
+version = "4.13.4"
+description = "Screen-scraping library"
+optional = false
+python-versions = ">=3.7.0"
+groups = ["dev"]
+files = [
+    {file = "beautifulsoup4-4.13.4-py3-none-any.whl", hash = "sha256:9bbbb14bfde9d79f38b8cd5f8c7c85f4b8f2523190ebed90e950a8dea4cb1c4b"},
+    {file = "beautifulsoup4-4.13.4.tar.gz", hash = "sha256:dbb3c4e1ceae6aefebdaf2423247260cd062430a410e38c66f2baa50a8437195"},
+]
+
+[package.dependencies]
+soupsieve = ">1.2"
+typing-extensions = ">=4.0.0"
+
+[package.extras]
+cchardet = ["cchardet"]
+chardet = ["chardet"]
+charset-normalizer = ["charset-normalizer"]
+html5lib = ["html5lib"]
+lxml = ["lxml"]
+
+[[package]]
+name = "bleach"
+version = "6.2.0"
+description = "An easy safelist-based HTML-sanitizing tool."
+optional = false
+python-versions = ">=3.9"
+groups = ["dev"]
+files = [
+    {file = "bleach-6.2.0-py3-none-any.whl", hash = "sha256:117d9c6097a7c3d22fd578fcd8d35ff1e125df6736f554da4e432fdd63f31e5e"},
+    {file = "bleach-6.2.0.tar.gz", hash = "sha256:123e894118b8a599fd80d3ec1a6d4cc7ce4e5882b1317a7e1ba69b56e95f991f"},
+]
+
+[package.dependencies]
+tinycss2 = {version = ">=1.1.0,<1.5", optional = true, markers = "extra == \"css\""}
+webencodings = "*"
+
+[package.extras]
+css = ["tinycss2 (>=1.1.0,<1.5)"]
+
+[[package]]
+name = "certifi"
+version = "2025.8.3"
+description = "Python package for providing Mozilla's CA Bundle."
+optional = false
+python-versions = ">=3.7"
+groups = ["main", "dev"]
+files = [
+    {file = "certifi-2025.8.3-py3-none-any.whl", hash = "sha256:f6c12493cfb1b06ba2ff328595af9350c65d6644968e5d3a2ffd78699af217a5"},
+    {file = "certifi-2025.8.3.tar.gz", hash = "sha256:e564105f78ded564e3ae7c923924435e1daa7463faeab5bb932bc53ffae63407"},
+]
+
+[[package]]
+name = "cffi"
+version = "1.17.1"
+description = "Foreign Function Interface for Python calling C code."
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "cffi-1.17.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:df8b1c11f177bc2313ec4b2d46baec87a5f3e71fc8b45dab2ee7cae86d9aba14"},
+    {file = "cffi-1.17.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:8f2cdc858323644ab277e9bb925ad72ae0e67f69e804f4898c070998d50b1a67"},
+    {file = "cffi-1.17.1-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:edae79245293e15384b51f88b00613ba9f7198016a5948b5dddf4917d4d26382"},
+    {file = "cffi-1.17.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:45398b671ac6d70e67da8e4224a065cec6a93541bb7aebe1b198a61b58c7b702"},
+    {file = "cffi-1.17.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ad9413ccdeda48c5afdae7e4fa2192157e991ff761e7ab8fdd8926f40b160cc3"},
+    {file = "cffi-1.17.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5da5719280082ac6bd9aa7becb3938dc9f9cbd57fac7d2871717b1feb0902ab6"},
+    {file = "cffi-1.17.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2bb1a08b8008b281856e5971307cc386a8e9c5b625ac297e853d36da6efe9c17"},
+    {file = "cffi-1.17.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:045d61c734659cc045141be4bae381a41d89b741f795af1dd018bfb532fd0df8"},
+    {file = "cffi-1.17.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:6883e737d7d9e4899a8a695e00ec36bd4e5e4f18fabe0aca0efe0a4b44cdb13e"},
+    {file = "cffi-1.17.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:6b8b4a92e1c65048ff98cfe1f735ef8f1ceb72e3d5f0c25fdb12087a23da22be"},
+    {file = "cffi-1.17.1-cp310-cp310-win32.whl", hash = "sha256:c9c3d058ebabb74db66e431095118094d06abf53284d9c81f27300d0e0d8bc7c"},
+    {file = "cffi-1.17.1-cp310-cp310-win_amd64.whl", hash = "sha256:0f048dcf80db46f0098ccac01132761580d28e28bc0f78ae0d58048063317e15"},
+    {file = "cffi-1.17.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:a45e3c6913c5b87b3ff120dcdc03f6131fa0065027d0ed7ee6190736a74cd401"},
+    {file = "cffi-1.17.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:30c5e0cb5ae493c04c8b42916e52ca38079f1b235c2f8ae5f4527b963c401caf"},
+    {file = "cffi-1.17.1-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f75c7ab1f9e4aca5414ed4d8e5c0e303a34f4421f8a0d47a4d019ceff0ab6af4"},
+    {file = "cffi-1.17.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a1ed2dd2972641495a3ec98445e09766f077aee98a1c896dcb4ad0d303628e41"},
+    {file = "cffi-1.17.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:46bf43160c1a35f7ec506d254e5c890f3c03648a4dbac12d624e4490a7046cd1"},
+    {file = "cffi-1.17.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a24ed04c8ffd54b0729c07cee15a81d964e6fee0e3d4d342a27b020d22959dc6"},
+    {file = "cffi-1.17.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:610faea79c43e44c71e1ec53a554553fa22321b65fae24889706c0a84d4ad86d"},
+    {file = "cffi-1.17.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:a9b15d491f3ad5d692e11f6b71f7857e7835eb677955c00cc0aefcd0669adaf6"},
+    {file = "cffi-1.17.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:de2ea4b5833625383e464549fec1bc395c1bdeeb5f25c4a3a82b5a8c756ec22f"},
+    {file = "cffi-1.17.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:fc48c783f9c87e60831201f2cce7f3b2e4846bf4d8728eabe54d60700b318a0b"},
+    {file = "cffi-1.17.1-cp311-cp311-win32.whl", hash = "sha256:85a950a4ac9c359340d5963966e3e0a94a676bd6245a4b55bc43949eee26a655"},
+    {file = "cffi-1.17.1-cp311-cp311-win_amd64.whl", hash = "sha256:caaf0640ef5f5517f49bc275eca1406b0ffa6aa184892812030f04c2abf589a0"},
+    {file = "cffi-1.17.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:805b4371bf7197c329fcb3ead37e710d1bca9da5d583f5073b799d5c5bd1eee4"},
+    {file = "cffi-1.17.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:733e99bc2df47476e3848417c5a4540522f234dfd4ef3ab7fafdf555b082ec0c"},
+    {file = "cffi-1.17.1-cp312-cp312-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1257bdabf294dceb59f5e70c64a3e2f462c30c7ad68092d01bbbfb1c16b1ba36"},
+    {file = "cffi-1.17.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:da95af8214998d77a98cc14e3a3bd00aa191526343078b530ceb0bd710fb48a5"},
+    {file = "cffi-1.17.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d63afe322132c194cf832bfec0dc69a99fb9bb6bbd550f161a49e9e855cc78ff"},
+    {file = "cffi-1.17.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f79fc4fc25f1c8698ff97788206bb3c2598949bfe0fef03d299eb1b5356ada99"},
+    {file = "cffi-1.17.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b62ce867176a75d03a665bad002af8e6d54644fad99a3c70905c543130e39d93"},
+    {file = "cffi-1.17.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:386c8bf53c502fff58903061338ce4f4950cbdcb23e2902d86c0f722b786bbe3"},
+    {file = "cffi-1.17.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:4ceb10419a9adf4460ea14cfd6bc43d08701f0835e979bf821052f1805850fe8"},
+    {file = "cffi-1.17.1-cp312-cp312-win32.whl", hash = "sha256:a08d7e755f8ed21095a310a693525137cfe756ce62d066e53f502a83dc550f65"},
+    {file = "cffi-1.17.1-cp312-cp312-win_amd64.whl", hash = "sha256:51392eae71afec0d0c8fb1a53b204dbb3bcabcb3c9b807eedf3e1e6ccf2de903"},
+    {file = "cffi-1.17.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:f3a2b4222ce6b60e2e8b337bb9596923045681d71e5a082783484d845390938e"},
+    {file = "cffi-1.17.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:0984a4925a435b1da406122d4d7968dd861c1385afe3b45ba82b750f229811e2"},
+    {file = "cffi-1.17.1-cp313-cp313-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d01b12eeeb4427d3110de311e1774046ad344f5b1a7403101878976ecd7a10f3"},
+    {file = "cffi-1.17.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:706510fe141c86a69c8ddc029c7910003a17353970cff3b904ff0686a5927683"},
+    {file = "cffi-1.17.1-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:de55b766c7aa2e2a3092c51e0483d700341182f08e67c63630d5b6f200bb28e5"},
+    {file = "cffi-1.17.1-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c59d6e989d07460165cc5ad3c61f9fd8f1b4796eacbd81cee78957842b834af4"},
+    {file = "cffi-1.17.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dd398dbc6773384a17fe0d3e7eeb8d1a21c2200473ee6806bb5e6a8e62bb73dd"},
+    {file = "cffi-1.17.1-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:3edc8d958eb099c634dace3c7e16560ae474aa3803a5df240542b305d14e14ed"},
+    {file = "cffi-1.17.1-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:72e72408cad3d5419375fc87d289076ee319835bdfa2caad331e377589aebba9"},
+    {file = "cffi-1.17.1-cp313-cp313-win32.whl", hash = "sha256:e03eab0a8677fa80d646b5ddece1cbeaf556c313dcfac435ba11f107ba117b5d"},
+    {file = "cffi-1.17.1-cp313-cp313-win_amd64.whl", hash = "sha256:f6a16c31041f09ead72d69f583767292f750d24913dadacf5756b966aacb3f1a"},
+    {file = "cffi-1.17.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:636062ea65bd0195bc012fea9321aca499c0504409f413dc88af450b57ffd03b"},
+    {file = "cffi-1.17.1-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c7eac2ef9b63c79431bc4b25f1cd649d7f061a28808cbc6c47b534bd789ef964"},
+    {file = "cffi-1.17.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e221cf152cff04059d011ee126477f0d9588303eb57e88923578ace7baad17f9"},
+    {file = "cffi-1.17.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:31000ec67d4221a71bd3f67df918b1f88f676f1c3b535a7eb473255fdc0b83fc"},
+    {file = "cffi-1.17.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6f17be4345073b0a7b8ea599688f692ac3ef23ce28e5df79c04de519dbc4912c"},
+    {file = "cffi-1.17.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0e2b1fac190ae3ebfe37b979cc1ce69c81f4e4fe5746bb401dca63a9062cdaf1"},
+    {file = "cffi-1.17.1-cp38-cp38-win32.whl", hash = "sha256:7596d6620d3fa590f677e9ee430df2958d2d6d6de2feeae5b20e82c00b76fbf8"},
+    {file = "cffi-1.17.1-cp38-cp38-win_amd64.whl", hash = "sha256:78122be759c3f8a014ce010908ae03364d00a1f81ab5c7f4a7a5120607ea56e1"},
+    {file = "cffi-1.17.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b2ab587605f4ba0bf81dc0cb08a41bd1c0a5906bd59243d56bad7668a6fc6c16"},
+    {file = "cffi-1.17.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:28b16024becceed8c6dfbc75629e27788d8a3f9030691a1dbf9821a128b22c36"},
+    {file = "cffi-1.17.1-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1d599671f396c4723d016dbddb72fe8e0397082b0a77a4fab8028923bec050e8"},
+    {file = "cffi-1.17.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ca74b8dbe6e8e8263c0ffd60277de77dcee6c837a3d0881d8c1ead7268c9e576"},
+    {file = "cffi-1.17.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f7f5baafcc48261359e14bcd6d9bff6d4b28d9103847c9e136694cb0501aef87"},
+    {file = "cffi-1.17.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:98e3969bcff97cae1b2def8ba499ea3d6f31ddfdb7635374834cf89a1a08ecf0"},
+    {file = "cffi-1.17.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cdf5ce3acdfd1661132f2a9c19cac174758dc2352bfe37d98aa7512c6b7178b3"},
+    {file = "cffi-1.17.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:9755e4345d1ec879e3849e62222a18c7174d65a6a92d5b346b1863912168b595"},
+    {file = "cffi-1.17.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:f1e22e8c4419538cb197e4dd60acc919d7696e5ef98ee4da4e01d3f8cfa4cc5a"},
+    {file = "cffi-1.17.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:c03e868a0b3bc35839ba98e74211ed2b05d2119be4e8a0f224fba9384f1fe02e"},
+    {file = "cffi-1.17.1-cp39-cp39-win32.whl", hash = "sha256:e31ae45bc2e29f6b2abd0de1cc3b9d5205aa847cafaecb8af1476a609a2f6eb7"},
+    {file = "cffi-1.17.1-cp39-cp39-win_amd64.whl", hash = "sha256:d016c76bdd850f3c626af19b0542c9677ba156e4ee4fccfdd7848803533ef662"},
+    {file = "cffi-1.17.1.tar.gz", hash = "sha256:1c39c6016c32bc48dd54561950ebd6836e1670f2ae46128f67cf49e789c52824"},
+]
+
+[package.dependencies]
+pycparser = "*"
+
+[[package]]
+name = "charset-normalizer"
+version = "3.4.3"
+description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet."
+optional = false
+python-versions = ">=3.7"
+groups = ["main", "dev"]
+files = [
+    {file = "charset_normalizer-3.4.3-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:fb7f67a1bfa6e40b438170ebdc8158b78dc465a5a67b6dde178a46987b244a72"},
+    {file = "charset_normalizer-3.4.3-cp310-cp310-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:cc9370a2da1ac13f0153780040f465839e6cccb4a1e44810124b4e22483c93fe"},
+    {file = "charset_normalizer-3.4.3-cp310-cp310-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:07a0eae9e2787b586e129fdcbe1af6997f8d0e5abaa0bc98c0e20e124d67e601"},
+    {file = "charset_normalizer-3.4.3-cp310-cp310-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:74d77e25adda8581ffc1c720f1c81ca082921329452eba58b16233ab1842141c"},
+    {file = "charset_normalizer-3.4.3-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:d0e909868420b7049dafd3a31d45125b31143eec59235311fc4c57ea26a4acd2"},
+    {file = "charset_normalizer-3.4.3-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:c6f162aabe9a91a309510d74eeb6507fab5fff92337a15acbe77753d88d9dcf0"},
+    {file = "charset_normalizer-3.4.3-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:4ca4c094de7771a98d7fbd67d9e5dbf1eb73efa4f744a730437d8a3a5cf994f0"},
+    {file = "charset_normalizer-3.4.3-cp310-cp310-musllinux_1_2_s390x.whl", hash = "sha256:02425242e96bcf29a49711b0ca9f37e451da7c70562bc10e8ed992a5a7a25cc0"},
+    {file = "charset_normalizer-3.4.3-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:78deba4d8f9590fe4dae384aeff04082510a709957e968753ff3c48399f6f92a"},
+    {file = "charset_normalizer-3.4.3-cp310-cp310-win32.whl", hash = "sha256:d79c198e27580c8e958906f803e63cddb77653731be08851c7df0b1a14a8fc0f"},
+    {file = "charset_normalizer-3.4.3-cp310-cp310-win_amd64.whl", hash = "sha256:c6e490913a46fa054e03699c70019ab869e990270597018cef1d8562132c2669"},
+    {file = "charset_normalizer-3.4.3-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:b256ee2e749283ef3ddcff51a675ff43798d92d746d1a6e4631bf8c707d22d0b"},
+    {file = "charset_normalizer-3.4.3-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:13faeacfe61784e2559e690fc53fa4c5ae97c6fcedb8eb6fb8d0a15b475d2c64"},
+    {file = "charset_normalizer-3.4.3-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:00237675befef519d9af72169d8604a067d92755e84fe76492fef5441db05b91"},
+    {file = "charset_normalizer-3.4.3-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:585f3b2a80fbd26b048a0be90c5aae8f06605d3c92615911c3a2b03a8a3b796f"},
+    {file = "charset_normalizer-3.4.3-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0e78314bdc32fa80696f72fa16dc61168fda4d6a0c014e0380f9d02f0e5d8a07"},
+    {file = "charset_normalizer-3.4.3-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:96b2b3d1a83ad55310de8c7b4a2d04d9277d5591f40761274856635acc5fcb30"},
+    {file = "charset_normalizer-3.4.3-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:939578d9d8fd4299220161fdd76e86c6a251987476f5243e8864a7844476ba14"},
+    {file = "charset_normalizer-3.4.3-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:fd10de089bcdcd1be95a2f73dbe6254798ec1bda9f450d5828c96f93e2536b9c"},
+    {file = "charset_normalizer-3.4.3-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:1e8ac75d72fa3775e0b7cb7e4629cec13b7514d928d15ef8ea06bca03ef01cae"},
+    {file = "charset_normalizer-3.4.3-cp311-cp311-win32.whl", hash = "sha256:6cf8fd4c04756b6b60146d98cd8a77d0cdae0e1ca20329da2ac85eed779b6849"},
+    {file = "charset_normalizer-3.4.3-cp311-cp311-win_amd64.whl", hash = "sha256:31a9a6f775f9bcd865d88ee350f0ffb0e25936a7f930ca98995c05abf1faf21c"},
+    {file = "charset_normalizer-3.4.3-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:e28e334d3ff134e88989d90ba04b47d84382a828c061d0d1027b1b12a62b39b1"},
+    {file = "charset_normalizer-3.4.3-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0cacf8f7297b0c4fcb74227692ca46b4a5852f8f4f24b3c766dd94a1075c4884"},
+    {file = "charset_normalizer-3.4.3-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:c6fd51128a41297f5409deab284fecbe5305ebd7e5a1f959bee1c054622b7018"},
+    {file = "charset_normalizer-3.4.3-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:3cfb2aad70f2c6debfbcb717f23b7eb55febc0bb23dcffc0f076009da10c6392"},
+    {file = "charset_normalizer-3.4.3-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1606f4a55c0fd363d754049cdf400175ee96c992b1f8018b993941f221221c5f"},
+    {file = "charset_normalizer-3.4.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:027b776c26d38b7f15b26a5da1044f376455fb3766df8fc38563b4efbc515154"},
+    {file = "charset_normalizer-3.4.3-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:42e5088973e56e31e4fa58eb6bd709e42fc03799c11c42929592889a2e54c491"},
+    {file = "charset_normalizer-3.4.3-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:cc34f233c9e71701040d772aa7490318673aa7164a0efe3172b2981218c26d93"},
+    {file = "charset_normalizer-3.4.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:320e8e66157cc4e247d9ddca8e21f427efc7a04bbd0ac8a9faf56583fa543f9f"},
+    {file = "charset_normalizer-3.4.3-cp312-cp312-win32.whl", hash = "sha256:fb6fecfd65564f208cbf0fba07f107fb661bcd1a7c389edbced3f7a493f70e37"},
+    {file = "charset_normalizer-3.4.3-cp312-cp312-win_amd64.whl", hash = "sha256:86df271bf921c2ee3818f0522e9a5b8092ca2ad8b065ece5d7d9d0e9f4849bcc"},
+    {file = "charset_normalizer-3.4.3-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:14c2a87c65b351109f6abfc424cab3927b3bdece6f706e4d12faaf3d52ee5efe"},
+    {file = "charset_normalizer-3.4.3-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:41d1fc408ff5fdfb910200ec0e74abc40387bccb3252f3f27c0676731df2b2c8"},
+    {file = "charset_normalizer-3.4.3-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:1bb60174149316da1c35fa5233681f7c0f9f514509b8e399ab70fea5f17e45c9"},
+    {file = "charset_normalizer-3.4.3-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:30d006f98569de3459c2fc1f2acde170b7b2bd265dc1943e87e1a4efe1b67c31"},
+    {file = "charset_normalizer-3.4.3-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:416175faf02e4b0810f1f38bcb54682878a4af94059a1cd63b8747244420801f"},
+    {file = "charset_normalizer-3.4.3-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:6aab0f181c486f973bc7262a97f5aca3ee7e1437011ef0c2ec04b5a11d16c927"},
+    {file = "charset_normalizer-3.4.3-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:fdabf8315679312cfa71302f9bd509ded4f2f263fb5b765cf1433b39106c3cc9"},
+    {file = "charset_normalizer-3.4.3-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:bd28b817ea8c70215401f657edef3a8aa83c29d447fb0b622c35403780ba11d5"},
+    {file = "charset_normalizer-3.4.3-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:18343b2d246dc6761a249ba1fb13f9ee9a2bcd95decc767319506056ea4ad4dc"},
+    {file = "charset_normalizer-3.4.3-cp313-cp313-win32.whl", hash = "sha256:6fb70de56f1859a3f71261cbe41005f56a7842cc348d3aeb26237560bfa5e0ce"},
+    {file = "charset_normalizer-3.4.3-cp313-cp313-win_amd64.whl", hash = "sha256:cf1ebb7d78e1ad8ec2a8c4732c7be2e736f6e5123a4146c5b89c9d1f585f8cef"},
+    {file = "charset_normalizer-3.4.3-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:3cd35b7e8aedeb9e34c41385fda4f73ba609e561faedfae0a9e75e44ac558a15"},
+    {file = "charset_normalizer-3.4.3-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b89bc04de1d83006373429975f8ef9e7932534b8cc9ca582e4db7d20d91816db"},
+    {file = "charset_normalizer-3.4.3-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:2001a39612b241dae17b4687898843f254f8748b796a2e16f1051a17078d991d"},
+    {file = "charset_normalizer-3.4.3-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:8dcfc373f888e4fb39a7bc57e93e3b845e7f462dacc008d9749568b1c4ece096"},
+    {file = "charset_normalizer-3.4.3-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:18b97b8404387b96cdbd30ad660f6407799126d26a39ca65729162fd810a99aa"},
+    {file = "charset_normalizer-3.4.3-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:ccf600859c183d70eb47e05a44cd80a4ce77394d1ac0f79dbd2dd90a69a3a049"},
+    {file = "charset_normalizer-3.4.3-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:53cd68b185d98dde4ad8990e56a58dea83a4162161b1ea9272e5c9182ce415e0"},
+    {file = "charset_normalizer-3.4.3-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:30a96e1e1f865f78b030d65241c1ee850cdf422d869e9028e2fc1d5e4db73b92"},
+    {file = "charset_normalizer-3.4.3-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:d716a916938e03231e86e43782ca7878fb602a125a91e7acb8b5112e2e96ac16"},
+    {file = "charset_normalizer-3.4.3-cp314-cp314-win32.whl", hash = "sha256:c6dbd0ccdda3a2ba7c2ecd9d77b37f3b5831687d8dc1b6ca5f56a4880cc7b7ce"},
+    {file = "charset_normalizer-3.4.3-cp314-cp314-win_amd64.whl", hash = "sha256:73dc19b562516fc9bcf6e5d6e596df0b4eb98d87e4f79f3ae71840e6ed21361c"},
+    {file = "charset_normalizer-3.4.3-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:0f2be7e0cf7754b9a30eb01f4295cc3d4358a479843b31f328afd210e2c7598c"},
+    {file = "charset_normalizer-3.4.3-cp38-cp38-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c60e092517a73c632ec38e290eba714e9627abe9d301c8c8a12ec32c314a2a4b"},
+    {file = "charset_normalizer-3.4.3-cp38-cp38-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:252098c8c7a873e17dd696ed98bbe91dbacd571da4b87df3736768efa7a792e4"},
+    {file = "charset_normalizer-3.4.3-cp38-cp38-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:3653fad4fe3ed447a596ae8638b437f827234f01a8cd801842e43f3d0a6b281b"},
+    {file = "charset_normalizer-3.4.3-cp38-cp38-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8999f965f922ae054125286faf9f11bc6932184b93011d138925a1773830bbe9"},
+    {file = "charset_normalizer-3.4.3-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:d95bfb53c211b57198bb91c46dd5a2d8018b3af446583aab40074bf7988401cb"},
+    {file = "charset_normalizer-3.4.3-cp38-cp38-musllinux_1_2_ppc64le.whl", hash = "sha256:5b413b0b1bfd94dbf4023ad6945889f374cd24e3f62de58d6bb102c4d9ae534a"},
+    {file = "charset_normalizer-3.4.3-cp38-cp38-musllinux_1_2_s390x.whl", hash = "sha256:b5e3b2d152e74e100a9e9573837aba24aab611d39428ded46f4e4022ea7d1942"},
+    {file = "charset_normalizer-3.4.3-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:a2d08ac246bb48479170408d6c19f6385fa743e7157d716e144cad849b2dd94b"},
+    {file = "charset_normalizer-3.4.3-cp38-cp38-win32.whl", hash = "sha256:ec557499516fc90fd374bf2e32349a2887a876fbf162c160e3c01b6849eaf557"},
+    {file = "charset_normalizer-3.4.3-cp38-cp38-win_amd64.whl", hash = "sha256:5d8d01eac18c423815ed4f4a2ec3b439d654e55ee4ad610e153cf02faf67ea40"},
+    {file = "charset_normalizer-3.4.3-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:70bfc5f2c318afece2f5838ea5e4c3febada0be750fcf4775641052bbba14d05"},
+    {file = "charset_normalizer-3.4.3-cp39-cp39-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:23b6b24d74478dc833444cbd927c338349d6ae852ba53a0d02a2de1fce45b96e"},
+    {file = "charset_normalizer-3.4.3-cp39-cp39-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:34a7f768e3f985abdb42841e20e17b330ad3aaf4bb7e7aeeb73db2e70f077b99"},
+    {file = "charset_normalizer-3.4.3-cp39-cp39-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:fb731e5deb0c7ef82d698b0f4c5bb724633ee2a489401594c5c88b02e6cb15f7"},
+    {file = "charset_normalizer-3.4.3-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:257f26fed7d7ff59921b78244f3cd93ed2af1800ff048c33f624c87475819dd7"},
+    {file = "charset_normalizer-3.4.3-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:1ef99f0456d3d46a50945c98de1774da86f8e992ab5c77865ea8b8195341fc19"},
+    {file = "charset_normalizer-3.4.3-cp39-cp39-musllinux_1_2_ppc64le.whl", hash = "sha256:2c322db9c8c89009a990ef07c3bcc9f011a3269bc06782f916cd3d9eed7c9312"},
+    {file = "charset_normalizer-3.4.3-cp39-cp39-musllinux_1_2_s390x.whl", hash = "sha256:511729f456829ef86ac41ca78c63a5cb55240ed23b4b737faca0eb1abb1c41bc"},
+    {file = "charset_normalizer-3.4.3-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:88ab34806dea0671532d3f82d82b85e8fc23d7b2dd12fa837978dad9bb392a34"},
+    {file = "charset_normalizer-3.4.3-cp39-cp39-win32.whl", hash = "sha256:16a8770207946ac75703458e2c743631c79c59c5890c80011d536248f8eaa432"},
+    {file = "charset_normalizer-3.4.3-cp39-cp39-win_amd64.whl", hash = "sha256:d22dbedd33326a4a5190dd4fe9e9e693ef12160c77382d9e87919bce54f3d4ca"},
+    {file = "charset_normalizer-3.4.3-py3-none-any.whl", hash = "sha256:ce571ab16d890d23b5c278547ba694193a45011ff86a9162a71307ed9f86759a"},
+    {file = "charset_normalizer-3.4.3.tar.gz", hash = "sha256:6fce4b8500244f6fcb71465d4a4930d132ba9ab8e71a7859e6a5d59851068d14"},
+]
+
+[[package]]
+name = "colorama"
+version = "0.4.6"
+description = "Cross-platform colored terminal text."
+optional = false
+python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7"
+groups = ["dev"]
+markers = "sys_platform == \"win32\""
+files = [
+    {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"},
+    {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
+]
+
+[[package]]
+name = "comm"
+version = "0.2.3"
+description = "Jupyter Python Comm implementation, for usage in ipykernel, xeus-python etc."
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "comm-0.2.3-py3-none-any.whl", hash = "sha256:c615d91d75f7f04f095b30d1c1711babd43bdc6419c1be9886a85f2f4e489417"},
+    {file = "comm-0.2.3.tar.gz", hash = "sha256:2dc8048c10962d55d7ad693be1e7045d891b7ce8d999c97963a5e3e99c055971"},
+]
+
+[package.extras]
+test = ["pytest"]
+
+[[package]]
+name = "coverage"
+version = "7.10.3"
+description = "Code coverage measurement for Python"
+optional = false
+python-versions = ">=3.9"
+groups = ["dev"]
+files = [
+    {file = "coverage-7.10.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:53808194afdf948c462215e9403cca27a81cf150d2f9b386aee4dab614ae2ffe"},
+    {file = "coverage-7.10.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:f4d1b837d1abf72187a61645dbf799e0d7705aa9232924946e1f57eb09a3bf00"},
+    {file = "coverage-7.10.3-cp310-cp310-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:2a90dd4505d3cc68b847ab10c5ee81822a968b5191664e8a0801778fa60459fa"},
+    {file = "coverage-7.10.3-cp310-cp310-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:d52989685ff5bf909c430e6d7f6550937bc6d6f3e6ecb303c97a86100efd4596"},
+    {file = "coverage-7.10.3-cp310-cp310-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:bdb558a1d97345bde3a9f4d3e8d11c9e5611f748646e9bb61d7d612a796671b5"},
+    {file = "coverage-7.10.3-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:c9e6331a8f09cb1fc8bda032752af03c366870b48cce908875ba2620d20d0ad4"},
+    {file = "coverage-7.10.3-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:992f48bf35b720e174e7fae916d943599f1a66501a2710d06c5f8104e0756ee1"},
+    {file = "coverage-7.10.3-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:c5595fc4ad6a39312c786ec3326d7322d0cf10e3ac6a6df70809910026d67cfb"},
+    {file = "coverage-7.10.3-cp310-cp310-win32.whl", hash = "sha256:9e92fa1f2bd5a57df9d00cf9ce1eb4ef6fccca4ceabec1c984837de55329db34"},
+    {file = "coverage-7.10.3-cp310-cp310-win_amd64.whl", hash = "sha256:b96524d6e4a3ce6a75c56bb15dbd08023b0ae2289c254e15b9fbdddf0c577416"},
+    {file = "coverage-7.10.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:f2ff2e2afdf0d51b9b8301e542d9c21a8d084fd23d4c8ea2b3a1b3c96f5f7397"},
+    {file = "coverage-7.10.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:18ecc5d1b9a8c570f6c9b808fa9a2b16836b3dd5414a6d467ae942208b095f85"},
+    {file = "coverage-7.10.3-cp311-cp311-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:1af4461b25fe92889590d438905e1fc79a95680ec2a1ff69a591bb3fdb6c7157"},
+    {file = "coverage-7.10.3-cp311-cp311-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:3966bc9a76b09a40dc6063c8b10375e827ea5dfcaffae402dd65953bef4cba54"},
+    {file = "coverage-7.10.3-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:205a95b87ef4eb303b7bc5118b47b6b6604a644bcbdb33c336a41cfc0a08c06a"},
+    {file = "coverage-7.10.3-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:5b3801b79fb2ad61e3c7e2554bab754fc5f105626056980a2b9cf3aef4f13f84"},
+    {file = "coverage-7.10.3-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:b0dc69c60224cda33d384572da945759756e3f06b9cdac27f302f53961e63160"},
+    {file = "coverage-7.10.3-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:a83d4f134bab2c7ff758e6bb1541dd72b54ba295ced6a63d93efc2e20cb9b124"},
+    {file = "coverage-7.10.3-cp311-cp311-win32.whl", hash = "sha256:54e409dd64e5302b2a8fdf44ec1c26f47abd1f45a2dcf67bd161873ee05a59b8"},
+    {file = "coverage-7.10.3-cp311-cp311-win_amd64.whl", hash = "sha256:30c601610a9b23807c5e9e2e442054b795953ab85d525c3de1b1b27cebeb2117"},
+    {file = "coverage-7.10.3-cp311-cp311-win_arm64.whl", hash = "sha256:dabe662312a97958e932dee056f2659051d822552c0b866823e8ba1c2fe64770"},
+    {file = "coverage-7.10.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:449c1e2d3a84d18bd204258a897a87bc57380072eb2aded6a5b5226046207b42"},
+    {file = "coverage-7.10.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:1d4f9ce50b9261ad196dc2b2e9f1fbbee21651b54c3097a25ad783679fd18294"},
+    {file = "coverage-7.10.3-cp312-cp312-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:4dd4564207b160d0d45c36a10bc0a3d12563028e8b48cd6459ea322302a156d7"},
+    {file = "coverage-7.10.3-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:5ca3c9530ee072b7cb6a6ea7b640bcdff0ad3b334ae9687e521e59f79b1d0437"},
+    {file = "coverage-7.10.3-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b6df359e59fa243c9925ae6507e27f29c46698359f45e568fd51b9315dbbe587"},
+    {file = "coverage-7.10.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:a181e4c2c896c2ff64c6312db3bda38e9ade2e1aa67f86a5628ae85873786cea"},
+    {file = "coverage-7.10.3-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:a374d4e923814e8b72b205ef6b3d3a647bb50e66f3558582eda074c976923613"},
+    {file = "coverage-7.10.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:daeefff05993e5e8c6e7499a8508e7bd94502b6b9a9159c84fd1fe6bce3151cb"},
+    {file = "coverage-7.10.3-cp312-cp312-win32.whl", hash = "sha256:187ecdcac21f9636d570e419773df7bd2fda2e7fa040f812e7f95d0bddf5f79a"},
+    {file = "coverage-7.10.3-cp312-cp312-win_amd64.whl", hash = "sha256:4a50ad2524ee7e4c2a95e60d2b0b83283bdfc745fe82359d567e4f15d3823eb5"},
+    {file = "coverage-7.10.3-cp312-cp312-win_arm64.whl", hash = "sha256:c112f04e075d3495fa3ed2200f71317da99608cbb2e9345bdb6de8819fc30571"},
+    {file = "coverage-7.10.3-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:b99e87304ffe0eb97c5308447328a584258951853807afdc58b16143a530518a"},
+    {file = "coverage-7.10.3-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:4af09c7574d09afbc1ea7da9dcea23665c01f3bc1b1feb061dac135f98ffc53a"},
+    {file = "coverage-7.10.3-cp313-cp313-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:488e9b50dc5d2aa9521053cfa706209e5acf5289e81edc28291a24f4e4488f46"},
+    {file = "coverage-7.10.3-cp313-cp313-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:913ceddb4289cbba3a310704a424e3fb7aac2bc0c3a23ea473193cb290cf17d4"},
+    {file = "coverage-7.10.3-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6b1f91cbc78c7112ab84ed2a8defbccd90f888fcae40a97ddd6466b0bec6ae8a"},
+    {file = "coverage-7.10.3-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:b0bac054d45af7cd938834b43a9878b36ea92781bcb009eab040a5b09e9927e3"},
+    {file = "coverage-7.10.3-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:fe72cbdd12d9e0f4aca873fa6d755e103888a7f9085e4a62d282d9d5b9f7928c"},
+    {file = "coverage-7.10.3-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:c1e2e927ab3eadd7c244023927d646e4c15c65bb2ac7ae3c3e9537c013700d21"},
+    {file = "coverage-7.10.3-cp313-cp313-win32.whl", hash = "sha256:24d0c13de473b04920ddd6e5da3c08831b1170b8f3b17461d7429b61cad59ae0"},
+    {file = "coverage-7.10.3-cp313-cp313-win_amd64.whl", hash = "sha256:3564aae76bce4b96e2345cf53b4c87e938c4985424a9be6a66ee902626edec4c"},
+    {file = "coverage-7.10.3-cp313-cp313-win_arm64.whl", hash = "sha256:f35580f19f297455f44afcd773c9c7a058e52eb6eb170aa31222e635f2e38b87"},
+    {file = "coverage-7.10.3-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:07009152f497a0464ffdf2634586787aea0e69ddd023eafb23fc38267db94b84"},
+    {file = "coverage-7.10.3-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:8dd2ba5f0c7e7e8cc418be2f0c14c4d9e3f08b8fb8e4c0f83c2fe87d03eb655e"},
+    {file = "coverage-7.10.3-cp313-cp313t-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:1ae22b97003c74186e034a93e4f946c75fad8c0ce8d92fbbc168b5e15ee2841f"},
+    {file = "coverage-7.10.3-cp313-cp313t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:eb329f1046888a36b1dc35504d3029e1dd5afe2196d94315d18c45ee380f67d5"},
+    {file = "coverage-7.10.3-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ce01048199a91f07f96ca3074b0c14021f4fe7ffd29a3e6a188ac60a5c3a4af8"},
+    {file = "coverage-7.10.3-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:08b989a06eb9dfacf96d42b7fb4c9a22bafa370d245dc22fa839f2168c6f9fa1"},
+    {file = "coverage-7.10.3-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:669fe0d4e69c575c52148511029b722ba8d26e8a3129840c2ce0522e1452b256"},
+    {file = "coverage-7.10.3-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:3262d19092771c83f3413831d9904b1ccc5f98da5de4ffa4ad67f5b20c7aaf7b"},
+    {file = "coverage-7.10.3-cp313-cp313t-win32.whl", hash = "sha256:cc0ee4b2ccd42cab7ee6be46d8a67d230cb33a0a7cd47a58b587a7063b6c6b0e"},
+    {file = "coverage-7.10.3-cp313-cp313t-win_amd64.whl", hash = "sha256:03db599f213341e2960430984e04cf35fb179724e052a3ee627a068653cf4a7c"},
+    {file = "coverage-7.10.3-cp313-cp313t-win_arm64.whl", hash = "sha256:46eae7893ba65f53c71284585a262f083ef71594f05ec5c85baf79c402369098"},
+    {file = "coverage-7.10.3-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:bce8b8180912914032785850d8f3aacb25ec1810f5f54afc4a8b114e7a9b55de"},
+    {file = "coverage-7.10.3-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:07790b4b37d56608536f7c1079bd1aa511567ac2966d33d5cec9cf520c50a7c8"},
+    {file = "coverage-7.10.3-cp314-cp314-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:e79367ef2cd9166acedcbf136a458dfe9a4a2dd4d1ee95738fb2ee581c56f667"},
+    {file = "coverage-7.10.3-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:419d2a0f769f26cb1d05e9ccbc5eab4cb5d70231604d47150867c07822acbdf4"},
+    {file = "coverage-7.10.3-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ee221cf244757cdc2ac882e3062ab414b8464ad9c884c21e878517ea64b3fa26"},
+    {file = "coverage-7.10.3-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:c2079d8cdd6f7373d628e14b3357f24d1db02c9dc22e6a007418ca7a2be0435a"},
+    {file = "coverage-7.10.3-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:bd8df1f83c0703fa3ca781b02d36f9ec67ad9cb725b18d486405924f5e4270bd"},
+    {file = "coverage-7.10.3-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:6b4e25e0fa335c8aa26e42a52053f3786a61cc7622b4d54ae2dad994aa754fec"},
+    {file = "coverage-7.10.3-cp314-cp314-win32.whl", hash = "sha256:d7c3d02c2866deb217dce664c71787f4b25420ea3eaf87056f44fb364a3528f5"},
+    {file = "coverage-7.10.3-cp314-cp314-win_amd64.whl", hash = "sha256:9c8916d44d9e0fe6cdb2227dc6b0edd8bc6c8ef13438bbbf69af7482d9bb9833"},
+    {file = "coverage-7.10.3-cp314-cp314-win_arm64.whl", hash = "sha256:1007d6a2b3cf197c57105cc1ba390d9ff7f0bee215ced4dea530181e49c65ab4"},
+    {file = "coverage-7.10.3-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:ebc8791d346410d096818788877d675ca55c91db87d60e8f477bd41c6970ffc6"},
+    {file = "coverage-7.10.3-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:1f4e4d8e75f6fd3c6940ebeed29e3d9d632e1f18f6fb65d33086d99d4d073241"},
+    {file = "coverage-7.10.3-cp314-cp314t-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:24581ed69f132b6225a31b0228ae4885731cddc966f8a33fe5987288bdbbbd5e"},
+    {file = "coverage-7.10.3-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:ec151569ddfccbf71bac8c422dce15e176167385a00cd86e887f9a80035ce8a5"},
+    {file = "coverage-7.10.3-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:2ae8e7c56290b908ee817200c0b65929b8050bc28530b131fe7c6dfee3e7d86b"},
+    {file = "coverage-7.10.3-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:5fb742309766d7e48e9eb4dc34bc95a424707bc6140c0e7d9726e794f11b92a0"},
+    {file = "coverage-7.10.3-cp314-cp314t-musllinux_1_2_i686.whl", hash = "sha256:c65e2a5b32fbe1e499f1036efa6eb9cb4ea2bf6f7168d0e7a5852f3024f471b1"},
+    {file = "coverage-7.10.3-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:d48d2cb07d50f12f4f18d2bb75d9d19e3506c26d96fffabf56d22936e5ed8f7c"},
+    {file = "coverage-7.10.3-cp314-cp314t-win32.whl", hash = "sha256:dec0d9bc15ee305e09fe2cd1911d3f0371262d3cfdae05d79515d8cb712b4869"},
+    {file = "coverage-7.10.3-cp314-cp314t-win_amd64.whl", hash = "sha256:424ea93a323aa0f7f01174308ea78bde885c3089ec1bef7143a6d93c3e24ef64"},
+    {file = "coverage-7.10.3-cp314-cp314t-win_arm64.whl", hash = "sha256:f5983c132a62d93d71c9ef896a0b9bf6e6828d8d2ea32611f58684fba60bba35"},
+    {file = "coverage-7.10.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:da749daa7e141985487e1ff90a68315b0845930ed53dc397f4ae8f8bab25b551"},
+    {file = "coverage-7.10.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:f3126fb6a47d287f461d9b1aa5d1a8c97034d1dffb4f452f2cf211289dae74ef"},
+    {file = "coverage-7.10.3-cp39-cp39-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:3da794db13cc27ca40e1ec8127945b97fab78ba548040047d54e7bfa6d442dca"},
+    {file = "coverage-7.10.3-cp39-cp39-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:4e27bebbd184ef8d1c1e092b74a2b7109dcbe2618dce6e96b1776d53b14b3fe8"},
+    {file = "coverage-7.10.3-cp39-cp39-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:8fd4ee2580b9fefbd301b4f8f85b62ac90d1e848bea54f89a5748cf132782118"},
+    {file = "coverage-7.10.3-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:6999920bdd73259ce11cabfc1307484f071ecc6abdb2ca58d98facbcefc70f16"},
+    {file = "coverage-7.10.3-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:c3623f929db885fab100cb88220a5b193321ed37e03af719efdbaf5d10b6e227"},
+    {file = "coverage-7.10.3-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:25b902c5e15dea056485d782e420bb84621cc08ee75d5131ecb3dbef8bd1365f"},
+    {file = "coverage-7.10.3-cp39-cp39-win32.whl", hash = "sha256:f930a4d92b004b643183451fe9c8fe398ccf866ed37d172ebaccfd443a097f61"},
+    {file = "coverage-7.10.3-cp39-cp39-win_amd64.whl", hash = "sha256:08e638a93c8acba13c7842953f92a33d52d73e410329acd472280d2a21a6c0e1"},
+    {file = "coverage-7.10.3-py3-none-any.whl", hash = "sha256:416a8d74dc0adfd33944ba2f405897bab87b7e9e84a391e09d241956bd953ce1"},
+    {file = "coverage-7.10.3.tar.gz", hash = "sha256:812ba9250532e4a823b070b0420a36499859542335af3dca8f47fc6aa1a05619"},
+]
+
+[package.extras]
+toml = ["tomli ; python_full_version <= \"3.11.0a6\""]
+
+[[package]]
+name = "debugpy"
+version = "1.8.16"
+description = "An implementation of the Debug Adapter Protocol for Python"
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "debugpy-1.8.16-cp310-cp310-macosx_14_0_x86_64.whl", hash = "sha256:2a3958fb9c2f40ed8ea48a0d34895b461de57a1f9862e7478716c35d76f56c65"},
+    {file = "debugpy-1.8.16-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e5ca7314042e8a614cc2574cd71f6ccd7e13a9708ce3c6d8436959eae56f2378"},
+    {file = "debugpy-1.8.16-cp310-cp310-win32.whl", hash = "sha256:8624a6111dc312ed8c363347a0b59c5acc6210d897e41a7c069de3c53235c9a6"},
+    {file = "debugpy-1.8.16-cp310-cp310-win_amd64.whl", hash = "sha256:fee6db83ea5c978baf042440cfe29695e1a5d48a30147abf4c3be87513609817"},
+    {file = "debugpy-1.8.16-cp311-cp311-macosx_14_0_universal2.whl", hash = "sha256:67371b28b79a6a12bcc027d94a06158f2fde223e35b5c4e0783b6f9d3b39274a"},
+    {file = "debugpy-1.8.16-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b2abae6dd02523bec2dee16bd6b0781cccb53fd4995e5c71cc659b5f45581898"},
+    {file = "debugpy-1.8.16-cp311-cp311-win32.whl", hash = "sha256:f8340a3ac2ed4f5da59e064aa92e39edd52729a88fbde7bbaa54e08249a04493"},
+    {file = "debugpy-1.8.16-cp311-cp311-win_amd64.whl", hash = "sha256:70f5fcd6d4d0c150a878d2aa37391c52de788c3dc680b97bdb5e529cb80df87a"},
+    {file = "debugpy-1.8.16-cp312-cp312-macosx_14_0_universal2.whl", hash = "sha256:b202e2843e32e80b3b584bcebfe0e65e0392920dc70df11b2bfe1afcb7a085e4"},
+    {file = "debugpy-1.8.16-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:64473c4a306ba11a99fe0bb14622ba4fbd943eb004847d9b69b107bde45aa9ea"},
+    {file = "debugpy-1.8.16-cp312-cp312-win32.whl", hash = "sha256:833a61ed446426e38b0dd8be3e9d45ae285d424f5bf6cd5b2b559c8f12305508"},
+    {file = "debugpy-1.8.16-cp312-cp312-win_amd64.whl", hash = "sha256:75f204684581e9ef3dc2f67687c3c8c183fde2d6675ab131d94084baf8084121"},
+    {file = "debugpy-1.8.16-cp313-cp313-macosx_14_0_universal2.whl", hash = "sha256:85df3adb1de5258dca910ae0bb185e48c98801ec15018a263a92bb06be1c8787"},
+    {file = "debugpy-1.8.16-cp313-cp313-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bee89e948bc236a5c43c4214ac62d28b29388453f5fd328d739035e205365f0b"},
+    {file = "debugpy-1.8.16-cp313-cp313-win32.whl", hash = "sha256:cf358066650439847ec5ff3dae1da98b5461ea5da0173d93d5e10f477c94609a"},
+    {file = "debugpy-1.8.16-cp313-cp313-win_amd64.whl", hash = "sha256:b5aea1083f6f50023e8509399d7dc6535a351cc9f2e8827d1e093175e4d9fa4c"},
+    {file = "debugpy-1.8.16-cp38-cp38-macosx_14_0_x86_64.whl", hash = "sha256:2801329c38f77c47976d341d18040a9ac09d0c71bf2c8b484ad27c74f83dc36f"},
+    {file = "debugpy-1.8.16-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:687c7ab47948697c03b8f81424aa6dc3f923e6ebab1294732df1ca9773cc67bc"},
+    {file = "debugpy-1.8.16-cp38-cp38-win32.whl", hash = "sha256:a2ba6fc5d7c4bc84bcae6c5f8edf5988146e55ae654b1bb36fecee9e5e77e9e2"},
+    {file = "debugpy-1.8.16-cp38-cp38-win_amd64.whl", hash = "sha256:d58c48d8dbbbf48a3a3a638714a2d16de537b0dace1e3432b8e92c57d43707f8"},
+    {file = "debugpy-1.8.16-cp39-cp39-macosx_14_0_x86_64.whl", hash = "sha256:135ccd2b1161bade72a7a099c9208811c137a150839e970aeaf121c2467debe8"},
+    {file = "debugpy-1.8.16-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:211238306331a9089e253fd997213bc4a4c65f949271057d6695953254095376"},
+    {file = "debugpy-1.8.16-cp39-cp39-win32.whl", hash = "sha256:88eb9ffdfb59bf63835d146c183d6dba1f722b3ae2a5f4b9fc03e925b3358922"},
+    {file = "debugpy-1.8.16-cp39-cp39-win_amd64.whl", hash = "sha256:c2c47c2e52b40449552843b913786499efcc3dbc21d6c49287d939cd0dbc49fd"},
+    {file = "debugpy-1.8.16-py2.py3-none-any.whl", hash = "sha256:19c9521962475b87da6f673514f7fd610328757ec993bf7ec0d8c96f9a325f9e"},
+    {file = "debugpy-1.8.16.tar.gz", hash = "sha256:31e69a1feb1cf6b51efbed3f6c9b0ef03bc46ff050679c4be7ea6d2e23540870"},
+]
+
+[[package]]
+name = "decorator"
+version = "5.2.1"
+description = "Decorators for Humans"
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "decorator-5.2.1-py3-none-any.whl", hash = "sha256:d316bb415a2d9e2d2b3abcc4084c6502fc09240e292cd76a76afc106a1c8e04a"},
+    {file = "decorator-5.2.1.tar.gz", hash = "sha256:65f266143752f734b0a7cc83c46f4618af75b8c5911b00ccb61d0ac9b6da0360"},
+]
+
+[[package]]
+name = "defusedxml"
+version = "0.7.1"
+description = "XML bomb protection for Python stdlib modules"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+groups = ["dev"]
+files = [
+    {file = "defusedxml-0.7.1-py2.py3-none-any.whl", hash = "sha256:a352e7e428770286cc899e2542b6cdaedb2b4953ff269a210103ec58f6198a61"},
+    {file = "defusedxml-0.7.1.tar.gz", hash = "sha256:1bb3032db185915b62d7c6209c5a8792be6a32ab2fedacc84e01b52c51aa3e69"},
+]
+
+[[package]]
+name = "dill"
+version = "0.4.0"
+description = "serialize all of Python"
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "dill-0.4.0-py3-none-any.whl", hash = "sha256:44f54bf6412c2c8464c14e8243eb163690a9800dbe2c367330883b19c7561049"},
+    {file = "dill-0.4.0.tar.gz", hash = "sha256:0633f1d2df477324f53a895b02c901fb961bdbf65a17122586ea7019292cbcf0"},
+]
+
+[package.extras]
+graph = ["objgraph (>=1.7.2)"]
+profile = ["gprof2dot (>=2022.7.29)"]
+
+[[package]]
+name = "et-xmlfile"
+version = "2.0.0"
+description = "An implementation of lxml.xmlfile for the standard library"
+optional = false
+python-versions = ">=3.8"
+groups = ["main"]
+files = [
+    {file = "et_xmlfile-2.0.0-py3-none-any.whl", hash = "sha256:7a91720bc756843502c3b7504c77b8fe44217c85c537d85037f0f536151b2caa"},
+    {file = "et_xmlfile-2.0.0.tar.gz", hash = "sha256:dab3f4764309081ce75662649be815c4c9081e88f0837825f90fd28317d4da54"},
+]
+
+[[package]]
+name = "executing"
+version = "2.2.0"
+description = "Get the currently executing AST node of a frame, and other information"
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "executing-2.2.0-py2.py3-none-any.whl", hash = "sha256:11387150cad388d62750327a53d3339fad4888b39a6fe233c3afbb54ecffd3aa"},
+    {file = "executing-2.2.0.tar.gz", hash = "sha256:5d108c028108fe2551d1a7b2e8b713341e2cb4fc0aa7dcf966fa4327a5226755"},
+]
+
+[package.extras]
+tests = ["asttokens (>=2.1.0)", "coverage", "coverage-enable-subprocess", "ipython", "littleutils", "pytest", "rich ; python_version >= \"3.11\""]
+
+[[package]]
+name = "fastjsonschema"
+version = "2.21.1"
+description = "Fastest Python implementation of JSON schema"
+optional = false
+python-versions = "*"
+groups = ["dev"]
+files = [
+    {file = "fastjsonschema-2.21.1-py3-none-any.whl", hash = "sha256:c9e5b7e908310918cf494a434eeb31384dd84a98b57a30bcb1f535015b554667"},
+    {file = "fastjsonschema-2.21.1.tar.gz", hash = "sha256:794d4f0a58f848961ba16af7b9c85a3e88cd360df008c59aac6fc5ae9323b5d4"},
+]
+
+[package.extras]
+devel = ["colorama", "json-spec", "jsonschema", "pylint", "pytest", "pytest-benchmark", "pytest-cache", "validictory"]
+
+[[package]]
+name = "fqdn"
+version = "1.5.1"
+description = "Validates fully-qualified domain names against RFC 1123, so that they are acceptable to modern bowsers"
+optional = false
+python-versions = ">=2.7, !=3.0, !=3.1, !=3.2, !=3.3, !=3.4, <4"
+groups = ["dev"]
+files = [
+    {file = "fqdn-1.5.1-py3-none-any.whl", hash = "sha256:3a179af3761e4df6eb2e026ff9e1a3033d3587bf980a0b1b2e1e5d08d7358014"},
+    {file = "fqdn-1.5.1.tar.gz", hash = "sha256:105ed3677e767fb5ca086a0c1f4bb66ebc3c100be518f0e0d755d9eae164d89f"},
+]
+
+[[package]]
+name = "h11"
+version = "0.16.0"
+description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1"
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "h11-0.16.0-py3-none-any.whl", hash = "sha256:63cf8bbe7522de3bf65932fda1d9c2772064ffb3dae62d55932da54b31cb6c86"},
+    {file = "h11-0.16.0.tar.gz", hash = "sha256:4e35b956cf45792e4caa5885e69fba00bdbc6ffafbfa020300e549b208ee5ff1"},
+]
+
+[[package]]
+name = "httpcore"
+version = "1.0.9"
+description = "A minimal low-level HTTP client."
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "httpcore-1.0.9-py3-none-any.whl", hash = "sha256:2d400746a40668fc9dec9810239072b40b4484b640a8c38fd654a024c7a1bf55"},
+    {file = "httpcore-1.0.9.tar.gz", hash = "sha256:6e34463af53fd2ab5d807f399a9b45ea31c3dfa2276f15a2c3f00afff6e176e8"},
+]
+
+[package.dependencies]
+certifi = "*"
+h11 = ">=0.16"
+
+[package.extras]
+asyncio = ["anyio (>=4.0,<5.0)"]
+http2 = ["h2 (>=3,<5)"]
+socks = ["socksio (==1.*)"]
+trio = ["trio (>=0.22.0,<1.0)"]
+
+[[package]]
+name = "httpx"
+version = "0.28.1"
+description = "The next generation HTTP client."
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "httpx-0.28.1-py3-none-any.whl", hash = "sha256:d909fcccc110f8c7faf814ca82a9a4d816bc5a6dbfea25d6591d6985b8ba59ad"},
+    {file = "httpx-0.28.1.tar.gz", hash = "sha256:75e98c5f16b0f35b567856f597f06ff2270a374470a5c2392242528e3e3e42fc"},
+]
+
+[package.dependencies]
+anyio = "*"
+certifi = "*"
+httpcore = "==1.*"
+idna = "*"
+
+[package.extras]
+brotli = ["brotli ; platform_python_implementation == \"CPython\"", "brotlicffi ; platform_python_implementation != \"CPython\""]
+cli = ["click (==8.*)", "pygments (==2.*)", "rich (>=10,<14)"]
+http2 = ["h2 (>=3,<5)"]
+socks = ["socksio (==1.*)"]
+zstd = ["zstandard (>=0.18.0)"]
+
+[[package]]
+name = "idna"
+version = "3.10"
+description = "Internationalized Domain Names in Applications (IDNA)"
+optional = false
+python-versions = ">=3.6"
+groups = ["main", "dev"]
+files = [
+    {file = "idna-3.10-py3-none-any.whl", hash = "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3"},
+    {file = "idna-3.10.tar.gz", hash = "sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9"},
+]
+
+[package.extras]
+all = ["flake8 (>=7.1.1)", "mypy (>=1.11.2)", "pytest (>=8.3.2)", "ruff (>=0.6.2)"]
+
+[[package]]
+name = "iniconfig"
+version = "2.1.0"
+description = "brain-dead simple config-ini parsing"
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "iniconfig-2.1.0-py3-none-any.whl", hash = "sha256:9deba5723312380e77435581c6bf4935c94cbfab9b1ed33ef8d238ea168eb760"},
+    {file = "iniconfig-2.1.0.tar.gz", hash = "sha256:3abbd2e30b36733fee78f9c7f7308f2d0050e88f0087fd25c2645f63c773e1c7"},
+]
+
+[[package]]
+name = "ipykernel"
+version = "6.30.1"
+description = "IPython Kernel for Jupyter"
+optional = false
+python-versions = ">=3.9"
+groups = ["dev"]
+files = [
+    {file = "ipykernel-6.30.1-py3-none-any.whl", hash = "sha256:aa6b9fb93dca949069d8b85b6c79b2518e32ac583ae9c7d37c51d119e18b3fb4"},
+    {file = "ipykernel-6.30.1.tar.gz", hash = "sha256:6abb270161896402e76b91394fcdce5d1be5d45f456671e5080572f8505be39b"},
+]
+
+[package.dependencies]
+appnope = {version = ">=0.1.2", markers = "platform_system == \"Darwin\""}
+comm = ">=0.1.1"
+debugpy = ">=1.6.5"
+ipython = ">=7.23.1"
+jupyter-client = ">=8.0.0"
+jupyter-core = ">=4.12,<5.0.dev0 || >=5.1.dev0"
+matplotlib-inline = ">=0.1"
+nest-asyncio = ">=1.4"
+packaging = ">=22"
+psutil = ">=5.7"
+pyzmq = ">=25"
+tornado = ">=6.2"
+traitlets = ">=5.4.0"
+
+[package.extras]
+cov = ["coverage[toml]", "matplotlib", "pytest-cov", "trio"]
+docs = ["intersphinx-registry", "myst-parser", "pydata-sphinx-theme", "sphinx", "sphinx-autodoc-typehints", "sphinxcontrib-github-alt", "sphinxcontrib-spelling", "trio"]
+pyqt5 = ["pyqt5"]
+pyside6 = ["pyside6"]
+test = ["flaky", "ipyparallel", "pre-commit", "pytest (>=7.0,<9)", "pytest-asyncio (>=0.23.5)", "pytest-cov", "pytest-timeout"]
+
+[[package]]
+name = "ipython"
+version = "9.4.0"
+description = "IPython: Productive Interactive Computing"
+optional = false
+python-versions = ">=3.11"
+groups = ["dev"]
+files = [
+    {file = "ipython-9.4.0-py3-none-any.whl", hash = "sha256:25850f025a446d9b359e8d296ba175a36aedd32e83ca9b5060430fe16801f066"},
+    {file = "ipython-9.4.0.tar.gz", hash = "sha256:c033c6d4e7914c3d9768aabe76bbe87ba1dc66a92a05db6bfa1125d81f2ee270"},
+]
+
+[package.dependencies]
+colorama = {version = "*", markers = "sys_platform == \"win32\""}
+decorator = "*"
+ipython-pygments-lexers = "*"
+jedi = ">=0.16"
+matplotlib-inline = "*"
+pexpect = {version = ">4.3", markers = "sys_platform != \"win32\" and sys_platform != \"emscripten\""}
+prompt_toolkit = ">=3.0.41,<3.1.0"
+pygments = ">=2.4.0"
+stack_data = "*"
+traitlets = ">=5.13.0"
+
+[package.extras]
+all = ["ipython[doc,matplotlib,test,test-extra]"]
+black = ["black"]
+doc = ["docrepr", "exceptiongroup", "intersphinx_registry", "ipykernel", "ipython[test]", "matplotlib", "setuptools (>=18.5)", "sphinx (>=1.3)", "sphinx-rtd-theme", "sphinx_toml (==0.0.4)", "typing_extensions"]
+matplotlib = ["matplotlib"]
+test = ["packaging", "pytest", "pytest-asyncio (<0.22)", "testpath"]
+test-extra = ["curio", "ipykernel", "ipython[test]", "jupyter_ai", "matplotlib (!=3.2.0)", "nbclient", "nbformat", "numpy (>=1.23)", "pandas", "trio"]
+
+[[package]]
+name = "ipython-pygments-lexers"
+version = "1.1.1"
+description = "Defines a variety of Pygments lexers for highlighting IPython code."
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "ipython_pygments_lexers-1.1.1-py3-none-any.whl", hash = "sha256:a9462224a505ade19a605f71f8fa63c2048833ce50abc86768a0d81d876dc81c"},
+    {file = "ipython_pygments_lexers-1.1.1.tar.gz", hash = "sha256:09c0138009e56b6854f9535736f4171d855c8c08a563a0dcd8022f78355c7e81"},
+]
+
+[package.dependencies]
+pygments = "*"
+
+[[package]]
+name = "isoduration"
+version = "20.11.0"
+description = "Operations with ISO 8601 durations"
+optional = false
+python-versions = ">=3.7"
+groups = ["dev"]
+files = [
+    {file = "isoduration-20.11.0-py3-none-any.whl", hash = "sha256:b2904c2a4228c3d44f409c8ae8e2370eb21a26f7ac2ec5446df141dde3452042"},
+    {file = "isoduration-20.11.0.tar.gz", hash = "sha256:ac2f9015137935279eac671f94f89eb00584f940f5dc49462a0c4ee692ba1bd9"},
+]
+
+[package.dependencies]
+arrow = ">=0.15.0"
+
+[[package]]
+name = "isort"
+version = "6.0.1"
+description = "A Python utility / library to sort Python imports."
+optional = false
+python-versions = ">=3.9.0"
+groups = ["dev"]
+files = [
+    {file = "isort-6.0.1-py3-none-any.whl", hash = "sha256:2dc5d7f65c9678d94c88dfc29161a320eec67328bc97aad576874cb4be1e9615"},
+    {file = "isort-6.0.1.tar.gz", hash = "sha256:1cb5df28dfbc742e490c5e41bad6da41b805b0a8be7bc93cd0fb2a8a890ac450"},
+]
+
+[package.extras]
+colors = ["colorama"]
+plugins = ["setuptools"]
+
+[[package]]
+name = "jedi"
+version = "0.19.2"
+description = "An autocompletion tool for Python that can be used for text editors."
+optional = false
+python-versions = ">=3.6"
+groups = ["dev"]
+files = [
+    {file = "jedi-0.19.2-py2.py3-none-any.whl", hash = "sha256:a8ef22bde8490f57fe5c7681a3c83cb58874daf72b4784de3cce5b6ef6edb5b9"},
+    {file = "jedi-0.19.2.tar.gz", hash = "sha256:4770dc3de41bde3966b02eb84fbcf557fb33cce26ad23da12c742fb50ecb11f0"},
+]
+
+[package.dependencies]
+parso = ">=0.8.4,<0.9.0"
+
+[package.extras]
+docs = ["Jinja2 (==2.11.3)", "MarkupSafe (==1.1.1)", "Pygments (==2.8.1)", "alabaster (==0.7.12)", "babel (==2.9.1)", "chardet (==4.0.0)", "commonmark (==0.8.1)", "docutils (==0.17.1)", "future (==0.18.2)", "idna (==2.10)", "imagesize (==1.2.0)", "mock (==1.0.1)", "packaging (==20.9)", "pyparsing (==2.4.7)", "pytz (==2021.1)", "readthedocs-sphinx-ext (==2.1.4)", "recommonmark (==0.5.0)", "requests (==2.25.1)", "six (==1.15.0)", "snowballstemmer (==2.1.0)", "sphinx (==1.8.5)", "sphinx-rtd-theme (==0.4.3)", "sphinxcontrib-serializinghtml (==1.1.4)", "sphinxcontrib-websupport (==1.2.4)", "urllib3 (==1.26.4)"]
+qa = ["flake8 (==5.0.4)", "mypy (==0.971)", "types-setuptools (==67.2.0.1)"]
+testing = ["Django", "attrs", "colorama", "docopt", "pytest (<9.0.0)"]
+
+[[package]]
+name = "jinja2"
+version = "3.1.6"
+description = "A very fast and expressive template engine."
+optional = false
+python-versions = ">=3.7"
+groups = ["dev"]
+files = [
+    {file = "jinja2-3.1.6-py3-none-any.whl", hash = "sha256:85ece4451f492d0c13c5dd7c13a64681a86afae63a5f347908daf103ce6d2f67"},
+    {file = "jinja2-3.1.6.tar.gz", hash = "sha256:0137fb05990d35f1275a587e9aee6d56da821fc83491a0fb838183be43f66d6d"},
+]
+
+[package.dependencies]
+MarkupSafe = ">=2.0"
+
+[package.extras]
+i18n = ["Babel (>=2.7)"]
+
+[[package]]
+name = "json5"
+version = "0.12.1"
+description = "A Python implementation of the JSON5 data format."
+optional = false
+python-versions = ">=3.8.0"
+groups = ["dev"]
+files = [
+    {file = "json5-0.12.1-py3-none-any.whl", hash = "sha256:d9c9b3bc34a5f54d43c35e11ef7cb87d8bdd098c6ace87117a7b7e83e705c1d5"},
+    {file = "json5-0.12.1.tar.gz", hash = "sha256:b2743e77b3242f8d03c143dd975a6ec7c52e2f2afe76ed934e53503dd4ad4990"},
+]
+
+[package.extras]
+dev = ["build (==1.2.2.post1)", "coverage (==7.5.4) ; python_version < \"3.9\"", "coverage (==7.8.0) ; python_version >= \"3.9\"", "mypy (==1.14.1) ; python_version < \"3.9\"", "mypy (==1.15.0) ; python_version >= \"3.9\"", "pip (==25.0.1)", "pylint (==3.2.7) ; python_version < \"3.9\"", "pylint (==3.3.6) ; python_version >= \"3.9\"", "ruff (==0.11.2)", "twine (==6.1.0)", "uv (==0.6.11)"]
+
+[[package]]
+name = "jsonpointer"
+version = "3.0.0"
+description = "Identify specific nodes in a JSON document (RFC 6901)"
+optional = false
+python-versions = ">=3.7"
+groups = ["dev"]
+files = [
+    {file = "jsonpointer-3.0.0-py2.py3-none-any.whl", hash = "sha256:13e088adc14fca8b6aa8177c044e12701e6ad4b28ff10e65f2267a90109c9942"},
+    {file = "jsonpointer-3.0.0.tar.gz", hash = "sha256:2b2d729f2091522d61c3b31f82e11870f60b68f43fbc705cb76bf4b832af59ef"},
+]
+
+[[package]]
+name = "jsonschema"
+version = "4.25.0"
+description = "An implementation of JSON Schema validation for Python"
+optional = false
+python-versions = ">=3.9"
+groups = ["dev"]
+files = [
+    {file = "jsonschema-4.25.0-py3-none-any.whl", hash = "sha256:24c2e8da302de79c8b9382fee3e76b355e44d2a4364bb207159ce10b517bd716"},
+    {file = "jsonschema-4.25.0.tar.gz", hash = "sha256:e63acf5c11762c0e6672ffb61482bdf57f0876684d8d249c0fe2d730d48bc55f"},
+]
+
+[package.dependencies]
+attrs = ">=22.2.0"
+fqdn = {version = "*", optional = true, markers = "extra == \"format-nongpl\""}
+idna = {version = "*", optional = true, markers = "extra == \"format-nongpl\""}
+isoduration = {version = "*", optional = true, markers = "extra == \"format-nongpl\""}
+jsonpointer = {version = ">1.13", optional = true, markers = "extra == \"format-nongpl\""}
+jsonschema-specifications = ">=2023.03.6"
+referencing = ">=0.28.4"
+rfc3339-validator = {version = "*", optional = true, markers = "extra == \"format-nongpl\""}
+rfc3986-validator = {version = ">0.1.0", optional = true, markers = "extra == \"format-nongpl\""}
+rfc3987-syntax = {version = ">=1.1.0", optional = true, markers = "extra == \"format-nongpl\""}
+rpds-py = ">=0.7.1"
+uri-template = {version = "*", optional = true, markers = "extra == \"format-nongpl\""}
+webcolors = {version = ">=24.6.0", optional = true, markers = "extra == \"format-nongpl\""}
+
+[package.extras]
+format = ["fqdn", "idna", "isoduration", "jsonpointer (>1.13)", "rfc3339-validator", "rfc3987", "uri-template", "webcolors (>=1.11)"]
+format-nongpl = ["fqdn", "idna", "isoduration", "jsonpointer (>1.13)", "rfc3339-validator", "rfc3986-validator (>0.1.0)", "rfc3987-syntax (>=1.1.0)", "uri-template", "webcolors (>=24.6.0)"]
+
+[[package]]
+name = "jsonschema-specifications"
+version = "2025.4.1"
+description = "The JSON Schema meta-schemas and vocabularies, exposed as a Registry"
+optional = false
+python-versions = ">=3.9"
+groups = ["dev"]
+files = [
+    {file = "jsonschema_specifications-2025.4.1-py3-none-any.whl", hash = "sha256:4653bffbd6584f7de83a67e0d620ef16900b390ddc7939d56684d6c81e33f1af"},
+    {file = "jsonschema_specifications-2025.4.1.tar.gz", hash = "sha256:630159c9f4dbea161a6a2205c3011cc4f18ff381b189fff48bb39b9bf26ae608"},
+]
+
+[package.dependencies]
+referencing = ">=0.31.0"
+
+[[package]]
+name = "jupyter-client"
+version = "8.6.3"
+description = "Jupyter protocol implementation and client libraries"
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "jupyter_client-8.6.3-py3-none-any.whl", hash = "sha256:e8a19cc986cc45905ac3362915f410f3af85424b4c0905e94fa5f2cb08e8f23f"},
+    {file = "jupyter_client-8.6.3.tar.gz", hash = "sha256:35b3a0947c4a6e9d589eb97d7d4cd5e90f910ee73101611f01283732bd6d9419"},
+]
+
+[package.dependencies]
+jupyter-core = ">=4.12,<5.0.dev0 || >=5.1.dev0"
+python-dateutil = ">=2.8.2"
+pyzmq = ">=23.0"
+tornado = ">=6.2"
+traitlets = ">=5.3"
+
+[package.extras]
+docs = ["ipykernel", "myst-parser", "pydata-sphinx-theme", "sphinx (>=4)", "sphinx-autodoc-typehints", "sphinxcontrib-github-alt", "sphinxcontrib-spelling"]
+test = ["coverage", "ipykernel (>=6.14)", "mypy", "paramiko ; sys_platform == \"win32\"", "pre-commit", "pytest (<8.2.0)", "pytest-cov", "pytest-jupyter[client] (>=0.4.1)", "pytest-timeout"]
+
+[[package]]
+name = "jupyter-core"
+version = "5.8.1"
+description = "Jupyter core package. A base package on which Jupyter projects rely."
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "jupyter_core-5.8.1-py3-none-any.whl", hash = "sha256:c28d268fc90fb53f1338ded2eb410704c5449a358406e8a948b75706e24863d0"},
+    {file = "jupyter_core-5.8.1.tar.gz", hash = "sha256:0a5f9706f70e64786b75acba995988915ebd4601c8a52e534a40b51c95f59941"},
+]
+
+[package.dependencies]
+platformdirs = ">=2.5"
+pywin32 = {version = ">=300", markers = "sys_platform == \"win32\" and platform_python_implementation != \"PyPy\""}
+traitlets = ">=5.3"
+
+[package.extras]
+docs = ["intersphinx-registry", "myst-parser", "pydata-sphinx-theme", "sphinx-autodoc-typehints", "sphinxcontrib-spelling", "traitlets"]
+test = ["ipykernel", "pre-commit", "pytest (<9)", "pytest-cov", "pytest-timeout"]
+
+[[package]]
+name = "jupyter-events"
+version = "0.12.0"
+description = "Jupyter Event System library"
+optional = false
+python-versions = ">=3.9"
+groups = ["dev"]
+files = [
+    {file = "jupyter_events-0.12.0-py3-none-any.whl", hash = "sha256:6464b2fa5ad10451c3d35fabc75eab39556ae1e2853ad0c0cc31b656731a97fb"},
+    {file = "jupyter_events-0.12.0.tar.gz", hash = "sha256:fc3fce98865f6784c9cd0a56a20644fc6098f21c8c33834a8d9fe383c17e554b"},
+]
+
+[package.dependencies]
+jsonschema = {version = ">=4.18.0", extras = ["format-nongpl"]}
+packaging = "*"
+python-json-logger = ">=2.0.4"
+pyyaml = ">=5.3"
+referencing = "*"
+rfc3339-validator = "*"
+rfc3986-validator = ">=0.1.1"
+traitlets = ">=5.3"
+
+[package.extras]
+cli = ["click", "rich"]
+docs = ["jupyterlite-sphinx", "myst-parser", "pydata-sphinx-theme (>=0.16)", "sphinx (>=8)", "sphinxcontrib-spelling"]
+test = ["click", "pre-commit", "pytest (>=7.0)", "pytest-asyncio (>=0.19.0)", "pytest-console-scripts", "rich"]
+
+[[package]]
+name = "jupyter-lsp"
+version = "2.2.6"
+description = "Multi-Language Server WebSocket proxy for Jupyter Notebook/Lab server"
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "jupyter_lsp-2.2.6-py3-none-any.whl", hash = "sha256:283783752bf0b459ee7fa88effa72104d87dd343b82d5c06cf113ef755b15b6d"},
+    {file = "jupyter_lsp-2.2.6.tar.gz", hash = "sha256:0566bd9bb04fd9e6774a937ed01522b555ba78be37bebef787c8ab22de4c0361"},
+]
+
+[package.dependencies]
+jupyter_server = ">=1.1.2"
+
+[[package]]
+name = "jupyter-server"
+version = "2.16.0"
+description = "The backend—i.e. core services, APIs, and REST endpoints—to Jupyter web applications."
+optional = false
+python-versions = ">=3.9"
+groups = ["dev"]
+files = [
+    {file = "jupyter_server-2.16.0-py3-none-any.whl", hash = "sha256:3d8db5be3bc64403b1c65b400a1d7f4647a5ce743f3b20dbdefe8ddb7b55af9e"},
+    {file = "jupyter_server-2.16.0.tar.gz", hash = "sha256:65d4b44fdf2dcbbdfe0aa1ace4a842d4aaf746a2b7b168134d5aaed35621b7f6"},
+]
+
+[package.dependencies]
+anyio = ">=3.1.0"
+argon2-cffi = ">=21.1"
+jinja2 = ">=3.0.3"
+jupyter-client = ">=7.4.4"
+jupyter-core = ">=4.12,<5.0.dev0 || >=5.1.dev0"
+jupyter-events = ">=0.11.0"
+jupyter-server-terminals = ">=0.4.4"
+nbconvert = ">=6.4.4"
+nbformat = ">=5.3.0"
+overrides = ">=5.0"
+packaging = ">=22.0"
+prometheus-client = ">=0.9"
+pywinpty = {version = ">=2.0.1", markers = "os_name == \"nt\""}
+pyzmq = ">=24"
+send2trash = ">=1.8.2"
+terminado = ">=0.8.3"
+tornado = ">=6.2.0"
+traitlets = ">=5.6.0"
+websocket-client = ">=1.7"
+
+[package.extras]
+docs = ["ipykernel", "jinja2", "jupyter-client", "myst-parser", "nbformat", "prometheus-client", "pydata-sphinx-theme", "send2trash", "sphinx-autodoc-typehints", "sphinxcontrib-github-alt", "sphinxcontrib-openapi (>=0.8.0)", "sphinxcontrib-spelling", "sphinxemoji", "tornado", "typing-extensions"]
+test = ["flaky", "ipykernel", "pre-commit", "pytest (>=7.0,<9)", "pytest-console-scripts", "pytest-jupyter[server] (>=0.7)", "pytest-timeout", "requests"]
+
+[[package]]
+name = "jupyter-server-terminals"
+version = "0.5.3"
+description = "A Jupyter Server Extension Providing Terminals."
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "jupyter_server_terminals-0.5.3-py3-none-any.whl", hash = "sha256:41ee0d7dc0ebf2809c668e0fc726dfaf258fcd3e769568996ca731b6194ae9aa"},
+    {file = "jupyter_server_terminals-0.5.3.tar.gz", hash = "sha256:5ae0295167220e9ace0edcfdb212afd2b01ee8d179fe6f23c899590e9b8a5269"},
+]
+
+[package.dependencies]
+pywinpty = {version = ">=2.0.3", markers = "os_name == \"nt\""}
+terminado = ">=0.8.3"
+
+[package.extras]
+docs = ["jinja2", "jupyter-server", "mistune (<4.0)", "myst-parser", "nbformat", "packaging", "pydata-sphinx-theme", "sphinxcontrib-github-alt", "sphinxcontrib-openapi", "sphinxcontrib-spelling", "sphinxemoji", "tornado"]
+test = ["jupyter-server (>=2.0.0)", "pytest (>=7.0)", "pytest-jupyter[server] (>=0.5.3)", "pytest-timeout"]
+
+[[package]]
+name = "jupyterlab"
+version = "4.4.5"
+description = "JupyterLab computational environment"
+optional = false
+python-versions = ">=3.9"
+groups = ["dev"]
+files = [
+    {file = "jupyterlab-4.4.5-py3-none-any.whl", hash = "sha256:e76244cceb2d1fb4a99341f3edc866f2a13a9e14c50368d730d75d8017be0863"},
+    {file = "jupyterlab-4.4.5.tar.gz", hash = "sha256:0bd6c18e6a3c3d91388af6540afa3d0bb0b2e76287a7b88ddf20ab41b336e595"},
+]
+
+[package.dependencies]
+async-lru = ">=1.0.0"
+httpx = ">=0.25.0"
+ipykernel = ">=6.5.0"
+jinja2 = ">=3.0.3"
+jupyter-core = "*"
+jupyter-lsp = ">=2.0.0"
+jupyter-server = ">=2.4.0,<3"
+jupyterlab-server = ">=2.27.1,<3"
+notebook-shim = ">=0.2"
+packaging = "*"
+setuptools = ">=41.1.0"
+tornado = ">=6.2.0"
+traitlets = "*"
+
+[package.extras]
+dev = ["build", "bump2version", "coverage", "hatch", "pre-commit", "pytest-cov", "ruff (==0.11.4)"]
+docs = ["jsx-lexer", "myst-parser", "pydata-sphinx-theme (>=0.13.0)", "pytest", "pytest-check-links", "pytest-jupyter", "sphinx (>=1.8,<8.2.0)", "sphinx-copybutton"]
+docs-screenshots = ["altair (==5.5.0)", "ipython (==8.16.1)", "ipywidgets (==8.1.5)", "jupyterlab-geojson (==3.4.0)", "jupyterlab-language-pack-zh-cn (==4.3.post1)", "matplotlib (==3.10.0)", "nbconvert (>=7.0.0)", "pandas (==2.2.3)", "scipy (==1.15.1)", "vega-datasets (==0.9.0)"]
+test = ["coverage", "pytest (>=7.0)", "pytest-check-links (>=0.7)", "pytest-console-scripts", "pytest-cov", "pytest-jupyter (>=0.5.3)", "pytest-timeout", "pytest-tornasync", "requests", "requests-cache", "virtualenv"]
+upgrade-extension = ["copier (>=9,<10)", "jinja2-time (<0.3)", "pydantic (<3.0)", "pyyaml-include (<3.0)", "tomli-w (<2.0)"]
+
+[[package]]
+name = "jupyterlab-pygments"
+version = "0.3.0"
+description = "Pygments theme using JupyterLab CSS variables"
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "jupyterlab_pygments-0.3.0-py3-none-any.whl", hash = "sha256:841a89020971da1d8693f1a99997aefc5dc424bb1b251fd6322462a1b8842780"},
+    {file = "jupyterlab_pygments-0.3.0.tar.gz", hash = "sha256:721aca4d9029252b11cfa9d185e5b5af4d54772bb8072f9b7036f4170054d35d"},
+]
+
+[[package]]
+name = "jupyterlab-server"
+version = "2.27.3"
+description = "A set of server components for JupyterLab and JupyterLab like applications."
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "jupyterlab_server-2.27.3-py3-none-any.whl", hash = "sha256:e697488f66c3db49df675158a77b3b017520d772c6e1548c7d9bcc5df7944ee4"},
+    {file = "jupyterlab_server-2.27.3.tar.gz", hash = "sha256:eb36caca59e74471988f0ae25c77945610b887f777255aa21f8065def9e51ed4"},
+]
+
+[package.dependencies]
+babel = ">=2.10"
+jinja2 = ">=3.0.3"
+json5 = ">=0.9.0"
+jsonschema = ">=4.18.0"
+jupyter-server = ">=1.21,<3"
+packaging = ">=21.3"
+requests = ">=2.31"
+
+[package.extras]
+docs = ["autodoc-traits", "jinja2 (<3.2.0)", "mistune (<4)", "myst-parser", "pydata-sphinx-theme", "sphinx", "sphinx-copybutton", "sphinxcontrib-openapi (>0.8)"]
+openapi = ["openapi-core (>=0.18.0,<0.19.0)", "ruamel-yaml"]
+test = ["hatch", "ipykernel", "openapi-core (>=0.18.0,<0.19.0)", "openapi-spec-validator (>=0.6.0,<0.8.0)", "pytest (>=7.0,<8)", "pytest-console-scripts", "pytest-cov", "pytest-jupyter[server] (>=0.6.2)", "pytest-timeout", "requests-mock", "ruamel-yaml", "sphinxcontrib-spelling", "strict-rfc3339", "werkzeug"]
+
+[[package]]
+name = "lark"
+version = "1.2.2"
+description = "a modern parsing library"
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "lark-1.2.2-py3-none-any.whl", hash = "sha256:c2276486b02f0f1b90be155f2c8ba4a8e194d42775786db622faccd652d8e80c"},
+    {file = "lark-1.2.2.tar.gz", hash = "sha256:ca807d0162cd16cef15a8feecb862d7319e7a09bdb13aef927968e45040fed80"},
+]
+
+[package.extras]
+atomic-cache = ["atomicwrites"]
+interegular = ["interegular (>=0.3.1,<0.4.0)"]
+nearley = ["js2py"]
+regex = ["regex"]
+
+[[package]]
+name = "markupsafe"
+version = "3.0.2"
+description = "Safely add untrusted strings to HTML/XML markup."
+optional = false
+python-versions = ">=3.9"
+groups = ["dev"]
+files = [
+    {file = "MarkupSafe-3.0.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:7e94c425039cde14257288fd61dcfb01963e658efbc0ff54f5306b06054700f8"},
+    {file = "MarkupSafe-3.0.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9e2d922824181480953426608b81967de705c3cef4d1af983af849d7bd619158"},
+    {file = "MarkupSafe-3.0.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:38a9ef736c01fccdd6600705b09dc574584b89bea478200c5fbf112a6b0d5579"},
+    {file = "MarkupSafe-3.0.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bbcb445fa71794da8f178f0f6d66789a28d7319071af7a496d4d507ed566270d"},
+    {file = "MarkupSafe-3.0.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:57cb5a3cf367aeb1d316576250f65edec5bb3be939e9247ae594b4bcbc317dfb"},
+    {file = "MarkupSafe-3.0.2-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:3809ede931876f5b2ec92eef964286840ed3540dadf803dd570c3b7e13141a3b"},
+    {file = "MarkupSafe-3.0.2-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:e07c3764494e3776c602c1e78e298937c3315ccc9043ead7e685b7f2b8d47b3c"},
+    {file = "MarkupSafe-3.0.2-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:b424c77b206d63d500bcb69fa55ed8d0e6a3774056bdc4839fc9298a7edca171"},
+    {file = "MarkupSafe-3.0.2-cp310-cp310-win32.whl", hash = "sha256:fcabf5ff6eea076f859677f5f0b6b5c1a51e70a376b0579e0eadef8db48c6b50"},
+    {file = "MarkupSafe-3.0.2-cp310-cp310-win_amd64.whl", hash = "sha256:6af100e168aa82a50e186c82875a5893c5597a0c1ccdb0d8b40240b1f28b969a"},
+    {file = "MarkupSafe-3.0.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:9025b4018f3a1314059769c7bf15441064b2207cb3f065e6ea1e7359cb46db9d"},
+    {file = "MarkupSafe-3.0.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:93335ca3812df2f366e80509ae119189886b0f3c2b81325d39efdb84a1e2ae93"},
+    {file = "MarkupSafe-3.0.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2cb8438c3cbb25e220c2ab33bb226559e7afb3baec11c4f218ffa7308603c832"},
+    {file = "MarkupSafe-3.0.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a123e330ef0853c6e822384873bef7507557d8e4a082961e1defa947aa59ba84"},
+    {file = "MarkupSafe-3.0.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1e084f686b92e5b83186b07e8a17fc09e38fff551f3602b249881fec658d3eca"},
+    {file = "MarkupSafe-3.0.2-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:d8213e09c917a951de9d09ecee036d5c7d36cb6cb7dbaece4c71a60d79fb9798"},
+    {file = "MarkupSafe-3.0.2-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:5b02fb34468b6aaa40dfc198d813a641e3a63b98c2b05a16b9f80b7ec314185e"},
+    {file = "MarkupSafe-3.0.2-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:0bff5e0ae4ef2e1ae4fdf2dfd5b76c75e5c2fa4132d05fc1b0dabcd20c7e28c4"},
+    {file = "MarkupSafe-3.0.2-cp311-cp311-win32.whl", hash = "sha256:6c89876f41da747c8d3677a2b540fb32ef5715f97b66eeb0c6b66f5e3ef6f59d"},
+    {file = "MarkupSafe-3.0.2-cp311-cp311-win_amd64.whl", hash = "sha256:70a87b411535ccad5ef2f1df5136506a10775d267e197e4cf531ced10537bd6b"},
+    {file = "MarkupSafe-3.0.2-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:9778bd8ab0a994ebf6f84c2b949e65736d5575320a17ae8984a77fab08db94cf"},
+    {file = "MarkupSafe-3.0.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:846ade7b71e3536c4e56b386c2a47adf5741d2d8b94ec9dc3e92e5e1ee1e2225"},
+    {file = "MarkupSafe-3.0.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1c99d261bd2d5f6b59325c92c73df481e05e57f19837bdca8413b9eac4bd8028"},
+    {file = "MarkupSafe-3.0.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e17c96c14e19278594aa4841ec148115f9c7615a47382ecb6b82bd8fea3ab0c8"},
+    {file = "MarkupSafe-3.0.2-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:88416bd1e65dcea10bc7569faacb2c20ce071dd1f87539ca2ab364bf6231393c"},
+    {file = "MarkupSafe-3.0.2-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:2181e67807fc2fa785d0592dc2d6206c019b9502410671cc905d132a92866557"},
+    {file = "MarkupSafe-3.0.2-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:52305740fe773d09cffb16f8ed0427942901f00adedac82ec8b67752f58a1b22"},
+    {file = "MarkupSafe-3.0.2-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:ad10d3ded218f1039f11a75f8091880239651b52e9bb592ca27de44eed242a48"},
+    {file = "MarkupSafe-3.0.2-cp312-cp312-win32.whl", hash = "sha256:0f4ca02bea9a23221c0182836703cbf8930c5e9454bacce27e767509fa286a30"},
+    {file = "MarkupSafe-3.0.2-cp312-cp312-win_amd64.whl", hash = "sha256:8e06879fc22a25ca47312fbe7c8264eb0b662f6db27cb2d3bbbc74b1df4b9b87"},
+    {file = "MarkupSafe-3.0.2-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:ba9527cdd4c926ed0760bc301f6728ef34d841f405abf9d4f959c478421e4efd"},
+    {file = "MarkupSafe-3.0.2-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:f8b3d067f2e40fe93e1ccdd6b2e1d16c43140e76f02fb1319a05cf2b79d99430"},
+    {file = "MarkupSafe-3.0.2-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:569511d3b58c8791ab4c2e1285575265991e6d8f8700c7be0e88f86cb0672094"},
+    {file = "MarkupSafe-3.0.2-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:15ab75ef81add55874e7ab7055e9c397312385bd9ced94920f2802310c930396"},
+    {file = "MarkupSafe-3.0.2-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f3818cb119498c0678015754eba762e0d61e5b52d34c8b13d770f0719f7b1d79"},
+    {file = "MarkupSafe-3.0.2-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:cdb82a876c47801bb54a690c5ae105a46b392ac6099881cdfb9f6e95e4014c6a"},
+    {file = "MarkupSafe-3.0.2-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:cabc348d87e913db6ab4aa100f01b08f481097838bdddf7c7a84b7575b7309ca"},
+    {file = "MarkupSafe-3.0.2-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:444dcda765c8a838eaae23112db52f1efaf750daddb2d9ca300bcae1039adc5c"},
+    {file = "MarkupSafe-3.0.2-cp313-cp313-win32.whl", hash = "sha256:bcf3e58998965654fdaff38e58584d8937aa3096ab5354d493c77d1fdd66d7a1"},
+    {file = "MarkupSafe-3.0.2-cp313-cp313-win_amd64.whl", hash = "sha256:e6a2a455bd412959b57a172ce6328d2dd1f01cb2135efda2e4576e8a23fa3b0f"},
+    {file = "MarkupSafe-3.0.2-cp313-cp313t-macosx_10_13_universal2.whl", hash = "sha256:b5a6b3ada725cea8a5e634536b1b01c30bcdcd7f9c6fff4151548d5bf6b3a36c"},
+    {file = "MarkupSafe-3.0.2-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:a904af0a6162c73e3edcb969eeeb53a63ceeb5d8cf642fade7d39e7963a22ddb"},
+    {file = "MarkupSafe-3.0.2-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4aa4e5faecf353ed117801a068ebab7b7e09ffb6e1d5e412dc852e0da018126c"},
+    {file = "MarkupSafe-3.0.2-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c0ef13eaeee5b615fb07c9a7dadb38eac06a0608b41570d8ade51c56539e509d"},
+    {file = "MarkupSafe-3.0.2-cp313-cp313t-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d16a81a06776313e817c951135cf7340a3e91e8c1ff2fac444cfd75fffa04afe"},
+    {file = "MarkupSafe-3.0.2-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:6381026f158fdb7c72a168278597a5e3a5222e83ea18f543112b2662a9b699c5"},
+    {file = "MarkupSafe-3.0.2-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:3d79d162e7be8f996986c064d1c7c817f6df3a77fe3d6859f6f9e7be4b8c213a"},
+    {file = "MarkupSafe-3.0.2-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:131a3c7689c85f5ad20f9f6fb1b866f402c445b220c19fe4308c0b147ccd2ad9"},
+    {file = "MarkupSafe-3.0.2-cp313-cp313t-win32.whl", hash = "sha256:ba8062ed2cf21c07a9e295d5b8a2a5ce678b913b45fdf68c32d95d6c1291e0b6"},
+    {file = "MarkupSafe-3.0.2-cp313-cp313t-win_amd64.whl", hash = "sha256:e444a31f8db13eb18ada366ab3cf45fd4b31e4db1236a4448f68778c1d1a5a2f"},
+    {file = "MarkupSafe-3.0.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:eaa0a10b7f72326f1372a713e73c3f739b524b3af41feb43e4921cb529f5929a"},
+    {file = "MarkupSafe-3.0.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:48032821bbdf20f5799ff537c7ac3d1fba0ba032cfc06194faffa8cda8b560ff"},
+    {file = "MarkupSafe-3.0.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1a9d3f5f0901fdec14d8d2f66ef7d035f2157240a433441719ac9a3fba440b13"},
+    {file = "MarkupSafe-3.0.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:88b49a3b9ff31e19998750c38e030fc7bb937398b1f78cfa599aaef92d693144"},
+    {file = "MarkupSafe-3.0.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cfad01eed2c2e0c01fd0ecd2ef42c492f7f93902e39a42fc9ee1692961443a29"},
+    {file = "MarkupSafe-3.0.2-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:1225beacc926f536dc82e45f8a4d68502949dc67eea90eab715dea3a21c1b5f0"},
+    {file = "MarkupSafe-3.0.2-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:3169b1eefae027567d1ce6ee7cae382c57fe26e82775f460f0b2778beaad66c0"},
+    {file = "MarkupSafe-3.0.2-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:eb7972a85c54febfb25b5c4b4f3af4dcc731994c7da0d8a0b4a6eb0640e1d178"},
+    {file = "MarkupSafe-3.0.2-cp39-cp39-win32.whl", hash = "sha256:8c4e8c3ce11e1f92f6536ff07154f9d49677ebaaafc32db9db4620bc11ed480f"},
+    {file = "MarkupSafe-3.0.2-cp39-cp39-win_amd64.whl", hash = "sha256:6e296a513ca3d94054c2c881cc913116e90fd030ad1c656b3869762b754f5f8a"},
+    {file = "markupsafe-3.0.2.tar.gz", hash = "sha256:ee55d3edf80167e48ea11a923c7386f4669df67d7994554387f84e7d8b0a2bf0"},
+]
+
+[[package]]
+name = "matplotlib-inline"
+version = "0.1.7"
+description = "Inline Matplotlib backend for Jupyter"
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "matplotlib_inline-0.1.7-py3-none-any.whl", hash = "sha256:df192d39a4ff8f21b1895d72e6a13f5fcc5099f00fa84384e0ea28c2cc0653ca"},
+    {file = "matplotlib_inline-0.1.7.tar.gz", hash = "sha256:8423b23ec666be3d16e16b60bdd8ac4e86e840ebd1dd11a30b9f117f2fa0ab90"},
+]
+
+[package.dependencies]
+traitlets = "*"
+
+[[package]]
+name = "mccabe"
+version = "0.7.0"
+description = "McCabe checker, plugin for flake8"
+optional = false
+python-versions = ">=3.6"
+groups = ["dev"]
+files = [
+    {file = "mccabe-0.7.0-py2.py3-none-any.whl", hash = "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e"},
+    {file = "mccabe-0.7.0.tar.gz", hash = "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325"},
+]
+
+[[package]]
+name = "mistune"
+version = "3.1.3"
+description = "A sane and fast Markdown parser with useful plugins and renderers"
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "mistune-3.1.3-py3-none-any.whl", hash = "sha256:1a32314113cff28aa6432e99e522677c8587fd83e3d51c29b82a52409c842bd9"},
+    {file = "mistune-3.1.3.tar.gz", hash = "sha256:a7035c21782b2becb6be62f8f25d3df81ccb4d6fa477a6525b15af06539f02a0"},
+]
+
+[[package]]
+name = "nbclient"
+version = "0.10.2"
+description = "A client library for executing notebooks. Formerly nbconvert's ExecutePreprocessor."
+optional = false
+python-versions = ">=3.9.0"
+groups = ["dev"]
+files = [
+    {file = "nbclient-0.10.2-py3-none-any.whl", hash = "sha256:4ffee11e788b4a27fabeb7955547e4318a5298f34342a4bfd01f2e1faaeadc3d"},
+    {file = "nbclient-0.10.2.tar.gz", hash = "sha256:90b7fc6b810630db87a6d0c2250b1f0ab4cf4d3c27a299b0cde78a4ed3fd9193"},
+]
+
+[package.dependencies]
+jupyter-client = ">=6.1.12"
+jupyter-core = ">=4.12,<5.0.dev0 || >=5.1.dev0"
+nbformat = ">=5.1"
+traitlets = ">=5.4"
+
+[package.extras]
+dev = ["pre-commit"]
+docs = ["autodoc-traits", "flaky", "ipykernel (>=6.19.3)", "ipython", "ipywidgets", "mock", "moto", "myst-parser", "nbconvert (>=7.1.0)", "pytest (>=7.0,<8)", "pytest-asyncio", "pytest-cov (>=4.0)", "sphinx (>=1.7)", "sphinx-book-theme", "sphinxcontrib-spelling", "testpath", "xmltodict"]
+test = ["flaky", "ipykernel (>=6.19.3)", "ipython", "ipywidgets", "nbconvert (>=7.1.0)", "pytest (>=7.0,<8)", "pytest-asyncio", "pytest-cov (>=4.0)", "testpath", "xmltodict"]
+
+[[package]]
+name = "nbconvert"
+version = "7.16.6"
+description = "Converting Jupyter Notebooks (.ipynb files) to other formats.  Output formats include asciidoc, html, latex, markdown, pdf, py, rst, script.  nbconvert can be used both as a Python library (`import nbconvert`) or as a command line tool (invoked as `jupyter nbconvert ...`)."
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "nbconvert-7.16.6-py3-none-any.whl", hash = "sha256:1375a7b67e0c2883678c48e506dc320febb57685e5ee67faa51b18a90f3a712b"},
+    {file = "nbconvert-7.16.6.tar.gz", hash = "sha256:576a7e37c6480da7b8465eefa66c17844243816ce1ccc372633c6b71c3c0f582"},
+]
+
+[package.dependencies]
+beautifulsoup4 = "*"
+bleach = {version = "!=5.0.0", extras = ["css"]}
+defusedxml = "*"
+jinja2 = ">=3.0"
+jupyter-core = ">=4.7"
+jupyterlab-pygments = "*"
+markupsafe = ">=2.0"
+mistune = ">=2.0.3,<4"
+nbclient = ">=0.5.0"
+nbformat = ">=5.7"
+packaging = "*"
+pandocfilters = ">=1.4.1"
+pygments = ">=2.4.1"
+traitlets = ">=5.1"
+
+[package.extras]
+all = ["flaky", "ipykernel", "ipython", "ipywidgets (>=7.5)", "myst-parser", "nbsphinx (>=0.2.12)", "playwright", "pydata-sphinx-theme", "pyqtwebengine (>=5.15)", "pytest (>=7)", "sphinx (==5.0.2)", "sphinxcontrib-spelling", "tornado (>=6.1)"]
+docs = ["ipykernel", "ipython", "myst-parser", "nbsphinx (>=0.2.12)", "pydata-sphinx-theme", "sphinx (==5.0.2)", "sphinxcontrib-spelling"]
+qtpdf = ["pyqtwebengine (>=5.15)"]
+qtpng = ["pyqtwebengine (>=5.15)"]
+serve = ["tornado (>=6.1)"]
+test = ["flaky", "ipykernel", "ipywidgets (>=7.5)", "pytest (>=7)"]
+webpdf = ["playwright"]
+
+[[package]]
+name = "nbformat"
+version = "5.10.4"
+description = "The Jupyter Notebook format"
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "nbformat-5.10.4-py3-none-any.whl", hash = "sha256:3b48d6c8fbca4b299bf3982ea7db1af21580e4fec269ad087b9e81588891200b"},
+    {file = "nbformat-5.10.4.tar.gz", hash = "sha256:322168b14f937a5d11362988ecac2a4952d3d8e3a2cbeb2319584631226d5b3a"},
+]
+
+[package.dependencies]
+fastjsonschema = ">=2.15"
+jsonschema = ">=2.6"
+jupyter-core = ">=4.12,<5.0.dev0 || >=5.1.dev0"
+traitlets = ">=5.1"
+
+[package.extras]
+docs = ["myst-parser", "pydata-sphinx-theme", "sphinx", "sphinxcontrib-github-alt", "sphinxcontrib-spelling"]
+test = ["pep440", "pre-commit", "pytest", "testpath"]
+
+[[package]]
+name = "nest-asyncio"
+version = "1.6.0"
+description = "Patch asyncio to allow nested event loops"
+optional = false
+python-versions = ">=3.5"
+groups = ["dev"]
+files = [
+    {file = "nest_asyncio-1.6.0-py3-none-any.whl", hash = "sha256:87af6efd6b5e897c81050477ef65c62e2b2f35d51703cae01aff2905b1852e1c"},
+    {file = "nest_asyncio-1.6.0.tar.gz", hash = "sha256:6f172d5449aca15afd6c646851f4e31e02c598d553a667e38cafa997cfec55fe"},
+]
+
+[[package]]
+name = "notebook"
+version = "7.4.5"
+description = "Jupyter Notebook - A web-based notebook environment for interactive computing"
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "notebook-7.4.5-py3-none-any.whl", hash = "sha256:351635461aca9dad08cf8946a4216f963e2760cc1bf7b1aaaecb23afc33ec046"},
+    {file = "notebook-7.4.5.tar.gz", hash = "sha256:7c2c4ea245913c3ad8ab3e5d36b34a842c06e524556f5c2e1f5d7d08c986615e"},
+]
+
+[package.dependencies]
+jupyter-server = ">=2.4.0,<3"
+jupyterlab = ">=4.4.5,<4.5"
+jupyterlab-server = ">=2.27.1,<3"
+notebook-shim = ">=0.2,<0.3"
+tornado = ">=6.2.0"
+
+[package.extras]
+dev = ["hatch", "pre-commit"]
+docs = ["myst-parser", "nbsphinx", "pydata-sphinx-theme", "sphinx (>=1.3.6)", "sphinxcontrib-github-alt", "sphinxcontrib-spelling"]
+test = ["importlib-resources (>=5.0) ; python_version < \"3.10\"", "ipykernel", "jupyter-server[test] (>=2.4.0,<3)", "jupyterlab-server[test] (>=2.27.1,<3)", "nbval", "pytest (>=7.0)", "pytest-console-scripts", "pytest-timeout", "pytest-tornasync", "requests"]
+
+[[package]]
+name = "notebook-shim"
+version = "0.2.4"
+description = "A shim layer for notebook traits and config"
+optional = false
+python-versions = ">=3.7"
+groups = ["dev"]
+files = [
+    {file = "notebook_shim-0.2.4-py3-none-any.whl", hash = "sha256:411a5be4e9dc882a074ccbcae671eda64cceb068767e9a3419096986560e1cef"},
+    {file = "notebook_shim-0.2.4.tar.gz", hash = "sha256:b4b2cfa1b65d98307ca24361f5b30fe785b53c3fd07b7a47e89acb5e6ac638cb"},
+]
+
+[package.dependencies]
+jupyter-server = ">=1.8,<3"
+
+[package.extras]
+test = ["pytest", "pytest-console-scripts", "pytest-jupyter", "pytest-tornasync"]
+
+[[package]]
+name = "numpy"
+version = "2.3.2"
+description = "Fundamental package for array computing in Python"
+optional = false
+python-versions = ">=3.11"
+groups = ["main"]
+files = [
+    {file = "numpy-2.3.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:852ae5bed3478b92f093e30f785c98e0cb62fa0a939ed057c31716e18a7a22b9"},
+    {file = "numpy-2.3.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:7a0e27186e781a69959d0230dd9909b5e26024f8da10683bd6344baea1885168"},
+    {file = "numpy-2.3.2-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:f0a1a8476ad77a228e41619af2fa9505cf69df928e9aaa165746584ea17fed2b"},
+    {file = "numpy-2.3.2-cp311-cp311-macosx_14_0_x86_64.whl", hash = "sha256:cbc95b3813920145032412f7e33d12080f11dc776262df1712e1638207dde9e8"},
+    {file = "numpy-2.3.2-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f75018be4980a7324edc5930fe39aa391d5734531b1926968605416ff58c332d"},
+    {file = "numpy-2.3.2-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:20b8200721840f5621b7bd03f8dcd78de33ec522fc40dc2641aa09537df010c3"},
+    {file = "numpy-2.3.2-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:1f91e5c028504660d606340a084db4b216567ded1056ea2b4be4f9d10b67197f"},
+    {file = "numpy-2.3.2-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:fb1752a3bb9a3ad2d6b090b88a9a0ae1cd6f004ef95f75825e2f382c183b2097"},
+    {file = "numpy-2.3.2-cp311-cp311-win32.whl", hash = "sha256:4ae6863868aaee2f57503c7a5052b3a2807cf7a3914475e637a0ecd366ced220"},
+    {file = "numpy-2.3.2-cp311-cp311-win_amd64.whl", hash = "sha256:240259d6564f1c65424bcd10f435145a7644a65a6811cfc3201c4a429ba79170"},
+    {file = "numpy-2.3.2-cp311-cp311-win_arm64.whl", hash = "sha256:4209f874d45f921bde2cff1ffcd8a3695f545ad2ffbef6d3d3c6768162efab89"},
+    {file = "numpy-2.3.2-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:bc3186bea41fae9d8e90c2b4fb5f0a1f5a690682da79b92574d63f56b529080b"},
+    {file = "numpy-2.3.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:2f4f0215edb189048a3c03bd5b19345bdfa7b45a7a6f72ae5945d2a28272727f"},
+    {file = "numpy-2.3.2-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:8b1224a734cd509f70816455c3cffe13a4f599b1bf7130f913ba0e2c0b2006c0"},
+    {file = "numpy-2.3.2-cp312-cp312-macosx_14_0_x86_64.whl", hash = "sha256:3dcf02866b977a38ba3ec10215220609ab9667378a9e2150615673f3ffd6c73b"},
+    {file = "numpy-2.3.2-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:572d5512df5470f50ada8d1972c5f1082d9a0b7aa5944db8084077570cf98370"},
+    {file = "numpy-2.3.2-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8145dd6d10df13c559d1e4314df29695613575183fa2e2d11fac4c208c8a1f73"},
+    {file = "numpy-2.3.2-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:103ea7063fa624af04a791c39f97070bf93b96d7af7eb23530cd087dc8dbe9dc"},
+    {file = "numpy-2.3.2-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:fc927d7f289d14f5e037be917539620603294454130b6de200091e23d27dc9be"},
+    {file = "numpy-2.3.2-cp312-cp312-win32.whl", hash = "sha256:d95f59afe7f808c103be692175008bab926b59309ade3e6d25009e9a171f7036"},
+    {file = "numpy-2.3.2-cp312-cp312-win_amd64.whl", hash = "sha256:9e196ade2400c0c737d93465327d1ae7c06c7cb8a1756121ebf54b06ca183c7f"},
+    {file = "numpy-2.3.2-cp312-cp312-win_arm64.whl", hash = "sha256:ee807923782faaf60d0d7331f5e86da7d5e3079e28b291973c545476c2b00d07"},
+    {file = "numpy-2.3.2-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:c8d9727f5316a256425892b043736d63e89ed15bbfe6556c5ff4d9d4448ff3b3"},
+    {file = "numpy-2.3.2-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:efc81393f25f14d11c9d161e46e6ee348637c0a1e8a54bf9dedc472a3fae993b"},
+    {file = "numpy-2.3.2-cp313-cp313-macosx_14_0_arm64.whl", hash = "sha256:dd937f088a2df683cbb79dda9a772b62a3e5a8a7e76690612c2737f38c6ef1b6"},
+    {file = "numpy-2.3.2-cp313-cp313-macosx_14_0_x86_64.whl", hash = "sha256:11e58218c0c46c80509186e460d79fbdc9ca1eb8d8aee39d8f2dc768eb781089"},
+    {file = "numpy-2.3.2-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5ad4ebcb683a1f99f4f392cc522ee20a18b2bb12a2c1c42c3d48d5a1adc9d3d2"},
+    {file = "numpy-2.3.2-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:938065908d1d869c7d75d8ec45f735a034771c6ea07088867f713d1cd3bbbe4f"},
+    {file = "numpy-2.3.2-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:66459dccc65d8ec98cc7df61307b64bf9e08101f9598755d42d8ae65d9a7a6ee"},
+    {file = "numpy-2.3.2-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:a7af9ed2aa9ec5950daf05bb11abc4076a108bd3c7db9aa7251d5f107079b6a6"},
+    {file = "numpy-2.3.2-cp313-cp313-win32.whl", hash = "sha256:906a30249315f9c8e17b085cc5f87d3f369b35fedd0051d4a84686967bdbbd0b"},
+    {file = "numpy-2.3.2-cp313-cp313-win_amd64.whl", hash = "sha256:c63d95dc9d67b676e9108fe0d2182987ccb0f11933c1e8959f42fa0da8d4fa56"},
+    {file = "numpy-2.3.2-cp313-cp313-win_arm64.whl", hash = "sha256:b05a89f2fb84d21235f93de47129dd4f11c16f64c87c33f5e284e6a3a54e43f2"},
+    {file = "numpy-2.3.2-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:4e6ecfeddfa83b02318f4d84acf15fbdbf9ded18e46989a15a8b6995dfbf85ab"},
+    {file = "numpy-2.3.2-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:508b0eada3eded10a3b55725b40806a4b855961040180028f52580c4729916a2"},
+    {file = "numpy-2.3.2-cp313-cp313t-macosx_14_0_arm64.whl", hash = "sha256:754d6755d9a7588bdc6ac47dc4ee97867271b17cee39cb87aef079574366db0a"},
+    {file = "numpy-2.3.2-cp313-cp313t-macosx_14_0_x86_64.whl", hash = "sha256:a9f66e7d2b2d7712410d3bc5684149040ef5f19856f20277cd17ea83e5006286"},
+    {file = "numpy-2.3.2-cp313-cp313t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:de6ea4e5a65d5a90c7d286ddff2b87f3f4ad61faa3db8dabe936b34c2275b6f8"},
+    {file = "numpy-2.3.2-cp313-cp313t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a3ef07ec8cbc8fc9e369c8dcd52019510c12da4de81367d8b20bc692aa07573a"},
+    {file = "numpy-2.3.2-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:27c9f90e7481275c7800dc9c24b7cc40ace3fdb970ae4d21eaff983a32f70c91"},
+    {file = "numpy-2.3.2-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:07b62978075b67eee4065b166d000d457c82a1efe726cce608b9db9dd66a73a5"},
+    {file = "numpy-2.3.2-cp313-cp313t-win32.whl", hash = "sha256:c771cfac34a4f2c0de8e8c97312d07d64fd8f8ed45bc9f5726a7e947270152b5"},
+    {file = "numpy-2.3.2-cp313-cp313t-win_amd64.whl", hash = "sha256:72dbebb2dcc8305c431b2836bcc66af967df91be793d63a24e3d9b741374c450"},
+    {file = "numpy-2.3.2-cp313-cp313t-win_arm64.whl", hash = "sha256:72c6df2267e926a6d5286b0a6d556ebe49eae261062059317837fda12ddf0c1a"},
+    {file = "numpy-2.3.2-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:448a66d052d0cf14ce9865d159bfc403282c9bc7bb2a31b03cc18b651eca8b1a"},
+    {file = "numpy-2.3.2-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:546aaf78e81b4081b2eba1d105c3b34064783027a06b3ab20b6eba21fb64132b"},
+    {file = "numpy-2.3.2-cp314-cp314-macosx_14_0_arm64.whl", hash = "sha256:87c930d52f45df092f7578889711a0768094debf73cfcde105e2d66954358125"},
+    {file = "numpy-2.3.2-cp314-cp314-macosx_14_0_x86_64.whl", hash = "sha256:8dc082ea901a62edb8f59713c6a7e28a85daddcb67454c839de57656478f5b19"},
+    {file = "numpy-2.3.2-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:af58de8745f7fa9ca1c0c7c943616c6fe28e75d0c81f5c295810e3c83b5be92f"},
+    {file = "numpy-2.3.2-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:fed5527c4cf10f16c6d0b6bee1f89958bccb0ad2522c8cadc2efd318bcd545f5"},
+    {file = "numpy-2.3.2-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:095737ed986e00393ec18ec0b21b47c22889ae4b0cd2d5e88342e08b01141f58"},
+    {file = "numpy-2.3.2-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:b5e40e80299607f597e1a8a247ff8d71d79c5b52baa11cc1cce30aa92d2da6e0"},
+    {file = "numpy-2.3.2-cp314-cp314-win32.whl", hash = "sha256:7d6e390423cc1f76e1b8108c9b6889d20a7a1f59d9a60cac4a050fa734d6c1e2"},
+    {file = "numpy-2.3.2-cp314-cp314-win_amd64.whl", hash = "sha256:b9d0878b21e3918d76d2209c924ebb272340da1fb51abc00f986c258cd5e957b"},
+    {file = "numpy-2.3.2-cp314-cp314-win_arm64.whl", hash = "sha256:2738534837c6a1d0c39340a190177d7d66fdf432894f469728da901f8f6dc910"},
+    {file = "numpy-2.3.2-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:4d002ecf7c9b53240be3bb69d80f86ddbd34078bae04d87be81c1f58466f264e"},
+    {file = "numpy-2.3.2-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:293b2192c6bcce487dbc6326de5853787f870aeb6c43f8f9c6496db5b1781e45"},
+    {file = "numpy-2.3.2-cp314-cp314t-macosx_14_0_arm64.whl", hash = "sha256:0a4f2021a6da53a0d580d6ef5db29947025ae8b35b3250141805ea9a32bbe86b"},
+    {file = "numpy-2.3.2-cp314-cp314t-macosx_14_0_x86_64.whl", hash = "sha256:9c144440db4bf3bb6372d2c3e49834cc0ff7bb4c24975ab33e01199e645416f2"},
+    {file = "numpy-2.3.2-cp314-cp314t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f92d6c2a8535dc4fe4419562294ff957f83a16ebdec66df0805e473ffaad8bd0"},
+    {file = "numpy-2.3.2-cp314-cp314t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:cefc2219baa48e468e3db7e706305fcd0c095534a192a08f31e98d83a7d45fb0"},
+    {file = "numpy-2.3.2-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:76c3e9501ceb50b2ff3824c3589d5d1ab4ac857b0ee3f8f49629d0de55ecf7c2"},
+    {file = "numpy-2.3.2-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:122bf5ed9a0221b3419672493878ba4967121514b1d7d4656a7580cd11dddcbf"},
+    {file = "numpy-2.3.2-cp314-cp314t-win32.whl", hash = "sha256:6f1ae3dcb840edccc45af496f312528c15b1f79ac318169d094e85e4bb35fdf1"},
+    {file = "numpy-2.3.2-cp314-cp314t-win_amd64.whl", hash = "sha256:087ffc25890d89a43536f75c5fe8770922008758e8eeeef61733957041ed2f9b"},
+    {file = "numpy-2.3.2-cp314-cp314t-win_arm64.whl", hash = "sha256:092aeb3449833ea9c0bf0089d70c29ae480685dd2377ec9cdbbb620257f84631"},
+    {file = "numpy-2.3.2-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:14a91ebac98813a49bc6aa1a0dfc09513dcec1d97eaf31ca21a87221a1cdcb15"},
+    {file = "numpy-2.3.2-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:71669b5daae692189540cffc4c439468d35a3f84f0c88b078ecd94337f6cb0ec"},
+    {file = "numpy-2.3.2-pp311-pypy311_pp73-macosx_14_0_arm64.whl", hash = "sha256:69779198d9caee6e547adb933941ed7520f896fd9656834c300bdf4dd8642712"},
+    {file = "numpy-2.3.2-pp311-pypy311_pp73-macosx_14_0_x86_64.whl", hash = "sha256:2c3271cc4097beb5a60f010bcc1cc204b300bb3eafb4399376418a83a1c6373c"},
+    {file = "numpy-2.3.2-pp311-pypy311_pp73-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:8446acd11fe3dc1830568c941d44449fd5cb83068e5c70bd5a470d323d448296"},
+    {file = "numpy-2.3.2-pp311-pypy311_pp73-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:aa098a5ab53fa407fded5870865c6275a5cd4101cfdef8d6fafc48286a96e981"},
+    {file = "numpy-2.3.2-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:6936aff90dda378c09bea075af0d9c675fe3a977a9d2402f95a87f440f59f619"},
+    {file = "numpy-2.3.2.tar.gz", hash = "sha256:e0486a11ec30cdecb53f184d496d1c6a20786c81e55e41640270130056f8ee48"},
+]
+
+[[package]]
+name = "openpyxl"
+version = "3.1.5"
+description = "A Python library to read/write Excel 2010 xlsx/xlsm files"
+optional = false
+python-versions = ">=3.8"
+groups = ["main"]
+files = [
+    {file = "openpyxl-3.1.5-py2.py3-none-any.whl", hash = "sha256:5282c12b107bffeef825f4617dc029afaf41d0ea60823bbb665ef3079dc79de2"},
+    {file = "openpyxl-3.1.5.tar.gz", hash = "sha256:cf0e3cf56142039133628b5acffe8ef0c12bc902d2aadd3e0fe5878dc08d1050"},
+]
+
+[package.dependencies]
+et-xmlfile = "*"
+
+[[package]]
+name = "overrides"
+version = "7.7.0"
+description = "A decorator to automatically detect mismatch when overriding a method."
+optional = false
+python-versions = ">=3.6"
+groups = ["dev"]
+files = [
+    {file = "overrides-7.7.0-py3-none-any.whl", hash = "sha256:c7ed9d062f78b8e4c1a7b70bd8796b35ead4d9f510227ef9c5dc7626c60d7e49"},
+    {file = "overrides-7.7.0.tar.gz", hash = "sha256:55158fa3d93b98cc75299b1e67078ad9003ca27945c76162c1c0766d6f91820a"},
+]
+
+[[package]]
+name = "packaging"
+version = "25.0"
+description = "Core utilities for Python packages"
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "packaging-25.0-py3-none-any.whl", hash = "sha256:29572ef2b1f17581046b3a2227d5c611fb25ec70ca1ba8554b24b0e69331a484"},
+    {file = "packaging-25.0.tar.gz", hash = "sha256:d443872c98d677bf60f6a1f2f8c1cb748e8fe762d2bf9d3148b5599295b0fc4f"},
+]
+
+[[package]]
+name = "pandas"
+version = "2.3.1"
+description = "Powerful data structures for data analysis, time series, and statistics"
+optional = false
+python-versions = ">=3.9"
+groups = ["main"]
+files = [
+    {file = "pandas-2.3.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:22c2e866f7209ebc3a8f08d75766566aae02bcc91d196935a1d9e59c7b990ac9"},
+    {file = "pandas-2.3.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:3583d348546201aff730c8c47e49bc159833f971c2899d6097bce68b9112a4f1"},
+    {file = "pandas-2.3.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0f951fbb702dacd390561e0ea45cdd8ecfa7fb56935eb3dd78e306c19104b9b0"},
+    {file = "pandas-2.3.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cd05b72ec02ebfb993569b4931b2e16fbb4d6ad6ce80224a3ee838387d83a191"},
+    {file = "pandas-2.3.1-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:1b916a627919a247d865aed068eb65eb91a344b13f5b57ab9f610b7716c92de1"},
+    {file = "pandas-2.3.1-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:fe67dc676818c186d5a3d5425250e40f179c2a89145df477dd82945eaea89e97"},
+    {file = "pandas-2.3.1-cp310-cp310-win_amd64.whl", hash = "sha256:2eb789ae0274672acbd3c575b0598d213345660120a257b47b5dafdc618aec83"},
+    {file = "pandas-2.3.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:2b0540963d83431f5ce8870ea02a7430adca100cec8a050f0811f8e31035541b"},
+    {file = "pandas-2.3.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:fe7317f578c6a153912bd2292f02e40c1d8f253e93c599e82620c7f69755c74f"},
+    {file = "pandas-2.3.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e6723a27ad7b244c0c79d8e7007092d7c8f0f11305770e2f4cd778b3ad5f9f85"},
+    {file = "pandas-2.3.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3462c3735fe19f2638f2c3a40bd94ec2dc5ba13abbb032dd2fa1f540a075509d"},
+    {file = "pandas-2.3.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:98bcc8b5bf7afed22cc753a28bc4d9e26e078e777066bc53fac7904ddef9a678"},
+    {file = "pandas-2.3.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:4d544806b485ddf29e52d75b1f559142514e60ef58a832f74fb38e48d757b299"},
+    {file = "pandas-2.3.1-cp311-cp311-win_amd64.whl", hash = "sha256:b3cd4273d3cb3707b6fffd217204c52ed92859533e31dc03b7c5008aa933aaab"},
+    {file = "pandas-2.3.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:689968e841136f9e542020698ee1c4fbe9caa2ed2213ae2388dc7b81721510d3"},
+    {file = "pandas-2.3.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:025e92411c16cbe5bb2a4abc99732a6b132f439b8aab23a59fa593eb00704232"},
+    {file = "pandas-2.3.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9b7ff55f31c4fcb3e316e8f7fa194566b286d6ac430afec0d461163312c5841e"},
+    {file = "pandas-2.3.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7dcb79bf373a47d2a40cf7232928eb7540155abbc460925c2c96d2d30b006eb4"},
+    {file = "pandas-2.3.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:56a342b231e8862c96bdb6ab97170e203ce511f4d0429589c8ede1ee8ece48b8"},
+    {file = "pandas-2.3.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:ca7ed14832bce68baef331f4d7f294411bed8efd032f8109d690df45e00c4679"},
+    {file = "pandas-2.3.1-cp312-cp312-win_amd64.whl", hash = "sha256:ac942bfd0aca577bef61f2bc8da8147c4ef6879965ef883d8e8d5d2dc3e744b8"},
+    {file = "pandas-2.3.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:9026bd4a80108fac2239294a15ef9003c4ee191a0f64b90f170b40cfb7cf2d22"},
+    {file = "pandas-2.3.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:6de8547d4fdb12421e2d047a2c446c623ff4c11f47fddb6b9169eb98ffba485a"},
+    {file = "pandas-2.3.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:782647ddc63c83133b2506912cc6b108140a38a37292102aaa19c81c83db2928"},
+    {file = "pandas-2.3.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2ba6aff74075311fc88504b1db890187a3cd0f887a5b10f5525f8e2ef55bfdb9"},
+    {file = "pandas-2.3.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:e5635178b387bd2ba4ac040f82bc2ef6e6b500483975c4ebacd34bec945fda12"},
+    {file = "pandas-2.3.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:6f3bf5ec947526106399a9e1d26d40ee2b259c66422efdf4de63c848492d91bb"},
+    {file = "pandas-2.3.1-cp313-cp313-win_amd64.whl", hash = "sha256:1c78cf43c8fde236342a1cb2c34bcff89564a7bfed7e474ed2fffa6aed03a956"},
+    {file = "pandas-2.3.1-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:8dfc17328e8da77be3cf9f47509e5637ba8f137148ed0e9b5241e1baf526e20a"},
+    {file = "pandas-2.3.1-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:ec6c851509364c59a5344458ab935e6451b31b818be467eb24b0fe89bd05b6b9"},
+    {file = "pandas-2.3.1-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:911580460fc4884d9b05254b38a6bfadddfcc6aaef856fb5859e7ca202e45275"},
+    {file = "pandas-2.3.1-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2f4d6feeba91744872a600e6edbbd5b033005b431d5ae8379abee5bcfa479fab"},
+    {file = "pandas-2.3.1-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:fe37e757f462d31a9cd7580236a82f353f5713a80e059a29753cf938c6775d96"},
+    {file = "pandas-2.3.1-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:5db9637dbc24b631ff3707269ae4559bce4b7fd75c1c4d7e13f40edc42df4444"},
+    {file = "pandas-2.3.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:4645f770f98d656f11c69e81aeb21c6fca076a44bed3dcbb9396a4311bc7f6d8"},
+    {file = "pandas-2.3.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:342e59589cc454aaff7484d75b816a433350b3d7964d7847327edda4d532a2e3"},
+    {file = "pandas-2.3.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1d12f618d80379fde6af007f65f0c25bd3e40251dbd1636480dfffce2cf1e6da"},
+    {file = "pandas-2.3.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dd71c47a911da120d72ef173aeac0bf5241423f9bfea57320110a978457e069e"},
+    {file = "pandas-2.3.1-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:09e3b1587f0f3b0913e21e8b32c3119174551deb4a4eba4a89bc7377947977e7"},
+    {file = "pandas-2.3.1-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:2323294c73ed50f612f67e2bf3ae45aea04dce5690778e08a09391897f35ff88"},
+    {file = "pandas-2.3.1-cp39-cp39-win_amd64.whl", hash = "sha256:b4b0de34dc8499c2db34000ef8baad684cfa4cbd836ecee05f323ebfba348c7d"},
+    {file = "pandas-2.3.1.tar.gz", hash = "sha256:0a95b9ac964fe83ce317827f80304d37388ea77616b1425f0ae41c9d2d0d7bb2"},
+]
+
+[package.dependencies]
+numpy = {version = ">=1.26.0", markers = "python_version >= \"3.12\""}
+python-dateutil = ">=2.8.2"
+pytz = ">=2020.1"
+tzdata = ">=2022.7"
+
+[package.extras]
+all = ["PyQt5 (>=5.15.9)", "SQLAlchemy (>=2.0.0)", "adbc-driver-postgresql (>=0.8.0)", "adbc-driver-sqlite (>=0.8.0)", "beautifulsoup4 (>=4.11.2)", "bottleneck (>=1.3.6)", "dataframe-api-compat (>=0.1.7)", "fastparquet (>=2022.12.0)", "fsspec (>=2022.11.0)", "gcsfs (>=2022.11.0)", "html5lib (>=1.1)", "hypothesis (>=6.46.1)", "jinja2 (>=3.1.2)", "lxml (>=4.9.2)", "matplotlib (>=3.6.3)", "numba (>=0.56.4)", "numexpr (>=2.8.4)", "odfpy (>=1.4.1)", "openpyxl (>=3.1.0)", "pandas-gbq (>=0.19.0)", "psycopg2 (>=2.9.6)", "pyarrow (>=10.0.1)", "pymysql (>=1.0.2)", "pyreadstat (>=1.2.0)", "pytest (>=7.3.2)", "pytest-xdist (>=2.2.0)", "python-calamine (>=0.1.7)", "pyxlsb (>=1.0.10)", "qtpy (>=2.3.0)", "s3fs (>=2022.11.0)", "scipy (>=1.10.0)", "tables (>=3.8.0)", "tabulate (>=0.9.0)", "xarray (>=2022.12.0)", "xlrd (>=2.0.1)", "xlsxwriter (>=3.0.5)", "zstandard (>=0.19.0)"]
+aws = ["s3fs (>=2022.11.0)"]
+clipboard = ["PyQt5 (>=5.15.9)", "qtpy (>=2.3.0)"]
+compression = ["zstandard (>=0.19.0)"]
+computation = ["scipy (>=1.10.0)", "xarray (>=2022.12.0)"]
+consortium-standard = ["dataframe-api-compat (>=0.1.7)"]
+excel = ["odfpy (>=1.4.1)", "openpyxl (>=3.1.0)", "python-calamine (>=0.1.7)", "pyxlsb (>=1.0.10)", "xlrd (>=2.0.1)", "xlsxwriter (>=3.0.5)"]
+feather = ["pyarrow (>=10.0.1)"]
+fss = ["fsspec (>=2022.11.0)"]
+gcp = ["gcsfs (>=2022.11.0)", "pandas-gbq (>=0.19.0)"]
+hdf5 = ["tables (>=3.8.0)"]
+html = ["beautifulsoup4 (>=4.11.2)", "html5lib (>=1.1)", "lxml (>=4.9.2)"]
+mysql = ["SQLAlchemy (>=2.0.0)", "pymysql (>=1.0.2)"]
+output-formatting = ["jinja2 (>=3.1.2)", "tabulate (>=0.9.0)"]
+parquet = ["pyarrow (>=10.0.1)"]
+performance = ["bottleneck (>=1.3.6)", "numba (>=0.56.4)", "numexpr (>=2.8.4)"]
+plot = ["matplotlib (>=3.6.3)"]
+postgresql = ["SQLAlchemy (>=2.0.0)", "adbc-driver-postgresql (>=0.8.0)", "psycopg2 (>=2.9.6)"]
+pyarrow = ["pyarrow (>=10.0.1)"]
+spss = ["pyreadstat (>=1.2.0)"]
+sql-other = ["SQLAlchemy (>=2.0.0)", "adbc-driver-postgresql (>=0.8.0)", "adbc-driver-sqlite (>=0.8.0)"]
+test = ["hypothesis (>=6.46.1)", "pytest (>=7.3.2)", "pytest-xdist (>=2.2.0)"]
+xml = ["lxml (>=4.9.2)"]
+
+[[package]]
+name = "pandocfilters"
+version = "1.5.1"
+description = "Utilities for writing pandoc filters in python"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+groups = ["dev"]
+files = [
+    {file = "pandocfilters-1.5.1-py2.py3-none-any.whl", hash = "sha256:93be382804a9cdb0a7267585f157e5d1731bbe5545a85b268d6f5fe6232de2bc"},
+    {file = "pandocfilters-1.5.1.tar.gz", hash = "sha256:002b4a555ee4ebc03f8b66307e287fa492e4a77b4ea14d3f934328297bb4939e"},
+]
+
+[[package]]
+name = "parso"
+version = "0.8.4"
+description = "A Python Parser"
+optional = false
+python-versions = ">=3.6"
+groups = ["dev"]
+files = [
+    {file = "parso-0.8.4-py2.py3-none-any.whl", hash = "sha256:a418670a20291dacd2dddc80c377c5c3791378ee1e8d12bffc35420643d43f18"},
+    {file = "parso-0.8.4.tar.gz", hash = "sha256:eb3a7b58240fb99099a345571deecc0f9540ea5f4dd2fe14c2a99d6b281ab92d"},
+]
+
+[package.extras]
+qa = ["flake8 (==5.0.4)", "mypy (==0.971)", "types-setuptools (==67.2.0.1)"]
+testing = ["docopt", "pytest"]
+
+[[package]]
+name = "pexpect"
+version = "4.9.0"
+description = "Pexpect allows easy control of interactive console applications."
+optional = false
+python-versions = "*"
+groups = ["dev"]
+markers = "sys_platform != \"win32\" and sys_platform != \"emscripten\""
+files = [
+    {file = "pexpect-4.9.0-py2.py3-none-any.whl", hash = "sha256:7236d1e080e4936be2dc3e326cec0af72acf9212a7e1d060210e70a47e253523"},
+    {file = "pexpect-4.9.0.tar.gz", hash = "sha256:ee7d41123f3c9911050ea2c2dac107568dc43b2d3b0c7557a33212c398ead30f"},
+]
+
+[package.dependencies]
+ptyprocess = ">=0.5"
+
+[[package]]
+name = "platformdirs"
+version = "4.3.8"
+description = "A small Python package for determining appropriate platform-specific dirs, e.g. a `user data dir`."
+optional = false
+python-versions = ">=3.9"
+groups = ["dev"]
+files = [
+    {file = "platformdirs-4.3.8-py3-none-any.whl", hash = "sha256:ff7059bb7eb1179e2685604f4aaf157cfd9535242bd23742eadc3c13542139b4"},
+    {file = "platformdirs-4.3.8.tar.gz", hash = "sha256:3d512d96e16bcb959a814c9f348431070822a6496326a4be0911c40b5a74c2bc"},
+]
+
+[package.extras]
+docs = ["furo (>=2024.8.6)", "proselint (>=0.14)", "sphinx (>=8.1.3)", "sphinx-autodoc-typehints (>=3)"]
+test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=8.3.4)", "pytest-cov (>=6)", "pytest-mock (>=3.14)"]
+type = ["mypy (>=1.14.1)"]
+
+[[package]]
+name = "pluggy"
+version = "1.6.0"
+description = "plugin and hook calling mechanisms for python"
+optional = false
+python-versions = ">=3.9"
+groups = ["dev"]
+files = [
+    {file = "pluggy-1.6.0-py3-none-any.whl", hash = "sha256:e920276dd6813095e9377c0bc5566d94c932c33b27a3e3945d8389c374dd4746"},
+    {file = "pluggy-1.6.0.tar.gz", hash = "sha256:7dcc130b76258d33b90f61b658791dede3486c3e6bfb003ee5c9bfb396dd22f3"},
+]
+
+[package.extras]
+dev = ["pre-commit", "tox"]
+testing = ["coverage", "pytest", "pytest-benchmark"]
+
+[[package]]
+name = "prometheus-client"
+version = "0.22.1"
+description = "Python client for the Prometheus monitoring system."
+optional = false
+python-versions = ">=3.9"
+groups = ["dev"]
+files = [
+    {file = "prometheus_client-0.22.1-py3-none-any.whl", hash = "sha256:cca895342e308174341b2cbf99a56bef291fbc0ef7b9e5412a0f26d653ba7094"},
+    {file = "prometheus_client-0.22.1.tar.gz", hash = "sha256:190f1331e783cf21eb60bca559354e0a4d4378facecf78f5428c39b675d20d28"},
+]
+
+[package.extras]
+twisted = ["twisted"]
+
+[[package]]
+name = "prompt-toolkit"
+version = "3.0.51"
+description = "Library for building powerful interactive command lines in Python"
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "prompt_toolkit-3.0.51-py3-none-any.whl", hash = "sha256:52742911fde84e2d423e2f9a4cf1de7d7ac4e51958f648d9540e0fb8db077b07"},
+    {file = "prompt_toolkit-3.0.51.tar.gz", hash = "sha256:931a162e3b27fc90c86f1b48bb1fb2c528c2761475e57c9c06de13311c7b54ed"},
+]
+
+[package.dependencies]
+wcwidth = "*"
+
+[[package]]
+name = "psutil"
+version = "7.0.0"
+description = "Cross-platform lib for process and system monitoring in Python.  NOTE: the syntax of this script MUST be kept compatible with Python 2.7."
+optional = false
+python-versions = ">=3.6"
+groups = ["dev"]
+files = [
+    {file = "psutil-7.0.0-cp36-abi3-macosx_10_9_x86_64.whl", hash = "sha256:101d71dc322e3cffd7cea0650b09b3d08b8e7c4109dd6809fe452dfd00e58b25"},
+    {file = "psutil-7.0.0-cp36-abi3-macosx_11_0_arm64.whl", hash = "sha256:39db632f6bb862eeccf56660871433e111b6ea58f2caea825571951d4b6aa3da"},
+    {file = "psutil-7.0.0-cp36-abi3-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1fcee592b4c6f146991ca55919ea3d1f8926497a713ed7faaf8225e174581e91"},
+    {file = "psutil-7.0.0-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4b1388a4f6875d7e2aff5c4ca1cc16c545ed41dd8bb596cefea80111db353a34"},
+    {file = "psutil-7.0.0-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a5f098451abc2828f7dc6b58d44b532b22f2088f4999a937557b603ce72b1993"},
+    {file = "psutil-7.0.0-cp36-cp36m-win32.whl", hash = "sha256:84df4eb63e16849689f76b1ffcb36db7b8de703d1bc1fe41773db487621b6c17"},
+    {file = "psutil-7.0.0-cp36-cp36m-win_amd64.whl", hash = "sha256:1e744154a6580bc968a0195fd25e80432d3afec619daf145b9e5ba16cc1d688e"},
+    {file = "psutil-7.0.0-cp37-abi3-win32.whl", hash = "sha256:ba3fcef7523064a6c9da440fc4d6bd07da93ac726b5733c29027d7dc95b39d99"},
+    {file = "psutil-7.0.0-cp37-abi3-win_amd64.whl", hash = "sha256:4cf3d4eb1aa9b348dec30105c55cd9b7d4629285735a102beb4441e38db90553"},
+    {file = "psutil-7.0.0.tar.gz", hash = "sha256:7be9c3eba38beccb6495ea33afd982a44074b78f28c434a1f51cc07fd315c456"},
+]
+
+[package.extras]
+dev = ["abi3audit", "black (==24.10.0)", "check-manifest", "coverage", "packaging", "pylint", "pyperf", "pypinfo", "pytest", "pytest-cov", "pytest-xdist", "requests", "rstcheck", "ruff", "setuptools", "sphinx", "sphinx_rtd_theme", "toml-sort", "twine", "virtualenv", "vulture", "wheel"]
+test = ["pytest", "pytest-xdist", "setuptools"]
+
+[[package]]
+name = "ptyprocess"
+version = "0.7.0"
+description = "Run a subprocess in a pseudo terminal"
+optional = false
+python-versions = "*"
+groups = ["dev"]
+markers = "sys_platform != \"win32\" and sys_platform != \"emscripten\" or os_name != \"nt\""
+files = [
+    {file = "ptyprocess-0.7.0-py2.py3-none-any.whl", hash = "sha256:4b41f3967fce3af57cc7e94b888626c18bf37a083e3651ca8feeb66d492fef35"},
+    {file = "ptyprocess-0.7.0.tar.gz", hash = "sha256:5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347423220"},
+]
+
+[[package]]
+name = "pure-eval"
+version = "0.2.3"
+description = "Safely evaluate AST nodes without side effects"
+optional = false
+python-versions = "*"
+groups = ["dev"]
+files = [
+    {file = "pure_eval-0.2.3-py3-none-any.whl", hash = "sha256:1db8e35b67b3d218d818ae653e27f06c3aa420901fa7b081ca98cbedc874e0d0"},
+    {file = "pure_eval-0.2.3.tar.gz", hash = "sha256:5f4e983f40564c576c7c8635ae88db5956bb2229d7e9237d03b3c0b0190eaf42"},
+]
+
+[package.extras]
+tests = ["pytest"]
+
+[[package]]
+name = "pycparser"
+version = "2.22"
+description = "C parser in Python"
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "pycparser-2.22-py3-none-any.whl", hash = "sha256:c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc"},
+    {file = "pycparser-2.22.tar.gz", hash = "sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6"},
+]
+
+[[package]]
+name = "pydantic"
+version = "2.11.7"
+description = "Data validation using Python type hints"
+optional = false
+python-versions = ">=3.9"
+groups = ["main"]
+files = [
+    {file = "pydantic-2.11.7-py3-none-any.whl", hash = "sha256:dde5df002701f6de26248661f6835bbe296a47bf73990135c7d07ce741b9623b"},
+    {file = "pydantic-2.11.7.tar.gz", hash = "sha256:d989c3c6cb79469287b1569f7447a17848c998458d49ebe294e975b9baf0f0db"},
+]
+
+[package.dependencies]
+annotated-types = ">=0.6.0"
+pydantic-core = "2.33.2"
+typing-extensions = ">=4.12.2"
+typing-inspection = ">=0.4.0"
+
+[package.extras]
+email = ["email-validator (>=2.0.0)"]
+timezone = ["tzdata ; python_version >= \"3.9\" and platform_system == \"Windows\""]
+
+[[package]]
+name = "pydantic-core"
+version = "2.33.2"
+description = "Core functionality for Pydantic validation and serialization"
+optional = false
+python-versions = ">=3.9"
+groups = ["main"]
+files = [
+    {file = "pydantic_core-2.33.2-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:2b3d326aaef0c0399d9afffeb6367d5e26ddc24d351dbc9c636840ac355dc5d8"},
+    {file = "pydantic_core-2.33.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:0e5b2671f05ba48b94cb90ce55d8bdcaaedb8ba00cc5359f6810fc918713983d"},
+    {file = "pydantic_core-2.33.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0069c9acc3f3981b9ff4cdfaf088e98d83440a4c7ea1bc07460af3d4dc22e72d"},
+    {file = "pydantic_core-2.33.2-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:d53b22f2032c42eaaf025f7c40c2e3b94568ae077a606f006d206a463bc69572"},
+    {file = "pydantic_core-2.33.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0405262705a123b7ce9f0b92f123334d67b70fd1f20a9372b907ce1080c7ba02"},
+    {file = "pydantic_core-2.33.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4b25d91e288e2c4e0662b8038a28c6a07eaac3e196cfc4ff69de4ea3db992a1b"},
+    {file = "pydantic_core-2.33.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6bdfe4b3789761f3bcb4b1ddf33355a71079858958e3a552f16d5af19768fef2"},
+    {file = "pydantic_core-2.33.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:efec8db3266b76ef9607c2c4c419bdb06bf335ae433b80816089ea7585816f6a"},
+    {file = "pydantic_core-2.33.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:031c57d67ca86902726e0fae2214ce6770bbe2f710dc33063187a68744a5ecac"},
+    {file = "pydantic_core-2.33.2-cp310-cp310-musllinux_1_1_armv7l.whl", hash = "sha256:f8de619080e944347f5f20de29a975c2d815d9ddd8be9b9b7268e2e3ef68605a"},
+    {file = "pydantic_core-2.33.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:73662edf539e72a9440129f231ed3757faab89630d291b784ca99237fb94db2b"},
+    {file = "pydantic_core-2.33.2-cp310-cp310-win32.whl", hash = "sha256:0a39979dcbb70998b0e505fb1556a1d550a0781463ce84ebf915ba293ccb7e22"},
+    {file = "pydantic_core-2.33.2-cp310-cp310-win_amd64.whl", hash = "sha256:b0379a2b24882fef529ec3b4987cb5d003b9cda32256024e6fe1586ac45fc640"},
+    {file = "pydantic_core-2.33.2-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:4c5b0a576fb381edd6d27f0a85915c6daf2f8138dc5c267a57c08a62900758c7"},
+    {file = "pydantic_core-2.33.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:e799c050df38a639db758c617ec771fd8fb7a5f8eaaa4b27b101f266b216a246"},
+    {file = "pydantic_core-2.33.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:dc46a01bf8d62f227d5ecee74178ffc448ff4e5197c756331f71efcc66dc980f"},
+    {file = "pydantic_core-2.33.2-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:a144d4f717285c6d9234a66778059f33a89096dfb9b39117663fd8413d582dcc"},
+    {file = "pydantic_core-2.33.2-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:73cf6373c21bc80b2e0dc88444f41ae60b2f070ed02095754eb5a01df12256de"},
+    {file = "pydantic_core-2.33.2-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3dc625f4aa79713512d1976fe9f0bc99f706a9dee21dfd1810b4bbbf228d0e8a"},
+    {file = "pydantic_core-2.33.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:881b21b5549499972441da4758d662aeea93f1923f953e9cbaff14b8b9565aef"},
+    {file = "pydantic_core-2.33.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:bdc25f3681f7b78572699569514036afe3c243bc3059d3942624e936ec93450e"},
+    {file = "pydantic_core-2.33.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:fe5b32187cbc0c862ee201ad66c30cf218e5ed468ec8dc1cf49dec66e160cc4d"},
+    {file = "pydantic_core-2.33.2-cp311-cp311-musllinux_1_1_armv7l.whl", hash = "sha256:bc7aee6f634a6f4a95676fcb5d6559a2c2a390330098dba5e5a5f28a2e4ada30"},
+    {file = "pydantic_core-2.33.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:235f45e5dbcccf6bd99f9f472858849f73d11120d76ea8707115415f8e5ebebf"},
+    {file = "pydantic_core-2.33.2-cp311-cp311-win32.whl", hash = "sha256:6368900c2d3ef09b69cb0b913f9f8263b03786e5b2a387706c5afb66800efd51"},
+    {file = "pydantic_core-2.33.2-cp311-cp311-win_amd64.whl", hash = "sha256:1e063337ef9e9820c77acc768546325ebe04ee38b08703244c1309cccc4f1bab"},
+    {file = "pydantic_core-2.33.2-cp311-cp311-win_arm64.whl", hash = "sha256:6b99022f1d19bc32a4c2a0d544fc9a76e3be90f0b3f4af413f87d38749300e65"},
+    {file = "pydantic_core-2.33.2-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:a7ec89dc587667f22b6a0b6579c249fca9026ce7c333fc142ba42411fa243cdc"},
+    {file = "pydantic_core-2.33.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:3c6db6e52c6d70aa0d00d45cdb9b40f0433b96380071ea80b09277dba021ddf7"},
+    {file = "pydantic_core-2.33.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4e61206137cbc65e6d5256e1166f88331d3b6238e082d9f74613b9b765fb9025"},
+    {file = "pydantic_core-2.33.2-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:eb8c529b2819c37140eb51b914153063d27ed88e3bdc31b71198a198e921e011"},
+    {file = "pydantic_core-2.33.2-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c52b02ad8b4e2cf14ca7b3d918f3eb0ee91e63b3167c32591e57c4317e134f8f"},
+    {file = "pydantic_core-2.33.2-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:96081f1605125ba0855dfda83f6f3df5ec90c61195421ba72223de35ccfb2f88"},
+    {file = "pydantic_core-2.33.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8f57a69461af2a5fa6e6bbd7a5f60d3b7e6cebb687f55106933188e79ad155c1"},
+    {file = "pydantic_core-2.33.2-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:572c7e6c8bb4774d2ac88929e3d1f12bc45714ae5ee6d9a788a9fb35e60bb04b"},
+    {file = "pydantic_core-2.33.2-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:db4b41f9bd95fbe5acd76d89920336ba96f03e149097365afe1cb092fceb89a1"},
+    {file = "pydantic_core-2.33.2-cp312-cp312-musllinux_1_1_armv7l.whl", hash = "sha256:fa854f5cf7e33842a892e5c73f45327760bc7bc516339fda888c75ae60edaeb6"},
+    {file = "pydantic_core-2.33.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:5f483cfb75ff703095c59e365360cb73e00185e01aaea067cd19acffd2ab20ea"},
+    {file = "pydantic_core-2.33.2-cp312-cp312-win32.whl", hash = "sha256:9cb1da0f5a471435a7bc7e439b8a728e8b61e59784b2af70d7c169f8dd8ae290"},
+    {file = "pydantic_core-2.33.2-cp312-cp312-win_amd64.whl", hash = "sha256:f941635f2a3d96b2973e867144fde513665c87f13fe0e193c158ac51bfaaa7b2"},
+    {file = "pydantic_core-2.33.2-cp312-cp312-win_arm64.whl", hash = "sha256:cca3868ddfaccfbc4bfb1d608e2ccaaebe0ae628e1416aeb9c4d88c001bb45ab"},
+    {file = "pydantic_core-2.33.2-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:1082dd3e2d7109ad8b7da48e1d4710c8d06c253cbc4a27c1cff4fbcaa97a9e3f"},
+    {file = "pydantic_core-2.33.2-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:f517ca031dfc037a9c07e748cefd8d96235088b83b4f4ba8939105d20fa1dcd6"},
+    {file = "pydantic_core-2.33.2-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0a9f2c9dd19656823cb8250b0724ee9c60a82f3cdf68a080979d13092a3b0fef"},
+    {file = "pydantic_core-2.33.2-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:2b0a451c263b01acebe51895bfb0e1cc842a5c666efe06cdf13846c7418caa9a"},
+    {file = "pydantic_core-2.33.2-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1ea40a64d23faa25e62a70ad163571c0b342b8bf66d5fa612ac0dec4f069d916"},
+    {file = "pydantic_core-2.33.2-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0fb2d542b4d66f9470e8065c5469ec676978d625a8b7a363f07d9a501a9cb36a"},
+    {file = "pydantic_core-2.33.2-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9fdac5d6ffa1b5a83bca06ffe7583f5576555e6c8b3a91fbd25ea7780f825f7d"},
+    {file = "pydantic_core-2.33.2-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:04a1a413977ab517154eebb2d326da71638271477d6ad87a769102f7c2488c56"},
+    {file = "pydantic_core-2.33.2-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:c8e7af2f4e0194c22b5b37205bfb293d166a7344a5b0d0eaccebc376546d77d5"},
+    {file = "pydantic_core-2.33.2-cp313-cp313-musllinux_1_1_armv7l.whl", hash = "sha256:5c92edd15cd58b3c2d34873597a1e20f13094f59cf88068adb18947df5455b4e"},
+    {file = "pydantic_core-2.33.2-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:65132b7b4a1c0beded5e057324b7e16e10910c106d43675d9bd87d4f38dde162"},
+    {file = "pydantic_core-2.33.2-cp313-cp313-win32.whl", hash = "sha256:52fb90784e0a242bb96ec53f42196a17278855b0f31ac7c3cc6f5c1ec4811849"},
+    {file = "pydantic_core-2.33.2-cp313-cp313-win_amd64.whl", hash = "sha256:c083a3bdd5a93dfe480f1125926afcdbf2917ae714bdb80b36d34318b2bec5d9"},
+    {file = "pydantic_core-2.33.2-cp313-cp313-win_arm64.whl", hash = "sha256:e80b087132752f6b3d714f041ccf74403799d3b23a72722ea2e6ba2e892555b9"},
+    {file = "pydantic_core-2.33.2-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:61c18fba8e5e9db3ab908620af374db0ac1baa69f0f32df4f61ae23f15e586ac"},
+    {file = "pydantic_core-2.33.2-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:95237e53bb015f67b63c91af7518a62a8660376a6a0db19b89acc77a4d6199f5"},
+    {file = "pydantic_core-2.33.2-cp313-cp313t-win_amd64.whl", hash = "sha256:c2fc0a768ef76c15ab9238afa6da7f69895bb5d1ee83aeea2e3509af4472d0b9"},
+    {file = "pydantic_core-2.33.2-cp39-cp39-macosx_10_12_x86_64.whl", hash = "sha256:a2b911a5b90e0374d03813674bf0a5fbbb7741570dcd4b4e85a2e48d17def29d"},
+    {file = "pydantic_core-2.33.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:6fa6dfc3e4d1f734a34710f391ae822e0a8eb8559a85c6979e14e65ee6ba2954"},
+    {file = "pydantic_core-2.33.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c54c939ee22dc8e2d545da79fc5381f1c020d6d3141d3bd747eab59164dc89fb"},
+    {file = "pydantic_core-2.33.2-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:53a57d2ed685940a504248187d5685e49eb5eef0f696853647bf37c418c538f7"},
+    {file = "pydantic_core-2.33.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:09fb9dd6571aacd023fe6aaca316bd01cf60ab27240d7eb39ebd66a3a15293b4"},
+    {file = "pydantic_core-2.33.2-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0e6116757f7959a712db11f3e9c0a99ade00a5bbedae83cb801985aa154f071b"},
+    {file = "pydantic_core-2.33.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8d55ab81c57b8ff8548c3e4947f119551253f4e3787a7bbc0b6b3ca47498a9d3"},
+    {file = "pydantic_core-2.33.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:c20c462aa4434b33a2661701b861604913f912254e441ab8d78d30485736115a"},
+    {file = "pydantic_core-2.33.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:44857c3227d3fb5e753d5fe4a3420d6376fa594b07b621e220cd93703fe21782"},
+    {file = "pydantic_core-2.33.2-cp39-cp39-musllinux_1_1_armv7l.whl", hash = "sha256:eb9b459ca4df0e5c87deb59d37377461a538852765293f9e6ee834f0435a93b9"},
+    {file = "pydantic_core-2.33.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:9fcd347d2cc5c23b06de6d3b7b8275be558a0c90549495c699e379a80bf8379e"},
+    {file = "pydantic_core-2.33.2-cp39-cp39-win32.whl", hash = "sha256:83aa99b1285bc8f038941ddf598501a86f1536789740991d7d8756e34f1e74d9"},
+    {file = "pydantic_core-2.33.2-cp39-cp39-win_amd64.whl", hash = "sha256:f481959862f57f29601ccced557cc2e817bce7533ab8e01a797a48b49c9692b3"},
+    {file = "pydantic_core-2.33.2-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:5c4aa4e82353f65e548c476b37e64189783aa5384903bfea4f41580f255fddfa"},
+    {file = "pydantic_core-2.33.2-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:d946c8bf0d5c24bf4fe333af284c59a19358aa3ec18cb3dc4370080da1e8ad29"},
+    {file = "pydantic_core-2.33.2-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:87b31b6846e361ef83fedb187bb5b4372d0da3f7e28d85415efa92d6125d6e6d"},
+    {file = "pydantic_core-2.33.2-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:aa9d91b338f2df0508606f7009fde642391425189bba6d8c653afd80fd6bb64e"},
+    {file = "pydantic_core-2.33.2-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:2058a32994f1fde4ca0480ab9d1e75a0e8c87c22b53a3ae66554f9af78f2fe8c"},
+    {file = "pydantic_core-2.33.2-pp310-pypy310_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:0e03262ab796d986f978f79c943fc5f620381be7287148b8010b4097f79a39ec"},
+    {file = "pydantic_core-2.33.2-pp310-pypy310_pp73-musllinux_1_1_armv7l.whl", hash = "sha256:1a8695a8d00c73e50bff9dfda4d540b7dee29ff9b8053e38380426a85ef10052"},
+    {file = "pydantic_core-2.33.2-pp310-pypy310_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:fa754d1850735a0b0e03bcffd9d4b4343eb417e47196e4485d9cca326073a42c"},
+    {file = "pydantic_core-2.33.2-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:a11c8d26a50bfab49002947d3d237abe4d9e4b5bdc8846a63537b6488e197808"},
+    {file = "pydantic_core-2.33.2-pp311-pypy311_pp73-macosx_10_12_x86_64.whl", hash = "sha256:dd14041875d09cc0f9308e37a6f8b65f5585cf2598a53aa0123df8b129d481f8"},
+    {file = "pydantic_core-2.33.2-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:d87c561733f66531dced0da6e864f44ebf89a8fba55f31407b00c2f7f9449593"},
+    {file = "pydantic_core-2.33.2-pp311-pypy311_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2f82865531efd18d6e07a04a17331af02cb7a651583c418df8266f17a63c6612"},
+    {file = "pydantic_core-2.33.2-pp311-pypy311_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2bfb5112df54209d820d7bf9317c7a6c9025ea52e49f46b6a2060104bba37de7"},
+    {file = "pydantic_core-2.33.2-pp311-pypy311_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:64632ff9d614e5eecfb495796ad51b0ed98c453e447a76bcbeeb69615079fc7e"},
+    {file = "pydantic_core-2.33.2-pp311-pypy311_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:f889f7a40498cc077332c7ab6b4608d296d852182211787d4f3ee377aaae66e8"},
+    {file = "pydantic_core-2.33.2-pp311-pypy311_pp73-musllinux_1_1_armv7l.whl", hash = "sha256:de4b83bb311557e439b9e186f733f6c645b9417c84e2eb8203f3f820a4b988bf"},
+    {file = "pydantic_core-2.33.2-pp311-pypy311_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:82f68293f055f51b51ea42fafc74b6aad03e70e191799430b90c13d643059ebb"},
+    {file = "pydantic_core-2.33.2-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:329467cecfb529c925cf2bbd4d60d2c509bc2fb52a20c1045bf09bb70971a9c1"},
+    {file = "pydantic_core-2.33.2-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:87acbfcf8e90ca885206e98359d7dca4bcbb35abdc0ff66672a293e1d7a19101"},
+    {file = "pydantic_core-2.33.2-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:7f92c15cd1e97d4b12acd1cc9004fa092578acfa57b67ad5e43a197175d01a64"},
+    {file = "pydantic_core-2.33.2-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d3f26877a748dc4251cfcfda9dfb5f13fcb034f5308388066bcfe9031b63ae7d"},
+    {file = "pydantic_core-2.33.2-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dac89aea9af8cd672fa7b510e7b8c33b0bba9a43186680550ccf23020f32d535"},
+    {file = "pydantic_core-2.33.2-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:970919794d126ba8645f3837ab6046fb4e72bbc057b3709144066204c19a455d"},
+    {file = "pydantic_core-2.33.2-pp39-pypy39_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:3eb3fe62804e8f859c49ed20a8451342de53ed764150cb14ca71357c765dc2a6"},
+    {file = "pydantic_core-2.33.2-pp39-pypy39_pp73-musllinux_1_1_armv7l.whl", hash = "sha256:3abcd9392a36025e3bd55f9bd38d908bd17962cc49bc6da8e7e96285336e2bca"},
+    {file = "pydantic_core-2.33.2-pp39-pypy39_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:3a1c81334778f9e3af2f8aeb7a960736e5cab1dfebfb26aabca09afd2906c039"},
+    {file = "pydantic_core-2.33.2-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:2807668ba86cb38c6817ad9bc66215ab8584d1d304030ce4f0887336f28a5e27"},
+    {file = "pydantic_core-2.33.2.tar.gz", hash = "sha256:7cb8bc3605c29176e1b105350d2e6474142d7c1bd1d9327c4a9bdb46bf827acc"},
+]
+
+[package.dependencies]
+typing-extensions = ">=4.6.0,<4.7.0 || >4.7.0"
+
+[[package]]
+name = "pydantic-settings"
+version = "2.10.1"
+description = "Settings management using Pydantic"
+optional = false
+python-versions = ">=3.9"
+groups = ["main"]
+files = [
+    {file = "pydantic_settings-2.10.1-py3-none-any.whl", hash = "sha256:a60952460b99cf661dc25c29c0ef171721f98bfcb52ef8d9ea4c943d7c8cc796"},
+    {file = "pydantic_settings-2.10.1.tar.gz", hash = "sha256:06f0062169818d0f5524420a360d632d5857b83cffd4d42fe29597807a1614ee"},
+]
+
+[package.dependencies]
+pydantic = ">=2.7.0"
+python-dotenv = ">=0.21.0"
+typing-inspection = ">=0.4.0"
+
+[package.extras]
+aws-secrets-manager = ["boto3 (>=1.35.0)", "boto3-stubs[secretsmanager]"]
+azure-key-vault = ["azure-identity (>=1.16.0)", "azure-keyvault-secrets (>=4.8.0)"]
+gcp-secret-manager = ["google-cloud-secret-manager (>=2.23.1)"]
+toml = ["tomli (>=2.0.1)"]
+yaml = ["pyyaml (>=6.0.1)"]
+
+[[package]]
+name = "pydeps"
+version = "3.0.1"
+description = "Display module dependencies"
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "pydeps-3.0.1-py3-none-any.whl", hash = "sha256:7c86ee63c9ee6ddd088c840364981c5aa214a994d323bb7fa4724fca30829bee"},
+    {file = "pydeps-3.0.1.tar.gz", hash = "sha256:a57415a8fae2ff6840a199b7dfcfecb90c37e4b9b54b58a111808a3440bc03bc"},
+]
+
+[package.dependencies]
+stdlib_list = "*"
+
+[[package]]
+name = "pygments"
+version = "2.19.2"
+description = "Pygments is a syntax highlighting package written in Python."
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "pygments-2.19.2-py3-none-any.whl", hash = "sha256:86540386c03d588bb81d44bc3928634ff26449851e99741617ecb9037ee5ec0b"},
+    {file = "pygments-2.19.2.tar.gz", hash = "sha256:636cb2477cec7f8952536970bc533bc43743542f70392ae026374600add5b887"},
+]
+
+[package.extras]
+windows-terminal = ["colorama (>=0.4.6)"]
+
+[[package]]
+name = "pylint"
+version = "3.3.8"
+description = "python code static checker"
+optional = false
+python-versions = ">=3.9.0"
+groups = ["dev"]
+files = [
+    {file = "pylint-3.3.8-py3-none-any.whl", hash = "sha256:7ef94aa692a600e82fabdd17102b73fc226758218c97473c7ad67bd4cb905d83"},
+    {file = "pylint-3.3.8.tar.gz", hash = "sha256:26698de19941363037e2937d3db9ed94fb3303fdadf7d98847875345a8bb6b05"},
+]
+
+[package.dependencies]
+astroid = ">=3.3.8,<=3.4.0.dev0"
+colorama = {version = ">=0.4.5", markers = "sys_platform == \"win32\""}
+dill = {version = ">=0.3.7", markers = "python_version >= \"3.12\""}
+isort = ">=4.2.5,<5.13 || >5.13,<7"
+mccabe = ">=0.6,<0.8"
+platformdirs = ">=2.2"
+tomlkit = ">=0.10.1"
+
+[package.extras]
+spelling = ["pyenchant (>=3.2,<4.0)"]
+testutils = ["gitpython (>3)"]
+
+[[package]]
+name = "pytest"
+version = "8.4.1"
+description = "pytest: simple powerful testing with Python"
+optional = false
+python-versions = ">=3.9"
+groups = ["dev"]
+files = [
+    {file = "pytest-8.4.1-py3-none-any.whl", hash = "sha256:539c70ba6fcead8e78eebbf1115e8b589e7565830d7d006a8723f19ac8a0afb7"},
+    {file = "pytest-8.4.1.tar.gz", hash = "sha256:7c67fd69174877359ed9371ec3af8a3d2b04741818c51e5e99cc1742251fa93c"},
+]
+
+[package.dependencies]
+colorama = {version = ">=0.4", markers = "sys_platform == \"win32\""}
+iniconfig = ">=1"
+packaging = ">=20"
+pluggy = ">=1.5,<2"
+pygments = ">=2.7.2"
+
+[package.extras]
+dev = ["argcomplete", "attrs (>=19.2)", "hypothesis (>=3.56)", "mock", "requests", "setuptools", "xmlschema"]
+
+[[package]]
+name = "pytest-cov"
+version = "6.2.1"
+description = "Pytest plugin for measuring coverage."
+optional = false
+python-versions = ">=3.9"
+groups = ["dev"]
+files = [
+    {file = "pytest_cov-6.2.1-py3-none-any.whl", hash = "sha256:f5bc4c23f42f1cdd23c70b1dab1bbaef4fc505ba950d53e0081d0730dd7e86d5"},
+    {file = "pytest_cov-6.2.1.tar.gz", hash = "sha256:25cc6cc0a5358204b8108ecedc51a9b57b34cc6b8c967cc2c01a4e00d8a67da2"},
+]
+
+[package.dependencies]
+coverage = {version = ">=7.5", extras = ["toml"]}
+pluggy = ">=1.2"
+pytest = ">=6.2.5"
+
+[package.extras]
+testing = ["fields", "hunter", "process-tests", "pytest-xdist", "virtualenv"]
+
+[[package]]
+name = "python-dateutil"
+version = "2.9.0.post0"
+description = "Extensions to the standard Python datetime module"
+optional = false
+python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7"
+groups = ["main", "dev"]
+files = [
+    {file = "python-dateutil-2.9.0.post0.tar.gz", hash = "sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3"},
+    {file = "python_dateutil-2.9.0.post0-py2.py3-none-any.whl", hash = "sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427"},
+]
+
+[package.dependencies]
+six = ">=1.5"
+
+[[package]]
+name = "python-dotenv"
+version = "1.1.1"
+description = "Read key-value pairs from a .env file and set them as environment variables"
+optional = false
+python-versions = ">=3.9"
+groups = ["main"]
+files = [
+    {file = "python_dotenv-1.1.1-py3-none-any.whl", hash = "sha256:31f23644fe2602f88ff55e1f5c79ba497e01224ee7737937930c448e4d0e24dc"},
+    {file = "python_dotenv-1.1.1.tar.gz", hash = "sha256:a8a6399716257f45be6a007360200409fce5cda2661e3dec71d23dc15f6189ab"},
+]
+
+[package.extras]
+cli = ["click (>=5.0)"]
+
+[[package]]
+name = "python-json-logger"
+version = "3.3.0"
+description = "JSON Log Formatter for the Python Logging Package"
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "python_json_logger-3.3.0-py3-none-any.whl", hash = "sha256:dd980fae8cffb24c13caf6e158d3d61c0d6d22342f932cb6e9deedab3d35eec7"},
+    {file = "python_json_logger-3.3.0.tar.gz", hash = "sha256:12b7e74b17775e7d565129296105bbe3910842d9d0eb083fc83a6a617aa8df84"},
+]
+
+[package.extras]
+dev = ["backports.zoneinfo ; python_version < \"3.9\"", "black", "build", "freezegun", "mdx_truly_sane_lists", "mike", "mkdocs", "mkdocs-awesome-pages-plugin", "mkdocs-gen-files", "mkdocs-literate-nav", "mkdocs-material (>=8.5)", "mkdocstrings[python]", "msgspec ; implementation_name != \"pypy\"", "mypy", "orjson ; implementation_name != \"pypy\"", "pylint", "pytest", "tzdata", "validate-pyproject[all]"]
+
+[[package]]
+name = "pytz"
+version = "2025.2"
+description = "World timezone definitions, modern and historical"
+optional = false
+python-versions = "*"
+groups = ["main"]
+files = [
+    {file = "pytz-2025.2-py2.py3-none-any.whl", hash = "sha256:5ddf76296dd8c44c26eb8f4b6f35488f3ccbf6fbbd7adee0b7262d43f0ec2f00"},
+    {file = "pytz-2025.2.tar.gz", hash = "sha256:360b9e3dbb49a209c21ad61809c7fb453643e048b38924c765813546746e81c3"},
+]
+
+[[package]]
+name = "pywin32"
+version = "311"
+description = "Python for Window Extensions"
+optional = false
+python-versions = "*"
+groups = ["dev"]
+markers = "sys_platform == \"win32\" and platform_python_implementation != \"PyPy\""
+files = [
+    {file = "pywin32-311-cp310-cp310-win32.whl", hash = "sha256:d03ff496d2a0cd4a5893504789d4a15399133fe82517455e78bad62efbb7f0a3"},
+    {file = "pywin32-311-cp310-cp310-win_amd64.whl", hash = "sha256:797c2772017851984b97180b0bebe4b620bb86328e8a884bb626156295a63b3b"},
+    {file = "pywin32-311-cp310-cp310-win_arm64.whl", hash = "sha256:0502d1facf1fed4839a9a51ccbcc63d952cf318f78ffc00a7e78528ac27d7a2b"},
+    {file = "pywin32-311-cp311-cp311-win32.whl", hash = "sha256:184eb5e436dea364dcd3d2316d577d625c0351bf237c4e9a5fabbcfa5a58b151"},
+    {file = "pywin32-311-cp311-cp311-win_amd64.whl", hash = "sha256:3ce80b34b22b17ccbd937a6e78e7225d80c52f5ab9940fe0506a1a16f3dab503"},
+    {file = "pywin32-311-cp311-cp311-win_arm64.whl", hash = "sha256:a733f1388e1a842abb67ffa8e7aad0e70ac519e09b0f6a784e65a136ec7cefd2"},
+    {file = "pywin32-311-cp312-cp312-win32.whl", hash = "sha256:750ec6e621af2b948540032557b10a2d43b0cee2ae9758c54154d711cc852d31"},
+    {file = "pywin32-311-cp312-cp312-win_amd64.whl", hash = "sha256:b8c095edad5c211ff31c05223658e71bf7116daa0ecf3ad85f3201ea3190d067"},
+    {file = "pywin32-311-cp312-cp312-win_arm64.whl", hash = "sha256:e286f46a9a39c4a18b319c28f59b61de793654af2f395c102b4f819e584b5852"},
+    {file = "pywin32-311-cp313-cp313-win32.whl", hash = "sha256:f95ba5a847cba10dd8c4d8fefa9f2a6cf283b8b88ed6178fa8a6c1ab16054d0d"},
+    {file = "pywin32-311-cp313-cp313-win_amd64.whl", hash = "sha256:718a38f7e5b058e76aee1c56ddd06908116d35147e133427e59a3983f703a20d"},
+    {file = "pywin32-311-cp313-cp313-win_arm64.whl", hash = "sha256:7b4075d959648406202d92a2310cb990fea19b535c7f4a78d3f5e10b926eeb8a"},
+    {file = "pywin32-311-cp314-cp314-win32.whl", hash = "sha256:b7a2c10b93f8986666d0c803ee19b5990885872a7de910fc460f9b0c2fbf92ee"},
+    {file = "pywin32-311-cp314-cp314-win_amd64.whl", hash = "sha256:3aca44c046bd2ed8c90de9cb8427f581c479e594e99b5c0bb19b29c10fd6cb87"},
+    {file = "pywin32-311-cp314-cp314-win_arm64.whl", hash = "sha256:a508e2d9025764a8270f93111a970e1d0fbfc33f4153b388bb649b7eec4f9b42"},
+    {file = "pywin32-311-cp38-cp38-win32.whl", hash = "sha256:6c6f2969607b5023b0d9ce2541f8d2cbb01c4f46bc87456017cf63b73f1e2d8c"},
+    {file = "pywin32-311-cp38-cp38-win_amd64.whl", hash = "sha256:c8015b09fb9a5e188f83b7b04de91ddca4658cee2ae6f3bc483f0b21a77ef6cd"},
+    {file = "pywin32-311-cp39-cp39-win32.whl", hash = "sha256:aba8f82d551a942cb20d4a83413ccbac30790b50efb89a75e4f586ac0bb8056b"},
+    {file = "pywin32-311-cp39-cp39-win_amd64.whl", hash = "sha256:e0c4cfb0621281fe40387df582097fd796e80430597cb9944f0ae70447bacd91"},
+    {file = "pywin32-311-cp39-cp39-win_arm64.whl", hash = "sha256:62ea666235135fee79bb154e695f3ff67370afefd71bd7fea7512fc70ef31e3d"},
+]
+
+[[package]]
+name = "pywinpty"
+version = "3.0.0"
+description = ""
+optional = false
+python-versions = ">=3.9"
+groups = ["dev"]
+markers = "os_name == \"nt\""
+files = [
+    {file = "pywinpty-3.0.0-cp310-cp310-win_amd64.whl", hash = "sha256:327b6034e0dc38352c1c99a7c0b3e54941b4e506a5f21acce63609cd2ab6cce2"},
+    {file = "pywinpty-3.0.0-cp311-cp311-win_amd64.whl", hash = "sha256:29daa71ac5dcbe1496ef99f4cde85a732b1f0a3b71405d42177dbcf9ee405e5a"},
+    {file = "pywinpty-3.0.0-cp312-cp312-win_amd64.whl", hash = "sha256:1e0c4b01e5b03b1531d7c5d0e044b8c66dd0288c6d2b661820849f2a8d91aec3"},
+    {file = "pywinpty-3.0.0-cp313-cp313-win_amd64.whl", hash = "sha256:828cbe756b7e3d25d886fbd5691a1d523cd59c5fb79286bb32bb75c5221e7ba1"},
+    {file = "pywinpty-3.0.0-cp313-cp313t-win_amd64.whl", hash = "sha256:de0cbe27b96e5a2cebd86c4a6b8b4139f978d9c169d44a8edc7e30e88e5d7a69"},
+    {file = "pywinpty-3.0.0-cp39-cp39-win_amd64.whl", hash = "sha256:007735316170ec1b6e773deadab5fe9ec4074dfdc06f27513fe87b8cfe45237d"},
+    {file = "pywinpty-3.0.0.tar.gz", hash = "sha256:68f70e68a9f0766ffdea3fc500351cb7b9b012bcb8239a411f7ff0fc8f86dcb1"},
+]
+
+[[package]]
+name = "pyyaml"
+version = "6.0.2"
+description = "YAML parser and emitter for Python"
+optional = false
+python-versions = ">=3.8"
+groups = ["main", "dev"]
+files = [
+    {file = "PyYAML-6.0.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0a9a2848a5b7feac301353437eb7d5957887edbf81d56e903999a75a3d743086"},
+    {file = "PyYAML-6.0.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:29717114e51c84ddfba879543fb232a6ed60086602313ca38cce623c1d62cfbf"},
+    {file = "PyYAML-6.0.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8824b5a04a04a047e72eea5cec3bc266db09e35de6bdfe34c9436ac5ee27d237"},
+    {file = "PyYAML-6.0.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:7c36280e6fb8385e520936c3cb3b8042851904eba0e58d277dca80a5cfed590b"},
+    {file = "PyYAML-6.0.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ec031d5d2feb36d1d1a24380e4db6d43695f3748343d99434e6f5f9156aaa2ed"},
+    {file = "PyYAML-6.0.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:936d68689298c36b53b29f23c6dbb74de12b4ac12ca6cfe0e047bedceea56180"},
+    {file = "PyYAML-6.0.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:23502f431948090f597378482b4812b0caae32c22213aecf3b55325e049a6c68"},
+    {file = "PyYAML-6.0.2-cp310-cp310-win32.whl", hash = "sha256:2e99c6826ffa974fe6e27cdb5ed0021786b03fc98e5ee3c5bfe1fd5015f42b99"},
+    {file = "PyYAML-6.0.2-cp310-cp310-win_amd64.whl", hash = "sha256:a4d3091415f010369ae4ed1fc6b79def9416358877534caf6a0fdd2146c87a3e"},
+    {file = "PyYAML-6.0.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:cc1c1159b3d456576af7a3e4d1ba7e6924cb39de8f67111c735f6fc832082774"},
+    {file = "PyYAML-6.0.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:1e2120ef853f59c7419231f3bf4e7021f1b936f6ebd222406c3b60212205d2ee"},
+    {file = "PyYAML-6.0.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5d225db5a45f21e78dd9358e58a98702a0302f2659a3c6cd320564b75b86f47c"},
+    {file = "PyYAML-6.0.2-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5ac9328ec4831237bec75defaf839f7d4564be1e6b25ac710bd1a96321cc8317"},
+    {file = "PyYAML-6.0.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3ad2a3decf9aaba3d29c8f537ac4b243e36bef957511b4766cb0057d32b0be85"},
+    {file = "PyYAML-6.0.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:ff3824dc5261f50c9b0dfb3be22b4567a6f938ccce4587b38952d85fd9e9afe4"},
+    {file = "PyYAML-6.0.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:797b4f722ffa07cc8d62053e4cff1486fa6dc094105d13fea7b1de7d8bf71c9e"},
+    {file = "PyYAML-6.0.2-cp311-cp311-win32.whl", hash = "sha256:11d8f3dd2b9c1207dcaf2ee0bbbfd5991f571186ec9cc78427ba5bd32afae4b5"},
+    {file = "PyYAML-6.0.2-cp311-cp311-win_amd64.whl", hash = "sha256:e10ce637b18caea04431ce14fabcf5c64a1c61ec9c56b071a4b7ca131ca52d44"},
+    {file = "PyYAML-6.0.2-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:c70c95198c015b85feafc136515252a261a84561b7b1d51e3384e0655ddf25ab"},
+    {file = "PyYAML-6.0.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ce826d6ef20b1bc864f0a68340c8b3287705cae2f8b4b1d932177dcc76721725"},
+    {file = "PyYAML-6.0.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1f71ea527786de97d1a0cc0eacd1defc0985dcf6b3f17bb77dcfc8c34bec4dc5"},
+    {file = "PyYAML-6.0.2-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9b22676e8097e9e22e36d6b7bda33190d0d400f345f23d4065d48f4ca7ae0425"},
+    {file = "PyYAML-6.0.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:80bab7bfc629882493af4aa31a4cfa43a4c57c83813253626916b8c7ada83476"},
+    {file = "PyYAML-6.0.2-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:0833f8694549e586547b576dcfaba4a6b55b9e96098b36cdc7ebefe667dfed48"},
+    {file = "PyYAML-6.0.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8b9c7197f7cb2738065c481a0461e50ad02f18c78cd75775628afb4d7137fb3b"},
+    {file = "PyYAML-6.0.2-cp312-cp312-win32.whl", hash = "sha256:ef6107725bd54b262d6dedcc2af448a266975032bc85ef0172c5f059da6325b4"},
+    {file = "PyYAML-6.0.2-cp312-cp312-win_amd64.whl", hash = "sha256:7e7401d0de89a9a855c839bc697c079a4af81cf878373abd7dc625847d25cbd8"},
+    {file = "PyYAML-6.0.2-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:efdca5630322a10774e8e98e1af481aad470dd62c3170801852d752aa7a783ba"},
+    {file = "PyYAML-6.0.2-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:50187695423ffe49e2deacb8cd10510bc361faac997de9efef88badc3bb9e2d1"},
+    {file = "PyYAML-6.0.2-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0ffe8360bab4910ef1b9e87fb812d8bc0a308b0d0eef8c8f44e0254ab3b07133"},
+    {file = "PyYAML-6.0.2-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:17e311b6c678207928d649faa7cb0d7b4c26a0ba73d41e99c4fff6b6c3276484"},
+    {file = "PyYAML-6.0.2-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:70b189594dbe54f75ab3a1acec5f1e3faa7e8cf2f1e08d9b561cb41b845f69d5"},
+    {file = "PyYAML-6.0.2-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:41e4e3953a79407c794916fa277a82531dd93aad34e29c2a514c2c0c5fe971cc"},
+    {file = "PyYAML-6.0.2-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:68ccc6023a3400877818152ad9a1033e3db8625d899c72eacb5a668902e4d652"},
+    {file = "PyYAML-6.0.2-cp313-cp313-win32.whl", hash = "sha256:bc2fa7c6b47d6bc618dd7fb02ef6fdedb1090ec036abab80d4681424b84c1183"},
+    {file = "PyYAML-6.0.2-cp313-cp313-win_amd64.whl", hash = "sha256:8388ee1976c416731879ac16da0aff3f63b286ffdd57cdeb95f3f2e085687563"},
+    {file = "PyYAML-6.0.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:24471b829b3bf607e04e88d79542a9d48bb037c2267d7927a874e6c205ca7e9a"},
+    {file = "PyYAML-6.0.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d7fded462629cfa4b685c5416b949ebad6cec74af5e2d42905d41e257e0869f5"},
+    {file = "PyYAML-6.0.2-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d84a1718ee396f54f3a086ea0a66d8e552b2ab2017ef8b420e92edbc841c352d"},
+    {file = "PyYAML-6.0.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9056c1ecd25795207ad294bcf39f2db3d845767be0ea6e6a34d856f006006083"},
+    {file = "PyYAML-6.0.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:82d09873e40955485746739bcb8b4586983670466c23382c19cffecbf1fd8706"},
+    {file = "PyYAML-6.0.2-cp38-cp38-win32.whl", hash = "sha256:43fa96a3ca0d6b1812e01ced1044a003533c47f6ee8aca31724f78e93ccc089a"},
+    {file = "PyYAML-6.0.2-cp38-cp38-win_amd64.whl", hash = "sha256:01179a4a8559ab5de078078f37e5c1a30d76bb88519906844fd7bdea1b7729ff"},
+    {file = "PyYAML-6.0.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:688ba32a1cffef67fd2e9398a2efebaea461578b0923624778664cc1c914db5d"},
+    {file = "PyYAML-6.0.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:a8786accb172bd8afb8be14490a16625cbc387036876ab6ba70912730faf8e1f"},
+    {file = "PyYAML-6.0.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d8e03406cac8513435335dbab54c0d385e4a49e4945d2909a581c83647ca0290"},
+    {file = "PyYAML-6.0.2-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f753120cb8181e736c57ef7636e83f31b9c0d1722c516f7e86cf15b7aa57ff12"},
+    {file = "PyYAML-6.0.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3b1fdb9dc17f5a7677423d508ab4f243a726dea51fa5e70992e59a7411c89d19"},
+    {file = "PyYAML-6.0.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:0b69e4ce7a131fe56b7e4d770c67429700908fc0752af059838b1cfb41960e4e"},
+    {file = "PyYAML-6.0.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:a9f8c2e67970f13b16084e04f134610fd1d374bf477b17ec1599185cf611d725"},
+    {file = "PyYAML-6.0.2-cp39-cp39-win32.whl", hash = "sha256:6395c297d42274772abc367baaa79683958044e5d3835486c16da75d2a694631"},
+    {file = "PyYAML-6.0.2-cp39-cp39-win_amd64.whl", hash = "sha256:39693e1f8320ae4f43943590b49779ffb98acb81f788220ea932a6b6c51004d8"},
+    {file = "pyyaml-6.0.2.tar.gz", hash = "sha256:d584d9ec91ad65861cc08d42e834324ef890a082e591037abe114850ff7bbc3e"},
+]
+
+[[package]]
+name = "pyzmq"
+version = "27.0.1"
+description = "Python bindings for 0MQ"
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "pyzmq-27.0.1-cp310-cp310-macosx_10_15_universal2.whl", hash = "sha256:90a4da42aa322de8a3522461e3b5fe999935763b27f69a02fced40f4e3cf9682"},
+    {file = "pyzmq-27.0.1-cp310-cp310-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:e648dca28178fc879c814cf285048dd22fd1f03e1104101106505ec0eea50a4d"},
+    {file = "pyzmq-27.0.1-cp310-cp310-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4bca8abc31799a6f3652d13f47e0b0e1cab76f9125f2283d085a3754f669b607"},
+    {file = "pyzmq-27.0.1-cp310-cp310-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:092f4011b26d6b0201002f439bd74b38f23f3aefcb358621bdc3b230afc9b2d5"},
+    {file = "pyzmq-27.0.1-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:6f02f30a4a6b3efe665ab13a3dd47109d80326c8fd286311d1ba9f397dc5f247"},
+    {file = "pyzmq-27.0.1-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:f293a1419266e3bf3557d1f8778f9e1ffe7e6b2c8df5c9dca191caf60831eb74"},
+    {file = "pyzmq-27.0.1-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:ce181dd1a7c6c012d0efa8ab603c34b5ee9d86e570c03415bbb1b8772eeb381c"},
+    {file = "pyzmq-27.0.1-cp310-cp310-win32.whl", hash = "sha256:f65741cc06630652e82aa68ddef4986a3ab9073dd46d59f94ce5f005fa72037c"},
+    {file = "pyzmq-27.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:44909aa3ed2234d69fe81e1dade7be336bcfeab106e16bdaa3318dcde4262b93"},
+    {file = "pyzmq-27.0.1-cp310-cp310-win_arm64.whl", hash = "sha256:4401649bfa0a38f0f8777f8faba7cd7eb7b5b8ae2abc7542b830dd09ad4aed0d"},
+    {file = "pyzmq-27.0.1-cp311-cp311-macosx_10_15_universal2.whl", hash = "sha256:9729190bd770314f5fbba42476abf6abe79a746eeda11d1d68fd56dd70e5c296"},
+    {file = "pyzmq-27.0.1-cp311-cp311-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:696900ef6bc20bef6a242973943574f96c3f97d2183c1bd3da5eea4f559631b1"},
+    {file = "pyzmq-27.0.1-cp311-cp311-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f96a63aecec22d3f7fdea3c6c98df9e42973f5856bb6812c3d8d78c262fee808"},
+    {file = "pyzmq-27.0.1-cp311-cp311-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c512824360ea7490390566ce00bee880e19b526b312b25cc0bc30a0fe95cb67f"},
+    {file = "pyzmq-27.0.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:dfb2bb5e0f7198eaacfb6796fb0330afd28f36d985a770745fba554a5903595a"},
+    {file = "pyzmq-27.0.1-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:4f6886c59ba93ffde09b957d3e857e7950c8fe818bd5494d9b4287bc6d5bc7f1"},
+    {file = "pyzmq-27.0.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:b99ea9d330e86ce1ff7f2456b33f1bf81c43862a5590faf4ef4ed3a63504bdab"},
+    {file = "pyzmq-27.0.1-cp311-cp311-win32.whl", hash = "sha256:571f762aed89025ba8cdcbe355fea56889715ec06d0264fd8b6a3f3fa38154ed"},
+    {file = "pyzmq-27.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:ee16906c8025fa464bea1e48128c048d02359fb40bebe5333103228528506530"},
+    {file = "pyzmq-27.0.1-cp311-cp311-win_arm64.whl", hash = "sha256:ba068f28028849da725ff9185c24f832ccf9207a40f9b28ac46ab7c04994bd41"},
+    {file = "pyzmq-27.0.1-cp312-abi3-macosx_10_15_universal2.whl", hash = "sha256:af7ebce2a1e7caf30c0bb64a845f63a69e76a2fadbc1cac47178f7bb6e657bdd"},
+    {file = "pyzmq-27.0.1-cp312-abi3-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:8f617f60a8b609a13099b313e7e525e67f84ef4524b6acad396d9ff153f6e4cd"},
+    {file = "pyzmq-27.0.1-cp312-abi3-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1d59dad4173dc2a111f03e59315c7bd6e73da1a9d20a84a25cf08325b0582b1a"},
+    {file = "pyzmq-27.0.1-cp312-abi3-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f5b6133c8d313bde8bd0d123c169d22525300ff164c2189f849de495e1344577"},
+    {file = "pyzmq-27.0.1-cp312-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:58cca552567423f04d06a075f4b473e78ab5bdb906febe56bf4797633f54aa4e"},
+    {file = "pyzmq-27.0.1-cp312-abi3-musllinux_1_2_i686.whl", hash = "sha256:4b9d8e26fb600d0d69cc9933e20af08552e97cc868a183d38a5c0d661e40dfbb"},
+    {file = "pyzmq-27.0.1-cp312-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:2329f0c87f0466dce45bba32b63f47018dda5ca40a0085cc5c8558fea7d9fc55"},
+    {file = "pyzmq-27.0.1-cp312-abi3-win32.whl", hash = "sha256:57bb92abdb48467b89c2d21da1ab01a07d0745e536d62afd2e30d5acbd0092eb"},
+    {file = "pyzmq-27.0.1-cp312-abi3-win_amd64.whl", hash = "sha256:ff3f8757570e45da7a5bedaa140489846510014f7a9d5ee9301c61f3f1b8a686"},
+    {file = "pyzmq-27.0.1-cp312-abi3-win_arm64.whl", hash = "sha256:df2c55c958d3766bdb3e9d858b911288acec09a9aab15883f384fc7180df5bed"},
+    {file = "pyzmq-27.0.1-cp313-cp313-android_24_arm64_v8a.whl", hash = "sha256:497bd8af534ae55dc4ef67eebd1c149ff2a0b0f1e146db73c8b5a53d83c1a5f5"},
+    {file = "pyzmq-27.0.1-cp313-cp313-android_24_x86_64.whl", hash = "sha256:a066ea6ad6218b4c233906adf0ae67830f451ed238419c0db609310dd781fbe7"},
+    {file = "pyzmq-27.0.1-cp313-cp313t-macosx_10_15_universal2.whl", hash = "sha256:72d235d6365ca73d8ce92f7425065d70f5c1e19baa458eb3f0d570e425b73a96"},
+    {file = "pyzmq-27.0.1-cp313-cp313t-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:313a7b374e3dc64848644ca348a51004b41726f768b02e17e689f1322366a4d9"},
+    {file = "pyzmq-27.0.1-cp313-cp313t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:119ce8590409702394f959c159d048002cbed2f3c0645ec9d6a88087fc70f0f1"},
+    {file = "pyzmq-27.0.1-cp313-cp313t-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:45c3e00ce16896ace2cd770ab9057a7cf97d4613ea5f2a13f815141d8b6894b9"},
+    {file = "pyzmq-27.0.1-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:678e50ec112bdc6df5a83ac259a55a4ba97a8b314c325ab26b3b5b071151bc61"},
+    {file = "pyzmq-27.0.1-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:d0b96c30be9f9387b18b18b6133c75a7b1b0065da64e150fe1feb5ebf31ece1c"},
+    {file = "pyzmq-27.0.1-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:88dc92d9eb5ea4968123e74db146d770b0c8d48f0e2bfb1dbc6c50a8edb12d64"},
+    {file = "pyzmq-27.0.1-cp313-cp313t-win32.whl", hash = "sha256:6dcbcb34f5c9b0cefdfc71ff745459241b7d3cda5b27c7ad69d45afc0821d1e1"},
+    {file = "pyzmq-27.0.1-cp313-cp313t-win_amd64.whl", hash = "sha256:b9fd0fda730461f510cfd9a40fafa5355d65f5e3dbdd8d6dfa342b5b3f5d1949"},
+    {file = "pyzmq-27.0.1-cp313-cp313t-win_arm64.whl", hash = "sha256:56a3b1853f3954ec1f0e91085f1350cc57d18f11205e4ab6e83e4b7c414120e0"},
+    {file = "pyzmq-27.0.1-cp314-cp314t-macosx_10_15_universal2.whl", hash = "sha256:f98f6b7787bd2beb1f0dde03f23a0621a0c978edf673b7d8f5e7bc039cbe1b60"},
+    {file = "pyzmq-27.0.1-cp314-cp314t-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:351bf5d8ca0788ca85327fda45843b6927593ff4c807faee368cc5aaf9f809c2"},
+    {file = "pyzmq-27.0.1-cp314-cp314t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5268a5a9177afff53dc6d70dffe63114ba2a6e7b20d9411cc3adeba09eeda403"},
+    {file = "pyzmq-27.0.1-cp314-cp314t-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a4aca06ba295aa78bec9b33ec028d1ca08744c36294338c41432b7171060c808"},
+    {file = "pyzmq-27.0.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:1c363c6dc66352331d5ad64bb838765c6692766334a6a02fdb05e76bd408ae18"},
+    {file = "pyzmq-27.0.1-cp314-cp314t-musllinux_1_2_i686.whl", hash = "sha256:87aebf4acd7249bdff8d3df03aed4f09e67078e6762cfe0aecf8d0748ff94cde"},
+    {file = "pyzmq-27.0.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:e4f22d67756518d71901edf73b38dc0eb4765cce22c8fe122cc81748d425262b"},
+    {file = "pyzmq-27.0.1-cp314-cp314t-win32.whl", hash = "sha256:8c62297bc7aea2147b472ca5ca2b4389377ad82898c87cabab2a94aedd75e337"},
+    {file = "pyzmq-27.0.1-cp314-cp314t-win_amd64.whl", hash = "sha256:bee5248d5ec9223545f8cc4f368c2d571477ae828c99409125c3911511d98245"},
+    {file = "pyzmq-27.0.1-cp314-cp314t-win_arm64.whl", hash = "sha256:0fc24bf45e4a454e55ef99d7f5c8b8712539200ce98533af25a5bfa954b6b390"},
+    {file = "pyzmq-27.0.1-cp38-cp38-macosx_10_15_universal2.whl", hash = "sha256:9d16fdfd7d70a6b0ca45d36eb19f7702fa77ef6256652f17594fc9ce534c9da6"},
+    {file = "pyzmq-27.0.1-cp38-cp38-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:d0356a21e58c3e99248930ff73cc05b1d302ff50f41a8a47371aefb04327378a"},
+    {file = "pyzmq-27.0.1-cp38-cp38-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:a27fa11ebaccc099cac4309c799aa33919671a7660e29b3e465b7893bc64ec81"},
+    {file = "pyzmq-27.0.1-cp38-cp38-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b25e72e115399a4441aad322258fa8267b873850dc7c276e3f874042728c2b45"},
+    {file = "pyzmq-27.0.1-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:f8c3b74f1cd577a5a9253eae7ed363f88cbb345a990ca3027e9038301d47c7f4"},
+    {file = "pyzmq-27.0.1-cp38-cp38-musllinux_1_2_i686.whl", hash = "sha256:19dce6c93656f9c469540350d29b128cd8ba55b80b332b431b9a1e9ff74cfd01"},
+    {file = "pyzmq-27.0.1-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:da81512b83032ed6cdf85ca62e020b4c23dda87f1b6c26b932131222ccfdbd27"},
+    {file = "pyzmq-27.0.1-cp38-cp38-win32.whl", hash = "sha256:7418fb5736d0d39b3ecc6bec4ff549777988feb260f5381636d8bd321b653038"},
+    {file = "pyzmq-27.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:af2ee67b3688b067e20fea3fe36b823a362609a1966e7e7a21883ae6da248804"},
+    {file = "pyzmq-27.0.1-cp39-cp39-macosx_10_15_universal2.whl", hash = "sha256:05a94233fdde585eb70924a6e4929202a747eea6ed308a6171c4f1c715bbe39e"},
+    {file = "pyzmq-27.0.1-cp39-cp39-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:c96702e1082eab62ae583d64c4e19c9b848359196697e536a0c57ae9bd165bd5"},
+    {file = "pyzmq-27.0.1-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:c9180d1f5b4b73e28b64e63cc6c4c097690f102aa14935a62d5dd7426a4e5b5a"},
+    {file = "pyzmq-27.0.1-cp39-cp39-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e971d8680003d0af6020713e52f92109b46fedb463916e988814e04c8133578a"},
+    {file = "pyzmq-27.0.1-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:fe632fa4501154d58dfbe1764a0495734d55f84eaf1feda4549a1f1ca76659e9"},
+    {file = "pyzmq-27.0.1-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:4c3874344fd5fa6d58bb51919708048ac4cab21099f40a227173cddb76b4c20b"},
+    {file = "pyzmq-27.0.1-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:0ec09073ed67ae236785d543df3b322282acc0bdf6d1b748c3e81f3043b21cb5"},
+    {file = "pyzmq-27.0.1-cp39-cp39-win32.whl", hash = "sha256:f44e7ea288d022d4bf93b9e79dafcb4a7aea45a3cbeae2116792904931cefccf"},
+    {file = "pyzmq-27.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:ffe6b809a97ac6dea524b3b837d5b28743d8c2f121141056d168ff0ba8f614ef"},
+    {file = "pyzmq-27.0.1-cp39-cp39-win_arm64.whl", hash = "sha256:fde26267416c8478c95432c81489b53f57b0b5d24cd5c8bfaebf5bbaac4dc90c"},
+    {file = "pyzmq-27.0.1-pp310-pypy310_pp73-macosx_10_15_x86_64.whl", hash = "sha256:544b995a6a1976fad5d7ff01409b4588f7608ccc41be72147700af91fd44875d"},
+    {file = "pyzmq-27.0.1-pp310-pypy310_pp73-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:0f772eea55cccce7f45d6ecdd1d5049c12a77ec22404f6b892fae687faa87bee"},
+    {file = "pyzmq-27.0.1-pp310-pypy310_pp73-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c9d63d66059114a6756d09169c9209ffceabacb65b9cb0f66e6fc344b20b73e6"},
+    {file = "pyzmq-27.0.1-pp310-pypy310_pp73-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1da8e645c655d86f0305fb4c65a0d848f461cd90ee07d21f254667287b5dbe50"},
+    {file = "pyzmq-27.0.1-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:1843fd0daebcf843fe6d4da53b8bdd3fc906ad3e97d25f51c3fed44436d82a49"},
+    {file = "pyzmq-27.0.1-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:7fb0ee35845bef1e8c4a152d766242164e138c239e3182f558ae15cb4a891f94"},
+    {file = "pyzmq-27.0.1-pp311-pypy311_pp73-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:f379f11e138dfd56c3f24a04164f871a08281194dd9ddf656a278d7d080c8ad0"},
+    {file = "pyzmq-27.0.1-pp311-pypy311_pp73-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b978c0678cffbe8860ec9edc91200e895c29ae1ac8a7085f947f8e8864c489fb"},
+    {file = "pyzmq-27.0.1-pp311-pypy311_pp73-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:7ebccf0d760bc92a4a7c751aeb2fef6626144aace76ee8f5a63abeb100cae87f"},
+    {file = "pyzmq-27.0.1-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:77fed80e30fa65708546c4119840a46691290efc231f6bfb2ac2a39b52e15811"},
+    {file = "pyzmq-27.0.1-pp38-pypy38_pp73-macosx_10_15_x86_64.whl", hash = "sha256:9d7b6b90da7285642f480b48c9efd1d25302fd628237d8f6f6ee39ba6b2d2d34"},
+    {file = "pyzmq-27.0.1-pp38-pypy38_pp73-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:d2976b7079f09f48d59dc123293ed6282fca6ef96a270f4ea0364e4e54c8e855"},
+    {file = "pyzmq-27.0.1-pp38-pypy38_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:2852f67371918705cc18b321695f75c5d653d5d8c4a9b946c1eec4dab2bd6fdf"},
+    {file = "pyzmq-27.0.1-pp38-pypy38_pp73-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:be45a895f98877271e8a0b6cf40925e0369121ce423421c20fa6d7958dc753c2"},
+    {file = "pyzmq-27.0.1-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:64ca3c7c614aefcdd5e358ecdd41d1237c35fe1417d01ec0160e7cdb0a380edc"},
+    {file = "pyzmq-27.0.1-pp39-pypy39_pp73-macosx_10_15_x86_64.whl", hash = "sha256:d97b59cbd8a6c8b23524a8ce237ff9504d987dc07156258aa68ae06d2dd5f34d"},
+    {file = "pyzmq-27.0.1-pp39-pypy39_pp73-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:27a78bdd384dbbe7b357af95f72efe8c494306b5ec0a03c31e2d53d6763e5307"},
+    {file = "pyzmq-27.0.1-pp39-pypy39_pp73-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:b007e5dcba684e888fbc90554cb12a2f4e492927c8c2761a80b7590209821743"},
+    {file = "pyzmq-27.0.1-pp39-pypy39_pp73-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:95594b2ceeaa94934e3e94dd7bf5f3c3659cf1a26b1fb3edcf6e42dad7e0eaf2"},
+    {file = "pyzmq-27.0.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:70b719a130b81dd130a57ac0ff636dc2c0127c5b35ca5467d1b67057e3c7a4d2"},
+    {file = "pyzmq-27.0.1.tar.gz", hash = "sha256:45c549204bc20e7484ffd2555f6cf02e572440ecf2f3bdd60d4404b20fddf64b"},
+]
+
+[package.dependencies]
+cffi = {version = "*", markers = "implementation_name == \"pypy\""}
+
+[[package]]
+name = "referencing"
+version = "0.36.2"
+description = "JSON Referencing + Python"
+optional = false
+python-versions = ">=3.9"
+groups = ["dev"]
+files = [
+    {file = "referencing-0.36.2-py3-none-any.whl", hash = "sha256:e8699adbbf8b5c7de96d8ffa0eb5c158b3beafce084968e2ea8bb08c6794dcd0"},
+    {file = "referencing-0.36.2.tar.gz", hash = "sha256:df2e89862cd09deabbdba16944cc3f10feb6b3e6f18e902f7cc25609a34775aa"},
+]
+
+[package.dependencies]
+attrs = ">=22.2.0"
+rpds-py = ">=0.7.0"
+typing-extensions = {version = ">=4.4.0", markers = "python_version < \"3.13\""}
+
+[[package]]
+name = "requests"
+version = "2.32.4"
+description = "Python HTTP for Humans."
+optional = false
+python-versions = ">=3.8"
+groups = ["main", "dev"]
+files = [
+    {file = "requests-2.32.4-py3-none-any.whl", hash = "sha256:27babd3cda2a6d50b30443204ee89830707d396671944c998b5975b031ac2b2c"},
+    {file = "requests-2.32.4.tar.gz", hash = "sha256:27d0316682c8a29834d3264820024b62a36942083d52caf2f14c0591336d3422"},
+]
+
+[package.dependencies]
+certifi = ">=2017.4.17"
+charset_normalizer = ">=2,<4"
+idna = ">=2.5,<4"
+urllib3 = ">=1.21.1,<3"
+
+[package.extras]
+socks = ["PySocks (>=1.5.6,!=1.5.7)"]
+use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"]
+
+[[package]]
+name = "requests-mock"
+version = "1.12.1"
+description = "Mock out responses from the requests package"
+optional = false
+python-versions = ">=3.5"
+groups = ["dev"]
+files = [
+    {file = "requests-mock-1.12.1.tar.gz", hash = "sha256:e9e12e333b525156e82a3c852f22016b9158220d2f47454de9cae8a77d371401"},
+    {file = "requests_mock-1.12.1-py2.py3-none-any.whl", hash = "sha256:b1e37054004cdd5e56c84454cc7df12b25f90f382159087f4b6915aaeef39563"},
+]
+
+[package.dependencies]
+requests = ">=2.22,<3"
+
+[package.extras]
+fixture = ["fixtures"]
+
+[[package]]
+name = "rfc3339-validator"
+version = "0.1.4"
+description = "A pure python RFC3339 validator"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+groups = ["dev"]
+files = [
+    {file = "rfc3339_validator-0.1.4-py2.py3-none-any.whl", hash = "sha256:24f6ec1eda14ef823da9e36ec7113124b39c04d50a4d3d3a3c2859577e7791fa"},
+    {file = "rfc3339_validator-0.1.4.tar.gz", hash = "sha256:138a2abdf93304ad60530167e51d2dfb9549521a836871b88d7f4695d0022f6b"},
+]
+
+[package.dependencies]
+six = "*"
+
+[[package]]
+name = "rfc3986-validator"
+version = "0.1.1"
+description = "Pure python rfc3986 validator"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+groups = ["dev"]
+files = [
+    {file = "rfc3986_validator-0.1.1-py2.py3-none-any.whl", hash = "sha256:2f235c432ef459970b4306369336b9d5dbdda31b510ca1e327636e01f528bfa9"},
+    {file = "rfc3986_validator-0.1.1.tar.gz", hash = "sha256:3d44bde7921b3b9ec3ae4e3adca370438eccebc676456449b145d533b240d055"},
+]
+
+[[package]]
+name = "rfc3987-syntax"
+version = "1.1.0"
+description = "Helper functions to syntactically validate strings according to RFC 3987."
+optional = false
+python-versions = ">=3.9"
+groups = ["dev"]
+files = [
+    {file = "rfc3987_syntax-1.1.0-py3-none-any.whl", hash = "sha256:6c3d97604e4c5ce9f714898e05401a0445a641cfa276432b0a648c80856f6a3f"},
+    {file = "rfc3987_syntax-1.1.0.tar.gz", hash = "sha256:717a62cbf33cffdd16dfa3a497d81ce48a660ea691b1ddd7be710c22f00b4a0d"},
+]
+
+[package.dependencies]
+lark = ">=1.2.2"
+
+[package.extras]
+testing = ["pytest (>=8.3.5)"]
+
+[[package]]
+name = "rpds-py"
+version = "0.27.0"
+description = "Python bindings to Rust's persistent data structures (rpds)"
+optional = false
+python-versions = ">=3.9"
+groups = ["dev"]
+files = [
+    {file = "rpds_py-0.27.0-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:130c1ffa5039a333f5926b09e346ab335f0d4ec393b030a18549a7c7e7c2cea4"},
+    {file = "rpds_py-0.27.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:a4cf32a26fa744101b67bfd28c55d992cd19438aff611a46cac7f066afca8fd4"},
+    {file = "rpds_py-0.27.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:64a0fe3f334a40b989812de70160de6b0ec7e3c9e4a04c0bbc48d97c5d3600ae"},
+    {file = "rpds_py-0.27.0-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:9a0ff7ee28583ab30a52f371b40f54e7138c52ca67f8ca17ccb7ccf0b383cb5f"},
+    {file = "rpds_py-0.27.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:15ea4d2e182345dd1b4286593601d766411b43f868924afe297570658c31a62b"},
+    {file = "rpds_py-0.27.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:36184b44bf60a480863e51021c26aca3dfe8dd2f5eeabb33622b132b9d8b8b54"},
+    {file = "rpds_py-0.27.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9b78430703cfcf5f5e86eb74027a1ed03a93509273d7c705babb547f03e60016"},
+    {file = "rpds_py-0.27.0-cp310-cp310-manylinux_2_31_riscv64.whl", hash = "sha256:dbd749cff1defbde270ca346b69b3baf5f1297213ef322254bf2a28537f0b046"},
+    {file = "rpds_py-0.27.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:6bde37765564cd22a676dd8101b657839a1854cfaa9c382c5abf6ff7accfd4ae"},
+    {file = "rpds_py-0.27.0-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:1d66f45b9399036e890fb9c04e9f70c33857fd8f58ac8db9f3278cfa835440c3"},
+    {file = "rpds_py-0.27.0-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:d85d784c619370d9329bbd670f41ff5f2ae62ea4519761b679d0f57f0f0ee267"},
+    {file = "rpds_py-0.27.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:5df559e9e7644d9042f626f2c3997b555f347d7a855a15f170b253f6c5bfe358"},
+    {file = "rpds_py-0.27.0-cp310-cp310-win32.whl", hash = "sha256:b8a4131698b6992b2a56015f51646711ec5d893a0b314a4b985477868e240c87"},
+    {file = "rpds_py-0.27.0-cp310-cp310-win_amd64.whl", hash = "sha256:cbc619e84a5e3ab2d452de831c88bdcad824414e9c2d28cd101f94dbdf26329c"},
+    {file = "rpds_py-0.27.0-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:dbc2ab5d10544eb485baa76c63c501303b716a5c405ff2469a1d8ceffaabf622"},
+    {file = "rpds_py-0.27.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:7ec85994f96a58cf7ed288caa344b7fe31fd1d503bdf13d7331ead5f70ab60d5"},
+    {file = "rpds_py-0.27.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:190d7285cd3bb6d31d37a0534d7359c1ee191eb194c511c301f32a4afa5a1dd4"},
+    {file = "rpds_py-0.27.0-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:c10d92fb6d7fd827e44055fcd932ad93dac6a11e832d51534d77b97d1d85400f"},
+    {file = "rpds_py-0.27.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:dd2c1d27ebfe6a015cfa2005b7fe8c52d5019f7bbdd801bc6f7499aab9ae739e"},
+    {file = "rpds_py-0.27.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4790c9d5dd565ddb3e9f656092f57268951398cef52e364c405ed3112dc7c7c1"},
+    {file = "rpds_py-0.27.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4300e15e7d03660f04be84a125d1bdd0e6b2f674bc0723bc0fd0122f1a4585dc"},
+    {file = "rpds_py-0.27.0-cp311-cp311-manylinux_2_31_riscv64.whl", hash = "sha256:59195dc244fc183209cf8a93406889cadde47dfd2f0a6b137783aa9c56d67c85"},
+    {file = "rpds_py-0.27.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:fae4a01ef8c4cb2bbe92ef2063149596907dc4a881a8d26743b3f6b304713171"},
+    {file = "rpds_py-0.27.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:e3dc8d4ede2dbae6c0fc2b6c958bf51ce9fd7e9b40c0f5b8835c3fde44f5807d"},
+    {file = "rpds_py-0.27.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:c3782fb753aa825b4ccabc04292e07897e2fd941448eabf666856c5530277626"},
+    {file = "rpds_py-0.27.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:887ab1f12b0d227e9260558a4a2320024b20102207ada65c43e1ffc4546df72e"},
+    {file = "rpds_py-0.27.0-cp311-cp311-win32.whl", hash = "sha256:5d6790ff400254137b81b8053b34417e2c46921e302d655181d55ea46df58cf7"},
+    {file = "rpds_py-0.27.0-cp311-cp311-win_amd64.whl", hash = "sha256:e24d8031a2c62f34853756d9208eeafa6b940a1efcbfe36e8f57d99d52bb7261"},
+    {file = "rpds_py-0.27.0-cp311-cp311-win_arm64.whl", hash = "sha256:08680820d23df1df0a0260f714d12966bc6c42d02e8055a91d61e03f0c47dda0"},
+    {file = "rpds_py-0.27.0-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:19c990fdf5acecbf0623e906ae2e09ce1c58947197f9bced6bbd7482662231c4"},
+    {file = "rpds_py-0.27.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:6c27a7054b5224710fcfb1a626ec3ff4f28bcb89b899148c72873b18210e446b"},
+    {file = "rpds_py-0.27.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:09965b314091829b378b60607022048953e25f0b396c2b70e7c4c81bcecf932e"},
+    {file = "rpds_py-0.27.0-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:14f028eb47f59e9169bfdf9f7ceafd29dd64902141840633683d0bad5b04ff34"},
+    {file = "rpds_py-0.27.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:6168af0be75bba990a39f9431cdfae5f0ad501f4af32ae62e8856307200517b8"},
+    {file = "rpds_py-0.27.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ab47fe727c13c09d0e6f508e3a49e545008e23bf762a245b020391b621f5b726"},
+    {file = "rpds_py-0.27.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5fa01b3d5e3b7d97efab65bd3d88f164e289ec323a8c033c5c38e53ee25c007e"},
+    {file = "rpds_py-0.27.0-cp312-cp312-manylinux_2_31_riscv64.whl", hash = "sha256:6c135708e987f46053e0a1246a206f53717f9fadfba27174a9769ad4befba5c3"},
+    {file = "rpds_py-0.27.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:fc327f4497b7087d06204235199daf208fd01c82d80465dc5efa4ec9df1c5b4e"},
+    {file = "rpds_py-0.27.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:7e57906e38583a2cba67046a09c2637e23297618dc1f3caddbc493f2be97c93f"},
+    {file = "rpds_py-0.27.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:0f4f69d7a4300fbf91efb1fb4916421bd57804c01ab938ab50ac9c4aa2212f03"},
+    {file = "rpds_py-0.27.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:b4c4fbbcff474e1e5f38be1bf04511c03d492d42eec0babda5d03af3b5589374"},
+    {file = "rpds_py-0.27.0-cp312-cp312-win32.whl", hash = "sha256:27bac29bbbf39601b2aab474daf99dbc8e7176ca3389237a23944b17f8913d97"},
+    {file = "rpds_py-0.27.0-cp312-cp312-win_amd64.whl", hash = "sha256:8a06aa1197ec0281eb1d7daf6073e199eb832fe591ffa329b88bae28f25f5fe5"},
+    {file = "rpds_py-0.27.0-cp312-cp312-win_arm64.whl", hash = "sha256:e14aab02258cb776a108107bd15f5b5e4a1bbaa61ef33b36693dfab6f89d54f9"},
+    {file = "rpds_py-0.27.0-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:443d239d02d9ae55b74015234f2cd8eb09e59fbba30bf60baeb3123ad4c6d5ff"},
+    {file = "rpds_py-0.27.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:b8a7acf04fda1f30f1007f3cc96d29d8cf0a53e626e4e1655fdf4eabc082d367"},
+    {file = "rpds_py-0.27.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9d0f92b78cfc3b74a42239fdd8c1266f4715b573204c234d2f9fc3fc7a24f185"},
+    {file = "rpds_py-0.27.0-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ce4ed8e0c7dbc5b19352b9c2c6131dd23b95fa8698b5cdd076307a33626b72dc"},
+    {file = "rpds_py-0.27.0-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:fde355b02934cc6b07200cc3b27ab0c15870a757d1a72fd401aa92e2ea3c6bfe"},
+    {file = "rpds_py-0.27.0-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:13bbc4846ae4c993f07c93feb21a24d8ec637573d567a924b1001e81c8ae80f9"},
+    {file = "rpds_py-0.27.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:be0744661afbc4099fef7f4e604e7f1ea1be1dd7284f357924af12a705cc7d5c"},
+    {file = "rpds_py-0.27.0-cp313-cp313-manylinux_2_31_riscv64.whl", hash = "sha256:069e0384a54f427bd65d7fda83b68a90606a3835901aaff42185fcd94f5a9295"},
+    {file = "rpds_py-0.27.0-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:4bc262ace5a1a7dc3e2eac2fa97b8257ae795389f688b5adf22c5db1e2431c43"},
+    {file = "rpds_py-0.27.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:2fe6e18e5c8581f0361b35ae575043c7029d0a92cb3429e6e596c2cdde251432"},
+    {file = "rpds_py-0.27.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:d93ebdb82363d2e7bec64eecdc3632b59e84bd270d74fe5be1659f7787052f9b"},
+    {file = "rpds_py-0.27.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:0954e3a92e1d62e83a54ea7b3fdc9efa5d61acef8488a8a3d31fdafbfb00460d"},
+    {file = "rpds_py-0.27.0-cp313-cp313-win32.whl", hash = "sha256:2cff9bdd6c7b906cc562a505c04a57d92e82d37200027e8d362518df427f96cd"},
+    {file = "rpds_py-0.27.0-cp313-cp313-win_amd64.whl", hash = "sha256:dc79d192fb76fc0c84f2c58672c17bbbc383fd26c3cdc29daae16ce3d927e8b2"},
+    {file = "rpds_py-0.27.0-cp313-cp313-win_arm64.whl", hash = "sha256:5b3a5c8089eed498a3af23ce87a80805ff98f6ef8f7bdb70bd1b7dae5105f6ac"},
+    {file = "rpds_py-0.27.0-cp313-cp313t-macosx_10_12_x86_64.whl", hash = "sha256:90fb790138c1a89a2e58c9282fe1089638401f2f3b8dddd758499041bc6e0774"},
+    {file = "rpds_py-0.27.0-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:010c4843a3b92b54373e3d2291a7447d6c3fc29f591772cc2ea0e9f5c1da434b"},
+    {file = "rpds_py-0.27.0-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c9ce7a9e967afc0a2af7caa0d15a3e9c1054815f73d6a8cb9225b61921b419bd"},
+    {file = "rpds_py-0.27.0-cp313-cp313t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:aa0bf113d15e8abdfee92aa4db86761b709a09954083afcb5bf0f952d6065fdb"},
+    {file = "rpds_py-0.27.0-cp313-cp313t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:eb91d252b35004a84670dfeafadb042528b19842a0080d8b53e5ec1128e8f433"},
+    {file = "rpds_py-0.27.0-cp313-cp313t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:db8a6313dbac934193fc17fe7610f70cd8181c542a91382531bef5ed785e5615"},
+    {file = "rpds_py-0.27.0-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ce96ab0bdfcef1b8c371ada2100767ace6804ea35aacce0aef3aeb4f3f499ca8"},
+    {file = "rpds_py-0.27.0-cp313-cp313t-manylinux_2_31_riscv64.whl", hash = "sha256:7451ede3560086abe1aa27dcdcf55cd15c96b56f543fb12e5826eee6f721f858"},
+    {file = "rpds_py-0.27.0-cp313-cp313t-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:32196b5a99821476537b3f7732432d64d93a58d680a52c5e12a190ee0135d8b5"},
+    {file = "rpds_py-0.27.0-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:a029be818059870664157194e46ce0e995082ac49926f1423c1f058534d2aaa9"},
+    {file = "rpds_py-0.27.0-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:3841f66c1ffdc6cebce8aed64e36db71466f1dc23c0d9a5592e2a782a3042c79"},
+    {file = "rpds_py-0.27.0-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:42894616da0fc0dcb2ec08a77896c3f56e9cb2f4b66acd76fc8992c3557ceb1c"},
+    {file = "rpds_py-0.27.0-cp313-cp313t-win32.whl", hash = "sha256:b1fef1f13c842a39a03409e30ca0bf87b39a1e2a305a9924deadb75a43105d23"},
+    {file = "rpds_py-0.27.0-cp313-cp313t-win_amd64.whl", hash = "sha256:183f5e221ba3e283cd36fdfbe311d95cd87699a083330b4f792543987167eff1"},
+    {file = "rpds_py-0.27.0-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:f3cd110e02c5bf17d8fb562f6c9df5c20e73029d587cf8602a2da6c5ef1e32cb"},
+    {file = "rpds_py-0.27.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:8d0e09cf4863c74106b5265c2c310f36146e2b445ff7b3018a56799f28f39f6f"},
+    {file = "rpds_py-0.27.0-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:64f689ab822f9b5eb6dfc69893b4b9366db1d2420f7db1f6a2adf2a9ca15ad64"},
+    {file = "rpds_py-0.27.0-cp314-cp314-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e36c80c49853b3ffda7aa1831bf175c13356b210c73128c861f3aa93c3cc4015"},
+    {file = "rpds_py-0.27.0-cp314-cp314-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:6de6a7f622860af0146cb9ee148682ff4d0cea0b8fd3ad51ce4d40efb2f061d0"},
+    {file = "rpds_py-0.27.0-cp314-cp314-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4045e2fc4b37ec4b48e8907a5819bdd3380708c139d7cc358f03a3653abedb89"},
+    {file = "rpds_py-0.27.0-cp314-cp314-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9da162b718b12c4219eeeeb68a5b7552fbc7aadedf2efee440f88b9c0e54b45d"},
+    {file = "rpds_py-0.27.0-cp314-cp314-manylinux_2_31_riscv64.whl", hash = "sha256:0665be515767dc727ffa5f74bd2ef60b0ff85dad6bb8f50d91eaa6b5fb226f51"},
+    {file = "rpds_py-0.27.0-cp314-cp314-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:203f581accef67300a942e49a37d74c12ceeef4514874c7cede21b012613ca2c"},
+    {file = "rpds_py-0.27.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:7873b65686a6471c0037139aa000d23fe94628e0daaa27b6e40607c90e3f5ec4"},
+    {file = "rpds_py-0.27.0-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:249ab91ceaa6b41abc5f19513cb95b45c6f956f6b89f1fe3d99c81255a849f9e"},
+    {file = "rpds_py-0.27.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:d2f184336bc1d6abfaaa1262ed42739c3789b1e3a65a29916a615307d22ffd2e"},
+    {file = "rpds_py-0.27.0-cp314-cp314-win32.whl", hash = "sha256:d3c622c39f04d5751408f5b801ecb527e6e0a471b367f420a877f7a660d583f6"},
+    {file = "rpds_py-0.27.0-cp314-cp314-win_amd64.whl", hash = "sha256:cf824aceaeffff029ccfba0da637d432ca71ab21f13e7f6f5179cd88ebc77a8a"},
+    {file = "rpds_py-0.27.0-cp314-cp314-win_arm64.whl", hash = "sha256:86aca1616922b40d8ac1b3073a1ead4255a2f13405e5700c01f7c8d29a03972d"},
+    {file = "rpds_py-0.27.0-cp314-cp314t-macosx_10_12_x86_64.whl", hash = "sha256:341d8acb6724c0c17bdf714319c393bb27f6d23d39bc74f94221b3e59fc31828"},
+    {file = "rpds_py-0.27.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:6b96b0b784fe5fd03beffff2b1533dc0d85e92bab8d1b2c24ef3a5dc8fac5669"},
+    {file = "rpds_py-0.27.0-cp314-cp314t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0c431bfb91478d7cbe368d0a699978050d3b112d7f1d440a41e90faa325557fd"},
+    {file = "rpds_py-0.27.0-cp314-cp314t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:20e222a44ae9f507d0f2678ee3dd0c45ec1e930f6875d99b8459631c24058aec"},
+    {file = "rpds_py-0.27.0-cp314-cp314t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:184f0d7b342967f6cda94a07d0e1fae177d11d0b8f17d73e06e36ac02889f303"},
+    {file = "rpds_py-0.27.0-cp314-cp314t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a00c91104c173c9043bc46f7b30ee5e6d2f6b1149f11f545580f5d6fdff42c0b"},
+    {file = "rpds_py-0.27.0-cp314-cp314t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f7a37dd208f0d658e0487522078b1ed68cd6bce20ef4b5a915d2809b9094b410"},
+    {file = "rpds_py-0.27.0-cp314-cp314t-manylinux_2_31_riscv64.whl", hash = "sha256:92f3b3ec3e6008a1fe00b7c0946a170f161ac00645cde35e3c9a68c2475e8156"},
+    {file = "rpds_py-0.27.0-cp314-cp314t-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:a1b3db5fae5cbce2131b7420a3f83553d4d89514c03d67804ced36161fe8b6b2"},
+    {file = "rpds_py-0.27.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:5355527adaa713ab693cbce7c1e0ec71682f599f61b128cf19d07e5c13c9b1f1"},
+    {file = "rpds_py-0.27.0-cp314-cp314t-musllinux_1_2_i686.whl", hash = "sha256:fcc01c57ce6e70b728af02b2401c5bc853a9e14eb07deda30624374f0aebfe42"},
+    {file = "rpds_py-0.27.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:3001013dae10f806380ba739d40dee11db1ecb91684febb8406a87c2ded23dae"},
+    {file = "rpds_py-0.27.0-cp314-cp314t-win32.whl", hash = "sha256:0f401c369186a5743694dd9fc08cba66cf70908757552e1f714bfc5219c655b5"},
+    {file = "rpds_py-0.27.0-cp314-cp314t-win_amd64.whl", hash = "sha256:8a1dca5507fa1337f75dcd5070218b20bc68cf8844271c923c1b79dfcbc20391"},
+    {file = "rpds_py-0.27.0-cp39-cp39-macosx_10_12_x86_64.whl", hash = "sha256:e0d7151a1bd5d0a203a5008fc4ae51a159a610cb82ab0a9b2c4d80241745582e"},
+    {file = "rpds_py-0.27.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:42ccc57ff99166a55a59d8c7d14f1a357b7749f9ed3584df74053fd098243451"},
+    {file = "rpds_py-0.27.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e377e4cf8795cdbdff75b8f0223d7b6c68ff4fef36799d88ccf3a995a91c0112"},
+    {file = "rpds_py-0.27.0-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:79af163a4b40bbd8cfd7ca86ec8b54b81121d3b213b4435ea27d6568bcba3e9d"},
+    {file = "rpds_py-0.27.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b2eff8ee57c5996b0d2a07c3601fb4ce5fbc37547344a26945dd9e5cbd1ed27a"},
+    {file = "rpds_py-0.27.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:7cf9bc4508efb18d8dff6934b602324eb9f8c6644749627ce001d6f38a490889"},
+    {file = "rpds_py-0.27.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:05284439ebe7d9f5f5a668d4d8a0a1d851d16f7d47c78e1fab968c8ad30cab04"},
+    {file = "rpds_py-0.27.0-cp39-cp39-manylinux_2_31_riscv64.whl", hash = "sha256:1321bce595ad70e80f97f998db37356b2e22cf98094eba6fe91782e626da2f71"},
+    {file = "rpds_py-0.27.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:737005088449ddd3b3df5a95476ee1c2c5c669f5c30eed909548a92939c0e12d"},
+    {file = "rpds_py-0.27.0-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:9b2a4e17bfd68536c3b801800941c95a1d4a06e3cada11c146093ba939d9638d"},
+    {file = "rpds_py-0.27.0-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:dc6b0d5a1ea0318ef2def2b6a55dccf1dcaf77d605672347271ed7b829860765"},
+    {file = "rpds_py-0.27.0-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:4c3f8a0d4802df34fcdbeb3dfe3a4d8c9a530baea8fafdf80816fcaac5379d83"},
+    {file = "rpds_py-0.27.0-cp39-cp39-win32.whl", hash = "sha256:699c346abc73993962cac7bb4f02f58e438840fa5458a048d3a178a7a670ba86"},
+    {file = "rpds_py-0.27.0-cp39-cp39-win_amd64.whl", hash = "sha256:be806e2961cd390a89d6c3ce8c2ae34271cfcd05660f716257838bb560f1c3b6"},
+    {file = "rpds_py-0.27.0-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:46f48482c1a4748ab2773f75fffbdd1951eb59794e32788834b945da857c47a8"},
+    {file = "rpds_py-0.27.0-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:419dd9c98bcc9fb0242be89e0c6e922df333b975d4268faa90d58499fd9c9ebe"},
+    {file = "rpds_py-0.27.0-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:55d42a0ef2bdf6bc81e1cc2d49d12460f63c6ae1423c4f4851b828e454ccf6f1"},
+    {file = "rpds_py-0.27.0-pp310-pypy310_pp73-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:2e39169ac6aae06dd79c07c8a69d9da867cef6a6d7883a0186b46bb46ccfb0c3"},
+    {file = "rpds_py-0.27.0-pp310-pypy310_pp73-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:935afcdea4751b0ac918047a2df3f720212892347767aea28f5b3bf7be4f27c0"},
+    {file = "rpds_py-0.27.0-pp310-pypy310_pp73-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8de567dec6d451649a781633d36f5c7501711adee329d76c095be2178855b042"},
+    {file = "rpds_py-0.27.0-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:555ed147cbe8c8f76e72a4c6cd3b7b761cbf9987891b9448808148204aed74a5"},
+    {file = "rpds_py-0.27.0-pp310-pypy310_pp73-manylinux_2_31_riscv64.whl", hash = "sha256:d2cc2b34f9e1d31ce255174da82902ad75bd7c0d88a33df54a77a22f2ef421ee"},
+    {file = "rpds_py-0.27.0-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:cb0702c12983be3b2fab98ead349ac63a98216d28dda6f518f52da5498a27a1b"},
+    {file = "rpds_py-0.27.0-pp310-pypy310_pp73-musllinux_1_2_aarch64.whl", hash = "sha256:ba783541be46f27c8faea5a6645e193943c17ea2f0ffe593639d906a327a9bcc"},
+    {file = "rpds_py-0.27.0-pp310-pypy310_pp73-musllinux_1_2_i686.whl", hash = "sha256:2406d034635d1497c596c40c85f86ecf2bf9611c1df73d14078af8444fe48031"},
+    {file = "rpds_py-0.27.0-pp310-pypy310_pp73-musllinux_1_2_x86_64.whl", hash = "sha256:dea0808153f1fbbad772669d906cddd92100277533a03845de6893cadeffc8be"},
+    {file = "rpds_py-0.27.0-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:d2a81bdcfde4245468f7030a75a37d50400ac2455c3a4819d9d550c937f90ab5"},
+    {file = "rpds_py-0.27.0-pp311-pypy311_pp73-macosx_10_12_x86_64.whl", hash = "sha256:e6491658dd2569f05860bad645569145c8626ac231877b0fb2d5f9bcb7054089"},
+    {file = "rpds_py-0.27.0-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:bec77545d188f8bdd29d42bccb9191682a46fb2e655e3d1fb446d47c55ac3b8d"},
+    {file = "rpds_py-0.27.0-pp311-pypy311_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:25a4aebf8ca02bbb90a9b3e7a463bbf3bee02ab1c446840ca07b1695a68ce424"},
+    {file = "rpds_py-0.27.0-pp311-pypy311_pp73-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:44524b96481a4c9b8e6c46d6afe43fa1fb485c261e359fbe32b63ff60e3884d8"},
+    {file = "rpds_py-0.27.0-pp311-pypy311_pp73-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:45d04a73c54b6a5fd2bab91a4b5bc8b426949586e61340e212a8484919183859"},
+    {file = "rpds_py-0.27.0-pp311-pypy311_pp73-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:343cf24de9ed6c728abefc5d5c851d5de06497caa7ac37e5e65dd572921ed1b5"},
+    {file = "rpds_py-0.27.0-pp311-pypy311_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7aed8118ae20515974650d08eb724150dc2e20c2814bcc307089569995e88a14"},
+    {file = "rpds_py-0.27.0-pp311-pypy311_pp73-manylinux_2_31_riscv64.whl", hash = "sha256:af9d4fd79ee1cc8e7caf693ee02737daabfc0fcf2773ca0a4735b356c8ad6f7c"},
+    {file = "rpds_py-0.27.0-pp311-pypy311_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:f0396e894bd1e66c74ecbc08b4f6a03dc331140942c4b1d345dd131b68574a60"},
+    {file = "rpds_py-0.27.0-pp311-pypy311_pp73-musllinux_1_2_aarch64.whl", hash = "sha256:59714ab0a5af25d723d8e9816638faf7f4254234decb7d212715c1aa71eee7be"},
+    {file = "rpds_py-0.27.0-pp311-pypy311_pp73-musllinux_1_2_i686.whl", hash = "sha256:88051c3b7d5325409f433c5a40328fcb0685fc04e5db49ff936e910901d10114"},
+    {file = "rpds_py-0.27.0-pp311-pypy311_pp73-musllinux_1_2_x86_64.whl", hash = "sha256:181bc29e59e5e5e6e9d63b143ff4d5191224d355e246b5a48c88ce6b35c4e466"},
+    {file = "rpds_py-0.27.0-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:9ad08547995a57e74fea6abaf5940d399447935faebbd2612b3b0ca6f987946b"},
+    {file = "rpds_py-0.27.0-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:61490d57e82e23b45c66f96184237994bfafa914433b8cd1a9bb57fecfced59d"},
+    {file = "rpds_py-0.27.0-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d7cf5e726b6fa977e428a61880fb108a62f28b6d0c7ef675b117eaff7076df49"},
+    {file = "rpds_py-0.27.0-pp39-pypy39_pp73-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:dc662bc9375a6a394b62dfd331874c434819f10ee3902123200dbcf116963f89"},
+    {file = "rpds_py-0.27.0-pp39-pypy39_pp73-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:299a245537e697f28a7511d01038c310ac74e8ea213c0019e1fc65f52c0dcb23"},
+    {file = "rpds_py-0.27.0-pp39-pypy39_pp73-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:be3964f7312ea05ed283b20f87cb533fdc555b2e428cc7be64612c0b2124f08c"},
+    {file = "rpds_py-0.27.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:33ba649a6e55ae3808e4c39e01580dc9a9b0d5b02e77b66bb86ef117922b1264"},
+    {file = "rpds_py-0.27.0-pp39-pypy39_pp73-manylinux_2_31_riscv64.whl", hash = "sha256:81f81bbd7cdb4bdc418c09a73809abeda8f263a6bf8f9c7f93ed98b5597af39d"},
+    {file = "rpds_py-0.27.0-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:11e8e28c0ba0373d052818b600474cfee2fafa6c9f36c8587d217b13ee28ca7d"},
+    {file = "rpds_py-0.27.0-pp39-pypy39_pp73-musllinux_1_2_aarch64.whl", hash = "sha256:e3acb9c16530362aeaef4e84d57db357002dc5cbfac9a23414c3e73c08301ab2"},
+    {file = "rpds_py-0.27.0-pp39-pypy39_pp73-musllinux_1_2_i686.whl", hash = "sha256:2e307cb5f66c59ede95c00e93cd84190a5b7f3533d7953690b2036780622ba81"},
+    {file = "rpds_py-0.27.0-pp39-pypy39_pp73-musllinux_1_2_x86_64.whl", hash = "sha256:f09c9d4c26fa79c1bad927efb05aca2391350b8e61c38cbc0d7d3c814e463124"},
+    {file = "rpds_py-0.27.0-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:af22763a0a1eff106426a6e1f13c4582e0d0ad89c1493ab6c058236174cd6c6a"},
+    {file = "rpds_py-0.27.0.tar.gz", hash = "sha256:8b23cf252f180cda89220b378d917180f29d313cd6a07b2431c0d3b776aae86f"},
+]
+
+[[package]]
+name = "send2trash"
+version = "1.8.3"
+description = "Send file to trash natively under Mac OS X, Windows and Linux"
+optional = false
+python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,>=2.7"
+groups = ["dev"]
+files = [
+    {file = "Send2Trash-1.8.3-py3-none-any.whl", hash = "sha256:0c31227e0bd08961c7665474a3d1ef7193929fedda4233843689baa056be46c9"},
+    {file = "Send2Trash-1.8.3.tar.gz", hash = "sha256:b18e7a3966d99871aefeb00cfbcfdced55ce4871194810fc71f4aa484b953abf"},
+]
+
+[package.extras]
+nativelib = ["pyobjc-framework-Cocoa ; sys_platform == \"darwin\"", "pywin32 ; sys_platform == \"win32\""]
+objc = ["pyobjc-framework-Cocoa ; sys_platform == \"darwin\""]
+win32 = ["pywin32 ; sys_platform == \"win32\""]
+
+[[package]]
+name = "setuptools"
+version = "80.9.0"
+description = "Easily download, build, install, upgrade, and uninstall Python packages"
+optional = false
+python-versions = ">=3.9"
+groups = ["dev"]
+files = [
+    {file = "setuptools-80.9.0-py3-none-any.whl", hash = "sha256:062d34222ad13e0cc312a4c02d73f059e86a4acbfbdea8f8f76b28c99f306922"},
+    {file = "setuptools-80.9.0.tar.gz", hash = "sha256:f36b47402ecde768dbfafc46e8e4207b4360c654f1f3bb84475f0a28628fb19c"},
+]
+
+[package.extras]
+check = ["pytest-checkdocs (>=2.4)", "pytest-ruff (>=0.2.1) ; sys_platform != \"cygwin\"", "ruff (>=0.8.0) ; sys_platform != \"cygwin\""]
+core = ["importlib_metadata (>=6) ; python_version < \"3.10\"", "jaraco.functools (>=4)", "jaraco.text (>=3.7)", "more_itertools", "more_itertools (>=8.8)", "packaging (>=24.2)", "platformdirs (>=4.2.2)", "tomli (>=2.0.1) ; python_version < \"3.11\"", "wheel (>=0.43.0)"]
+cover = ["pytest-cov"]
+doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "pyproject-hooks (!=1.1)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (>=1,<2)", "sphinx-reredirects", "sphinxcontrib-towncrier", "towncrier (<24.7)"]
+enabler = ["pytest-enabler (>=2.2)"]
+test = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "ini2toml[lite] (>=0.14)", "jaraco.develop (>=7.21) ; python_version >= \"3.9\" and sys_platform != \"cygwin\"", "jaraco.envs (>=2.2)", "jaraco.path (>=3.7.2)", "jaraco.test (>=5.5)", "packaging (>=24.2)", "pip (>=19.1)", "pyproject-hooks (!=1.1)", "pytest (>=6,!=8.1.*)", "pytest-home (>=0.5)", "pytest-perf ; sys_platform != \"cygwin\"", "pytest-subprocess", "pytest-timeout", "pytest-xdist (>=3)", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel (>=0.44.0)"]
+type = ["importlib_metadata (>=7.0.2) ; python_version < \"3.10\"", "jaraco.develop (>=7.21) ; sys_platform != \"cygwin\"", "mypy (==1.14.*)", "pytest-mypy"]
+
+[[package]]
+name = "six"
+version = "1.17.0"
+description = "Python 2 and 3 compatibility utilities"
+optional = false
+python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7"
+groups = ["main", "dev"]
+files = [
+    {file = "six-1.17.0-py2.py3-none-any.whl", hash = "sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274"},
+    {file = "six-1.17.0.tar.gz", hash = "sha256:ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81"},
+]
+
+[[package]]
+name = "sniffio"
+version = "1.3.1"
+description = "Sniff out which async library your code is running under"
+optional = false
+python-versions = ">=3.7"
+groups = ["dev"]
+files = [
+    {file = "sniffio-1.3.1-py3-none-any.whl", hash = "sha256:2f6da418d1f1e0fddd844478f41680e794e6051915791a034ff65e5f100525a2"},
+    {file = "sniffio-1.3.1.tar.gz", hash = "sha256:f4324edc670a0f49750a81b895f35c3adb843cca46f0530f79fc1babb23789dc"},
+]
+
+[[package]]
+name = "soupsieve"
+version = "2.7"
+description = "A modern CSS selector implementation for Beautiful Soup."
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "soupsieve-2.7-py3-none-any.whl", hash = "sha256:6e60cc5c1ffaf1cebcc12e8188320b72071e922c2e897f737cadce79ad5d30c4"},
+    {file = "soupsieve-2.7.tar.gz", hash = "sha256:ad282f9b6926286d2ead4750552c8a6142bc4c783fd66b0293547c8fe6ae126a"},
+]
+
+[[package]]
+name = "stack-data"
+version = "0.6.3"
+description = "Extract data from python stack frames and tracebacks for informative displays"
+optional = false
+python-versions = "*"
+groups = ["dev"]
+files = [
+    {file = "stack_data-0.6.3-py3-none-any.whl", hash = "sha256:d5558e0c25a4cb0853cddad3d77da9891a08cb85dd9f9f91b9f8cd66e511e695"},
+    {file = "stack_data-0.6.3.tar.gz", hash = "sha256:836a778de4fec4dcd1dcd89ed8abff8a221f58308462e1c4aa2a3cf30148f0b9"},
+]
+
+[package.dependencies]
+asttokens = ">=2.1.0"
+executing = ">=1.2.0"
+pure-eval = "*"
+
+[package.extras]
+tests = ["cython", "littleutils", "pygments", "pytest", "typeguard"]
+
+[[package]]
+name = "stdlib-list"
+version = "0.11.1"
+description = "A list of Python Standard Libraries (2.7 through 3.13)."
+optional = false
+python-versions = ">=3.9"
+groups = ["dev"]
+files = [
+    {file = "stdlib_list-0.11.1-py3-none-any.whl", hash = "sha256:9029ea5e3dfde8cd4294cfd4d1797be56a67fc4693c606181730148c3fd1da29"},
+    {file = "stdlib_list-0.11.1.tar.gz", hash = "sha256:95ebd1d73da9333bba03ccc097f5bac05e3aa03e6822a0c0290f87e1047f1857"},
+]
+
+[package.extras]
+dev = ["build", "stdlib-list[doc,lint,test]"]
+doc = ["furo", "sphinx"]
+lint = ["mypy", "ruff"]
+support = ["sphobjinv"]
+test = ["coverage[toml]", "pytest", "pytest-cov"]
+
+[[package]]
+name = "terminado"
+version = "0.18.1"
+description = "Tornado websocket backend for the Xterm.js Javascript terminal emulator library."
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "terminado-0.18.1-py3-none-any.whl", hash = "sha256:a4468e1b37bb318f8a86514f65814e1afc977cf29b3992a4500d9dd305dcceb0"},
+    {file = "terminado-0.18.1.tar.gz", hash = "sha256:de09f2c4b85de4765f7714688fff57d3e75bad1f909b589fde880460c753fd2e"},
+]
+
+[package.dependencies]
+ptyprocess = {version = "*", markers = "os_name != \"nt\""}
+pywinpty = {version = ">=1.1.0", markers = "os_name == \"nt\""}
+tornado = ">=6.1.0"
+
+[package.extras]
+docs = ["myst-parser", "pydata-sphinx-theme", "sphinx"]
+test = ["pre-commit", "pytest (>=7.0)", "pytest-timeout"]
+typing = ["mypy (>=1.6,<2.0)", "traitlets (>=5.11.1)"]
+
+[[package]]
+name = "tinycss2"
+version = "1.4.0"
+description = "A tiny CSS parser"
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "tinycss2-1.4.0-py3-none-any.whl", hash = "sha256:3a49cf47b7675da0b15d0c6e1df8df4ebd96e9394bb905a5775adb0d884c5289"},
+    {file = "tinycss2-1.4.0.tar.gz", hash = "sha256:10c0972f6fc0fbee87c3edb76549357415e94548c1ae10ebccdea16fb404a9b7"},
+]
+
+[package.dependencies]
+webencodings = ">=0.4"
+
+[package.extras]
+doc = ["sphinx", "sphinx_rtd_theme"]
+test = ["pytest", "ruff"]
+
+[[package]]
+name = "tomlkit"
+version = "0.13.3"
+description = "Style preserving TOML library"
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "tomlkit-0.13.3-py3-none-any.whl", hash = "sha256:c89c649d79ee40629a9fda55f8ace8c6a1b42deb912b2a8fd8d942ddadb606b0"},
+    {file = "tomlkit-0.13.3.tar.gz", hash = "sha256:430cf247ee57df2b94ee3fbe588e71d362a941ebb545dec29b53961d61add2a1"},
+]
+
+[[package]]
+name = "tornado"
+version = "6.5.2"
+description = "Tornado is a Python web framework and asynchronous networking library, originally developed at FriendFeed."
+optional = false
+python-versions = ">=3.9"
+groups = ["dev"]
+files = [
+    {file = "tornado-6.5.2-cp39-abi3-macosx_10_9_universal2.whl", hash = "sha256:2436822940d37cde62771cff8774f4f00b3c8024fe482e16ca8387b8a2724db6"},
+    {file = "tornado-6.5.2-cp39-abi3-macosx_10_9_x86_64.whl", hash = "sha256:583a52c7aa94ee046854ba81d9ebb6c81ec0fd30386d96f7640c96dad45a03ef"},
+    {file = "tornado-6.5.2-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b0fe179f28d597deab2842b86ed4060deec7388f1fd9c1b4a41adf8af058907e"},
+    {file = "tornado-6.5.2-cp39-abi3-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b186e85d1e3536d69583d2298423744740986018e393d0321df7340e71898882"},
+    {file = "tornado-6.5.2-cp39-abi3-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e792706668c87709709c18b353da1f7662317b563ff69f00bab83595940c7108"},
+    {file = "tornado-6.5.2-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:06ceb1300fd70cb20e43b1ad8aaee0266e69e7ced38fa910ad2e03285009ce7c"},
+    {file = "tornado-6.5.2-cp39-abi3-musllinux_1_2_i686.whl", hash = "sha256:74db443e0f5251be86cbf37929f84d8c20c27a355dd452a5cfa2aada0d001ec4"},
+    {file = "tornado-6.5.2-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:b5e735ab2889d7ed33b32a459cac490eda71a1ba6857b0118de476ab6c366c04"},
+    {file = "tornado-6.5.2-cp39-abi3-win32.whl", hash = "sha256:c6f29e94d9b37a95013bb669616352ddb82e3bfe8326fccee50583caebc8a5f0"},
+    {file = "tornado-6.5.2-cp39-abi3-win_amd64.whl", hash = "sha256:e56a5af51cc30dd2cae649429af65ca2f6571da29504a07995175df14c18f35f"},
+    {file = "tornado-6.5.2-cp39-abi3-win_arm64.whl", hash = "sha256:d6c33dc3672e3a1f3618eb63b7ef4683a7688e7b9e6e8f0d9aa5726360a004af"},
+    {file = "tornado-6.5.2.tar.gz", hash = "sha256:ab53c8f9a0fa351e2c0741284e06c7a45da86afb544133201c5cc8578eb076a0"},
+]
+
+[[package]]
+name = "traitlets"
+version = "5.14.3"
+description = "Traitlets Python configuration system"
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "traitlets-5.14.3-py3-none-any.whl", hash = "sha256:b74e89e397b1ed28cc831db7aea759ba6640cb3de13090ca145426688ff1ac4f"},
+    {file = "traitlets-5.14.3.tar.gz", hash = "sha256:9ed0579d3502c94b4b3732ac120375cda96f923114522847de4b3bb98b96b6b7"},
+]
+
+[package.extras]
+docs = ["myst-parser", "pydata-sphinx-theme", "sphinx"]
+test = ["argcomplete (>=3.0.3)", "mypy (>=1.7.0)", "pre-commit", "pytest (>=7.0,<8.2)", "pytest-mock", "pytest-mypy-testing"]
+
+[[package]]
+name = "types-python-dateutil"
+version = "2.9.0.20250809"
+description = "Typing stubs for python-dateutil"
+optional = false
+python-versions = ">=3.9"
+groups = ["dev"]
+files = [
+    {file = "types_python_dateutil-2.9.0.20250809-py3-none-any.whl", hash = "sha256:768890cac4f2d7fd9e0feb6f3217fce2abbfdfc0cadd38d11fba325a815e4b9f"},
+    {file = "types_python_dateutil-2.9.0.20250809.tar.gz", hash = "sha256:69cbf8d15ef7a75c3801d65d63466e46ac25a0baa678d89d0a137fc31a608cc1"},
+]
+
+[[package]]
+name = "typing-extensions"
+version = "4.14.1"
+description = "Backported and Experimental Type Hints for Python 3.9+"
+optional = false
+python-versions = ">=3.9"
+groups = ["main", "dev"]
+files = [
+    {file = "typing_extensions-4.14.1-py3-none-any.whl", hash = "sha256:d1e1e3b58374dc93031d6eda2420a48ea44a36c2b4766a4fdeb3710755731d76"},
+    {file = "typing_extensions-4.14.1.tar.gz", hash = "sha256:38b39f4aeeab64884ce9f74c94263ef78f3c22467c8724005483154c26648d36"},
+]
+
+[[package]]
+name = "typing-inspection"
+version = "0.4.1"
+description = "Runtime typing introspection tools"
+optional = false
+python-versions = ">=3.9"
+groups = ["main"]
+files = [
+    {file = "typing_inspection-0.4.1-py3-none-any.whl", hash = "sha256:389055682238f53b04f7badcb49b989835495a96700ced5dab2d8feae4b26f51"},
+    {file = "typing_inspection-0.4.1.tar.gz", hash = "sha256:6ae134cc0203c33377d43188d4064e9b357dba58cff3185f22924610e70a9d28"},
+]
+
+[package.dependencies]
+typing-extensions = ">=4.12.0"
+
+[[package]]
+name = "tzdata"
+version = "2025.2"
+description = "Provider of IANA time zone data"
+optional = false
+python-versions = ">=2"
+groups = ["main"]
+files = [
+    {file = "tzdata-2025.2-py2.py3-none-any.whl", hash = "sha256:1a403fada01ff9221ca8044d701868fa132215d84beb92242d9acd2147f667a8"},
+    {file = "tzdata-2025.2.tar.gz", hash = "sha256:b60a638fcc0daffadf82fe0f57e53d06bdec2f36c4df66280ae79bce6bd6f2b9"},
+]
+
+[[package]]
+name = "uri-template"
+version = "1.3.0"
+description = "RFC 6570 URI Template Processor"
+optional = false
+python-versions = ">=3.7"
+groups = ["dev"]
+files = [
+    {file = "uri-template-1.3.0.tar.gz", hash = "sha256:0e00f8eb65e18c7de20d595a14336e9f337ead580c70934141624b6d1ffdacc7"},
+    {file = "uri_template-1.3.0-py3-none-any.whl", hash = "sha256:a44a133ea12d44a0c0f06d7d42a52d71282e77e2f937d8abd5655b8d56fc1363"},
+]
+
+[package.extras]
+dev = ["flake8", "flake8-annotations", "flake8-bandit", "flake8-bugbear", "flake8-commas", "flake8-comprehensions", "flake8-continuation", "flake8-datetimez", "flake8-docstrings", "flake8-import-order", "flake8-literal", "flake8-modern-annotations", "flake8-noqa", "flake8-pyproject", "flake8-requirements", "flake8-typechecking-import", "flake8-use-fstring", "mypy", "pep8-naming", "types-PyYAML"]
+
+[[package]]
+name = "urllib3"
+version = "2.5.0"
+description = "HTTP library with thread-safe connection pooling, file post, and more."
+optional = false
+python-versions = ">=3.9"
+groups = ["main", "dev"]
+files = [
+    {file = "urllib3-2.5.0-py3-none-any.whl", hash = "sha256:e6b01673c0fa6a13e374b50871808eb3bf7046c4b125b216f6bf1cc604cff0dc"},
+    {file = "urllib3-2.5.0.tar.gz", hash = "sha256:3fc47733c7e419d4bc3f6b3dc2b4f890bb743906a30d56ba4a5bfa4bbff92760"},
+]
+
+[package.extras]
+brotli = ["brotli (>=1.0.9) ; platform_python_implementation == \"CPython\"", "brotlicffi (>=0.8.0) ; platform_python_implementation != \"CPython\""]
+h2 = ["h2 (>=4,<5)"]
+socks = ["pysocks (>=1.5.6,!=1.5.7,<2.0)"]
+zstd = ["zstandard (>=0.18.0)"]
+
+[[package]]
+name = "wcwidth"
+version = "0.2.13"
+description = "Measures the displayed width of unicode strings in a terminal"
+optional = false
+python-versions = "*"
+groups = ["dev"]
+files = [
+    {file = "wcwidth-0.2.13-py2.py3-none-any.whl", hash = "sha256:3da69048e4540d84af32131829ff948f1e022c1c6bdb8d6102117aac784f6859"},
+    {file = "wcwidth-0.2.13.tar.gz", hash = "sha256:72ea0c06399eb286d978fdedb6923a9eb47e1c486ce63e9b4e64fc18303972b5"},
+]
+
+[[package]]
+name = "webcolors"
+version = "24.11.1"
+description = "A library for working with the color formats defined by HTML and CSS."
+optional = false
+python-versions = ">=3.9"
+groups = ["dev"]
+files = [
+    {file = "webcolors-24.11.1-py3-none-any.whl", hash = "sha256:515291393b4cdf0eb19c155749a096f779f7d909f7cceea072791cb9095b92e9"},
+    {file = "webcolors-24.11.1.tar.gz", hash = "sha256:ecb3d768f32202af770477b8b65f318fa4f566c22948673a977b00d589dd80f6"},
+]
+
+[[package]]
+name = "webencodings"
+version = "0.5.1"
+description = "Character encoding aliases for legacy web content"
+optional = false
+python-versions = "*"
+groups = ["dev"]
+files = [
+    {file = "webencodings-0.5.1-py2.py3-none-any.whl", hash = "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78"},
+    {file = "webencodings-0.5.1.tar.gz", hash = "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"},
+]
+
+[[package]]
+name = "websocket-client"
+version = "1.8.0"
+description = "WebSocket client for Python with low level API options"
+optional = false
+python-versions = ">=3.8"
+groups = ["dev"]
+files = [
+    {file = "websocket_client-1.8.0-py3-none-any.whl", hash = "sha256:17b44cc997f5c498e809b22cdf2d9c7a9e71c02c8cc2b6c56e7c2d1239bfa526"},
+    {file = "websocket_client-1.8.0.tar.gz", hash = "sha256:3239df9f44da632f96012472805d40a23281a991027ce11d2f45a6f24ac4c3da"},
+]
+
+[package.extras]
+docs = ["Sphinx (>=6.0)", "myst-parser (>=2.0.0)", "sphinx-rtd-theme (>=1.1.0)"]
+optional = ["python-socks", "wsaccel"]
+test = ["websockets"]
+
+[[package]]
+name = "xlsxwriter"
+version = "3.2.5"
+description = "A Python module for creating Excel XLSX files."
+optional = false
+python-versions = ">=3.8"
+groups = ["main"]
+files = [
+    {file = "xlsxwriter-3.2.5-py3-none-any.whl", hash = "sha256:4f4824234e1eaf9d95df9a8fe974585ff91d0f5e3d3f12ace5b71e443c1c6abd"},
+    {file = "xlsxwriter-3.2.5.tar.gz", hash = "sha256:7e88469d607cdc920151c0ab3ce9cf1a83992d4b7bc730c5ffdd1a12115a7dbe"},
+]
+
+[metadata]
+lock-version = "2.1"
+python-versions = ">=3.12,<4.0"
+content-hash = "043e8657b19858523c1ca7580fc1000f460b8a897b3f8cf041814af49e6bc7ba"
diff --git a/pyproject.toml b/pyproject.toml
index 4c3d1cb..74b0cc7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,58 +1,59 @@
 [build-system]
-requires = ["setuptools", "wheel"]
-build-backend = "setuptools.build_meta"
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"
+
 
 [project]
 name = "pyetm"
-version = "2.0-beta"
-
+version = "2.0"
 description = "Python-ETM Connector"
-authors = [] # TODO: add us!
 readme = "README.md"
-requires-python = ">=3.12"
-license = {file = "LICENSE"}
-dependencies = [
-    # 'requests>=2.26',
-    # 'pandas[parquet]>=2.2',
-    # 'openpyxl>=3.0',
-    # 'xlsxwriter>=3.0',
+license = { text = "MIT" }
+authors = [
+  { name = "Nora Schinkel", email = "nora.schinkel@quintel.com" },
+  { name = "Louis Parkes-Talbo", email = "louis.parkestalbot@quintel.com" }
 ]
-keywords = ["ETM", "Energy Transition Model"]
-classifiers = [
-    'Development Status :: 4 - Beta',
-    'Intended Audience :: Developers',
-    'Intended Audience :: Education',
-    'Intended Audience :: Science/Research',
-    # 'License :: OSI Approved :: European Union Public Licence 1.2 (EUPL 1.2)',
-    'Natural Language :: English',
-    'Operating System :: OS Independent',
-    'Programming Language :: Python',
-    # 'Programming Language :: Python :: 3',
-    # 'Programming Language :: Python :: 3.10',
-    # 'Programming Language :: Python :: 3.11',
-    # 'Programming Language :: Python :: 3.12',
+keywords = ["energy", "transition", "modeling", "api", "ETM"]
+requires-python = ">=3.12,<4.0"
+
+dependencies = [
+  "pydantic",
+  "pandas",
+  "requests",
+  "python-dotenv",
+  "pyyaml",
+  "pydantic-settings",
+  "xlsxwriter",
+  "openpyxl"
 ]
 
+[project.scripts]
+pyetm = "pyetm.__main__:main"
+
 [project.urls]
-repository = "https://github.com/robcalon/pyetm"
-
-[project.optional-dependencies]
-async = ["aiohttp>=3.8"]
-dev = [
-    "pytest>=7.0",
-    "pylint>=3.0",
-    "requests-mock>=1.11"
-]
+"Repository"    = "https://github.com/quintel/pyetm"
+"Documentation" = "https://docs.energytransitionmodel.com/main/pyetm/introduction"
+"Issue tracker" = "https://github.com/quintel/pyetm/issues"
+
+[tool.poetry]
+packages = [{ include = "pyetm", from = "src" }]
+include = ["LICENSE"]
+
+
+[tool.poetry.group.dev.dependencies]
+pytest = "*"
+pylint = "*"
+requests-mock = "*"
+ipykernel = "*"
+notebook = "*"
+pytest-cov = "*"
+pydeps = "*"
 
-[tool.setuptools.package-data]
-"pyetm.data" = ["*.csv"]
 
-[tool.pylint]
-max-args = 15
-max-local = 20
 
 [tool.pytest.ini_options]
-minversion = "7.0"
-addopts = [
-    "--import-mode=importlib",
-]
+addopts = "--cov=pyetm --cov-report=term-missing"
+testpaths = ["tests"]
+
+[tool.pylint.main]
+fail-under = 8.0
diff --git a/pytest.ini b/pytest.ini
index ab7b981..787f920 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -2,3 +2,4 @@
 python_files = tests/*.py
 pythonpath = src
 testpaths = tests
+addopts = --cov=pyetm --cov-report=term-missing
diff --git a/running_notebooks.md b/running_notebooks.md
index e9af4a6..8fa45ba 100644
--- a/running_notebooks.md
+++ b/running_notebooks.md
@@ -1,9 +1,10 @@
 # Running Notebooks
 
 This guide will help you install everything you need to open and run our Jupyter notebooks in VS Code,
-even if you don’t have Python, Jupyter, or any VS Code extensions installed yet. If you'd like some
-additional guidance or you're having trouble, check out [this helpful guide from vscode](https://www.youtube.com/watch?v=suAkMeWJ1yE&ab_channel=VisualStudioCode).
-Just note that in the video they use venv, whereas we use pipenv (these are practically interchangable).
+even if you don’t have Python, Jupyter, or any VS Code extensions installed yet.
+
+If you'd like some additional guidance or you're having trouble, check out [this helpful guide from VS Code](https://www.youtube.com/watch?v=suAkMeWJ1yE&ab_channel=VisualStudioCode).
+Just note: in the video they use `venv`, whereas we use [Poetry](https://python-poetry.org/) for dependency management and virtual environments.
 
 ---
 
@@ -17,17 +18,20 @@ Just note that in the video they use venv, whereas we use pipenv (these are prac
 ## 2. Install Python
 
 Go to the [official Python download page](https://www.python.org/downloads/) and download the latest
-**Python 3.x** installer for your OS.
--  **Windows:** Run the installer, **check** "Add Python to PATH", and click **Install Now**.
--  **macOS/Linux:** Follow the on-screen instructions. On Linux, you can also use your package manager:
-
-   ```bash
-   # Ubuntu/Debian
-   sudo apt update && sudo apt install python3 python3-venv python3-pip
-   ```
+**Python 3.12+** installer for your OS.
+
+- **Windows:** Run the installer, **check** "Add Python to PATH", and click **Install Now**.
+- **macOS/Linux:** Follow the on-screen instructions. On macOS you can also use [Homebrew](https://brew.sh/):
+  ```bash
+  brew install python@3.12
+  ```
+  On Linux, you can use your package manager:
+  ```bash
+  # Ubuntu/Debian
+  sudo apt update && sudo apt install python3 python3-pip
+  ```
 
 Verify installation by opening a terminal and running:
-
 ```bash
 python3 --version
 # or on Windows
@@ -43,7 +47,6 @@ python --version
 3. (Optional) Check "Add to PATH" during installation for easier command-line use.
 
 Verify by running:
-
 ```bash
 code --version
 ```
@@ -53,39 +56,39 @@ code --version
 ## 4. Install Necessary VS Code Extensions
 
 1. Open VS Code.
-2. Click the **Extensions** icon (or press <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>X</kbd>).
+2. Click the **Extensions** icon (or press `Ctrl+Shift+X` / `Cmd+Shift+X` on macOS).
 3. Install:
-
    * **Python** (by Microsoft)
    * **Jupyter** (by Microsoft)
 
 ---
 
-## 5. Set Up a Python Environment (using Pipenv)
+## 5. Set Up a Python Environment (using Poetry)
 
-If you'd like to learn more about pipenv, [check out the docs here.](https://pipenv.pypa.io/en/latest/index.html)
-
-In your project folder:
-
-1. **Install Pipenv** (if you don’t have it already):
+We use [Poetry](https://python-poetry.org/) to manage dependencies and virtual environments.
 
+1. **Install Poetry** (if you don’t have it already):
    ```bash
-   pip install pipenv
+   curl -sSL https://install.python-poetry.org | python3 -
+   ```
+   Or on Windows (PowerShell):
+   ```powershell
+   (Invoke-WebRequest -Uri https://install.python-poetry.org -UseBasicParsing).Content | py -
    ```
-2. **Install dependencies** from `Pipfile`:
 
+2. **Install dependencies** from `pyproject.toml`:
    ```bash
-   pipenv install
+   poetry install --with dev
    ```
-3. **Activate** the Pipenv environment:
 
+3. **Activate** the Poetry environment:
    ```bash
-   pipenv shell
+   eval $(poetry env activate)
    ```
-4. When adding new packages:
 
+4. When adding new packages:
    ```bash
-   pipenv install <package>
+   poetry add <package>
    ```
 
 ---
@@ -93,13 +96,13 @@ In your project folder:
 ## 6. Open & Run the Notebook
 
 1. In VS Code, go to **File → Open Folder** and select this project’s root folder.
-2. Locate a `.ipynb` file in the Examples folder, and click to open it.
-3. At the top right of the notebook editor, click **Select Kernel** and choose the interpreter from
-your Pipenv environment (it will mention `Pipenv`).
-4. Run cells by clicking the ▶️ icon or pressing <kbd>Shift</kbd>+<kbd>Enter</kbd>.
+2. Locate a `.ipynb` file in the `examples` folder, and click to open it.
+3. At the top right of the notebook editor, click **Select Kernel** and choose the interpreter from your Poetry environment (it will mention `.venv` or the Poetry-managed path).
+4. Run cells by clicking the ▶️ icon or pressing `Shift+Enter`.
 
 ---
 
 ## 7. Important Notes
-After this setup you will be *almost* ready to run the Jupyter notebooks in the examples folder. You
-still need to configure your settings as [outlined in the main readme.](README.md)
+
+After this setup you will be *almost* ready to run the Jupyter notebooks in the examples folder.
+You still need to configure your settings as [outlined in the main README](README.md).
diff --git a/src/pyetm/clients/session.py b/src/pyetm/clients/session.py
index b57d726..c7a011f 100644
--- a/src/pyetm/clients/session.py
+++ b/src/pyetm/clients/session.py
@@ -25,6 +25,10 @@ def __init__(self, base_url: Optional[str] = None, token: Optional[str] = None):
             }
         )
 
+        proxies = get_settings().proxy_servers
+        if proxies:
+            self.proxies.update(proxies)
+
     def request(self, method: str, url: str, **kwargs) -> requests.Response:
         # Ensure we only pass a path to `url`; prefix with base_url
         full_url = (
diff --git a/src/pyetm/config/settings.py b/src/pyetm/config/settings.py
index 3119b40..34d36b5 100644
--- a/src/pyetm/config/settings.py
+++ b/src/pyetm/config/settings.py
@@ -1,38 +1,74 @@
 from pathlib import Path
-import yaml, os
+import re
 from typing import Optional, ClassVar, List, Annotated
 from pydantic import Field, ValidationError, HttpUrl, field_validator
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
 PROJECT_ROOT = Path(__file__).resolve().parents[3]
-CONFIG_FILE = PROJECT_ROOT / "config.yml"
+ENV_FILE = PROJECT_ROOT / "config.env"
+
 
 class AppConfig(BaseSettings):
     """
-    Application configuration loaded from YAML.
+    Application configuration loaded from .env file and environment variables.
     """
 
     etm_api_token: Annotated[
         str,
         Field(
             ...,
-            description="Your ETM API token: must be either `etm_<JWT>` or `etm_beta_<JWT>`. If not set please set $ETM_API_TOKEN or config.yml:etm_api_token",
+            description="Your ETM API token: must be either `etm_<JWT>` or `etm_beta_<JWT>`",
         ),
     ]
-    base_url: HttpUrl = Field(
-        "https://engine.energytransitionmodel.com/api/v3",
-        description="Base URL for the ETM API",
+    base_url: Optional[HttpUrl] = Field(
+        None,
+        description="Base URL for the ETM API (will be inferred from environment if not provided)",
+    )
+    environment: Optional[str] = Field(
+        "pro",
+        description=(
+            "ETM environment to target. One of: 'pro' (default), 'beta', 'local', or a stable tag 'YYYY-MM'. "
+            "When set and base_url is not provided, base_url will be inferred."
+        ),
     )
     log_level: Optional[str] = Field(
         "INFO",
         description="App logging level",
     )
 
+    proxy_servers_http: Optional[str] = Field(
+        None,
+        description="HTTP proxy server URL",
+    )
+    proxy_servers_https: Optional[str] = Field(
+        None,
+        description="HTTPS proxy server URL",
+    )
+    csv_separator: str = Field(
+        ",",
+        description="CSV file separator character",
+    )
+    decimal_separator: str = Field(
+        ".",
+        description="Decimal separator character",
+    )
+
     model_config: ClassVar[SettingsConfigDict] = SettingsConfigDict(
-        env_file=None, extra="ignore", case_sensitive=False
+        case_sensitive=False,
+        extra="ignore",
     )
 
-    temp_folder: Optional[Path] = PROJECT_ROOT / 'tmp'
+    temp_folder: Optional[Path] = PROJECT_ROOT / "tmp"
+
+    def __init__(self, **values):
+        """
+        This ensures tests can monkeypatch `pyetm.config.settings.ENV_FILE`
+        """
+        super().__init__(
+            _env_file=ENV_FILE,
+            _env_file_encoding="utf-8",
+            **values,
+        )
 
     @field_validator("etm_api_token")
     @classmethod
@@ -68,36 +104,33 @@ def check_jwt(cls, v: str) -> str:
 
         return v
 
+    def model_post_init(self, __context) -> None:
+        """Post-initialization to handle base_url inference."""
+        if not self.base_url:
+            self.base_url = HttpUrl(_infer_base_url_from_env(self.environment))
+
     def path_to_tmp(self, subfolder: str):
         folder = self.temp_folder / subfolder
         folder.mkdir(parents=True, exist_ok=True)
         return folder
 
-    @classmethod
-    def from_yaml(cls, path: Path) -> "AppConfig":
-        raw = {}
-        if path.is_file():
-            try:
-                raw = yaml.safe_load(path.read_text()) or {}
-            except yaml.YAMLError:
-                raw = {}
-
-        data = {k.lower(): v for k, v in raw.items()}
-
-        for field in ("etm_api_token", "base_url", "log_level"):
-            if val := os.getenv(field.upper()):
-                data[field] = val
-
-        return cls(**data)
+    @property
+    def proxy_servers(self) -> dict[str, str]:
+        """Return proxy servers as a dictionary for backward compatibility."""
+        proxies = {}
+        if self.proxy_servers_http:
+            proxies["http"] = self.proxy_servers_http
+        if self.proxy_servers_https:
+            proxies["https"] = self.proxy_servers_https
+        return proxies
 
 
 def get_settings() -> AppConfig:
     """
-    Always re-load AppConfig from disk and ENV on each call,
-    and raise a clear, aggregated message if anything required is missing.
+    Load AppConfig from .env file and environment variables.
     """
     try:
-        return AppConfig.from_yaml(CONFIG_FILE)
+        return AppConfig()
     except ValidationError as exc:
         missing_or_invalid: List[str] = []
         for err in exc.errors():
@@ -109,5 +142,34 @@ def get_settings() -> AppConfig:
         raise RuntimeError(
             f"\nConfiguration error: one or more required settings are missing or invalid:\n\n"
             f"{detail}\n\n"
-            f"Please set them via environment variables or in `{CONFIG_FILE}`."
+            f"Please set them via environment variables or in `{ENV_FILE}`."
         ) from exc
+
+
+def _infer_base_url_from_env(environment: str) -> str:
+    """
+    Infers the ETM API base URL from an environment string.
+
+    Supported values (case-insensitive):
+      - 'pro'/'prod' (default): https://engine.energytransitionmodel.com/api/v3
+      - 'beta'/'staging':       https://beta.engine.energytransitionmodel.com/api/v3
+      - 'local'/'dev'/'development': http://localhost:3000/api/v3
+      - stable tags 'YYYY-MM':  https://{YYYY-MM}.engine.energytransitionmodel.com/api/v3
+
+    Falls back to the 'pro' URL if the input is empty or unrecognized.
+    """
+    env = (environment or "").strip().lower()
+
+    if env in ("", "pro", "prod"):  # default
+        return "https://engine.energytransitionmodel.com/api/v3"
+    if env in ("beta", "staging"):
+        return "https://beta.engine.energytransitionmodel.com/api/v3"
+    if env in ("local", "dev", "development"):
+        return "http://localhost:3000/api/v3"
+
+    # Stable tagged environments e.g., '2025-01'
+    if re.fullmatch(r"\d{4}-\d{2}", env):
+        return f"https://{env}.engine.energytransitionmodel.com/api/v3"
+
+    # Unrecognized: be conservative and return production
+    return "https://engine.energytransitionmodel.com/api/v3"
diff --git a/src/pyetm/models/__init__.py b/src/pyetm/models/__init__.py
index 5f78c5a..6e0abb7 100644
--- a/src/pyetm/models/__init__.py
+++ b/src/pyetm/models/__init__.py
@@ -2,5 +2,6 @@
 from .gqueries import Gqueries
 from .inputs import Input, Inputs
 from .scenario import Scenario
+from .scenarios import Scenarios
 from .sortables import Sortable, Sortables
 from .scenario_packer import ScenarioPacker
diff --git a/src/pyetm/models/base.py b/src/pyetm/models/base.py
index 335a47f..fbd7c73 100644
--- a/src/pyetm/models/base.py
+++ b/src/pyetm/models/base.py
@@ -1,8 +1,9 @@
 from __future__ import annotations
-from typing import Any, Type, TypeVar
+from typing import Any, Type, TypeVar, Union, List, Dict
 from pydantic import BaseModel, PrivateAttr, ValidationError, ConfigDict
 from pydantic_core import InitErrorDetails, PydanticCustomError
 import pandas as pd
+from pyetm.models.warnings import WarningCollector
 
 T = TypeVar("T", bound="Base")
 
@@ -10,7 +11,7 @@
 class Base(BaseModel):
     """
     Custom base model that:
-      - Collects non-breaking validation or runtime warnings
+      - Collects non-breaking validation or runtime warnings using WarningCollector
       - Fails fast on critical errors
       - Catches validation errors and converts them into warnings
       - Validates on assignment, converting assignment errors into warnings
@@ -19,144 +20,167 @@ class Base(BaseModel):
 
     # Enable assignment validation
     model_config = ConfigDict(validate_assignment=True)
-
-    # Internal list of warnings (not part of serialized schema)
-    _warnings: dict[str, list[str]] = PrivateAttr(default_factory=dict)
+    _warning_collector: WarningCollector = PrivateAttr(default_factory=WarningCollector)
 
     def __init__(self, **data: Any) -> None:
-        # Ensure private warnings list exists before any validation
-        object.__setattr__(self, "_warnings", {})
+        """
+        Initialize the model, converting validation errors to warnings.
+        """
+        object.__setattr__(self, "_warning_collector", WarningCollector())
+
         try:
             super().__init__(**data)
         except ValidationError as e:
-            # Construct without validation to preserve fields
-            inst = self.__class__.model_construct(**data)
-            # Copy field data
-            object.__setattr__(self, "__dict__", inst.__dict__.copy())
-            # Ensure warnings list on this instance
-            if not hasattr(self, "_warnings"):
-                object.__setattr__(self, "_warnings", {})
-            # Convert each validation error into a warning
-            for err in e.errors():
-                loc = ".".join(str(x) for x in err.get("loc", []))
-                msg = err.get("msg", "")
-                self.add_warning(loc, msg)
+            # If validation fails, create model without validation and collect warnings
+            # Use model_construct to bypass validation
+            temp_instance = self.__class__.model_construct(**data)
+
+            # Copy the constructed data to this instance
+            for field_name, field_value in temp_instance.__dict__.items():
+                if not field_name.startswith("_"):
+                    object.__setattr__(self, field_name, field_value)
+
+            # Convert validation errors to warnings
+            for error in e.errors():
+                field_path = ".".join(str(part) for part in error.get("loc", []))
+                message = error.get("msg", "Validation failed")
+                self._warning_collector.add(field_path, message, "error")
 
     def __setattr__(self, name: str, value: Any) -> None:
-        """ Abuses the fact that init does not return on valdiation errors"""
-        # Intercept assignment-time validation errors
-        if name in self.__class__.model_fields:
-            try:
-                self._clear_warnings_for_attr(name)
-                current_data = self.model_dump()
-                current_data[name] = value
-                obj =self.__class__.model_validate(current_data)
-                if name in obj.warnings:
-                    self.add_warning(name, obj.warnings[name])
-                    # Do not assign invalid value
-                    return
-            except ValidationError as e:
-                for err in e.errors():
-                    if err.get("loc") == (name,):
-                        msg = err.get("msg", "")
-                        self.add_warning(name, msg)
-                # Do not assign invalid value
-                return
+        """
+        Handle assignment with validation error capture.
+        """
+        # Skip validation for private attributes, methods/functions, or existing methods
+        if (
+            name.startswith("_")
+            or name not in self.__class__.model_fields
+            or callable(value)
+            or hasattr(self.__class__, name)
+        ):
+            # Use object.__setattr__ to bypass Pydantic for these cases
+            object.__setattr__(self, name, value)
+            return
 
-        super().__setattr__(name, value)
+        # Clear existing warnings for this field
+        self._warning_collector.clear(name)
 
-    def add_warning(self, key: str, message: str) -> None:
-        """Append a warning message to this model."""
-        # TODO: this is horrible. we need a struct for it!!
-        if key in self._warnings:
-            if isinstance(self._warnings[key], dict):
-                if isinstance(message, dict):
-                    self._warnings[key].update(message)
-                else:
-                    self._warnings[key].update({'base', message})
-            elif isinstance(message, list):
-                self._warnings[key].extend(message)
-            else:
-                self._warnings[key].append(message)
-        else:
-            # TODO: this is horrible. we need a struct for it
-            if isinstance(message, list) or isinstance(message, dict):
-                self._warnings[key] = message
-            else:
-                self._warnings[key] = [message]
+        try:
+            # Try to validate the new value by creating a copy with the update
+            current_data = self.model_dump()
+            current_data[name] = value
 
-    @property
-    def warnings(self) -> dict[str, list[str]]:
-        """Return a copy of the warnings list."""
-        return self._warnings
+            # Test validation with a temporary instance
+            test_instance = self.__class__.model_validate(current_data)
 
-    def show_warnings(self) -> None:
-        """Print all warnings to the console."""
-        if not self._warnings:
-            print("No warnings.")
+            # If validation succeeds, set the value
+            super().__setattr__(name, value)
+
+        except ValidationError as e:
+            # If validation fails, add warnings but don't set the value
+            for error in e.errors():
+                if error.get("loc") == (name,):
+                    message = error.get("msg", "Validation failed")
+                    self._warning_collector.add(name, message, "warning")
             return
-        print("Warnings:")
-        # TODO: use prettyprint
-        for i, w in enumerate(self._warnings, start=1):
-            print(f" {i}. {w}")
 
-    def _clear_warnings_for_attr(self, key):
+    def add_warning(
+        self,
+        field: str,
+        message: Union[str, List[str], Dict[str, Any]],
+        severity: str = "warning",
+    ) -> None:
+        """Add a warning to this model instance."""
+        self._warning_collector.add(field, message, severity)
+
+    @property
+    def warnings(self) -> Union[WarningCollector, Dict[str, List[str]]]:
         """
-        Remove a key from the warnings.
+        Return warnings.
         """
-        self._warnings.pop(key, None)
+        return self._warning_collector
 
-    def _merge_submodel_warnings(self, *submodels: Base, key_attr=None) -> None:
+    def show_warnings(self) -> None:
+        """Print all warnings to the console."""
+        self._warning_collector.show_warnings()
+
+    def log_warnings(
+        self, logger, level: str = "warning", prefix: str | None = None
+    ) -> None:
         """
-        Bring warnings from a nested Base (or list thereof)
-        into this model's warnings list.
+        Log all collected warnings using the provided logger.
         """
-        from typing import Iterable
+        try:
+            collector = getattr(self, "warnings", None)
+            if collector is None or len(collector) == 0:
+                return
+            log_fn = getattr(logger, level, getattr(logger, "warning", None))
+            if log_fn is None:
+                return
+            for w in collector:
+                field = getattr(w, "field", "")
+                msg = getattr(w, "message", str(w))
+                if prefix:
+                    log_fn(f"{prefix} [{field}]: {msg}")
+                else:
+                    log_fn(f"[{field}]: {msg}")
+        except Exception:
+            pass
 
-        def _collect(wm: Base):
-            if not wm.warnings: return
+    def _clear_warnings_for_attr(self, field: str) -> None:
+        """Remove warnings for a specific field."""
+        self._warning_collector.clear(field)
 
-            key = wm.__class__.__name__
-            if not key_attr is None:
-                key += f'({key_attr}={getattr(wm, key_attr)})'
-            self.add_warning(key, wm.warnings)
+    def _merge_submodel_warnings(self, *submodels: Base, key_attr: str = None) -> None:
+        """
+        Merge warnings from nested Base models.
+        """
+        self._warning_collector.merge_submodel_warnings(*submodels, key_attr=key_attr)
 
-        for item in submodels:
-            if isinstance(item, Base):
-                _collect(item)
+    @classmethod
+    def from_dataframe(cls: Type[T], df: pd.DataFrame, **kwargs) -> T:
+        """
+        Create an instance from a pandas DataFrame.
+        """
+        try:
+            return cls._from_dataframe(df, **kwargs)
+        except Exception as e:
+            # Create a fallback instance with warnings
+            instance = cls.model_construct()
+            instance.add_warning(
+                "from_dataframe", f"Failed to create from DataFrame: {e}"
+            )
+            return instance
 
     @classmethod
-    def load_safe(cls: Type[T], **data: Any) -> T:
+    def _from_dataframe(cls, df: pd.DataFrame, **kwargs):
         """
-        Alternate constructor that always returns an instance,
-        converting all validation errors into warnings.
+        Private method to be implemented by each subclass for specific deserialization logic.
         """
-        return cls(**data)
+        raise NotImplementedError(
+            f"{cls.__name__} must implement _from_dataframe() class method"
+        )
 
-    def _get_serializable_fields(self) -> list[str]:
+    def _get_serializable_fields(self) -> List[str]:
         """
         Parse and return column names for serialization.
         Override this method in subclasses if you need custom field selection logic.
         """
         return [
             field_name
-            for field_name in self.model_fields.keys()
+            for field_name in self.__class__.model_fields.keys()
             if not field_name.startswith("_")
         ]
 
     def _raise_exception_on_loc(self, err: str, type: str, loc: str, msg: str):
         """
-        Nice and convoluted way to raise validation errors on custom locs.
-        Used in model validators
+        Raise validation errors on custom locations.
+        Used in model validators.
         """
         raise ValidationError.from_exception_data(
             err,
             [
                 InitErrorDetails(
-                    type=PydanticCustomError(
-                        type,
-                        msg,
-                    ),
+                    type=PydanticCustomError(type, msg),
                     loc=(loc,),
                     input=self,
                 ),
@@ -191,7 +215,9 @@ def to_dataframe(self, **kwargs) -> pd.DataFrame:
             if not isinstance(df, pd.DataFrame):
                 raise ValueError(f"Expected DataFrame, got {type(df)}")
         except Exception as e:
-            self.add_warning(f"{self.__class__.__name__}._to_dataframe()", f"failed: {e}")
+            self.add_warning(
+                f"{self.__class__.__name__}._to_dataframe()", f"failed: {e}"
+            )
             df = pd.DataFrame()
 
         # Set index name if not already set
diff --git a/src/pyetm/models/couplings.py b/src/pyetm/models/couplings.py
new file mode 100644
index 0000000..5879a82
--- /dev/null
+++ b/src/pyetm/models/couplings.py
@@ -0,0 +1,42 @@
+from __future__ import annotations
+from typing import List, Set
+from pyetm.models.base import Base
+
+
+class Couplings(Base):
+
+    active_couplings: List[str] = []
+    inactive_couplings: List[str] = []
+
+    def __init__(self, **data):
+        super().__init__(**data)
+
+    def active_groups(self) -> List[str]:
+        """Get active coupling groups"""
+        return self.active_couplings
+
+    def inactive_groups(self) -> List[str]:
+        """Get inactive coupling groups"""
+        return self.inactive_couplings
+
+    def all_groups(self) -> Set[str]:
+        """Get all coupling groups (active and inactive)"""
+        return set(self.active_couplings + self.inactive_couplings)
+
+    @classmethod
+    def from_json(cls, data: dict) -> Couplings:
+        """
+        Create Couplings from JSON data.
+
+        Expected format:
+        {
+            "active_couplings": ["external_group1"],
+            "inactive_couplings": ["external_group2"]
+        }
+        """
+        return cls.model_validate(
+            {
+                "active_couplings": data.get("active_couplings", []),
+                "inactive_couplings": data.get("inactive_couplings", []),
+            }
+        )
diff --git a/src/pyetm/models/custom_curves.py b/src/pyetm/models/custom_curves.py
index 8f2bf2c..753176b 100644
--- a/src/pyetm/models/custom_curves.py
+++ b/src/pyetm/models/custom_curves.py
@@ -1,9 +1,11 @@
 from __future__ import annotations
 import pandas as pd
 from pathlib import Path
-from typing import Optional
+from typing import Optional, Any
+from pyetm.models.warnings import WarningCollector
 from pyetm.clients import BaseClient
 from pyetm.models.base import Base
+from pydantic import PrivateAttr
 from pyetm.services.scenario_runners.fetch_custom_curves import (
     DownloadCustomCurveRunner,
 )
@@ -29,7 +31,7 @@ class CustomCurve(Base):
     def available(self) -> bool:
         return bool(self.file_path)
 
-    def retrieve(self, client, scenario) -> Optional[pd.DataFrame]:
+    def retrieve(self, client, scenario) -> Optional[pd.Series]:
         """Process curve from client, save to file, set file_path"""
         file_path = (
             get_settings().path_to_tmp(str(scenario.id))
@@ -53,16 +55,18 @@ def retrieve(self, client, scenario) -> Optional[pd.DataFrame]:
                         .squeeze("columns")
                         .dropna(how="all")
                     )
+                    if len(curve) != 8760:
+                        self.add_warning(
+                            self.key,
+                            f"Curve length should be 8760, got {len(curve)}; proceeding with current data",
+                        )
 
                     self.file_path = file_path
-                    curve.to_csv(self.file_path, index=False)
+                    curve.to_csv(self.file_path, index=False, header=False)
                     return curve.rename(self.key)
                 except Exception as e:
                     # File processing error - add warning and return None
-                    self.add_warning(
-                        self.key,
-                        f"Failed to process curve data: {e}"
-                    )
+                    self.add_warning(self.key, f"Failed to process curve data: {e}")
                     return None
             else:
                 # API call failed - add warning for each error
@@ -82,12 +86,17 @@ def contents(self) -> Optional[pd.Series]:
             return None
 
         try:
-            return (
+            series = (
                 pd.read_csv(self.file_path, header=None, index_col=False, dtype=float)
                 .squeeze("columns")
                 .dropna(how="all")
-                .rename(self.key)
             )
+            if len(series) != 8760:
+                self.add_warning(
+                    self.key,
+                    f"Curve length should be 8760, got {len(series)}; using available data",
+                )
+            return series.rename(self.key)
         except Exception as e:
             self.add_warning(self.key, f"Failed to read curve file: {e}")
             return None
@@ -111,21 +120,77 @@ def from_json(cls, data: dict) -> CustomCurve:
         Initialize a CustomCurve from JSON data
         """
         try:
-            curve = cls.model_validate(data)
+            curve = cls(**data)
+            missing = [k for k in ("key", "type") if k not in data]
+            if missing:
+                curve.add_warning(
+                    "base",
+                    f"Failed to create curve from data: missing required fields: {', '.join(missing)}",
+                )
+
             return curve
         except Exception as e:
-            # Create basic curve with warning attached
             basic_data = {
                 "key": data.get("key", "unknown"),
                 "type": data.get("type", "unknown"),
             }
-            curve = cls.model_validate(basic_data)
-            curve.add_warning(basic_data["key"], f"Failed to create curve from data: {e}")
+            curve = cls.model_construct(**basic_data)
+            curve.add_warning("base", f"Failed to create curve from data: {e}")
             return curve
 
+    def _to_dataframe(self, **kwargs) -> pd.DataFrame:
+        """
+        Serialize CustomCurve to DataFrame with time series data.
+        """
+        curve_data = self.contents()
+
+        if curve_data is None or curve_data.empty:
+            # Return empty DataFrame with proper structure
+            return pd.DataFrame({self.key: pd.Series(dtype=float)})
+        df = pd.DataFrame({self.key: curve_data.values})
+        df.index.name = "hour"
+        return df
+
+    @classmethod
+    def _from_dataframe(
+        cls, df: pd.DataFrame, scenario_id: str | int | None = None, **kwargs
+    ) -> "CustomCurve":
+        """
+        Create CustomCurve from DataFrame containing time series data.
+        """
+        if len(df.columns) != 1:
+            raise ValueError(
+                f"DataFrame must contain exactly 1 column, got {len(df.columns)}"
+            )
+
+        curve_key = df.columns[0]
+        curve_data_dict = {
+            "key": curve_key,
+            "type": "custom",
+        }
+        curve = cls.model_validate(curve_data_dict)
+
+        if not df.empty:
+            curve_data = df.iloc[:, 0].dropna()
+            if not curve_data.empty:
+                safe_key = str(curve_key).replace("/", "-")
+                file_path = (
+                    get_settings().path_to_tmp(str(scenario_id)) / f"{safe_key}.csv"
+                )
+                file_path.parent.mkdir(parents=True, exist_ok=True)
+                try:
+                    curve_data.to_csv(file_path, index=False, header=False)
+                    curve.file_path = file_path
+                except Exception as e:
+                    curve.add_warning(
+                        curve_key, f"Failed to save curve data to file: {e}"
+                    )
+        return curve
+
 
 class CustomCurves(Base):
     curves: list[CustomCurve]
+    _scenario: Any = PrivateAttr(default=None)
 
     def __len__(self) -> int:
         return len(self.curves)
@@ -147,19 +212,17 @@ def get_contents(
         curve = self._find(curve_name)
 
         if not curve:
-            self.add_warning('curves', f"Curve {curve_name} not found in collection")
+            self.add_warning("curves", f"Curve {curve_name} not found in collection")
             return None
 
         if not curve.available():
             # Try to retrieve it
             result = curve.retrieve(BaseClient(), scenario)
-            # Merge any warnings from the curve retrieval
-            self._merge_submodel_warnings(curve)
+            self._merge_submodel_warnings(curve, key_attr="key")
             return result
         else:
             contents = curve.contents()
-            # Merge any warnings from reading contents
-            self._merge_submodel_warnings(curve)
+            self._merge_submodel_warnings(curve, key_attr="key")
             return contents
 
     def _find(self, curve_name: str) -> Optional[CustomCurve]:
@@ -171,24 +234,142 @@ def from_json(cls, data: list[dict]) -> CustomCurves:
         Initialize CustomCurves collection from JSON data
         """
         curves = []
-        collection_warnings = {}
 
         for curve_data in data:
             try:
-                key = curve_data['key']
                 curve = CustomCurve.from_json(curve_data)
                 curves.append(curve)
             except Exception as e:
-                # Log the problematic curve but continue processing
-                collection_warnings[f"CustomCurve(key={key})"] = f"Skipped invalid curve data: {e}"
+                # Create a basic curve and continue processing
+                key = curve_data.get("key", "unknown")
+                basic_curve = CustomCurve.model_construct(key=key, type="unknown")
+                basic_curve.add_warning(key, f"Skipped invalid curve data: {e}")
+                curves.append(basic_curve)
 
         collection = cls.model_validate({"curves": curves})
+        collection._merge_submodel_warnings(*curves, key_attr="key")
+        return collection
+
+    def _to_dataframe(self, **kwargs) -> pd.DataFrame:
+        """
+        Serialize CustomCurves collection to DataFrame with time series data.
+        """
+        if not self.curves:
+            return pd.DataFrame(index=pd.Index([], name="hour"))
+
+        curve_columns = {}
 
-        # Add any collection-level warnings
-        for loc, msg in collection_warnings.items():
-            collection.add_warning(loc, msg)
+        for curve in self.curves:
+            try:
+                if (
+                    not curve.available()
+                    and getattr(self, "_scenario", None) is not None
+                ):
+                    try:
+                        curve.retrieve(BaseClient(), self._scenario)
+                    except Exception:
+                        pass
+                curve_df = curve._to_dataframe(**kwargs)
+                if not curve_df.empty:
+                    # Get the curve data as a Series
+                    curve_series = curve_df.iloc[:, 0]  # First (and only) column
+                    curve_columns[curve.key] = curve_series
+                else:
+                    # TODO: Should we add empty series for curves with no data? currently yes
+                    curve_columns[curve.key] = pd.Series(dtype=float, name=curve.key)
 
-        # Merge warnings from individual curves
-        collection._merge_submodel_warnings(*curves, key_attr='key')
+            except Exception as e:
+                curve_columns[curve.key] = pd.Series(dtype=float, name=curve.key)
+                self.add_warning(
+                    "curves", f"Failed to serialize curve {curve.key}: {e}"
+                )
+
+        if curve_columns:
+            # Combine all curves into a single DataFrame
+            result_df = pd.DataFrame(curve_columns)
+            result_df.index.name = "hour"
+            return result_df
+        else:
+            return pd.DataFrame(index=pd.Index([], name="hour"))
 
+    @classmethod
+    def _from_dataframe(
+        cls, df: pd.DataFrame, scenario_id: str | int | None = None, **kwargs
+    ) -> "CustomCurves":
+        """
+        Create CustomCurves collection from DataFrame with time series data.
+        """
+        curves = []
+        if len(df.columns) == 0:
+            return cls.model_validate({"curves": curves})
+        for column_name in df.columns:
+            try:
+                curve_df = df[[column_name]]
+                curve = CustomCurve._from_dataframe(
+                    curve_df, scenario_id=scenario_id, **kwargs
+                )
+                curves.append(curve)
+            except Exception as e:
+                basic_curve = CustomCurve.model_construct(
+                    key=column_name, type="custom"
+                )
+                basic_curve.add_warning(
+                    "base", f"Failed to create curve from column {column_name}: {e}"
+                )
+                curves.append(basic_curve)
+        collection = cls.model_validate({"curves": curves})
+        collection._merge_submodel_warnings(*curves, key_attr="key")
         return collection
+
+    def validate_for_upload(self) -> dict[str, WarningCollector]:
+        """
+        Validate all curves for upload
+        """
+        validation_errors = {}
+
+        for curve in self.curves:
+            curve_warnings = WarningCollector()
+
+            if not curve.available():
+                curve_warnings.add(curve.key, "Curve has no data available")
+                validation_errors[curve.key] = curve_warnings
+                continue
+
+            try:
+                try:
+                    # Read without dtype conversion to preserve non-numeric values
+                    raw_data = pd.read_csv(
+                        curve.file_path, header=None, index_col=False
+                    )
+                    if raw_data.empty:
+                        curve_warnings.add(curve.key, "Curve contains no data")
+                        validation_errors[curve.key] = curve_warnings
+                        continue
+
+                    # Check length first
+                    if len(raw_data) != 8760:
+                        curve_warnings.add(
+                            curve.key,
+                            f"Curve must contain exactly 8,760 values, found {len(raw_data)}",
+                        )
+                    else:
+                        try:
+                            # Try to convert to numeric, this will raise if there are non-numeric values
+                            pd.to_numeric(raw_data.iloc[:, 0], errors="raise")
+                        except (ValueError, TypeError):
+                            curve_warnings.add(
+                                curve.key, "Curve contains non-numeric values"
+                            )
+
+                except pd.errors.EmptyDataError:
+                    curve_warnings.add(curve.key, "Curve contains no data")
+                except Exception as e:
+                    curve_warnings.add(curve.key, f"Error reading curve data: {str(e)}")
+
+            except Exception as e:
+                curve_warnings.add(curve.key, f"Error reading curve data: {str(e)}")
+
+            if len(curve_warnings) > 0:
+                validation_errors[curve.key] = curve_warnings
+
+        return validation_errors
diff --git a/src/pyetm/models/export_config.py b/src/pyetm/models/export_config.py
new file mode 100644
index 0000000..a531a44
--- /dev/null
+++ b/src/pyetm/models/export_config.py
@@ -0,0 +1,25 @@
+from __future__ import annotations
+
+from typing import Optional, Sequence
+from pydantic import BaseModel
+
+
+class ExportConfig(BaseModel):
+    """
+    Per-scenario export configuration.
+
+    If a value is None, the exporter will use its default/global behavior.
+    """
+
+    include_inputs: Optional[bool] = None
+    include_sortables: Optional[bool] = None
+    include_custom_curves: Optional[bool] = None
+    include_gqueries: Optional[bool] = None
+    inputs_defaults: Optional[bool] = None
+    inputs_min_max: Optional[bool] = None
+
+    # Select which output carriers to include; None means don't include carriers
+    output_carriers: Optional[Sequence[str]] = None
+
+    def effective_bool(self, value: Optional[bool], default: bool) -> bool:
+        return default if value is None else bool(value)
diff --git a/src/pyetm/models/gqueries.py b/src/pyetm/models/gqueries.py
index 4fe802c..948dce6 100644
--- a/src/pyetm/models/gqueries.py
+++ b/src/pyetm/models/gqueries.py
@@ -10,7 +10,7 @@
 
 class Gqueries(Base):
     """
-    We cannot validat yet - as we'd need a servcie connected to the main
+    We cannot validate yet - as we'd need a service connected to the main
     gquery endpoint
     """
 
@@ -48,7 +48,7 @@ def execute(self, client, scenario):
         if result.success:
             self.update(result.data)
         else:
-            self.add_warning('results', f"Error retrieving queries: {result.errors}")
+            self.add_warning("results", f"Error retrieving queries: {result.errors}")
 
     def to_dataframe(self, columns="future"):
         if not self.is_ready():
@@ -58,6 +58,13 @@ def to_dataframe(self, columns="future"):
         df.index.name = "gquery"
         return df.set_index("unit", append=True)
 
+    def _to_dataframe(self, **kwargs) -> pd.DataFrame:
+        """
+        Implementation required by Base class.
+        Uses to_dataframe with default parameters.
+        """
+        return self.to_dataframe()
+
     @classmethod
     def from_list(cls, query_list: list[str]):
         return cls(query_dict={q: None for q in query_list})
diff --git a/src/pyetm/models/inputs.py b/src/pyetm/models/inputs.py
index 33dde63..c800403 100644
--- a/src/pyetm/models/inputs.py
+++ b/src/pyetm/models/inputs.py
@@ -1,7 +1,8 @@
 from __future__ import annotations
-from typing import Any, Optional, Union
-from pydantic import field_validator, model_validator, ValidationInfo
+from typing import Optional, Union
+from pydantic import field_validator, model_validator
 import pandas as pd
+from pyetm.models.warnings import WarningCollector
 from pyetm.models.base import Base
 
 
@@ -15,13 +16,11 @@ class Input(Base):
     default: Optional[Union[float, str]] = None
     user: Optional[Union[float, str]] = None
     disabled: Optional[bool] = False
-    coupling_disabled: Optional[bool] = False
-    coupling_groups: Optional[list[str]] = []
     disabled_by: Optional[str] = None
 
-    def is_valid_update(self, value) -> list[str]:
+    def is_valid_update(self, value) -> WarningCollector:
         """
-        Returns a list of validation warnings without updating the current object
+        Returns a WarningCollector with validation warnings without updating the current object.
         """
         new_obj_dict = self.model_dump()
         new_obj_dict["user"] = value
@@ -30,7 +29,7 @@ def is_valid_update(self, value) -> list[str]:
         return warnings_obj.warnings
 
     @classmethod
-    def from_json(cls, data: tuple[str, dict]) -> Input:
+    def from_json(cls, data: tuple[str, dict]) -> "Input":
         """
         Initialize an Input from a JSON-like tuple coming from .items()
         """
@@ -43,7 +42,7 @@ def from_json(cls, data: tuple[str, dict]) -> Input:
             return input_instance
         except Exception as e:
             # Create a basic Input with warning attached
-            basic_input = cls.model_validate(payload)
+            basic_input = cls.model_construct(**payload)  # Bypass validation
             basic_input.add_warning(key, f"Failed to create specialized input: {e}")
             return basic_input
 
@@ -78,7 +77,7 @@ class BoolInput(Input):
 
     @field_validator("user", mode="after")
     @classmethod
-    def is_bool_float(cls, value: float) -> float:
+    def is_bool_float(cls, value: Optional[float]) -> Optional[float]:
         if value == 1.0 or value == 0.0 or value is None:
             return value
         raise ValueError(
@@ -96,7 +95,6 @@ class EnumInput(Input):
     def _get_serializable_fields(self) -> list[str]:
         """Include permitted_values in serialization for EnumInput"""
         base_fields = super()._get_serializable_fields()
-        # Ensure permitted_values is included
         if "permitted_values" not in base_fields:
             base_fields.append("permitted_values")
         return base_fields
@@ -106,12 +104,13 @@ def check_permitted(self) -> EnumInput:
         if self.user is None or self.user in self.permitted_values:
             return self
         self._raise_exception_on_loc(
-            'ValueError',
-            type='inclusion',
-            loc='user',
-            msg=f"Value error, {self.user} should be in {self.permitted_values}"
+            "ValueError",
+            type="inclusion",
+            loc="user",
+            msg=f"Value error, {self.user} should be in {self.permitted_values}",
         )
 
+
 class FloatInput(Input):
     """Input representing a float"""
 
@@ -133,21 +132,23 @@ def _get_serializable_fields(self) -> list[str]:
     @model_validator(mode="after")
     def check_min_max(self) -> FloatInput:
         if not isinstance(self.user, float):
-            # We let pydantic handle the field validation
             return self
         if self.user is None or (self.user <= self.max and self.user >= self.min):
             return self
         self._raise_exception_on_loc(
-            'ValueError',
-            type='out_of_bounds',
-            loc='user',
-            msg=f"Value error, {self.user} should be between {self.min} and {self.max}"
+            "ValueError",
+            type="out_of_bounds",
+            loc="user",
+            msg=f"Value error, {self.user} should be between {self.min} and {self.max}",
         )
 
 
 class Inputs(Base):
     inputs: list[Input]
 
+    def __init__(self, **data):
+        super().__init__(**data)
+
     def __len__(self):
         return len(self.inputs)
 
@@ -157,30 +158,39 @@ def __iter__(self):
     def keys(self):
         return [input.key for input in self.inputs]
 
-    def is_valid_update(self, key_vals: dict) -> dict:
+    def get_input_by_key(self, key: str) -> Optional[Input]:
+        """Get input by its key"""
+        for input_obj in self.inputs:
+            if input_obj.key == key:
+                return input_obj
+        return None
+
+    def is_valid_update(self, key_vals: dict) -> dict[str, WarningCollector]:
         """
-        Returns a dict of input keys and errors when errors were found
+        Returns a dict mapping input keys to their WarningCollectors when errors were found.
         """
-        warnings = {}
-        for input in self.inputs:
-            if input.key in key_vals:
-                input_warn = input.is_valid_update(key_vals[input.key])
-                if len(input_warn) > 0:
-                    warnings[input.key] = input_warn
+        warnings: dict[str, WarningCollector] = {}
+        input_map = {inp.key: inp for inp in self.inputs}
+
+        for key, value in key_vals.items():
+            input_obj = input_map.get(key)
+            if input_obj is None:
+                warnings[key] = WarningCollector.with_warning(key, "Key does not exist")
+                continue
 
-        non_existent_keys = set(key_vals.keys()) - set(self.keys())
-        for key in non_existent_keys:
-            warnings[key] = "Key does not exist"
+            input_warnings = input_obj.is_valid_update(value)
+            if len(input_warnings) > 0:
+                warnings[key] = input_warnings
 
         return warnings
 
     def update(self, key_vals: dict):
         """
-        Update the values of certain inputs
+        Update the values of certain inputs.
         """
-        for input in self.inputs:
-            if input.key in key_vals:
-                input.user = key_vals[input.key]
+        for input_obj in self.inputs:
+            if input_obj.key in key_vals:
+                input_obj.user = key_vals[input_obj.key]
 
     def _to_dataframe(self, columns="user", **kwargs) -> pd.DataFrame:
         """
@@ -190,7 +200,6 @@ def _to_dataframe(self, columns="user", **kwargs) -> pd.DataFrame:
             columns = [columns]
         columns = ["unit"] + columns
 
-        # Create DataFrame from inputs
         df = pd.DataFrame.from_dict(
             {
                 input.key: [getattr(input, key, None) for key in columns]
@@ -207,6 +216,6 @@ def from_json(cls, data) -> Inputs:
         inputs = [Input.from_json(item) for item in data.items()]
 
         collection = cls.model_validate({"inputs": inputs})
-        collection._merge_submodel_warnings(*inputs, key_attr='key')
+        collection._merge_submodel_warnings(*inputs, key_attr="key")
 
         return collection
diff --git a/src/pyetm/models/output_curves.py b/src/pyetm/models/output_curves.py
index 83a1a14..31b9bcb 100644
--- a/src/pyetm/models/output_curves.py
+++ b/src/pyetm/models/output_curves.py
@@ -3,10 +3,12 @@
 import pandas as pd
 from pathlib import Path
 from typing import Optional
+import os
 
 import yaml
 from pyetm.clients import BaseClient
 from pyetm.models.base import Base
+from pyetm.models.warnings import WarningCollector
 from pyetm.config.settings import get_settings
 from pyetm.services.scenario_runners.fetch_output_curves import (
     DownloadOutputCurveRunner,
@@ -14,6 +16,18 @@
 )
 
 
+# Small LRU cache for reading CSVs from disk. Uses mtime to invalidate when file changes.
+def _read_csv_cached(path: Path) -> pd.DataFrame:
+    return _read_csv_cached_impl(str(path), os.path.getmtime(path))
+
+
+# TODO determine appropriate maxsize
+@lru_cache(maxsize=64)
+def _read_csv_cached_impl(path_str: str, mtime: float) -> pd.DataFrame:
+    df = pd.read_csv(path_str, index_col=0)
+    return df.dropna(how="all")
+
+
 class OutputCurveError(Exception):
     """Base carrier curve error"""
 
@@ -33,18 +47,26 @@ class OutputCurve(Base):
     def available(self) -> bool:
         return bool(self.file_path)
 
-    def retrieve(self, client, scenario) -> Optional[pd.DataFrame]:
+    def retrieve(
+        self, client, scenario, force_refresh: bool = False
+    ) -> Optional[pd.DataFrame]:
         """Process curve from client, save to file, set file_path"""
         file_path = (
             get_settings().path_to_tmp(str(scenario.id))
             / f"{self.key.replace('/','-')}.csv"
         )
 
-        # TODO: Examine the caching situation in the future if time permits: could be particularly
-        # relevant for bulk processing
-        # if file_path.is_file():
-        #     self.file_path = file_path
-        #     return self.contents()
+        # Reuse a cached file if present unless explicitly refreshing.
+        if not force_refresh and file_path.is_file():
+            self.file_path = file_path
+            try:
+                return _read_csv_cached(self.file_path)
+            except Exception as e:
+                # Fall through to re-download on cache read failure
+                self.add_warning(
+                    "file_path",
+                    f"Failed to read cached curve file for {self.key}: {e}; refetching",
+                )
         try:
             result = DownloadOutputCurveRunner.run(client, scenario, self.key)
             if result.success:
@@ -59,27 +81,31 @@ def retrieve(self, client, scenario) -> Optional[pd.DataFrame]:
 
                 except Exception as e:
                     self.add_warning(
-                        'data',
-                        f"Failed to process curve data for {self.key}: {e}"
+                        "data", f"Failed to process curve data for {self.key}: {e}"
                     )
                     return None
 
         except Exception as e:
             # Unexpected error - add warning
-            self.add_warning('base', f"Unexpected error retrieving curve {self.key}: {e}")
+            self.add_warning(
+                "base", f"Unexpected error retrieving curve {self.key}: {e}"
+            )
             return None
 
     def contents(self) -> Optional[pd.DataFrame]:
         """Open file from path and return contents"""
         if not self.available():
-            self.add_warning('file_path', f"Curve {self.key} not available - no file path set")
+            self.add_warning(
+                "file_path", f"Curve {self.key} not available - no file path set"
+            )
             return None
 
         try:
-            df = pd.read_csv(self.file_path, index_col=0)
-            return df.dropna(how="all")
+            return _read_csv_cached(self.file_path)
         except Exception as e:
-            self.add_warning('file_path', f"Failed to read curve file for {self.key}: {e}")
+            self.add_warning(
+                "file_path", f"Failed to read curve file for {self.key}: {e}"
+            )
             return None
 
     def remove(self) -> bool:
@@ -92,7 +118,9 @@ def remove(self) -> bool:
             self.file_path = None
             return True
         except Exception as e:
-            self.add_warning('file_path', f"Failed to remove curve file for {self.key}: {e}")
+            self.add_warning(
+                "file_path", f"Failed to remove curve file for {self.key}: {e}"
+            )
             return False
 
     @classmethod
@@ -109,8 +137,8 @@ def from_json(cls, data: dict) -> OutputCurve:
                 "key": data.get("key", "unknown"),
                 "type": data.get("type", "unknown"),
             }
-            curve = cls.model_validate(basic_data)
-            curve.add_warning('base', f"Failed to create curve from data: {e}")
+            curve = cls.model_construct(**basic_data)
+            curve.add_warning("base", f"Failed to create curve from data: {e}")
             return curve
 
 
@@ -135,19 +163,27 @@ def get_contents(self, scenario, curve_name: str) -> Optional[pd.DataFrame]:
         curve = self._find(curve_name)
 
         if not curve:
-            self.add_warning('curves', f"Curve {curve_name} not found in collection")
+            self.add_warning("curves", f"Curve {curve_name} not found in collection")
             return None
 
         if not curve.available():
-            # Try to retrieve it
+            # Try to attach a cached file from disk first
+            expected_path = (
+                get_settings().path_to_tmp(str(scenario.id))
+                / f"{curve.key.replace('/', '-')}.csv"
+            )
+            if expected_path.is_file():
+                curve.file_path = expected_path
+                contents = curve.contents()
+                self._merge_submodel_warnings(curve, key_attr="key")
+                return contents
+
             result = curve.retrieve(BaseClient(), scenario)
-            # Merge any warnings from the curve retrieval
-            self._merge_submodel_warnings(curve)
+            self._merge_submodel_warnings(curve, key_attr="key")
             return result
         else:
             contents = curve.contents()
-            # Merge any warnings from reading contents
-            self._merge_submodel_warnings(curve)
+            self._merge_submodel_warnings(curve, key_attr="key")
             return contents
 
     @staticmethod
@@ -188,23 +224,13 @@ def get_curves_by_carrier_type(
         Returns:
             Dictionary mapping curve names to DataFrames
         """
-        carrier_mapping = {
-            "electricity": ["merit_order", "electricity_price", "residual_load"],
-            "heat": [
-                "heat_network",
-                "agriculture_heat",
-                "household_heat",
-                "buildings_heat",
-            ],
-            "hydrogen": ["hydrogen", "hydrogen_integral_cost"],
-            "methane": ["network_gas"],
-        }
+        carrier_mapping = self._load_carrier_mappings()
 
         if carrier_type not in carrier_mapping:
             valid_types = ", ".join(carrier_mapping.keys())
             self.add_warning(
-                'carrier_type',
-                f"Invalid carrier type '{carrier_type}'. Valid types: {valid_types}"
+                "carrier_type",
+                f"Invalid carrier type '{carrier_type}'. Valid types: {valid_types}",
             )
             return {}
 
@@ -225,25 +251,22 @@ def from_json(cls, data: list[dict]) -> OutputCurves:
         Initialize OutputCurves collection from JSON data
         """
         curves = []
-        collection_warnings = {}
 
         for curve_data in data:
             try:
-                key = curve_data['key']
                 curve = OutputCurve.from_json(curve_data)
                 curves.append(curve)
             except Exception as e:
-                # Log the problematic curve but continue processing
-                collection_warnings[f"OutputCurve(key={key})"] = f"Skipped invalid curve data: {e}"
+                # Create a basic curve and continue processing
+                key = curve_data.get("key", "unknown")
+                basic_curve = OutputCurve.model_construct(key=key, type="unknown")
+                basic_curve.add_warning(key, f"Skipped invalid curve data: {e}")
+                curves.append(basic_curve)
 
         collection = cls.model_validate({"curves": curves})
 
-        # Add any collection-level warnings
-        for loc, msg in collection_warnings.items():
-            collection.add_warning(loc, msg)
-
         # Merge warnings from individual curves
-        collection._merge_submodel_warnings(*curves, key_attr='key')
+        collection._merge_submodel_warnings(*curves, key_attr="key")
 
         return collection
 
@@ -255,7 +278,7 @@ def from_service_result(
         if not service_result.success or not service_result.data:
             empty_curves = cls(curves=[])
             for error in service_result.errors:
-                empty_curves.add_warning('base', f"Service error: {error}")
+                empty_curves.add_warning("base", f"Service error: {error}")
             return empty_curves
 
         curves_list = []
@@ -281,17 +304,18 @@ def from_service_result(
                 curves_list.append(curve)
 
             except Exception as e:
-                curves_list.append(
-                    OutputCurve.model_validate({"key": curve_name, "type": "unknown"})
+                basic_curve = OutputCurve.model_construct(
+                    key=curve_name, type="unknown"
                 )
-                curves_list[-1].add_warning('base', f"Failed to process curve data: {e}")
+                basic_curve.add_warning("base", f"Failed to process curve data: {e}")
+                curves_list.append(basic_curve)
 
         curves_collection = cls(curves=curves_list)
 
         for error in service_result.errors:
-            curves_collection.add_warning('base', f"Download warning: {error}")
+            curves_collection.add_warning("base", f"Download warning: {error}")
 
-        curves_collection._merge_submodel_warnings(curves_list, key_attr='key')
+        curves_collection._merge_submodel_warnings(*curves_list, key_attr="key")
 
         return curves_collection
 
diff --git a/src/pyetm/models/packables/custom_curves_pack.py b/src/pyetm/models/packables/custom_curves_pack.py
new file mode 100644
index 0000000..529655a
--- /dev/null
+++ b/src/pyetm/models/packables/custom_curves_pack.py
@@ -0,0 +1,61 @@
+import logging
+from typing import ClassVar, Any
+import pandas as pd
+from pyetm.models.custom_curves import CustomCurves
+from pyetm.models.packables.packable import Packable
+
+logger = logging.getLogger(__name__)
+
+
+class CustomCurvesPack(Packable):
+    key: ClassVar[str] = "custom_curves"
+    sheet_name: ClassVar[str] = "CUSTOM_CURVES"
+
+    def _build_dataframe_for_scenario(self, scenario: Any, columns: str = "", **kwargs):
+        try:
+            series_list = list(scenario.custom_curves_series())
+        except Exception as e:
+            logger.warning(
+                "Failed extracting custom curves for %s: %s", scenario.identifier(), e
+            )
+            return None
+        if not series_list:
+            return None
+        return pd.concat(series_list, axis=1)
+
+    def _to_dataframe(self, columns="", **kwargs) -> pd.DataFrame:
+        return self.build_pack_dataframe(columns=columns, **kwargs)
+
+    def _normalize_curves_dataframe(self, df: pd.DataFrame) -> pd.DataFrame:
+        return self._normalize_single_header_sheet(
+            df,
+            helper_columns={"sortables"},
+            drop_empty=True,
+            reset_index=True,
+        )
+
+    def from_dataframe(self, df: pd.DataFrame):
+        if df is None or getattr(df, "empty", False):
+            return
+        try:
+            df = self._normalize_curves_dataframe(df)
+        except Exception as e:
+            logger.warning("Failed to normalize custom curves sheet: %s", e)
+            return
+        if df is None or df.empty:
+            return
+
+        def _apply(scenario, block: pd.DataFrame):
+            try:
+                curves = CustomCurves._from_dataframe(block, scenario_id=scenario.id)
+            except Exception as e:
+                logger.warning(
+                    "Failed to build custom curves for '%s': %s",
+                    scenario.identifier(),
+                    e,
+                )
+                return
+            scenario.update_custom_curves(curves)
+
+        for scenario in self.scenarios:
+            _apply(scenario, df)
diff --git a/src/pyetm/models/packables/inputs_pack.py b/src/pyetm/models/packables/inputs_pack.py
new file mode 100644
index 0000000..111e4c9
--- /dev/null
+++ b/src/pyetm/models/packables/inputs_pack.py
@@ -0,0 +1,424 @@
+import logging
+from typing import ClassVar, Dict, Any, List, Set
+import pandas as pd
+from pyetm.models.packables.packable import Packable
+
+logger = logging.getLogger(__name__)
+
+
+class InputsPack(Packable):
+    key: ClassVar[str] = "inputs"
+    sheet_name: ClassVar[str] = "SLIDER_SETTINGS"
+
+    def __init__(self, **data):
+        super().__init__(**data)
+        self._scenario_short_names: Dict[str, str] = {}
+
+    def set_scenario_short_names(self, scenario_short_names: Dict[str, str]):
+        """Set mapping of scenario IDs to short names for display purposes."""
+        self._scenario_short_names = scenario_short_names or {}
+
+    def _get_scenario_display_key(self, scenario: "Any") -> Any:
+        """Get the display key for a scenario (short name, identifier, or ID)."""
+        short_name = self._scenario_short_names.get(str(scenario.id))
+        if short_name:
+            return short_name
+
+        try:
+            identifier = scenario.identifier()
+            if isinstance(identifier, (str, int)):
+                return identifier
+        except Exception:
+            pass
+
+        return scenario.id
+
+    def resolve_scenario(self, label: Any):
+        """Resolve a scenario from various label formats (short name, identifier, or numeric ID)."""
+        if label is None:
+            return None
+
+        label_str = str(label).strip()
+
+        # Try short name first
+        for scenario in self.scenarios:
+            if self._scenario_short_names.get(str(scenario.id)) == label_str:
+                return scenario
+
+        # Identifier/title
+        found_scenario = super().resolve_scenario(label_str)
+        if found_scenario is not None:
+            return found_scenario
+
+        # Try numeric ID as fallback
+        try:
+            numeric_id = int(float(label_str))
+            for scenario in self.scenarios:
+                if scenario.id == numeric_id:
+                    return scenario
+        except (ValueError, TypeError):
+            pass
+
+        return None
+
+    def _extract_input_values(self, scenario, field_name: str) -> Dict[str, Any]:
+        """Extract input values for a specific field from a scenario."""
+        values = self._extract_from_input_objects(scenario, field_name)
+        if values:
+            return values
+
+        return self._extract_from_dataframe(scenario, field_name)
+
+    def _extract_from_input_objects(self, scenario, field_name: str) -> Dict[str, Any]:
+        """Extract values by iterating through scenario input objects."""
+        try:
+            values = {}
+            for input_obj in scenario.inputs:
+                key = getattr(input_obj, "key", None)
+                if key is None:
+                    continue
+
+                value = getattr(input_obj, field_name, None)
+                values[str(key)] = value
+
+            return values if values else {}
+        except Exception:
+            return {}
+
+    def _extract_from_dataframe(self, scenario, field_name: str) -> Dict[str, Any]:
+        """Extract values from scenario inputs DataFrame."""
+        try:
+            df = scenario.inputs.to_dataframe(columns=field_name)
+        except Exception:
+            return {}
+
+        if df is None or getattr(df, "empty", False):
+            return {}
+
+        # Handle MultiIndex (drop 'unit' level if present)
+        df = self._normalize_dataframe_index(df)
+        series = self._dataframe_to_series(df, field_name)
+        if series is None:
+            return {}
+
+        series.index = series.index.map(str)
+        return series.to_dict()
+
+    def _normalize_dataframe_index(self, df: pd.DataFrame) -> pd.DataFrame:
+        """Remove 'unit' level from MultiIndex if present."""
+        if isinstance(df.index, pd.MultiIndex) and "unit" in (df.index.names or []):
+            df = df.copy()
+            df.index = df.index.droplevel("unit")
+        return df
+
+    def _dataframe_to_series(self, df: pd.DataFrame, field_name: str) -> pd.Series:
+        """Convert DataFrame to Series, selecting appropriate column."""
+        if isinstance(df, pd.Series):
+            return df
+        columns_lower = {str(col).lower(): col for col in df.columns}
+        for candidate in (field_name, "user", "value", "default"):
+            if candidate in columns_lower:
+                return df[columns_lower[candidate]]
+        return df.iloc[:, 0]
+
+    def _build_consolidated_dataframe(
+        self, field_mappings: Dict[Any, List[str]]
+    ) -> pd.DataFrame:
+        """Build DataFrame with different fields per scenario."""
+        if not self.scenarios:
+            return pd.DataFrame()
+        relevant_scenarios = {s for s in self.scenarios if s in field_mappings}
+        if not relevant_scenarios:
+            return pd.DataFrame()
+        all_input_keys = self._collect_all_input_keys(
+            relevant_scenarios, field_mappings
+        )
+        if not all_input_keys:
+            return pd.DataFrame()
+        sorted_keys = sorted(all_input_keys)
+
+        scenario_frames = []
+        scenario_labels = []
+
+        for scenario in relevant_scenarios:
+            scenario_label = self._get_scenario_display_key(scenario)
+            fields = field_mappings.get(scenario, ["user"]) or ["user"]
+
+            scenario_data = self._build_scenario_data(scenario, fields, sorted_keys)
+            if not scenario_data:
+                continue
+
+            scenario_df = pd.DataFrame(scenario_data, index=sorted_keys)
+            scenario_df.index.name = "input"
+            scenario_frames.append(scenario_df)
+            scenario_labels.append(scenario_label)
+
+        if not scenario_frames:
+            return pd.DataFrame()
+
+        return pd.concat(
+            scenario_frames, axis=1, keys=scenario_labels, names=["scenario", "field"]
+        )
+
+    def _collect_all_input_keys(
+        self, scenarios: Set[Any], field_mappings: Dict[Any, List[str]]
+    ) -> Set[str]:
+        """Collect all unique input keys across scenarios and fields."""
+        all_keys = set()
+        for scenario in scenarios:
+            fields = field_mappings.get(scenario, ["user"]) or ["user"]
+            for field in fields:
+                input_values = self._extract_input_values(scenario, field)
+                all_keys.update(input_values.keys())
+        return all_keys
+
+    def _build_scenario_data(
+        self, scenario, fields: List[str], sorted_keys: List[str]
+    ) -> Dict[str, List[Any]]:
+        """Build data dictionary for a single scenario across multiple fields."""
+        data = {}
+        for field in fields:
+            value_mapping = self._extract_input_values(scenario, field) or {}
+            data[field] = [value_mapping.get(key) for key in sorted_keys]
+        return data
+
+    def _build_simple_dataframe(self, field_name: str = "user") -> pd.DataFrame:
+        """Build simple DataFrame with one field per scenario."""
+        if not self.scenarios:
+            return pd.DataFrame()
+
+        all_input_keys = set()
+        scenario_data = {}
+
+        # Collect data from all scenarios
+        for scenario in self.scenarios:
+            scenario_label = self._get_scenario_display_key(scenario)
+            input_values = self._extract_input_values(scenario, field_name)
+
+            if not input_values:
+                continue
+
+            scenario_data[scenario_label] = input_values
+            all_input_keys.update(input_values.keys())
+
+        if not all_input_keys:
+            return pd.DataFrame()
+
+        # Build DataFrame
+        sorted_keys = sorted(all_input_keys)
+        data = {}
+        for scenario_label, values in scenario_data.items():
+            data[scenario_label] = [values.get(key) for key in sorted_keys]
+
+        df = pd.DataFrame(data, index=sorted_keys)
+        df.index.name = "input"
+        return df
+
+    def _build_bounds_dataframe(self) -> pd.DataFrame:
+        """Build DataFrame with min/max bounds (assumes identical across scenarios)."""
+        if not self.scenarios:
+            return pd.DataFrame()
+
+        # Collect all input keys
+        all_input_keys = set()
+        for scenario in self.scenarios:
+            try:
+                keys = [
+                    str(getattr(inp, "key", ""))
+                    for inp in scenario.inputs
+                    if getattr(inp, "key", None)
+                ]
+            except Exception:
+                try:
+                    df = scenario.inputs.to_dataframe(columns=["min", "max"])
+                    df = self._normalize_dataframe_index(df)
+                    keys = [str(idx) for idx in df.index.unique()]
+                except Exception:
+                    keys = []
+
+            all_input_keys.update(key for key in keys if key)
+
+        if not all_input_keys:
+            return pd.DataFrame()
+
+        sorted_keys = sorted(all_input_keys)
+
+        min_values = {}
+        max_values = {}
+
+        for scenario in self.scenarios:
+            min_mapping = self._extract_input_values(scenario, "min") or {}
+            max_mapping = self._extract_input_values(scenario, "max") or {}
+
+            for key in sorted_keys:
+                if key not in min_values and key in min_mapping:
+                    min_values[key] = min_mapping[key]
+                if key not in max_values and key in max_mapping:
+                    max_values[key] = max_mapping[key]
+
+            if len(min_values) == len(sorted_keys) and len(max_values) == len(
+                sorted_keys
+            ):
+                break
+
+        data = {
+            ("", "min"): [min_values.get(key) for key in sorted_keys],
+            ("", "max"): [max_values.get(key) for key in sorted_keys],
+        }
+        df = pd.DataFrame(data, index=sorted_keys)
+        df.index.name = "input"
+        df.columns = pd.MultiIndex.from_tuples(df.columns, names=["scenario", "field"])
+        return df
+
+    def _to_dataframe(self, columns: str = "user", **kwargs) -> pd.DataFrame:
+        """Build DataFrame with specified field for all scenarios."""
+        if not isinstance(columns, str) or columns.strip() == "":
+            columns = "user"
+        return self._build_simple_dataframe(columns)
+
+    def to_dataframe_per_scenario_fields(
+        self, fields_map: Dict["Any", List[str]]
+    ) -> pd.DataFrame:
+        """Build DataFrame where each scenario may have different fields."""
+        return self._build_consolidated_dataframe(fields_map)
+
+    def to_dataframe_defaults(self) -> pd.DataFrame:
+        """Build DataFrame of default values for each input per scenario."""
+        return self._build_simple_dataframe("default")
+
+    def to_dataframe_min_max(self) -> pd.DataFrame:
+        """Build DataFrame with min/max bounds (shared across scenarios)."""
+        return self._build_bounds_dataframe()
+
+    def from_dataframe(self, df):
+        """Import input values from DataFrame."""
+        if df is None or getattr(df, "empty", False):
+            return
+
+        try:
+            df = df.dropna(how="all")
+            if df.empty:
+                return
+
+            header_positions = self.first_non_empty_row_positions(df, 1)
+            if not header_positions:
+                return
+
+            header_row_index = header_positions[0]
+            header_row = df.iloc[header_row_index].astype(str)
+
+            # Extract data rows
+            data_df = df.iloc[header_row_index + 1 :].copy()
+            data_df.columns = header_row.values
+
+            if data_df.empty or len(data_df.columns) < 2:
+                return
+
+            # Process input data
+            input_column = data_df.columns[0]
+            input_keys = data_df[input_column].astype(str).str.strip()
+
+            # Filter out empty input keys
+            valid_mask = input_keys != ""
+            data_df = data_df.loc[valid_mask]
+            input_keys = input_keys.loc[valid_mask]
+            data_df.index = input_keys
+
+            # Process each scenario column
+            scenario_columns = [col for col in data_df.columns if col != input_column]
+
+            for column_name in scenario_columns:
+                scenario = self.resolve_scenario(column_name)
+                if scenario is None:
+                    logger.warning(
+                        "Could not find scenario for SLIDER_SETTINGS column label '%s'",
+                        column_name,
+                    )
+                    continue
+
+                column_data = data_df[column_name]
+
+                # Filter out blank values
+                updates = {
+                    key: value
+                    for key, value in column_data.items()
+                    if not self._is_blank_value(value)
+                }
+
+                if not updates:
+                    continue
+                try:
+                    scenario.update_user_values(updates)
+                except Exception as e:
+                    logger.warning(
+                        "Failed updating inputs for scenario '%s' from column '%s': %s",
+                        scenario.identifier(),
+                        column_name,
+                        e,
+                    )
+                finally:
+                    self._log_scenario_input_warnings(scenario)
+
+        except Exception as e:
+            logger.warning("Failed to parse simplified SLIDER_SETTINGS sheet: %s", e)
+
+    def _is_blank_value(self, value: Any) -> bool:
+        """Check if a value should be considered blank/empty."""
+        if value is None:
+            return True
+        if isinstance(value, float) and pd.isna(value):
+            return True
+        if isinstance(value, str) and value.strip().lower() in {"", "nan"}:
+            return True
+        return False
+
+    def build_combined_dataframe(
+        self, include_defaults: bool = False, include_min_max: bool = False
+    ) -> pd.DataFrame:
+        """Build DataFrame with various field combinations based on flags."""
+        if not self.scenarios:
+            return pd.DataFrame()
+
+        # Determine what fields we need
+        fields = ["user"]
+        if include_defaults:
+            fields.append("default")
+
+        if fields == ["user"]:
+            return self._build_simple_dataframe("user")
+        elif fields == ["default"]:
+            return self._build_simple_dataframe("default")
+        elif include_min_max and not include_defaults:
+            return self._build_user_with_bounds_dataframe()
+        elif include_min_max and include_defaults:
+            return self._build_full_combined_dataframe()
+        else:
+            field_map = {scenario: fields for scenario in self.scenarios}
+            return self._build_consolidated_dataframe(field_map)
+
+    def _build_full_combined_dataframe(self) -> pd.DataFrame:
+        """Build DataFrame with user values, defaults, and min/max bounds."""
+        try:
+            field_map = {scenario: ["user", "default"] for scenario in self.scenarios}
+            df_core = self._build_consolidated_dataframe(field_map)
+            df_bounds = self._build_bounds_dataframe()
+
+            if not df_bounds.empty and not df_core.empty:
+                return pd.concat([df_bounds, df_core], axis=1)
+            elif not df_core.empty:
+                return df_core
+            else:
+                return df_bounds
+        except Exception:
+            pass
+
+    def _log_scenario_input_warnings(self, scenario):
+        """Log any warnings from scenario inputs if available."""
+        try:
+            if hasattr(scenario, "_inputs") and scenario._inputs is not None:
+                scenario._inputs.log_warnings(
+                    logger,
+                    prefix=f"Inputs warning for '{scenario.identifier()}'",
+                )
+        except Exception:
+            pass
diff --git a/src/pyetm/models/packables/output_curves_pack.py b/src/pyetm/models/packables/output_curves_pack.py
new file mode 100644
index 0000000..7aaf950
--- /dev/null
+++ b/src/pyetm/models/packables/output_curves_pack.py
@@ -0,0 +1,134 @@
+import logging
+from typing import ClassVar, Any, Optional, Sequence, Tuple
+from xlsxwriter import Workbook
+from pyetm.models.output_curves import OutputCurves
+import pandas as pd
+from pyetm.models.packables.packable import Packable
+from pyetm.utils.excel import add_frame
+
+logger = logging.getLogger(__name__)
+
+
+class OutputCurvesPack(Packable):
+    key: ClassVar[str] = "output_curves"
+    sheet_name: ClassVar[str] = "OUTPUT_CURVES"
+
+    def _build_dataframe_for_scenario(self, scenario: Any, columns: str = "", **kwargs):
+        try:
+            series_list = list(scenario.all_output_curves())
+            try:
+                if (
+                    hasattr(scenario, "_output_curves")
+                    and scenario._output_curves is not None
+                ):
+                    scenario._output_curves.log_warnings(
+                        logger,
+                        prefix=f"Output curves warning for '{scenario.identifier()}'",
+                    )
+            except Exception:
+                pass
+        except Exception as e:
+            logger.warning(
+                "Failed extracting output curves for %s: %s", scenario.identifier(), e
+            )
+            return None
+        if not series_list:
+            return None
+        return pd.concat(series_list, axis=1)
+
+    def _to_dataframe(self, columns="", **kwargs) -> pd.DataFrame:
+        return self.build_pack_dataframe(columns=columns, **kwargs)
+
+    def to_excel_per_carrier(
+        self, path: str, carriers: Optional[Sequence[str]] = None
+    ) -> None:
+
+        # Determine carrier selection
+        carrier_map = OutputCurves._load_carrier_mappings()
+        valid_carriers = list(carrier_map.keys())
+        selected = list(valid_carriers if carriers is None else carriers)
+        selected = [c for c in selected if c in valid_carriers]
+        if not selected:
+            selected = valid_carriers
+
+        # Nothing to do without scenarios
+        if not self.scenarios:
+            return
+
+        wrote_any = False
+        workbook = None
+        try:
+            # Sort scenarios for deterministic sheet layout
+            scenarios_sorted = sorted(self.scenarios, key=lambda s: s.id)
+
+            for carrier in selected:
+                series_entries: list[Tuple[Tuple[str, str], pd.Series]] = []
+
+                for scenario in scenarios_sorted:
+                    # Scenario label
+                    try:
+                        scenario_name = str(scenario.identifier())
+                    except Exception:
+                        scenario_name = str(getattr(scenario, "id", "scenario"))
+
+                    # Fetch curves mapping safely
+                    curves = None
+                    if hasattr(scenario, "get_output_curves") and callable(
+                        getattr(scenario, "get_output_curves")
+                    ):
+                        try:
+                            curves = scenario.get_output_curves(carrier)
+                        except Exception:
+                            curves = None
+                    if not isinstance(curves, dict) or not curves:
+                        continue
+
+                    for curve_name, df in curves.items():
+                        if df is None:
+                            continue
+                        try:
+                            if isinstance(df, pd.Series):
+                                s = df.copy()
+                                series_entries.append(((scenario_name, curve_name), s))
+                            elif isinstance(df, pd.DataFrame):
+                                if df.empty:
+                                    continue
+                                if df.shape[1] == 1:
+                                    s = df.iloc[:, 0].copy()
+                                    series_entries.append(
+                                        ((scenario_name, curve_name), s)
+                                    )
+                                else:
+                                    for col in df.columns:
+                                        s = df[col].copy()
+                                        sub_curve = f"{curve_name}:{col}"
+                                        series_entries.append(
+                                            ((scenario_name, sub_curve), s)
+                                        )
+                        except Exception:
+                            continue
+
+                if not series_entries:
+                    continue
+
+                cols: list[Tuple[str, str]] = [key for key, _ in series_entries]
+                frames = [s for _, s in series_entries]
+                combined = pd.concat(frames, axis=1)
+                combined.columns = pd.MultiIndex.from_tuples(
+                    cols, names=["Scenario", "Curve"]
+                )
+
+                # Lazily create the workbook on first real data
+                if workbook is None:
+                    workbook = Workbook(str(path))
+                add_frame(
+                    name=carrier.upper(),
+                    frame=combined,
+                    workbook=workbook,
+                    column_width=18,
+                    scenario_styling=True,
+                )
+                wrote_any = True
+        finally:
+            if workbook is not None and wrote_any:
+                workbook.close()
diff --git a/src/pyetm/models/packables/packable.py b/src/pyetm/models/packables/packable.py
new file mode 100644
index 0000000..6b2fdfc
--- /dev/null
+++ b/src/pyetm/models/packables/packable.py
@@ -0,0 +1,215 @@
+from typing import ClassVar, Set, Callable, Optional, Dict, Any
+import logging
+import pandas as pd
+from pydantic import BaseModel, Field
+
+from pyetm.models.scenario import Scenario
+
+logger = logging.getLogger(__name__)
+
+
+class Packable(BaseModel):
+    scenarios: Set["Scenario"] = Field(default_factory=set)
+    key: ClassVar[str] = "base_pack"
+    sheet_name: ClassVar[str] = "SHEET"
+
+    _scenario_id_cache: Dict[str, "Scenario"] | None = None
+
+    def add(self, *scenarios):
+        "Adds one or more scenarios to the packable"
+        if not scenarios:
+            return
+        self.scenarios.update(scenarios)
+        self._scenario_id_cache = None
+
+    def discard(self, scenario):
+        "Removes a scenario from the pack"
+        self.scenarios.discard(scenario)
+        self._scenario_id_cache = None
+
+    def clear(self):
+        self.scenarios.clear()
+        self._scenario_id_cache = None
+
+    def summary(self) -> dict:
+        return {self.key: {"scenario_count": len(self.scenarios)}}
+
+    def _key_for(self, scenario: "Scenario") -> Any:
+        """Return the identifier used as the top-level column key when packing.
+        Subclasses can override (e.g. to use short names)."""
+        return scenario.identifier()
+
+    def _build_dataframe_for_scenario(
+        self, scenario: "Scenario", columns: str = "", **kwargs
+    ) -> Optional[pd.DataFrame]:
+        return None
+
+    def _concat_frames(
+        self, frames: list[pd.DataFrame], keys: list[Any]
+    ) -> pd.DataFrame:
+        if not frames:
+            return pd.DataFrame()
+        return pd.concat(frames, axis=1, keys=keys)
+
+    def build_pack_dataframe(self, columns: str = "", **kwargs) -> pd.DataFrame:
+        frames: list[pd.DataFrame] = []
+        keys: list[Any] = []
+        for scenario in self.scenarios:
+            try:
+                df = self._build_dataframe_for_scenario(
+                    scenario, columns=columns, **kwargs
+                )
+            except Exception as e:
+                logger.warning(
+                    "Failed building frame for scenario %s in %s: %s",
+                    scenario.identifier(),
+                    self.__class__.__name__,
+                    e,
+                )
+                continue
+            if df is None or df.empty:
+                continue
+            frames.append(df)
+            keys.append(self._key_for(scenario))
+        return self._concat_frames(frames, keys)
+
+    def to_dataframe(self, columns="") -> pd.DataFrame:
+        """Convert the pack into a dataframe"""
+        if len(self.scenarios) == 0:
+            return pd.DataFrame()
+        return self._to_dataframe(columns=columns)
+
+    def from_dataframe(self, df):
+        """Should parse the df and call correct setters on identified scenarios"""
+        raise NotImplementedError
+
+    def _to_dataframe(self, columns="", **kwargs) -> pd.DataFrame:
+        """Base implementation - kids should implement this or use build_pack_dataframe"""
+        return pd.DataFrame()
+
+    def _refresh_cache(self):
+        self._scenario_id_cache = {str(s.identifier()): s for s in self.scenarios}
+
+    def _find_by_identifier(self, identifier: str):
+        ident_str = str(identifier)
+        if self._scenario_id_cache is None or len(self._scenario_id_cache) != len(
+            self.scenarios
+        ):
+            self._refresh_cache()
+        return self._scenario_id_cache.get(ident_str)
+
+    def resolve_scenario(self, label: Any) -> Optional["Scenario"]:
+        if label is None:
+            return None
+        return self._find_by_identifier(label)
+
+    @staticmethod
+    def is_blank(value: Any) -> bool:
+        return (
+            value is None
+            or (isinstance(value, float) and pd.isna(value))
+            or (isinstance(value, str) and value.strip() == "")
+        )
+
+    @staticmethod
+    def drop_all_blank(df: pd.DataFrame) -> pd.DataFrame:
+        if df is None:
+            return pd.DataFrame()
+        return df.dropna(how="all")
+
+    @staticmethod
+    def first_non_empty_row_positions(df: pd.DataFrame, count: int = 2) -> list[int]:
+        positions: list[int] = []
+        if df is None:
+            return positions
+        for idx, (_, row) in enumerate(df.iterrows()):
+            if not row.isna().all():
+                positions.append(idx)
+                if len(positions) >= count:
+                    break
+        return positions
+
+    def _log_fail(self, context: str, exc: Exception):
+        logger.warning("%s failed in %s: %s", context, self.__class__.__name__, exc)
+
+    def apply_identifier_blocks(
+        self,
+        df: pd.DataFrame,
+        apply_block: Callable[["Scenario", pd.DataFrame], None],
+        resolve: Optional[Callable[[Any], Optional["Scenario"]]] = None,
+    ):
+        if df is None or not isinstance(df.columns, pd.MultiIndex):
+            return
+        identifiers = df.columns.get_level_values(0).unique()
+        for identifier in identifiers:
+            scenario = (
+                resolve(identifier) if resolve else None
+            ) or self._find_by_identifier(identifier)
+            if scenario is None:
+                logger.warning(
+                    "Could not find scenario for identifier '%s' in %s",
+                    identifier,
+                    self.__class__.__name__,
+                )
+                continue
+            block = df[identifier]
+            try:
+                apply_block(scenario, block)
+            except Exception as e:
+                logger.warning(
+                    "Failed applying block for scenario '%s' in %s: %s",
+                    identifier,
+                    self.__class__.__name__,
+                    e,
+                )
+
+    def _normalize_single_header_sheet(
+        self,
+        df: pd.DataFrame,
+        *,
+        helper_columns: Optional[set[str]] = None,
+        drop_empty: bool = True,
+        reset_index: bool = False,
+    ) -> pd.DataFrame:
+        """Normalize a sheet that uses a single header row.
+        - First non-empty row becomes header.
+        - Subsequent rows are data.
+        - Optionally drop columns whose header is blank or in helper_columns.
+        - Optionally reset the row index.
+        Returns a DataFrame with a single-level column index.
+        """
+        helper_columns_lc = {h.lower() for h in (helper_columns or set())}
+        if df is None:
+            return pd.DataFrame()
+        df = df.dropna(how="all")
+        if df.empty:
+            return df
+
+        positions = self.first_non_empty_row_positions(df, 1)
+        if not positions:
+            return pd.DataFrame()
+        header_pos = positions[0]
+        header_row = df.iloc[header_pos].astype(str).map(lambda s: s.strip())
+        data = df.iloc[header_pos + 1 :].copy()
+        data.columns = header_row.values
+
+        def _is_blank(v):
+            return (
+                v is None
+                or (isinstance(v, float) and pd.isna(v))
+                or (isinstance(v, str) and v.strip() == "")
+            )
+
+        if drop_empty or helper_columns_lc:
+            keep = []
+            for c in data.columns:
+                if drop_empty and _is_blank(c):
+                    continue
+                if isinstance(c, str) and c.strip().lower() in helper_columns_lc:
+                    continue
+                keep.append(c)
+            data = data[keep]
+
+        if reset_index:
+            data.reset_index(drop=True, inplace=True)
+        return data
diff --git a/src/pyetm/models/packables/query_pack.py b/src/pyetm/models/packables/query_pack.py
new file mode 100644
index 0000000..b7a0094
--- /dev/null
+++ b/src/pyetm/models/packables/query_pack.py
@@ -0,0 +1,63 @@
+import logging
+from typing import ClassVar, Any
+
+import pandas as pd
+
+from pyetm.models.packables.packable import Packable
+
+logger = logging.getLogger(__name__)
+
+
+class QueryPack(Packable):
+    key: ClassVar[str] = "gquery"
+    sheet_name: ClassVar[str] = "GQUERIES"
+    output_sheet_name: ClassVar[str] = "GQUERIES_RESULTS"
+
+    def _build_dataframe_for_scenario(
+        self, scenario: Any, columns: str = "future", **kwargs
+    ):
+        try:
+            df = scenario.results(columns=columns)
+            try:
+                if hasattr(scenario, "_queries") and scenario._queries is not None:
+                    scenario._queries.log_warnings(
+                        logger,
+                        prefix=f"Queries warning for '{scenario.identifier()}'",
+                    )
+            except Exception:
+                pass
+            return df
+        except Exception as e:
+            logger.warning(
+                "Failed building gquery results for %s: %s", scenario.identifier(), e
+            )
+            return None
+
+    def _to_dataframe(self, columns="future", **kwargs) -> pd.DataFrame:
+        return self.build_pack_dataframe(columns=columns, **kwargs)
+
+    def from_dataframe(self, df: pd.DataFrame):
+        if df is None or df.empty:
+            return
+
+        first_col = df.iloc[:, 0].dropna().astype(str).str.strip()
+        filtered = [q for q in first_col if q and q.lower() != "nan"]
+        unique_queries = list(dict.fromkeys(filtered))
+
+        # Apply unique queries to all scenarios
+        if unique_queries:
+            for scenario in self.scenarios:
+                try:
+                    scenario.add_queries(unique_queries)
+                finally:
+                    try:
+                        if (
+                            hasattr(scenario, "_queries")
+                            and scenario._queries is not None
+                        ):
+                            scenario._queries.log_warnings(
+                                logger,
+                                prefix=f"Queries warning for '{scenario.identifier()}'",
+                            )
+                    except Exception:
+                        pass
diff --git a/src/pyetm/models/packables/sortable_pack.py b/src/pyetm/models/packables/sortable_pack.py
new file mode 100644
index 0000000..17d0651
--- /dev/null
+++ b/src/pyetm/models/packables/sortable_pack.py
@@ -0,0 +1,54 @@
+import logging
+from typing import ClassVar, Any
+import pandas as pd
+from pyetm.models.packables.packable import Packable
+
+logger = logging.getLogger(__name__)
+
+
+class SortablePack(Packable):
+    key: ClassVar[str] = "sortables"
+    sheet_name: ClassVar[str] = "SORTABLES"
+
+    def _build_dataframe_for_scenario(self, scenario: Any, columns: str = "", **kwargs):
+        try:
+            df = scenario.sortables.to_dataframe()
+        except Exception as e:
+            logger.warning(
+                "Failed extracting sortables for %s: %s", scenario.identifier(), e
+            )
+            return None
+        return df if not df.empty else None
+
+    def _to_dataframe(self, columns="", **kwargs) -> pd.DataFrame:
+        return self.build_pack_dataframe(columns=columns, **kwargs)
+
+    def _normalize_sortables_dataframe(self, df: pd.DataFrame) -> pd.DataFrame:
+        """Normalize a sortables sheet expecting a single header row."""
+        return self._normalize_single_header_sheet(
+            df,
+            helper_columns={"sortables"},
+            drop_empty=True,
+            reset_index=False,
+        )
+
+    def from_dataframe(self, df: pd.DataFrame):
+        """Unpack and update sortables for each scenario from the sheet."""
+        if df is None or getattr(df, "empty", False):
+            return
+        try:
+            df = self._normalize_sortables_dataframe(df)
+        except Exception as e:
+            logger.warning("Failed to normalize sortables sheet: %s", e)
+            return
+        if df is None or df.empty:
+            return
+
+        def _apply(scenario, block: pd.DataFrame):
+            scenario.set_sortables_from_dataframe(block)
+
+        if isinstance(df.columns, pd.MultiIndex):
+            self.apply_identifier_blocks(df, _apply)
+        else:
+            for scenario in self.scenarios:
+                _apply(scenario, df)
diff --git a/src/pyetm/models/scenario.py b/src/pyetm/models/scenario.py
index 879ad89..e25c53e 100644
--- a/src/pyetm/models/scenario.py
+++ b/src/pyetm/models/scenario.py
@@ -3,7 +3,9 @@
 from datetime import datetime
 from typing import Any, Dict, List, Optional, Set, Union
 from urllib.parse import urlparse
-from pydantic import Field, PrivateAttr, model_validator
+from pydantic import Field, PrivateAttr
+from os import PathLike
+from pyetm.models.couplings import Couplings
 from pyetm.models.inputs import Inputs
 from pyetm.models.output_curves import OutputCurves
 from pyetm.clients import BaseClient
@@ -11,6 +13,7 @@
 from pyetm.models.custom_curves import CustomCurves
 from pyetm.models.gqueries import Gqueries
 from pyetm.models.sortables import Sortables
+from pyetm.models.export_config import ExportConfig
 from pyetm.services.scenario_runners.fetch_inputs import FetchInputsRunner
 from pyetm.services.scenario_runners.fetch_metadata import FetchMetadataRunner
 from pyetm.services.scenario_runners.fetch_sortables import FetchSortablesRunner
@@ -18,8 +21,14 @@
     FetchAllCustomCurveDataRunner,
 )
 from pyetm.services.scenario_runners.update_inputs import UpdateInputsRunner
+from pyetm.services.scenario_runners.update_sortables import UpdateSortablesRunner
 from pyetm.services.scenario_runners.create_scenario import CreateScenarioRunner
 from pyetm.services.scenario_runners.update_metadata import UpdateMetadataRunner
+from pyetm.services.scenario_runners.update_custom_curves import (
+    UpdateCustomCurvesRunner,
+)
+from pyetm.services.scenario_runners.fetch_couplings import FetchCouplingsRunner
+from pyetm.services.scenario_runners.update_couplings import UpdateCouplingsRunner
 
 
 class ScenarioError(Exception):
@@ -41,6 +50,7 @@ class Scenario(Base):
     private: Optional[bool] = None
     area_code: str = Field(..., description="Area code")
     source: Optional[str] = None
+    title: Optional[str] = None
     metadata: Optional[Dict[str, Any]] = None
     start_year: Optional[int] = None
     scaling: Optional[Any] = None
@@ -53,6 +63,8 @@ class Scenario(Base):
     _custom_curves: Optional[CustomCurves] = PrivateAttr(default=None)
     _output_curves: Optional[OutputCurves] = PrivateAttr(default=None)
     _queries: Optional[Gqueries] = PrivateAttr(None)
+    _export_config: Optional[ExportConfig] = PrivateAttr(default=None)
+    _couplings: Optional[Couplings] = PrivateAttr(default=None)
 
     @classmethod
     def new(cls, area_code: str, end_year: int, **kwargs) -> "Scenario":
@@ -71,7 +83,7 @@ def new(cls, area_code: str, end_year: int, **kwargs) -> "Scenario":
         # parse into a Scenario
         scenario = cls.model_validate(result.data)
         for warning in result.errors:
-            scenario.add_warning('base', warning)
+            scenario.add_warning("base", warning)
 
         return scenario
 
@@ -91,9 +103,58 @@ def load(cls, scenario_id: int) -> Scenario:
         # parse into a Scenario
         scenario = cls.model_validate(result.data)
         for w in result.errors:
-            scenario.add_warning('metadata', w)
+            scenario.add_warning("metadata", w)
         return scenario
 
+    @classmethod
+    def from_excel(cls, xlsx_path: PathLike | str) -> List["Scenario"]:
+        """
+        Load or create one or more scenarios from an Excel workbook.
+        """
+        from pyetm.models.scenario_packer import ScenarioPacker
+        from pyetm.utils.paths import PyetmPaths
+
+        resolver = PyetmPaths()
+        path = resolver.resolve_for_read(xlsx_path, default_dir="inputs")
+
+        packer = ScenarioPacker.from_excel(str(path))
+        scenarios = list(packer._scenarios())
+        scenarios.sort(key=lambda s: s.id)
+        return scenarios
+
+    def to_excel(
+        self,
+        path: PathLike | str,
+        *others: "Scenario",
+        carriers: list[str] | None = None,
+        include_inputs: bool | None = None,
+        include_sortables: bool | None = None,
+        include_custom_curves: bool | None = None,
+        include_gqueries: bool | None = None,
+        include_output_curves: bool | None = None,
+    ) -> None:
+        """
+        Export this scenario – and optionally additional scenarios – to an Excel file.
+        Output curves are exported to a separate workbook only when enabled, with one
+        sheet per carrier. Use carriers to filter which carriers to include when exporting.
+        """
+
+        from pyetm.models.scenarios import Scenarios
+        from pyetm.utils.paths import PyetmPaths
+
+        resolver = PyetmPaths()
+        out_path = resolver.resolve_for_write(path, default_dir="outputs")
+
+        Scenarios(items=[self, *others]).to_excel(
+            str(out_path),
+            carriers=carriers,
+            include_inputs=include_inputs,
+            include_sortables=include_sortables,
+            include_custom_curves=include_custom_curves,
+            include_gqueries=include_gqueries,
+            include_output_curves=include_output_curves,
+        )
+
     def update_metadata(self, **kwargs) -> Dict[str, Any]:
         """
         Update metadata for this scenario.
@@ -105,7 +166,7 @@ def update_metadata(self, **kwargs) -> Dict[str, Any]:
 
         # Add any warnings from the update
         for w in result.errors:
-            self.add_warning('metadata', w)
+            self.add_warning("metadata", w)
 
         # Update the current scenario object with the server response
         if result.data and "scenario" in result.data:
@@ -114,6 +175,10 @@ def update_metadata(self, **kwargs) -> Dict[str, Any]:
                 if hasattr(self, field):
                     setattr(self, field, value)
 
+            for field, value in kwargs.items():
+                if hasattr(self, field) and field not in scenario_data:
+                    setattr(self, field, value)
+
         return result.data
 
     def __eq__(self, other: "Scenario"):
@@ -123,11 +188,48 @@ def __hash__(self):
         return hash((self.id, self.area_code, self.end_year))
 
     def _to_dataframe(self, **kwargs) -> pd.DataFrame:
-        return pd.DataFrame.from_dict(
-            self.model_dump(include={"end_year", "area_code", "private", "template"}),
-            orient="index",
-            columns=[self.id],
-        )
+        """
+        Return a single-column DataFrame describing this scenario
+        - Column name is the scenario_id for concatenation.
+        """
+        info: Dict[str, Any] = {
+            "title": self.title,
+            "scenario_id": self.id,
+            "template": self.template,
+            "area_code": self.area_code,
+            "start_year": self.start_year,
+            "end_year": self.end_year,
+            "keep_compatible": self.keep_compatible,
+            "private": self.private,
+            "source": self.source,
+            "url": self.url,
+            "version": self.version,
+            "created_at": self.created_at,
+            "updated_at": self.updated_at,
+        }
+
+        # Description from metadata (if present)
+        meta = self.metadata if isinstance(self.metadata, dict) else None
+        if meta is not None:
+            desc = meta.get("description")
+            if desc is not None:
+                info["description"] = desc
+
+        # Flatten remaining metadata keys
+        if meta is not None:
+            for k, v in meta.items():
+                if k == "description":
+                    continue
+                if k not in info:
+                    info[k] = v
+
+        return pd.DataFrame.from_dict(info, orient="index", columns=[self.id])
+
+    def identifier(self):
+        if self.title:
+            return self.title
+
+        return self.id
 
     def user_values(self) -> Dict[str, Any]:
         """
@@ -163,7 +265,8 @@ def inputs(self) -> Inputs:
         coll = Inputs.from_json(result.data)
         # merge runner warnings and any item‐level warnings
         for w in result.errors:
-            self.add_warning('inputs', w)
+            self.add_warning("inputs", w)
+        # Merge submodel warnings with a simple, clean prefix
         self._merge_submodel_warnings(coll)
 
         self._inputs = coll
@@ -174,9 +277,13 @@ def set_user_values_from_dataframe(self, dataframe: pd.DataFrame) -> None:
         Extract df to dict, set None/NaN sliders to reset, and call update_inputs.
         This ensures the dataframe exactly represents the inputs.
         """
-        self.update_user_values(
-            dataframe['user'].droplevel('unit').fillna("reset").to_dict()
-        )
+        series = dataframe["user"]
+        # If MultiIndex with 'unit', drop it
+        if isinstance(series.index, pd.MultiIndex) and "unit" in (
+            series.index.names or []
+        ):
+            series = series.droplevel("unit")
+        self.update_user_values(series.fillna("reset").to_dict())
 
     def update_user_values(self, update_inputs: Dict[str, Any]) -> None:
         """
@@ -185,8 +292,7 @@ def update_user_values(self, update_inputs: Dict[str, Any]) -> None:
         """
         # Update them in the Inputs object, and check validation
         validity_errors = self.inputs.is_valid_update(update_inputs)
-        if validity_errors:
-            raise ScenarioError(f"Could not update user values: {validity_errors}")
+        self._handle_validity_errors(validity_errors, "user values")
 
         result = UpdateInputsRunner.run(BaseClient(), self, update_inputs)
 
@@ -195,7 +301,6 @@ def update_user_values(self, update_inputs: Dict[str, Any]) -> None:
 
         self.inputs.update(update_inputs)
 
-
     def remove_user_values(self, input_keys: Union[List[str], Set[str]]) -> None:
         """
         Remove user values for specified inputs, resetting them to default values.
@@ -212,7 +317,6 @@ def remove_user_values(self, input_keys: Union[List[str], Set[str]]) -> None:
         # Update them in the Inputs object
         self.inputs.update(reset_inputs)
 
-
     @property
     def sortables(self) -> Sortables:
         if self._sortables is not None:
@@ -224,12 +328,80 @@ def sortables(self) -> Sortables:
 
         coll = Sortables.from_json(result.data)
         for w in result.errors:
-            self.add_warning('sortables', w)
+            self.add_warning("sortables", w)
+        # Merge submodel warnings with a simple, clean prefix
         self._merge_submodel_warnings(coll)
 
         self._sortables = coll
         return coll
 
+    def set_sortables_from_dataframe(self, dataframe: pd.DataFrame) -> None:
+        """
+        Extract sortables from dataframe and update them.
+        The dataframe should have sortable names as columns and orders as rows.
+
+        Args:
+            dataframe: DataFrame with sortable names as columns and order values as rows
+        """
+        coll = Sortables._from_dataframe(dataframe)
+        updates = coll.to_updates_dict()
+        if updates:
+            self.update_sortables(updates)
+
+    def update_sortables(self, update_sortables: Dict[str, List[Any]]) -> None:
+        """
+        Update the order of specified sortables.
+
+        Args:
+            update_sortables: Dictionary mapping sortable names to their new orders
+        """
+        # Validate the updates first
+        validity_errors = self.sortables.is_valid_update(update_sortables)
+        self._handle_validity_errors(validity_errors, "sortables")
+
+        # Make individual API calls for each sortable as there is no bulk endpoint
+        for name, order in update_sortables.items():
+            if name.startswith("heat_network_"):
+                subtype = name.replace("heat_network_", "")
+                result = UpdateSortablesRunner.run(
+                    BaseClient(), self, "heat_network", order, subtype=subtype
+                )
+            else:
+                result = UpdateSortablesRunner.run(BaseClient(), self, name, order)
+
+            if not result.success:
+                raise ScenarioError(
+                    f"Could not update sortable '{name}': {result.errors}"
+                )
+
+        self.sortables.update(update_sortables)
+
+    def remove_sortables(self, sortable_names: Union[List[str], Set[str]]) -> None:
+        """
+        Reset specified sortables to their default/empty orders.
+
+        Args:
+            sortable_names: List or set of sortable names to reset
+        """
+        # Make individual API calls to reset each sortable
+        for name in sortable_names:
+            if name.startswith("heat_network_"):
+                # Handle heat_network with subtype
+                subtype = name.replace("heat_network_", "")
+                result = UpdateSortablesRunner.run(
+                    BaseClient(), self, "heat_network", [], subtype=subtype
+                )
+            else:
+                result = UpdateSortablesRunner.run(BaseClient(), self, name, [])
+
+            if not result.success:
+                raise ScenarioError(
+                    f"Could not remove sortable '{name}': {result.errors}"
+                )
+
+        reset_sortables = {name: [] for name in sortable_names}
+        self.sortables.update(reset_sortables)
+
     @property
     def custom_curves(self) -> CustomCurves:
         if self._custom_curves is not None:
@@ -240,8 +412,13 @@ def custom_curves(self) -> CustomCurves:
             raise ScenarioError(f"Could not retrieve custom_curves: {result.errors}")
 
         coll = CustomCurves.from_json(result.data)
+        try:
+            coll._scenario = self
+        except Exception:
+            pass
         for w in result.errors:
-            self.add_warning('custom_curves', w)
+            self.add_warning("custom_curves", w)
+        # Merge submodel warnings with a simple, clean prefix
         self._merge_submodel_warnings(coll)
 
         self._custom_curves = coll
@@ -255,6 +432,34 @@ def custom_curves_series(self):
         for key in self.custom_curves.attached_keys():
             yield self.custom_curve_series(key)
 
+    def update_custom_curves(self, custom_curves) -> None:
+        """
+        Upload/update custom curves for this scenario.
+
+        Args:
+            custom_curves: CustomCurves object containing curves to upload
+        """
+        # Validate curves before uploading
+        validity_errors = custom_curves.validate_for_upload()
+        self._handle_validity_errors(validity_errors, "custom curves")
+
+        # Upload curves
+        result = UpdateCustomCurvesRunner.run(BaseClient(), self, custom_curves)
+        if not result.success:
+            raise ScenarioError(f"Could not update custom curves: {result.errors}")
+
+        # Update the scenario's custom curves object
+        for new_curve in custom_curves.curves:
+            existing_curve = self.custom_curves._find(new_curve.key)
+            if existing_curve:
+                existing_curve.file_path = new_curve.file_path
+            else:
+                self.custom_curves.curves.append(new_curve)
+        try:
+            self.custom_curves._scenario = self
+        except Exception:
+            pass
+
     @property
     def output_curves(self) -> OutputCurves:
         if self._output_curves is not None:
@@ -274,6 +479,12 @@ def all_output_curves(self):
     def get_output_curves(self, carrier_type: str) -> dict[str, pd.DataFrame]:
         return self.output_curves.get_curves_by_carrier_type(self, carrier_type)
 
+    def set_export_config(self, config: ExportConfig | None) -> None:
+        self._export_config = config
+
+    def get_export_config(self) -> ExportConfig | None:
+        return self._export_config
+
     def add_queries(self, gquery_keys: list[str]):
         if self._queries is None:
             self._queries = Gqueries.from_list(gquery_keys)
@@ -286,6 +497,7 @@ def execute_queries(self):
         ready collecting all of them
         """
         self._queries.execute(BaseClient(), self)
+        self._merge_submodel_warnings(self._queries)
 
     def results(self, columns="future") -> pd.DataFrame:
         """
@@ -308,3 +520,82 @@ def queries_requested(self):
             return False
 
         return len(self._queries.query_keys()) > 0
+
+    def show_all_warnings(self) -> None:
+        """
+        Display all warnings from the scenario and its submodels in a organized way.
+        """
+        print(f"=== Warnings for Scenario {self.id} ===")
+
+        # Show scenario-level warnings
+        if len(self.warnings) > 0:
+            print("\nScenario warnings:")
+            self.show_warnings()
+
+        # Show submodel warnings if they exist and are loaded
+        submodels = [
+            ("Inputs", self._inputs),
+            ("Sortables", self._sortables),
+            ("Custom Curves", self._custom_curves),
+            ("Output Curves", self._output_curves),
+            ("Queries", self._queries),
+            ("Couplings", self._couplings),
+        ]
+
+        for name, submodel in submodels:
+            if submodel is not None and len(submodel.warnings) > 0:
+                print(f"\n{name} warnings:")
+                submodel.show_warnings()
+
+    def _handle_validity_errors(
+        self, validity_errors: Dict[str, Any], context: str
+    ) -> None:
+        """
+        Helper method to format and raise ScenarioError for validity errors.
+        """
+        if not validity_errors:
+            return
+
+        error_summary = []
+        for key, warning_collector in validity_errors.items():
+            warnings_list = [w.message for w in warning_collector]
+            error_summary.append(f"{key}: {warnings_list}")
+
+        raise ScenarioError(f"Could not update {context}: {error_summary}")
+
+    @property
+    def couplings(self) -> Couplings:
+        """Get coupling groups for this scenario"""
+        if self._couplings is not None:
+            return self._couplings
+
+        result = FetchCouplingsRunner.run(BaseClient(), self)
+        if not result.success:
+            raise ScenarioError(f"Could not retrieve couplings: {result.errors}")
+
+        coll = Couplings.from_json(result.data)
+        for w in result.errors:
+            self.add_warning("couplings", w)
+        self._merge_submodel_warnings(coll)
+
+        self._couplings = coll
+        return coll
+
+    def update_couplings(
+        self, coupling_groups: List[str], action: str = "couple", force: bool = False
+    ) -> None:
+
+        result = UpdateCouplingsRunner.run(
+            BaseClient(), self, coupling_groups, action, force
+        )
+
+        if not result.success:
+            raise ScenarioError(f"Could not update couplings: {result.errors}")
+
+        # Update the cached couplings with the response data
+        if self._couplings is not None:
+            updated_couplings = Couplings.from_json(result.data)
+            self._couplings = updated_couplings
+
+        for w in result.errors:
+            self.add_warning("couplings", w)
diff --git a/src/pyetm/models/scenario_packer.py b/src/pyetm/models/scenario_packer.py
index cf5c74d..2ba1e55 100644
--- a/src/pyetm/models/scenario_packer.py
+++ b/src/pyetm/models/scenario_packer.py
@@ -1,122 +1,173 @@
 import pandas as pd
+import logging
+from pathlib import Path
+from os import PathLike
 from pydantic import BaseModel
-from typing import Optional, Dict, List, Any, Set, Literal, ClassVar
+from typing import Optional, Dict, Any, Sequence, List
 from xlsxwriter import Workbook
 
-from pyetm.models.base import Base
+from pyetm.models.packables.custom_curves_pack import CustomCurvesPack
+from pyetm.models.packables.inputs_pack import InputsPack
+from pyetm.models.packables.output_curves_pack import OutputCurvesPack
+from pyetm.models.packables.query_pack import QueryPack
+from pyetm.models.packables.sortable_pack import SortablePack
 from pyetm.models import Scenario
+from pyetm.models.export_config import ExportConfig
+from pyetm.models.custom_curves import CustomCurves
 from pyetm.utils.excel import add_frame
 
+logger = logging.getLogger(__name__)
 
-class Packable(BaseModel):
-    scenarios: Optional[set["Scenario"]] = set()
-    key: ClassVar[str] = "base_pack"
 
-    def add(self, *scenarios):
-        "Adds one or more scenarios to the packable"
-        self.scenarios.update(scenarios)
+class ExportConfigResolver:
+    """Handles resolution of export configuration from various sources."""
 
-    def discard(self, scenario):
-        "Removes a scenario from the pack"
-        self.scenarios.discard(scenario)
+    @staticmethod
+    def resolve_boolean(
+        explicit_value: Optional[bool], config_value: Optional[bool], default: bool
+    ) -> bool:
+        """Resolve boolean value from explicit parameter, config, or default."""
+        if explicit_value is not None:
+            return bool(explicit_value)
+        if config_value is not None:
+            return bool(config_value)
+        return default
 
-    def clear(self):
-        self.scenarios = []
+    @staticmethod
+    def extract_from_main_sheet(
+        main_df: pd.DataFrame, scenarios: List[Scenario]
+    ) -> Optional[ExportConfig]:
+        """Extract export configuration from the first scenario column in main sheet."""
+        if main_df.empty or not scenarios:
+            return None
 
-    def summary(self) -> dict:
-        return {self.key: {"scenario_count": len(self.scenarios)}}
+        try:
+            helper_columns = {"description", "helper", "notes"}
+            candidate_series = None
 
-    def to_dataframe(self, columns="") -> pd.DataFrame:
-        """Convert the pack into a dataframe"""
-        if len(self.scenarios) == 0:
-            return pd.DataFrame()
+            for col in main_df.columns:
+                name = str(col).strip().lower()
+                if name in helper_columns or name in {"", "nan"}:
+                    continue
+                candidate_series = main_df[col]
+                break
 
-        return self._to_dataframe(columns=columns)
+            if candidate_series is None:
+                candidate_series = main_df.iloc[:, 0]
 
-    def _to_dataframe(self, columns="", **kwargs) -> pd.DataFrame:
-        """Base implementation - kids should implement this"""
-        return pd.DataFrame()
+            return ExportConfigResolver._parse_config_from_series(candidate_series)
+        except Exception as e:
+            logger.exception("Error extracting from main sheet: %s", e)
+            return None
 
+    @staticmethod
+    def _parse_config_from_series(series: pd.Series) -> "ExportConfig":
+        """Parse ExportConfig from a pandas Series (column from main sheet)."""
 
-class InputsPack(Packable):
-    key: ClassVar[str] = "inputs"
+        def _iter_rows():
+            for label, value in zip(series.index, series.values):
+                yield str(label).strip().lower(), value
 
-    def _to_dataframe(self, columns="user", **kwargs):
-        return pd.concat(
-            [scenario.inputs.to_dataframe(columns=columns) for scenario in self.scenarios],
-            axis=1,
-            keys=[scenario.id for scenario in self.scenarios],
-        )
+        def _value_after_output(name: str) -> Any:
+            target = name.strip().lower()
+            seen_output = False
+            chosen: Any = None
+            for lbl, val in _iter_rows():
+                if lbl == "output":
+                    seen_output = True
+                    continue
+                if seen_output and lbl == target:
+                    chosen = val
+            return chosen
 
+        def _value_any(name: str) -> Any:
+            target = name.strip().lower()
+            chosen: Any = None
+            for lbl, val in _iter_rows():
+                if lbl == target:
+                    chosen = val
+            return chosen
 
-class QueryPack(Packable):
-    key: ClassVar[str] = "gquery"
+        def get_cell_value(name: str) -> Any:
+            val = _value_after_output(name)
+            return val if val is not None else _value_any(name)
 
-    def _to_dataframe(
-        self, columns="future", **kwargs
-    ) -> pd.DataFrame:  # Make sure **kwargs is here
-        if not self.scenarios:
-            return pd.DataFrame()
+        def parse_bool(value: Any) -> Optional[bool]:
+            """Parse boolean from various formats."""
+            if value is None or (isinstance(value, float) and pd.isna(value)):
+                return None
+            if isinstance(value, bool):
+                return value
+            if isinstance(value, (int, float)):
+                try:
+                    return bool(int(value))
+                except Exception:
+                    return None
+            if isinstance(value, str):
+                normalized = value.strip().lower()
+                if normalized in {"true", "yes", "y", "1"}:
+                    return True
+                if normalized in {"false", "no", "n", "0"}:
+                    return False
+            return None
 
-        return pd.concat(
-            [scenario.results(columns=columns) for scenario in self.scenarios],
-            axis=1,
-            keys=[scenario.id for scenario in self.scenarios],
-            copy=False,
-        )
+        def parse_bool_field(*names: str) -> Optional[bool]:
+            """Return the first non-None boolean parsed from the provided field names."""
+            for n in names:
+                val = parse_bool(get_cell_value(n))
+                if val is not None:
+                    return val
+            return None
 
+        def parse_carriers(value: Any) -> Optional[List[str]]:
+            """Parse comma-separated carrier list."""
+            if not isinstance(value, str) or not value.strip():
+                return None
+            return [carrier.strip() for carrier in value.split(",") if carrier.strip()]
 
-class SortablePack(Packable):
-    key: ClassVar[str] = "sortables"
-
-    def _to_dataframe(self, columns="", **kwargs) -> pd.DataFrame:
-        """PACKS ONLY FIRST SCENARIO"""
-        for scenario in self.scenarios:
-            return scenario.sortables.to_dataframe()
-
-
-class CustomCurvesPack(Packable):
-    key: ClassVar[str] = "custom_curves"
-
-    def _to_dataframe(self, columns="", **kwargs) -> pd.DataFrame:
-        """PACKS ONLY FIRST SCENARIO"""
-        for scenario in self.scenarios:
-            series_list = list(scenario.custom_curves_series())
-            if len(series_list) == 0:
-                continue
-            return pd.concat(series_list, axis=1)
-        return pd.DataFrame()
+        exports_val = get_cell_value("exports")
+        carriers_val = get_cell_value("output_carriers")
 
+        exports_bool = parse_bool(exports_val)
+        if exports_bool is True:
+            output_carriers = ["electricity", "hydrogen", "heat", "methane"]
+        elif exports_bool is False:
+            output_carriers = None
+        else:
+            output_carriers = parse_carriers(carriers_val) or parse_carriers(
+                exports_val
+            )
 
-class OutputCurvesPack(Packable):
-    key: ClassVar[str] = "output_curves"
-
-    def _to_dataframe(self, columns="", **kwargs) -> pd.DataFrame:
-        """PACKS ONLY FIRST SCENARIO"""
-        for scenario in self.scenarios:
-            series_list = list(scenario.all_output_curves())
-            if len(series_list) == 0:
-                continue
-            return pd.concat(series_list, axis=1)
-        return pd.DataFrame()
+        config = ExportConfig(
+            include_inputs=parse_bool_field("include_inputs", "inputs"),
+            include_sortables=parse_bool_field("include_sortables", "sortables"),
+            include_custom_curves=parse_bool_field(
+                "include_custom_curves", "custom_curves"
+            ),
+            include_gqueries=(
+                parse_bool_field("include_gqueries", "gquery_results", "gqueries")
+            ),
+            inputs_defaults=parse_bool(get_cell_value("defaults")),
+            inputs_min_max=parse_bool(get_cell_value("min_max")),
+            output_carriers=output_carriers,
+        )
+        return config
 
 
 class ScenarioPacker(BaseModel):
-    """Packs one or multiple scenarios for export to dataframes or excel"""
+    """
+    Packs one or multiple scenarios for export to dataframes or excel
+    """
 
-    # To avoid keeping all in memory, the packer only remembers which scenarios
-    # to pack what info for later
-    _custom_curves: "CustomCurvesPack" = CustomCurvesPack()
-    _inputs: "InputsPack" = InputsPack()
-    _sortables: "SortablePack" = SortablePack()
-    _output_curves: "OutputCurvesPack" = OutputCurvesPack()
-
-    # Setting up a packer
+    # Pack collections
+    _custom_curves: CustomCurvesPack = CustomCurvesPack()
+    _inputs: InputsPack = InputsPack()
+    _sortables: SortablePack = SortablePack()
+    _output_curves: OutputCurvesPack = OutputCurvesPack()
 
+    # Scenario management methods
     def add(self, *scenarios):
-        """
-        Shorthand method for adding all extractions for the scenario
-        """
+        """Add scenarios to all packs."""
         self.add_custom_curves(*scenarios)
         self.add_inputs(*scenarios)
         self.add_sortables(*scenarios)
@@ -134,17 +185,15 @@ def add_sortables(self, *scenarios):
     def add_output_curves(self, *scenarios):
         self._output_curves.add(*scenarios)
 
-    # DataFrame outputs
-
     def main_info(self) -> pd.DataFrame:
-        """Create main info DataFrame"""
-        if len(self._scenarios()) == 0:
+        """Create main info DataFrame by concatenating scenario dataframes."""
+        scenarios = self._scenarios()
+        if not scenarios:
             return pd.DataFrame()
-
-        return pd.concat([scenario.to_dataframe() for scenario in self._scenarios()], axis=1)
+        return pd.concat([scenario.to_dataframe() for scenario in scenarios], axis=1)
 
     def inputs(self, columns="user") -> pd.DataFrame:
-        return self._inputs.to_dataframe(columns=columns)
+        return self._inputs._to_dataframe(columns=columns)
 
     def gquery_results(self, columns="future") -> pd.DataFrame:
         return QueryPack(scenarios=self._scenarios()).to_dataframe(columns=columns)
@@ -158,61 +207,981 @@ def custom_curves(self) -> pd.DataFrame:
     def output_curves(self) -> pd.DataFrame:
         return self._output_curves.to_dataframe()
 
-    def to_excel(self, path: str):
-        """Export to Excel with simplified approach"""
-        if len(self._scenarios()) == 0:
+    def to_excel(
+        self,
+        path: str,
+        *,
+        carriers: Optional[Sequence[str]] = None,
+        include_inputs: Optional[bool] = None,
+        include_sortables: Optional[bool] = None,
+        include_custom_curves: Optional[bool] = None,
+        include_gqueries: Optional[bool] = None,
+        include_output_curves: Optional[bool] = None,
+    ):
+        """Export scenarios to Excel file."""
+        if not self._scenarios():
             raise ValueError("Packer was empty, nothing to export")
 
+        global_config = self._get_global_export_config()
+        resolved_flags = self._resolve_export_flags(
+            global_config,
+            include_inputs,
+            include_sortables,
+            include_custom_curves,
+            include_gqueries,
+            include_output_curves,
+        )
+
+        # Ensure destination directory exists
+        try:
+            Path(path).parent.mkdir(parents=True, exist_ok=True)
+        except Exception:
+            pass
+
+        # Create and populate workbook
         workbook = Workbook(path)
+        try:
+            self._add_main_sheet(workbook)
+            self._add_data_sheets(workbook, global_config, resolved_flags)
+            self._add_gqueries_sheet(workbook, resolved_flags["include_gqueries"])
+        finally:
+            workbook.close()
 
-        sheet_configs = [
-            ("MAIN", self.main_info),
-            ("PARAMETERS", self.inputs),
-            ("GQUERIES_RESULTS", self.gquery_results),
-            ("SORTABLES", self.sortables),
-            ("CUSTOM_CURVES", self.custom_curves),
-            ("OUTPUT_CURVES", self.output_curves),
-        ]
+        # Handle output curves separately
+        self._export_output_curves_if_needed(
+            path, carriers, resolved_flags["include_output_curves"], global_config
+        )
+
+    def _get_global_export_config(self) -> Optional[ExportConfig]:
+        """Get global export configuration from first scenario that has one."""
+        for scenario in self._scenarios():
+            config = getattr(scenario, "_export_config", None)
+            if config is not None:
+                return config
+        return None
+
+    def _resolve_export_flags(
+        self,
+        global_config: Optional[ExportConfig],
+        include_inputs: Optional[bool],
+        include_sortables: Optional[bool],
+        include_custom_curves: Optional[bool],
+        include_gqueries: Optional[bool],
+        include_output_curves: Optional[bool],
+    ) -> Dict[str, Any]:
+        """Resolve all export flags from parameters and configuration."""
+        resolver = ExportConfigResolver()
+
+        return {
+            "include_inputs": resolver.resolve_boolean(
+                include_inputs,
+                (
+                    getattr(global_config, "include_inputs", None)
+                    if global_config
+                    else None
+                ),
+                True,
+            ),
+            "include_sortables": resolver.resolve_boolean(
+                include_sortables,
+                (
+                    getattr(global_config, "include_sortables", None)
+                    if global_config
+                    else None
+                ),
+                False,
+            ),
+            "include_custom_curves": resolver.resolve_boolean(
+                include_custom_curves,
+                (
+                    getattr(global_config, "include_custom_curves", None)
+                    if global_config
+                    else None
+                ),
+                False,
+            ),
+            "include_gqueries": resolver.resolve_boolean(
+                include_gqueries,
+                (
+                    getattr(global_config, "include_gqueries", None)
+                    if global_config
+                    else None
+                ),
+                False,
+            ),
+            "include_output_curves": resolver.resolve_boolean(
+                include_output_curves,
+                (
+                    getattr(global_config, "output_carriers", None) is not None
+                    if global_config
+                    else None
+                ),
+                False,
+            ),
+            "inputs_defaults": (
+                bool(getattr(global_config, "inputs_defaults", False))
+                if global_config
+                else False
+            ),
+            "inputs_min_max": (
+                bool(getattr(global_config, "inputs_min_max", False))
+                if global_config
+                else False
+            ),
+        }
+
+    def _add_main_sheet(self, workbook: Workbook):
+        """Add main scenario information sheet to workbook."""
+        main_df = self._build_excel_main_dataframe()
+        if not main_df.empty:
+            sanitized_df = self._sanitize_dataframe_for_excel(main_df)
+            add_frame(
+                name="MAIN",
+                frame=sanitized_df,
+                workbook=workbook,
+                column_width=18,
+                scenario_styling=True,
+            )
+
+    def _add_data_sheets(
+        self,
+        workbook: Workbook,
+        global_config: Optional[ExportConfig],
+        flags: Dict[str, Any],
+    ):
+        """Add data sheets (inputs, sortables, custom_curves) to workbook."""
+        if flags["include_inputs"]:
+            self._add_inputs_sheet(
+                workbook, flags["inputs_defaults"], flags["inputs_min_max"]
+            )
+
+        if flags["include_sortables"]:
+            self._add_pack_sheet(workbook, self._sortables)
+
+        if flags["include_custom_curves"]:
+            self._add_pack_sheet(workbook, self._custom_curves)
+
+    def _add_inputs_sheet(
+        self, workbook: Workbook, include_defaults: bool, include_min_max: bool
+    ):
+        """Add inputs sheet with proper field handling."""
+        try:
+            df = self._inputs.build_combined_dataframe(
+                include_defaults=include_defaults, include_min_max=include_min_max
+            )
+            if df is not None and not df.empty:
+                self._add_dataframe_to_workbook(workbook, self._inputs.sheet_name, df)
+        except Exception as e:
+            logger.warning("Failed to build inputs DataFrame: %s", e)
+            df = self._inputs._to_dataframe(columns="user")
+            if df is not None and not df.empty:
+                self._add_dataframe_to_workbook(workbook, self._inputs.sheet_name, df)
+
+    def _add_pack_sheet(self, workbook: Workbook, pack):
+        """Add a pack's DataFrame to the workbook."""
+        df = pack.to_dataframe()
+        if df is not None and not df.empty:
+            self._add_dataframe_to_workbook(workbook, pack.sheet_name, df)
+
+    def _add_gqueries_sheet(self, workbook: Workbook, include_gqueries: bool):
+        """Add gqueries sheet if requested."""
+        if not include_gqueries:
+            return
+
+        gquery_pack = QueryPack(scenarios=self._scenarios())
+        gqueries_df = gquery_pack.to_dataframe(columns="future")
+        if not gqueries_df.empty:
+            self._add_dataframe_to_workbook(
+                workbook, gquery_pack.output_sheet_name, gqueries_df
+            )
+
+    def _export_output_curves_if_needed(
+        self,
+        main_path: str,
+        carriers: Optional[Sequence[str]],
+        include_output_curves: bool,
+        global_config: Optional[ExportConfig],
+    ):
+        """Export output curves to separate file if needed."""
+        if not include_output_curves:
+            return
+
+        # Determine output file path (next to the main workbook)
+        base_path = Path(main_path)
+        output_path = str(
+            base_path.with_name(f"{base_path.stem}_exports{base_path.suffix}")
+        )
+
+        # Determine carriers to export
+        chosen_carriers = list(carriers) if carriers else None
+        if chosen_carriers is None and global_config is not None:
+            config_carriers = getattr(global_config, "output_carriers", None)
+            chosen_carriers = list(config_carriers) if config_carriers else None
+
+        try:
+            self._output_curves.to_excel_per_carrier(output_path, chosen_carriers)
+        except Exception as e:
+            logger.warning("Failed exporting output curves workbook: %s", e)
+
+    def _add_dataframe_to_workbook(
+        self, workbook: Workbook, sheet_name: str, df: pd.DataFrame
+    ):
+        """Add a DataFrame to the workbook as a new sheet."""
+        cleaned_df = df.fillna("").infer_objects(copy=False)
+        add_frame(
+            name=sheet_name,
+            frame=cleaned_df,
+            workbook=workbook,
+            column_width=18,
+            scenario_styling=True,
+        )
+
+    @classmethod
+    def from_excel(cls, xlsx_path: PathLike | str) -> "ScenarioPacker":
+        """Import scenarios from Excel file."""
+        packer = cls()
+
+        # Resolve default location: if a relative path/filename is provided and the
+        # file does not exist at that location, look for it in the project /inputs dir.
+        path = Path(xlsx_path)
+        if not path.is_absolute() and not path.exists():
+
+            def _find_root_with(dir_name: str) -> Path:
+                for base in [
+                    Path.cwd(),
+                    *Path.cwd().parents,
+                    Path(__file__).resolve().parent,
+                    *Path(__file__).resolve().parents,
+                ]:
+                    candidate = base / dir_name
+                    if candidate.exists() and candidate.is_dir():
+                        return base
+                return Path.cwd()
+
+            root = _find_root_with("inputs")
+            relative = path if str(path.parent) != "." else Path(path.name)
+            candidate = root / "inputs" / relative
+            if candidate.exists():
+                path = candidate
+
+        try:
+            excel_file = pd.ExcelFile(str(path))
+        except Exception as e:
+            logger.warning("Could not open Excel file '%s': %s", xlsx_path, e)
+            return packer
+
+        # Import main sheet and create scenarios
+        main_df = packer._import_main_sheet(excel_file)
+        if main_df is None:
+            return packer
+
+        scenarios_by_column = packer._create_scenarios_from_main(main_df)
+        if not scenarios_by_column:
+            return packer
+
+        packer._apply_export_configuration(main_df, scenarios_by_column)
+        packer._import_data_sheets(excel_file, main_df, scenarios_by_column)
+
+        return packer
+
+    def _import_main_sheet(self, excel_file: pd.ExcelFile) -> Optional[pd.DataFrame]:
+        """Import and validate the main sheet."""
+        try:
+            main_df = excel_file.parse("MAIN", index_col=0)
+            if main_df is None or getattr(main_df, "empty", False):
+                return None
+            return main_df
+        except Exception as e:
+            logger.warning("Failed to parse MAIN sheet: %s", e)
+            return None
+
+    def _create_scenarios_from_main(self, main_df: pd.DataFrame) -> Dict[str, Scenario]:
+        """Create scenarios from main sheet columns."""
+        scenarios_by_column = {}
+
+        for column_name in main_df.columns:
+            column_str = str(column_name) if column_name is not None else ""
+            if column_str.strip().lower() in {"description", "helper", "notes"}:
+                continue
+
+            try:
+                scenario = self._create_scenario_from_column(
+                    column_str, main_df[column_name]
+                )
+                if scenario is not None:
+                    self.add(scenario)
+                    scenarios_by_column[column_str] = scenario
+            except Exception as e:
+                logger.warning(
+                    "Failed to set up scenario for column '%s': %s", column_name, e
+                )
+
+        return scenarios_by_column
+
+    def _create_scenario_from_column(
+        self, column_name: str, column_data: pd.Series
+    ) -> Optional[Scenario]:
+        """Create a scenario from a main sheet column."""
+        scenario_id = self._safe_get_int(column_data.get("scenario_id"))
+        area_code = column_data.get("area_code")
+        end_year = self._safe_get_int(column_data.get("end_year"))
+        metadata_updates = self._extract_metadata_updates(column_data)
+        scenario = self._load_or_create_scenario(
+            scenario_id, area_code, end_year, column_name, **metadata_updates
+        )
+        if scenario is None:
+            return None
+
+        # Metadata already applied in creation, but if needed, can update again here
+        self._apply_metadata_to_scenario(scenario, metadata_updates)
+
+        return scenario
+
+    def _safe_get_int(self, value: Any) -> Optional[int]:
+        """Safely convert value to integer."""
+        if value is None or (isinstance(value, float) and pd.isna(value)):
+            return None
+        try:
+            return int(float(value))
+        except (ValueError, TypeError):
+            return None
+
+    def _safe_get_bool(self, value: Any) -> Optional[bool]:
+        """Safely convert value to boolean."""
+        if value is None or (isinstance(value, float) and pd.isna(value)):
+            return None
+        if isinstance(value, bool):
+            return value
+        if isinstance(value, (int, float)):
+            try:
+                return bool(int(value))
+            except Exception:
+                return None
+        if isinstance(value, str):
+            normalized = value.strip().lower()
+            if normalized in {"true", "yes", "y", "1"}:
+                return True
+            if normalized in {"false", "no", "n", "0"}:
+                return False
+        return None
+
+    def _load_or_create_scenario(
+        self,
+        scenario_id: Optional[int],
+        area_code: Any,
+        end_year: Optional[int],
+        column_name: str,
+        **kwargs,
+    ) -> Optional[Scenario]:
+        """Load existing scenario or create new one. Passes all available kwargs to Scenario.new for full metadata."""
+        if scenario_id is not None:
+            try:
+                return Scenario.load(scenario_id)
+            except Exception as e:
+                logger.warning(
+                    "Failed to load scenario %s for column '%s': %s",
+                    scenario_id,
+                    column_name,
+                    e,
+                )
+
+        if area_code and end_year is not None:
+            try:
+                return Scenario.new(str(area_code), int(end_year), **kwargs)
+            except Exception as e:
+                logger.warning(
+                    "Failed to create scenario for column '%s' (area_code=%s, end_year=%s): %s",
+                    column_name,
+                    area_code,
+                    end_year,
+                    e,
+                )
+
+        logger.warning(
+            "MAIN column '%s' missing required fields for creation (area_code/end_year)",
+            column_name,
+        )
+        return None
+
+    def _extract_metadata_updates(self, column_data: pd.Series) -> Dict[str, Any]:
+        """Extract metadata updates from column data."""
+        metadata = {}
+
+        private = self._safe_get_bool(column_data.get("private"))
+        if private is not None:
+            metadata["private"] = private
+
+        template = self._safe_get_int(column_data.get("template"))
+        if template is not None:
+            metadata["template"] = template
+
+        for field in ["source", "title"]:
+            value = column_data.get(field)
+            if isinstance(value, str) and value.strip():
+                metadata[field] = value.strip()
+
+        return metadata
+
+    def _apply_metadata_to_scenario(self, scenario: Scenario, metadata: Dict[str, Any]):
+        """Apply metadata updates to scenario."""
+        if not metadata:
+            return
+
+        try:
+            scenario.update_metadata(**metadata)
+        except Exception as e:
+            logger.warning(
+                "Failed to update metadata for '%s': %s", scenario.identifier(), e
+            )
+
+    def _apply_export_configuration(
+        self, main_df: pd.DataFrame, scenarios_by_column: Dict[str, Scenario]
+    ):
+        """Apply export configuration to all scenarios."""
+        try:
+            config = ExportConfigResolver.extract_from_main_sheet(
+                main_df, list(scenarios_by_column.values())
+            )
+            if config is None:
+                return
+
+            for scenario in scenarios_by_column.values():
+                try:
+                    if hasattr(scenario, "set_export_config"):
+                        scenario.set_export_config(config)
+                    else:
+                        setattr(scenario, "_export_config", config)
+                except Exception:
+                    pass
+        except Exception:
+            pass
+
+    def _import_data_sheets(
+        self,
+        excel_file: pd.ExcelFile,
+        main_df: pd.DataFrame,
+        scenarios_by_column: Dict[str, Scenario],
+    ):
+        """Import all data sheets (inputs, gqueries, sortables, custom curves)."""
+        # Build short name mapping for inputs
+        short_name_map = self._build_short_name_mapping(main_df, scenarios_by_column)
+        self._import_inputs_sheet(excel_file, short_name_map)
+        self._import_gqueries_sheet(excel_file)
+        self._import_scenario_specific_sheets(excel_file, main_df, scenarios_by_column)
+
+    def _build_short_name_mapping(
+        self, main_df: pd.DataFrame, scenarios_by_column: Dict[str, Scenario]
+    ) -> Dict[str, str]:
+        """Build mapping of scenario IDs to short names."""
+        sheet_info = self._extract_scenario_sheet_info(main_df)
+        short_name_map = {}
+
+        for column_name, scenario in scenarios_by_column.items():
+            info = (
+                sheet_info.get(column_name, {}) if isinstance(sheet_info, dict) else {}
+            )
+            short_name = info.get("short_name") if isinstance(info, dict) else None
+
+            if short_name is None or (
+                isinstance(short_name, float) and pd.isna(short_name)
+            ):
+                short_name = str(scenario.identifier())
+
+            short_name_map[str(scenario.id)] = str(short_name)
+
+        return short_name_map
+
+    def _import_inputs_sheet(
+        self, excel_file: pd.ExcelFile, short_name_map: Dict[str, str]
+    ):
+        """Import inputs sheet - delegate to InputsPack."""
+        try:
+            slider_df = excel_file.parse(InputsPack.sheet_name, header=None)
+            if slider_df is not None and not slider_df.empty:
+                self._inputs.set_scenario_short_names(short_name_map)
+                self._inputs.from_dataframe(slider_df)
+        except Exception as e:
+            logger.warning("Failed to import SLIDER_SETTINGS: %s", e)
+
+    def _import_gqueries_sheet(self, excel_file: pd.ExcelFile):
+        """Import gqueries sheet - delegate to QueryPack."""
+        for sheet_name in ("GQUERIES", QueryPack.sheet_name):
+            if sheet_name in excel_file.sheet_names:
+                try:
+                    gqueries_df = excel_file.parse(sheet_name, header=None)
+                    if gqueries_df is not None and not gqueries_df.empty:
+                        query_pack = QueryPack(scenarios=self._scenarios())
+                        query_pack.from_dataframe(gqueries_df)
+                        return
+                except Exception as e:
+                    logger.warning("Failed to import GQUERIES: %s", e)
 
-        for sheet_name, data_method in sheet_configs:
-            df = data_method()
-            if not df.empty:
-                add_frame(sheet_name, df.fillna(""), workbook, column_width=18)
+    def _import_scenario_specific_sheets(
+        self,
+        excel_file: pd.ExcelFile,
+        main_df: pd.DataFrame,
+        scenarios_by_column: Dict[str, Scenario],
+    ):
+        """Import scenario-specific sortables and custom curves sheets."""
+        sheet_info = self._extract_scenario_sheet_info(main_df)
 
-        workbook.close()
+        for column_name, scenario in scenarios_by_column.items():
+            info = (
+                sheet_info.get(column_name, {}) if isinstance(sheet_info, dict) else {}
+            )
 
-    def _scenarios(self) -> set["Scenario"]:
-        """
-        All scenarios we are packing info for: for these we need to insert
-        their metadata
-        """
-        return set.union(*map(set, (pack.scenarios for pack in self.all_pack_data())))
+            # Import sortables
+            sortables_sheet = info.get("sortables") if isinstance(info, dict) else None
+            if (
+                isinstance(sortables_sheet, str)
+                and sortables_sheet in excel_file.sheet_names
+            ):
+                try:
+                    sortables_df = excel_file.parse(sortables_sheet, header=None)
+                    self._process_single_scenario_sortables(scenario, sortables_df)
+                except Exception as e:
+                    logger.warning(
+                        "Failed to process SORTABLES sheet '%s' for '%s': %s",
+                        sortables_sheet,
+                        scenario.identifier(),
+                        e,
+                    )
 
-    def all_pack_data(self):
-        """Yields each subpack"""
-        # TODO: we can also do this with model dump?
-        yield self._inputs
-        yield self._sortables
-        yield self._custom_curves
-        yield self._output_curves
+            # Import custom curves
+            curves_sheet = info.get("custom_curves") if isinstance(info, dict) else None
+            if isinstance(curves_sheet, str) and curves_sheet in excel_file.sheet_names:
+                try:
+                    curves_df = excel_file.parse(curves_sheet, header=None)
+                    self._process_single_scenario_curves(scenario, curves_df)
+                except Exception as e:
+                    logger.warning(
+                        "Failed to process CUSTOM_CURVES sheet '%s' for '%s': %s",
+                        curves_sheet,
+                        scenario.identifier(),
+                        e,
+                    )
+
+    def _scenarios(self) -> set[Scenario]:
+        """All scenarios we are packing info for across all packs."""
+        all_scenarios = set()
+        for pack in self._get_all_packs():
+            scenarios = getattr(pack, "scenarios", None)
+            if scenarios:
+                if isinstance(scenarios, set):
+                    all_scenarios.update(scenarios)
+                else:
+                    try:
+                        all_scenarios.update(set(scenarios))
+                    except Exception:
+                        pass
+        return all_scenarios
+
+    def _get_all_packs(self):
+        """Get all pack instances."""
+        return [self._inputs, self._sortables, self._custom_curves, self._output_curves]
 
     def clear(self):
-        """Clear all scenarios"""
-        for pack in self.all_pack_data():
-            pack.clear()
+        """Clear all scenarios from all packs."""
+        for pack in self._get_all_packs():
+            try:
+                pack.clear()
+            except Exception:
+                pass
 
-    def remove_scenario(self, scenario: "Scenario"):
-        """Remove a specific scenario from all collections"""
-        for pack in self.all_pack_data():
-            pack.discard(scenario)
+    def remove_scenario(self, scenario: Scenario):
+        """Remove a specific scenario from all collections."""
+        for pack in self._get_all_packs():
+            try:
+                pack.discard(scenario)
+            except Exception:
+                pass
 
     def get_summary(self) -> Dict[str, Any]:
-        """Get a summary of what's in the packer"""
+        """Get a summary of what's in the packer."""
         summary = {"total_scenarios": len(self._scenarios())}
+        for pack in self._get_all_packs():
+            try:
+                summary.update(pack.summary())
+            except Exception:
+                pass
+        summary["scenario_ids"] = sorted(
+            [getattr(s, "id", None) for s in self._scenarios()]
+        )
+        return summary
 
-        for pack in self.all_pack_data():
-            summary.update(pack.summary())
+    # Excel and DataFrame processing methods - refactored for consistency
+    def _build_excel_main_dataframe(self) -> pd.DataFrame:
+        """Build a MAIN sheet DataFrame for Excel export with proper ordering and labeling."""
+        main_df = self.main_info()
+        if main_df is None or main_df.empty:
+            return pd.DataFrame()
 
-        summary["scenario_ids"] = sorted([s.id for s in self._scenarios()])
+        # Apply preferred field ordering
+        ordered_df = self._apply_field_ordering(main_df)
 
-        return summary
+        # Apply scenario column labeling
+        labeled_df = self._apply_scenario_column_labels(ordered_df)
+
+        return labeled_df
+
+    def _apply_field_ordering(self, df: pd.DataFrame) -> pd.DataFrame:
+        """Apply preferred field ordering to DataFrame rows."""
+        preferred_fields = [
+            "title",
+            "description",
+            "scenario_id",
+            "template",
+            "area_code",
+            "start_year",
+            "end_year",
+            "keep_compatible",
+            "private",
+            "source",
+            "url",
+            "version",
+            "created_at",
+            "updated_at",
+        ]
+
+        present_fields = [field for field in preferred_fields if field in df.index]
+        remaining_fields = [field for field in df.index if field not in present_fields]
+        ordered_fields = present_fields + remaining_fields
+
+        ordered_df = df.reindex(index=ordered_fields)
+        ordered_df.index.name = "scenario"
+        return ordered_df
+
+    def _apply_scenario_column_labels(self, df: pd.DataFrame) -> pd.DataFrame:
+        """Apply human-readable labels to scenario columns."""
+        try:
+            scenarios = list(self._scenarios())
+            column_rename_map = self._build_column_rename_map(scenarios, df.columns)
+
+            if column_rename_map:
+                return df.rename(columns=column_rename_map)
+            return df
+        except Exception:
+            # If renaming fails, return original DataFrame
+            return df
+
+    def _build_column_rename_map(
+        self, scenarios: List[Scenario], columns
+    ) -> Dict[Any, str]:
+        """Build mapping of column IDs to human-readable labels."""
+        rename_map = {}
+        scenarios_by_id = {str(getattr(s, "id", "")): s for s in scenarios}
+
+        for column in columns:
+            matched_scenario = self._find_matching_scenario(
+                column, scenarios, scenarios_by_id
+            )
+            if matched_scenario is not None:
+                label = self._get_scenario_display_label(matched_scenario, column)
+                rename_map[column] = label
+
+        return rename_map
+
+    def _find_matching_scenario(
+        self, column, scenarios: List[Scenario], scenarios_by_id: Dict[str, Scenario]
+    ) -> Optional[Scenario]:
+        """Find scenario matching the given column identifier."""
+        # Try exact ID match first
+        for scenario in scenarios:
+            if column == getattr(scenario, "id", None):
+                return scenario
+
+        # Try string ID match as fallback
+        return scenarios_by_id.get(str(column))
+
+    def _get_scenario_display_label(self, scenario: Scenario, fallback_column) -> str:
+        """Get display label for scenario, with fallbacks."""
+        try:
+            if hasattr(scenario, "identifier"):
+                return scenario.identifier()
+        except Exception:
+            pass
+
+        # Try title attribute
+        title = getattr(scenario, "title", None)
+        if title:
+            return title
+
+        # Try ID attribute
+        scenario_id = getattr(scenario, "id", None)
+        if scenario_id:
+            return str(scenario_id)
+
+        # Final fallback
+        return str(fallback_column)
+
+    def _sanitize_dataframe_for_excel(self, df: pd.DataFrame) -> pd.DataFrame:
+        """Convert DataFrame to Excel-compatible format."""
+        if df is None or df.empty:
+            return pd.DataFrame()
+
+        sanitized_df = df.copy()
+
+        # Sanitize index and columns
+        sanitized_df.index = sanitized_df.index.map(self._sanitize_excel_value)
+        sanitized_df.columns = [
+            self._sanitize_excel_value(col) for col in sanitized_df.columns
+        ]
+
+        # Sanitize cell values
+        sanitized_df = sanitized_df.map(self._sanitize_excel_value)
+
+        return sanitized_df
+
+    def _sanitize_excel_value(self, value: Any) -> str:
+        """Convert a single value to Excel-safe format."""
+        if value is None:
+            return ""
+
+        if isinstance(value, (str, int, float, bool)):
+            return value
+
+        # Handle datetime objects
+        if self._is_datetime_like(value):
+            try:
+                return str(value)
+            except Exception:
+                return ""
+
+        # Generic fallback
+        try:
+            return str(value)
+        except Exception:
+            return ""
+
+    def _is_datetime_like(self, value: Any) -> bool:
+        """Check if value is a datetime-like object."""
+        import datetime as dt
+
+        return isinstance(value, (pd.Timestamp, dt.datetime, dt.date))
+
+    def _extract_scenario_sheet_info(
+        self, main_df: pd.DataFrame
+    ) -> Dict[str, Dict[str, str]]:
+        """Extract sheet information for each scenario from main DataFrame."""
+        if isinstance(main_df, pd.Series):
+            return self._extract_single_scenario_sheet_info(main_df)
+        else:
+            return self._extract_multiple_scenario_sheet_info(main_df)
+
+    def _extract_single_scenario_sheet_info(
+        self, series: pd.Series
+    ) -> Dict[str, Dict[str, str]]:
+        """Extract sheet info for single scenario (Series case)."""
+        identifier = str(series.name)
+
+        return {
+            identifier: {
+                "short_name": self._get_safe_value(series, "short_name", identifier),
+                "sortables": self._get_value_before_output(series, "sortables"),
+                "custom_curves": self._get_value_before_output(series, "custom_curves"),
+            }
+        }
+
+    def _extract_multiple_scenario_sheet_info(
+        self, df: pd.DataFrame
+    ) -> Dict[str, Dict[str, str]]:
+        """Extract sheet info for multiple scenarios (DataFrame case)."""
+        scenario_sheets = {}
+
+        for identifier in df.columns:
+            column_data = df[identifier]
+            scenario_sheets[str(identifier)] = {
+                "short_name": self._get_safe_value(
+                    column_data, "short_name", str(identifier)
+                ),
+                "sortables": self._get_value_before_output(column_data, "sortables"),
+                "custom_curves": self._get_value_before_output(
+                    column_data, "custom_curves"
+                ),
+            }
+
+        return scenario_sheets
+
+    def _get_safe_value(self, series: pd.Series, key: str, default: str) -> str:
+        """Safely get value from series with default fallback."""
+        value = series.get(key)
+        if pd.notna(value):
+            return str(value)
+        return default
+
+    def _get_value_before_output(self, series: pd.Series, key: str) -> Optional[str]:
+        """Get value from series, but only if it appears before 'output' section."""
+        seen_output = False
+
+        for label, value in zip(series.index, series.values):
+            normalized_label = str(label).strip().lower()
+
+            if normalized_label == "output":
+                seen_output = True
+
+            if normalized_label == key and not seen_output:
+                return value if pd.notna(value) else None
+
+        return None
+
+    def _process_single_scenario_sortables(self, scenario: Scenario, df: pd.DataFrame):
+        """Process sortables data for a single scenario."""
+        normalized_data = self._normalize_sheet(
+            df,
+            helper_names={"sortables", "hour", "index"},
+            reset_index=True,
+            rename_map={"heat_network": "heat_network_lt"},
+        )
+
+        if normalized_data is None or normalized_data.empty:
+            return
+
+        self._apply_sortables_to_scenario(scenario, normalized_data)
+
+    def _apply_sortables_to_scenario(self, scenario: Scenario, data: pd.DataFrame):
+        """Apply sortables data to scenario with error handling."""
+        try:
+            scenario.set_sortables_from_dataframe(data)
+            self._log_scenario_warnings(scenario, "_sortables", "Sortables")
+        except Exception as e:
+            logger.warning(
+                "Failed processing sortables for '%s': %s", scenario.identifier(), e
+            )
+
+    def _process_single_scenario_curves(self, scenario: Scenario, df: pd.DataFrame):
+        """Process custom curves data for a single scenario."""
+        normalized_data = self._normalize_sheet(
+            df,
+            helper_names={"curves", "custom_curves", "hour", "index"},
+            reset_index=True,
+        )
+
+        if normalized_data is None or normalized_data.empty:
+            return
+
+        self._apply_custom_curves_to_scenario(scenario, normalized_data)
+
+    def _apply_custom_curves_to_scenario(self, scenario: Scenario, data: pd.DataFrame):
+        """Apply custom curves to scenario with validation and error handling."""
+        try:
+            curves = CustomCurves._from_dataframe(data, scenario_id=scenario.id)
+
+            # Log processing warnings
+            curves.log_warnings(
+                logger,
+                prefix=f"Custom curves warning for '{scenario.identifier()}'",
+            )
+
+            # Validate curves and log validation issues
+            self._validate_and_log_curves(curves, scenario)
+
+            # Apply curves to scenario
+            scenario.update_custom_curves(curves)
+
+        except Exception as e:
+            self._handle_curves_processing_error(scenario, e)
+
+    def _validate_and_log_curves(self, curves: CustomCurves, scenario: Scenario):
+        """Validate curves and log any validation issues."""
+        try:
+            validation_results = curves.validate_for_upload()
+            for key, issues in (validation_results or {}).items():
+                for issue in issues:
+                    logger.warning(
+                        "Custom curve validation for '%s' in '%s' [%s]: %s",
+                        key,
+                        scenario.identifier(),
+                        getattr(issue, "field", key),
+                        getattr(issue, "message", str(issue)),
+                    )
+        except Exception:
+            # Validation errors are not critical, continue processing
+            pass
+
+    def _normalize_sheet(
+        self,
+        df: pd.DataFrame,
+        *,
+        helper_names: set[str],
+        reset_index: bool = True,
+        rename_map: Optional[Dict[str, str]] = None,
+    ) -> pd.DataFrame:
+        """Normalize a sheet by finding headers and cleaning data."""
+        if df is None:
+            return pd.DataFrame()
+
+        df = df.dropna(how="all")
+        if df.empty:
+            return df
+
+        header_position = self._find_first_non_empty_row(df)
+        if header_position is None:
+            return pd.DataFrame()
+
+        # Extract header and data
+        header = df.iloc[header_position].astype(str).map(str.strip)
+        data = df.iloc[header_position + 1 :].copy()
+        data.columns = header.values
+
+        # Keep only non-helper columns
+        columns_to_keep = [
+            col for col in data.columns if not self._is_helper_column(col, helper_names)
+        ]
+        data = data[columns_to_keep]
+
+        # Apply column renaming if provided
+        if rename_map:
+            data = data.rename(columns=rename_map)
+
+        if reset_index:
+            data.reset_index(drop=True, inplace=True)
+
+        return data
+
+    def _handle_curves_processing_error(self, scenario: Scenario, error: Exception):
+        """Handle errors during curves processing."""
+        logger.warning(
+            "Failed processing custom curves for '%s': %s", scenario.identifier(), error
+        )
+
+    def _log_scenario_warnings(
+        self, scenario: Scenario, attribute_name: str, context: str
+    ):
+        """Log warnings from scenario attributes if available."""
+        try:
+            attribute = getattr(scenario, attribute_name, None)
+            if attribute is not None and hasattr(attribute, "log_warnings"):
+                attribute.log_warnings(
+                    logger,
+                    prefix=f"{context} warning for '{scenario.identifier()}'",
+                )
+        except Exception:
+            # Warning logging failures should not interrupt processing
+            pass
+
+    def _find_first_non_empty_row(self, df: pd.DataFrame) -> Optional[int]:
+        """Find the first row that contains non-empty data."""
+        if df is None:
+            return None
+
+        for index, (_, row) in enumerate(df.iterrows()):
+            try:
+                if not row.isna().all():
+                    return index
+            except Exception:
+                # Fallback check for non-standard empty values
+                if any(value not in (None, "", float("nan")) for value in row):
+                    return index
+
+        return None
+
+    def _is_helper_column(self, column_name: Any, helper_names: set[str]) -> bool:
+        """Check if a column is a helper column that should be ignored."""
+        if not isinstance(column_name, str):
+            return True
+
+        normalized_name = column_name.strip().lower()
+        return normalized_name in (helper_names or set()) or normalized_name in {
+            "",
+            "nan",
+        }
diff --git a/src/pyetm/models/scenarios.py b/src/pyetm/models/scenarios.py
new file mode 100644
index 0000000..4153f60
--- /dev/null
+++ b/src/pyetm/models/scenarios.py
@@ -0,0 +1,70 @@
+from __future__ import annotations
+from os import PathLike
+from pathlib import Path
+from typing import Iterable, Iterator, List, Optional, Sequence
+from pydantic import Field
+from pyetm.models.base import Base
+from .scenario import Scenario
+
+
+class Scenarios(Base):
+    """
+    A simple collection of Scenario objects with convenience utilities.
+    #TODO: Make a nice repr or stats functions
+    """
+
+    items: List[Scenario] = Field(default_factory=list)
+
+    def __iter__(self) -> Iterator[Scenario]:
+        return iter(self.items)
+
+    def __len__(self) -> int:
+        return len(self.items)
+
+    def __getitem__(self, index: int) -> Scenario:
+        return self.items[index]
+
+    def add(self, *scenarios: Scenario) -> None:
+        self.items.extend(scenarios)
+
+    def extend(self, scenarios: Iterable[Scenario]) -> None:
+        self.items.extend(list(scenarios))
+
+    def to_excel(
+        self,
+        path: PathLike | str,
+        *,
+        carriers: Optional[Sequence[str]] = None,
+        include_inputs: bool | None = None,
+        include_sortables: bool | None = None,
+        include_custom_curves: bool | None = None,
+        include_gqueries: bool | None = None,
+        include_output_curves: bool | None = None,
+    ) -> None:
+        from .scenario_packer import ScenarioPacker
+        from pyetm.utils.paths import PyetmPaths
+
+        packer = ScenarioPacker()
+        if self.items:
+            packer.add(*self.items)
+
+        resolver = PyetmPaths()
+        out_path = resolver.resolve_for_write(path, default_dir="outputs")
+
+        packer.to_excel(
+            str(out_path),
+            carriers=carriers,
+            include_inputs=include_inputs,
+            include_sortables=include_sortables,
+            include_custom_curves=include_custom_curves,
+            include_gqueries=include_gqueries,
+            include_output_curves=include_output_curves,
+        )
+
+    @classmethod
+    def from_excel(cls, xlsx_path: PathLike | str) -> "Scenarios":
+        """
+        Load or create scenarios from an Excel workbook and wrap them in Scenarios.
+        """
+        scenarios = Scenario.from_excel(xlsx_path)
+        return cls(items=scenarios)
diff --git a/src/pyetm/models/sortables.py b/src/pyetm/models/sortables.py
index ecc9225..e21d2da 100644
--- a/src/pyetm/models/sortables.py
+++ b/src/pyetm/models/sortables.py
@@ -2,6 +2,8 @@
 from typing import Any, Dict, Iterator, List, Optional, Tuple, Union
 
 import pandas as pd
+from pydantic import field_validator, model_validator
+from pyetm.models.warnings import WarningCollector
 
 from pyetm.models.base import Base
 
@@ -30,6 +32,65 @@ def name(self):
         else:
             return self.type
 
+    def is_valid_update(self, new_order: list[Any]) -> WarningCollector:
+        """
+        Returns a WarningCollector with validation warnings without updating the current object
+        """
+        new_obj_dict = self.model_dump()
+        new_obj_dict["order"] = new_order
+
+        warnings_obj = self.__class__(**new_obj_dict)
+        return warnings_obj.warnings
+
+    @field_validator("type")
+    @classmethod
+    def validate_type(cls, value: str) -> str:
+        """Validate that type is a non-empty string"""
+        if not isinstance(value, str) or not value.strip():
+            raise ValueError("Type must be a non-empty string")
+        return value.strip()
+
+    @field_validator("subtype")
+    @classmethod
+    def validate_subtype(cls, value: Optional[str]) -> Optional[str]:
+        """Validate subtype if provided"""
+        if value is not None:
+            if not isinstance(value, str) or not value.strip():
+                raise ValueError("Subtype must be a non-empty string or None")
+            return value.strip()
+        return value
+
+    @field_validator("order")
+    @classmethod
+    def validate_order(cls, value: list[Any]) -> list[Any]:
+        """Validate that order is a list and check for duplicates"""
+        if not isinstance(value, list):
+            raise ValueError("Order must be a list")
+
+        # Check for duplicates
+        seen = set()
+        duplicates = []
+        for item in value:
+            if item in seen:
+                duplicates.append(item)
+            seen.add(item)
+
+        if duplicates:
+            raise ValueError(f"Order contains duplicate items: {duplicates}")
+
+        return value
+
+    @model_validator(mode="after")
+    def validate_sortable_consistency(self) -> "Sortable":
+        """Additional validation for the entire sortable"""
+        if self.type == "heat_network" and self.subtype is None:
+            raise ValueError("heat_network type requires a subtype")
+
+        if len(self.order) > 17:
+            raise ValueError("Order cannot contain more than 17 items")
+
+        return self
+
     @classmethod
     def from_json(
         cls, data: Tuple[str, Union[list[Any], Dict[str, list[Any]]]]
@@ -42,36 +103,20 @@ def from_json(
         sort_type, payload = data
 
         if isinstance(payload, list):
-            try:
-                sortable = cls.model_validate({"type": sort_type, "order": payload})
-                yield sortable
-            except Exception as e:
-                # Create basic sortable with warning
-                sortable = cls.model_validate({"type": sort_type, "order": []})
-                sortable.add_warning('base', f"Failed to create sortable for {sort_type}: {e}")
-                yield sortable
+            sortable = cls(type=sort_type, order=payload)
+            yield sortable
 
         elif isinstance(payload, dict):
             for sub, order in payload.items():
-                try:
-                    sortable = cls.model_validate(
-                        {"type": sort_type, "subtype": sub, "order": order}
-                    )
-                    yield sortable
-                except Exception as e:
-                    # Create basic sortable with warning
-                    sortable = cls.model_validate(
-                        {"type": sort_type, "subtype": sub, "order": []}
-                    )
-                    sortable.add_warning(
-                        'base', f"Failed to create sortable for {sort_type}.{sub}: {e}"
-                    )
-                    yield sortable
+                sortable = cls(type=sort_type, subtype=sub, order=order)
+                yield sortable
 
         else:
             # Create basic sortable with warning for unexpected payload
-            sortable = cls.model_validate({"type": sort_type, "order": []})
-            sortable.add_warning('type', f"Unexpected payload for '{sort_type}': {payload!r}")
+            sortable = cls(type=sort_type, order=[])
+            sortable.add_warning(
+                "payload", f"Unexpected payload for '{sort_type}': {payload!r}"
+            )
             yield sortable
 
 
@@ -93,6 +138,90 @@ def keys(self) -> List[str]:
         # will repeat 'heat_network' for each subtype
         return [s.type for s in self.sortables]
 
+    def names(self) -> List[str]:
+        """Get all sortable names (including subtype suffixes)"""
+        return [s.name() for s in self.sortables]
+
+    def is_valid_update(
+        self, updates: Dict[str, list[Any]]
+    ) -> Dict[str, WarningCollector]:
+        """
+        Returns a dict mapping sortable names to their WarningCollectors when errors were found
+
+        :param updates: Dict mapping sortable names to new orders
+        :return: Dict mapping sortable names to WarningCollectors
+        """
+        warnings = {}
+
+        # Check each sortable that has an update
+        sortable_by_name = {s.name(): s for s in self.sortables}
+
+        for name, new_order in updates.items():
+            if name in sortable_by_name:
+                sortable = sortable_by_name[name]
+                sortable_warnings = sortable.is_valid_update(new_order)
+                if len(sortable_warnings) > 0:
+                    warnings[name] = sortable_warnings
+            else:
+                warnings[name] = WarningCollector.with_warning(
+                    name, "Sortable does not exist"
+                )
+
+        # Check for non-existent sortables
+        non_existent_names = set(updates.keys()) - set(self.names())
+        for name in non_existent_names:
+            if name not in warnings:  # Don't overwrite existing warnings
+                warnings[name] = WarningCollector.with_warning(
+                    name, "Sortable does not exist"
+                )
+
+        return warnings
+
+    def update(self, updates: Dict[str, list[Any]]):
+        """
+        Update the orders of specified sortables
+
+        :param updates: Dict mapping sortable names to new orders
+        """
+        sortable_by_name = {s.name(): s for s in self.sortables}
+
+        for name, new_order in updates.items():
+            if name in sortable_by_name:
+                sortable_by_name[name].order = new_order
+
+    @field_validator("sortables")
+    @classmethod
+    def validate_sortables_list(cls, value: List[Sortable]) -> List[Sortable]:
+        """Validate the list of sortables"""
+        if not isinstance(value, list):
+            raise ValueError("Sortables must be a list")
+
+        # Check for duplicate names
+        names = [s.name() for s in value if isinstance(s, Sortable)]
+        duplicates = []
+        seen = set()
+        for name in names:
+            if name in seen:
+                duplicates.append(name)
+            seen.add(name)
+
+        if duplicates:
+            raise ValueError(f"Duplicate sortable names found: {duplicates}")
+
+        return value
+
+    @model_validator(mode="after")
+    def validate_sortables_consistency(self) -> "Sortables":
+        """Additional validation for the entire sortables collection"""
+        heat_network_types = [s for s in self.sortables if s.type == "heat_network"]
+        if len(heat_network_types) > 0:
+            # All heat_network sortables should have subtypes
+            without_subtypes = [s for s in heat_network_types if s.subtype is None]
+            if without_subtypes:
+                raise ValueError("All heat_network sortables must have subtypes")
+
+        return self
+
     @classmethod
     def from_json(cls, data: Dict[str, Any]) -> "Sortables":
         """
@@ -103,13 +232,10 @@ def from_json(cls, data: Dict[str, Any]) -> "Sortables":
         for pair in data.items():
             items.extend(Sortable.from_json(pair))
 
-        collection = cls.model_validate({"sortables": items})
+        # Use Base class constructor that handles validation gracefully
+        collection = cls(sortables=items)
 
-        # Merge any warnings from individual sortables
-        for sortable in items:
-            if hasattr(sortable, "warnings") and sortable.warnings:
-                for warning in sortable.warnings:
-                    collection.add_warning(warning)
+        collection._merge_submodel_warnings(*items, key_attr="type")
 
         return collection
 
@@ -125,7 +251,45 @@ def as_dict(self) -> Dict[str, Any]:
                 result[s.type] = s.order
         return result
 
-    def to_dataframe(self) -> pd.DataFrame:
+    def _to_dataframe(self, **kwargs) -> pd.DataFrame:
+        """
+        Serialize the Sortables collection to DataFrame.
+        """
         return pd.DataFrame.from_dict(
             {s.name(): s.order for s in self.sortables}, orient="index"
         ).T
+
+    @classmethod
+    def _from_dataframe(cls, df: pd.DataFrame, **kwargs) -> "Sortables":
+        if df is None:
+            return cls(sortables=[])
+
+        # Ensure DataFrame
+        if isinstance(df, pd.Series):
+            df = df.to_frame(name=str(df.name))
+
+        def _extract_order(series: pd.Series) -> List[Any]:
+            s = series.dropna()
+            if s.dtype == object:
+                s = s.astype(str).map(lambda v: v.strip()).replace({"": pd.NA}).dropna()
+            return s.tolist()
+
+        items: List[Sortable] = []
+        for col in df.columns:
+            name = str(col)
+            order = _extract_order(df[col])
+            if not order:
+                continue
+
+            if name.startswith("heat_network_"):
+                subtype = name[len("heat_network_") :]
+                items.append(
+                    Sortable(type="heat_network", subtype=subtype, order=order)
+                )
+            else:
+                items.append(Sortable(type=name, order=order))
+
+        return cls(sortables=items)
+
+    def to_updates_dict(self) -> Dict[str, List[Any]]:
+        return {s.name(): s.order for s in self.sortables}
diff --git a/src/pyetm/models/warnings.py b/src/pyetm/models/warnings.py
new file mode 100644
index 0000000..8c68774
--- /dev/null
+++ b/src/pyetm/models/warnings.py
@@ -0,0 +1,200 @@
+from __future__ import annotations
+from typing import Any, Optional, Dict, List, Union, Literal
+from dataclasses import dataclass, field
+from datetime import datetime
+
+
+@dataclass
+class ModelWarning:
+    """Individual warning with context and metadata."""
+
+    field: str
+    message: str
+    severity: Literal["info", "warning", "error"] = "warning"
+    timestamp: datetime = field(default_factory=datetime.now)
+
+    def __str__(self) -> str:
+        return f"{self.field}: {self.message}"
+
+    def __repr__(self) -> str:
+        return f"ModelWarning(field='{self.field}', message='{self.message}', severity='{self.severity}')"
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Convert to dictionary for serialization."""
+        return {
+            "field": self.field,
+            "message": self.message,
+            "severity": self.severity,
+            "timestamp": self.timestamp.isoformat(),
+        }
+
+
+class WarningCollector:
+    """Manages warnings for a model instance with a clean API."""
+
+    def __init__(self):
+        self._warnings: List[ModelWarning] = []
+
+    @classmethod
+    def with_warning(
+        cls, field: str, message: str, severity: str = "warning"
+    ) -> "WarningCollector":
+        """
+        Convenience method to create a WarningCollector with a single warning.
+        """
+        collector = cls()
+        collector.add(field, message, severity)
+        return collector
+
+    def add(
+        self,
+        field: str,
+        message: Union[str, List[str], Dict[str, Any]],
+        severity: str = "warning",
+    ) -> None:
+        """
+        Add warning(s) to the collection.
+        """
+        if isinstance(message, str):
+            self._warnings.append(ModelWarning(field, message, severity))
+
+        elif isinstance(message, list):
+            for msg in message:
+                if isinstance(msg, str):
+                    self._warnings.append(ModelWarning(field, msg, severity))
+                else:
+                    self._warnings.append(ModelWarning(field, str(msg), severity))
+
+        elif isinstance(message, dict):
+            # Handle nested warning dictionaries (like from submodels)
+            for sub_field, sub_messages in message.items():
+                nested_field = f"{field}.{sub_field}"
+                self.add(nested_field, sub_messages, severity)
+        else:
+            # Fallback for any other type
+            self._warnings.append(ModelWarning(field, str(message), severity))
+
+    def clear(self, field: Optional[str] = None) -> None:
+        """Clear warnings. If field is specified, clear only that field."""
+        if field is None:
+            self._warnings.clear()
+        else:
+            self._warnings = [w for w in self._warnings if w.field != field]
+
+    def get_by_field(self, field: str) -> List[ModelWarning]:
+        """Get all warnings for a specific field."""
+        return [w for w in self._warnings if w.field == field]
+
+    def has_warnings(self, field: Optional[str] = None) -> bool:
+        """Check if warnings exist. If field specified, check only that field."""
+        if field is None:
+            return len(self._warnings) > 0
+        return any(w.field == field for w in self._warnings)
+
+    def get_fields_with_warnings(self) -> List[str]:
+        """Get list of all fields that have warnings."""
+        return list(set(w.field for w in self._warnings))
+
+    def to_dict(self) -> Dict[str, List[Dict[str, Any]]]:
+        """Convert to dictionary grouped by field."""
+        result = {}
+        for warning in self._warnings:
+            if warning.field not in result:
+                result[warning.field] = []
+            result[warning.field].append(warning.to_dict())
+        return result
+
+    def merge_from(self, other: "WarningCollector", prefix: str = "") -> None:
+        """
+        Merge warnings from another collector, optionally with a field prefix.
+        """
+        for warning in other._warnings:
+            field = f"{prefix}.{warning.field}" if prefix else warning.field
+            self._warnings.append(
+                ModelWarning(
+                    field=field,
+                    message=warning.message,
+                    severity=warning.severity,
+                    timestamp=warning.timestamp,
+                )
+            )
+
+    def merge_submodel_warnings(
+        self, *submodels, key_attr: Optional[str] = None
+    ) -> None:
+        """
+        Merge warnings from Base model instances.
+        """
+        for submodel in submodels:
+            if hasattr(submodel, "_warning_collector"):
+                # Determine prefix for nested warnings
+                prefix = submodel.__class__.__name__
+                if key_attr and hasattr(submodel, key_attr):
+                    key_value = getattr(submodel, key_attr)
+                    prefix = f"{prefix}({key_attr}={key_value})"
+
+                self.merge_from(submodel._warning_collector, prefix)
+
+    def show_warnings(self) -> None:
+        """Print all warnings to console in a readable format."""
+        if not self._warnings:
+            print("No warnings.")
+            return
+
+        print("Warnings:")
+        grouped = {}
+        for warning in self._warnings:
+            if warning.field not in grouped:
+                grouped[warning.field] = []
+            grouped[warning.field].append(warning)
+
+        for field, warnings in grouped.items():
+            print(f"  {field}:")
+            for warning in warnings:
+                severity_indicator = (
+                    "[WARNING]"
+                    if warning.severity == "warning"
+                    else "[ERROR]" if warning.severity == "error" else "[INFO]"
+                )
+                print(f"    {severity_indicator} {warning.message}")
+
+    def __len__(self) -> int:
+        """Return number of warnings."""
+        return len(self._warnings)
+
+    def __bool__(self) -> bool:
+        """Return True if there are warnings."""
+        return len(self._warnings) > 0
+
+    def __iter__(self):
+        """Iterate over warnings."""
+        return iter(self._warnings)
+
+    def __repr__(self) -> str:
+        """Nice string representation showing warning summary."""
+        if not self._warnings:
+            return "WarningCollector(no warnings)"
+
+        # Group by field for summary
+        field_counts = {}
+        severity_counts = {"error": 0, "warning": 0, "info": 0}
+
+        for warning in self._warnings:
+            field_counts[warning.field] = field_counts.get(warning.field, 0) + 1
+            severity_counts[warning.severity] += 1
+
+        # Build summary string
+        total = len(self._warnings)
+        severity_parts = []
+        for sev, count in severity_counts.items():
+            if count > 0:
+                severity_parts.append(f"{count} {sev}")
+
+        severity_str = ", ".join(severity_parts)
+        field_summary = (
+            f"{len(field_counts)} fields" if len(field_counts) != 1 else "1 field"
+        )
+
+        return (
+            f"WarningCollector({total} warnings: {severity_str} across {field_summary})"
+        )
diff --git a/src/pyetm/services/scenario_runners/create_scenario.py b/src/pyetm/services/scenario_runners/create_scenario.py
index 1696539..98d6606 100644
--- a/src/pyetm/services/scenario_runners/create_scenario.py
+++ b/src/pyetm/services/scenario_runners/create_scenario.py
@@ -27,6 +27,7 @@ class CreateScenarioRunner(BaseRunner[Dict[str, Any]]):
         "keep_compatible",
         "private",
         "source",
+        "title",
         "metadata",
         "start_year",
         "scaling",
diff --git a/src/pyetm/services/scenario_runners/fetch_couplings.py b/src/pyetm/services/scenario_runners/fetch_couplings.py
new file mode 100644
index 0000000..1e100a2
--- /dev/null
+++ b/src/pyetm/services/scenario_runners/fetch_couplings.py
@@ -0,0 +1,45 @@
+from typing import Any, Dict
+
+from pyetm.services.scenario_runners.base_runner import BaseRunner
+from ..service_result import ServiceResult
+from pyetm.clients.base_client import BaseClient
+
+
+class FetchCouplingsRunner(BaseRunner[Dict[str, Any]]):
+    """
+    Runner for reading the coupling information of a scenario.
+
+    GET /api/v3/scenarios/{scenario_id}
+    """
+
+    COUPLING_KEYS = [
+        "active_couplings",
+        "inactive_couplings",
+    ]
+
+    @staticmethod
+    def run(
+        client: BaseClient,
+        scenario: Any,
+    ) -> ServiceResult[Dict[str, Any]]:
+        result = FetchCouplingsRunner._make_request(
+            client=client, method="get", path=f"/scenarios/{scenario.id}"
+        )
+
+        if not result.success:
+            return result
+
+        # Extract coupling-related data from response
+        body = result.data
+        coupling_data: Dict[str, Any] = {}
+        warnings: list[str] = []
+
+        for key in FetchCouplingsRunner.COUPLING_KEYS:
+            if key in body:
+                coupling_data[key] = body[key]
+            else:
+                # non-breaking: warning for missing coupling data
+                coupling_data[key] = None
+                warnings.append(f"Missing coupling field in response: {key!r}")
+
+        return ServiceResult.ok(data=coupling_data, errors=warnings)
diff --git a/src/pyetm/services/scenario_runners/fetch_output_curves.py b/src/pyetm/services/scenario_runners/fetch_output_curves.py
index a187a04..6d0eb4d 100644
--- a/src/pyetm/services/scenario_runners/fetch_output_curves.py
+++ b/src/pyetm/services/scenario_runners/fetch_output_curves.py
@@ -1,8 +1,8 @@
 import io
-from typing import Any, Dict
+from typing import Any, Dict, List, Optional
+import pandas as pd
 from pyetm.services.scenario_runners.base_runner import BaseRunner
 from pyetm.services.scenario_runners.fetch_curves_generic import (
-    GenericCurveBulkRunner,
     GenericCurveDownloadRunner,
 )
 from ..service_result import ServiceResult
@@ -26,7 +26,6 @@ def run(
 class FetchAllOutputCurvesRunner(BaseRunner[Dict[str, io.StringIO]]):
     """Download all known output curves."""
 
-    # Known curve types from the Rails controller
     CURVE_TYPES = [
         "merit_order",
         "electricity_price",
@@ -44,10 +43,63 @@ class FetchAllOutputCurvesRunner(BaseRunner[Dict[str, io.StringIO]]):
     def run(
         client: BaseClient,
         scenario: Any,
+        curve_types: Optional[List[str]] = None,
     ) -> ServiceResult[Dict[str, io.StringIO]]:
-        return GenericCurveBulkRunner.run(
-            client,
-            scenario,
-            FetchAllOutputCurvesRunner.CURVE_TYPES,
-            curve_type="output",
-        )
+        """
+        Uses the bulk endpoint to fetch output curves as a single CSV,
+        then splits them into their carrier groups
+
+        Args:
+            client: The API client
+            scenario: The scenario object
+            curve_types: Optional list of curve types to fetch. If None, fetches all default curves.
+        """
+        try:
+            types_to_fetch = curve_types or FetchAllOutputCurvesRunner.CURVE_TYPES
+
+            path = f"/scenarios/{scenario.id}/bulk_output_curves"
+            params = {"curve_types": ",".join(types_to_fetch)}
+            resp = client.session.get(
+                path, params=params, headers={"Accept": "text/csv"}
+            )
+
+            if not resp.ok:
+                return ServiceResult.fail([f"{resp.status_code}: {resp.text}"])
+
+            try:
+                csv_text = resp.content.decode("utf-8")
+                df = pd.read_csv(io.StringIO(csv_text), index_col=0)
+            except Exception as e:
+                return ServiceResult.fail([f"Failed to parse bulk CSV: {e}"])
+
+            results: Dict[str, io.StringIO] = {}
+            warnings: list[str] = []
+
+            groups: Dict[str, list[str]] = {}
+            for col in df.columns:
+                base = str(col)
+                for sep in (":", "/"):
+                    if sep in base:
+                        base = base.split(sep, 1)[0]
+                        break
+                groups.setdefault(base, []).append(col)
+
+            for base, cols in groups.items():
+                try:
+                    sub = df[cols].dropna(how="all")
+                    buf = io.StringIO()
+                    sub.to_csv(buf, index=True)
+                    buf.seek(0)
+                    results[base] = buf
+                except Exception as e:
+                    warnings.append(f"{base}: Failed to prepare CSV: {e}")
+
+            if results:
+                return ServiceResult.ok(data=results, errors=warnings or None)
+            else:
+                return ServiceResult.fail(warnings or ["No curves present in CSV"])
+
+        except (PermissionError, ValueError, ConnectionError) as e:
+            return ServiceResult.fail([str(e)])
+        except Exception as e:
+            return ServiceResult.fail([str(e)])
diff --git a/src/pyetm/services/scenario_runners/update_couplings.py b/src/pyetm/services/scenario_runners/update_couplings.py
new file mode 100644
index 0000000..4143129
--- /dev/null
+++ b/src/pyetm/services/scenario_runners/update_couplings.py
@@ -0,0 +1,73 @@
+from typing import Any, Dict, List, Union
+
+from pyetm.services.scenario_runners.base_runner import BaseRunner
+from ..service_result import ServiceResult
+from pyetm.clients.base_client import BaseClient
+
+
+class UpdateCouplingsRunner(BaseRunner[Dict[str, Any]]):
+    """
+    Runner for updating coupling groups in a scenario.
+
+    POST /api/v3/scenarios/{scenario_id}/couple
+    POST /api/v3/scenarios/{scenario_id}/uncouple
+    """
+
+    @staticmethod
+    def run(
+        client: BaseClient,
+        scenario: Any,
+        coupling_groups: List[str],
+        action: str = "couple",
+        force: bool = False,
+    ) -> ServiceResult[Dict[str, Any]]:
+        """
+        Update coupling groups for a scenario.
+
+        Args:
+            client: The API client
+            scenario: The scenario object with an id attribute
+            coupling_groups: List of coupling group names to couple/uncouple
+            action: Either "couple" or "uncouple"
+            force: If True and action is "uncouple", force uncouple all groups
+        """
+        if action not in ["couple", "uncouple"]:
+            return ServiceResult.error(
+                errors=[f"Invalid action: {action}. Must be 'couple' or 'uncouple'"]
+            )
+
+        # Prepare request data
+        data: Dict[str, Union[List[str], bool]] = {"groups": coupling_groups}
+
+        if action == "uncouple" and force:
+            data["force"] = True
+
+        result = UpdateCouplingsRunner._make_request(
+            client=client,
+            method="post",
+            path=f"/scenarios/{scenario.id}/{action}",
+            json=data,
+        )
+
+        if not result.success:
+            return result
+
+        # The response should be the updated scenario data
+        body = result.data
+        coupling_data: Dict[str, Any] = {}
+        warnings: list[str] = []
+
+        # Extract relevant coupling information from the response
+        coupling_keys = [
+            "active_couplings",
+            "inactive_couplings",
+        ]
+
+        for key in coupling_keys:
+            if key in body:
+                coupling_data[key] = body[key]
+            else:
+                coupling_data[key] = None
+                warnings.append(f"Missing coupling field in response: {key!r}")
+
+        return ServiceResult.ok(data=coupling_data, errors=warnings)
diff --git a/src/pyetm/services/scenario_runners/update_custom_curves.py b/src/pyetm/services/scenario_runners/update_custom_curves.py
new file mode 100644
index 0000000..5cc305c
--- /dev/null
+++ b/src/pyetm/services/scenario_runners/update_custom_curves.py
@@ -0,0 +1,83 @@
+from typing import Any, Dict
+from pyetm.services.scenario_runners.base_runner import BaseRunner
+from ..service_result import ServiceResult
+from pyetm.clients.base_client import BaseClient
+
+
+class UpdateCustomCurvesRunner(BaseRunner[Dict[str, Any]]):
+    """
+    Runner for uploading custom curves to a scenario.
+    """
+
+    @staticmethod
+    def run(
+        client: BaseClient,
+        scenario: Any,
+        custom_curves: Any,
+        **kwargs,
+    ) -> ServiceResult[Dict[str, Any]]:
+        """Upload all curves in the CustomCurves object."""
+
+        all_errors = []
+        successful_uploads = []
+
+        for curve in custom_curves.curves:
+            try:
+                if curve.file_path and curve.file_path.exists():
+                    # Use file
+                    with open(curve.file_path, "r") as f:
+                        files = {
+                            "file": (f"{curve.key}.csv", f, "application/octet-stream")
+                        }
+                        # Override Content-Type header so multipart/form-data is used
+                        headers = {"Content-Type": None}
+
+                        result = UpdateCustomCurvesRunner._make_request(
+                            client=client,
+                            method="put",
+                            path=f"/scenarios/{scenario.id}/custom_curves/{curve.key}",
+                            files=files,
+                            headers=headers,
+                        )
+                else:
+                    # Create file content from curve data
+                    curve_data = curve.contents()
+                    file_content = "\n".join(str(value) for value in curve_data)
+                    files = {
+                        "file": (
+                            f"{curve.key}.csv",
+                            file_content,
+                            "application/octet-stream",
+                        )
+                    }
+                    # Override Content-Type header so multipart/form-data is used
+                    headers = {"Content-Type": None}
+
+                    result = UpdateCustomCurvesRunner._make_request(
+                        client=client,
+                        method="put",
+                        path=f"/scenarios/{scenario.id}/custom_curves/{curve.key}",
+                        files=files,
+                        headers=headers,
+                    )
+
+                # Check if the request was successful
+                if result.success:
+                    successful_uploads.append(curve.key)
+                else:
+                    for err in result.errors:
+                        all_errors.append(f"{curve.key}: {err}")
+
+            except Exception as e:
+                all_errors.append(f"Error uploading {curve.key}: {str(e)}")
+
+        # TODO: This provides some aggregated results, because we actually get multiple ServiceResults - one for each curve upload. Explore further.
+        return ServiceResult(
+            success=len(all_errors) == 0,
+            data={
+                "uploaded_curves": successful_uploads,
+                "total_curves": len(custom_curves.curves),
+                "successful_uploads": len(successful_uploads),
+            },
+            errors=all_errors,
+        )
diff --git a/src/pyetm/services/scenario_runners/update_metadata.py b/src/pyetm/services/scenario_runners/update_metadata.py
index bb1b2b8..4bbbc87 100644
--- a/src/pyetm/services/scenario_runners/update_metadata.py
+++ b/src/pyetm/services/scenario_runners/update_metadata.py
@@ -17,20 +17,19 @@ class UpdateMetadataRunner(BaseRunner[Dict[str, Any]]):
         **kwargs: Additional arguments passed to the request
     """
 
-    # TODO: Investigate why end_year is not setting correctly
     META_KEYS = [
         "keep_compatible",
         "private",
         "source",
         "metadata",
         "end_year",
+        "title",
     ]
     UNSETTABLE_META_KEYS = [
         "id",
         "created_at",
         "updated_at",
         "area_code",
-        "title",
         "start_year",
         "scaling",
         "template",
@@ -78,6 +77,15 @@ def run(
         if hasattr(scenario, "metadata") and isinstance(scenario.metadata, dict):
             existing_metadata = scenario.metadata.copy()
 
+        legacy_title = None
+        if isinstance(existing_metadata, dict):
+            legacy_title = existing_metadata.pop("title", None)
+        if "metadata" in direct_fields and isinstance(direct_fields["metadata"], dict):
+            direct_fields["metadata"].pop("title", None)
+        nested_metadata.pop("title", None)
+        if legacy_title is not None and "title" not in direct_fields:
+            direct_fields["title"] = legacy_title
+
         final_metadata = existing_metadata.copy()
         if nested_metadata:
             final_metadata.update(nested_metadata)
diff --git a/src/pyetm/services/scenario_runners/update_sortables.py b/src/pyetm/services/scenario_runners/update_sortables.py
new file mode 100644
index 0000000..59679b4
--- /dev/null
+++ b/src/pyetm/services/scenario_runners/update_sortables.py
@@ -0,0 +1,47 @@
+from typing import Any, Dict, List
+from pyetm.services.scenario_runners.base_runner import BaseRunner
+from ..service_result import ServiceResult
+from pyetm.clients.base_client import BaseClient
+
+
+class UpdateSortablesRunner(BaseRunner[Dict[str, Any]]):
+    """
+    Runner for updating a single user sortable on a scenario.
+
+    PUT /api/v3/scenarios/{scenario_id}/user_sortables/{sortable_type}
+    PUT /api/v3/scenarios/{scenario_id}/user_sortables/{sortable_type}?subtype={subtype}
+
+    Args:
+        client: The HTTP client to use
+        scenario: The scenario object (must have an 'id' attribute)
+        sortable_type: The type of sortable (e.g., "demand", "heat_network")
+        order: The new order for the sortable
+        subtype: Optional subtype for heat_network (e.g., "lt", "mt", "ht")
+        **kwargs: Additional arguments passed to the request
+    """
+
+    @staticmethod
+    def run(
+        client: BaseClient,
+        scenario: Any,
+        sortable_type: str,
+        order: List[Any],
+        subtype: str = None,
+        **kwargs,
+    ) -> ServiceResult[Dict[str, Any]]:
+        """
+        Update a single sortable for a scenario - the endpoint doesn't handle bulk updates.
+
+        """
+        path = f"/scenarios/{scenario.id}/user_sortables/{sortable_type}"
+        if subtype:
+            path += f"?subtype={subtype}"
+
+        payload = {"order": order}
+
+        return UpdateSortablesRunner._make_request(
+            client=client,
+            method="put",
+            path=path,
+            payload=payload,
+        )
diff --git a/src/pyetm/utils/excel.py b/src/pyetm/utils/excel.py
index 0dc4b61..5e1f86b 100644
--- a/src/pyetm/utils/excel.py
+++ b/src/pyetm/utils/excel.py
@@ -69,6 +69,52 @@ def write_index(
             worksheet.write(row + row_offset, 0, value)
 
 
+def create_scenario_formats(workbook: Workbook) -> dict:
+    """Create alternating background formats for scenario blocks"""
+    return {
+        "white_header": workbook.add_format(
+            {"bold": True, "bg_color": "#FFFFFF", "border": 1, "align": "center"}
+        ),
+        "grey_header": workbook.add_format(
+            {"bold": True, "bg_color": "#D9D9D9", "border": 1, "align": "center"}
+        ),
+        "white_data": workbook.add_format(
+            {"bg_color": "#FFFFFF", "border": 1, "align": "left"}
+        ),
+        "grey_data": workbook.add_format(
+            {"bg_color": "#D9D9D9", "border": 1, "align": "left"}
+        ),
+        "bold": workbook.add_format({"bold": True}),
+        "default": None,
+    }
+
+
+def get_scenario_blocks(columns: pd.MultiIndex) -> List[tuple]:
+    """
+    Identify scenario blocks in multi-index columns
+    Returns list of (scenario_name, start_col, end_col) tuples
+    """
+    if not isinstance(columns, pd.MultiIndex):
+        return []
+
+    blocks = []
+    current_scenario = None
+    start_col = None
+
+    for i, (scenario, _) in enumerate(columns):
+        if scenario != current_scenario:
+            if current_scenario is not None:
+                blocks.append((current_scenario, start_col, i - 1))
+            current_scenario = scenario
+            start_col = i
+
+    # Add the last block
+    if current_scenario is not None:
+        blocks.append((current_scenario, start_col, len(columns) - 1))
+
+    return blocks
+
+
 def add_frame(
     name: str,
     frame: pd.DataFrame,
@@ -80,8 +126,8 @@ def add_frame(
     bold_headers: bool = True,
     nan_as_formula: bool = True,
     decimal_precision: int = 10,
+    scenario_styling: bool = True,
 ) -> Worksheet:
-    """Add DataFrame to workbook as a new worksheet"""
 
     # Create worksheet
     worksheet = workbook.add_worksheet(str(name))
@@ -94,50 +140,140 @@ def add_frame(
         ),
     )
 
-    # Create bold format
-    bold_format = workbook.add_format({"bold": True}) if bold_headers else None
+    # Create formats
+    formats = (
+        create_scenario_formats(workbook)
+        if scenario_styling
+        else {
+            "bold": workbook.add_format({"bold": True}) if bold_headers else None,
+            "default": None,
+        }
+    )
 
     # Calculate offsets
     col_offset = frame.index.nlevels if index else 0
     row_offset = frame.columns.nlevels
 
-    # Adjust row offset if index has names
-    if index and frame.index.names != [None] * frame.index.nlevels:
-        row_offset += 1
+    # Handle multi-index columns with scenario styling
+    if isinstance(frame.columns, pd.MultiIndex) and scenario_styling:
+        # Get scenario blocks for alternating colors
+        scenario_blocks = get_scenario_blocks(frame.columns)
 
-    # Write column headers
-    if isinstance(frame.columns, pd.MultiIndex):
         # Write column names
-        if index and frame.columns.names != [None] * frame.columns.nlevels:
+        if frame.columns.names != [None] * frame.columns.nlevels:
             for idx, name in enumerate(frame.columns.names):
                 if name is not None:
-                    worksheet.write(idx, col_offset - 1, name, bold_format)
+                    worksheet.write(idx, col_offset - 1, name, formats["bold"])
 
-        # Write column values
+        # Write column headers with alternating scenario backgrounds
         for col_num, values in enumerate(frame.columns.values):
+            # Determine which scenario block this column belongs to
+            scenario_idx = next(
+                (
+                    i
+                    for i, (_, start, end) in enumerate(scenario_blocks)
+                    if start <= col_num <= end
+                ),
+                0,
+            )
+            is_grey = scenario_idx % 2 == 1
+            header_format = (
+                formats["grey_header"] if is_grey else formats["white_header"]
+            )
+
             for row_num, value in enumerate(values):
-                worksheet.write(row_num, col_num + col_offset, value, bold_format)
+                worksheet.write(row_num, col_num + col_offset, value, header_format)
+
+        # Write data with scenario block coloring
+        for row_num, row_data in enumerate(frame.values):
+            for col_num, value in enumerate(row_data):
+                # Determine scenario block
+                scenario_idx = next(
+                    (
+                        i
+                        for i, (_, start, end) in enumerate(scenario_blocks)
+                        if start <= col_num <= end
+                    ),
+                    0,
+                )
+                is_grey = scenario_idx % 2 == 1
+                data_format = formats["grey_data"] if is_grey else formats["white_data"]
+
+                worksheet.write(
+                    row_num + row_offset, col_num + col_offset, value, data_format
+                )
+
     else:
-        # Write simple column headers
-        for col_num, value in enumerate(frame.columns.values):
-            worksheet.write(row_offset - 1, col_num + col_offset, value, bold_format)
+        # Standard column handling or single-index scenario styling
+        bold_format = formats.get("bold") if bold_headers else None
+
+        if isinstance(frame.columns, pd.MultiIndex):
+            # Write column names without styling
+            if frame.columns.names != [None] * frame.columns.nlevels:
+                for idx, name in enumerate(frame.columns.names):
+                    if name is not None:
+                        worksheet.write(idx, col_offset - 1, name, bold_format)
+
+            # Write column values
+            for col_num, values in enumerate(frame.columns.values):
+                for row_num, value in enumerate(values):
+                    worksheet.write(row_num, col_num + col_offset, value, bold_format)
+
+            # Write data without styling
+            for row_num, row_data in enumerate(frame.values):
+                for col_num, value in enumerate(row_data):
+                    worksheet.write(row_num + row_offset, col_num + col_offset, value)
+        else:
+            # Single-level columns
+            if scenario_styling:
+                # Alternate header backgrounds by scenario column
+                for col_num, value in enumerate(frame.columns.values):
+                    is_grey = (col_num % 2) == 1
+                    header_format = (
+                        formats["grey_header"] if is_grey else formats["white_header"]
+                    )
+                    worksheet.write(
+                        row_offset - 1, col_num + col_offset, value, header_format
+                    )
+
+                # Alternate data backgrounds by scenario column
+                for row_num, row_data in enumerate(frame.values):
+                    for col_num, value in enumerate(row_data):
+                        is_grey = (col_num % 2) == 1
+                        data_format = (
+                            formats["grey_data"] if is_grey else formats["white_data"]
+                        )
+                        worksheet.write(
+                            row_num + row_offset,
+                            col_num + col_offset,
+                            value,
+                            data_format,
+                        )
+            else:
+                # No scenario styling: write simple headers and data
+                for col_num, value in enumerate(frame.columns.values):
+                    worksheet.write(
+                        row_offset - 1, col_num + col_offset, value, bold_format
+                    )
+
+                for row_num, row_data in enumerate(frame.values):
+                    for col_num, value in enumerate(row_data):
+                        worksheet.write(
+                            row_num + row_offset, col_num + col_offset, value
+                        )
 
     # Set column widths
     set_column_widths(worksheet, col_offset, len(frame.columns), column_width)
 
-    # Write data
-    for row_num, row_data in enumerate(frame.values):
-        for col_num, value in enumerate(row_data):
-            worksheet.write(row_num + row_offset, col_num + col_offset, value)
-
-    # Write index
     if index:
         set_column_widths(
             worksheet, 0, frame.index.nlevels, index_width or column_width
         )
-        write_index(worksheet, frame.index, row_offset, bold_format)
 
-    # Freeze panes
+        # Create index format matching the styling
+        index_format = formats.get("bold") if bold_headers else None
+        write_index(worksheet, frame.index, row_offset, index_format)
+
     if freeze_panes:
         worksheet.freeze_panes(row_offset, col_offset)
 
@@ -156,7 +292,6 @@ def add_series(
     nan_as_formula: bool = True,
     decimal_precision: int = 10,
 ) -> Worksheet:
-    """Add Series to workbook as a new worksheet"""
 
     # Create worksheet
     worksheet = workbook.add_worksheet(str(name))
diff --git a/src/pyetm/utils/paths.py b/src/pyetm/utils/paths.py
new file mode 100644
index 0000000..4527066
--- /dev/null
+++ b/src/pyetm/utils/paths.py
@@ -0,0 +1,87 @@
+from __future__ import annotations
+from pathlib import Path
+from typing import Optional, Union
+
+
+PathLikeOrStr = Union[str, Path]
+
+
+class PyetmPaths:
+    """
+    - Reads: if given a relative path that does not exist, try under <root>/inputs.
+    - Writes: if given a relative path, place it under <root>/outputs.
+    - Absolute paths are always respected.
+    - Root discovery: walk upwards from CWD and this file's directory to find a
+      directory containing the requested subdirectory (e.g., 'inputs' or 'outputs').
+    """
+
+    def __init__(self, start: Optional[Path] = None):
+        self._start = Path(start) if start else Path.cwd()
+
+    @staticmethod
+    def _find_root_with(dir_name: str, start: Optional[Path] = None) -> Path:
+        """Find a root directory that contains the given subdirectory name."""
+        candidates = []
+        base_from_start = Path.cwd() if start is None else Path(start)
+        candidates.extend([base_from_start, *base_from_start.parents])
+
+        here = Path(__file__).resolve().parent
+        candidates.extend([here, *here.parents])
+
+        for base in candidates:
+            probe = base / dir_name
+            try:
+                if probe.exists() and probe.is_dir():
+                    return base
+            except Exception:
+                continue
+
+        return base_from_start
+
+    def inputs_dir(self) -> Path:
+        root = self._find_root_with("inputs", self._start)
+        return root / "inputs"
+
+    def outputs_dir(self) -> Path:
+        root = self._find_root_with("outputs", self._start)
+        return root / "outputs"
+
+    def resolve_for_read(
+        self, path: PathLikeOrStr, *, default_dir: str = "inputs"
+    ) -> Path:
+        p = Path(path)
+        if p.is_absolute() or p.exists():
+            return p
+
+        base = (
+            self.inputs_dir()
+            if default_dir == "inputs"
+            else self._find_root_with(default_dir, self._start) / default_dir
+        )
+        # Preserve any sub-paths the user provided
+        relative = p if str(p.parent) != "." else Path(p.name)
+        candidate = base / relative
+        return candidate if candidate.exists() else p
+
+    def resolve_for_write(
+        self,
+        path: PathLikeOrStr,
+        *,
+        default_dir: str = "outputs",
+        create_parents: bool = True,
+    ) -> Path:
+        p = Path(path)
+        if p.is_absolute():
+            if create_parents:
+                p.parent.mkdir(parents=True, exist_ok=True)
+            return p
+
+        base = (
+            self.outputs_dir()
+            if default_dir == "outputs"
+            else self._find_root_with(default_dir, self._start) / default_dir
+        )
+        out = base / p
+        if create_parents:
+            out.parent.mkdir(parents=True, exist_ok=True)
+        return out
diff --git a/tests/conftest.py b/tests/conftest.py
index 185252a..eebb435 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -5,6 +5,7 @@
 
 from pydantic import HttpUrl
 import os, sys, pytest
+from pathlib import Path
 
 # Ensure src/ is on sys.path before any imports of your app code
 ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
@@ -12,7 +13,6 @@
 if SRC not in sys.path:
     sys.path.insert(0, SRC)
 
-# Set the ENV vars at import time so BaseClient picks up the test URL and token
 os.environ["BASE_URL"] = "https://example.com/api"
 os.environ["ETM_API_TOKEN"] = "etm_real.looking.token"
 
diff --git a/tests/models/conftest.py b/tests/models/conftest.py
index 7149d98..b5ce673 100644
--- a/tests/models/conftest.py
+++ b/tests/models/conftest.py
@@ -10,10 +10,69 @@
 import pytest
 from datetime import datetime
 from pathlib import Path
+from pyetm.models.sortables import Sortables
 from pyetm.models.scenario import Scenario
+from pyetm.models.output_curves import OutputCurves
 
 
 # --- Scenario Fixtures --- #
+@pytest.fixture
+def multiple_scenarios():
+    """Create multiple scenarios for testing"""
+    scenarios = []
+    for i in range(3):
+        scenario = Mock(spec=Scenario)
+        scenario.id = f"scenario_{i}"
+        scenario.area_code = "nl2015"
+        scenario.end_year = 2050
+        scenario.start_year = 2019
+        scenario.identifier = Mock(return_value=scenario.id)
+        scenarios.append(scenario)
+    return scenarios
+
+
+@pytest.fixture
+def scenario_with_inputs():
+    """Create a scenario with mock inputs"""
+    scenario = Mock(spec=Scenario)
+    scenario.id = "input_scenario"
+    scenario.area_code = "nl2015"
+    scenario.end_year = 2050
+    scenario.start_year = 2019
+    scenario.identifier = Mock(return_value=scenario.id)
+
+    # Mock inputs
+    scenario.inputs = Mock()
+    mock_df = pd.DataFrame(
+        {"user": [1000, 2000], "unit": ["MW", "MW"], "default": [500, 800]},
+        index=["wind_capacity", "solar_capacity"],
+    )
+    mock_df.index.name = "input"
+    scenario.inputs.to_dataframe = Mock(return_value=mock_df)
+
+    return scenario
+
+
+@pytest.fixture
+def scenario_with_queries():
+    """Create a scenario with mock queries"""
+    scenario = Mock(spec=Scenario)
+    scenario.id = "query_scenario"
+    scenario.area_code = "nl2015"
+    scenario.end_year = 2050
+    scenario.start_year = 2019
+    scenario.identifier = Mock(return_value=scenario.id)
+
+    # Mock queries
+    mock_results = pd.DataFrame(
+        {"future": [100, 200], "unit": ["MW", "GWh"]},
+        index=["total_demand", "co2_emissions"],
+    )
+    mock_results.index.name = "gquery"
+    scenario.results = Mock(return_value=mock_results)
+    scenario.queries_requested = Mock(return_value=True)
+
+    return scenario
 
 
 @pytest.fixture
@@ -154,6 +213,13 @@ def multiple_scenarios():
     return scenarios
 
 
+@pytest.fixture
+def patch_sortables_from_json(monkeypatch):
+    dummy = object()
+    monkeypatch.setattr(Sortables, "from_json", staticmethod(lambda data: dummy))
+    return dummy
+
+
 # --- Input Fixtures --- #
 
 
@@ -244,6 +310,20 @@ def sortable_collection_json():
     }
 
 
+@pytest.fixture
+def valid_sortable_collection_json():
+    """Fixture with valid data that won't trigger validation warnings"""
+    return {
+        "forecast_storage": ["fs1", "fs2"],
+        "heat_network": {
+            "lt": ["hn1", "hn2"],
+            "mt": ["hn3"],
+            "ht": ["hn4", "hn5", "hn6"],
+        },
+        "hydrogen_supply": ["hs1", "hs2", "hs3"],
+    }
+
+
 # --- Curve Fixtures --- #
 
 
@@ -290,3 +370,38 @@ def fixture_path():
 def interconnector_csv_path(fixture_path):
     """Path to the interconnector CSV fixture file"""
     return fixture_path / "interconnector_2_export_availability.csv"
+
+
+@pytest.fixture
+def carrier_mappings(monkeypatch):
+    mapping = {"electricity": {}, "gas": {}}
+    monkeypatch.setattr(
+        OutputCurves,
+        "_load_carrier_mappings",
+        staticmethod(lambda: mapping),
+        raising=True,
+    )
+    return mapping
+
+
+@pytest.fixture
+def mock_workbook(monkeypatch):
+    instance = Mock()
+    cls = Mock(return_value=instance)
+    monkeypatch.setattr(
+        "pyetm.models.packables.output_curves_pack.Workbook",
+        cls,
+        raising=True,
+    )
+    return {"cls": cls, "instance": instance}
+
+
+@pytest.fixture
+def patch_add_frame(monkeypatch):
+    m = Mock()
+    monkeypatch.setattr(
+        "pyetm.models.packables.output_curves_pack.add_frame",
+        m,
+        raising=True,
+    )
+    return m
diff --git a/tests/models/packables/test_custom_curves_pack.py b/tests/models/packables/test_custom_curves_pack.py
new file mode 100644
index 0000000..75c5bdf
--- /dev/null
+++ b/tests/models/packables/test_custom_curves_pack.py
@@ -0,0 +1,81 @@
+import pandas as pd
+from pyetm.models.packables.custom_curves_pack import CustomCurvesPack
+
+
+class MockScenario:
+    def __init__(self, id="id1"):
+        self.id = id
+        self.curves_updated_with = None
+        self.custom_series_called = False
+
+    def custom_curves_series(self):
+        self.custom_series_called = True
+        return [pd.Series([1, 2, 3], name="curve1")]
+
+    def identifier(self):
+        return f"scenario-{self.id}"
+
+    def update_custom_curves(self, curves):
+        self.curves_updated_with = curves
+
+
+class MockCustomCurves:
+    @staticmethod
+    def _from_dataframe(df, scenario_id=None):
+        return {"built_from": df.copy(), "scenario_id": scenario_id}
+
+
+def test_build_dataframe_for_scenario_returns_concatenated_df(monkeypatch):
+    pack = CustomCurvesPack()
+    scenario = MockScenario()
+
+    df = pack._build_dataframe_for_scenario(scenario)
+    assert isinstance(df, pd.DataFrame)
+    assert "curve1" in df.columns
+    assert scenario.custom_series_called
+
+
+def test_build_dataframe_for_scenario_returns_none_if_exception(monkeypatch):
+    pack = CustomCurvesPack()
+
+    def bad_series():
+        raise RuntimeError("bad")
+
+    scenario = MockScenario()
+    scenario.custom_curves_series = bad_series
+
+    result = pack._build_dataframe_for_scenario(scenario)
+    assert result is None
+
+
+def test_build_dataframe_for_scenario_returns_none_if_empty(monkeypatch):
+    pack = CustomCurvesPack()
+
+    def empty_series():
+        return []
+
+    scenario = MockScenario()
+    scenario.custom_curves_series = empty_series
+
+    result = pack._build_dataframe_for_scenario(scenario)
+    assert result is None
+
+
+def test_from_dataframe_returns_early_for_none_df():
+    pack = CustomCurvesPack()
+    assert pack.from_dataframe(None) is None
+
+
+def test_from_dataframe_returns_early_for_empty_df():
+    pack = CustomCurvesPack()
+    df = pd.DataFrame()
+    assert pack.from_dataframe(df) is None
+
+
+def test_from_dataframe_returns_early_if_not_multiindex(monkeypatch):
+    pack = CustomCurvesPack()
+
+    monkeypatch.setattr(pack, "_normalize_curves_dataframe", lambda df: df)
+
+    df = pd.DataFrame({"a": [1, 2]})
+    assert pack.from_dataframe(df) is None
diff --git a/tests/models/packables/test_gquery_pack.py b/tests/models/packables/test_gquery_pack.py
new file mode 100644
index 0000000..f548344
--- /dev/null
+++ b/tests/models/packables/test_gquery_pack.py
@@ -0,0 +1,85 @@
+import pandas as pd
+
+
+class MockScenario:
+    def __init__(self):
+        self.received_queries = None
+
+    def add_queries(self, queries):
+        self.received_queries = queries
+
+
+class DummyClass:
+    def __init__(self, scenarios):
+        self.scenarios = scenarios
+
+    def from_dataframe(self, df: pd.DataFrame):
+        if df is None or df.empty:
+            return
+
+        first_col = df.iloc[:, 0].dropna().astype(str).str.strip()
+
+        # Filter out empty strings and literal "nan"
+        filtered = [q for q in first_col if q and q.lower() != "nan"]
+
+        # Remove duplicates while preserving order
+        unique_queries = list(dict.fromkeys(filtered))
+
+        if unique_queries:
+            for scenario in self.scenarios:
+                scenario.add_queries(unique_queries)
+
+
+def test_from_dataframe_with_valid_data():
+    scenario1 = MockScenario()
+    scenario2 = MockScenario()
+    obj = DummyClass([scenario1, scenario2])
+
+    df = pd.DataFrame({"queries": ["q1", " q2 ", "q1", None, "nan", "  "]})
+
+    obj.from_dataframe(df)
+
+    expected = ["q1", "q2"]
+    assert scenario1.received_queries == expected
+    assert scenario2.received_queries == expected
+
+
+def test_from_dataframe_with_empty_df():
+    scenario = MockScenario()
+    obj = DummyClass([scenario])
+
+    df = pd.DataFrame({"queries": []})
+    obj.from_dataframe(df)
+
+    assert scenario.received_queries is None
+
+
+def test_from_dataframe_with_none_df():
+    scenario = MockScenario()
+    obj = DummyClass([scenario])
+
+    obj.from_dataframe(None)
+
+    assert scenario.received_queries is None
+
+
+def test_from_dataframe_strips_and_deduplicates():
+    scenario = MockScenario()
+    obj = DummyClass([scenario])
+
+    df = pd.DataFrame({"queries": [" a ", "a", "b", " B ", "nan", "NaN"]})
+
+    obj.from_dataframe(df)
+
+    assert scenario.received_queries == ["a", "b", "B"]
+
+
+def test_from_dataframe_preserves_order():
+    scenario = MockScenario()
+    obj = DummyClass([scenario])
+
+    df = pd.DataFrame({"queries": ["x", "y", "z", "x", "y"]})
+
+    obj.from_dataframe(df)
+
+    assert scenario.received_queries == ["x", "y", "z"]
diff --git a/tests/models/packables/test_inputs_pack.py b/tests/models/packables/test_inputs_pack.py
new file mode 100644
index 0000000..4e43cb0
--- /dev/null
+++ b/tests/models/packables/test_inputs_pack.py
@@ -0,0 +1,717 @@
+import pandas as pd
+from unittest.mock import Mock, patch
+import numpy as np
+
+from pyetm.models.packables.inputs_pack import InputsPack
+
+
+class DummyInput:
+    def __init__(self, key, user, default=None, min_val=None, max_val=None):
+        self.key = key
+        self.user = user
+        self.default = default
+        self.min = min_val
+        self.max = max_val
+
+
+def make_scenario(id_val, identifier=None):
+    s = Mock()
+    s.id = id_val
+    if identifier is None:
+        s.identifier = Mock(return_value=str(id_val))
+    else:
+        s.identifier = (
+            Mock(side_effect=identifier)
+            if callable(identifier)
+            else Mock(return_value=identifier)
+        )
+    s.update_user_values = Mock()
+    return s
+
+
+# Existing tests
+def test_key_for_prefers_short_name_and_fallbacks():
+    s1 = make_scenario(1, identifier="id-1")
+    s2 = make_scenario(2, identifier="id-2")
+
+    pack = InputsPack()
+    pack.set_scenario_short_names({"1": "S1"})
+
+    assert pack._get_scenario_display_key(s1) == "S1"  # short name wins
+    assert pack._get_scenario_display_key(s2) == "id-2"  # falls back to identifier
+
+    s3 = make_scenario(
+        3, identifier=lambda: (_ for _ in ()).throw(RuntimeError("boom"))
+    )
+    assert (
+        pack._get_scenario_display_key(s3) == 3
+    )  # falls back to id when identifier fails
+
+
+def test_resolve_scenario_by_short_identifier_and_numeric():
+    s1, s2, s3 = (
+        make_scenario(1, "ID1"),
+        make_scenario(2, "ID2"),
+        make_scenario(3, "ID3"),
+    )
+    pack = InputsPack()
+    pack.add(s1, s2, s3)
+    pack.set_scenario_short_names({"1": "S1"})
+
+    assert pack.resolve_scenario("S1") is s1  # short name
+    assert pack.resolve_scenario("ID2") is s2  # identifier
+    assert pack.resolve_scenario("3") is s3  # numeric id
+    assert pack.resolve_scenario("missing") is None
+
+
+def test_to_dataframe_from_iterable_inputs_only():
+    s = make_scenario(1, "S1")
+    s.inputs = [DummyInput("a", 10), DummyInput("b", 20)]
+
+    pack = InputsPack()
+    pack.add(s)
+    df = pack.to_dataframe()
+
+    assert list(df.index) == ["a", "b"]
+    assert "S1" in df.columns or 1 in df.columns
+    col = "S1" if "S1" in df.columns else 1
+    assert df.loc["a", col] == 10
+    assert df.loc["b", col] == 20
+    assert df.index.name == "input"
+
+
+def test_to_dataframe_from_df_and_series_variants():
+    s1 = make_scenario(1, "S1")
+    s1.inputs = Mock()
+    s1.inputs.__iter__ = Mock(side_effect=TypeError())
+    s1.inputs.to_dataframe = Mock(
+        return_value=pd.DataFrame(
+            {"user": [1, 2], "unit": ["MW", "MW"]}, index=["a", "b"]
+        ).set_index("unit", append=True)
+    )
+
+    s2 = make_scenario(2, "S2")
+    s2.inputs = Mock()
+    s2.inputs.__iter__ = Mock(side_effect=TypeError())
+    s2.inputs.to_dataframe = Mock(
+        return_value=pd.DataFrame({"value": [3, 4]}, index=["c", "d"])
+    )
+
+    # From Series
+    s3 = make_scenario(3, "S3")
+    s3.inputs = Mock()
+    s3.inputs.__iter__ = Mock(side_effect=TypeError())
+    s3.inputs.to_dataframe = Mock(return_value=pd.Series([5], index=["e"]))
+
+    pack = InputsPack()
+    pack.add(s1, s2, s3)
+    df = pack.to_dataframe()
+
+    # All keys present
+    for key in ["a", "b", "c", "d", "e"]:
+        assert key in df.index
+
+    assert df.loc["a", "S1"] == 1
+    assert df.loc["c", "S2"] == 3
+    assert df.loc["e", "S3"] == 5
+
+
+def test_to_dataframe_returns_empty_when_no_data():
+    s = make_scenario(1, "S1")
+    s.inputs = Mock()
+    s.inputs.__iter__ = Mock(side_effect=TypeError())
+    s.inputs.to_dataframe = Mock(return_value=pd.DataFrame())
+
+    pack = InputsPack()
+    pack.add(s)
+    df = pack.to_dataframe()
+    assert df.empty
+
+
+def test_from_dataframe_parses_and_updates(caplog):
+    s1 = make_scenario(1, "S1")
+    s2 = make_scenario(2, "S2")
+    s3 = make_scenario(3, "S3")
+
+    pack = InputsPack()
+    pack.add(s1, s2, s3)
+    pack.set_scenario_short_names({"1": "Short1"})
+
+    df = pd.DataFrame(
+        [
+            ["input", "Short1", "3", "Unknown"],
+            ["a", 1, 10, 99],
+            ["b", " ", "nan", 88],
+        ]
+    )
+
+    with caplog.at_level("WARNING"):
+        pack.from_dataframe(df)
+
+    s1.update_user_values.assert_called_once_with({"a": 1})
+    s3.update_user_values.assert_called_once_with({"a": 10})
+    # Unknown column should produce a warning and not call any scenario
+    assert "Could not find scenario for SLIDER_SETTINGS column label" in caplog.text
+
+
+def test_from_dataframe_handles_update_exception(caplog):
+    s1 = make_scenario(1, "S1")
+    s1.update_user_values.side_effect = RuntimeError("fail")
+
+    pack = InputsPack()
+    pack.add(s1)
+
+    df = pd.DataFrame([["input", "S1"], ["a", 1]])
+
+    with caplog.at_level("WARNING"):
+        pack.from_dataframe(df)
+        assert "Failed updating inputs for scenario" in caplog.text
+
+
+def test_from_dataframe_early_returns():
+    pack = InputsPack()
+    # None and empty
+    pack.from_dataframe(None)
+    pack.from_dataframe(pd.DataFrame())
+    # No header rows
+    pack.from_dataframe(pd.DataFrame([[None], [None]]))
+    # After header but no data columns
+    pack.from_dataframe(pd.DataFrame([["only-one-col"], [1]]))
+
+
+# New tests for 100% coverage
+
+
+def test_class_variables():
+    """Test class variables are set correctly."""
+    assert InputsPack.key == "inputs"
+    assert InputsPack.sheet_name == "SLIDER_SETTINGS"
+
+
+def test_init_with_kwargs():
+    """Test initialization with kwargs."""
+    pack = InputsPack(some_param="value")
+    assert pack._scenario_short_names == {}
+
+
+def test_set_scenario_short_names_with_none():
+    """Test setting short names with None value."""
+    pack = InputsPack()
+    pack.set_scenario_short_names(None)
+    assert pack._scenario_short_names == {}
+
+
+def test_get_scenario_display_key_with_non_string_identifier():
+    """Test _get_scenario_display_key when identifier returns non-string/int."""
+    s = make_scenario(1)
+    s.identifier.return_value = {"complex": "object"}
+
+    pack = InputsPack()
+    result = pack._get_scenario_display_key(s)
+    assert result == 1  # Falls back to ID
+
+
+def test_resolve_scenario_with_none():
+    """Test resolve_scenario with None input."""
+    pack = InputsPack()
+    assert pack.resolve_scenario(None) is None
+
+
+def test_resolve_scenario_with_whitespace():
+    """Test resolve_scenario strips whitespace."""
+    s = make_scenario(1, "ID1")
+    pack = InputsPack()
+    pack.add(s)
+
+    assert pack.resolve_scenario("  ID1  ") is s
+
+
+def test_resolve_scenario_numeric_conversion_error():
+    """Test resolve_scenario when numeric conversion fails."""
+    s = make_scenario(1, "ID1")
+    pack = InputsPack()
+    pack.add(s)
+
+    # Non-numeric string should not crash
+    assert pack.resolve_scenario("not_a_number") is None
+
+
+def test_extract_from_input_objects_no_key():
+    """Test _extract_from_input_objects with input missing key attribute."""
+    s = make_scenario(1)
+    input_obj = Mock()
+    input_obj.key = None  # Explicitly set key to None
+    input_obj.user = 10
+    s.inputs = [input_obj]
+
+    pack = InputsPack()
+    result = pack._extract_from_input_objects(s, "user")
+    assert result == {}  # Should skip objects with None key
+
+
+def test_extract_from_input_objects_exception():
+    """Test _extract_from_input_objects with iteration exception."""
+    s = make_scenario(1)
+    s.inputs = Mock()
+    s.inputs.__iter__ = Mock(side_effect=Exception("iteration failed"))
+
+    pack = InputsPack()
+    result = pack._extract_from_input_objects(s, "user")
+    assert result == {}
+
+
+def test_extract_from_dataframe_to_dataframe_exception():
+    """Test _extract_from_dataframe when to_dataframe raises exception."""
+    s = make_scenario(1)
+    s.inputs = Mock()
+    s.inputs.to_dataframe = Mock(side_effect=Exception("dataframe failed"))
+
+    pack = InputsPack()
+    result = pack._extract_from_dataframe(s, "user")
+    assert result == {}
+
+
+def test_extract_from_dataframe_none_result():
+    """Test _extract_from_dataframe when to_dataframe returns None."""
+    s = make_scenario(1)
+    s.inputs = Mock()
+    s.inputs.to_dataframe = Mock(return_value=None)
+
+    pack = InputsPack()
+    result = pack._extract_from_dataframe(s, "user")
+    assert result == {}
+
+
+def test_extract_from_dataframe_empty_result():
+    """Test _extract_from_dataframe when to_dataframe returns empty DataFrame."""
+    s = make_scenario(1)
+    s.inputs = Mock()
+    empty_df = pd.DataFrame()
+    s.inputs.to_dataframe = Mock(return_value=empty_df)
+
+    pack = InputsPack()
+    result = pack._extract_from_dataframe(s, "user")
+    assert result == {}
+
+
+def test_normalize_dataframe_index_no_multiindex():
+    """Test _normalize_dataframe_index with regular index."""
+    pack = InputsPack()
+    df = pd.DataFrame({"user": [1, 2]}, index=["a", "b"])
+    result = pack._normalize_dataframe_index(df)
+    assert result.equals(df)
+
+
+def test_normalize_dataframe_index_no_unit_level():
+    """Test _normalize_dataframe_index with MultiIndex but no 'unit' level."""
+    pack = InputsPack()
+    df = pd.DataFrame(
+        {"user": [1, 2]},
+        index=pd.MultiIndex.from_tuples(
+            [("a", "x"), ("b", "y")], names=["key", "other"]
+        ),
+    )
+    result = pack._normalize_dataframe_index(df)
+    assert result.equals(df)
+
+
+def test_dataframe_to_series_with_series_input():
+    """Test _dataframe_to_series when input is already a Series."""
+    pack = InputsPack()
+    series = pd.Series([1, 2], index=["a", "b"])
+    result = pack._dataframe_to_series(series, "user")
+    assert result.equals(series)
+
+
+def test_dataframe_to_series_with_default_field():
+    """Test _dataframe_to_series finding 'default' column."""
+    pack = InputsPack()
+    df = pd.DataFrame({"default": [1, 2], "other": [3, 4]}, index=["a", "b"])
+    result = pack._dataframe_to_series(df, "missing_field")
+    assert result.equals(df["default"])
+
+
+def test_dataframe_to_series_with_value_field():
+    """Test _dataframe_to_series finding 'value' column."""
+    pack = InputsPack()
+    df = pd.DataFrame({"value": [1, 2], "other": [3, 4]}, index=["a", "b"])
+    result = pack._dataframe_to_series(df, "missing_field")
+    assert result.equals(df["value"])
+
+
+def test_dataframe_to_series_fallback_to_first_column():
+    """Test _dataframe_to_series falling back to first column."""
+    pack = InputsPack()
+    df = pd.DataFrame({"col1": [1, 2], "col2": [3, 4]}, index=["a", "b"])
+    result = pack._dataframe_to_series(df, "missing_field")
+    assert result.equals(df.iloc[:, 0])
+
+
+def test_build_consolidated_dataframe_no_scenarios():
+    """Test _build_consolidated_dataframe with no scenarios."""
+    pack = InputsPack()
+    result = pack._build_consolidated_dataframe({})
+    assert result.empty
+
+
+def test_build_consolidated_dataframe_no_relevant_scenarios():
+    """Test _build_consolidated_dataframe with no relevant scenarios in field_mappings."""
+    s = make_scenario(1)
+    pack = InputsPack()
+    pack.add(s)
+
+    result = pack._build_consolidated_dataframe({})  # Empty field mappings
+    assert result.empty
+
+
+def test_build_consolidated_dataframe_no_input_keys():
+    """Test _build_consolidated_dataframe when no input keys are found."""
+    s = make_scenario(1)
+    s.inputs = []
+    pack = InputsPack()
+    pack.add(s)
+
+    result = pack._build_consolidated_dataframe({s: ["user"]})
+    assert result.empty
+
+
+def test_build_consolidated_dataframe_no_scenario_frames():
+    """Test _build_consolidated_dataframe when no scenario frames are built."""
+    s = make_scenario(1)
+    s.inputs = Mock()
+    s.inputs.__iter__ = Mock(side_effect=Exception())
+    s.inputs.to_dataframe = Mock(side_effect=Exception())
+    pack = InputsPack()
+    pack.add(s)
+
+    result = pack._build_consolidated_dataframe({s: ["user"]})
+    assert result.empty
+
+
+def test_build_scenario_data_empty_fields():
+    """Test _build_scenario_data with empty fields list."""
+    s = make_scenario(1)
+    pack = InputsPack()
+
+    result = pack._build_scenario_data(s, [], ["a", "b"])
+    assert result == {}
+
+
+def test_build_simple_dataframe_no_scenarios():
+    """Test _build_simple_dataframe with no scenarios."""
+    pack = InputsPack()
+    result = pack._build_simple_dataframe()
+    assert result.empty
+
+
+def test_build_simple_dataframe_no_input_keys():
+    """Test _build_simple_dataframe when no input keys found."""
+    s = make_scenario(1)
+    s.inputs = []
+
+    pack = InputsPack()
+    pack.add(s)
+
+    result = pack._build_simple_dataframe()
+    assert result.empty
+
+
+def test_build_bounds_dataframe_no_scenarios():
+    """Test _build_bounds_dataframe with no scenarios."""
+    pack = InputsPack()
+    result = pack._build_bounds_dataframe()
+    assert result.empty
+
+
+def test_build_bounds_dataframe_no_input_keys():
+    """Test _build_bounds_dataframe when no input keys found."""
+    s = make_scenario(1)
+    s.inputs = []
+
+    pack = InputsPack()
+    pack.add(s)
+
+    result = pack._build_bounds_dataframe()
+    assert result.empty
+
+
+def test_build_bounds_dataframe_from_objects():
+    """Test _build_bounds_dataframe extracting from input objects."""
+    s = make_scenario(1)
+    s.inputs = [
+        DummyInput("a", 10, min_val=0, max_val=100),
+        DummyInput("b", 20, min_val=5, max_val=50),
+    ]
+    pack = InputsPack()
+    pack.add(s)
+
+    result = pack._build_bounds_dataframe()
+    assert not result.empty
+    assert ("", "min") in result.columns
+    assert ("", "max") in result.columns
+
+
+def test_build_bounds_dataframe_from_dataframe_exception():
+    """Test _build_bounds_dataframe when both input iteration and dataframe fail."""
+    s = make_scenario(1)
+    s.inputs = Mock()
+    s.inputs.__iter__ = Mock(side_effect=Exception())
+    s.inputs.to_dataframe = Mock(side_effect=Exception())
+    pack = InputsPack()
+    pack.add(s)
+
+    result = pack._build_bounds_dataframe()
+    assert result.empty
+
+
+def test_build_bounds_dataframe_early_break():
+    """Test _build_bounds_dataframe early break when all values found."""
+    s1 = make_scenario(1)
+    s1.inputs = [DummyInput("a", 10, min_val=0, max_val=100)]
+    s2 = make_scenario(2)
+    s2.inputs = [DummyInput("a", 20, min_val=0, max_val=100)]
+    pack = InputsPack()
+    pack.add(s1, s2)
+
+    result = pack._build_bounds_dataframe()
+    assert not result.empty
+    # Should have values from first scenario due to early break
+
+
+def test_to_dataframe_empty_columns():
+    """Test _to_dataframe with empty columns parameter."""
+    s = make_scenario(1)
+    s.inputs = [DummyInput("a", 10)]
+    pack = InputsPack()
+    pack.add(s)
+
+    result = pack._to_dataframe(columns="")
+    assert not result.empty
+
+
+def test_to_dataframe_non_string_columns():
+    """Test _to_dataframe with non-string columns parameter."""
+    s = make_scenario(1)
+    s.inputs = [DummyInput("a", 10)]
+    pack = InputsPack()
+    pack.add(s)
+
+    result = pack._to_dataframe(columns=123)
+    assert not result.empty
+
+
+def test_to_dataframe_per_scenario_fields():
+    """Test to_dataframe_per_scenario_fields."""
+    s1 = make_scenario(1)
+    s1.inputs = [DummyInput("a", 10, default=5)]
+    s2 = make_scenario(2)
+    s2.inputs = [DummyInput("a", 20)]
+    pack = InputsPack()
+    pack.add(s1, s2)
+
+    fields_map = {s1: ["user", "default"], s2: ["user"]}
+    result = pack.to_dataframe_per_scenario_fields(fields_map)
+    assert not result.empty
+
+
+def test_to_dataframe_defaults():
+    """Test to_dataframe_defaults."""
+    s = make_scenario(1)
+    s.inputs = [DummyInput("a", 10, default=5)]
+    pack = InputsPack()
+    pack.add(s)
+
+    result = pack.to_dataframe_defaults()
+    assert not result.empty
+
+
+def test_to_dataframe_min_max():
+    """Test to_dataframe_min_max."""
+    s = make_scenario(1)
+    s.inputs = [DummyInput("a", 10, min_val=0, max_val=100)]
+    pack = InputsPack()
+    pack.add(s)
+
+    result = pack.to_dataframe_min_max()
+    assert not result.empty
+
+
+def test_from_dataframe_exception_handling(caplog):
+    """Test from_dataframe general exception handling."""
+    pack = InputsPack()
+    df = Mock()
+    df.empty = False
+    df.dropna = Mock(side_effect=Exception("processing failed"))
+
+    with caplog.at_level("WARNING"):
+        pack.from_dataframe(df)
+        assert "Failed to parse simplified SLIDER_SETTINGS sheet" in caplog.text
+
+
+def test_from_dataframe_empty_after_dropna():
+    """Test from_dataframe when DataFrame is empty after dropna."""
+    pack = InputsPack()
+    df = pd.DataFrame([[None, None], [None, None]])
+    pack.from_dataframe(df)  # Should return early
+
+
+def test_is_blank_value():
+    """Test _is_blank_value method."""
+    pack = InputsPack()
+
+    assert pack._is_blank_value(None) is True
+    assert pack._is_blank_value(np.nan) is True
+    assert pack._is_blank_value("") is True
+    assert pack._is_blank_value("  ") is True
+    assert pack._is_blank_value("nan") is True
+    assert pack._is_blank_value("NaN") is True
+    assert pack._is_blank_value(0) is False
+    assert pack._is_blank_value("0") is False
+    assert pack._is_blank_value("value") is False
+
+
+def test_build_combined_dataframe_no_scenarios():
+    """Test build_combined_dataframe with no scenarios."""
+    pack = InputsPack()
+    result = pack.build_combined_dataframe()
+    assert result.empty
+
+
+def test_build_combined_dataframe_defaults_only():
+    """Test build_combined_dataframe with defaults only."""
+    s = make_scenario(1)
+    s.inputs = [DummyInput("a", 10, default=5)]
+    pack = InputsPack()
+    pack.add(s)
+    result = pack.build_combined_dataframe(include_defaults=True, include_min_max=False)
+    assert not result.empty
+
+
+def test_build_combined_dataframe_user_with_bounds():
+    """Test build_combined_dataframe with user values and bounds but no defaults."""
+    s = make_scenario(1)
+    s.inputs = [DummyInput("a", 10, min_val=0, max_val=100)]
+    pack = InputsPack()
+    pack.add(s)
+    result = pack.build_combined_dataframe(include_defaults=False, include_min_max=True)
+    assert isinstance(result, pd.DataFrame)
+
+
+def test_build_combined_dataframe_full():
+    """Test build_combined_dataframe with all options."""
+    s = make_scenario(1)
+    s.inputs = [DummyInput("a", 10, default=5, min_val=0, max_val=100)]
+    pack = InputsPack()
+    pack.add(s)
+    result = pack.build_combined_dataframe(include_defaults=True, include_min_max=True)
+
+
+def test_build_full_combined_dataframe_exception():
+    """Test _build_full_combined_dataframe exception handling."""
+    pack = InputsPack()
+    with patch.object(pack, "_build_consolidated_dataframe", side_effect=Exception()):
+        with patch.object(pack, "_build_bounds_dataframe", return_value=pd.DataFrame()):
+            result = pack._build_full_combined_dataframe()
+
+
+def test_build_full_combined_dataframe_empty_core():
+    """Test _build_full_combined_dataframe with empty core DataFrame."""
+    s = make_scenario(1)
+    s.inputs = [DummyInput("a", 10, min_val=0, max_val=100)]
+
+    pack = InputsPack()
+    pack.add(s)
+
+    with patch.object(
+        pack, "_build_consolidated_dataframe", return_value=pd.DataFrame()
+    ):
+        result = pack._build_full_combined_dataframe()
+
+
+def test_build_full_combined_dataframe_empty_bounds():
+    """Test _build_full_combined_dataframe with empty bounds DataFrame."""
+    s = make_scenario(1)
+    s.inputs = [DummyInput("a", 10, default=5)]
+
+    pack = InputsPack()
+    pack.add(s)
+
+    with patch.object(pack, "_build_bounds_dataframe", return_value=pd.DataFrame()):
+        result = pack._build_full_combined_dataframe()
+
+
+def test_log_scenario_input_warnings():
+    """Test _log_scenario_input_warnings with scenario having _inputs."""
+    s = make_scenario(1)
+    mock_inputs = Mock()
+    mock_inputs.log_warnings = Mock()
+    s._inputs = mock_inputs
+    pack = InputsPack()
+    pack._log_scenario_input_warnings(s)
+    mock_inputs.log_warnings.assert_called_once()
+
+
+def test_log_scenario_input_warnings_no_inputs():
+    """Test _log_scenario_input_warnings with scenario missing _inputs."""
+    s = make_scenario(1)
+    pack = InputsPack()
+    pack._log_scenario_input_warnings(s)
+
+
+def test_log_scenario_input_warnings_none_inputs():
+    """Test _log_scenario_input_warnings with _inputs = None."""
+    s = make_scenario(1)
+    s._inputs = None
+    pack = InputsPack()
+    pack._log_scenario_input_warnings(s)
+
+
+def test_log_scenario_input_warnings_exception():
+    """Test _log_scenario_input_warnings with exception during logging."""
+    s = make_scenario(1)
+    mock_inputs = Mock()
+    mock_inputs.log_warnings = Mock(side_effect=Exception("logging failed"))
+    s._inputs = mock_inputs
+    pack = InputsPack()
+    pack._log_scenario_input_warnings(s)
+
+
+def test_from_dataframe_calls_log_warnings():
+    """Test from_dataframe calls _log_scenario_input_warnings."""
+    s = make_scenario(1, "S1")
+    pack = InputsPack()
+    pack.add(s)
+
+    with patch.object(pack, "_log_scenario_input_warnings") as mock_log:
+        with patch(
+            "pyetm.models.packables.inputs_pack.InputsPack.first_non_empty_row_positions",
+            return_value=[0],
+        ):
+            df = pd.DataFrame([["input", "S1"], ["a", 10]])
+            pack.from_dataframe(df)
+            mock_log.assert_called_once_with(s)
+
+
+def test_extract_input_values_prefers_objects():
+    """Test _extract_input_values prefers input objects over dataframe."""
+    s = make_scenario(1)
+    s.inputs = [DummyInput("a", 10)]
+
+    pack = InputsPack()
+
+    with patch.object(pack, "_extract_from_dataframe") as mock_df:
+        result = pack._extract_input_values(s, "user")
+        mock_df.assert_not_called()
+        assert result == {"a": 10}
+
+
+def test_extract_input_values_fallback_to_dataframe():
+    """Test _extract_input_values falls back to dataframe."""
+    s = make_scenario(1)
+    s.inputs = Mock()
+    s.inputs.__iter__ = Mock(side_effect=Exception())
+    s.inputs.to_dataframe = Mock(return_value=pd.DataFrame({"user": [10]}, index=["a"]))
+
+    pack = InputsPack()
+    result = pack._extract_input_values(s, "user")
+    assert result == {"a": 10}
diff --git a/tests/models/packables/test_output_curves_pack.py b/tests/models/packables/test_output_curves_pack.py
new file mode 100644
index 0000000..e9ad086
--- /dev/null
+++ b/tests/models/packables/test_output_curves_pack.py
@@ -0,0 +1,373 @@
+import pandas as pd
+from unittest.mock import Mock
+import tempfile
+import os
+
+from pyetm.models.packables.output_curves_pack import OutputCurvesPack
+
+
+def make_scenario(id_val="S"):
+    s = Mock()
+    s.identifier = Mock(return_value=str(id_val))
+    s.id = id_val
+    return s
+
+
+def test_to_dataframe_collects_series():
+    s = make_scenario()
+    s.all_output_curves.return_value = [
+        pd.Series([1, 2], name="c1"),
+        pd.Series([3, 4], name="c2"),
+    ]
+
+    pack = OutputCurvesPack()
+    pack.add(s)
+
+    df = pack.to_dataframe()
+    assert not df.empty
+    assert "c1" in df.columns.get_level_values(1) or "c1" in df.columns
+
+
+def test_to_dataframe_handles_exception_and_empty(caplog):
+    s = make_scenario()
+    s.all_output_curves.side_effect = RuntimeError("fail")
+
+    pack = OutputCurvesPack()
+    pack.add(s)
+
+    with caplog.at_level("WARNING"):
+        df = pack.to_dataframe()
+        assert df.empty
+        assert "Failed extracting output curves" in caplog.text
+
+    s.all_output_curves.side_effect = None
+    s.all_output_curves.return_value = []
+    df2 = pack.to_dataframe()
+    assert df2.empty
+
+
+def test_build_dataframe_with_warnings(caplog):
+    """Test the warning logging branch when scenario has _output_curves."""
+    s = make_scenario()
+    s.all_output_curves.return_value = [pd.Series([1, 2], name="test")]
+
+    # Mock _output_curves with log_warnings method
+    mock_output_curves = Mock()
+    mock_output_curves.log_warnings = Mock()
+    s._output_curves = mock_output_curves
+
+    pack = OutputCurvesPack()
+    pack.add(s)
+
+    df = pack._build_dataframe_for_scenario(s)
+
+    # Verify log_warnings was called
+    mock_output_curves.log_warnings.assert_called_once()
+    assert not df.empty
+
+
+def test_build_dataframe_warning_logging_exception():
+    """Test exception handling in warning logging branch."""
+    s = make_scenario()
+    s.all_output_curves.return_value = [pd.Series([1, 2], name="test")]
+
+    # Mock _output_curves that raises exception during log_warnings
+    mock_output_curves = Mock()
+    mock_output_curves.log_warnings.side_effect = Exception("logging failed")
+    s._output_curves = mock_output_curves
+
+    pack = OutputCurvesPack()
+    df = pack._build_dataframe_for_scenario(s)
+
+    # Should still return dataframe despite logging exception
+    assert not df.empty
+
+
+def test_build_dataframe_no_output_curves_attr():
+    """Test scenario without _output_curves attribute."""
+    s = make_scenario()
+    s.all_output_curves.return_value = [pd.Series([1, 2], name="test")]
+    # Don't set _output_curves attribute
+
+    pack = OutputCurvesPack()
+    df = pack._build_dataframe_for_scenario(s)
+
+    assert not df.empty
+
+
+def test_build_dataframe_output_curves_none():
+    """Test scenario with _output_curves = None."""
+    s = make_scenario()
+    s.all_output_curves.return_value = [pd.Series([1, 2], name="test")]
+    s._output_curves = None
+
+    pack = OutputCurvesPack()
+    df = pack._build_dataframe_for_scenario(s)
+
+    assert not df.empty
+
+
+def test_to_excel_per_carrier_no_scenarios(carrier_mappings):
+    """Test to_excel_per_carrier with no scenarios."""
+
+    pack = OutputCurvesPack()
+    # Don't add any scenarios
+
+    with tempfile.NamedTemporaryFile(suffix=".xlsx", delete=False) as tmp:
+        pack.to_excel_per_carrier(tmp.name)
+        # Should return early, file shouldn't be created with content
+        assert os.path.getsize(tmp.name) == 0
+        os.unlink(tmp.name)
+
+
+def test_to_excel_per_carrier_full_flow(
+    carrier_mappings, mock_workbook, patch_add_frame
+):
+    """Test full flow of to_excel_per_carrier."""
+    # Setup mocks
+    mock_wb = mock_workbook["instance"]
+
+    # Create scenario with output curves
+    s1 = make_scenario("scenario1")
+    s1.get_output_curves = Mock(
+        return_value={
+            "demand": pd.Series([100, 200, 300], name="hourly_demand"),
+            "supply": pd.DataFrame({"wind": [50, 60, 70], "solar": [30, 40, 50]}),
+        }
+    )
+
+    s2 = make_scenario("scenario2")
+    s2.get_output_curves = Mock(
+        return_value={"demand": pd.Series([150, 250, 350], name="hourly_demand")}
+    )
+
+    pack = OutputCurvesPack()
+    pack.add(s1)
+    pack.add(s2)
+
+    with tempfile.NamedTemporaryFile(suffix=".xlsx") as tmp:
+        pack.to_excel_per_carrier(tmp.name, carriers=["electricity"])
+
+        # Verify workbook creation and closing
+    mock_workbook["cls"].assert_called_once_with(str(tmp.name))
+    mock_wb.close.assert_called_once()
+
+    assert patch_add_frame.call_count >= 1
+
+
+def test_to_excel_invalid_carriers(carrier_mappings):
+    """Test to_excel_per_carrier with invalid carriers."""
+
+    s = make_scenario()
+    s.get_output_curves = Mock(return_value={"demand": pd.Series([1, 2, 3])})
+
+    pack = OutputCurvesPack()
+    pack.add(s)
+
+    with tempfile.NamedTemporaryFile(suffix=".xlsx", delete=False) as tmp:
+        # Pass invalid carriers - should fall back to valid ones
+        pack.to_excel_per_carrier(tmp.name, carriers=["invalid_carrier"])
+        os.unlink(tmp.name)
+
+
+def test_to_excel_scenario_without_get_output_curves(mock_workbook, carrier_mappings):
+    """Test scenario without get_output_curves method."""
+    mock_wb = mock_workbook["instance"]
+
+    s = make_scenario()
+    # Don't add get_output_curves method
+
+    pack = OutputCurvesPack()
+    pack.add(s)
+
+    with tempfile.NamedTemporaryFile(suffix=".xlsx") as tmp:
+        pack.to_excel_per_carrier(tmp.name)
+        # Should not create workbook since no valid curves
+    mock_workbook["cls"].assert_not_called()
+
+
+def test_to_excel_get_output_curves_exception(mock_workbook, carrier_mappings):
+    """Test exception in get_output_curves method."""
+
+    s = make_scenario()
+    s.get_output_curves = Mock(side_effect=Exception("curves failed"))
+
+    pack = OutputCurvesPack()
+    pack.add(s)
+
+    with tempfile.NamedTemporaryFile(suffix=".xlsx") as tmp:
+        pack.to_excel_per_carrier(tmp.name)
+        # Should handle exception gracefully
+    mock_workbook["cls"].assert_not_called()
+
+
+def test_to_excel_empty_curves_dict(mock_workbook, carrier_mappings):
+    """Test scenario with empty curves dictionary."""
+    s = make_scenario()
+    s.get_output_curves = Mock(return_value={})
+
+    pack = OutputCurvesPack()
+    pack.add(s)
+
+    with tempfile.NamedTemporaryFile(suffix=".xlsx") as tmp:
+        pack.to_excel_per_carrier(tmp.name)
+    mock_workbook["cls"].assert_not_called()
+
+
+def test_to_excel_none_curves(mock_workbook, carrier_mappings):
+    """Test scenario returning None for curves."""
+    s = make_scenario()
+    s.get_output_curves = Mock(return_value=None)
+
+    pack = OutputCurvesPack()
+    pack.add(s)
+
+    with tempfile.NamedTemporaryFile(suffix=".xlsx") as tmp:
+        pack.to_excel_per_carrier(tmp.name)
+    mock_workbook["cls"].assert_not_called()
+
+
+def test_to_excel_none_dataframe_values(mock_workbook, carrier_mappings):
+    """Test scenario with None values in curves dictionary."""
+    s = make_scenario()
+    s.get_output_curves = Mock(return_value={"demand": None, "supply": None})
+
+    pack = OutputCurvesPack()
+    pack.add(s)
+
+    with tempfile.NamedTemporaryFile(suffix=".xlsx") as tmp:
+        pack.to_excel_per_carrier(tmp.name)
+    mock_workbook["cls"].assert_not_called()
+
+
+def test_to_excel_empty_dataframe(mock_workbook, carrier_mappings):
+    """Test scenario with empty DataFrame."""
+    s = make_scenario()
+    empty_df = pd.DataFrame()  # Empty DataFrame
+    s.get_output_curves = Mock(return_value={"demand": empty_df})
+
+    pack = OutputCurvesPack()
+    pack.add(s)
+
+    with tempfile.NamedTemporaryFile(suffix=".xlsx") as tmp:
+        pack.to_excel_per_carrier(tmp.name)
+        # Should not create workbook due to empty DataFrame
+    mock_workbook["cls"].assert_not_called()
+
+
+def test_to_excel_multi_column_dataframe(
+    mock_workbook, carrier_mappings, patch_add_frame
+):
+    """Test scenario with multi-column DataFrame."""
+    mock_wb = mock_workbook["instance"]
+
+    s = make_scenario()
+    multi_df = pd.DataFrame(
+        {"wind": [10, 20, 30], "solar": [5, 15, 25], "hydro": [2, 4, 6]}
+    )
+    s.get_output_curves = Mock(return_value={"supply": multi_df})
+
+    pack = OutputCurvesPack()
+    pack.add(s)
+
+    with tempfile.NamedTemporaryFile(suffix=".xlsx") as tmp:
+        pack.to_excel_per_carrier(tmp.name)
+    mock_workbook["cls"].assert_called_once()
+    mock_wb.close.assert_called_once()
+
+
+def test_to_excel_single_column_dataframe(
+    mock_workbook, carrier_mappings, patch_add_frame
+):
+    """Test scenario with single-column DataFrame."""
+    mock_wb = mock_workbook["instance"]
+
+    s = make_scenario()
+    single_df = pd.DataFrame({"demand": [100, 200, 300]})
+    s.get_output_curves = Mock(return_value={"hourly": single_df})
+
+    pack = OutputCurvesPack()
+    pack.add(s)
+
+    with tempfile.NamedTemporaryFile(suffix=".xlsx") as tmp:
+        pack.to_excel_per_carrier(tmp.name)
+    mock_workbook["cls"].assert_called_once()
+    mock_wb.close.assert_called_once()
+
+
+def test_to_excel_dataframe_processing_exception(mock_workbook, carrier_mappings):
+    """Test exception during DataFrame processing."""
+    s = make_scenario()
+    # Create a DataFrame that will cause an exception during processing
+    bad_df = Mock(spec=pd.DataFrame)
+    bad_df.empty = False
+    bad_df.shape = (10, 1)
+    bad_df.iloc = Mock()
+    bad_df.iloc.__getitem__ = Mock(side_effect=Exception("processing failed"))
+
+    s.get_output_curves = Mock(return_value={"bad_data": bad_df})
+
+    pack = OutputCurvesPack()
+    pack.add(s)
+
+    with tempfile.NamedTemporaryFile(suffix=".xlsx") as tmp:
+        pack.to_excel_per_carrier(tmp.name)
+        # Should handle exception and not create workbook
+    mock_workbook["cls"].assert_not_called()
+
+
+def test_to_excel_scenario_identifier_exception(mock_workbook, carrier_mappings):
+    """Test scenario where identifier() raises exception."""
+    s = make_scenario()
+    s.identifier.side_effect = Exception("identifier failed")
+    s.get_output_curves = Mock(return_value={"demand": pd.Series([1, 2, 3])})
+
+    pack = OutputCurvesPack()
+    pack.add(s)
+
+    with tempfile.NamedTemporaryFile(suffix=".xlsx") as tmp:
+        pack.to_excel_per_carrier(tmp.name)
+        # Should use fallback naming and still work
+        mock_workbook["cls"].assert_called_once()
+
+
+def test_to_excel_empty_carrier_selection(carrier_mappings):
+    """Test when carrier selection results in empty list."""
+    s = make_scenario()
+    s.get_output_curves = Mock(return_value={"demand": pd.Series([1, 2, 3])})
+
+    pack = OutputCurvesPack()
+    pack.add(s)
+
+    with tempfile.NamedTemporaryFile(suffix=".xlsx") as tmp:
+        pack.to_excel_per_carrier(tmp.name, carriers=["nonexistent1", "nonexistent2"])
+
+
+def test_class_variables():
+    """Test class variables are set correctly."""
+    assert OutputCurvesPack.key == "output_curves"
+    assert OutputCurvesPack.sheet_name == "OUTPUT_CURVES"
+
+
+def test_to_dataframe_with_kwargs():
+    """Test _to_dataframe passes kwargs correctly by checking it calls the base implementation."""
+    s = make_scenario()
+    s.all_output_curves.return_value = [pd.Series([1, 2], name="test")]
+
+    pack = OutputCurvesPack()
+    pack.add(s)
+
+    # Test that _to_dataframe works with additional kwargs
+    df = pack._to_dataframe(columns="test", extra_param="value")
+    assert isinstance(df, pd.DataFrame)
+
+
+def test_build_dataframe_with_columns_kwargs():
+    """Test _build_dataframe_for_scenario with columns parameter."""
+    s = make_scenario()
+    s.all_output_curves.return_value = [pd.Series([1, 2], name="test")]
+
+    pack = OutputCurvesPack()
+    df = pack._build_dataframe_for_scenario(s, columns="test_columns", extra="param")
+
+    assert not df.empty
diff --git a/tests/models/packables/test_packable.py b/tests/models/packables/test_packable.py
new file mode 100644
index 0000000..e1f7cb6
--- /dev/null
+++ b/tests/models/packables/test_packable.py
@@ -0,0 +1,221 @@
+import pytest
+import pandas as pd
+from pyetm.models.packables.packable import Packable
+
+
+class MockScenario:
+    def __init__(self, id):
+        self._id = id
+
+    def identifier(self):
+        return self._id
+
+
+@pytest.fixture
+def packable():
+    return Packable()
+
+
+def test_add_discard_clear(packable):
+    s1 = MockScenario("a")
+    s2 = MockScenario("b")
+
+    packable.add(s1)
+    assert s1 in packable.scenarios
+    assert packable._scenario_id_cache is None
+
+    packable.add(s2)
+    assert s2 in packable.scenarios
+
+    packable.discard(s1)
+    assert s1 not in packable.scenarios
+    assert packable._scenario_id_cache is None
+
+    packable.clear()
+    assert len(packable.scenarios) == 0
+    assert packable._scenario_id_cache is None
+
+
+def test_summary(packable):
+    s1 = MockScenario("id1")
+    s2 = MockScenario("id2")
+    packable.add(s1, s2)
+    summary = packable.summary()
+    assert "base_pack" in summary
+    assert summary["base_pack"]["scenario_count"] == 2
+
+
+def test_key_for_returns_identifier(packable):
+    s = MockScenario("sc1")
+    assert packable._key_for(s) == "sc1"
+
+
+def test_build_pack_dataframe_calls_and_concat(monkeypatch, packable):
+    s1 = MockScenario("sc1")
+    s2 = MockScenario("sc2")
+    packable.add(s1, s2)
+
+    # Mock _build_dataframe_for_scenario to return a simple df
+    def fake_build_df(scenario, **kwargs):
+        return pd.DataFrame({f"{scenario.identifier()}_col": [1, 2]})
+
+    monkeypatch.setattr(packable, "_build_dataframe_for_scenario", fake_build_df)
+    monkeypatch.setattr(packable, "_concat_frames", lambda frames, keys: (frames, keys))
+
+    frames, keys = packable.build_pack_dataframe()
+
+    assert isinstance(frames[0], pd.DataFrame)
+    assert keys == ["sc1", "sc2"] or keys == ["sc2", "sc1"]  # order not guaranteed
+
+
+def test_build_pack_dataframe_skips_none_empty(monkeypatch, packable):
+    s = MockScenario("sc")
+    packable.add(s)
+
+    monkeypatch.setattr(packable, "_build_dataframe_for_scenario", lambda s, **kw: None)
+    df = packable.build_pack_dataframe()
+    assert df.empty
+
+    monkeypatch.setattr(
+        packable, "_build_dataframe_for_scenario", lambda s, **kw: pd.DataFrame()
+    )
+    df = packable.build_pack_dataframe()
+    assert df.empty
+
+
+def test_build_pack_dataframe_handles_exceptions(monkeypatch, packable):
+    s = MockScenario("sc")
+    packable.add(s)
+
+    def raise_exc(scenario, **kwargs):
+        raise RuntimeError("fail")
+
+    monkeypatch.setattr(packable, "_build_dataframe_for_scenario", raise_exc)
+
+    # Should not raise, just skip scenario
+    df = packable.build_pack_dataframe()
+    assert df.empty
+
+
+def test_to_dataframe_returns_empty_if_no_scenarios(monkeypatch, packable):
+    assert packable.to_dataframe().empty
+
+    monkeypatch.setattr(
+        packable, "_to_dataframe", lambda **kwargs: pd.DataFrame({"a": [1]})
+    )
+    packable.add(MockScenario("sc"))
+    df = packable.to_dataframe()
+    assert "a" in df.columns
+
+
+def test_refresh_cache_and_find_by_identifier(packable):
+    s1 = MockScenario("sc1")
+    s2 = MockScenario("sc2")
+    packable.add(s1, s2)
+
+    packable._scenario_id_cache = None
+    packable._refresh_cache()
+
+    assert "sc1" in packable._scenario_id_cache
+    assert packable._find_by_identifier("sc2") == s2
+    assert packable._find_by_identifier("missing") is None
+
+
+def test_resolve_scenario(packable):
+    s = MockScenario("foo")
+    packable.add(s)
+    assert packable.resolve_scenario("foo") == s
+    assert packable.resolve_scenario(None) is None
+    assert packable.resolve_scenario("bar") is None
+
+
+def test_is_blank():
+    assert Packable.is_blank(None)
+    assert Packable.is_blank(float("nan"))
+    assert Packable.is_blank("")
+    assert Packable.is_blank("   ")
+    assert not Packable.is_blank("x")
+    assert not Packable.is_blank(123)
+
+
+def test_drop_all_blank():
+    df = pd.DataFrame({"a": [None, None], "b": [None, None]})
+    result = Packable.drop_all_blank(df)
+    assert result.empty
+
+    df2 = pd.DataFrame({"a": [None, 1], "b": [None, 2]})
+    result2 = Packable.drop_all_blank(df2)
+    assert len(result2) == 1
+
+
+def test_first_non_empty_row_positions():
+    df = pd.DataFrame({"a": [None, 1, 2], "b": [None, None, 3]})
+    positions = Packable.first_non_empty_row_positions(df, count=2)
+    assert positions == [1, 2]
+
+    positions = Packable.first_non_empty_row_positions(pd.DataFrame(), count=2)
+    assert positions == []
+
+
+def test_apply_identifier_blocks(monkeypatch, packable):
+    s1 = MockScenario("sc1")
+    s2 = MockScenario("sc2")
+    packable.add(s1, s2)
+
+    columns = pd.MultiIndex.from_tuples(
+        [("sc1", "a"), ("sc1", "b"), ("sc2", "a")], names=["id", "curve"]
+    )
+    df = pd.DataFrame([[1, 2, 3], [4, 5, 6]], columns=columns)
+
+    called = {}
+
+    def apply_block(scenario, block):
+        called[scenario.identifier()] = block.sum().sum()
+
+    packable.apply_identifier_blocks(df, apply_block)
+
+    assert "sc1" in called
+    assert "sc2" in called
+
+    # Test with resolve function overriding
+    def resolve_override(label):
+        return s1 if label == "sc1" else None
+
+    called.clear()
+    packable.apply_identifier_blocks(df, apply_block, resolve=resolve_override)
+    assert "sc1" in called
+    assert "sc2" in called
+
+    # Test with non-MultiIndex columns
+    packable.apply_identifier_blocks(pd.DataFrame({"a": [1, 2]}), apply_block)
+
+
+def test_apply_identifier_blocks_logs(monkeypatch, caplog, packable):
+    s1 = MockScenario("sc1")
+    packable.add(s1)
+
+    columns = pd.MultiIndex.from_tuples([("sc1", "a")], names=["id", "curve"])
+    df = pd.DataFrame([[1]], columns=columns)
+
+    def fail_block(scenario, block):
+        raise ValueError("fail")
+
+    with caplog.at_level("WARNING"):
+        packable.apply_identifier_blocks(df, fail_block)
+        assert "Failed applying block" in caplog.text
+
+
+def test_normalize_single_header_sheet(packable):
+    df = pd.DataFrame(
+        [
+            ["col1", "col2", "helper"],
+            [1, 2, 3],
+            [4, 5, 6],
+        ]
+    )
+    result = packable._normalize_single_header_sheet(
+        df, helper_columns={"helper"}, reset_index=True
+    )
+    assert list(result.columns) == ["col1", "col2"]
+    assert result.shape == (2, 2)
+    assert result.index.equals(pd.RangeIndex(0, 2))
diff --git a/tests/models/packables/test_query_pack.py b/tests/models/packables/test_query_pack.py
new file mode 100644
index 0000000..e046620
--- /dev/null
+++ b/tests/models/packables/test_query_pack.py
@@ -0,0 +1,63 @@
+import pandas as pd
+from unittest.mock import Mock
+
+from pyetm.models.packables.query_pack import QueryPack
+
+
+def make_scenario(id_val="S"):
+    s = Mock()
+    s.identifier = Mock(return_value=str(id_val))
+    s.results = Mock(
+        return_value=pd.DataFrame(
+            {"future": [1], "unit": ["MW"]}, index=["q1"]
+        ).set_index("unit", append=True)
+    )
+    s.add_queries = Mock()
+    return s
+
+
+def test_to_dataframe_calls_results_and_builds(caplog):
+    s1 = make_scenario("S1")
+    s2 = make_scenario("S2")
+
+    pack = QueryPack()
+    pack.add(s1, s2)
+
+    df = pack.to_dataframe()
+    assert not df.empty
+    assert "S1" in df.columns or "S2" in df.columns
+
+
+def test_to_dataframe_handles_exception(caplog):
+    s = make_scenario()
+    s.results.side_effect = RuntimeError("bad")
+
+    pack = QueryPack()
+    pack.add(s)
+
+    with caplog.at_level("WARNING"):
+        df = pack.to_dataframe()
+        assert df.empty
+        assert "Failed building gquery results" in caplog.text
+
+
+def test_from_dataframe_applies_unique_queries():
+    s1 = make_scenario()
+    s2 = make_scenario()
+
+    pack = QueryPack()
+    pack.add(s1, s2)
+
+    df = pd.DataFrame({"queries": ["a", " a ", "b", None, "nan", "B"]})
+    pack.from_dataframe(df)
+
+    # Should deduplicate and strip, keep case of non-'nan' values
+    expected = ["a", "b", "B"]
+    s1.add_queries.assert_called_once_with(expected)
+    s2.add_queries.assert_called_once_with(expected)
+
+
+def test_from_dataframe_early_returns():
+    pack = QueryPack()
+    pack.from_dataframe(None)
+    pack.from_dataframe(pd.DataFrame())
diff --git a/tests/models/packables/test_sortable_pack.py b/tests/models/packables/test_sortable_pack.py
new file mode 100644
index 0000000..6f7eda2
--- /dev/null
+++ b/tests/models/packables/test_sortable_pack.py
@@ -0,0 +1,77 @@
+import pandas as pd
+from unittest.mock import Mock
+
+from pyetm.models.packables.sortable_pack import SortablePack
+
+
+def make_scenario(id_val="S1"):
+    s = Mock()
+    s.identifier = Mock(return_value=str(id_val))
+    s.sortables = Mock()
+    return s
+
+
+def test_to_dataframe_builds_from_scenarios():
+    s1 = make_scenario("S1")
+    s2 = make_scenario("S2")
+    s1.sortables.to_dataframe.return_value = pd.DataFrame({"a": [1]})
+    s2.sortables.to_dataframe.return_value = pd.DataFrame({"b": [2]})
+
+    pack = SortablePack()
+    pack.add(s1, s2)
+
+    df = pack.to_dataframe()
+    assert not df.empty
+
+
+def test_to_dataframe_handles_exception_and_empty(caplog):
+    s = make_scenario("S")
+    s.sortables.to_dataframe.side_effect = RuntimeError("boom")
+    pack = SortablePack()
+    pack.add(s)
+
+    with caplog.at_level("WARNING"):
+        df = pack.to_dataframe()
+        assert df.empty
+        assert "Failed extracting sortables" in caplog.text
+
+    s.sortables.to_dataframe.side_effect = None
+    s.sortables.to_dataframe.return_value = pd.DataFrame()
+    df2 = pack.to_dataframe()
+    assert df2.empty
+
+
+def test_from_dataframe_multiindex_and_single_block(monkeypatch):
+    s1 = make_scenario("S1")
+    s2 = make_scenario("S2")
+    pack = SortablePack()
+    pack.add(s1, s2)
+    cols = pd.MultiIndex.from_tuples([("S1", "a"), ("S2", "a")])
+    df = pd.DataFrame([[1, 2]], columns=cols)
+    monkeypatch.setattr(pack, "_normalize_sortables_dataframe", lambda d: d)
+    pack.from_dataframe(df)
+
+    assert s1.set_sortables_from_dataframe.called
+    assert s2.set_sortables_from_dataframe.called
+
+
+def test_from_dataframe_normalize_errors_and_empty(caplog, monkeypatch):
+    s = make_scenario("S")
+    pack = SortablePack()
+    pack.add(s)
+
+    with caplog.at_level("WARNING"):
+        monkeypatch.setattr(
+            pack,
+            "_normalize_sortables_dataframe",
+            lambda d: (_ for _ in ()).throw(RuntimeError("bad")),
+        )
+        pack.from_dataframe(pd.DataFrame([[1]]))
+        assert "Failed to normalize sortables sheet" in caplog.text
+
+    # empty after normalize
+    monkeypatch.setattr(
+        pack, "_normalize_sortables_dataframe", lambda d: pd.DataFrame()
+    )
+    pack.from_dataframe(pd.DataFrame([[1]]))
+    assert not s.set_sortables_from_dataframe.called
diff --git a/tests/models/test_base.py b/tests/models/test_base.py
index 06a6545..2cb1cb6 100644
--- a/tests/models/test_base.py
+++ b/tests/models/test_base.py
@@ -1,100 +1,337 @@
 from pyetm.models.base import Base
+import pandas as pd
 
 
 def test_valid_initialization_has_no_warnings(dummy_base_model):
+    """Test that valid initialization produces no warnings."""
     d = dummy_base_model(a=10, b="string", c=3.14)
+
     assert d.a == 10
     assert d.b == "string"
     assert d.c == 3.14
-    assert d.warnings == {}
+    assert len(d.warnings) == 0
+    assert not d.warnings.has_warnings()
 
 
 def test_invalid_initialization_becomes_warning_not_exception(dummy_base_model):
+    """Test that invalid initialization creates warnings instead of exceptions."""
     d = dummy_base_model(a="not-an-int", b="hi")
+
     assert isinstance(d, dummy_base_model)
-    assert any("valid integer" in w.lower() for w_list in d.warnings.values() for w in w_list)
+    assert len(d.warnings) > 0
+
+    all_warnings = list(d.warnings)
+    warning_messages = [w.message.lower() for w in all_warnings]
+    assert any("valid integer" in msg for msg in warning_messages)
 
 
 def test_missing_required_field_becomes_warning(dummy_base_model):
+    """Test that missing required fields become warnings."""
     d = dummy_base_model(a=5)
+
     assert isinstance(d, dummy_base_model)
-    assert any("field required" in w.lower() for w_list in d.warnings.values() for w in w_list)
+    assert len(d.warnings) > 0
+
+    # Check for field required warning
+    all_warnings = list(d.warnings)
+    warning_messages = [w.message.lower() for w in all_warnings]
+    assert any("field required" in msg for msg in warning_messages)
 
 
 def test_assignment_validation_generates_warning_and_skips_assignment(dummy_base_model):
+    """Test that invalid assignments generate warnings and don't change the value."""
     d = dummy_base_model(a=1, b="foo")
     d.warnings.clear()
 
-    # good assignment
+    # Good assignment should work
     d.a = 42
     assert d.a == 42
-    assert d.warnings == {}
+    assert len(d.warnings) == 0
 
-    # bad assignment
+    # Bad assignment should generate warning and not change value
+    original_b = d.b
     d.b = 123
-    assert d.b == "foo"
+
+    assert d.b == original_b
     assert len(d.warnings) == 1
-    # actual message contains "valid string"
-    assert any("valid string" in w.lower() for w_list in d.warnings.values() for w in w_list)
+
+    # Check warning content
+    b_warnings = d.warnings.get_by_field("b")
+    assert len(b_warnings) > 0
+    assert any("valid string" in w.message.lower() for w in b_warnings)
 
 
 def test_merge_submodel_warnings_brings_them_up(dummy_base_model):
+    """Test that submodel warnings are properly merged with key attributes."""
+
     class Child(Base):
         x: int
 
+        def _to_dataframe(self, **kwargs):
+
+            return pd.DataFrame({"x": [self.x]})
+
     child = Child(x="warning")
-    assert child.warnings, "child should have at least one warning"
+    assert len(child.warnings) > 0, "child should have at least one warning"
 
     parent = dummy_base_model(a=0, b="string")
     parent.warnings.clear()
 
-    parent._merge_submodel_warnings(child, key_attr='x')
+    parent._merge_submodel_warnings(child, key_attr="x")
+
+    # Check that warnings were merged with proper prefix
+    parent_fields = parent.warnings.get_fields_with_warnings()
+    assert any("Child(x=warning)" in field for field in parent_fields)
 
-    assert parent.warnings[f'Child(x=warning)'] == child.warnings
+    # Check that the actual warning content is preserved
+    assert len(parent.warnings) > 0
 
 
 def test_show_warnings_no_warnings_prints_no_warnings(capsys, dummy_base_model):
+    """Test show_warnings output when no warnings exist."""
     d = dummy_base_model(a=3, b="string")
-    # ensure no warnings
     d.warnings.clear()
+
     d.show_warnings()
     captured = capsys.readouterr()
     assert "No warnings." in captured.out.strip()
 
 
-def test_merge_submodel_warnings_with_list(dummy_base_model):
-    # Create two children
+def test_show_warnings_with_warnings_prints_formatted_output(capsys, dummy_base_model):
+    """Test show_warnings output when warnings exist."""
+    d = dummy_base_model(a="invalid", b="string")
+
+    d.show_warnings()
+
+    captured = capsys.readouterr()
+    assert "Warnings:" in captured.out
+    # Should contain field name and warning indicator
+    assert "a:" in captured.out
+    assert "[WARNING]" in captured.out or "[ERROR]" in captured.out
+
+
+def test_merge_submodel_warnings_with_multiple_submodels(dummy_base_model):
+    """Test merging warnings from multiple submodels."""
+
     class Child(Base):
         x: int
 
+        def _to_dataframe(self, **kwargs):
+
+            return pd.DataFrame({"x": [self.x]})
+
     c1 = Child(x="bad1")
     c2 = Child(x="bad2")
-    # both have warnings
-    assert c1.warnings and c2.warnings
+
+    # Both should have warnings
+    assert len(c1.warnings) > 0 and len(c2.warnings) > 0
 
     parent = dummy_base_model(a=1, b="string")
     parent.warnings.clear()
 
-    # pass list of submodels
-    parent._merge_submodel_warnings(c1, c2, key_attr='x')
-    # expect two warnings, in order
-    expected = {
-        'Child(x=bad1)': {
-            'x': ['Input should be a valid integer, unable to parse string as an integer']
-        },
-        'Child(x=bad2)': {
-            'x': ['Input should be a valid integer, unable to parse string as an integer']
-        }
-    }
-    assert parent.warnings == expected
-
-
-def test_load_safe_always_constructs_and_warns(dummy_base_model):
-    # load_safe should never raise, even if data is invalid
-    data = {"a": "not-int", "b": 123}
-    d = dummy_base_model.load_safe(**data)
+    # Merge warnings from both children
+    parent._merge_submodel_warnings(c1, c2, key_attr="x")
+
+    # Check that both were merged with proper prefixes
+    parent_fields = parent.warnings.get_fields_with_warnings()
+    assert any("Child(x=bad1)" in field for field in parent_fields)
+    assert any("Child(x=bad2)" in field for field in parent_fields)
+
+    # Should have warnings from both children
+    assert len(parent.warnings) >= 2
+
+
+def test_add_warning_manually(dummy_base_model):
+    """Test manually adding warnings to a model."""
+    d = dummy_base_model(a=1, b="string")
+    d.warnings.clear()
+
+    d.add_warning("custom_field", "Custom warning message")
+
+    assert d.warnings.has_warnings("custom_field")
+    custom_warnings = d.warnings.get_by_field("custom_field")
+    assert len(custom_warnings) == 1
+    assert custom_warnings[0].message == "Custom warning message"
+
+
+def test_add_warning_with_severity(dummy_base_model):
+    """Test adding warnings with different severity levels."""
+    d = dummy_base_model(a=1, b="string")
+    d.warnings.clear()
+
+    d.add_warning("error_field", "Critical error", "error")
+    d.add_warning("info_field", "Information", "info")
+
+    error_warnings = d.warnings.get_by_field("error_field")
+    info_warnings = d.warnings.get_by_field("info_field")
+
+    assert error_warnings[0].severity == "error"
+    assert info_warnings[0].severity == "info"
+
+
+def test_clear_warnings_for_specific_field(dummy_base_model):
+    """Test clearing warnings for a specific field."""
+    d = dummy_base_model(a="invalid", b=123)
+
+    # Should have warnings for both fields
+    assert d.warnings.has_warnings("a")
+    assert d.warnings.has_warnings("b")
+
+    # Clear warnings for field 'a' only
+    d._clear_warnings_for_attr("a")
+
+    assert not d.warnings.has_warnings("a")
+    assert d.warnings.has_warnings("b")  # Should still have warnings for b
+
+
+def test_warnings_property_returns_collector(dummy_base_model):
+    """Test that the warnings property returns a WarningCollector."""
+    d = dummy_base_model(a=1, b="string")
+
+    from pyetm.models.warnings import WarningCollector
+
+    assert isinstance(d.warnings, WarningCollector)
+
+
+def test_assignment_clears_previous_warnings(dummy_base_model):
+    """Test that valid assignment clears previous warnings for that field."""
+    d = dummy_base_model(a=1, b="string")
+
+    # Make invalid assignment to create warning
+    d.a = "invalid"
+    assert d.warnings.has_warnings("a")
+
+    # Make valid assignment - should clear warnings
+    d.a = 42
+    assert d.a == 42
+    assert not d.warnings.has_warnings("a")
+
+
+def test_get_serializable_fields(dummy_base_model):
+    """Test _get_serializable_fields method."""
+    d = dummy_base_model(a=1, b="string")
+
+    fields = d._get_serializable_fields()
+
+    assert "a" in fields
+    assert "b" in fields
+    # Should not include private fields
+    assert all(not field.startswith("_") for field in fields)
+
+
+def test_multiple_validation_errors_all_become_warnings(dummy_base_model):
+    """Test that multiple validation errors all become warnings."""
+    # Create model with multiple invalid fields
+    d = dummy_base_model(a="not-int", b=123)
+
     assert isinstance(d, dummy_base_model)
-    # Contains both warnings
-    msgs = [w.lower() for w_list in d.warnings.values() for w in w_list]
-    assert any("valid integer" in m for m in msgs)
-    assert any("valid string" in m or "field required" in m for m in msgs)
+    assert len(d.warnings) >= 2
+
+    assert d.warnings.has_warnings("a")
+    assert d.warnings.has_warnings("b")
+
+
+# Additional helper test for complex warning merging
+def test_nested_warning_merging_preserves_structure(dummy_base_model):
+    """Test that nested warning structures are preserved during merging."""
+    d = dummy_base_model(a=1, b="string")
+    d.warnings.clear()
+
+    complex_warnings = {"sub1": ["Warning 1", "Warning 2"], "sub2": ["Warning 3"]}
+    d.add_warning("parent", complex_warnings)
+
+    # Should create nested field names
+    fields = d.warnings.get_fields_with_warnings()
+    assert "parent.sub1" in fields
+    assert "parent.sub2" in fields
+
+    # Check warning counts
+    sub1_warnings = d.warnings.get_by_field("parent.sub1")
+    sub2_warnings = d.warnings.get_by_field("parent.sub2")
+
+    assert len(sub1_warnings) == 2
+    assert len(sub2_warnings) == 1
+
+
+def test_show_warnings_different_severities(capsys, dummy_base_model):
+    """Test show_warnings output with different severity levels."""
+    d = dummy_base_model(a=1, b="string")
+    d.warnings.clear()
+
+    # Add warnings with different severities
+    d.add_warning("field1", "Information message", "info")
+    d.add_warning("field2", "Warning message", "warning")
+    d.add_warning("field3", "Error message", "error")
+
+    d.show_warnings()
+
+    captured = capsys.readouterr()
+    assert "Warnings:" in captured.out
+    assert "[INFO]" in captured.out
+    assert "[WARNING]" in captured.out
+    assert "[ERROR]" in captured.out
+    assert "Information message" in captured.out
+    assert "Warning message" in captured.out
+    assert "Error message" in captured.out
+
+
+def test_from_dataframe_not_implemented_creates_fallback(dummy_base_model):
+    """Test that calling from_dataframe on base class creates fallback with warning."""
+
+    df = pd.DataFrame({"a": [1], "b": ["test"]})
+
+    # The base class should create a fallback instance with warnings since _from_dataframe is not implemented
+    instance = dummy_base_model.from_dataframe(df)
+
+    assert isinstance(instance, dummy_base_model)
+    assert len(instance.warnings) > 0
+
+    from_dataframe_warnings = instance.warnings.get_by_field("from_dataframe")
+    assert len(from_dataframe_warnings) > 0
+    assert "must implement _from_dataframe" in from_dataframe_warnings[0].message
+
+
+def test_from_dataframe_error_handling_creates_fallback_instance(dummy_base_model):
+    """Test that from_dataframe creates fallback instance with warnings on error."""
+
+    # Override _from_dataframe to raise an error
+    def failing_from_dataframe(cls, df, **kwargs):
+        raise ValueError("Intentional test error")
+
+    dummy_base_model._from_dataframe = classmethod(failing_from_dataframe)
+
+    df = pd.DataFrame({"a": [1], "b": ["test"]})
+
+    # Should not raise, but create instance with warnings
+    instance = dummy_base_model.from_dataframe(df)
+
+    assert isinstance(instance, dummy_base_model)
+    assert len(instance.warnings) > 0
+
+    from_dataframe_warnings = instance.warnings.get_by_field("from_dataframe")
+    assert len(from_dataframe_warnings) > 0
+    assert "Failed to create from DataFrame" in from_dataframe_warnings[0].message
+
+
+def test_from_dataframe_successful_delegation():
+    """Test that from_dataframe properly delegates to _from_dataframe."""
+
+    class TestModel(Base):
+        x: int
+        y: str
+
+        def _to_dataframe(self, **kwargs):
+            return pd.DataFrame({"x": [self.x], "y": [self.y]})
+
+        @classmethod
+        def _from_dataframe(cls, df, **kwargs):
+            row = df.iloc[0]
+            return cls(x=row["x"], y=row["y"])
+
+    # Test the successful path
+    df = pd.DataFrame({"x": [42], "y": ["hello"]})
+    instance = TestModel.from_dataframe(df)
+
+    assert instance.x == 42
+    assert instance.y == "hello"
+    assert len(instance.warnings) == 0
diff --git a/tests/models/test_custom_curves.py b/tests/models/test_custom_curves.py
index 8587a29..0cbb2a1 100644
--- a/tests/models/test_custom_curves.py
+++ b/tests/models/test_custom_curves.py
@@ -60,7 +60,9 @@ def test_custom_curve_retrieve_processing_error():
 
         assert result is None
         assert len(curve.warnings) > 0
-        assert "Failed to process curve data" in curve.warnings[curve.key][0]
+        key_warnings = curve.warnings.get_by_field(curve.key)
+        assert len(key_warnings) > 0
+        assert "Failed to process curve data" in key_warnings[0].message
 
 
 def test_custom_curve_retrieve_service_error():
@@ -81,7 +83,9 @@ def test_custom_curve_retrieve_service_error():
 
         assert result is None
         assert len(curve.warnings) > 0
-        assert "Failed to retrieve curve: API error" in curve.warnings[curve.key][0]
+        key_warnings = curve.warnings.get_by_field(curve.key)
+        assert len(key_warnings) > 0
+        assert "Failed to retrieve curve: API error" in key_warnings[0].message
 
 
 def test_custom_curve_retrieve_unexpected_error():
@@ -99,9 +103,10 @@ def test_custom_curve_retrieve_unexpected_error():
 
         assert result is None
         assert len(curve.warnings) > 0
+        key_warnings = curve.warnings.get_by_field(curve.key)
+        assert len(key_warnings) > 0
         assert (
-            "Unexpected error retrieving curve: Unexpected"
-            in curve.warnings[curve.key][0]
+            "Unexpected error retrieving curve: Unexpected" in key_warnings[0].message
         )
 
 
@@ -112,7 +117,9 @@ def test_custom_curve_contents_not_available():
 
     assert result is None
     assert len(curve.warnings) > 0
-    assert "not available - no file path set" in curve.warnings[curve.key][0]
+    key_warnings = curve.warnings.get_by_field(curve.key)
+    assert len(key_warnings) > 0
+    assert "not available - no file path set" in key_warnings[0].message
 
 
 def test_custom_curve_contents_file_error():
@@ -124,7 +131,9 @@ def test_custom_curve_contents_file_error():
 
     assert result is None
     assert len(curve.warnings) > 0
-    assert "Failed to read curve file" in curve.warnings[curve.key][0]
+    key_warnings = curve.warnings.get_by_field(curve.key)
+    assert len(key_warnings) > 0
+    assert "Failed to read curve file" in key_warnings[0].message
 
 
 def test_custom_curve_remove_not_available():
@@ -145,7 +154,24 @@ def test_custom_curve_remove_file_error():
 
         assert result is False
         assert len(curve.warnings) > 0
-        assert "Failed to remove curve file" in curve.warnings[curve.key][0]
+        key_warnings = curve.warnings.get_by_field(curve.key)
+        assert len(key_warnings) > 0
+        assert "Failed to remove curve file" in key_warnings[0].message
+
+
+def test_custom_curve_remove_success(tmp_path):
+    """Remove should delete file and clear file_path when available."""
+    temp_file = tmp_path / "curve.csv"
+    temp_file.write_text("1\n2\n3\n")
+
+    curve = CustomCurve(key="test_curve", type="custom", file_path=temp_file)
+    assert curve.available() is True
+
+    result = curve.remove()
+
+    assert result is True
+    assert curve.file_path is None
+    assert not temp_file.exists()
 
 
 def test_custom_curves_from_json_with_invalid_curve():
@@ -162,6 +188,703 @@ def test_custom_curves_from_json_with_invalid_curve():
     ):
         curves = CustomCurves.from_json(data)
 
-        assert len(curves.curves) == 1
+        assert len(curves.curves) == 2  # 1 valid curve + 1 fallback curve
         assert len(curves.warnings) > 0
-        assert "Skipped invalid curve data" in curves.warnings['CustomCurve(key=valid_curve)'][0]
+        # The key for the warnings appears to be based on the fallback curve that was created
+        fallback_curve_key = (
+            "CustomCurve(key=unknown).unknown"  # This is the actual key generated
+        )
+        fallback_curve_warnings = curves.warnings.get_by_field(fallback_curve_key)
+        assert len(fallback_curve_warnings) > 0
+        assert "Skipped invalid curve data" in fallback_curve_warnings[0].message
+
+
+def test_custom_curve_from_json_success():
+    data = {"key": "abc", "type": "custom"}
+    curve = CustomCurve.from_json(data)
+    assert curve.key == "abc"
+    assert curve.type == "custom"
+    # No warnings on success
+    assert len(curve.warnings) == 0
+
+
+def test_custom_curve_from_json_failure_adds_warning():
+    """Missing required fields should fall back and add a warning."""
+    # Missing both key and type triggers ValidationError path
+    curve = CustomCurve.from_json({"unexpected": 123})
+    # Fallback returns a constructed model; ensure a warning was recorded
+    assert len(curve.warnings) > 0
+    base_warnings = curve.warnings.get_by_field("base")
+    assert (
+        base_warnings and "Failed to create curve from data" in base_warnings[0].message
+    )
+
+
+def test_custom_curve_from_dataframe_basic_roundtrip():
+    """Test basic serialization and deserialization of a CustomCurve."""
+    import numpy as np
+
+    hours = 24
+    test_data = pd.Series(np.random.rand(hours) * 100, name="test_curve")
+    original = CustomCurve(key="test_curve", type="profile")
+
+    # Save test data to temporary file
+    temp_dir = Path("/tmp/test_curves")
+    temp_dir.mkdir(exist_ok=True)
+    temp_file = temp_dir / "test_curve.csv"
+    test_data.to_csv(temp_file, index=False, header=False)
+    original.file_path = temp_file
+
+    try:
+        # Serialize to DataFrame
+        df = original.to_dataframe()
+
+        # Should be time series format: one column with curve key, hour index
+        assert df.shape[1] == 1
+        assert df.columns[0] == "test_curve"
+        assert df.index.name == "hour"
+        restored = CustomCurve.from_dataframe(df)
+
+        # Verify properties
+        assert restored.key == original.key
+        assert restored.type == "custom"  # Default type from DataFrame deserialization
+        assert restored.available()
+
+        # Verify data is preserved
+        restored_data = restored.contents()
+        assert restored_data is not None
+        assert len(restored_data) == hours
+
+    finally:
+        # Clean up
+        if temp_file.exists():
+            temp_file.unlink()
+        if restored.file_path and restored.file_path.exists():
+            restored.file_path.unlink()
+        try:
+            temp_dir.rmdir()
+        except OSError:
+            pass  # Directory not empty or doesn't exist
+
+
+def test_custom_curve_from_dataframe_without_file_path():
+    """Test deserialization of curve without file_path."""
+    original = CustomCurve(key="no_file_curve", type="custom")
+
+    df = original.to_dataframe()
+    restored = CustomCurve.from_dataframe(df)
+
+    assert restored.key == original.key
+    assert restored.type == "custom"  # Default type from DataFrame deserialization
+    assert restored.file_path is None
+    assert not restored.available()
+
+
+def test_custom_curve_from_dataframe_alternative_structure():
+    """Test deserialization from DataFrame with time series data."""
+    import numpy as np
+
+    hours = 12
+    data = np.random.rand(hours) * 50
+    df = pd.DataFrame({"alt_curve": data})
+    df.index.name = "hour"
+
+    restored = CustomCurve.from_dataframe(df)
+
+    assert restored.key == "alt_curve"
+    assert restored.type == "custom"  # Default type from DataFrame deserialization
+    assert restored.available()  # Should have saved the data
+
+    # Verify data was saved correctly
+    restored_data = restored.contents()
+    assert restored_data is not None
+    assert len(restored_data) == hours
+
+    # Clean up
+    if restored.file_path and restored.file_path.exists():
+        restored.file_path.unlink()
+
+
+def test_custom_curve_from_dataframe_save_error(tmp_path):
+    """Saving data during from_dataframe should warn on failure."""
+    import numpy as np
+
+    df = pd.DataFrame({"foo": np.array([1.0, 2.0, 3.0])})
+
+    with (
+        patch("pyetm.models.custom_curves.get_settings") as mock_settings,
+        patch("pandas.Series.to_csv", side_effect=OSError("disk full")),
+    ):
+        mock_settings.return_value.path_to_tmp.return_value = tmp_path
+        curve = CustomCurve.from_dataframe(df)
+        assert isinstance(curve, CustomCurve)
+        assert curve.key == "foo"
+        # Save failed so file_path not set
+        assert curve.file_path is None
+        # Warning recorded on curve
+        warnings = curve.warnings.get_by_field("foo")
+        assert warnings and "Failed to save curve data to file" in warnings[0].message
+
+
+def test_custom_curve_from_dataframe_invalid_multiple_rows():
+    """Test error handling when DataFrame has multiple rows."""
+    df = pd.DataFrame(
+        {
+            "key": ["curve1", "curve2"],
+            "type": ["profile", "availability"],
+            "file_path": [None, "/tmp/test.csv"],
+        }
+    )
+
+    restored = CustomCurve.from_dataframe(df)
+
+    assert isinstance(restored, CustomCurve)
+    assert len(restored.warnings) > 0
+    from_dataframe_warnings = restored.warnings.get_by_field("from_dataframe")
+    assert len(from_dataframe_warnings) > 0
+
+
+def test_custom_curve_from_dataframe_fallback_on_error():
+    """Test fallback behavior when deserialization fails."""
+    df = pd.DataFrame({"invalid_field": ["value"], "another_invalid": ["value2"]})
+
+    # Base.from_dataframe should handle the error and return instance with warning
+    restored = CustomCurve.from_dataframe(df)
+
+    assert len(restored.warnings) > 0
+    assert len(restored.warnings.get_fields_with_warnings()) > 0
+
+
+def test_custom_curves_from_dataframe_collection_roundtrip():
+    """Test serialization and deserialization of a CustomCurves collection."""
+    import numpy as np
+
+    # Create test data for curves
+    hours = 24
+    temp_dir = Path("/tmp/test_curves_collection")
+    temp_dir.mkdir(exist_ok=True)
+
+    curves_list = []
+    test_files = []
+
+    try:
+        # Create curves with actual data
+        for i, (key, curve_type) in enumerate(
+            [("curve1", "profile"), ("curve2", "availability"), ("curve3", "custom")]
+        ):
+            curve = CustomCurve(key=key, type=curve_type)
+
+            # Only add data to some curves to test mixed scenarios
+            if i < 2:  # First two curves get data
+                data = pd.Series(np.random.rand(hours) * (i + 1) * 10, name=key)
+                temp_file = temp_dir / f"{key}.csv"
+                data.to_csv(temp_file, index=False, header=False)
+                curve.file_path = temp_file
+                test_files.append(temp_file)
+
+            curves_list.append(curve)
+
+        original_collection = CustomCurves(curves=curves_list)
+
+        # Serialize to DataFrame
+        df = original_collection.to_dataframe()
+
+        # Should have columns for each curve and hour index
+        assert df.index.name == "hour"
+        assert len(df.columns) == 3  # Three curves
+        assert set(df.columns) == {"curve1", "curve2", "curve3"}
+
+        # Deserialize back
+        restored_collection = CustomCurves.from_dataframe(df)
+        assert len(restored_collection.curves) == len(original_collection.curves)
+
+        # Verify each curve (note: type information is not preserved in time series format)
+        for orig, rest in zip(original_collection.curves, restored_collection.curves):
+            assert orig.key == rest.key
+
+    finally:
+        # Clean up
+        for file_path in test_files:
+            if file_path.exists():
+                file_path.unlink()
+
+        # Clean up any files created during deserialization
+        for curve in (
+            restored_collection.curves if "restored_collection" in locals() else []
+        ):
+            if curve.file_path and curve.file_path.exists():
+                curve.file_path.unlink()
+
+        try:
+            temp_dir.rmdir()
+        except OSError:
+            pass  # Directory not empty or doesn't exist
+
+
+def test_custom_curves_from_dataframe_empty_collection():
+    """Test deserialization of empty collection."""
+    empty_collection = CustomCurves(curves=[])
+
+    df = empty_collection.to_dataframe()
+    # Should be empty DataFrame with hour index
+    assert df.empty
+    assert df.index.name == "hour"
+
+    restored = CustomCurves.from_dataframe(df)
+
+    assert len(restored.curves) == 0
+
+
+def test_custom_curves_from_dataframe_with_invalid_curve_data():
+    """Test handling of invalid curve data in collection."""
+    import numpy as np
+
+    hours = 10
+    df = pd.DataFrame(
+        {
+            "valid_curve": np.random.rand(hours) * 100,
+            "problem_curve": [np.nan] * hours,  # All NaN values
+        }
+    )
+    df.index.name = "hour"
+
+    restored_collection = CustomCurves.from_dataframe(df)
+    assert len(restored_collection.curves) == 2
+
+    # Check that we got both curves
+    curve_keys = {curve.key for curve in restored_collection.curves}
+    assert curve_keys == {"valid_curve", "problem_curve"}
+
+    # Valid curve should have data, problem curve might not
+    valid_curve = next(c for c in restored_collection.curves if c.key == "valid_curve")
+    assert valid_curve.key == "valid_curve"
+
+    # Clean up any created files
+    for curve in restored_collection.curves:
+        if curve.file_path and curve.file_path.exists():
+            curve.file_path.unlink()
+
+
+def test_custom_curves_from_dataframe_preserves_warnings():
+    """Test that warnings from individual curves are preserved in collection."""
+    curves = CustomCurves(
+        curves=[
+            CustomCurve(key="good_curve", type="profile"),
+            CustomCurve(key="another_curve", type="availability"),
+        ]
+    )
+
+    df = curves.to_dataframe()
+    restored = CustomCurves.from_dataframe(df)
+
+    assert len(restored.curves) == 2
+
+
+def test_custom_curves_len_iter_and_attachment_helpers():
+    """Covers __len__, __iter__, is_attached, attached_keys."""
+    c1 = CustomCurve(key="a", type="custom")
+    c2 = CustomCurve(key="b", type="custom")
+    col = CustomCurves(curves=[c1, c2])
+
+    assert len(col) == 2
+    assert [c.key for c in iter(col)] == ["a", "b"]
+    assert col.is_attached("a") is True
+    assert col.is_attached("z") is False
+    assert list(col.attached_keys()) == ["a", "b"]
+
+
+def test_custom_curves_get_contents_not_found_adds_warning():
+    col = CustomCurves(curves=[])
+    mock_scenario = Mock()
+    res = col.get_contents(mock_scenario, "nope")
+    assert res is None
+    warnings = col.warnings.get_by_field("curves")
+    assert warnings and "not found in collection" in warnings[0].message
+
+
+def test_custom_curves_get_contents_available_reads_file(tmp_path):
+    key = "my_curve"
+    data_file = tmp_path / f"{key}.csv"
+    data_file.write_text("1\n2\n3\n")
+    curve = CustomCurve(key=key, type="custom", file_path=data_file)
+    col = CustomCurves(curves=[curve])
+    mock_scenario = Mock()
+
+    res = col.get_contents(mock_scenario, key)
+    assert isinstance(res, pd.Series)
+    assert res.name == key
+    # Curve warned about non-8760 values, and warnings merged into collection
+    # Warnings are merged with a prefixed field name; just check the message exists
+    any_msg = any("Curve length should be 8760" in w.message for w in col.warnings)
+    assert any_msg
+
+
+def test_custom_curves_get_contents_retrieves_when_unavailable(tmp_path):
+    key = "remote_curve"
+    curve = CustomCurve(key=key, type="custom")
+    col = CustomCurves(curves=[curve])
+    mock_scenario = Mock()
+    mock_scenario.id = 999
+
+    csv_data = io.StringIO("10\n20\n30\n")
+    with (
+        patch(
+            "pyetm.models.custom_curves.DownloadCustomCurveRunner.run",
+            return_value=ServiceResult.ok(data=csv_data),
+        ),
+        patch("pyetm.models.custom_curves.get_settings") as mock_settings,
+        patch("pandas.Series.to_csv") as mock_to_csv,
+    ):
+        mock_settings.return_value.path_to_tmp.return_value = tmp_path / "999"
+        res = col.get_contents(mock_scenario, key)
+        assert isinstance(res, pd.Series)
+        assert res.name == key
+        assert curve.file_path is not None
+
+
+def test_custom_curves_to_dataframe_attempts_retrieve_and_suppresses_errors():
+    """Hit branch where retrieve raises but is suppressed when _scenario is set."""
+    curve = CustomCurve(key="x", type="custom")
+    col = CustomCurves(curves=[curve])
+    # Setting the private attr is fine here
+    col._scenario = object()
+    with patch.object(curve, "retrieve", side_effect=RuntimeError("boom")):
+        df = col.to_dataframe()
+        # Column exists, index named 'hour'
+        assert df.index.name == "hour"
+        assert "x" in df.columns
+
+
+def test_custom_curves_to_dataframe_curve_to_dataframe_raises_adds_warning():
+    curve = CustomCurve(key="y", type="custom")
+    col = CustomCurves(curves=[curve])
+    with patch.object(CustomCurve, "_to_dataframe", side_effect=ValueError("bad")):
+        df = col.to_dataframe()
+        # Column created as empty series
+        assert "y" in df.columns
+        warnings = col.warnings.get_by_field("curves")
+        assert warnings and "Failed to serialize curve y" in warnings[0].message
+
+
+def test_custom_curves_from_dataframe_handles_per_column_error():
+    import numpy as np
+
+    df = pd.DataFrame({"ok": np.array([1.0, 2.0]), "bad": np.array([3.0, 4.0])})
+
+    def fake_from_df(inner_df, **kwargs):
+        name = inner_df.columns[0]
+        if name == "bad":
+            raise ValueError("oops")
+        return CustomCurve(key=name, type="custom")
+
+    with patch.object(CustomCurve, "_from_dataframe", side_effect=fake_from_df):
+        col = CustomCurves.from_dataframe(df)
+        assert len(col.curves) == 2
+        # Warning for the bad column on collection
+        # Field names are prefixed; check presence by message
+        assert any(
+            "Failed to create curve from column bad" in w.message for w in col.warnings
+        )
+
+
+# --- Validate for Upload Tests --- #
+
+
+def test_validate_for_upload_valid_curves():
+    """Test validate_for_upload with valid curves (8760 numeric values)"""
+    import numpy as np
+    from pathlib import Path
+    import shutil
+
+    # Create temporary files with valid data
+    temp_dir = Path("/tmp/test_curves")
+    temp_dir.mkdir(exist_ok=True)
+
+    try:
+        # Valid curve data (8760 values)
+        valid_data = np.random.uniform(0, 100, 8760)
+        valid_file = temp_dir / "valid_curve.csv"
+        pd.Series(valid_data).to_csv(valid_file, header=False, index=False)
+
+        curves = CustomCurves(
+            curves=[
+                CustomCurve(key="valid_curve", type="profile", file_path=valid_file)
+            ]
+        )
+
+        validation_errors = curves.validate_for_upload()
+
+        # Should have no errors
+        assert len(validation_errors) == 0
+
+    finally:
+        # Cleanup - remove entire directory tree
+        if temp_dir.exists():
+            shutil.rmtree(temp_dir)
+
+
+def test_validate_for_upload_curve_no_data():
+    """Test validate_for_upload with curve that has no data available"""
+    curves = CustomCurves(
+        curves=[CustomCurve(key="no_data_curve", type="profile")]  # No file_path set
+    )
+
+    validation_errors = curves.validate_for_upload()
+
+    assert len(validation_errors) == 1
+    assert "no_data_curve" in validation_errors
+    warnings_collector = validation_errors["no_data_curve"]
+    assert len(warnings_collector) == 1
+    warnings_list = list(warnings_collector)
+    assert "Curve has no data available" in warnings_list[0].message
+
+
+def test_validate_for_upload_wrong_length():
+    """Test validate_for_upload with curve that has wrong number of values"""
+    import numpy as np
+    from pathlib import Path
+    import shutil
+
+    temp_dir = Path("/tmp/test_curves")
+    temp_dir.mkdir(exist_ok=True)
+
+    try:
+        # Wrong length data
+        short_data = np.random.uniform(0, 100, 100)
+        short_file = temp_dir / "short_curve.csv"
+        pd.Series(short_data).to_csv(short_file, header=False, index=False)
+
+        curves = CustomCurves(
+            curves=[
+                CustomCurve(key="short_curve", type="profile", file_path=short_file)
+            ]
+        )
+
+        validation_errors = curves.validate_for_upload()
+
+        assert len(validation_errors) == 1
+        assert "short_curve" in validation_errors
+        warnings_collector = validation_errors["short_curve"]
+        assert len(warnings_collector) == 1
+        warnings_list = list(warnings_collector)
+        assert (
+            "Curve must contain exactly 8,760 values, found 100"
+            in warnings_list[0].message
+        )
+
+    finally:
+        # Cleanup - remove entire directory tree
+        if temp_dir.exists():
+            shutil.rmtree(temp_dir)
+
+
+def test_validate_for_upload_non_numeric_values():
+    """Test validate_for_upload with curve that has non-numeric values"""
+    from pathlib import Path
+    import shutil
+
+    temp_dir = Path("/tmp/test_curves")
+    temp_dir.mkdir(exist_ok=True)
+
+    try:
+        # Create file with non-numeric data
+        non_numeric_file = temp_dir / "non_numeric_curve.csv"
+        with open(non_numeric_file, "w") as f:
+            # Mix of numeric and non-numeric values
+            for i in range(8760):
+                if i % 100 == 0:
+                    f.write("not_a_number\n")
+                else:
+                    f.write(f"{i * 0.5}\n")
+
+        curves = CustomCurves(
+            curves=[
+                CustomCurve(
+                    key="non_numeric_curve", type="profile", file_path=non_numeric_file
+                )
+            ]
+        )
+
+        validation_errors = curves.validate_for_upload()
+
+        assert len(validation_errors) == 1
+        assert "non_numeric_curve" in validation_errors
+        warnings_collector = validation_errors["non_numeric_curve"]
+        assert len(warnings_collector) == 1
+        warnings_list = list(warnings_collector)
+        assert "Curve contains non-numeric values" in warnings_list[0].message
+
+    finally:
+        # Cleanup - remove entire directory tree
+        if temp_dir.exists():
+            shutil.rmtree(temp_dir)
+
+
+def test_validate_for_upload_empty_curve():
+    """Test validate_for_upload with curve that has empty data"""
+    from pathlib import Path
+    import shutil
+
+    temp_dir = Path("/tmp/test_curves")
+    temp_dir.mkdir(exist_ok=True)
+
+    try:
+        empty_file = temp_dir / "empty_curve.csv"
+        empty_file.touch()
+
+        curves = CustomCurves(
+            curves=[
+                CustomCurve(key="empty_curve", type="profile", file_path=empty_file)
+            ]
+        )
+
+        validation_errors = curves.validate_for_upload()
+
+        assert len(validation_errors) == 1
+        assert "empty_curve" in validation_errors
+        warnings_collector = validation_errors["empty_curve"]
+        assert len(warnings_collector) == 1
+        warnings_list = list(warnings_collector)
+        assert "Curve contains no data" in warnings_list[0].message
+
+    finally:
+        # Cleanup - remove entire directory tree
+        if temp_dir.exists():
+            shutil.rmtree(temp_dir)
+
+
+def test_validate_for_upload_file_read_error():
+    """Test validate_for_upload with curve file that cannot be read"""
+    from pathlib import Path
+
+    non_existent_file = Path("/tmp/non_existent_curve.csv")
+
+    curves = CustomCurves(
+        curves=[
+            CustomCurve(
+                key="unreadable_curve", type="profile", file_path=non_existent_file
+            )
+        ]
+    )
+
+    validation_errors = curves.validate_for_upload()
+
+    assert len(validation_errors) == 1
+    assert "unreadable_curve" in validation_errors
+    warnings_collector = validation_errors["unreadable_curve"]
+    assert len(warnings_collector) == 1
+    warnings_list = list(warnings_collector)  # Convert to list to access by index
+    assert "Error reading curve data:" in warnings_list[0].message
+
+
+def test_validate_for_upload_empty_dataframe_branch(tmp_path):
+    """Force pd.read_csv to return an empty DataFrame to hit raw_data.empty path."""
+    f = tmp_path / "empty_data.csv"
+    f.write_text("\n\n")
+    curves = CustomCurves(curves=[CustomCurve(key="k", type="profile", file_path=f)])
+
+    def fake_read_csv(path, header=None, index_col=False):
+        return pd.DataFrame()
+
+    with patch("pyetm.models.custom_curves.pd.read_csv", side_effect=fake_read_csv):
+        validation_errors = curves.validate_for_upload()
+        assert "k" in validation_errors
+        warnings = list(validation_errors["k"])
+        assert warnings and "Curve contains no data" in warnings[0].message
+
+
+def test_validate_for_upload_outer_except_path(tmp_path):
+    """Trigger outer exception handler by failing once inside inner except block."""
+    f = tmp_path / "raise_once.csv"
+    f.write_text("")
+    curves = CustomCurves(curves=[CustomCurve(key="zz", type="profile", file_path=f)])
+
+    # Make read_csv raise EmptyDataError to go into that except branch
+    def raise_empty(*args, **kwargs):
+        raise pd.errors.EmptyDataError("no data")
+
+    class AddOnceFailCollector:
+        def __init__(self):
+            self._count = 0
+            self._records = []
+
+        def add(self, field, message, severity="warning"):
+            if self._count == 0:
+                self._count += 1
+                raise RuntimeError("collector add failed once")
+            self._records.append((field, str(message), severity))
+
+        def __len__(self):
+            return len(self._records)
+
+        def __iter__(self):
+            class W:
+                def __init__(self, field, message, severity):
+                    self.field = field
+                    self.message = message
+                    self.severity = severity
+
+            return (W(f, m, s) for (f, m, s) in self._records)
+
+    with (
+        patch("pyetm.models.custom_curves.pd.read_csv", side_effect=raise_empty),
+        patch("pyetm.models.custom_curves.WarningCollector", AddOnceFailCollector),
+    ):
+        errors = curves.validate_for_upload()
+        # Should have captured via outer except and still recorded a warning
+        assert "zz" in errors
+        items = list(errors["zz"])  # iter must work
+        assert items and "Error reading curve data:" in items[0].message
+
+
+def test_validate_for_upload_multiple_curves_mixed_validity():
+    """Test validate_for_upload with mix of valid and invalid curves"""
+    import numpy as np
+    from pathlib import Path
+    import shutil
+
+    temp_dir = Path("/tmp/test_curves")
+    temp_dir.mkdir(exist_ok=True)
+
+    try:
+        # Valid curve
+        valid_data = np.random.uniform(0, 100, 8760)
+        valid_file = temp_dir / "valid_curve.csv"
+        pd.Series(valid_data).to_csv(valid_file, header=False, index=False)
+
+        # Invalid curve (wrong length)
+        invalid_data = np.random.uniform(0, 100, 100)
+        invalid_file = temp_dir / "invalid_curve.csv"
+        pd.Series(invalid_data).to_csv(invalid_file, header=False, index=False)
+
+        curves = CustomCurves(
+            curves=[
+                CustomCurve(key="valid_curve", type="profile", file_path=valid_file),
+                CustomCurve(
+                    key="invalid_curve", type="profile", file_path=invalid_file
+                ),
+                CustomCurve(key="no_data_curve", type="profile"),  # No file path
+            ]
+        )
+
+        validation_errors = curves.validate_for_upload()
+
+        # Should have errors for 2 curves, but not the valid one
+        assert len(validation_errors) == 2
+        assert "valid_curve" not in validation_errors
+        assert "invalid_curve" in validation_errors
+        assert "no_data_curve" in validation_errors
+
+        # Check specific error messages
+        invalid_warnings = list(validation_errors["invalid_curve"])
+        no_data_warnings = list(validation_errors["no_data_curve"])
+        assert (
+            "Curve must contain exactly 8,760 values, found 100"
+            in invalid_warnings[0].message
+        )
+        assert "Curve has no data available" in no_data_warnings[0].message
+
+    finally:
+        # Cleanup - remove entire directory tree
+        if temp_dir.exists():
+            shutil.rmtree(temp_dir)
diff --git a/tests/models/test_input.py b/tests/models/test_input.py
deleted file mode 100644
index 25de8b5..0000000
--- a/tests/models/test_input.py
+++ /dev/null
@@ -1,100 +0,0 @@
-import pytest
-from pyetm.models import Input
-from pyetm.models.inputs import BoolInput, EnumInput, FloatInput
-
-
-@pytest.mark.parametrize(
-    "json_fixture",
-    ["float_input_json", "enum_input_json", "bool_input_json", "disabled_input_json"],
-)
-def test_input_from_json(json_fixture, request):
-    input_json = request.getfixturevalue(json_fixture)
-    input = Input.from_json(next(iter(input_json.items())))
-
-    # Assert valid input
-    assert input
-
-
-def test_bool_input():
-    input = BoolInput(key='my_bool', unit='bool', default=0.0)
-
-    # Setting the input
-    input.user = 0.0
-    assert input.user == 0.0
-
-    # Is it valid to update to string?
-    validity_errors = input.is_valid_update('true')
-    assert 'user' in validity_errors
-    assert 'Input should be a valid number, unable to parse string as a number' in validity_errors['user']
-
-    # Is it valid to update to 0.5?
-    validity_errors = input.is_valid_update(0.5)
-    assert 'user' in validity_errors
-    assert 'Value error, 0.5 should be 1.0 or 0.0 representing True/False, or On/Off' in validity_errors['user']
-
-    # Try to update to 0.5
-    input.user = 0.5
-    assert input.user == 0.0
-
-    # Reset the input
-    input.user = "reset"
-    assert input.user is None
-    assert 'user' not in input.warnings
-
-def test_enum_input():
-    input = EnumInput(
-        key='my_enum',
-        unit='enum',
-        default='diesel',
-        permitted_values=['diesel', 'gasoline']
-    )
-
-    # Setting the input
-    input.user = 'gasoline'
-    assert input.user == 'gasoline'
-    # Is it valid to update to kerosene?
-    validity_errors = input.is_valid_update('kerosene')
-    assert 'user' in validity_errors
-    assert "Value error, kerosene should be in ['diesel', 'gasoline']" in validity_errors['user']
-
-    # Try to update to 0.5
-    input.user = 0.5
-    assert 'user' in input.warnings
-    assert input.user == 'gasoline'
-
-    # Try to update to kerosene
-    input.user = 'kerosene'
-    assert 'user' in input.warnings
-    assert input.user == 'gasoline'
-
-    # Reset the input
-    input.user = "reset"
-    assert input.user is None
-    assert 'user' not in input.warnings
-
-def test_float_input():
-    input = FloatInput(
-        key='my_float',
-        unit='euro',
-        min=0.0,
-        max=20.0
-    )
-
-    # Setting the input
-    input.user = 2.0
-    assert input.user == 2.0
-
-    # Is it valid to update to -1.0?
-    validity_errors = input.is_valid_update(-1.0)
-    assert 'user' in validity_errors
-    assert "Value error, -1.0 should be between 0.0 and 20.0" in validity_errors['user']
-
-    # Try to update to 30
-    input.user = 30.0
-    assert 'user' in input.warnings
-    assert "Value error, 30.0 should be between 0.0 and 20.0" in input.warnings['user']
-    assert input.user == 2.0
-
-    # Reset the input
-    input.user = "reset"
-    assert input.user is None
diff --git a/tests/models/test_inputs.py b/tests/models/test_inputs.py
index cb3af91..cae762c 100644
--- a/tests/models/test_inputs.py
+++ b/tests/models/test_inputs.py
@@ -1,7 +1,10 @@
-from pyetm.models import Inputs
+import pytest
+from pyetm.models import Inputs, Input
+from pyetm.models.inputs import BoolInput, EnumInput, FloatInput
 
 
 def test_collection_from_json(inputs_json):
+    """Test creating Inputs collection from JSON data."""
     input_collection = Inputs.from_json(inputs_json)
 
     # Check if valid!
@@ -19,7 +22,6 @@ def test_to_dataframe(inputs_json):
 
     assert "user" in df_standard.columns
     assert "user" in df_with_defaults.columns
-
     assert "default" not in df_standard.columns
     assert "default" in df_with_defaults.columns
 
@@ -27,21 +29,361 @@ def test_to_dataframe(inputs_json):
 
     assert df_with_non_existing["foo"].isnull().all()
 
+
 def test_valid_update(inputs_json):
+    """Test validation of updates using new WarningCollector system."""
     input_collection = Inputs.from_json(inputs_json)
 
-    # A good update
+    # A good update - should return empty dict
     warnings = input_collection.is_valid_update({"investment_costs_co2_ccs": 50.0})
     assert len(warnings) == 0
 
-    # An update that will trigger validation
+    # An update that will trigger validation - returns WarningCollector objects
     warnings = input_collection.is_valid_update({"investment_costs_co2_ccs": "hello"})
     assert len(warnings) > 0
     assert "investment_costs_co2_ccs" in warnings
-    assert warnings["investment_costs_co2_ccs"]["user"] == ["Input should be a valid number, unable to parse string as a number"]
 
-    # An update of a non existent key
+    # Check the WarningCollector object
+    warning_collector = warnings["investment_costs_co2_ccs"]
+    assert warning_collector.has_warnings("user")
+
+    user_warnings = warning_collector.get_by_field("user")
+    assert len(user_warnings) > 0
+    assert "unable to parse string as a number" in user_warnings[0].message.lower()
+
+    # An update of a non-existent key
     warnings = input_collection.is_valid_update({"hello": "hello"})
     assert len(warnings) > 0
     assert "hello" in warnings
-    assert warnings["hello"] == "Key does not exist"
+
+    # Check non-existent key warning
+    hello_warnings = warnings["hello"]
+    assert hello_warnings.has_warnings("hello")
+    hello_warning_msgs = [w.message for w in hello_warnings.get_by_field("hello")]
+    assert "Key does not exist" in hello_warning_msgs
+
+
+def test_collection_update_method(inputs_json):
+    """Test the update method applies changes correctly."""
+    input_collection = Inputs.from_json(inputs_json)
+
+    # Get original value
+    original_input = next(
+        inp for inp in input_collection if inp.key == "investment_costs_co2_ccs"
+    )
+    original_value = original_input.user
+
+    # Update with valid value
+    input_collection.update({"investment_costs_co2_ccs": 75.0})
+    assert original_input.user == 75.0
+
+    # Update with invalid value - should not change and add warning
+    input_collection.update({"investment_costs_co2_ccs": "invalid"})
+    assert original_input.user == 75.0  # Should not change
+    assert original_input.warnings.has_warnings("user")
+
+
+def test_collection_with_invalid_inputs():
+    """Test collection creation when individual inputs have issues."""
+    # Create data that will cause some inputs to have warnings
+    problematic_data = {
+        "good_input": {"unit": "float", "min": 0, "max": 100, "user": 50},
+        "bad_input": {"unit": "float"},  # Missing required min/max
+        "unknown_unit": {"unit": "weird_unit", "min": 0, "max": 100},
+    }
+
+    collection = Inputs.from_json(problematic_data)
+
+    # Collection should be created
+    assert len(collection) == 3
+
+    # Collection should have warnings merged from problematic inputs
+    assert len(collection.warnings) > 0
+
+
+@pytest.mark.parametrize(
+    "json_fixture",
+    ["float_input_json", "enum_input_json", "bool_input_json", "disabled_input_json"],
+)
+def test_input_from_json(json_fixture, request):
+    """Test Input creation from JSON data."""
+    input_json = request.getfixturevalue(json_fixture)
+    input_obj = Input.from_json(next(iter(input_json.items())))
+
+    # Assert valid input
+    assert input_obj
+
+
+def test_bool_input():
+    """Test BoolInput validation and warning behavior."""
+    input_obj = BoolInput(key="my_bool", unit="bool", default=0.0)
+
+    # Setting the input
+    input_obj.user = 0.0
+    assert input_obj.user == 0.0
+
+    # Is it valid to update to string? - should return WarningCollector
+    validity_warnings = input_obj.is_valid_update("true")
+    assert validity_warnings.has_warnings("user")
+
+    user_warnings = validity_warnings.get_by_field("user")
+    assert any(
+        "unable to parse string as a number" in w.message.lower() for w in user_warnings
+    )
+
+    # Is it valid to update to 0.5?
+    validity_warnings = input_obj.is_valid_update(0.5)
+    assert validity_warnings.has_warnings("user")
+
+    user_warnings = validity_warnings.get_by_field("user")
+    assert any("0.5 should be 1.0 or 0.0" in w.message for w in user_warnings)
+
+    # Try to update to 0.5 - should not change value but add warning
+    input_obj.user = 0.5
+    assert input_obj.user == 0.0  # Should not change
+    assert input_obj.warnings.has_warnings("user")  # Should have warning
+
+    # Reset the input
+    input_obj.user = "reset"
+    assert input_obj.user is None
+    assert not input_obj.warnings.has_warnings("user")  # Warnings should be cleared
+
+
+def test_enum_input():
+    """Test EnumInput validation and warning behavior."""
+    input_obj = EnumInput(
+        key="my_enum",
+        unit="enum",
+        default="diesel",
+        permitted_values=["diesel", "gasoline"],
+    )
+
+    # Setting the input
+    input_obj.user = "gasoline"
+    assert input_obj.user == "gasoline"
+
+    # Is it valid to update to kerosene?
+    validity_warnings = input_obj.is_valid_update("kerosene")
+    assert validity_warnings.has_warnings("user")
+
+    user_warnings = validity_warnings.get_by_field("user")
+    assert any(
+        "kerosene should be in ['diesel', 'gasoline']" in w.message
+        for w in user_warnings
+    )
+
+    # Try to update to invalid number - should not change value but add warning
+    input_obj.user = 0.5
+    assert input_obj.warnings.has_warnings("user")
+    assert input_obj.user == "gasoline"  # Should not change
+
+    # Try to update to kerosene - should not change value but add warning
+    input_obj.warnings.clear()  # Clear previous warnings
+    input_obj.user = "kerosene"
+    assert input_obj.warnings.has_warnings("user")
+    assert input_obj.user == "gasoline"  # Should not change
+
+    # Reset the input
+    input_obj.user = "reset"
+    assert input_obj.user is None
+    assert not input_obj.warnings.has_warnings("user")
+
+
+def test_float_input():
+    """Test FloatInput validation and warning behavior."""
+    input_obj = FloatInput(key="my_float", unit="euro", min=0.0, max=20.0)
+
+    # Setting the input
+    input_obj.user = 2.0
+    assert input_obj.user == 2.0
+
+    # Is it valid to update to -1.0?
+    validity_warnings = input_obj.is_valid_update(-1.0)
+    assert validity_warnings.has_warnings("user")
+
+    user_warnings = validity_warnings.get_by_field("user")
+    assert any(
+        "-1.0 should be between 0.0 and 20.0" in w.message for w in user_warnings
+    )
+
+    # Try to update to 30 - should not change value but add warning
+    input_obj.user = 30.0
+    assert input_obj.warnings.has_warnings("user")
+
+    # Check the warning message
+    user_warnings = input_obj.warnings.get_by_field("user")
+    assert any(
+        "30.0 should be between 0.0 and 20.0" in w.message for w in user_warnings
+    )
+    assert input_obj.user == 2.0  # Should not change
+
+    # Reset the input
+    input_obj.user = "reset"
+    assert input_obj.user is None
+    assert not input_obj.warnings.has_warnings("user")
+
+
+def test_input_warning_severity_levels():
+    """Test that different validation failures can have different severity levels."""
+    input_obj = FloatInput(key="test", unit="float", min=0, max=100)
+
+    # Create input with validation error (should be 'error' severity from __init__)
+    bad_input = FloatInput(
+        key="test", unit="float", min=0, max=100, user="not_a_number"
+    )
+
+    # Check that initialization warnings exist
+    if len(bad_input.warnings) > 0:
+        warnings = list(bad_input.warnings)
+        # Should have error-level warnings from failed initialization
+        assert any(w.severity == "error" for w in warnings)
+
+
+def test_input_warning_timestamps():
+    """Test that warnings have timestamps."""
+    input_obj = BoolInput(key="test", unit="bool")
+
+    # Create a warning
+    input_obj.user = 0.5  # Invalid value
+
+    if len(input_obj.warnings) > 0:
+        warnings = list(input_obj.warnings)
+        for warning in warnings:
+            assert hasattr(warning, "timestamp")
+            assert warning.timestamp is not None
+
+
+def test_warning_collector_methods():
+    """Test WarningCollector methods work correctly with Input objects."""
+    input_obj = FloatInput(key="test", unit="float", min=0, max=100)
+
+    # Add some warnings
+    input_obj.user = -5  # Out of bounds
+    input_obj.add_warning("custom_field", "Custom warning", "info")
+
+    warnings = input_obj.warnings
+
+    # Test various methods
+    assert len(warnings) > 0
+    assert warnings.has_warnings()
+    assert warnings.has_warnings("user")
+    assert warnings.has_warnings("custom_field")
+
+    fields_with_warnings = warnings.get_fields_with_warnings()
+    assert "user" in fields_with_warnings
+    assert "custom_field" in fields_with_warnings
+
+    # Test clearing specific field
+    warnings.clear("custom_field")
+    assert not warnings.has_warnings("custom_field")
+    assert warnings.has_warnings("user")  # Should still have user warnings
+
+
+def test_inputs_collection_warning_aggregation():
+    """Test that Inputs collection properly aggregates warnings from individual inputs."""
+    # Create inputs with various issues
+    inputs_data = {
+        "good_input": {"unit": "float", "min": 0, "max": 100, "user": 50},
+        "bad_float": {
+            "unit": "float",
+            "min": 0,
+            "max": 100,
+            "user": 150,
+        },  # Out of bounds
+        "bad_bool": {"unit": "bool", "user": 0.5},  # Invalid bool value
+        "missing_data": {"unit": "enum"},  # Missing required permitted_values
+    }
+
+    collection = Inputs.from_json(inputs_data)
+
+    # Collection should exist
+    assert len(collection) == 4
+
+    # Should have aggregated warnings
+    assert len(collection.warnings) > 0
+
+    # Check that warnings from individual inputs are properly prefixed
+    warning_fields = collection.warnings.get_fields_with_warnings()
+
+    # Should have warnings with input key prefixes
+    assert any("Input(key=" in field for field in warning_fields)
+
+
+def test_input_serializable_fields():
+    """Test that different input types return correct serializable fields."""
+    # Test base Input
+    base_input = Input(key="test", unit="simple")
+    base_fields = base_input._get_serializable_fields()
+    expected_base = [
+        "key",
+        "unit",
+        "default",
+        "user",
+        "disabled",
+        "disabled_by",
+    ]
+    for field in expected_base:
+        assert field in base_fields
+
+    # Test EnumInput includes permitted_values
+    enum_input = EnumInput(key="test", unit="enum", permitted_values=["a", "b"])
+    enum_fields = enum_input._get_serializable_fields()
+    assert "permitted_values" in enum_fields
+
+    # Test FloatInput includes min/max
+    float_input = FloatInput(key="test", unit="float", min=0, max=100)
+    float_fields = float_input._get_serializable_fields()
+    assert "min" in float_fields
+    assert "max" in float_fields
+    assert "step" in float_fields
+    assert "share_group" in float_fields
+
+
+def test_input_reset_functionality():
+    """Test that 'reset' string properly clears user values across all input types."""
+    # Test FloatInput
+    float_input = FloatInput(key="test_float", unit="float", min=0, max=100, user=50.0)
+    assert float_input.user == 50.0
+    float_input.user = "reset"
+    assert float_input.user is None
+
+    # Test BoolInput
+    bool_input = BoolInput(key="test_bool", unit="bool", user=1.0)
+    assert bool_input.user == 1.0
+    bool_input.user = "reset"
+    assert bool_input.user is None
+
+    # Test EnumInput
+    enum_input = EnumInput(
+        key="test_enum", unit="enum", permitted_values=["a", "b"], user="a"
+    )
+    assert enum_input.user == "a"
+    enum_input.user = "reset"
+    assert enum_input.user is None
+
+
+def test_collection_iteration_and_access():
+    """Test that Inputs collection supports proper iteration and key access."""
+    inputs_data = {
+        "input1": {"unit": "float", "min": 0, "max": 100},
+        "input2": {"unit": "bool"},
+        "input3": {"unit": "enum", "permitted_values": ["a", "b"]},
+    }
+
+    collection = Inputs.from_json(inputs_data)
+
+    # Test length
+    assert len(collection) == 3
+
+    # Test iteration
+    input_keys = [inp.key for inp in collection]
+    assert "input1" in input_keys
+    assert "input2" in input_keys
+    assert "input3" in input_keys
+
+    # Test keys() method
+    keys = collection.keys()
+    assert len(keys) == 3
+    assert "input1" in keys
+    assert "input2" in keys
+    assert "input3" in keys
diff --git a/tests/models/test_output_curves.py b/tests/models/test_output_curves.py
index c9fccb7..f43a003 100644
--- a/tests/models/test_output_curves.py
+++ b/tests/models/test_output_curves.py
@@ -61,7 +61,9 @@ def test_output_curve_retrieve_processing_error():
 
         assert result is None
         assert len(curve.warnings) > 0
-        assert "Failed to process curve data" in curve.warnings['data'][0]
+        data_warnings = curve.warnings.get_by_field("data")
+        assert len(data_warnings) > 0
+        assert "Failed to process curve data" in data_warnings[0].message
 
 
 def test_output_curve_retrieve_unexpected_error():
@@ -79,9 +81,11 @@ def test_output_curve_retrieve_unexpected_error():
 
         assert result is None
         assert len(curve.warnings) > 0
+        base_warnings = curve.warnings.get_by_field("base")
+        assert len(base_warnings) > 0
         assert (
             "Unexpected error retrieving curve test_curve: Unexpected"
-            in curve.warnings['base'][0]
+            in base_warnings[0].message
         )
 
 
@@ -92,7 +96,9 @@ def test_output_curve_contents_not_available():
 
     assert result is None
     assert len(curve.warnings) > 0
-    assert "not available - no file path set" in curve.warnings['file_path'][0]
+    file_path_warnings = curve.warnings.get_by_field("file_path")
+    assert len(file_path_warnings) > 0
+    assert "not available - no file path set" in file_path_warnings[0].message
 
 
 def test_output_curve_contents_file_error():
@@ -104,7 +110,9 @@ def test_output_curve_contents_file_error():
 
     assert result is None
     assert len(curve.warnings) > 0
-    assert "Failed to read curve file" in curve.warnings['file_path'][0]
+    file_path_warnings = curve.warnings.get_by_field("file_path")
+    assert len(file_path_warnings) > 0
+    assert "Failed to read curve file" in file_path_warnings[0].message
 
 
 def test_output_curve_remove_not_available():
@@ -125,7 +133,9 @@ def test_output_curve_remove_file_error():
 
         assert result is False
         assert len(curve.warnings) > 0
-        assert "Failed to remove curve file" in curve.warnings['file_path'][0]
+        file_path_warnings = curve.warnings.get_by_field("file_path")
+        assert len(file_path_warnings) > 0
+        assert "Failed to remove curve file" in file_path_warnings[0].message
 
 
 def test_output_curves_from_json_with_invalid_curve():
@@ -142,9 +152,15 @@ def test_output_curves_from_json_with_invalid_curve():
     ):
         curves = OutputCurves.from_json(data)
 
-        assert len(curves.curves) == 1
+        assert len(curves.curves) == 2  # 1 valid curve + 1 fallback curve
         assert len(curves.warnings) > 0
-        assert "Skipped invalid curve data" in curves.warnings['OutputCurve(key=valid_curve)'][0]
+        # The key for the warnings appears to be based on the fallback curve that was created
+        fallback_curve_key = (
+            "OutputCurve(key=unknown).unknown"  # This is the actual key generated
+        )
+        fallback_curve_warnings = curves.warnings.get_by_field(fallback_curve_key)
+        assert len(fallback_curve_warnings) > 0
+        assert "Skipped invalid curve data" in fallback_curve_warnings[0].message
 
 
 def test_output_curves_from_service_result_failure():
@@ -157,9 +173,11 @@ def test_output_curves_from_service_result_failure():
     curves = OutputCurves.from_service_result(failed_result, mock_scenario)
 
     assert len(curves.curves) == 0
-    assert len(curves.warnings['base']) == 2
-    assert "Service error: API error" in curves.warnings['base'][0]
-    assert "Service error: Network error" in curves.warnings['base'][1]
+    base_warnings = curves.warnings.get_by_field("base")
+    assert len(base_warnings) == 2
+    warning_messages = [w.message for w in base_warnings]
+    assert "Service error: API error" in warning_messages
+    assert "Service error: Network error" in warning_messages
 
 
 def test_output_curves_from_service_result_no_data():
@@ -196,7 +214,9 @@ def test_output_curves_from_service_result_processing_error():
         assert curves.curves[0].key == "test_curve"
         assert curves.curves[0].type == "unknown"
         assert len(curves.curves[0].warnings) > 0
-        assert "Failed to process curve data" in curves.curves[0].warnings['base'][0]
+        base_warnings = curves.curves[0].warnings.get_by_field("base")
+        assert len(base_warnings) > 0
+        assert "Failed to process curve data" in base_warnings[0].message
 
 
 def test_output_curves_from_service_result_no_caching():
diff --git a/tests/models/test_scenario.py b/tests/models/test_scenario.py
index e72607b..332dab3 100644
--- a/tests/models/test_scenario.py
+++ b/tests/models/test_scenario.py
@@ -1,5 +1,5 @@
+from unittest.mock import Mock
 import pytest
-from pyetm.clients.base_client import BaseClient
 from pyetm.models.inputs import Inputs
 from pyetm.models.custom_curves import CustomCurves
 from pyetm.models.scenario import Scenario, ScenarioError
@@ -13,6 +13,7 @@
 from pyetm.services.scenario_runners.create_scenario import CreateScenarioRunner
 from pyetm.services.scenario_runners.update_metadata import UpdateMetadataRunner
 from pyetm.services.scenario_runners.update_inputs import UpdateInputsRunner
+from pyetm.services.scenario_runners.update_sortables import UpdateSortablesRunner
 
 # ------ New scenario ------ #
 
@@ -38,7 +39,7 @@ def test_new_scenario_success_minimal(monkeypatch, ok_service_result):
     assert scenario.area_code == "nl"
     assert scenario.end_year == 2050
     assert scenario.private is False
-    assert scenario.warnings == {}
+    assert len(scenario.warnings) == 0
 
 
 def test_new_scenario_success_with_kwargs(monkeypatch, ok_service_result):
@@ -72,7 +73,7 @@ def test_new_scenario_success_with_kwargs(monkeypatch, ok_service_result):
     assert scenario.private is True
     assert scenario.start_year == 2019
     assert scenario.source == "pyetm"
-    assert scenario.warnings == {}
+    assert len(scenario.warnings) == 0
 
 
 def test_new_scenario_with_warnings(monkeypatch, ok_service_result):
@@ -88,7 +89,9 @@ def test_new_scenario_with_warnings(monkeypatch, ok_service_result):
 
     scenario = Scenario.new("nl", 2050, invalid_field="should_be_ignored")
     assert scenario.id == 12347
-    assert scenario.warnings["base"] == warnings
+    base_warnings = scenario.warnings.get_by_field("base")
+    assert len(base_warnings) == 1
+    assert base_warnings[0].message == warnings[0]
 
 
 def test_new_scenario_failure(monkeypatch, fail_service_result):
@@ -119,7 +122,7 @@ def test_update_metadata_success(monkeypatch, scenario, ok_service_result):
     result = scenario.update_metadata(end_year=2050, private=True, custom_field="value")
 
     assert result == updated_data
-    assert scenario.warnings == {}
+    assert len(scenario.warnings) == 0
 
 
 def test_update_metadata_with_warnings(monkeypatch, scenario, ok_service_result):
@@ -136,7 +139,9 @@ def test_update_metadata_with_warnings(monkeypatch, scenario, ok_service_result)
     result = scenario.update_metadata(private=True, id=999)
 
     assert result == updated_data
-    assert scenario.warnings["metadata"] == warnings
+    metadata_warnings = scenario.warnings.get_by_field("metadata")
+    assert len(metadata_warnings) == 1
+    assert metadata_warnings[0].message == warnings[0]
 
 
 def test_update_metadata_failure(monkeypatch, scenario, fail_service_result):
@@ -163,7 +168,7 @@ def test_update_metadata_empty_kwargs(monkeypatch, scenario, ok_service_result):
 
     result = scenario.update_metadata()
     assert result == updated_data
-    assert scenario.warnings == {}
+    assert len(scenario.warnings) == 0
 
 
 # ------ Load ------ #
@@ -180,7 +185,7 @@ def test_load_success(monkeypatch, full_scenario_metadata, ok_service_result):
     scenario = Scenario.load(1)
     for key, val in full_scenario_metadata.items():
         assert getattr(scenario, key) == val
-    assert scenario.warnings == {}
+    assert len(scenario.warnings) == 0
 
 
 def test_load_with_warnings(monkeypatch, minimal_scenario_metadata, ok_service_result):
@@ -197,7 +202,9 @@ def test_load_with_warnings(monkeypatch, minimal_scenario_metadata, ok_service_r
     assert scenario.id == 2
     assert scenario.end_year == 2040
     assert scenario.area_code == "NL"
-    assert scenario.warnings["metadata"] == warns
+    metadata_warnings = scenario.warnings.get_by_field("metadata")
+    assert len(metadata_warnings) == 1
+    assert metadata_warnings[0].message == warns[0]
 
 
 def test_load_failure(monkeypatch, fail_service_result):
@@ -221,8 +228,11 @@ def test_load_missing_required_field(monkeypatch, ok_service_result):
         "run",
         lambda client, stub: ok_service_result(incomplete_data),
     )
-    print(Scenario.load(4).warnings)
-    assert "Field required" in Scenario.load(4).warnings["end_year"]
+
+    scenario = Scenario.load(4)
+    end_year_warnings = scenario.warnings.get_by_field("end_year")
+    assert len(end_year_warnings) > 0
+    assert any("Field required" in w.message for w in end_year_warnings)
 
 
 # ------ version ------- #
@@ -234,7 +244,10 @@ def test_version_when_no_url_set(scenario):
 
 def test_version_when_url_stable():
     scenario = Scenario(
-        id=4, url="https://2025-01.engine.energytransitionmodel.com/api/v3/scenarios/4"
+        id=4,
+        area_code="nl",
+        end_year=2050,
+        url="https://2025-01.engine.energytransitionmodel.com/api/v3/scenarios/4",
     )
 
     assert scenario.version == "2025-01"
@@ -242,7 +255,10 @@ def test_version_when_url_stable():
 
 def test_version_when_url_latest():
     scenario = Scenario(
-        id=4, url="https://engine.energytransitionmodel.com/api/v3/scenarios/4"
+        id=4,
+        area_code="nl",
+        end_year=2050,
+        url="https://engine.energytransitionmodel.com/api/v3/scenarios/4",
     )
 
     assert scenario.version == "latest"
@@ -258,7 +274,7 @@ def test_inputs_success(monkeypatch, scenario, inputs_json, ok_service_result):
 
     coll = scenario.inputs
     assert scenario._inputs is coll
-    assert scenario.warnings == {}
+    assert len(scenario.warnings) == 0
 
 
 def test_inputs_with_warnings(monkeypatch, inputs_json, scenario, ok_service_result):
@@ -273,7 +289,9 @@ def test_inputs_with_warnings(monkeypatch, inputs_json, scenario, ok_service_res
     coll = scenario.inputs
     assert coll
     assert next(iter(coll)).key in inputs_json.keys()
-    assert scenario.warnings["inputs"] == warns
+    inputs_warnings = scenario.warnings.get_by_field("inputs")
+    assert len(inputs_warnings) == 1
+    assert inputs_warnings[0].message == warns[0]
 
 
 def test_inputs_failure(monkeypatch, scenario, fail_service_result):
@@ -315,8 +333,7 @@ def test_update_inputs_success(monkeypatch, inputs_json, scenario, ok_service_re
 
     # Should not return anything (returns None)
     assert result is None
-    # No warnings
-    assert scenario.warnings == {}
+    assert len(scenario.warnings) == 0
     # Inputs were updated
     assert targeted_input.user == 42.5
 
@@ -349,7 +366,7 @@ def test_update_inputs_single_input(
 
     # Cache should be invalidated
     assert targeted_input.user == new_value
-    assert scenario.warnings == {}
+    assert len(scenario.warnings) == 0
 
 
 def test_update_inputs_with_warnings(
@@ -370,7 +387,7 @@ def test_update_inputs_with_warnings(
 
     scenario.update_user_values({"investment_costs_co2_ccs": 42.5})
     # This is not likely to occur so we don't log them
-    assert scenario.warnings == {}
+    assert len(scenario.warnings) == 0
     assert scenario._inputs
 
 
@@ -403,7 +420,7 @@ def test_update_inputs_empty_dict(
     )
 
     scenario.update_user_values({})
-    assert scenario.warnings == {}
+    assert len(scenario.warnings) == 0
     assert not scenario.user_values()
 
 
@@ -433,13 +450,14 @@ def mock_runner_run(client, scen, inputs):
     try:
         scenario.update_user_values({"investment_costs_co2_ccs": 42})
 
-        # Should have both existing and new warnings [for now we ignore new warnings]
-        expected_warnings = [
-            "Existing warning 1",
-            "Existing warning 2",
-            # "New warning from update",
-        ]
-        assert scenario.warnings["queries"] == expected_warnings
+        queries_warnings = scenario.warnings.get_by_field("queries")
+        expected_messages = ["Existing warning 1", "Existing warning 2"]
+
+        assert len(queries_warnings) == 2
+        warning_messages = [w.message for w in queries_warnings]
+        for expected_msg in expected_messages:
+            assert expected_msg in warning_messages
+
     finally:
         # Restore original method
         pyetm.services.scenario_runners.update_inputs.UpdateInputsRunner.run = (
@@ -450,7 +468,7 @@ def mock_runner_run(client, scen, inputs):
 # ------ sortables ------ #
 
 
-@pytest.fixture(autouse=True)
+@pytest.fixture
 def patch_sortables_from_json(monkeypatch):
     dummy = object()
     monkeypatch.setattr(Sortables, "from_json", staticmethod(lambda data: dummy))
@@ -469,7 +487,7 @@ def test_sortables_success(
     coll = scenario.sortables
     assert coll is patch_sortables_from_json
     assert scenario._sortables is coll
-    assert scenario.warnings == {}
+    assert len(scenario.warnings) == 0
 
 
 def test_sortables_with_warnings(
@@ -486,7 +504,7 @@ def test_sortables_with_warnings(
 
     coll = scenario.sortables
     assert coll is patch_sortables_from_json
-    assert scenario.warnings["sortables"] == warns
+    assert len(scenario.warnings) > 0
 
 
 def test_sortables_failure(monkeypatch, scenario, fail_service_result):
@@ -500,6 +518,78 @@ def test_sortables_failure(monkeypatch, scenario, fail_service_result):
         _ = scenario.sortables
 
 
+def test_set_sortables_from_dataframe(monkeypatch, scenario):
+    import pandas as pd
+
+    df = pd.DataFrame({"forecast_storage": [1, 2, 3], "heat_network_lt": [4, 5, None]})
+
+    update_calls = []
+
+    def mock_update_sortables(self, updates):
+        update_calls.append(updates)
+
+    monkeypatch.setattr(scenario.__class__, "update_sortables", mock_update_sortables)
+
+    scenario.set_sortables_from_dataframe(df)
+
+    expected = {
+        "forecast_storage": [1, 2, 3],
+        "heat_network_lt": [4, 5],
+    }
+    assert update_calls[0] == expected
+
+
+def test_update_sortables(monkeypatch, scenario, ok_service_result):
+    updates = {"forecast_storage": [1, 2, 3]}
+
+    mock_sortables = Mock()
+    mock_sortables.is_valid_update.return_value = {}
+    mock_sortables.update = Mock()
+    scenario._sortables = mock_sortables
+
+    monkeypatch.setattr(
+        UpdateSortablesRunner, "run", lambda *args, **kwargs: ok_service_result({})
+    )
+
+    scenario.update_sortables(updates)
+
+    mock_sortables.is_valid_update.assert_called_once_with(updates)
+    mock_sortables.update.assert_called_once_with(updates)
+
+
+def test_update_sortables_validation_error(scenario):
+    from pyetm.models.warnings import WarningCollector
+
+    updates = {"nonexistent": [1, 2, 3]}
+
+    mock_sortables = Mock()
+    error_collector = WarningCollector.with_warning(
+        "nonexistent", "Sortable does not exist"
+    )
+    mock_sortables.is_valid_update.return_value = {"nonexistent": error_collector}
+    scenario._sortables = mock_sortables
+
+    with pytest.raises(ScenarioError):
+        scenario.update_sortables(updates)
+
+
+def test_remove_sortables(monkeypatch, scenario, ok_service_result):
+    sortable_names = ["forecast_storage", "hydrogen_supply"]
+
+    mock_sortables = Mock()
+    mock_sortables.update = Mock()
+    scenario._sortables = mock_sortables
+
+    monkeypatch.setattr(
+        UpdateSortablesRunner, "run", lambda *args, **kwargs: ok_service_result({})
+    )
+
+    scenario.remove_sortables(sortable_names)
+
+    expected_updates = {"forecast_storage": [], "hydrogen_supply": []}
+    mock_sortables.update.assert_called_once_with(expected_updates)
+
+
 # ------ custom_curves ------ #
 
 
@@ -528,7 +618,7 @@ def test_custom_curves_success(
     coll = scenario.custom_curves
     assert coll is patch_custom_curves_from_json
     assert scenario._custom_curves is coll
-    assert scenario.warnings == {}
+    assert len(scenario.warnings) == 0
 
 
 def test_custom_curves_with_warnings(
@@ -545,7 +635,9 @@ def test_custom_curves_with_warnings(
 
     coll = scenario.custom_curves
     assert coll is patch_custom_curves_from_json
-    assert scenario.warnings["custom_curves"] == warns
+    custom_curves_warnings = scenario.warnings.get_by_field("custom_curves")
+    assert len(custom_curves_warnings) == 1
+    assert custom_curves_warnings[0].message == warns[0]
 
 
 def test_custom_curves_failure(monkeypatch, scenario, fail_service_result):
@@ -564,3 +656,264 @@ def test_to_dataframe(scenario):
     dataframe = scenario.to_dataframe()
 
     assert dataframe[scenario.id]["end_year"] == 2050
+
+
+# ------ Warnings tests ------ #
+
+
+def test_scenario_warning_system_integration(scenario):
+    """Test that the scenario properly integrates with the new warning system"""
+    # Add some warnings
+    scenario.add_warning("test_field", "Test warning message")
+    scenario.add_warning("test_field", "Another warning")
+    scenario.add_warning("other_field", "Different field warning", "error")
+
+    # Check warning collector functionality
+    assert len(scenario.warnings) == 3
+    assert scenario.warnings.has_warnings("test_field")
+    assert scenario.warnings.has_warnings("other_field")
+
+    test_warnings = scenario.warnings.get_by_field("test_field")
+    assert len(test_warnings) == 2
+
+    other_warnings = scenario.warnings.get_by_field("other_field")
+    assert len(other_warnings) == 1
+    assert other_warnings[0].severity == "error"
+
+
+def test_scenario_show_all_warnings(scenario, capsys):
+    """Test the show_all_warnings method"""
+    scenario.add_warning("test_field", "Test warning")
+
+    scenario.show_all_warnings()
+
+    captured = capsys.readouterr()
+    assert f"Warnings for Scenario {scenario.id}" in captured.out
+    assert "Scenario warnings:" in captured.out
+    assert "Test warning" in captured.out
+
+
+# ------ Update Custom Curves Tests ------ #
+
+
+def test_scenario_update_custom_curves_success(monkeypatch, ok_service_result):
+    """Test successful custom curves update"""
+    from pyetm.models.custom_curves import CustomCurve, CustomCurves
+    from pyetm.services.scenario_runners.update_custom_curves import UpdateCustomCurvesRunner
+    from pyetm.models.warnings import WarningCollector
+    import pandas as pd
+    import numpy as np
+    
+    scenario = Scenario(id=12345, area_code="nl", end_year=2050)
+    scenario._custom_curves = CustomCurves(curves=[])
+    
+    # Create valid custom curves (mock file data)
+    curve = CustomCurve(key="test_curve", type="profile")
+    custom_curves = CustomCurves(curves=[curve])
+    
+    # Mock validate_for_upload to return no errors
+    def mock_validate():
+        return {}
+    
+    # Mock UpdateCustomCurvesRunner to succeed
+    def mock_runner(client, scenario, curves):
+        return ok_service_result({
+            "uploaded_curves": ["test_curve"],
+            "total_curves": 1,
+            "successful_uploads": 1
+        })
+    
+    monkeypatch.setattr(custom_curves, "validate_for_upload", mock_validate)
+    monkeypatch.setattr(UpdateCustomCurvesRunner, "run", mock_runner)
+    
+    # Should succeed without raising exception
+    scenario.update_custom_curves(custom_curves)
+    
+    # Verify curve was added to scenario's curves
+    assert len(scenario.custom_curves.curves) == 1
+    assert scenario.custom_curves.curves[0].key == "test_curve"
+
+
+def test_scenario_update_custom_curves_validation_error():
+    """Test custom curves update with validation errors"""
+    from pyetm.models.custom_curves import CustomCurve, CustomCurves
+    from pyetm.models.warnings import WarningCollector
+    
+    scenario = Scenario(id=12345, area_code="nl", end_year=2050)
+    
+    # Create custom curves
+    curve = CustomCurve(key="invalid_curve", type="profile")
+    custom_curves = CustomCurves(curves=[curve])
+    
+    # Mock validate_for_upload to return validation errors
+    def mock_validate():
+        warning_collector = WarningCollector()
+        warning_collector.add("invalid_curve", "Curve contains non-numeric values")
+        return {"invalid_curve": warning_collector}
+    
+    custom_curves.validate_for_upload = mock_validate
+    
+    # Should raise ScenarioError due to validation failure
+    with pytest.raises(ScenarioError) as exc_info:
+        scenario.update_custom_curves(custom_curves)
+    
+    assert "Could not update custom curves" in str(exc_info.value)
+    assert "invalid_curve" in str(exc_info.value)
+    assert "Curve contains non-numeric values" in str(exc_info.value)
+
+
+def test_scenario_update_custom_curves_runner_failure(monkeypatch, fail_service_result):
+    """Test custom curves update with runner failure"""
+    from pyetm.models.custom_curves import CustomCurve, CustomCurves
+    from pyetm.services.scenario_runners.update_custom_curves import UpdateCustomCurvesRunner
+    
+    scenario = Scenario(id=12345, area_code="nl", end_year=2050)
+    
+    # Create valid custom curves
+    curve = CustomCurve(key="test_curve", type="profile")
+    custom_curves = CustomCurves(curves=[curve])
+    
+    # Mock validate_for_upload to return no errors
+    def mock_validate():
+        return {}
+    
+    # Mock UpdateCustomCurvesRunner to fail
+    def mock_runner(client, scenario, curves):
+        return fail_service_result(["HTTP 500: Internal server error"])
+    
+    monkeypatch.setattr(custom_curves, "validate_for_upload", mock_validate)
+    monkeypatch.setattr(UpdateCustomCurvesRunner, "run", mock_runner)
+    
+    # Should raise ScenarioError due to runner failure
+    with pytest.raises(ScenarioError) as exc_info:
+        scenario.update_custom_curves(custom_curves)
+    
+    assert "Could not update custom curves" in str(exc_info.value)
+    assert "HTTP 500: Internal server error" in str(exc_info.value)
+
+
+def test_scenario_update_custom_curves_updates_existing_curve(monkeypatch, ok_service_result):
+    """Test that updating existing curves replaces file_path"""
+    from pyetm.models.custom_curves import CustomCurve, CustomCurves
+    from pyetm.services.scenario_runners.update_custom_curves import UpdateCustomCurvesRunner
+    from pathlib import Path
+    
+    scenario = Scenario(id=12345, area_code="nl", end_year=2050)
+    
+    # Set up scenario with existing curve
+    existing_curve = CustomCurve(key="existing_curve", type="profile", file_path=Path("/old/path.csv"))
+    scenario._custom_curves = CustomCurves(curves=[existing_curve])
+    
+    # Create new curves with same key but different file path
+    new_curve = CustomCurve(key="existing_curve", type="profile", file_path=Path("/new/path.csv"))
+    custom_curves = CustomCurves(curves=[new_curve])
+    
+    # Mock validate_for_upload to return no errors
+    def mock_validate():
+        return {}
+    
+    # Mock UpdateCustomCurvesRunner to succeed
+    def mock_runner(client, scenario, curves):
+        return ok_service_result({
+            "uploaded_curves": ["existing_curve"],
+            "total_curves": 1,
+            "successful_uploads": 1
+        })
+    
+    monkeypatch.setattr(custom_curves, "validate_for_upload", mock_validate)
+    monkeypatch.setattr(UpdateCustomCurvesRunner, "run", mock_runner)
+    
+    # Update curves
+    scenario.update_custom_curves(custom_curves)
+    
+    # Verify existing curve was updated with new file path
+    assert len(scenario.custom_curves.curves) == 1
+    updated_curve = scenario.custom_curves.curves[0]
+    assert updated_curve.key == "existing_curve"
+    assert updated_curve.file_path == Path("/new/path.csv")
+
+
+def test_scenario_update_custom_curves_adds_new_curve(monkeypatch, ok_service_result):
+    """Test that new curves are added to scenario's curves collection"""
+    from pyetm.models.custom_curves import CustomCurve, CustomCurves
+    from pyetm.services.scenario_runners.update_custom_curves import UpdateCustomCurvesRunner
+    from pathlib import Path
+    
+    scenario = Scenario(id=12345, area_code="nl", end_year=2050)
+    
+    # Set up scenario with one existing curve
+    existing_curve = CustomCurve(key="existing_curve", type="profile", file_path=Path("/old/path.csv"))
+    scenario._custom_curves = CustomCurves(curves=[existing_curve])
+    
+    # Create new curve with different key
+    new_curve = CustomCurve(key="new_curve", type="availability", file_path=Path("/new/path.csv"))
+    custom_curves = CustomCurves(curves=[new_curve])
+    
+    # Mock validate_for_upload to return no errors
+    def mock_validate():
+        return {}
+    
+    # Mock UpdateCustomCurvesRunner to succeed
+    def mock_runner(client, scenario, curves):
+        return ok_service_result({
+            "uploaded_curves": ["new_curve"],
+            "total_curves": 1,
+            "successful_uploads": 1
+        })
+    
+    monkeypatch.setattr(custom_curves, "validate_for_upload", mock_validate)
+    monkeypatch.setattr(UpdateCustomCurvesRunner, "run", mock_runner)
+    
+    # Update curves
+    scenario.update_custom_curves(custom_curves)
+    
+    # Verify both curves exist
+    assert len(scenario.custom_curves.curves) == 2
+    curve_keys = {curve.key for curve in scenario.custom_curves.curves}
+    assert curve_keys == {"existing_curve", "new_curve"}
+
+
+def test_scenario_update_custom_curves_multiple_validation_errors():
+    """Test custom curves update with multiple validation errors"""
+    from pyetm.models.custom_curves import CustomCurve, CustomCurves
+    from pyetm.models.warnings import WarningCollector
+    
+    scenario = Scenario(id=12345, area_code="nl", end_year=2050)
+    
+    # Create custom curves
+    curves = [
+        CustomCurve(key="curve1", type="profile"),
+        CustomCurve(key="curve2", type="availability")
+    ]
+    custom_curves = CustomCurves(curves=curves)
+    
+    # Mock validate_for_upload to return multiple validation errors
+    def mock_validate():
+        errors = {}
+        
+        # Curve1 errors
+        curve1_warnings = WarningCollector()
+        curve1_warnings.add("curve1", "Wrong length")
+        curve1_warnings.add("curve1", "Non-numeric values")
+        errors["curve1"] = curve1_warnings
+
+        # Curve2 errors
+        curve2_warnings = WarningCollector()
+        curve2_warnings.add("curve2", "No data available")
+        errors["curve2"] = curve2_warnings
+
+        return errors
+    
+    custom_curves.validate_for_upload = mock_validate
+    
+    # Should raise ScenarioError with all validation errors
+    with pytest.raises(ScenarioError) as exc_info:
+        scenario.update_custom_curves(custom_curves)
+    
+    error_message = str(exc_info.value)
+    assert "Could not update custom curves" in error_message
+    assert "curve1" in error_message
+    assert "curve2" in error_message
+    assert "Wrong length" in error_message
+    assert "Non-numeric values" in error_message
+    assert "No data available" in error_message
diff --git a/tests/models/test_scenario_packer.py b/tests/models/test_scenario_packer.py
index b54503f..23b3525 100644
--- a/tests/models/test_scenario_packer.py
+++ b/tests/models/test_scenario_packer.py
@@ -1,16 +1,20 @@
 import pytest
 import pandas as pd
-import numpy as np
 import tempfile
 import os
 from unittest.mock import Mock, patch
 from pyetm.models.scenario_packer import (
-    CustomCurvesPack,
-    InputsPack,
-    OutputCurvesPack,
-    SortablePack,
+    ScenarioPacker,
+    ExportConfigResolver,
 )
-from pyetm.models import ScenarioPacker, Scenario
+from pyetm.models.packables.custom_curves_pack import CustomCurvesPack
+from pyetm.models.packables.inputs_pack import InputsPack
+from pyetm.models.packables.output_curves_pack import OutputCurvesPack
+from pyetm.models.packables.sortable_pack import SortablePack
+from pyetm.models.packables.query_pack import QueryPack
+from pyetm.models import Scenario
+from pyetm.models.custom_curves import CustomCurves
+from pyetm.models.export_config import ExportConfig
 
 
 class TestScenarioPackerInit:
@@ -31,8 +35,8 @@ def test_add_single_scenario(self, sample_scenario):
         packer.add(sample_scenario)
 
         # Should be added to all collections
-        for _key, collection in packer.model_dump():
-            assert sample_scenario in collection
+        for pack in packer._get_all_packs():
+            assert sample_scenario in pack.scenarios
 
     def test_add_multiple_scenarios(self, multiple_scenarios):
         """Test adding multiple scenarios at once"""
@@ -40,10 +44,10 @@ def test_add_multiple_scenarios(self, multiple_scenarios):
         packer.add(*multiple_scenarios)
 
         # All scenarios should be in all collections
-        for _key, collection in packer.model_dump():
-            assert len(collection) == 3
+        for pack in packer._get_all_packs():
+            assert len(pack.scenarios) == 3
             for scenario in multiple_scenarios:
-                assert scenario in collection
+                assert scenario in pack.scenarios
 
     def test_add_custom_curves(self, sample_scenario):
         """Test adding scenarios to custom_curves only"""
@@ -188,13 +192,14 @@ def test_inputs_no_input_scenarios(self, sample_scenario):
     def test_inputs_single_scenario(self, scenario_with_inputs):
         """Test inputs with single scenario"""
         mock_df = pd.DataFrame(
-            {"value": [1000, 2000], "unit": ["MW", "MW"], "default": [500, 800]},
+            {"user": [1000, 2000], "unit": ["MW", "MW"], "default": [500, 800]},
             index=["wind_capacity", "solar_capacity"],
         )
         mock_df.index.name = "input"
         final_df = mock_df.set_index("unit", append=True)
 
         scenario_with_inputs.inputs.to_dataframe = Mock(return_value=final_df)
+        scenario_with_inputs.identifier = Mock(return_value=scenario_with_inputs.id)
 
         packer = ScenarioPacker()
         packer.add_inputs(scenario_with_inputs)
@@ -203,8 +208,6 @@ def test_inputs_single_scenario(self, scenario_with_inputs):
 
         assert not result.empty
         assert "input" in result.index.names
-        assert (scenario_with_inputs.id, "value") in result.columns
-        assert (scenario_with_inputs.id, "default") in result.columns
 
     def test_inputs_multiple_scenarios(self, multiple_scenarios):
         """Test inputs with multiple scenarios"""
@@ -228,22 +231,19 @@ def test_inputs_multiple_scenarios(self, multiple_scenarios):
 
         result = packer.inputs()
 
-        # Should have unit column plus value/default for each scenario
-        expected_columns = (
-            [("unit", "")]
-            + [(s.id, "value") for s in multiple_scenarios]
-            + [(s.id, "default") for s in multiple_scenarios]
-        )
-        assert len(result.columns) >= len(multiple_scenarios) * 2
+        assert set(result.columns) == {s.id for s in multiple_scenarios}
 
-        # Should have all unique input keys
-        all_keys = {
-            ("wind_capacity", "MW"),
-            ("unique_input_0", "GW"),
-            ("unique_input_1", "GW"),
-            ("unique_input_2", "GW"),
+        expected_keys = {
+            "wind_capacity",
+            "unique_input_0",
+            "unique_input_1",
+            "unique_input_2",
         }
-        assert set(result.index) == all_keys
+        assert set(result.index) == expected_keys
+
+        for i, s in enumerate(multiple_scenarios):
+            assert result.loc["wind_capacity", s.id] == 1000 + i * 100
+            assert result.loc[f"unique_input_{i}", s.id] == i * 10
 
 
 class TestGqueryResults:
@@ -269,6 +269,7 @@ def test_gquery_results_no_queries(self, sample_scenario):
 
     def test_gquery_results_single_scenario(self, scenario_with_queries):
         """Test gquery_results with single scenario"""
+        scenario_with_queries.identifier = Mock(return_value=scenario_with_queries.id)
         packer = ScenarioPacker()
         packer.add(scenario_with_queries)
 
@@ -288,6 +289,7 @@ def test_gquery_results_multiple_scenarios(self):
             scenario.area_code = "nl2015"
             scenario.end_year = 2050
             scenario.start_year = 2019
+            scenario.identifier = Mock(return_value=scenario.id)
 
             mock_results = pd.DataFrame(
                 {"future": [100 + i * 10, 200 + i * 20], "unit": ["MW", "GWh"]},
@@ -366,11 +368,16 @@ def test_custom_curves_with_series(self, sample_scenario):
 
         packer = ScenarioPacker()
         packer.add_custom_curves(sample_scenario)
-
         result = packer.custom_curves()
+
         assert not result.empty
-        assert "curve1" in result.columns
-        assert "curve2" in result.columns
+        if isinstance(result.columns, pd.MultiIndex):
+            level_1 = result.columns.get_level_values(1)
+            assert "curve1" in level_1
+            assert "curve2" in level_1
+        else:
+            assert "curve1" in result.columns
+            assert "curve2" in result.columns
 
     def test_output_curves_empty(self):
         """Test output_curves with no scenarios"""
@@ -388,8 +395,12 @@ def test_output_curves_with_series(self, sample_scenario):
         packer = ScenarioPacker()
         packer.add_output_curves(sample_scenario)
         result = packer.output_curves()
+
         assert not result.empty
-        assert "output_curve" in result.columns
+        if isinstance(result.columns, pd.MultiIndex):
+            assert "output_curve" in result.columns.get_level_values(1)
+        else:
+            assert "output_curve" in result.columns
 
 
 class TestExcelExport:
@@ -423,9 +434,18 @@ def test_to_excel_with_data(self, scenario_with_inputs):
         packer = ScenarioPacker()
         packer.add(scenario_with_inputs)
 
+        scenario_with_inputs.to_dataframe = Mock(
+            return_value=pd.DataFrame(
+                {scenario_with_inputs.id: ["nl2015", 2050]},
+                index=["area_code", "end_year"],
+            )
+        )
+
         with (
             patch.object(ScenarioPacker, "main_info", return_value=dummy_main_df),
-            patch.object(InputsPack, "to_dataframe", return_value=dummy_inputs_df),
+            patch.object(
+                InputsPack, "build_combined_dataframe", return_value=dummy_inputs_df
+            ),
             patch.object(ScenarioPacker, "gquery_results", return_value=dummy_empty_df),
             patch.object(SortablePack, "to_dataframe", return_value=dummy_empty_df),
             patch.object(CustomCurvesPack, "to_dataframe", return_value=dummy_empty_df),
@@ -446,6 +466,7 @@ def test_to_excel_sheet_types(self):
         scenario.area_code = "nl2015"
         scenario.end_year = 2050
         scenario.start_year = 2019
+        scenario.identifier = Mock(return_value=scenario.id)
 
         # Mock all data methods to return non-empty DataFrames
         scenario.to_dataframe = Mock(
@@ -507,7 +528,7 @@ def test_clear(self, multiple_scenarios):
 
         # Verify all collections are empty
         assert len(packer._scenarios()) == 0
-        for pack in packer.all_pack_data():
+        for pack in packer._get_all_packs():
             assert len(pack.scenarios) == 0
 
     def test_remove_scenario(self, multiple_scenarios):
@@ -567,3 +588,1101 @@ def test_get_summary_with_data(self, multiple_scenarios):
         assert summary["output_curves"]["scenario_count"] == 1  # scenario 2 only
         assert len(summary["scenario_ids"]) == 3
         assert all(s.id in summary["scenario_ids"] for s in multiple_scenarios)
+
+
+class TestFromExcel:
+    def test_from_excel(self):
+        ScenarioPacker.from_excel("tests/fixtures/my_input_excel.xlsx")
+
+
+class TestExportConfigResolver:
+    """Test the ExportConfigResolver class"""
+
+    def test_resolve_boolean_explicit_value(self):
+        """Test resolve_boolean with explicit value provided"""
+        assert ExportConfigResolver.resolve_boolean(True, False, False) == True
+        assert ExportConfigResolver.resolve_boolean(False, True, True) == False
+        assert ExportConfigResolver.resolve_boolean(None, True, False) == True
+        assert ExportConfigResolver.resolve_boolean(None, None, True) == True
+
+    def test_parse_config_from_series(self):
+        """Test parsing config from pandas Series"""
+        series = pd.Series(
+            {
+                "inputs": "yes",
+                "sortables": "no",
+                "defaults": "1",
+                "min_max": "0",
+                "exports": "electricity,gas",
+            }
+        )
+
+        config = ExportConfigResolver._parse_config_from_series(series)
+
+        assert config.include_inputs == True
+        assert config.include_sortables == False
+        assert config.inputs_defaults == True
+        assert config.inputs_min_max == False
+        assert config.output_carriers == ["electricity", "gas"]
+
+
+class TestScenarioPackerHelpers:
+
+    def test_find_first_non_empty_row(self):
+        """Test _find_first_non_empty_row method"""
+        packer = ScenarioPacker()
+
+        assert packer._find_first_non_empty_row(None) is None
+
+        empty = pd.DataFrame([[float("nan")], [float("nan")]])
+        assert packer._find_first_non_empty_row(empty) is None
+
+        # Test with actual data
+        df = pd.DataFrame([[None, None], ["header", "value"], [1, 2]])
+        assert packer._find_first_non_empty_row(df) == 1
+
+    def test_is_helper_column(self):
+        """Test _is_helper_column method"""
+        packer = ScenarioPacker()
+        helpers = {"sortables", "hour", "index"}
+
+        assert packer._is_helper_column(123, helpers) is True
+        assert packer._is_helper_column(" ", helpers) is True
+        assert packer._is_helper_column("NaN", helpers) is True
+        assert packer._is_helper_column("hour", helpers) is True
+        assert packer._is_helper_column("value", helpers) is False
+
+    def test_normalize_sheet(self):
+        """Test _normalize_sheet method"""
+        packer = ScenarioPacker()
+
+        # None -> empty
+        assert packer._normalize_sheet(None, helper_names=set()).empty
+
+        # Build a frame with header at row 1 (0-based)
+        raw = pd.DataFrame(
+            [
+                [None, None, None],
+                ["index", "heat_network", "value"],  # header
+                [1, "hn", 10],
+                [2, "hn", 20],
+            ]
+        )
+
+        norm = packer._normalize_sheet(
+            raw,
+            helper_names={"index"},
+            reset_index=False,
+            rename_map={"heat_network": "heat_network_lt"},
+        )
+
+        # index column removed, rename applied, index preserved
+        assert list(norm.columns) == ["heat_network_lt", "value"]
+        assert norm.index.tolist() == [2, 3]  # original DataFrame indices kept
+
+    def test_safe_get_bool(self):
+        """Test _safe_get_bool method"""
+        packer = ScenarioPacker()
+        na = float("nan")
+        assert packer._safe_get_bool(None) is None
+        assert packer._safe_get_bool(na) is None
+        assert packer._safe_get_bool(True) is True
+        assert packer._safe_get_bool(False) is False
+        assert packer._safe_get_bool(1) is True
+        assert packer._safe_get_bool(0.0) is False
+        assert packer._safe_get_bool("yes") is True
+        assert packer._safe_get_bool("No") is False
+        assert packer._safe_get_bool("1") is True
+        assert packer._safe_get_bool("maybe") is None
+
+    def test_safe_get_int(self):
+        """Test _safe_get_int method"""
+        packer = ScenarioPacker()
+        na = float("nan")
+        assert packer._safe_get_int(None) is None
+        assert packer._safe_get_int(na) is None
+        assert packer._safe_get_int(5) == 5
+        assert packer._safe_get_int(5.9) == 5
+        assert packer._safe_get_int("7") == 7
+        assert packer._safe_get_int("abc") is None
+
+    def test_load_or_create_scenario_load_new_and_failures(self, monkeypatch):
+        """Test _load_or_create_scenario method"""
+        packer = ScenarioPacker()
+
+        loaded = Mock(spec=Scenario)
+        created = Mock(spec=Scenario)
+
+        # Successful load
+        monkeypatch.setattr(Scenario, "load", staticmethod(lambda sid: loaded))
+        out = packer._load_or_create_scenario(42, "nl2015", 2050, "COL")
+        assert out is loaded
+
+        # Failing load -> None
+        def boom(_):
+            raise RuntimeError("bad")
+
+        monkeypatch.setattr(Scenario, "load", staticmethod(boom))
+        assert packer._load_or_create_scenario(42, "nl2015", 2050, "COL") is None
+
+        # Successful new
+        monkeypatch.setattr(Scenario, "new", staticmethod(lambda a, y: created))
+        out = packer._load_or_create_scenario(None, "de", 2030, "COL2")
+        assert out is created
+
+        # Failing new -> None
+        def boom2(_, __):
+            raise ValueError("bad")
+
+        monkeypatch.setattr(Scenario, "new", staticmethod(boom2))
+        assert packer._load_or_create_scenario(None, "nl", 2050, "C") is None
+
+        # Missing fields -> None
+        assert packer._load_or_create_scenario(None, None, None, "C") is None
+
+    def test_extract_metadata_updates_and_apply(self):
+        """Test metadata extraction and application"""
+        packer = ScenarioPacker()
+
+        # Test extraction
+        series = pd.Series(
+            {"private": True, "template": 7, "source": " src ", "title": "  title  "}
+        )
+
+        meta = packer._extract_metadata_updates(series)
+        assert meta == {
+            "private": True,
+            "template": 7,
+            "source": "src",
+            "title": "title",
+        }
+
+        # empty strings trimmed out
+        series_empty = pd.Series(
+            {"private": None, "template": None, "source": " ", "title": ""}
+        )
+        meta_empty = packer._extract_metadata_updates(series_empty)
+        assert meta_empty == {}
+
+        # apply updates
+        scenario = Mock(spec=Scenario)
+        packer._apply_metadata_to_scenario(scenario, {"private": False})
+        scenario.update_metadata.assert_called_once_with(private=False)
+
+        # swallow exceptions
+        scenario.update_metadata.side_effect = RuntimeError("boom")
+        packer._apply_metadata_to_scenario(
+            scenario, {"private": True}
+        )  # should not raise
+
+        # no updates does nothing
+        scenario.update_metadata.reset_mock()
+        scenario.update_metadata.side_effect = None
+        packer._apply_metadata_to_scenario(scenario, {})
+        scenario.update_metadata.assert_not_called()
+
+    def test_extract_scenario_sheet_info_series_and_df(self):
+        """Test _extract_scenario_sheet_info method"""
+        packer = ScenarioPacker()
+
+        ser = pd.Series(
+            {
+                "short_name": "S",
+                "sortables": "SORT1",
+                "custom_curves": "CUR1",
+            },
+            name="COL1",
+        )
+        out = packer._extract_scenario_sheet_info(ser)
+        assert out == {
+            "COL1": {"short_name": "S", "sortables": "SORT1", "custom_curves": "CUR1"}
+        }
+
+        df = pd.DataFrame(
+            {
+                "A": {"short_name": None, "sortables": "S_A", "custom_curves": None},
+                "B": {"short_name": "B_S", "sortables": None, "custom_curves": "C_B"},
+            }
+        )
+        out2 = packer._extract_scenario_sheet_info(df)
+        assert out2["A"]["short_name"] == "A"
+        assert out2["A"]["sortables"] == "S_A"
+        assert out2["A"]["custom_curves"] is None
+        assert out2["B"]["short_name"] == "B_S"
+        assert out2["B"]["custom_curves"] == "C_B"
+
+    def test_process_single_scenario_sortables(self):
+        """Test _process_single_scenario_sortables method"""
+        packer = ScenarioPacker()
+        scenario = Mock(spec=Scenario)
+
+        # Build a sheet where header row contains helpers + target column to be renamed
+        raw = pd.DataFrame(
+            [
+                [None, None, None],
+                ["sortables", "heat_network", "hour"],
+                [None, "lt", 1],
+                [None, "mt", 2],
+            ]
+        )
+
+        packer._process_single_scenario_sortables(scenario, raw)
+        assert scenario.set_sortables_from_dataframe.called
+        df_arg = scenario.set_sortables_from_dataframe.call_args[0][0]
+        assert "heat_network_lt" in df_arg.columns
+        assert "hour" not in df_arg.columns
+
+    def test_process_single_scenario_sortables_empty_after_normalize(self):
+        """Test _process_single_scenario_sortables with empty data after normalization"""
+        packer = ScenarioPacker()
+        scenario = Mock(spec=Scenario)
+
+        raw = pd.DataFrame(
+            [
+                [None, None],
+                ["sortables", "hour"],
+                [None, 1],
+            ]
+        )
+
+        packer._process_single_scenario_sortables(scenario, raw)
+        scenario.set_sortables_from_dataframe.assert_not_called()
+
+    def test_process_single_scenario_curves_success_and_error(self, monkeypatch):
+        """Test _process_single_scenario_curves method"""
+        packer = ScenarioPacker()
+        scenario = Mock(spec=Scenario)
+        scenario.id = 999
+
+        raw = pd.DataFrame(
+            [
+                [None, None],
+                ["custom_curves", "value"],
+                ["curve_1", 1.0],
+                ["curve_2", 2.0],
+            ]
+        )
+
+        dummy_curves = Mock(spec=CustomCurves)
+        monkeypatch.setattr(
+            CustomCurves,
+            "_from_dataframe",
+            staticmethod(lambda df, scenario_id: dummy_curves),
+        )
+        packer._process_single_scenario_curves(scenario, raw)
+        scenario.update_custom_curves.assert_called_once_with(dummy_curves)
+        scenario.update_custom_curves.reset_mock()
+
+        def boom(_df, scenario_id):
+            raise RuntimeError("bad curves")
+
+        monkeypatch.setattr(CustomCurves, "_from_dataframe", staticmethod(boom))
+        packer._process_single_scenario_curves(scenario, raw)
+        scenario.update_custom_curves.assert_not_called()
+
+    def test_process_single_scenario_curves_empty_after_normalize(self):
+        """Test _process_single_scenario_curves with empty data after normalization"""
+        packer = ScenarioPacker()
+        scenario = Mock(spec=Scenario)
+        scenario.id = 1
+
+        raw = pd.DataFrame(
+            [
+                [None],
+                ["custom_curves"],
+                [None],
+            ]
+        )
+        packer._process_single_scenario_curves(scenario, raw)
+        scenario.update_custom_curves.assert_not_called()
+
+
+class TestCreateScenarioFromColumn:
+
+    def test_create_scenario_from_column_loads_and_updates(self, monkeypatch):
+        """Test _create_scenario_from_column method with loading existing scenario"""
+        packer = ScenarioPacker()
+        scenario = Mock(spec=Scenario)
+        scenario.identifier = Mock(return_value="SID")
+        monkeypatch.setattr(Scenario, "load", staticmethod(lambda sid: scenario))
+
+        ser = pd.Series(
+            {
+                "scenario_id": "101",
+                "area_code": "nl2015",
+                "end_year": 2050,
+                "private": "yes",
+                "template": "7",
+                "source": " src ",
+                "title": " title ",
+            }
+        )
+
+        out = packer._create_scenario_from_column("COL", ser)
+        assert out is scenario
+        scenario.update_metadata.assert_called_once()
+
+    def test_create_scenario_from_column_creates(self, monkeypatch):
+        """Test _create_scenario_from_column method with creating new scenario"""
+        packer = ScenarioPacker()
+        scenario = Mock(spec=Scenario)
+        scenario.identifier = Mock(return_value="NEW")
+        # Accept *args, **kwargs for compatibility with production code
+        monkeypatch.setattr(
+            Scenario, "new", staticmethod(lambda *args, **kwargs: scenario)
+        )
+
+        ser = pd.Series(
+            {
+                "scenario_id": None,
+                "area_code": "de",
+                "end_year": 2030,
+                "private": 0,
+                "template": None,
+            }
+        )
+
+        out = packer._create_scenario_from_column("COL", ser)
+        assert out is scenario
+
+    def test_create_scenario_from_column_returns_none_on_fail(self, monkeypatch):
+        """Test _create_scenario_from_column returns None on failure"""
+        packer = ScenarioPacker()
+        monkeypatch.setattr(
+            ScenarioPacker, "_load_or_create_scenario", lambda self, *a, **k: None
+        )
+        ser = pd.Series({"scenario_id": None, "area_code": None, "end_year": None})
+        assert packer._create_scenario_from_column("COL", ser) is None
+
+
+class TestFromExcelDetailed:
+
+    def test_from_excel_full_flow(self, tmp_path, monkeypatch):
+        """Test complete from_excel flow"""
+        # Prepare MAIN with two scenarios: one load, one create
+        main = pd.DataFrame(
+            {
+                "S1": {
+                    "scenario_id": 101,
+                    "area_code": "nl2015",
+                    "end_year": 2050,
+                    "private": "yes",
+                    "template": 3,
+                    "source": "source1",
+                    "title": "Title 1",
+                    "short_name": "Short1",
+                    "sortables": "S1_SORT",
+                    "custom_curves": "S1_CURVES",
+                },
+                "S2": {
+                    "scenario_id": None,
+                    "area_code": "de",
+                    "end_year": 2030,
+                    "private": 0,
+                    "template": None,
+                    "source": "",
+                    "title": "",
+                    "short_name": None,
+                    "sortables": "S2_SORT",
+                    "custom_curves": None,
+                },
+            }
+        )
+
+        # Other sheets
+        params = pd.DataFrame([["helper", "value"], ["input_key", 1]])
+        gqueries = pd.DataFrame([["gquery", "future"], ["co2_emissions", 100]])
+        s1_sort = pd.DataFrame([[None, None], ["sortables", "value"], ["a", 1]])
+        s2_sort = pd.DataFrame([[None, None], ["sortables", "value"], ["b", 2]])
+        s1_curves = pd.DataFrame([[None, None], ["custom_curves", "value"], ["x", 1]])
+
+        path = tmp_path / "import.xlsx"
+        with pd.ExcelWriter(path, engine="xlsxwriter") as writer:
+            main.to_excel(writer, sheet_name="MAIN")
+            params.to_excel(
+                writer, sheet_name="SLIDER_SETTINGS", header=False, index=False
+            )
+            gqueries.to_excel(writer, sheet_name="GQUERIES", header=False, index=False)
+            s1_sort.to_excel(writer, sheet_name="S1_SORT", header=False, index=False)
+            s2_sort.to_excel(writer, sheet_name="S2_SORT", header=False, index=False)
+            s1_curves.to_excel(
+                writer, sheet_name="S1_CURVES", header=False, index=False
+            )
+
+        # Patch loading/creating and pack interactions
+        s_loaded = Mock(spec=Scenario)
+        s_loaded.id = "101"
+        s_loaded.identifier = Mock(return_value="101")
+        s_created = Mock(spec=Scenario)
+        s_created.id = "created"
+        s_created.identifier = Mock(return_value="created")
+
+        monkeypatch.setattr(
+            Scenario, "load", staticmethod(lambda *args, **kwargs: s_loaded)
+        )
+        monkeypatch.setattr(
+            Scenario, "new", staticmethod(lambda *args, **kwargs: s_created)
+        )
+
+        # Spy on inputs and queries imports
+        with (
+            patch.object(InputsPack, "set_scenario_short_names") as set_sn,
+            patch.object(InputsPack, "from_dataframe") as from_df,
+            patch.object(QueryPack, "from_dataframe") as gq_from_df,
+            patch.object(
+                ScenarioPacker, "_process_single_scenario_sortables"
+            ) as proc_sort,
+            patch.object(
+                ScenarioPacker, "_process_single_scenario_curves"
+            ) as proc_curves,
+        ):
+            packer = ScenarioPacker.from_excel(str(path))
+
+            assert isinstance(packer, ScenarioPacker)
+            assert s_loaded in packer._scenarios()
+            assert s_created in packer._scenarios()
+
+            set_sn.assert_called_once()
+            from_df.assert_called_once()
+            gq_from_df.assert_called_once()
+
+            # Called once for each scenario with a sortables sheet
+            assert proc_sort.call_count == 2
+            proc_curves.assert_called_once()
+
+    def test_from_excel_missing_or_bad_main(self, tmp_path):
+        """Test from_excel with missing or bad main sheet"""
+        packer = ScenarioPacker.from_excel(str(tmp_path / "bad.xlsx"))
+        assert isinstance(packer, ScenarioPacker)
+        assert len(packer._scenarios()) == 0
+
+        # File with no MAIN sheet
+        path = tmp_path / "no_main.xlsx"
+        with pd.ExcelWriter(path, engine="xlsxwriter") as writer:
+            pd.DataFrame([[1]]).to_excel(writer, sheet_name="OTHER")
+        packer2 = ScenarioPacker.from_excel(str(path))
+        assert isinstance(packer2, ScenarioPacker)
+        assert len(packer2._scenarios()) == 0
+
+        # File with empty MAIN sheet
+        path2 = tmp_path / "empty_main.xlsx"
+        with pd.ExcelWriter(path2, engine="xlsxwriter") as writer:
+            pd.DataFrame().to_excel(writer, sheet_name="MAIN")
+        packer3 = ScenarioPacker.from_excel(str(path2))
+        assert isinstance(packer3, ScenarioPacker)
+        assert len(packer3._scenarios()) == 0
+
+    def test_from_excel_slider_settings_and_gqueries_errors(
+        self, tmp_path, monkeypatch
+    ):
+        """Test from_excel with errors in slider settings and gqueries import"""
+        main = pd.DataFrame(
+            {
+                "S": {
+                    "scenario_id": None,
+                    "area_code": "nl2015",
+                    "end_year": 2050,
+                    "sortables": None,
+                    "custom_curves": None,
+                }
+            }
+        )
+        params = pd.DataFrame([["helper", "value"], ["input_key", 1]])
+        gqueries = pd.DataFrame([["gquery", "future"], ["co2_emissions", 100]])
+
+        path = tmp_path / "errs.xlsx"
+        with pd.ExcelWriter(path, engine="xlsxwriter") as writer:
+            main.to_excel(writer, sheet_name="MAIN")
+            params.to_excel(
+                writer, sheet_name="SLIDER_SETTINGS", header=False, index=False
+            )
+            gqueries.to_excel(writer, sheet_name="GQUERIES", header=False, index=False)
+
+        # Create returns a simple scenario
+        s_created = Mock(spec=Scenario)
+        s_created.id = "created"
+        s_created.identifier = Mock(return_value="created")
+        monkeypatch.setattr(Scenario, "new", staticmethod(lambda a, y: s_created))
+
+        with (
+            patch.object(InputsPack, "set_scenario_short_names") as set_sn,
+            patch.object(
+                InputsPack, "from_dataframe", side_effect=RuntimeError("bad params")
+            ),
+            patch.object(
+                QueryPack, "from_dataframe", side_effect=RuntimeError("bad gq")
+            ),
+        ):
+            packer = ScenarioPacker.from_excel(str(path))
+
+            assert isinstance(packer, ScenarioPacker)
+            # Scenario was still created even if imports failed
+            assert s_created in packer._scenarios()
+            set_sn.assert_called_once()
+
+    def test_from_excel_gqueries_sheet_name_fallback(self, tmp_path, monkeypatch):
+        """Test from_excel with gqueries sheet name fallback"""
+        main = pd.DataFrame(
+            {"S": {"scenario_id": None, "area_code": "nl2015", "end_year": 2050}}
+        )
+
+        path = tmp_path / "gq_fallback.xlsx"
+        with pd.ExcelWriter(path, engine="xlsxwriter") as writer:
+            main.to_excel(writer, sheet_name="MAIN")
+            pd.DataFrame([["gquery"], ["total_costs"]]).to_excel(
+                writer, sheet_name="GQ2", header=False, index=False
+            )
+
+        s_created = Mock(spec=Scenario)
+        s_created.id = "created"
+        s_created.identifier = Mock(return_value="created")
+        monkeypatch.setattr(Scenario, "new", staticmethod(lambda a, y: s_created))
+
+        with patch.object(QueryPack, "sheet_name", "GQ2"):
+            with patch.object(QueryPack, "from_dataframe") as gq_from_df:
+                packer = ScenarioPacker.from_excel(str(path))
+                assert s_created in packer._scenarios()
+                gq_from_df.assert_called_once()
+
+    def test_from_excel_processing_sortables_and_curves_errors(
+        self, tmp_path, monkeypatch
+    ):
+        """Test from_excel with errors in processing sortables and curves"""
+        main = pd.DataFrame(
+            {
+                "S": {
+                    "scenario_id": None,
+                    "area_code": "nl2015",
+                    "end_year": 2050,
+                    "sortables": "S_SORT",
+                    "custom_curves": "S_CURVES",
+                }
+            }
+        )
+
+        path = tmp_path / "proc_errs.xlsx"
+        with pd.ExcelWriter(path, engine="xlsxwriter") as writer:
+            main.to_excel(writer, sheet_name="MAIN")
+            pd.DataFrame([[None], ["sortables"], ["a"]]).to_excel(
+                writer, sheet_name="S_SORT", header=False, index=False
+            )
+            pd.DataFrame([[None], ["custom_curves"], ["x"]]).to_excel(
+                writer, sheet_name="S_CURVES", header=False, index=False
+            )
+
+        s_created = Mock(spec=Scenario)
+        s_created.id = "created"
+        s_created.identifier = Mock(return_value="created")
+        monkeypatch.setattr(Scenario, "new", staticmethod(lambda a, y: s_created))
+
+        with (
+            patch.object(
+                ScenarioPacker,
+                "_process_single_scenario_sortables",
+                side_effect=RuntimeError("bad sort"),
+            ),
+            patch.object(
+                ScenarioPacker,
+                "_process_single_scenario_curves",
+                side_effect=RuntimeError("bad cur"),
+            ),
+        ):
+            packer = ScenarioPacker.from_excel(str(path))
+            assert isinstance(packer, ScenarioPacker)
+            assert s_created in packer._scenarios()
+
+    def test_from_excel_setup_column_exception_and_all_fail(
+        self, tmp_path, monkeypatch
+    ):
+        """Test from_excel with setup column exceptions"""
+        # Two columns: first raises, second returns scenario
+        main = pd.DataFrame(
+            {
+                "A": {"scenario_id": None, "area_code": "nl2015", "end_year": 2050},
+                "B": {"scenario_id": None, "area_code": "de", "end_year": 2030},
+            }
+        )
+        path = tmp_path / "columns_mix.xlsx"
+        with pd.ExcelWriter(path, engine="xlsxwriter") as writer:
+            main.to_excel(writer, sheet_name="MAIN")
+
+        # Patch method to raise for A and create for B
+        def setup(col_name, col_ser):
+            if col_name == "A":
+                raise RuntimeError("boom")
+            s = Mock(spec=Scenario)
+            s.id = "BID"
+            s.identifier = Mock(return_value="BID")
+            return s
+
+        with patch.object(
+            ScenarioPacker, "_create_scenario_from_column", side_effect=setup
+        ):
+            packer = ScenarioPacker.from_excel(str(path))
+            assert any(s.id == "BID" for s in packer._scenarios())
+
+        # All columns fail -> 0 scenarios, early return
+        with patch.object(
+            ScenarioPacker,
+            "_create_scenario_from_column",
+            side_effect=RuntimeError("e"),
+        ):
+            packer2 = ScenarioPacker.from_excel(str(path))
+            assert len(packer2._scenarios()) == 0
+
+    def test_from_excel_missing_slider_settings_sheet_parse_error(
+        self, tmp_path, monkeypatch
+    ):
+        """Test from_excel with missing slider settings sheet"""
+        main = pd.DataFrame(
+            {"S": {"scenario_id": None, "area_code": "nl2015", "end_year": 2050}}
+        )
+        path = tmp_path / "no_params.xlsx"
+        with pd.ExcelWriter(path, engine="xlsxwriter") as writer:
+            main.to_excel(writer, sheet_name="MAIN")
+
+        s_created = Mock(spec=Scenario)
+        s_created.id = "created"
+        s_created.identifier = Mock(return_value="created")
+        monkeypatch.setattr(Scenario, "new", staticmethod(lambda a, y: s_created))
+        packer = ScenarioPacker.from_excel(str(path))
+        assert s_created in packer._scenarios()
+
+    def test_from_excel_gqueries_parse_raises(self, tmp_path, monkeypatch):
+        """Test from_excel with gqueries parse error"""
+        main = pd.DataFrame(
+            {"S": {"scenario_id": None, "area_code": "nl2015", "end_year": 2050}}
+        )
+        path = tmp_path / "gq_parse_err.xlsx"
+        with pd.ExcelWriter(path, engine="xlsxwriter") as writer:
+            main.to_excel(writer, sheet_name="MAIN")
+            pd.DataFrame([["gquery"], ["total_costs"]]).to_excel(
+                writer, sheet_name="GQUERIES", header=False, index=False
+            )
+
+        s_created = Mock(spec=Scenario)
+        s_created.id = "created"
+        s_created.identifier = Mock(return_value="created")
+        monkeypatch.setattr(Scenario, "new", staticmethod(lambda a, y: s_created))
+
+        original_parse = pd.ExcelFile.parse
+
+        def parse_proxy(self, sheet_name, *a, **k):
+            if sheet_name == "GQUERIES":
+                raise ValueError("bad parse")
+            return original_parse(self, sheet_name, *a, **k)
+
+        with patch.object(pd.ExcelFile, "parse", parse_proxy):
+            packer = ScenarioPacker.from_excel(str(path))
+            assert s_created in packer._scenarios()
+
+
+class TestInputsPackIntegration:
+    """Test integration with the new InputsPack.build_combined_dataframe method"""
+
+    def test_inputs_pack_build_combined_dataframe_called(self, sample_scenario):
+        """Test that to_excel calls the new build_combined_dataframe method"""
+        packer = ScenarioPacker()
+        packer.add(sample_scenario)
+
+        sample_scenario.to_dataframe = Mock(
+            return_value=pd.DataFrame({sample_scenario.id: ["test"]}, index=["row"])
+        )
+
+        with (
+            patch.object(InputsPack, "build_combined_dataframe") as mock_build,
+            patch("xlsxwriter.Workbook") as mock_workbook_class,
+        ):
+            mock_build.return_value = pd.DataFrame({"test": [1]}, index=["input1"])
+            mock_workbook = Mock()
+            mock_workbook_class.return_value = mock_workbook
+
+            packer.to_excel("test.xlsx", include_inputs=True)
+
+            # Verify the new method was called with correct parameters
+            mock_build.assert_called_once_with(
+                include_defaults=False, include_min_max=False
+            )
+
+    def test_inputs_pack_build_combined_dataframe_with_flags(self, sample_scenario):
+        """Test that flags are passed correctly to build_combined_dataframe"""
+        packer = ScenarioPacker()
+        packer.add(sample_scenario)
+
+        sample_scenario.to_dataframe = Mock(
+            return_value=pd.DataFrame({sample_scenario.id: ["test"]}, index=["row"])
+        )
+
+        # Mock a global config that sets inputs defaults and min_max
+        mock_config = Mock()
+        mock_config.inputs_defaults = True
+        mock_config.inputs_min_max = True
+        mock_config.include_inputs = True
+        mock_config.include_sortables = False
+        mock_config.include_custom_curves = False
+        mock_config.include_gqueries = False
+        mock_config.output_carriers = None
+
+        with (
+            patch.object(InputsPack, "build_combined_dataframe") as mock_build,
+            patch.object(
+                ScenarioPacker, "_get_global_export_config", return_value=mock_config
+            ),
+            patch("xlsxwriter.Workbook") as mock_workbook_class,
+        ):
+            mock_build.return_value = pd.DataFrame({"test": [1]}, index=["input1"])
+            mock_workbook = Mock()
+            mock_workbook_class.return_value = mock_workbook
+
+            packer.to_excel("test.xlsx")
+
+            # Verify the method was called with the config flags
+            mock_build.assert_called_once_with(
+                include_defaults=True, include_min_max=True
+            )
+
+
+class TestExportConfigResolverExtras:
+
+    def test_extract_from_main_sheet_skips_helper_and_parses(self):
+        # First column is a helper and must be skipped
+        main = pd.DataFrame(
+            {
+                "helper": {"inputs": "no"},
+                "S1": {
+                    "inputs": "yes",
+                    "sortables": 0,
+                    "custom_curves": 1,
+                    "gqueries": "1",
+                    "defaults": "1",
+                    "min_max": "0",
+                    "exports": "electricity, gas ",
+                },
+            }
+        )
+
+        scenarios = [Mock(spec=Scenario)]
+        cfg = ExportConfigResolver.extract_from_main_sheet(main, scenarios)
+        assert cfg.include_inputs is True
+        assert cfg.include_sortables is False
+        assert cfg.include_custom_curves is True
+        assert cfg.include_gqueries is True
+        assert cfg.inputs_defaults is True
+        assert cfg.inputs_min_max is False
+        assert cfg.output_carriers == ["electricity", "gas"]
+
+    def test_extract_from_main_sheet_empty_or_error(self):
+        assert ExportConfigResolver.extract_from_main_sheet(pd.DataFrame(), []) is None
+
+
+class TestScenarioPackerExtras:
+
+    def test_get_global_export_config_first_available(self):
+        packer = ScenarioPacker()
+
+        s1 = Mock(spec=Scenario)
+        s1.id = "1"
+        s1.identifier = Mock(return_value="1")
+        s1._export_config = ExportConfig(include_inputs=True)
+
+        s2 = Mock(spec=Scenario)
+        s2.id = "2"
+        s2.identifier = Mock(return_value="2")
+        s2._export_config = ExportConfig(include_inputs=False)
+
+        # Ensure deterministic order by patching _scenarios
+        with patch.object(ScenarioPacker, "_scenarios", return_value={s1, s2}):
+            cfg = packer._get_global_export_config()
+            assert isinstance(cfg, ExportConfig)
+
+    def test_apply_export_configuration_sets_on_scenarios(self):
+        packer = ScenarioPacker()
+        s = Mock(spec=Scenario)
+        s.id = "X"
+        s.identifier = Mock(return_value="X")
+        packer.add(s)
+
+        main = pd.DataFrame(
+            {
+                "X": {
+                    "inputs": "1",
+                    "sortables": "0",
+                    "custom_curves": None,
+                    "gquery_results": "yes",
+                    "defaults": 1,
+                    "min_max": 0,
+                    "exports": "hydrogen",
+                }
+            }
+        )
+        packer._apply_export_configuration(main, {"X": s})
+        if hasattr(s, "set_export_config") and s.set_export_config.called:
+            assert s.set_export_config.call_count == 1
+        else:
+            assert hasattr(s, "_export_config")
+
+    def test_add_inputs_sheet_fallback_on_error(self, monkeypatch):
+        packer = ScenarioPacker()
+        s = Mock(spec=Scenario)
+        s.id = "SID"
+        s.identifier = Mock(return_value="SID")
+        s.to_dataframe = Mock(return_value=pd.DataFrame({"SID": [1]}, index=["row"]))
+        packer.add(s)
+
+        # Force build_combined_dataframe to raise, and _to_dataframe to return data
+        monkeypatch.setattr(
+            InputsPack,
+            "build_combined_dataframe",
+            staticmethod(lambda **k: (_ for _ in ()).throw(RuntimeError("bad"))),
+        )
+        monkeypatch.setattr(
+            InputsPack,
+            "_to_dataframe",
+            staticmethod(lambda **k: pd.DataFrame({"v": [1]}, index=["i"])),
+        )
+
+        with patch("pyetm.models.scenario_packer.Workbook") as mock_wb:
+            mock_wb.return_value = Mock()
+            # Should not raise
+            file_path = os.path.join(tempfile.gettempdir(), "inputs_fallback.xlsx")
+            packer.to_excel(file_path, include_inputs=True)
+
+    def test_add_pack_and_gqueries_sheets(self):
+        packer = ScenarioPacker()
+        s = Mock(spec=Scenario)
+        s.id = "S"
+        s.identifier = Mock(return_value="S")
+        s.to_dataframe = Mock(return_value=pd.DataFrame({"S": [1]}, index=["row"]))
+        packer.add(s)
+
+        # Make packs return non-empty DataFrames
+        with (
+            patch.object(
+                SortablePack, "to_dataframe", return_value=pd.DataFrame({"v": [1]})
+            ),
+            patch.object(
+                CustomCurvesPack, "to_dataframe", return_value=pd.DataFrame({"v": [1]})
+            ),
+            patch.object(
+                QueryPack,
+                "to_dataframe",
+                return_value=pd.DataFrame({"future": [1]}, index=["q"]),
+            ),
+            patch.object(QueryPack, "output_sheet_name", "GQUERIES_OUT"),
+            patch.object(
+                InputsPack,
+                "build_combined_dataframe",
+                return_value=pd.DataFrame({"v": [1]}),
+            ),
+            patch("pyetm.models.scenario_packer.add_frame") as add_frame,
+            patch("pyetm.models.scenario_packer.Workbook") as mock_wb,
+        ):
+            mock_wb.return_value = Mock()
+            tmp = os.path.join(tempfile.gettempdir(), "with_packs.xlsx")
+            packer.to_excel(
+                tmp,
+                include_sortables=True,
+                include_custom_curves=True,
+                include_gqueries=True,
+            )
+
+            # MAIN + INPUTS + SORTABLES + CUSTOM_CURVES + GQUERIES
+            sheet_names = [call.kwargs.get("name") for call in add_frame.call_args_list]
+            assert "MAIN" in sheet_names
+            assert "SLIDER_SETTINGS" in sheet_names
+            assert "SORTABLES" in sheet_names
+            assert "CUSTOM_CURVES" in sheet_names
+            assert "GQUERIES_OUT" in sheet_names
+
+    def test_export_output_curves_with_params_and_config(self):
+        packer = ScenarioPacker()
+        s = Mock(spec=Scenario)
+        s.id = "S"
+        s.identifier = Mock(return_value="S")
+        s.to_dataframe = Mock(return_value=pd.DataFrame({"S": [1]}, index=["row"]))
+        packer.add(s)
+
+        # Case 1: carriers explicitly provided
+        with (
+            patch.object(OutputCurvesPack, "to_excel_per_carrier") as toe,
+            patch("pyetm.models.scenario_packer.Workbook") as mock_wb,
+        ):
+            mock_wb.return_value = Mock()
+            tmp = os.path.join(tempfile.gettempdir(), "export1.xlsx")
+            packer.to_excel(tmp, include_output_curves=True, carriers=["el", "gas"])
+            args, _ = toe.call_args
+            assert args[0].endswith("_exports.xlsx")
+            assert args[1] == ["el", "gas"]
+
+        # Case 2: carriers from global config
+        cfg = ExportConfig(output_carriers=["h2"])  # minimal
+        s2 = Mock(spec=Scenario)
+        s2.id = "S2"
+        s2.identifier = Mock(return_value="S2")
+        s2.to_dataframe = Mock(return_value=pd.DataFrame({"S2": [1]}, index=["row"]))
+        setattr(s2, "_export_config", cfg)
+        packer2 = ScenarioPacker()
+        packer2.add(s2)
+        with (
+            patch.object(OutputCurvesPack, "to_excel_per_carrier") as toe2,
+            patch("pyetm.models.scenario_packer.Workbook") as mock_wb2,
+        ):
+            mock_wb2.return_value = Mock()
+            tmp2 = os.path.join(tempfile.gettempdir(), "export2.xlsx")
+            packer2.to_excel(tmp2, include_output_curves=True)
+            args2, _ = toe2.call_args
+            assert args2[1] == ["h2"]
+
+    def test_build_excel_main_dataframe_applies_labels_and_order(self):
+        packer = ScenarioPacker()
+        s1 = Mock(spec=Scenario)
+        s1.id = "1"
+        s1.identifier = Mock(return_value="Label 1")
+        s2 = Mock(spec=Scenario)
+        s2.id = "2"
+        s2.identifier = Mock(return_value="Label 2")
+        packer.add(s1, s2)
+
+        df = pd.DataFrame(
+            {"1": ["A", 2050], "2": ["B", 2040]}, index=["area_code", "end_year"]
+        )
+
+        with patch.object(ScenarioPacker, "main_info", return_value=df):
+            out = packer._build_excel_main_dataframe()
+            # Columns should be relabeled using identifier
+            assert list(out.columns) == ["Label 1", "Label 2"]
+            # Preferred ordering keeps known fields order among those present
+            assert out.index.tolist()[0:2] == ["area_code", "end_year"]
+
+    def test_sanitize_dataframe_for_excel_handles_datetime_and_objects(self):
+        packer = ScenarioPacker()
+        import datetime as dt
+
+        class Foo:
+            def __str__(self):
+                return "foo"
+
+        frame = pd.DataFrame(
+            {
+                "col": [dt.datetime(2020, 1, 1), Foo()],
+            },
+            index=["when", "obj"],
+        )
+        out = packer._sanitize_dataframe_for_excel(frame)
+        assert out.loc["obj", "col"] == "foo"
+
+    def test_log_scenario_warnings_helper(self):
+        packer = ScenarioPacker()
+        s = Mock(spec=Scenario)
+        s.identifier = Mock(return_value="SID")
+        helper_attr = Mock()
+        s._sortables = helper_attr
+        packer._log_scenario_warnings(s, "_sortables", "Sortables")
+        helper_attr.log_warnings.assert_called_once()
+
+
+def test_apply_scenario_column_labels_no_matches():
+    packer = ScenarioPacker()
+    # No scenarios added; rename map should be empty and df unchanged
+    df = pd.DataFrame({"X": [1]}, index=["row"])
+    out = packer._apply_scenario_column_labels(df)
+    assert list(out.columns) == ["X"]
+
+
+def test_build_column_rename_map_both_match_str_and_exact():
+    packer = ScenarioPacker()
+    s1 = Mock(spec=Scenario)
+    s1.id = "1"
+    s2 = Mock(spec=Scenario)
+    s2.id = 2  # int id for exact match case
+    # Columns include string '1' and int 2
+    cols = ["1", 2, "nope"]
+    rename = packer._build_column_rename_map([s1, s2], cols)
+    assert "1" in rename and 2 in rename
+    # 'nope' should not be in rename map
+    assert "nope" not in rename
+
+
+def test_get_scenario_display_label_fallbacks():
+    packer = ScenarioPacker()
+    # 1) identifier raises -> title used
+    sc = Mock(spec=Scenario)
+    sc.identifier = Mock(side_effect=RuntimeError("bad"))
+    sc.title = "T"
+    assert packer._get_scenario_display_label(sc, "FALL") == "T"
+
+    # 2) no title -> id used
+    sc2 = Mock(spec=Scenario)
+    sc2.identifier = Mock(side_effect=RuntimeError("bad"))
+    sc2.title = None
+    sc2.id = 42
+    assert packer._get_scenario_display_label(sc2, "FALL") == "42"
+
+    # 3) no id -> fallback to column
+    sc3 = Mock(spec=Scenario)
+    sc3.identifier = Mock(side_effect=RuntimeError("bad"))
+    sc3.title = None
+    sc3.id = None
+    assert packer._get_scenario_display_label(sc3, "COLX") == "COLX"
+
+
+def test_get_value_before_output_respects_output_boundary():
+    packer = ScenarioPacker()
+    series = pd.Series(["S1", None, "S2"], index=["sortables", "output", "sortables"])
+    assert packer._get_value_before_output(series, "sortables") == "S1"
+
+
+def test_export_output_curves_if_needed_false():
+    packer = ScenarioPacker()
+    s = Mock(spec=Scenario)
+    s.id = "S"
+    s.identifier = Mock(return_value="S")
+    s.to_dataframe = Mock(return_value=pd.DataFrame({"S": [1]}, index=["row"]))
+    packer.add(s)
+
+    with (
+        patch.object(OutputCurvesPack, "to_excel_per_carrier") as toe,
+        patch("pyetm.models.scenario_packer.Workbook") as wb,
+    ):
+        wb.return_value = Mock()
+        packer.to_excel("/tmp/x.xlsx", include_output_curves=False)
+        toe.assert_not_called()
+
+
+def test_add_gqueries_sheet_disabled():
+    packer = ScenarioPacker()
+    with (
+        patch("pyetm.models.scenario_packer.add_frame") as add_frame,
+        patch("pyetm.models.scenario_packer.Workbook") as wb,
+        patch.object(ScenarioPacker, "_scenarios", return_value={Mock(spec=Scenario)}),
+        patch.object(ScenarioPacker, "_add_data_sheets"),
+    ):
+        wb.return_value = Mock()
+        # Make main_info non-empty to create MAIN
+        with patch.object(
+            ScenarioPacker,
+            "main_info",
+            return_value=pd.DataFrame({"A": [1]}, index=["i"]),
+        ):
+            packer.to_excel("/tmp/y.xlsx", include_gqueries=False)
+            sheet_names = [call.kwargs.get("name") for call in add_frame.call_args_list]
+            assert "MAIN" in sheet_names
+            assert "GQUERIES" not in sheet_names and "GQUERIES_OUT" not in sheet_names
+
+
+def test_clear_and_remove_scenario_swallow_errors():
+    packer = ScenarioPacker()
+    fake_pack1 = Mock()
+    fake_pack2 = Mock()
+    fake_pack1.clear.side_effect = RuntimeError("bad")
+    fake_pack2.clear.return_value = None
+
+    fake_pack1.discard.side_effect = RuntimeError("bad")
+    fake_pack2.discard.return_value = None
+
+    with patch.object(
+        ScenarioPacker, "_get_all_packs", return_value=[fake_pack1, fake_pack2]
+    ):
+        packer.clear()  # should not raise
+        sc = Mock(spec=Scenario)
+        packer.remove_scenario(sc)  # should not raise
diff --git a/tests/models/test_sortable.py b/tests/models/test_sortable.py
deleted file mode 100644
index 184b2e2..0000000
--- a/tests/models/test_sortable.py
+++ /dev/null
@@ -1,69 +0,0 @@
-import pytest
-from pyetm.models.sortables import Sortable
-
-
-@pytest.mark.parametrize(
-    "payload, expected_type, expected_order, expected_subtype",
-    [
-        # flat list → one Sortable, no subtype
-        (
-            ("forecast_storage", ["a", "b", "c"]),
-            "forecast_storage",
-            ["a", "b", "c"],
-            None,
-        ),
-        # flat list for heat_network treated the same
-        (("heat_network", ["x", "y"]), "heat_network", ["x", "y"], None),
-    ],
-)
-def test_from_json_with_list(payload, expected_type, expected_order, expected_subtype):
-    result = list(Sortable.from_json(payload))
-    assert isinstance(result, list) and len(result) == 1
-    sortable = result[0]
-    assert sortable.type == expected_type
-    assert sortable.order == expected_order
-    assert sortable.subtype is expected_subtype
-
-
-def test_from_json_with_dict():
-    # nested dict → one Sortable per subtype
-    payload = ("heat_network", {"lt": [1, 2], "mt": [3, 4], "ht": []})
-    result = list(Sortable.from_json(payload))
-
-    assert isinstance(result, list) and len(result) == 3
-
-    got = {(s.type, s.subtype, tuple(s.order)) for s in result}
-    expected = {
-        ("heat_network", "lt", (1, 2)),
-        ("heat_network", "mt", (3, 4)),
-        ("heat_network", "ht", ()),
-    }
-    assert got == expected
-
-
-@pytest.mark.parametrize(
-    "payload",
-    [
-        ("forecast_storage", None),
-        ("heat_network", 123),
-        ("foo", object()),
-    ],
-)
-def test_from_json_creates_warning_on_invalid(payload):
-    """Test that invalid payloads create sortables with warnings instead of raising exceptions"""
-    result = list(Sortable.from_json(payload))
-
-    # Should always yield exactly one sortable
-    assert len(result) == 1
-    sortable = result[0]
-
-    # Should have the correct type and empty order
-    assert sortable.type == payload[0]
-    assert sortable.order == []
-    assert sortable.subtype is None
-
-    # Should have a warning about the unexpected payload
-    assert hasattr(sortable, "warnings")
-    assert 'type' in sortable.warnings
-    assert "Unexpected payload" in sortable.warnings['type'][0]
-    assert str(payload[1]) in sortable.warnings['type'][0]
diff --git a/tests/models/test_sortables.py b/tests/models/test_sortables.py
index b631369..0e0d77d 100644
--- a/tests/models/test_sortables.py
+++ b/tests/models/test_sortables.py
@@ -2,8 +2,8 @@
 from pyetm.models.sortables import Sortable, Sortables
 
 
-def test_collection_from_json(sortable_collection_json):
-    coll = Sortables.from_json(sortable_collection_json)
+def test_collection_from_json(valid_sortable_collection_json):
+    coll = Sortables.from_json(valid_sortable_collection_json)
 
     assert coll
     # 1 (forecast_storage) + 3 (heat_network subtypes) + 1 (hydrogen_supply) = 5
@@ -24,14 +24,257 @@ def test_collection_from_json(sortable_collection_json):
     ]
 
 
-def test_as_dict_roundtrip(sortable_collection_json):
-    coll = Sortables.from_json(sortable_collection_json)
+def test_names_method(valid_sortable_collection_json):
+    coll = Sortables.from_json(valid_sortable_collection_json)
+
+    names = coll.names()
+    expected_names = [
+        "forecast_storage",
+        "heat_network_lt",
+        "heat_network_mt",
+        "heat_network_ht",
+        "hydrogen_supply",
+    ]
+    assert set(names) == set(expected_names)
+
+
+def test_as_dict_roundtrip(valid_sortable_collection_json):
+    coll = Sortables.from_json(valid_sortable_collection_json)
     rebuilt = coll.as_dict()
 
-    assert rebuilt == sortable_collection_json
+    assert rebuilt == valid_sortable_collection_json
+
+
+def test_to_dataframe(valid_sortable_collection_json):
+    coll = Sortables.from_json(valid_sortable_collection_json)
+
+    df = coll._to_dataframe()
+    assert df["forecast_storage"][0] == "fs1"
+    assert df["heat_network_lt"][0] == "hn1"
+
+
+def test_is_valid_update():
+    """Test the is_valid_update method"""
+    coll = Sortables.from_json(
+        {"forecast_storage": ["a", "b"], "heat_network": {"lt": ["c", "d"]}}
+    )
+
+    # Valid updates
+    valid_updates = {"forecast_storage": ["x", "y"], "heat_network_lt": ["z"]}
+    warnings = coll.is_valid_update(valid_updates)
+    assert len(warnings) == 0
+
+    # Invalid updates - non-existent sortable
+    invalid_updates = {"nonexistent": ["a", "b"], "forecast_storage": ["valid"]}
+    warnings = coll.is_valid_update(invalid_updates)
+    assert "forecast_storage" not in warnings
+
+    # Invalid updates - validation errors
+    invalid_order_updates = {"forecast_storage": [1, 2, 2]}
+    warnings = coll.is_valid_update(invalid_order_updates)
+    assert "forecast_storage" in warnings
+    assert len(warnings["forecast_storage"]) > 0
+
+
+def test_update_method():
+    coll = Sortables.from_json(
+        {"forecast_storage": ["a", "b"], "heat_network": {"lt": ["c", "d"]}}
+    )
+
+    updates = {"forecast_storage": ["x", "y", "z"], "heat_network_lt": ["w"]}
+    coll.update(updates)
+
+    sortable_by_name = {s.name(): s for s in coll.sortables}
+    assert sortable_by_name["forecast_storage"].order == ["x", "y", "z"]
+    assert sortable_by_name["heat_network_lt"].order == ["w"]
+
+
+def test_validation_duplicate_sortable_names():
+    sortables_list = [
+        Sortable(type="forecast_storage", order=["a"]),
+        Sortable(type="forecast_storage", order=["b"]),  # Duplicate name
+    ]
+
+    # This should create warnings about duplicate names
+    coll = Sortables(sortables=sortables_list)
+    assert len(coll.warnings) > 0
+    # Flatten all warning messages to search
+    all_warnings = [w.message for w in coll.warnings]
+    warning_text = " ".join(all_warnings)
+    assert "duplicate" in warning_text.lower()
+
+
+def test_validation_heat_network_consistency():
+    sortables_list = [
+        Sortable(type="heat_network", order=["a"], subtype="lt"),  # Valid
+        Sortable(type="heat_network", order=["b"]),  # Invalid - no subtype
+    ]
+
+    coll = Sortables(sortables=sortables_list)
+    assert len(coll.warnings) > 0
+
+
+def test_collection_merges_individual_warnings():
+    data_with_issues = {"heat_network": ["no_subtype"]}  # This will cause warnings
+
+    coll = Sortables.from_json(data_with_issues)
+    assert len(coll.warnings) > 0
+
+
+@pytest.mark.parametrize(
+    "payload, expected_type, expected_order, expected_subtype",
+    [
+        # flat list → one Sortable, no subtype
+        (
+            ("forecast_storage", ["a", "b", "c"]),
+            "forecast_storage",
+            ["a", "b", "c"],
+            None,
+        ),
+        (("hydrogen_supply", ["x", "y"]), "hydrogen_supply", ["x", "y"], None),
+    ],
+)
+def test_from_json_with_list(payload, expected_type, expected_order, expected_subtype):
+    result = list(Sortable.from_json(payload))
+    assert isinstance(result, list) and len(result) == 1
+    sortable = result[0]
+    assert sortable.type == expected_type
+    assert sortable.order == expected_order
+    assert sortable.subtype is expected_subtype
+
+
+def test_from_json_with_list_heat_network_generates_warning():
+    """heat_network without subtype should generate a validation warning"""
+    payload = ("heat_network", ["x", "y"])
+    result = list(Sortable.from_json(payload))
+
+    assert len(result) == 1
+    sortable = result[0]
+    assert sortable.type == "heat_network"
+    assert sortable.order == ["x", "y"]
+    assert sortable.subtype is None  # No subtype provided
+
+    # Should have validation warning about missing subtype
+    assert len(sortable.warnings) > 0
+    all_warnings = [w.message for w in sortable.warnings]
+    warning_text = " ".join(all_warnings)
+    assert "heat_network type requires a subtype" in warning_text
+
+
+def test_from_json_with_dict():
+    # nested dict → one Sortable per subtype
+    payload = ("heat_network", {"lt": [1, 2], "mt": [3, 4], "ht": []})
+    result = list(Sortable.from_json(payload))
+
+    assert isinstance(result, list) and len(result) == 3
+
+    got = {(s.type, s.subtype, tuple(s.order)) for s in result}
+    expected = {
+        ("heat_network", "lt", (1, 2)),
+        ("heat_network", "mt", (3, 4)),
+        ("heat_network", "ht", ()),
+    }
+    assert got == expected
+
+    # These should not have warnings since they have proper subtypes
+    for sortable in result:
+        assert len(sortable.warnings) == 0
+
+
+def test_validation_duplicate_order_items():
+    """Test that duplicate items in order generate warnings"""
+    payload = ("forecast_storage", [1, 2, 2, 3])
+    result = list(Sortable.from_json(payload))
+
+    assert len(result) == 1
+    sortable = result[0]
+    assert sortable.type == "forecast_storage"
+    assert sortable.order == [1, 2, 2, 3]
+
+    # Should have validation warning about duplicates
+    assert len(sortable.warnings) > 0
+    all_warnings = [w.message for w in sortable.warnings]
+    warning_text = " ".join(all_warnings)
+    assert "duplicate" in warning_text.lower()
+
+
+def test_validation_order_too_long():
+    """Test that orders with too many items generate warnings"""
+    long_order = list(range(20))  # More than 17 items
+    payload = ("forecast_storage", long_order)
+    result = list(Sortable.from_json(payload))
+
+    assert len(result) == 1
+    sortable = result[0]
+    assert sortable.type == "forecast_storage"
+    assert sortable.order == long_order
+
+    # Should have validation warning about length
+    assert len(sortable.warnings) > 0
+    all_warnings = [w.message for w in sortable.warnings]
+    warning_text = " ".join(all_warnings)
+    assert "more than 17 items" in warning_text
+
+
+@pytest.mark.parametrize(
+    "payload",
+    [
+        ("forecast_storage", None),
+        ("heat_network", 123),
+        ("foo", object()),
+    ],
+)
+def test_from_json_creates_warning_on_invalid(payload):
+    """Test that invalid payloads create sortables with warnings instead of raising exceptions"""
+    result = list(Sortable.from_json(payload))
+
+    # Should always yield exactly one sortable
+    assert len(result) == 1
+    sortable = result[0]
+
+    # Should have the correct type and empty order
+    assert sortable.type == payload[0]
+    assert sortable.order == []
+    assert sortable.subtype is None
+
+    assert hasattr(sortable, "warnings")
+    assert len(sortable.warnings) > 0
+    all_warnings = [w.message for w in sortable.warnings]
+    warning_text = " ".join(all_warnings)
+    # Could be either unexpected payload warning or validation warning
+    assert (
+        "Unexpected payload" in warning_text
+        or "heat_network type requires a subtype" in warning_text
+    )
+    assert str(payload[1]) in warning_text
+
+
+def test_sortable_is_valid_update():
+    """Test the is_valid_update method"""
+    sortable = Sortable(type="forecast_storage", order=[1, 2, 3])
+
+    # Valid update - no warnings
+    warnings = sortable.is_valid_update([4, 5, 6])
+    assert len(warnings) == 0
+
+    # Invalid update - duplicates
+    warnings = sortable.is_valid_update([1, 2, 2])
+    assert len(warnings) > 0
+    all_warnings = [w.message for w in warnings]
+    warning_text = " ".join(all_warnings)
+    assert "duplicate" in warning_text.lower()
+
+    # Invalid update - too long
+    warnings = sortable.is_valid_update(list(range(18)))
+    assert len(warnings) > 0
+    all_warnings = [w.message for w in warnings]
+    warning_text = " ".join(all_warnings)
+    assert "more than 17 items" in warning_text
 
 
-def test_to_dataframe(sortable_collection_json):
-    coll = Sortables.from_json(sortable_collection_json)
+def test_name_method():
+    sortable1 = Sortable(type="forecast_storage", order=[1, 2])
+    assert sortable1.name() == "forecast_storage"
 
-    assert coll.to_dataframe()["forecast_storage"][0] == "fs1"
+    sortable2 = Sortable(type="heat_network", subtype="lt", order=[3, 4])
+    assert sortable2.name() == "heat_network_lt"
diff --git a/tests/models/test_warnings.py b/tests/models/test_warnings.py
new file mode 100644
index 0000000..b1cb44a
--- /dev/null
+++ b/tests/models/test_warnings.py
@@ -0,0 +1,289 @@
+from datetime import datetime
+from pyetm.models.warnings import ModelWarning, WarningCollector
+
+# ----------------ModelWarning----------------
+
+
+def test_warning_creation():
+    """Test basic ModelWarning object creation."""
+    warning = ModelWarning(field="test_field", message="Test message")
+
+    assert warning.field == "test_field"
+    assert warning.message == "Test message"
+    assert warning.severity == "warning"
+    assert isinstance(warning.timestamp, datetime)
+
+
+def test_warning_with_custom_severity():
+    """Test ModelWarning creation with custom severity."""
+    warning = ModelWarning(
+        field="error_field", message="Error message", severity="error"
+    )
+
+    assert warning.field == "error_field"
+    assert warning.message == "Error message"
+    assert warning.severity == "error"
+
+
+def test_warning_string_representation():
+    """Test ModelWarning __str__ method."""
+    warning = ModelWarning(field="field1", message="Test message")
+
+    assert str(warning) == "field1: Test message"
+
+
+def test_warning_repr():
+    """Test ModelWarning __repr__ method."""
+    warning = ModelWarning(field="field1", message="Test message", severity="error")
+
+    repr_str = repr(warning)
+    assert "ModelWarning(" in repr_str
+    assert "field='field1'" in repr_str
+    assert "message='Test message'" in repr_str
+    assert "severity='error'" in repr_str
+
+
+def test_warning_to_dict():
+    """Test ModelWarning serialization to dictionary."""
+    warning = ModelWarning(field="field1", message="Test message", severity="info")
+    result = warning.to_dict()
+
+    assert result["field"] == "field1"
+    assert result["message"] == "Test message"
+    assert result["severity"] == "info"
+    assert "timestamp" in result
+
+
+# ----------------WarningCollector----------------
+
+
+def test_warning_collector_creation():
+    """Test basic WarningCollector creation."""
+    collector = WarningCollector()
+
+    assert len(collector) == 0
+    assert not collector.has_warnings()
+    assert collector.get_fields_with_warnings() == []
+
+
+def test_add_simple_warning():
+    """Test adding a simple string warning."""
+    collector = WarningCollector()
+    collector.add("field1", "Simple warning")
+
+    assert len(collector) == 1
+    assert collector.has_warnings("field1")
+    assert not collector.has_warnings("field2")
+
+    warnings = collector.get_by_field("field1")
+    assert len(warnings) == 1
+    assert warnings[0].message == "Simple warning"
+
+
+def test_add_multiple_warnings_same_field():
+    """Test adding multiple warnings to the same field."""
+    collector = WarningCollector()
+
+    collector.add("field1", "Warning 1")
+    collector.add("field1", "Warning 2")
+
+    assert len(collector) == 2
+    warnings = collector.get_by_field("field1")
+    assert len(warnings) == 2
+    messages = [w.message for w in warnings]
+    assert "Warning 1" in messages
+    assert "Warning 2" in messages
+
+
+def test_add_list_of_warnings():
+    """Test adding a list of warning messages."""
+    collector = WarningCollector()
+    collector.add("field1", ["Warning 1", "Warning 2", "Warning 3"])
+
+    assert len(collector) == 3
+    warnings = collector.get_by_field("field1")
+    messages = [w.message for w in warnings]
+    assert "Warning 1" in messages
+    assert "Warning 2" in messages
+    assert "Warning 3" in messages
+
+
+def test_add_nested_dict_warnings():
+    """Test adding nested dictionary warnings (legacy pattern)."""
+    collector = WarningCollector()
+    nested_warnings = {
+        "subfield1": ["Sub warning 1"],
+        "subfield2": ["Sub warning 2", "Sub warning 3"],
+    }
+    collector.add("parent", nested_warnings)
+
+    assert len(collector) == 3
+    assert collector.has_warnings("parent.subfield1")
+    assert collector.has_warnings("parent.subfield2")
+
+    sub1_warnings = collector.get_by_field("parent.subfield1")
+    assert len(sub1_warnings) == 1
+    assert sub1_warnings[0].message == "Sub warning 1"
+
+    sub2_warnings = collector.get_by_field("parent.subfield2")
+    assert len(sub2_warnings) == 2
+
+
+def test_add_warning_with_severity():
+    """Test adding warnings with different severities."""
+    collector = WarningCollector()
+
+    collector.add("field1", "Info message", "info")
+    collector.add("field2", "Warning message", "warning")
+    collector.add("field3", "Error message", "error")
+
+    assert len(collector) == 3
+
+    info_warning = collector.get_by_field("field1")[0]
+    assert info_warning.severity == "info"
+
+    warning_warning = collector.get_by_field("field2")[0]
+    assert warning_warning.severity == "warning"
+
+    error_warning = collector.get_by_field("field3")[0]
+    assert error_warning.severity == "error"
+
+
+def test_clear_all_warnings():
+    """Test clearing all warnings."""
+    collector = WarningCollector()
+    collector.add("field1", "Warning 1")
+    collector.add("field2", "Warning 2")
+
+    assert len(collector) == 2
+
+    collector.clear()
+
+    assert len(collector) == 0
+    assert not collector.has_warnings()
+
+
+def test_clear_specific_field():
+    """Test clearing warnings for a specific field."""
+    collector = WarningCollector()
+    collector.add("field1", "Warning 1")
+    collector.add("field2", "Warning 2")
+    collector.add("field1", "Warning 3")
+
+    assert len(collector) == 3
+
+    collector.clear("field1")
+
+    assert len(collector) == 1
+    assert not collector.has_warnings("field1")
+    assert collector.has_warnings("field2")
+
+
+def test_get_fields_with_warnings():
+    """Test getting list of fields that have warnings."""
+    collector = WarningCollector()
+    collector.add("field1", "Warning 1")
+    collector.add("field2", "Warning 2")
+    collector.add("field1", "Warning 3")
+
+    fields = collector.get_fields_with_warnings()
+
+    assert len(fields) == 2
+    assert "field1" in fields
+    assert "field2" in fields
+
+
+def test_to_dict():
+    """Test conversion to detailed dictionary format."""
+    collector = WarningCollector()
+    collector.add("field1", "Warning 1", "error")
+
+    result = collector.to_dict()
+
+    assert "field1" in result
+    assert len(result["field1"]) == 1
+    warning_dict = result["field1"][0]
+    assert warning_dict["field"] == "field1"
+    assert warning_dict["message"] == "Warning 1"
+    assert warning_dict["severity"] == "error"
+    assert "timestamp" in warning_dict
+
+
+def test_merge_from_another_collector():
+    """Test merging warnings from another collector."""
+    collector1 = WarningCollector()
+    collector1.add("field1", "Main warning")
+
+    collector2 = WarningCollector()
+    collector2.add("sub_field", "Sub warning")
+
+    collector1.merge_from(collector2, "SubModel")
+
+    assert len(collector1) == 2
+    assert collector1.has_warnings("field1")
+    assert collector1.has_warnings("SubModel.sub_field")
+
+
+def test_merge_from_without_prefix():
+    """Test merging warnings without prefix."""
+    collector1 = WarningCollector()
+    collector1.add("field1", "Warning 1")
+
+    collector2 = WarningCollector()
+    collector2.add("field2", "Warning 2")
+
+    collector1.merge_from(collector2)
+
+    assert len(collector1) == 2
+    assert collector1.has_warnings("field1")
+    assert collector1.has_warnings("field2")
+
+
+def test_collector_bool_evaluation():
+    """Test WarningCollector boolean evaluation."""
+    collector = WarningCollector()
+
+    assert not collector  # Empty collector is falsy
+
+    collector.add("field1", "Warning")
+
+    assert collector  # Non-empty collector is truthy
+
+
+def test_collector_iteration():
+    """Test iterating over WarningCollector."""
+    collector = WarningCollector()
+    collector.add("field1", "Warning 1")
+    collector.add("field2", "Warning 2")
+
+    warnings = list(collector)
+
+    assert len(warnings) == 2
+    assert all(isinstance(w, ModelWarning) for w in warnings)
+    messages = [w.message for w in warnings]
+    assert "Warning 1" in messages
+    assert "Warning 2" in messages
+
+
+def test_collector_repr_empty():
+    """Test WarningCollector __repr__ when empty."""
+    collector = WarningCollector()
+
+    repr_str = repr(collector)
+
+    assert "no warnings" in repr_str
+
+
+def test_collector_repr_with_warnings():
+    """Test WarningCollector __repr__ with warnings."""
+    collector = WarningCollector()
+    collector.add("field1", "Warning", "warning")
+    collector.add("field2", "Error", "error")
+    collector.add("field3", "Info", "info")
+
+    repr_str = repr(collector)
+
+    assert "3 warnings" in repr_str
+    assert "1 warning" in repr_str
+    assert "1 error" in repr_str
+    assert "1 info" in repr_str
diff --git a/tests/services/conftest.py b/tests/services/conftest.py
index c6503c0..079fd7d 100644
--- a/tests/services/conftest.py
+++ b/tests/services/conftest.py
@@ -54,7 +54,6 @@ def mock_method(url, params=None, json=None, **kwargs):
                 if kwargs:
                     call_data.update(kwargs)
 
-                # If no parameters, record None for backwards compatibility
                 call_record = (url, call_data if call_data else None)
                 self.calls.append(call_record)
 
diff --git a/tests/services/scenario_runners/test_update_custom_curves.py b/tests/services/scenario_runners/test_update_custom_curves.py
new file mode 100644
index 0000000..7036620
--- /dev/null
+++ b/tests/services/scenario_runners/test_update_custom_curves.py
@@ -0,0 +1,302 @@
+import pandas as pd
+import numpy as np
+from pathlib import Path
+from unittest.mock import Mock, patch
+import pytest
+from pyetm.models.custom_curves import CustomCurve, CustomCurves
+from pyetm.services.scenario_runners.update_custom_curves import (
+    UpdateCustomCurvesRunner,
+)
+from pyetm.services.service_result import ServiceResult
+
+
+@pytest.fixture
+def temp_curve_files():
+    """Fixture that creates temporary curve files for testing"""
+    temp_dir = Path("/tmp/test_update_curves")
+    temp_dir.mkdir(exist_ok=True)
+
+    files = {}
+
+    # Create valid curve file (8760 values)
+    valid_data = np.random.uniform(0, 100, 8760)
+    valid_file = temp_dir / "valid_curve.csv"
+    pd.Series(valid_data).to_csv(valid_file, header=False, index=False)
+    files["valid"] = valid_file
+
+    # Create another valid curve file
+    another_data = np.random.uniform(50, 150, 8760)
+    another_file = temp_dir / "another_curve.csv"
+    pd.Series(another_data).to_csv(another_file, header=False, index=False)
+    files["another"] = another_file
+
+    yield files
+
+    # Cleanup
+    for file_path in files.values():
+        file_path.unlink(missing_ok=True)
+    temp_dir.rmdir()
+
+
+def test_update_custom_curves_success_single_curve(temp_curve_files):
+    """Test successful upload of a single custom curve"""
+    # Mock client
+    mock_client = Mock()
+    mock_client.session.base_url = "https://engine.example.com/api/v3"
+
+    # Mock scenario
+    mock_scenario = Mock()
+    mock_scenario.id = 12345
+
+    # Create custom curves with one curve
+    curve = CustomCurve(
+        key="test_curve", type="profile", file_path=temp_curve_files["valid"]
+    )
+    custom_curves = CustomCurves(curves=[curve])
+
+    # Mock successful _make_request response
+    with patch.object(
+        UpdateCustomCurvesRunner,
+        "_make_request",
+        return_value=ServiceResult.ok(data={"status": "uploaded"}),
+    ) as mock_make_request:
+
+        result = UpdateCustomCurvesRunner.run(mock_client, mock_scenario, custom_curves)
+
+        # Verify result
+        assert result.success is True
+        assert result.data["total_curves"] == 1
+        assert result.data["successful_uploads"] == 1
+        assert "test_curve" in result.data["uploaded_curves"]
+        assert len(result.errors) == 0
+
+        # Verify _make_request was called correctly
+        mock_make_request.assert_called_once()
+        call_args = mock_make_request.call_args
+        assert call_args[1]["client"] == mock_client
+        assert call_args[1]["method"] == "put"
+        assert "/scenarios/12345/custom_curves/test_curve" in call_args[1]["path"]
+        assert "files" in call_args[1]
+        assert call_args[1]["headers"]["Content-Type"] is None
+
+
+def test_update_custom_curves_success_multiple_curves(temp_curve_files):
+    """Test successful upload of multiple custom curves"""
+    # Mock client
+    mock_client = Mock()
+    mock_client.session.base_url = "https://engine.example.com/api/v3"
+
+    # Mock scenario
+    mock_scenario = Mock()
+    mock_scenario.id = 54321
+
+    # Create custom curves with multiple curves
+    curves = [
+        CustomCurve(key="curve_1", type="profile", file_path=temp_curve_files["valid"]),
+        CustomCurve(
+            key="curve_2", type="availability", file_path=temp_curve_files["another"]
+        ),
+    ]
+    custom_curves = CustomCurves(curves=curves)
+
+    # Mock successful _make_request responses
+    with patch.object(
+        UpdateCustomCurvesRunner,
+        "_make_request",
+        return_value=ServiceResult.ok(data={"status": "uploaded"}),
+    ) as mock_make_request:
+
+        result = UpdateCustomCurvesRunner.run(mock_client, mock_scenario, custom_curves)
+
+        # Verify result
+        assert result.success is True
+        assert result.data["total_curves"] == 2
+        assert result.data["successful_uploads"] == 2
+        assert set(result.data["uploaded_curves"]) == {"curve_1", "curve_2"}
+        assert len(result.errors) == 0
+
+        # Verify _make_request was called twice
+        assert mock_make_request.call_count == 2
+
+
+def test_update_custom_curves_curve_without_file():
+    """Test upload of curve without file (uses contents() method)"""
+    # Mock client
+    mock_client = Mock()
+    mock_client.session.base_url = "https://engine.example.com/api/v3"
+
+    # Mock scenario
+    mock_scenario = Mock()
+    mock_scenario.id = 99999
+
+    # Create curve without file_path but with contents
+    curve = CustomCurve(key="no_file_curve", type="profile")
+
+    # Mock curve.contents() to return data
+    mock_series = pd.Series(np.random.uniform(0, 100, 8760))
+
+    with patch(
+        "pyetm.models.custom_curves.CustomCurve.contents", return_value=mock_series
+    ):
+        custom_curves = CustomCurves(curves=[curve])
+
+        # Mock successful _make_request response
+        with patch.object(
+            UpdateCustomCurvesRunner,
+            "_make_request",
+            return_value=ServiceResult.ok(data={"status": "uploaded"}),
+        ) as mock_make_request:
+
+            result = UpdateCustomCurvesRunner.run(
+                mock_client, mock_scenario, custom_curves
+            )
+
+            # Verify result
+            assert result.success is True
+            assert result.data["successful_uploads"] == 1
+            assert "no_file_curve" in result.data["uploaded_curves"]
+
+            # Verify _make_request was called with file content
+            mock_make_request.assert_called_once()
+            call_args = mock_make_request.call_args
+            assert "files" in call_args[1]
+
+
+def test_update_custom_curves_http_error():
+    """Test handling of HTTP errors during upload"""
+    # Mock client
+    mock_client = Mock()
+    mock_client.session.base_url = "https://engine.example.com/api/v3"
+
+    # Mock scenario
+    mock_scenario = Mock()
+    mock_scenario.id = 12345
+
+    # Create custom curves
+    curve = CustomCurve(key="error_curve", type="profile")
+    mock_series = pd.Series(np.random.uniform(0, 100, 8760))
+
+    with patch(
+        "pyetm.models.custom_curves.CustomCurve.contents", return_value=mock_series
+    ):
+        custom_curves = CustomCurves(curves=[curve])
+
+        # Mock _make_request failure response
+        with patch.object(
+            UpdateCustomCurvesRunner,
+            "_make_request",
+            return_value=ServiceResult.fail(["422: Validation failed"]),
+        ) as mock_make_request:
+
+            result = UpdateCustomCurvesRunner.run(
+                mock_client, mock_scenario, custom_curves
+            )
+
+            # Verify result shows failure
+            assert result.success is False
+            assert result.data["successful_uploads"] == 0
+            assert len(result.errors) == 1
+            assert "422: Validation failed" in result.errors[0]
+
+
+def test_update_custom_curves_network_exception():
+    """Test handling of network exceptions during upload"""
+    # Mock client
+    mock_client = Mock()
+    mock_client.session.base_url = "https://engine.example.com/api/v3"
+
+    # Mock scenario
+    mock_scenario = Mock()
+    mock_scenario.id = 12345
+
+    # Create custom curves
+    curve = CustomCurve(key="network_error_curve", type="profile")
+    mock_series = pd.Series(np.random.uniform(0, 100, 8760))
+
+    with patch(
+        "pyetm.models.custom_curves.CustomCurve.contents", return_value=mock_series
+    ):
+        custom_curves = CustomCurves(curves=[curve])
+
+        # Mock _make_request raising exception
+        with patch.object(
+            UpdateCustomCurvesRunner,
+            "_make_request",
+            side_effect=ConnectionError("Network unreachable"),
+        ):
+            result = UpdateCustomCurvesRunner.run(
+                mock_client, mock_scenario, custom_curves
+            )
+
+            # Verify result shows failure
+            assert result.success is False
+            assert result.data["successful_uploads"] == 0
+            assert len(result.errors) == 1
+            assert (
+                "Error uploading network_error_curve: Network unreachable"
+                in result.errors[0]
+            )
+
+
+def test_update_custom_curves_mixed_success_failure(temp_curve_files):
+    """Test upload with mix of successful and failed curves"""
+    # Mock client
+    mock_client = Mock()
+    mock_client.session.base_url = "https://engine.example.com/api/v3"
+
+    # Mock scenario
+    mock_scenario = Mock()
+    mock_scenario.id = 12345
+
+    # Create multiple curves
+    curves = [
+        CustomCurve(
+            key="success_curve", type="profile", file_path=temp_curve_files["valid"]
+        ),
+        CustomCurve(
+            key="fail_curve", type="availability", file_path=temp_curve_files["another"]
+        ),
+    ]
+    custom_curves = CustomCurves(curves=curves)
+
+    # Mock mixed responses (first succeeds, second fails)
+    success_result = ServiceResult.ok(data={"status": "uploaded"})
+    fail_result = ServiceResult.fail(["500: Internal server error"])
+
+    with patch.object(
+        UpdateCustomCurvesRunner,
+        "_make_request",
+        side_effect=[success_result, fail_result],
+    ) as mock_make_request:
+
+        result = UpdateCustomCurvesRunner.run(mock_client, mock_scenario, custom_curves)
+
+        # Verify mixed result
+        assert result.success is False
+        assert result.data["total_curves"] == 2
+        assert result.data["successful_uploads"] == 1
+        assert result.data["uploaded_curves"] == ["success_curve"]
+        assert len(result.errors) == 1
+        assert "500: Internal server error" in result.errors[0]
+
+
+def test_update_custom_curves_empty_curves_list():
+    """Test upload with empty curves list"""
+    # Mock client
+    mock_client = Mock()
+    mock_client.session.base_url = "https://engine.example.com/api/v3"
+
+    # Mock scenario
+    mock_scenario = Mock()
+    mock_scenario.id = 12345
+
+    custom_curves = CustomCurves(curves=[])
+
+    result = UpdateCustomCurvesRunner.run(mock_client, mock_scenario, custom_curves)
+
+    # Should succeed with no uploads
+    assert result.success is True
+    assert result.data["total_curves"] == 0
+    assert result.data["successful_uploads"] == 0
+    assert result.data["uploaded_curves"] == []
+    assert len(result.errors) == 0
diff --git a/tests/services/scenario_runners/test_update_metadata.py b/tests/services/scenario_runners/test_update_metadata.py
index da6a652..10bb5b0 100644
--- a/tests/services/scenario_runners/test_update_metadata.py
+++ b/tests/services/scenario_runners/test_update_metadata.py
@@ -108,7 +108,7 @@ def test_update_metadata_runner_unsettable_keys_generate_warnings():
 
     metadata = {
         "id": 456,  # Unsettable
-        "title": "New Title",  # Unsettable
+        "title": "New Title",  # Settable
         "end_year": 2050,  # Settable
     }
 
@@ -121,7 +121,8 @@ def test_update_metadata_runner_unsettable_keys_generate_warnings():
         expected_payload = {
             "scenario": {
                 "end_year": 2050,
-                "metadata": {"existing": "value", "id": 456, "title": "New Title"},
+                "title": "New Title",
+                "metadata": {"existing": "value", "id": 456},
             }
         }
         mock_request.assert_called_once_with(
@@ -293,6 +294,7 @@ def test_update_metadata_runner_meta_keys_constants():
         "source",
         "metadata",
         "end_year",
+        "title",
     ]
 
     expected_unsettable_keys = [
@@ -300,7 +302,6 @@ def test_update_metadata_runner_meta_keys_constants():
         "created_at",
         "updated_at",
         "area_code",
-        "title",
         "start_year",
         "scaling",
         "template",
diff --git a/tests/services/scenario_runners/test_update_sortables.py b/tests/services/scenario_runners/test_update_sortables.py
new file mode 100644
index 0000000..e200e41
--- /dev/null
+++ b/tests/services/scenario_runners/test_update_sortables.py
@@ -0,0 +1,445 @@
+from pyetm.services.scenario_runners.update_sortables import UpdateSortablesRunner
+
+
+def test_update_sortables_success(dummy_client, fake_response, dummy_scenario):
+    """Test successful sortables update"""
+    body = {"order": ["item_1", "item_2", "item_3"]}
+    response = fake_response(ok=True, status_code=200, json_data=body)
+    client = dummy_client(response, method="put")
+    scenario = dummy_scenario(1)
+    order = ["item_1", "item_2", "item_3"]
+
+    result = UpdateSortablesRunner.run(client, scenario, "demand", order)
+
+    assert result.success is True
+    assert result.data == body
+    assert result.errors == []
+    assert client.calls == [
+        ("/scenarios/1/user_sortables/demand", {"json": {"order": order}})
+    ]
+
+
+def test_update_sortables_with_subtype(dummy_client, fake_response, dummy_scenario):
+    """Test sortables update with subtype parameter"""
+    body = {"order": ["heat_item_1", "heat_item_2"]}
+    response = fake_response(ok=True, status_code=200, json_data=body)
+    client = dummy_client(response, method="put")
+    scenario = dummy_scenario(2)
+    order = ["heat_item_1", "heat_item_2"]
+
+    result = UpdateSortablesRunner.run(
+        client, scenario, "heat_network", order, subtype="lt"
+    )
+
+    assert result.success is True
+    assert result.data == body
+    assert result.errors == []
+    assert client.calls == [
+        (
+            "/scenarios/2/user_sortables/heat_network?subtype=lt",
+            {"json": {"order": order}},
+        )
+    ]
+
+
+def test_update_sortables_heat_network_mt_subtype(
+    dummy_client, fake_response, dummy_scenario
+):
+    """Test heat network sortables update with medium temperature subtype"""
+    body = {"order": ["mt_source_1", "mt_source_2", "mt_source_3"]}
+    response = fake_response(ok=True, status_code=200, json_data=body)
+    client = dummy_client(response, method="put")
+    scenario = dummy_scenario(3)
+    order = ["mt_source_1", "mt_source_2", "mt_source_3"]
+
+    result = UpdateSortablesRunner.run(
+        client, scenario, "heat_network", order, subtype="mt"
+    )
+
+    assert result.success is True
+    assert result.data == body
+    assert result.errors == []
+    assert client.calls == [
+        (
+            "/scenarios/3/user_sortables/heat_network?subtype=mt",
+            {"json": {"order": order}},
+        )
+    ]
+
+
+def test_update_sortables_heat_network_ht_subtype(
+    dummy_client, fake_response, dummy_scenario
+):
+    """Test heat network sortables update with high temperature subtype"""
+    body = {"order": ["ht_source_1", "ht_source_2"]}
+    response = fake_response(ok=True, status_code=200, json_data=body)
+    client = dummy_client(response, method="put")
+    scenario = dummy_scenario(4)
+    order = ["ht_source_1", "ht_source_2"]
+
+    result = UpdateSortablesRunner.run(
+        client, scenario, "heat_network", order, subtype="ht"
+    )
+
+    assert result.success is True
+    assert result.data == body
+    assert result.errors == []
+    assert client.calls == [
+        (
+            "/scenarios/4/user_sortables/heat_network?subtype=ht",
+            {"json": {"order": order}},
+        )
+    ]
+
+
+def test_update_sortables_empty_order(dummy_client, fake_response, dummy_scenario):
+    """Test sortables update with empty order list"""
+    body = {"order": []}
+    response = fake_response(ok=True, status_code=200, json_data=body)
+    client = dummy_client(response, method="put")
+    scenario = dummy_scenario(5)
+    order = []
+
+    result = UpdateSortablesRunner.run(client, scenario, "demand", order)
+
+    assert result.success is True
+    assert result.data == body
+    assert result.errors == []
+    assert client.calls == [
+        ("/scenarios/5/user_sortables/demand", {"json": {"order": []}})
+    ]
+
+
+def test_update_sortables_single_item(dummy_client, fake_response, dummy_scenario):
+    """Test sortables update with single item in order"""
+    body = {"order": ["single_item"]}
+    response = fake_response(ok=True, status_code=200, json_data=body)
+    client = dummy_client(response, method="put")
+    scenario = dummy_scenario(6)
+    order = ["single_item"]
+
+    result = UpdateSortablesRunner.run(client, scenario, "supply", order)
+
+    assert result.success is True
+    assert result.data == body
+    assert result.errors == []
+    assert client.calls == [
+        ("/scenarios/6/user_sortables/supply", {"json": {"order": order}})
+    ]
+
+
+def test_update_sortables_numeric_order_items(
+    dummy_client, fake_response, dummy_scenario
+):
+    """Test sortables update with numeric items in order"""
+    body = {"order": [1, 2, 3, 4]}
+    response = fake_response(ok=True, status_code=200, json_data=body)
+    client = dummy_client(response, method="put")
+    scenario = dummy_scenario(7)
+    order = [1, 2, 3, 4]
+
+    result = UpdateSortablesRunner.run(client, scenario, "demand", order)
+
+    assert result.success is True
+    assert result.data == body
+    assert result.errors == []
+    assert client.calls == [
+        ("/scenarios/7/user_sortables/demand", {"json": {"order": order}})
+    ]
+
+
+def test_update_sortables_mixed_type_order_items(
+    dummy_client, fake_response, dummy_scenario
+):
+    """Test sortables update with mixed type items in order"""
+    body = {"order": ["item_1", 2, "item_3", 4]}
+    response = fake_response(ok=True, status_code=200, json_data=body)
+    client = dummy_client(response, method="put")
+    scenario = dummy_scenario(8)
+    order = ["item_1", 2, "item_3", 4]
+
+    result = UpdateSortablesRunner.run(client, scenario, "demand", order)
+
+    assert result.success is True
+    assert result.data == body
+    assert result.errors == []
+    assert client.calls == [
+        ("/scenarios/8/user_sortables/demand", {"json": {"order": order}})
+    ]
+
+
+def test_update_sortables_with_kwargs(dummy_client, fake_response, dummy_scenario):
+    """Test sortables update with additional kwargs"""
+    body = {"order": ["item_1", "item_2"]}
+    response = fake_response(ok=True, status_code=200, json_data=body)
+    client = dummy_client(response, method="put")
+    scenario = dummy_scenario(9)
+    order = ["item_1", "item_2"]
+
+    result = UpdateSortablesRunner.run(client, scenario, "demand", order, timeout=30)
+
+    assert result.success is True
+    assert result.data == body
+    assert result.errors == []
+    # Verify the basic structure - kwargs handling might vary
+    assert len(client.calls) == 1
+    assert client.calls[0][0] == "/scenarios/9/user_sortables/demand"
+    assert client.calls[0][1]["json"] == {"order": order}
+
+
+def test_update_sortables_large_scenario_id(
+    dummy_client, fake_response, dummy_scenario
+):
+    """Test with large scenario ID"""
+    body = {"order": ["item_1", "item_2"]}
+    response = fake_response(ok=True, status_code=200, json_data=body)
+    client = dummy_client(response, method="put")
+    scenario = dummy_scenario(999999)
+    order = ["item_1", "item_2"]
+
+    result = UpdateSortablesRunner.run(client, scenario, "demand", order)
+
+    assert result.success is True
+    assert client.calls[0][0] == "/scenarios/999999/user_sortables/demand"
+
+
+def test_update_sortables_http_failure_422(dummy_client, fake_response, dummy_scenario):
+    """Test HTTP 422 validation error"""
+    response = fake_response(ok=False, status_code=422, text="Invalid sortable order")
+    client = dummy_client(response, method="put")
+    scenario = dummy_scenario(10)
+    order = ["invalid_item"]
+
+    result = UpdateSortablesRunner.run(client, scenario, "demand", order)
+
+    assert result.success is False
+    assert result.data is None
+    assert result.errors == ["422: Invalid sortable order"]
+
+
+def test_update_sortables_http_failure_404(dummy_client, fake_response, dummy_scenario):
+    """Test HTTP 404 scenario not found"""
+    response = fake_response(ok=False, status_code=404, text="Scenario not found")
+    client = dummy_client(response, method="put")
+    scenario = dummy_scenario(999)
+    order = ["item_1", "item_2"]
+
+    result = UpdateSortablesRunner.run(client, scenario, "demand", order)
+
+    assert result.success is False
+    assert result.data is None
+    assert result.errors == ["404: Scenario not found"]
+
+
+def test_update_sortables_http_failure_400(dummy_client, fake_response, dummy_scenario):
+    """Test HTTP 400 bad request"""
+    response = fake_response(
+        ok=False, status_code=400, text="Bad request - invalid sortable type"
+    )
+    client = dummy_client(response, method="put")
+    scenario = dummy_scenario(11)
+    order = ["item_1"]
+
+    result = UpdateSortablesRunner.run(client, scenario, "invalid_type", order)
+
+    assert result.success is False
+    assert result.data is None
+    assert result.errors == ["400: Bad request - invalid sortable type"]
+
+
+def test_update_sortables_http_failure_403(dummy_client, fake_response, dummy_scenario):
+    """Test HTTP 403 forbidden access"""
+    response = fake_response(
+        ok=False, status_code=403, text="Forbidden - access denied"
+    )
+    client = dummy_client(response, method="put")
+    scenario = dummy_scenario(12)
+    order = ["item_1", "item_2"]
+
+    result = UpdateSortablesRunner.run(client, scenario, "demand", order)
+
+    assert result.success is False
+    assert result.data is None
+    assert result.errors == ["403: Forbidden - access denied"]
+
+
+def test_update_sortables_http_failure_500(dummy_client, fake_response, dummy_scenario):
+    """Test HTTP 500 internal server error"""
+    response = fake_response(ok=False, status_code=500, text="Internal Server Error")
+    client = dummy_client(response, method="put")
+    scenario = dummy_scenario(13)
+    order = ["item_1", "item_2"]
+
+    result = UpdateSortablesRunner.run(client, scenario, "demand", order)
+
+    assert result.success is False
+    assert result.data is None
+    assert result.errors == ["500: Internal Server Error"]
+
+
+def test_update_sortables_connection_error(dummy_client, dummy_scenario):
+    """Test connection error handling"""
+    client = dummy_client(ConnectionError("Connection failed"), method="put")
+    scenario = dummy_scenario(14)
+    order = ["item_1", "item_2"]
+
+    result = UpdateSortablesRunner.run(client, scenario, "demand", order)
+
+    assert result.success is False
+    assert result.data is None
+    assert any("Connection failed" in err for err in result.errors)
+
+
+def test_update_sortables_permission_error(dummy_client, dummy_scenario):
+    """Test permission error handling"""
+    client = dummy_client(PermissionError("Access denied"), method="put")
+    scenario = dummy_scenario(15)
+    order = ["item_1", "item_2"]
+
+    result = UpdateSortablesRunner.run(client, scenario, "demand", order)
+
+    assert result.success is False
+    assert result.data is None
+    assert any("Access denied" in err for err in result.errors)
+
+
+def test_update_sortables_value_error(dummy_client, dummy_scenario):
+    """Test value error handling"""
+    client = dummy_client(ValueError("Invalid value provided"), method="put")
+    scenario = dummy_scenario(16)
+    order = ["item_1", "item_2"]
+
+    result = UpdateSortablesRunner.run(client, scenario, "demand", order)
+
+    assert result.success is False
+    assert result.data is None
+    assert any("Invalid value provided" in err for err in result.errors)
+
+
+def test_update_sortables_generic_exception(dummy_client, dummy_scenario):
+    """Test generic exception handling"""
+    client = dummy_client(RuntimeError("Unexpected error"), method="put")
+    scenario = dummy_scenario(17)
+    order = ["item_1", "item_2"]
+
+    result = UpdateSortablesRunner.run(client, scenario, "demand", order)
+
+    assert result.success is False
+    assert result.data is None
+    assert any("Unexpected error" in err for err in result.errors)
+
+
+def test_update_sortables_payload_structure(
+    dummy_client, fake_response, dummy_scenario
+):
+    """Test that the payload is correctly structured for the API"""
+    body = {"order": ["a", "b", "c", "d"]}
+    response = fake_response(ok=True, status_code=200, json_data=body)
+    client = dummy_client(response, method="put")
+    scenario = dummy_scenario(18)
+    order = ["a", "b", "c", "d"]
+
+    UpdateSortablesRunner.run(client, scenario, "demand", order)
+
+    # Verify the exact payload structure
+    expected_call = (
+        "/scenarios/18/user_sortables/demand",
+        {"json": {"order": ["a", "b", "c", "d"]}},
+    )
+    assert client.calls == [expected_call]
+
+
+def test_update_sortables_url_construction_no_subtype(
+    dummy_client, fake_response, dummy_scenario
+):
+    """Test URL construction without subtype"""
+    body = {"order": ["item_1"]}
+    response = fake_response(ok=True, status_code=200, json_data=body)
+    client = dummy_client(response, method="put")
+    scenario = dummy_scenario(19)
+    order = ["item_1"]
+
+    UpdateSortablesRunner.run(client, scenario, "supply", order)
+
+    assert client.calls[0][0] == "/scenarios/19/user_sortables/supply"
+
+
+def test_update_sortables_url_construction_with_subtype(
+    dummy_client, fake_response, dummy_scenario
+):
+    """Test URL construction with subtype"""
+    body = {"order": ["item_1"]}
+    response = fake_response(ok=True, status_code=200, json_data=body)
+    client = dummy_client(response, method="put")
+    scenario = dummy_scenario(20)
+    order = ["item_1"]
+
+    UpdateSortablesRunner.run(client, scenario, "heat_network", order, subtype="mt")
+
+    assert client.calls[0][0] == "/scenarios/20/user_sortables/heat_network?subtype=mt"
+
+
+def test_update_sortables_different_sortable_types(
+    dummy_client, fake_response, dummy_scenario
+):
+    """Test different sortable types"""
+    body = {"order": ["item_1", "item_2"]}
+    response = fake_response(ok=True, status_code=200, json_data=body)
+    client = dummy_client(response, method="put")
+    scenario = dummy_scenario(21)
+    order = ["item_1", "item_2"]
+
+    # Test various sortable types
+    sortable_types = ["demand", "supply", "heat_network", "storage", "conversion"]
+
+    for i, sortable_type in enumerate(sortable_types):
+        scenario_obj = dummy_scenario(21 + i)
+        result = UpdateSortablesRunner.run(client, scenario_obj, sortable_type, order)
+
+        assert result.success is True
+        expected_url = f"/scenarios/{21 + i}/user_sortables/{sortable_type}"
+        assert client.calls[i][0] == expected_url
+
+
+def test_update_sortables_subtype_none_explicitly(
+    dummy_client, fake_response, dummy_scenario
+):
+    """Test with subtype explicitly set to None"""
+    body = {"order": ["item_1", "item_2"]}
+    response = fake_response(ok=True, status_code=200, json_data=body)
+    client = dummy_client(response, method="put")
+    scenario = dummy_scenario(22)
+    order = ["item_1", "item_2"]
+
+    result = UpdateSortablesRunner.run(client, scenario, "demand", order, subtype=None)
+
+    assert result.success is True
+    assert result.data == body
+    assert result.errors == []
+    assert client.calls == [
+        ("/scenarios/22/user_sortables/demand", {"json": {"order": order}})
+    ]
+
+
+def test_update_sortables_complex_order_data(
+    dummy_client, fake_response, dummy_scenario
+):
+    """Test with complex order data including dictionaries"""
+    order = [
+        {"id": 1, "name": "item_1"},
+        {"id": 2, "name": "item_2"},
+        {"id": 3, "name": "item_3"},
+    ]
+    body = {"order": order}
+    response = fake_response(ok=True, status_code=200, json_data=body)
+    client = dummy_client(response, method="put")
+    scenario = dummy_scenario(23)
+
+    result = UpdateSortablesRunner.run(client, scenario, "demand", order)
+
+    assert result.success is True
+    assert result.data == body
+    assert result.errors == []
+    assert client.calls == [
+        ("/scenarios/23/user_sortables/demand", {"json": {"order": order}})
+    ]
diff --git a/tests/test_settings.py b/tests/test_settings.py
index 4d0caab..c8d71f9 100644
--- a/tests/test_settings.py
+++ b/tests/test_settings.py
@@ -1,5 +1,3 @@
-import os
-import yaml
 import pytest
 from pathlib import Path
 import pyetm.config.settings as settings_module
@@ -9,83 +7,136 @@
 get_settings = settings_module.get_settings
 
 
-# Fixture: clear any ENV vars
-@pytest.fixture(autouse=True)
-def clear_env(monkeypatch):
-    for var in ("ETM_API_TOKEN", "BASE_URL", "LOG_LEVEL"):
+# Settings-specific fixture for clean environment
+@pytest.fixture
+def clean_settings_env(monkeypatch, tmp_path):
+    """Create a completely clean environment for settings tests"""
+    # Clear all ETM environment variables
+    etm_vars = [
+        "ETM_API_TOKEN",
+        "BASE_URL",
+        "LOG_LEVEL",
+        "ENVIRONMENT",
+        "CSV_SEPARATOR",
+        "DECIMAL_SEPARATOR",
+        "PROXY_SERVERS_HTTP",
+        "PROXY_SERVERS_HTTPS",
+    ]
+    for var in etm_vars:
         monkeypatch.delenv(var, raising=False)
 
-
-# Helper to write a YAML file
-def write_yaml(path: Path, data: dict):
-    path.write_text(yaml.safe_dump(data))
-
-
-# File has all values → use them
-def test_from_yaml_loads_file_values(tmp_path):
-    cfg_file = tmp_path / "config.yml"
-    payload = {
-        "etm_api_token": "etm_valid.looking.token",
-        "base_url": "https://custom.local/api",
-        "log_level": "DEBUG",
+    # Create isolated config file path
+    test_config_file = tmp_path / "isolated_config.env"
+    monkeypatch.setattr(settings_module, "ENV_FILE", test_config_file)
+
+    return test_config_file
+
+
+# Helper to write a .env file
+def write_env_file(path: Path, data: dict):
+    lines = []
+    for key, value in data.items():
+        # Quote values with spaces
+        if isinstance(value, str) and (" " in value or "#" in value):
+            value = f'"{value}"'
+        lines.append(f"{key}={value}")
+    path.write_text("\n".join(lines))
+
+
+# Test basic .env file loading
+def test_config_loads_env_file_values(clean_settings_env):
+    env_file = clean_settings_env
+    env_data = {
+        "ETM_API_TOKEN": "etm_valid.looking.token",
+        "BASE_URL": "https://custom.local/api",
+        "LOG_LEVEL": "DEBUG",
+        "ENVIRONMENT": "beta",
+        "CSV_SEPARATOR": ";",
+        "DECIMAL_SEPARATOR": ",",
     }
-    write_yaml(cfg_file, payload)
+    write_env_file(env_file, env_data)
 
-    config = AppConfig.from_yaml(cfg_file)
+    config = AppConfig()
 
     assert config.etm_api_token == "etm_valid.looking.token"
     assert config.base_url == HttpUrl("https://custom.local/api")
     assert config.log_level == "DEBUG"
+    assert config.environment == "beta"
+    assert config.csv_separator == ";"
+    assert config.decimal_separator == ","
 
 
-# File only has token; ENV overrides log_level; base_url uses default
-def test_from_yaml_env_overrides_and_defaults(tmp_path, monkeypatch):
-    cfg_file = tmp_path / "config.yml"
-    write_yaml(cfg_file, {"etm_api_token": "etm_valid.looking.token"})
+# Test environment variables override .env file
+def test_env_vars_override_env_file(clean_settings_env, monkeypatch):
+    env_file = clean_settings_env
+    write_env_file(
+        env_file, {"ETM_API_TOKEN": "etm_from.env.file", "LOG_LEVEL": "DEBUG"}
+    )
 
-    # only override LOG_LEVEL
+    # ENV var should override file
     monkeypatch.setenv("LOG_LEVEL", "WARNING")
 
-    config = AppConfig.from_yaml(cfg_file)
+    config = AppConfig()
 
-    assert config.etm_api_token == "etm_valid.looking.token"
-    assert config.log_level == "WARNING"
-    # default from the class
-    assert config.base_url == HttpUrl("https://engine.energytransitionmodel.com/api/v3")
+    assert config.etm_api_token == "etm_from.env.file"  # from file
+    assert config.log_level == "WARNING"  # from env var (overrides file)
 
 
-# No file; ENV provides token; others default
-def test_from_yaml_no_file_uses_env_and_defaults(tmp_path, monkeypatch):
-    cfg_file = tmp_path / "does_not_exist.yml"
-    monkeypatch.setenv("ETM_API_TOKEN", "etm_valid.looking.token")
+# Test base_url inference from environment
+def test_base_url_inference_from_environment(clean_settings_env):
+    env_file = clean_settings_env
+    write_env_file(
+        env_file, {"ETM_API_TOKEN": "etm_valid.looking.token", "ENVIRONMENT": "beta"}
+    )
 
-    config = AppConfig.from_yaml(cfg_file)
+    config = AppConfig()
 
-    assert config.etm_api_token == "etm_valid.looking.token"
-    assert config.base_url == HttpUrl("https://engine.energytransitionmodel.com/api/v3")
-    assert config.log_level == "INFO"
+    assert config.environment == "beta"
+    assert config.base_url == HttpUrl(
+        "https://beta.engine.energytransitionmodel.com/api/v3"
+    )
 
 
-# Invalid YAML is swallowed; ENV+defaults apply
-def test_from_yaml_invalid_yaml_is_swallowed(tmp_path, monkeypatch):
-    cfg_file = tmp_path / "config.yml"
-    cfg_file.write_text(":\t not valid yaml :::")
+# Test proxy servers configuration
+def test_proxy_servers_configuration(clean_settings_env):
+    env_file = clean_settings_env
+    write_env_file(
+        env_file,
+        {
+            "ETM_API_TOKEN": "etm_valid.looking.token",
+            "PROXY_SERVERS_HTTP": "http://proxy.example.com:8080",
+            "PROXY_SERVERS_HTTPS": "https://secure.proxy.com:8080",
+        },
+    )
+
+    config = AppConfig()
+
+    assert config.proxy_servers_http == "http://proxy.example.com:8080"
+    assert config.proxy_servers_https == "https://secure.proxy.com:8080"
 
+    # Test backward compatibility property
+    proxy_dict = config.proxy_servers
+    assert proxy_dict["http"] == "http://proxy.example.com:8080"
+    assert proxy_dict["https"] == "https://secure.proxy.com:8080"
+
+
+# Test no .env file, only environment variables
+def test_no_env_file_uses_env_vars_and_defaults(clean_settings_env, monkeypatch):
+    # Don't create the env_file, just set environment variable
     monkeypatch.setenv("ETM_API_TOKEN", "etm_valid.looking.token")
 
-    config = AppConfig.from_yaml(cfg_file)
+    config = AppConfig()
 
     assert config.etm_api_token == "etm_valid.looking.token"
     assert config.base_url == HttpUrl("https://engine.energytransitionmodel.com/api/v3")
     assert config.log_level == "INFO"
+    assert config.environment == "pro"
 
 
-# Empty file + no ENV → get_settings() raises RuntimeError with helpful message
-def test_get_settings_missing_token_raises_runtime_error(tmp_path, monkeypatch):
-    cfg_file = tmp_path / "config.yml"
-    write_yaml(cfg_file, {})
-
-    monkeypatch.setattr(settings_module, "CONFIG_FILE", cfg_file)
+# Test missing required token raises helpful error
+def test_get_settings_missing_token_raises_runtime_error(clean_settings_env):
+    env_file = clean_settings_env
+    write_env_file(env_file, {})
 
     with pytest.raises(RuntimeError) as excinfo:
         get_settings()
@@ -96,7 +147,66 @@ def test_get_settings_missing_token_raises_runtime_error(tmp_path, monkeypatch):
         in msg
     )
     assert "• etm_api_token: Field required" in msg
-    assert str(cfg_file) in msg
+    assert str(env_file) in msg
+
+
+# Test defaults when no configuration provided
+def test_default_values(clean_settings_env):
+    env_file = clean_settings_env
+    write_env_file(env_file, {"ETM_API_TOKEN": "etm_valid.looking.token"})
+
+    config = AppConfig()
+
+    assert config.etm_api_token == "etm_valid.looking.token"
+    assert config.environment == "pro"
+    assert config.log_level == "INFO"
+    assert config.csv_separator == ","
+    assert config.decimal_separator == "."
+    assert config.proxy_servers_http is None
+    assert config.proxy_servers_https is None
+    assert config.base_url == HttpUrl("https://engine.energytransitionmodel.com/api/v3")
+
+
+# Test environment inference for different values
+@pytest.mark.parametrize(
+    "env,expected_url",
+    [
+        ("pro", "https://engine.energytransitionmodel.com/api/v3"),
+        ("beta", "https://beta.engine.energytransitionmodel.com/api/v3"),
+        ("local", "http://localhost:3000/api/v3"),
+        ("2025-01", "https://2025-01.engine.energytransitionmodel.com/api/v3"),
+        ("", "https://engine.energytransitionmodel.com/api/v3"),  # default
+        ("unknown", "https://engine.energytransitionmodel.com/api/v3"),  # fallback
+    ],
+)
+def test_environment_inference(clean_settings_env, env, expected_url):
+    env_file = clean_settings_env
+    env_data = {"ETM_API_TOKEN": "etm_valid.looking.token"}
+    if env:  # Don't add environment key if it's empty string
+        env_data["ENVIRONMENT"] = env
+
+    write_env_file(env_file, env_data)
+
+    config = AppConfig()
+    assert config.base_url == HttpUrl(expected_url)
+
+
+# Test explicit base_url overrides environment inference
+def test_explicit_base_url_overrides_environment(clean_settings_env):
+    env_file = clean_settings_env
+    write_env_file(
+        env_file,
+        {
+            "ETM_API_TOKEN": "etm_valid.looking.token",
+            "ENVIRONMENT": "beta",
+            "BASE_URL": "https://custom.override.com/api/v3",
+        },
+    )
+
+    config = AppConfig()
+
+    assert config.environment == "beta"
+    assert config.base_url == HttpUrl("https://custom.override.com/api/v3")
 
 
 # VALID TOKENS
@@ -111,13 +221,13 @@ def test_get_settings_missing_token_raises_runtime_error(tmp_path, monkeypatch):
         "IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c",
     ],
 )
-def test_valid_etm_api_token_regex(tmp_path, token):
-    # Write a minimal config.yml with only the token
-    cfg = tmp_path / "config.yml"
-    write_yaml(cfg, {"etm_api_token": token})
+def test_valid_etm_api_token_regex(clean_settings_env, token):
+    env_file = clean_settings_env
+    write_env_file(env_file, {"ETM_API_TOKEN": token})
+
     # Should not raise
-    conf = AppConfig.from_yaml(cfg)
-    assert conf.etm_api_token == token
+    config = AppConfig()
+    assert config.etm_api_token == token
 
 
 # INVALID TOKENS
@@ -134,12 +244,46 @@ def test_valid_etm_api_token_regex(tmp_path, token):
         "etm_beta_eyJhbGci.eyJ zdWIi.abc",
     ],
 )
-def test_invalid_etm_api_token_raises(tmp_path, token):
-    cfg = tmp_path / "config.yml"
-    write_yaml(cfg, {"etm_api_token": token})
+def test_invalid_etm_api_token_raises(clean_settings_env, token):
+    env_file = clean_settings_env
+    write_env_file(env_file, {"ETM_API_TOKEN": token})
+
     with pytest.raises(ValidationError) as excinfo:
-        AppConfig.from_yaml(cfg)
+        AppConfig()
     errs = excinfo.value.errors()
     # Should have exactly one error, on the token field
     assert any(err["loc"] == ("etm_api_token",) for err in errs)
     assert any("Invalid ETM API token" in err["msg"] for err in errs)
+
+
+# Test temp folder functionality
+def test_path_to_tmp_creates_directory(clean_settings_env):
+    env_file = clean_settings_env
+    write_env_file(env_file, {"ETM_API_TOKEN": "etm_valid.looking.token"})
+
+    config = AppConfig()
+    config.temp_folder = env_file.parent / "custom_tmp"
+
+    result_path = config.path_to_tmp("test_subfolder")
+
+    assert result_path.exists()
+    assert result_path.is_dir()
+    assert result_path.name == "test_subfolder"
+    assert result_path.parent == config.temp_folder
+
+
+# Test quoted values in .env file
+def test_quoted_values_in_env_file(clean_settings_env):
+    env_file = clean_settings_env
+    content = '''ETM_API_TOKEN=etm_valid.looking.token
+LOG_LEVEL="DEBUG WITH SPACES"
+CSV_SEPARATOR=";"
+PROXY_SERVERS_HTTP="http://user:pass@proxy.example.com:8080"'''
+    env_file.write_text(content)
+
+    config = AppConfig()
+
+    assert config.etm_api_token == "etm_valid.looking.token"
+    assert config.log_level == "DEBUG WITH SPACES"
+    assert config.csv_separator == ";"
+    assert config.proxy_servers_http == "http://user:pass@proxy.example.com:8080"
diff --git a/tests/utils/test_excel.py b/tests/utils/test_excel.py
index 8533655..cb074fd 100644
--- a/tests/utils/test_excel.py
+++ b/tests/utils/test_excel.py
@@ -3,16 +3,18 @@
 import numpy as np
 import tempfile
 import os
-from unittest.mock import Mock
+from unittest.mock import Mock, patch, call
 from xlsxwriter.workbook import Workbook
 from xlsxwriter.worksheet import Worksheet
 
 from pyetm.utils.excel import (
+    add_frame,
     handle_numeric_value,
     set_column_widths,
     write_index,
-    add_frame,
     add_series,
+    create_scenario_formats,
+    get_scenario_blocks,
 )
 
 
@@ -66,6 +68,93 @@ def test_handle_zero(self):
         result = handle_numeric_value(self.mock_worksheet, 0, 0, 0.0, None)
         self.mock_worksheet.write_number.assert_called_once_with(0, 0, 0.0, None)
 
+    def test_handle_negative_number(self):
+        """Test negative number handling"""
+        result = handle_numeric_value(self.mock_worksheet, 0, 0, -5.5, None)
+        self.mock_worksheet.write_number.assert_called_once_with(0, 0, -5.5, None)
+
+    def test_handle_number_with_cell_format(self):
+        """Test number handling with cell format"""
+        mock_format = Mock()
+        result = handle_numeric_value(self.mock_worksheet, 1, 1, 42.0, mock_format)
+        self.mock_worksheet.write_number.assert_called_once_with(
+            1, 1, 42.0, mock_format
+        )
+
+    def test_handle_nan_with_cell_format(self):
+        """Test NaN handling with cell format"""
+        mock_format = Mock()
+        result = handle_numeric_value(
+            self.mock_worksheet, 1, 1, np.nan, mock_format, nan_as_formula=True
+        )
+        self.mock_worksheet.write_formula.assert_called_once_with(
+            1, 1, "=NA()", mock_format, "#N/A"
+        )
+
+    def test_decimal_precision_edge_cases(self):
+        """Test decimal precision with edge cases"""
+        # Test precision = 0
+        result = handle_numeric_value(
+            self.mock_worksheet, 0, 0, 3.14159, None, decimal_precision=0
+        )
+        args = self.mock_worksheet.write_number.call_args[0]
+        assert args[2] == 4.0  # Should ceil to 4
+
+        # Test very high precision
+        result = handle_numeric_value(
+            self.mock_worksheet, 0, 0, 1.23456789, None, decimal_precision=15
+        )
+        self.mock_worksheet.write_number.assert_called_with(0, 0, 1.23456789, None)
+
+    def test_handle_positive_infinity(self):
+        """Test handling positive infinity"""
+        # Infinity will cause OverflowError in math.ceil, so it should be handled
+        # The function should still try to process it, but the math.ceil will fail
+        with pytest.raises(OverflowError):
+            handle_numeric_value(self.mock_worksheet, 0, 0, float("inf"), None)
+
+    def test_handle_negative_infinity(self):
+        """Test handling negative infinity"""
+        # Negative infinity will cause OverflowError in math.ceil
+        with pytest.raises(OverflowError):
+            handle_numeric_value(self.mock_worksheet, 0, 0, float("-inf"), None)
+
+    def test_handle_very_small_number(self):
+        """Test handling very small numbers"""
+        very_small = 1e-10  # Use a less extreme small number
+        result = handle_numeric_value(
+            self.mock_worksheet, 0, 0, very_small, None, decimal_precision=10
+        )
+
+        # Should write the small number (may be rounded by precision)
+        args = self.mock_worksheet.write_number.call_args[0]
+        # Check that it's close to the expected value
+        assert abs(args[2] - very_small) < 1e-15
+
+    def test_handle_very_large_number(self):
+        """Test handling very large numbers"""
+        very_large = 1e10  # Large but not infinity
+        result = handle_numeric_value(
+            self.mock_worksheet, 0, 0, very_large, None, decimal_precision=10
+        )
+
+        # Should write the large number
+        args = self.mock_worksheet.write_number.call_args[0]
+        assert args[2] == very_large
+
+    def test_handle_positive_infinity(self):
+        """Test handling positive infinity"""
+        # Infinity will cause OverflowError in math.ceil, so it should be handled
+        # The function should still try to process it, but the math.ceil will fail
+        with pytest.raises(OverflowError):
+            handle_numeric_value(self.mock_worksheet, 0, 0, float("inf"), None)
+
+    def test_handle_negative_infinity(self):
+        """Test handling negative infinity"""
+        # Negative infinity will cause OverflowError in math.ceil
+        with pytest.raises(OverflowError):
+            handle_numeric_value(self.mock_worksheet, 0, 0, float("-inf"), None)
+
 
 class TestSetColumnWidths:
     def setup_method(self):
@@ -99,6 +188,16 @@ def test_set_list_widths_wrong_length(self):
         with pytest.raises(ValueError, match="Expected 3 widths, got 2"):
             set_column_widths(self.mock_worksheet, 0, 3, [10, 15])
 
+    def test_set_single_width_zero_columns(self):
+        """Test with zero columns"""
+        set_column_widths(self.mock_worksheet, 5, 0, 10)
+        self.mock_worksheet.set_column.assert_called_once_with(5, 4, 10)
+
+    def test_set_list_widths_empty_list(self):
+        """Test with empty list"""
+        with pytest.raises(ValueError, match="Expected 2 widths, got 0"):
+            set_column_widths(self.mock_worksheet, 0, 2, [])
+
 
 class TestWriteIndex:
     def setup_method(self):
@@ -153,88 +252,114 @@ def test_write_index_no_names(self):
         ]  # row_offset - 1
         assert len(name_calls) == 0
 
+    def test_write_multiindex_partial_names(self):
+        """Test writing MultiIndex with some None names"""
+        index = pd.MultiIndex.from_tuples([("A", 1), ("B", 2)], names=["letter", None])
 
-class TestAddFrame:
-    """Test add_frame function"""
+        write_index(self.mock_worksheet, index, 1, self.bold_format)
 
-    def setup_method(self):
-        """Setup test data"""
-        self.temp_dir = tempfile.mkdtemp()
+        # Should write only non-None names
+        name_calls = [
+            call for call in self.mock_worksheet.write.call_args_list if call[0][0] == 0
+        ]
+        assert len(name_calls) == 1
+        assert name_calls[0][0][2] == "letter"
 
-    def teardown_method(self):
-        """Clean up temp files"""
-        import shutil
+    def test_write_multiindex_all_none_names(self):
+        """Test writing MultiIndex with all None names"""
+        index = pd.MultiIndex.from_tuples([("A", 1), ("B", 2)], names=[None, None])
 
-        shutil.rmtree(self.temp_dir, ignore_errors=True)
+        write_index(self.mock_worksheet, index, 1, None)
 
-    def test_add_simple_dataframe(self):
-        """Test adding simple DataFrame"""
-        df = pd.DataFrame(
-            {"A": [1, 2, 3], "B": [4.5, np.nan, 6.7]}, index=["row1", "row2", "row3"]
-        )
+        # Should not write any names
+        name_calls = [
+            call for call in self.mock_worksheet.write.call_args_list if call[0][0] == 0
+        ]
+        assert len(name_calls) == 0
 
-        file_path = os.path.join(self.temp_dir, "test.xlsx")
-        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+    def test_write_empty_index(self):
+        """Test writing empty index"""
+        index = pd.Index([], name="empty")
 
-        worksheet = add_frame("TestSheet", df, workbook)
+        write_index(self.mock_worksheet, index, 1, self.bold_format)
 
-        assert worksheet is not None
-        assert worksheet.name == "TestSheet"
+        # Should write name but no values
+        name_calls = [
+            call for call in self.mock_worksheet.write.call_args_list if call[0][0] == 0
+        ]
+        assert len(name_calls) == 1
 
-        workbook.close()
+        # Should have no value calls since index is empty
+        value_calls = [
+            call for call in self.mock_worksheet.write.call_args_list if call[0][0] >= 1
+        ]
+        assert len(value_calls) == 0  # No values, only the name
 
-    def test_add_dataframe_no_index(self):
-        """Test adding DataFrame without index"""
-        df = pd.DataFrame({"A": [1, 2, 3], "B": [4, 5, 6]})
 
-        file_path = os.path.join(self.temp_dir, "test_no_index.xlsx")
-        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+class TestCreateScenarioFormats:
+    def test_create_scenario_formats(self):
+        """Test scenario format creation"""
+        mock_workbook = Mock(spec=Workbook)
+        mock_format = Mock()
+        mock_workbook.add_format.return_value = mock_format
 
-        worksheet = add_frame("TestSheet", df, workbook, index=False)
+        formats = create_scenario_formats(mock_workbook)
 
-        assert worksheet is not None
-        workbook.close()
+        # Check all expected formats are created
+        expected_formats = [
+            "white_header",
+            "grey_header",
+            "white_data",
+            "grey_data",
+            "bold",
+        ]
+        for fmt in expected_formats:
+            assert fmt in formats
+            assert formats[fmt] == mock_format
+
+        assert formats["default"] is None
+        assert mock_workbook.add_format.call_count == 5
 
-    def test_add_multiindex_dataframe(self):
-        """Test adding DataFrame with MultiIndex"""
-        arrays = [["A", "A", "B", "B"], [1, 2, 1, 2]]
-        index = pd.MultiIndex.from_arrays(arrays, names=["letter", "number"])
 
+class TestGetScenarioBlocks:
+    def test_get_scenario_blocks_simple(self):
+        """Test scenario block identification"""
         columns = pd.MultiIndex.from_tuples(
-            [("X", "col1"), ("X", "col2"), ("Y", "col1")], names=["group", "item"]
+            [
+                ("Scenario1", "A"),
+                ("Scenario1", "B"),
+                ("Scenario2", "C"),
+                ("Scenario2", "D"),
+                ("Scenario3", "E"),
+            ]
         )
 
-        df = pd.DataFrame(np.random.randn(4, 3), index=index, columns=columns)
-
-        file_path = os.path.join(self.temp_dir, "test_multi.xlsx")
-        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
-
-        worksheet = add_frame("MultiTest", df, workbook)
+        blocks = get_scenario_blocks(columns)
 
-        assert worksheet is not None
-        workbook.close()
+        expected = [("Scenario1", 0, 1), ("Scenario2", 2, 3), ("Scenario3", 4, 4)]
+        assert blocks == expected
 
-    def test_add_frame_with_custom_options(self):
-        """Test add_frame with custom options"""
-        df = pd.DataFrame({"A": [1.123456789, 2.987654321], "B": [np.nan, 4.555555555]})
+    def test_get_scenario_blocks_single_index(self):
+        """Test with single-level index"""
+        columns = pd.Index(["A", "B", "C"])
+        blocks = get_scenario_blocks(columns)
+        assert blocks == []
 
-        file_path = os.path.join(self.temp_dir, "test_custom.xlsx")
-        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+    def test_get_scenario_blocks_empty(self):
+        """Test with empty MultiIndex"""
+        columns = pd.MultiIndex.from_tuples([], names=["scenario", "variable"])
+        blocks = get_scenario_blocks(columns)
+        assert blocks == []
 
-        worksheet = add_frame(
-            "CustomTest",
-            df,
-            workbook,
-            column_width=[15, 20],
-            index_width=12,
-            freeze_panes=False,
-            bold_headers=False,
-            nan_as_formula=False,
-            decimal_precision=3,
+    def test_get_scenario_blocks_single_scenario(self):
+        """Test with single scenario"""
+        columns = pd.MultiIndex.from_tuples(
+            [("OnlyScenario", "A"), ("OnlyScenario", "B"), ("OnlyScenario", "C")]
         )
 
-        assert worksheet is not None
-        workbook.close()
+        blocks = get_scenario_blocks(columns)
+        expected = [("OnlyScenario", 0, 2)]
+        assert blocks == expected
 
 
 class TestAddSeries:
@@ -306,6 +431,310 @@ def test_add_series_multiindex(self):
         assert worksheet is not None
         workbook.close()
 
+    def test_add_series_no_index(self):
+        """Test adding Series without writing index"""
+        series = pd.Series([1, 2, 3], name="values")
+
+        file_path = os.path.join(self.temp_dir, "test_series_no_index.xlsx")
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        worksheet = add_series("NoIndex", series, workbook, index=False)
+
+        assert worksheet is not None
+        workbook.close()
+
+    def test_add_series_custom_widths(self):
+        """Test adding Series with custom column widths"""
+        series = pd.Series([1, 2, 3], index=["A", "B", "C"], name="values")
+
+        file_path = os.path.join(self.temp_dir, "test_series_widths.xlsx")
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        worksheet = add_series(
+            "CustomWidths", series, workbook, column_width=20, index_width=10
+        )
+
+        assert worksheet is not None
+        workbook.close()
+
+    def test_add_series_no_freeze_panes(self):
+        """Test adding Series without freezing panes"""
+        series = pd.Series([1, 2, 3], name="values")
+
+        file_path = os.path.join(self.temp_dir, "test_series_no_freeze.xlsx")
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        worksheet = add_series("NoFreeze", series, workbook, freeze_panes=False)
+
+        assert worksheet is not None
+        workbook.close()
+
+    def test_add_series_no_bold_headers(self):
+        """Test adding Series without bold headers"""
+        series = pd.Series([1, 2, 3], name="values")
+
+        file_path = os.path.join(self.temp_dir, "test_series_no_bold.xlsx")
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        worksheet = add_series("NoBold", series, workbook, bold_headers=False)
+
+        assert worksheet is not None
+        workbook.close()
+
+    def test_add_series_list_name(self):
+        """Test adding Series with tuple name (lists aren't hashable for Series names)"""
+        # Series names must be hashable, so use tuple instead of list
+        series = pd.Series([1, 2, 3], name=("part1", "part2", "part3"))
+
+        file_path = os.path.join(self.temp_dir, "test_series_tuple_name.xlsx")
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        worksheet = add_series("TupleName", series, workbook)
+
+        assert worksheet is not None
+        workbook.close()
+
+    def test_add_series_multiindex_with_index_width_list(self):
+        """Test adding Series with MultiIndex and list of index widths"""
+        index = pd.MultiIndex.from_tuples(
+            [("A", 1), ("B", 2)], names=["letter", "number"]
+        )
+        series = pd.Series([10, 20], index=index, name="values")
+
+        file_path = os.path.join(self.temp_dir, "test_series_multi_widths.xlsx")
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        worksheet = add_series("MultiWidths", series, workbook, index_width=[15, 10])
+
+        assert worksheet is not None
+        workbook.close()
+
+
+class TestAddFrame:
+    """Test add_frame function with comprehensive coverage"""
+
+    def setup_method(self):
+        """Setup test data"""
+        self.temp_dir = tempfile.mkdtemp()
+
+    def teardown_method(self):
+        """Clean up temp files"""
+        import shutil
+
+        shutil.rmtree(self.temp_dir, ignore_errors=True)
+
+    def test_add_frame_multiindex_scenario_styling(self):
+        """Test DataFrame with MultiIndex columns and scenario styling"""
+        columns = pd.MultiIndex.from_tuples(
+            [
+                ("Scenario1", "A"),
+                ("Scenario1", "B"),
+                ("Scenario2", "C"),
+                ("Scenario2", "D"),
+            ],
+            names=["scenario", "variable"],
+        )
+
+        df = pd.DataFrame(
+            [[1, 2, 3, 4], [5, 6, 7, 8]], columns=columns, index=["row1", "row2"]
+        )
+
+        file_path = os.path.join(self.temp_dir, "test_multiindex_scenario.xlsx")
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        worksheet = add_frame("MultiScenario", df, workbook, scenario_styling=True)
+
+        assert worksheet is not None
+        workbook.close()
+
+    def test_add_frame_multiindex_no_scenario_styling(self):
+        """Test DataFrame with MultiIndex columns but no scenario styling"""
+        columns = pd.MultiIndex.from_tuples(
+            [("Level1", "A"), ("Level1", "B"), ("Level2", "C")],
+            names=["level1", "level2"],
+        )
+
+        df = pd.DataFrame([[1, 2, 3]], columns=columns)
+
+        file_path = os.path.join(self.temp_dir, "test_multiindex_no_scenario.xlsx")
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        worksheet = add_frame("MultiNoScenario", df, workbook, scenario_styling=False)
+
+        assert worksheet is not None
+        workbook.close()
+
+    def test_add_frame_single_index_scenario_styling(self):
+        """Test DataFrame with single-level columns and scenario styling"""
+        df = pd.DataFrame(
+            {"Col1": [1, 2], "Col2": [3, 4], "Col3": [5, 6], "Col4": [7, 8]}
+        )
+
+        file_path = os.path.join(self.temp_dir, "test_single_scenario.xlsx")
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        worksheet = add_frame("SingleScenario", df, workbook, scenario_styling=True)
+
+        assert worksheet is not None
+        workbook.close()
+
+    def test_add_frame_single_index_no_scenario_styling(self):
+        """Test DataFrame with single-level columns and no scenario styling"""
+        df = pd.DataFrame({"A": [1, 2], "B": [3, 4]})
+
+        file_path = os.path.join(self.temp_dir, "test_single_no_scenario.xlsx")
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        worksheet = add_frame("SingleNoScenario", df, workbook, scenario_styling=False)
+
+        assert worksheet is not None
+        workbook.close()
+
+    def test_add_frame_no_index(self):
+        """Test DataFrame without writing index"""
+        df = pd.DataFrame({"A": [1, 2], "B": [3, 4]})
+
+        file_path = os.path.join(self.temp_dir, "test_no_index.xlsx")
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        worksheet = add_frame("NoIndex", df, workbook, index=False)
+
+        assert worksheet is not None
+        workbook.close()
+
+    def test_add_frame_multiindex_data_index(self):
+        """Test DataFrame with MultiIndex for rows"""
+        index = pd.MultiIndex.from_tuples([("A", 1), ("A", 2), ("B", 1)])
+        df = pd.DataFrame({"col1": [1, 2, 3], "col2": [4, 5, 6]}, index=index)
+
+        file_path = os.path.join(self.temp_dir, "test_multiindex_rows.xlsx")
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        worksheet = add_frame("MultiRows", df, workbook)
+
+        assert worksheet is not None
+        workbook.close()
+
+    def test_add_frame_index_widths_list(self):
+        """Test DataFrame with list of index widths"""
+        index = pd.MultiIndex.from_tuples([("A", 1), ("B", 2)])
+        df = pd.DataFrame({"col": [1, 2]}, index=index)
+
+        file_path = os.path.join(self.temp_dir, "test_index_widths_list.xlsx")
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        worksheet = add_frame("IndexWidthsList", df, workbook, index_width=[15, 10])
+
+        assert worksheet is not None
+        workbook.close()
+
+    def test_add_frame_no_freeze_panes(self):
+        """Test DataFrame without freezing panes"""
+        df = pd.DataFrame({"A": [1, 2], "B": [3, 4]})
+
+        file_path = os.path.join(self.temp_dir, "test_no_freeze_panes.xlsx")
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        worksheet = add_frame("NoFreeze", df, workbook, freeze_panes=False)
+
+        assert worksheet is not None
+        workbook.close()
+
+    def test_add_frame_no_bold_headers(self):
+        """Test DataFrame without bold headers"""
+        df = pd.DataFrame({"A": [1, 2], "B": [3, 4]})
+
+        file_path = os.path.join(self.temp_dir, "test_no_bold.xlsx")
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        worksheet = add_frame("NoBold", df, workbook, bold_headers=False)
+
+        assert worksheet is not None
+        workbook.close()
+
+    def test_add_frame_custom_precision(self):
+        """Test DataFrame with custom decimal precision"""
+        df = pd.DataFrame({"A": [1.123456789], "B": [2.987654321]})
+
+        file_path = os.path.join(self.temp_dir, "test_precision.xlsx")
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        worksheet = add_frame("Precision", df, workbook, decimal_precision=3)
+
+        assert worksheet is not None
+        workbook.close()
+
+    def test_add_frame_nan_as_text(self):
+        """Test DataFrame with NaN values as text"""
+        df = pd.DataFrame({"A": [1, np.nan], "B": [np.nan, 2]})
+
+        file_path = os.path.join(self.temp_dir, "test_nan_text.xlsx")
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        worksheet = add_frame("NaNText", df, workbook, nan_as_formula=False)
+
+        assert worksheet is not None
+        workbook.close()
+
+    def test_add_frame_multiindex_columns_no_names(self):
+        """Test DataFrame with MultiIndex columns having no names"""
+        columns = pd.MultiIndex.from_tuples([("A", 1), ("B", 2)])
+        df = pd.DataFrame([[1, 2]], columns=columns)
+
+        file_path = os.path.join(self.temp_dir, "test_multiindex_no_col_names.xlsx")
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        worksheet = add_frame("MultiNoColNames", df, workbook)
+
+        assert worksheet is not None
+        workbook.close()
+
+    def test_add_frame_multiindex_columns_partial_names(self):
+        """Test DataFrame with MultiIndex columns having partial names"""
+        columns = pd.MultiIndex.from_tuples(
+            [("A", 1), ("B", 2)], names=["level1", None]
+        )
+        df = pd.DataFrame([[1, 2]], columns=columns)
+
+        file_path = os.path.join(
+            self.temp_dir, "test_multiindex_partial_col_names.xlsx"
+        )
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        worksheet = add_frame("MultiPartialColNames", df, workbook)
+
+        assert worksheet is not None
+        workbook.close()
+
+    def test_add_frame_single_scenario_block(self):
+        """Test DataFrame with single scenario in MultiIndex"""
+        columns = pd.MultiIndex.from_tuples(
+            [("OnlyScenario", "A"), ("OnlyScenario", "B")]
+        )
+        df = pd.DataFrame([[1, 2]], columns=columns)
+
+        file_path = os.path.join(self.temp_dir, "test_single_scenario_block.xlsx")
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        worksheet = add_frame(
+            "SingleScenarioBlock", df, workbook, scenario_styling=True
+        )
+
+        assert worksheet is not None
+        workbook.close()
+
+    def test_add_frame_empty_dataframe(self):
+        """Test with empty DataFrame"""
+        df = pd.DataFrame()
+
+        file_path = os.path.join(self.temp_dir, "test_empty.xlsx")
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        worksheet = add_frame("Empty", df, workbook)
+
+        assert worksheet is not None
+        workbook.close()
+
 
 class TestIntegration:
 
@@ -372,3 +801,424 @@ def test_edge_cases(self):
         workbook.close()
 
         assert os.path.exists(file_path)
+
+    def test_complex_multiindex_scenario(self):
+        """Test complex scenario with multiple MultiIndex features"""
+        # Create complex MultiIndex for both rows and columns
+        row_index = pd.MultiIndex.from_tuples(
+            [
+                ("Region1", "City1"),
+                ("Region1", "City2"),
+                ("Region2", "City3"),
+                ("Region2", "City4"),
+            ],
+            names=["Region", "City"],
+        )
+
+        col_index = pd.MultiIndex.from_tuples(
+            [
+                ("Scenario1", "Metric1"),
+                ("Scenario1", "Metric2"),
+                ("Scenario2", "Metric1"),
+                ("Scenario2", "Metric2"),
+                ("Scenario3", "Metric1"),
+            ],
+            names=["Scenario", "Metric"],
+        )
+
+        df = pd.DataFrame(np.random.rand(4, 5), index=row_index, columns=col_index)
+
+        # Add some NaN values
+        df.iloc[1, 2] = np.nan
+        df.iloc[3, 4] = np.nan
+
+        file_path = os.path.join(self.temp_dir, "complex_multiindex.xlsx")
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        worksheet = add_frame(
+            "ComplexMulti",
+            df,
+            workbook,
+            scenario_styling=True,
+            column_width=[12, 15, 10, 8, 20],
+            index_width=[15, 12],
+            decimal_precision=4,
+        )
+
+        assert worksheet is not None
+        workbook.close()
+
+    def test_all_formatting_options(self):
+        """Test all formatting and styling options together"""
+        df = pd.DataFrame(
+            {
+                "A": [1.123456789, np.nan, 3.987654321],
+                "B": [np.nan, 2.555555555, 4.111111111],
+                "C": [5.999999999, 6.000000001, np.nan],
+            },
+            index=["row1", "row2", "row3"],
+        )
+
+        file_path = os.path.join(self.temp_dir, "all_formatting.xlsx")
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        # Test with all options enabled
+        worksheet = add_frame(
+            "AllFormatting",
+            df,
+            workbook,
+            index=True,
+            column_width=15,
+            index_width=12,
+            freeze_panes=True,
+            bold_headers=True,
+            nan_as_formula=True,
+            decimal_precision=6,
+            scenario_styling=True,
+        )
+
+        assert worksheet is not None
+        workbook.close()
+
+    def test_mixed_data_types(self):
+        """Test DataFrame with mixed data types"""
+        df = pd.DataFrame(
+            {
+                "integers": [1, 2, 3],
+                "floats": [1.1, 2.2, np.nan],
+                "strings": ["a", "b", "c"],
+                "booleans": [True, False, True],
+                "dates": pd.date_range("2024-01-01", periods=3),
+            }
+        )
+
+        file_path = os.path.join(self.temp_dir, "mixed_types.xlsx")
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        worksheet = add_frame("MixedTypes", df, workbook)
+
+        assert worksheet is not None
+        workbook.close()
+
+    def test_very_large_precision_values(self):
+        """Test with very large numbers and high precision"""
+        df = pd.DataFrame(
+            {
+                "large_numbers": [1234567890.123456789, 9876543210.987654321],
+                "small_numbers": [0.000000001, 0.000000002],
+            }
+        )
+
+        file_path = os.path.join(self.temp_dir, "large_precision.xlsx")
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        worksheet = add_frame("LargePrecision", df, workbook, decimal_precision=15)
+
+        assert worksheet is not None
+        workbook.close()
+
+
+class TestErrorConditions:
+    """Test error conditions and edge cases"""
+
+    def setup_method(self):
+        """Setup test data"""
+        self.temp_dir = tempfile.mkdtemp()
+
+    def teardown_method(self):
+        """Clean up temp files"""
+        import shutil
+
+        shutil.rmtree(self.temp_dir, ignore_errors=True)
+
+    def test_column_width_list_mismatch(self):
+        """Test error when column width list doesn't match column count"""
+        df = pd.DataFrame({"A": [1], "B": [2], "C": [3]})
+
+        file_path = os.path.join(self.temp_dir, "width_mismatch.xlsx")
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        with pytest.raises(ValueError, match="Expected 3 widths, got 2"):
+            add_frame("WidthMismatch", df, workbook, column_width=[10, 15])
+
+        workbook.close()
+
+    def test_index_width_list_mismatch(self):
+        """Test error when index width list doesn't match index levels"""
+        index = pd.MultiIndex.from_tuples([("A", 1), ("B", 2)])
+        df = pd.DataFrame({"col": [1, 2]}, index=index)
+
+        file_path = os.path.join(self.temp_dir, "index_width_mismatch.xlsx")
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        with pytest.raises(ValueError, match="Expected 2 widths, got 1"):
+            add_frame("IndexWidthMismatch", df, workbook, index_width=[10])
+
+        workbook.close()
+
+    def test_series_index_width_mismatch(self):
+        """Test error when series index width list doesn't match index levels"""
+        index = pd.MultiIndex.from_tuples([("A", 1), ("B", 2)])
+        series = pd.Series([1, 2], index=index)
+
+        file_path = os.path.join(self.temp_dir, "series_width_mismatch.xlsx")
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        with pytest.raises(ValueError, match="Expected 2 widths, got 3"):
+            add_series(
+                "SeriesWidthMismatch", series, workbook, index_width=[10, 15, 20]
+            )
+
+        workbook.close()
+
+
+class TestScenarioStylingEdgeCases:
+    """Test edge cases in scenario styling"""
+
+    def setup_method(self):
+        """Setup test data"""
+        self.temp_dir = tempfile.mkdtemp()
+
+    def teardown_method(self):
+        """Clean up temp files"""
+        import shutil
+
+        shutil.rmtree(self.temp_dir, ignore_errors=True)
+
+    def test_odd_number_of_scenario_blocks(self):
+        """Test scenario styling with odd number of blocks"""
+        columns = pd.MultiIndex.from_tuples(
+            [("Scenario1", "A"), ("Scenario2", "B"), ("Scenario3", "C")]
+        )
+        df = pd.DataFrame([[1, 2, 3]], columns=columns)
+
+        file_path = os.path.join(self.temp_dir, "odd_scenarios.xlsx")
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        worksheet = add_frame("OddScenarios", df, workbook, scenario_styling=True)
+
+        assert worksheet is not None
+        workbook.close()
+
+    def test_single_column_per_scenario(self):
+        """Test scenario styling with single column per scenario"""
+        columns = pd.MultiIndex.from_tuples(
+            [
+                ("Scenario1", "A"),
+                ("Scenario2", "B"),
+                ("Scenario3", "C"),
+                ("Scenario4", "D"),
+            ]
+        )
+        df = pd.DataFrame([[1, 2, 3, 4]], columns=columns)
+
+        file_path = os.path.join(self.temp_dir, "single_col_scenarios.xlsx")
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        worksheet = add_frame("SingleColScenarios", df, workbook, scenario_styling=True)
+
+        assert worksheet is not None
+        workbook.close()
+
+    def test_uneven_scenario_blocks(self):
+        """Test scenario styling with uneven block sizes"""
+        columns = pd.MultiIndex.from_tuples(
+            [
+                ("Scenario1", "A"),
+                ("Scenario1", "B"),
+                ("Scenario1", "C"),  # 3 columns
+                ("Scenario2", "D"),  # 1 column
+                ("Scenario3", "E"),
+                ("Scenario3", "F"),  # 2 columns
+            ]
+        )
+        df = pd.DataFrame([[1, 2, 3, 4, 5, 6]], columns=columns)
+
+        file_path = os.path.join(self.temp_dir, "uneven_scenarios.xlsx")
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        worksheet = add_frame("UnevenScenarios", df, workbook, scenario_styling=True)
+
+        assert worksheet is not None
+        workbook.close()
+
+
+class TestWorksheetNameHandling:
+    """Test worksheet name handling edge cases"""
+
+    def setup_method(self):
+        """Setup test data"""
+        self.temp_dir = tempfile.mkdtemp()
+
+    def teardown_method(self):
+        """Clean up temp files"""
+        import shutil
+
+        shutil.rmtree(self.temp_dir, ignore_errors=True)
+
+    def test_numeric_worksheet_name(self):
+        """Test with numeric worksheet name"""
+        df = pd.DataFrame({"A": [1, 2]})
+
+        file_path = os.path.join(self.temp_dir, "numeric_name.xlsx")
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        worksheet = add_frame(123, df, workbook)
+
+        assert worksheet is not None
+        assert worksheet.name == "123"
+        workbook.close()
+
+    def test_float_worksheet_name(self):
+        """Test with float worksheet name"""
+        df = pd.DataFrame({"A": [1, 2]})
+
+        file_path = os.path.join(self.temp_dir, "float_name.xlsx")
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        worksheet = add_frame(45.67, df, workbook)
+
+        assert worksheet is not None
+        assert worksheet.name == "45.67"
+        workbook.close()
+
+    def test_none_worksheet_name(self):
+        """Test with None worksheet name"""
+        df = pd.DataFrame({"A": [1, 2]})
+
+        file_path = os.path.join(self.temp_dir, "none_name.xlsx")
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        worksheet = add_frame(None, df, workbook)
+
+        assert worksheet is not None
+        assert worksheet.name == "None"
+        workbook.close()
+
+    def test_series_numeric_worksheet_name(self):
+        """Test Series with numeric worksheet name"""
+        series = pd.Series([1, 2, 3], name="values")
+
+        file_path = os.path.join(self.temp_dir, "series_numeric_name.xlsx")
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        worksheet = add_series(999, series, workbook)
+
+        assert worksheet is not None
+        assert worksheet.name == "999"
+        workbook.close()
+
+
+class TestAdditionalCoverageEdgeCases:
+    """Additional tests to ensure 100% coverage"""
+
+    def setup_method(self):
+        """Setup test data"""
+        self.temp_dir = tempfile.mkdtemp()
+
+    def teardown_method(self):
+        """Clean up temp files"""
+        import shutil
+
+        shutil.rmtree(self.temp_dir, ignore_errors=True)
+
+    def test_add_frame_multiindex_no_scenario_data_writing(self):
+        """Test MultiIndex DataFrame data writing without scenario styling"""
+        columns = pd.MultiIndex.from_tuples(
+            [("Level1", "A"), ("Level1", "B"), ("Level2", "C")],
+            names=["level1", "level2"],
+        )
+
+        df = pd.DataFrame(
+            [[1.1, 2.2, 3.3], [4.4, 5.5, 6.6]], columns=columns, index=["row1", "row2"]
+        )
+
+        file_path = os.path.join(self.temp_dir, "test_multiindex_data_writing.xlsx")
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        worksheet = add_frame("MultiData", df, workbook, scenario_styling=False)
+
+        assert worksheet is not None
+        workbook.close()
+
+    def test_scenario_blocks_next_function_edge_case(self):
+        """Test the next() function edge case in scenario block detection"""
+        columns = pd.MultiIndex.from_tuples(
+            [
+                ("Scenario1", "A"),
+                ("Scenario1", "B"),
+                ("Scenario2", "C"),
+                ("Scenario2", "D"),
+            ]
+        )
+        df = pd.DataFrame([[1, 2, 3, 4]], columns=columns)
+
+        file_path = os.path.join(self.temp_dir, "test_scenario_next.xlsx")
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        # This should exercise the scenario_idx calculation in both header and data writing
+        worksheet = add_frame("ScenarioNext", df, workbook, scenario_styling=True)
+
+        assert worksheet is not None
+        workbook.close()
+
+    def test_column_width_fallback_to_default(self):
+        """Test when index_width falls back to column_width"""
+        df = pd.DataFrame({"A": [1, 2]}, index=["x", "y"])
+
+        file_path = os.path.join(self.temp_dir, "test_width_fallback.xlsx")
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        # index_width=None should fall back to column_width
+        worksheet = add_frame(
+            "WidthFallback", df, workbook, column_width=20, index_width=None
+        )
+
+        assert worksheet is not None
+        workbook.close()
+
+    def test_series_column_width_setting(self):
+        """Test series column width setting when column_width is None"""
+        series = pd.Series([1, 2, 3], name="test")
+
+        file_path = os.path.join(self.temp_dir, "test_series_no_width.xlsx")
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        worksheet = add_series("SeriesNoWidth", series, workbook, column_width=None)
+
+        assert worksheet is not None
+        workbook.close()
+
+    def test_series_index_width_fallback(self):
+        """Test series index width fallback to column width"""
+        series = pd.Series([1, 2, 3], index=["a", "b", "c"], name="test")
+
+        file_path = os.path.join(self.temp_dir, "test_series_index_fallback.xlsx")
+        workbook = Workbook(file_path, {"nan_inf_to_errors": True})
+
+        # index_width=None should fall back to column_width
+        worksheet = add_series(
+            "SeriesIndexFallback", series, workbook, column_width=15, index_width=None
+        )
+
+        assert worksheet is not None
+        workbook.close()
+
+    def test_get_scenario_blocks_edge_coverage(self):
+        """Test get_scenario_blocks function edge cases for complete coverage"""
+        # Test completely empty MultiIndex
+        empty_columns = pd.MultiIndex.from_tuples([], names=["scenario", "variable"])
+        blocks = get_scenario_blocks(empty_columns)
+        assert blocks == []
+
+        # Test with repeating scenario changes
+        columns = pd.MultiIndex.from_tuples(
+            [("A", "1"), ("B", "1"), ("A", "2"), ("B", "2"), ("A", "3")]
+        )
+        blocks = get_scenario_blocks(columns)
+        expected = [("A", 0, 0), ("B", 1, 1), ("A", 2, 2), ("B", 3, 3), ("A", 4, 4)]
+        assert blocks == expected
+
+
+if __name__ == "__main__":
+    pytest.main([__file__, "-v", "--tb=short"])
diff --git a/tests/utils/test_pyetm_paths.py b/tests/utils/test_pyetm_paths.py
new file mode 100644
index 0000000..966d711
--- /dev/null
+++ b/tests/utils/test_pyetm_paths.py
@@ -0,0 +1,326 @@
+import pytest
+from pathlib import Path
+import tempfile
+import shutil
+from unittest.mock import patch
+
+from pyetm.utils.paths import PyetmPaths
+
+
+class TestPyetmPaths:
+
+    @pytest.fixture
+    def temp_project_structure(self):
+        """Create a temporary project structure for testing."""
+        with tempfile.TemporaryDirectory() as temp_dir:
+            temp_path = Path(temp_dir)
+
+            # Create project structure
+            project_root = temp_path / "project"
+            project_root.mkdir()
+
+            inputs_dir = project_root / "inputs"
+            outputs_dir = project_root / "outputs"
+            inputs_dir.mkdir()
+            outputs_dir.mkdir()
+
+            # Create some test files
+            (inputs_dir / "test_file.txt").write_text("test content")
+            (inputs_dir / "subdir").mkdir()
+            (inputs_dir / "subdir" / "nested_file.txt").write_text("nested content")
+
+            yield {
+                "temp_dir": temp_path,
+                "project_root": project_root,
+                "inputs_dir": inputs_dir,
+                "outputs_dir": outputs_dir,
+            }
+
+    def test_init_default(self):
+        """Test PyetmPaths initialization with default parameters."""
+        paths = PyetmPaths()
+        assert paths._start == Path.cwd()
+
+    def test_init_with_start_path(self):
+        """Test PyetmPaths initialization with custom start path."""
+        start_path = Path("/custom/start")
+        paths = PyetmPaths(start=start_path)
+        assert paths._start == start_path
+
+    def test_init_with_string_start(self):
+        """Test PyetmPaths initialization with string start path."""
+        start_str = "/custom/start"
+        paths = PyetmPaths(start=start_str)
+        assert paths._start == Path(start_str)
+
+    def test_find_root_with_existing_dir(self, temp_project_structure):
+        """Test _find_root_with when the directory exists."""
+        project_root = temp_project_structure["project_root"]
+
+        result = PyetmPaths._find_root_with("inputs", project_root)
+        assert result == project_root
+
+    def test_find_root_with_nonexistent_dir(self):
+        """Test _find_root_with when directory doesn't exist."""
+        with tempfile.TemporaryDirectory() as temp_dir:
+            temp_path = Path(temp_dir)
+            result = PyetmPaths._find_root_with("nonexistent", temp_path)
+            # Should return the start directory when nothing is found
+            assert result == temp_path
+
+    def test_find_root_with_parent_search(self, temp_project_structure):
+        """Test _find_root_with searches parent directories."""
+        project_root = temp_project_structure["project_root"]
+        subdir = project_root / "deep" / "nested" / "path"
+        subdir.mkdir(parents=True)
+
+        result = PyetmPaths._find_root_with("inputs", subdir)
+        assert result == project_root
+
+    def test_find_root_with_permission_error(self):
+        """Test _find_root_with handles permission errors gracefully."""
+        with tempfile.TemporaryDirectory() as temp_dir:
+            temp_path = Path(temp_dir)
+
+            # Mock Path.exists to raise an exception
+            with patch.object(
+                Path, "exists", side_effect=PermissionError("Access denied")
+            ):
+                result = PyetmPaths._find_root_with("inputs", temp_path)
+                assert result == temp_path
+
+    def test_inputs_dir(self, temp_project_structure):
+        """Test inputs_dir method."""
+        project_root = temp_project_structure["project_root"]
+        paths = PyetmPaths(start=project_root)
+
+        result = paths.inputs_dir()
+        assert result == project_root / "inputs"
+        assert result.exists()
+
+    def test_outputs_dir(self, temp_project_structure):
+        """Test outputs_dir method."""
+        project_root = temp_project_structure["project_root"]
+        paths = PyetmPaths(start=project_root)
+
+        result = paths.outputs_dir()
+        assert result == project_root / "outputs"
+        assert result.exists()
+
+    def test_resolve_for_read_absolute_path(self):
+        """Test resolve_for_read with absolute path."""
+        paths = PyetmPaths()
+        abs_path = Path("/absolute/path/file.txt")
+
+        result = paths.resolve_for_read(abs_path)
+        assert result == abs_path
+
+    def test_resolve_for_read_existing_relative_path(self, temp_project_structure):
+        """Test resolve_for_read with existing relative path."""
+        project_root = temp_project_structure["project_root"]
+        paths = PyetmPaths(start=project_root)
+
+        # Create a file in the current directory relative to project_root
+        test_file = project_root / "local_file.txt"
+        test_file.write_text("local content")
+
+        with patch("pathlib.Path.cwd", return_value=project_root):
+            result = paths.resolve_for_read("local_file.txt")
+            assert result == Path("local_file.txt")
+
+    def test_resolve_for_read_nonexistent_relative_path_found_in_inputs(
+        self, temp_project_structure
+    ):
+        """Test resolve_for_read with nonexistent relative path that exists in inputs."""
+        project_root = temp_project_structure["project_root"]
+        paths = PyetmPaths(start=project_root)
+
+        result = paths.resolve_for_read("test_file.txt")
+        assert result == project_root / "inputs" / "test_file.txt"
+        assert result.exists()
+
+    def test_resolve_for_read_nonexistent_relative_path_not_found(
+        self, temp_project_structure
+    ):
+        """Test resolve_for_read with nonexistent relative path that doesn't exist anywhere."""
+        project_root = temp_project_structure["project_root"]
+        paths = PyetmPaths(start=project_root)
+
+        result = paths.resolve_for_read("nonexistent.txt")
+        # Should return the original path when not found
+        assert result == Path("nonexistent.txt")
+
+    def test_resolve_for_read_with_subdirectory(self, temp_project_structure):
+        """Test resolve_for_read with subdirectory paths."""
+        project_root = temp_project_structure["project_root"]
+        paths = PyetmPaths(start=project_root)
+
+        result = paths.resolve_for_read("subdir/nested_file.txt")
+        assert result == project_root / "inputs" / "subdir" / "nested_file.txt"
+        assert result.exists()
+
+    def test_resolve_for_read_custom_default_dir(self, temp_project_structure):
+        """Test resolve_for_read with custom default directory."""
+        project_root = temp_project_structure["project_root"]
+        custom_dir = project_root / "custom"
+        custom_dir.mkdir()
+        (custom_dir / "custom_file.txt").write_text("custom content")
+
+        paths = PyetmPaths(start=project_root)
+        result = paths.resolve_for_read("custom_file.txt", default_dir="custom")
+        assert result == custom_dir / "custom_file.txt"
+        assert result.exists()
+
+    def test_resolve_for_read_string_input(self, temp_project_structure):
+        """Test resolve_for_read with string input."""
+        project_root = temp_project_structure["project_root"]
+        paths = PyetmPaths(start=project_root)
+
+        result = paths.resolve_for_read("test_file.txt")
+        assert result == project_root / "inputs" / "test_file.txt"
+        assert result.exists()
+
+    def test_resolve_for_write_absolute_path(self):
+        """Test resolve_for_write with absolute path."""
+        with tempfile.TemporaryDirectory() as temp_dir:
+            paths = PyetmPaths()
+            abs_path = Path(temp_dir) / "output.txt"
+
+            result = paths.resolve_for_write(abs_path)
+            assert result == abs_path
+            # Parent should be created
+            assert result.parent.exists()
+
+    def test_resolve_for_write_absolute_path_no_create_parents(self):
+        """Test resolve_for_write with absolute path and create_parents=False."""
+        with tempfile.TemporaryDirectory() as temp_dir:
+            paths = PyetmPaths()
+            abs_path = Path(temp_dir) / "nested" / "deep" / "output.txt"
+
+            result = paths.resolve_for_write(abs_path, create_parents=False)
+            assert result == abs_path
+            # Parent should NOT be created
+            assert not result.parent.exists()
+
+    def test_resolve_for_write_relative_path(self, temp_project_structure):
+        """Test resolve_for_write with relative path."""
+        project_root = temp_project_structure["project_root"]
+        paths = PyetmPaths(start=project_root)
+
+        result = paths.resolve_for_write("output.txt")
+        assert result == project_root / "outputs" / "output.txt"
+        assert result.parent.exists()
+
+    def test_resolve_for_write_relative_path_with_subdirs(self, temp_project_structure):
+        """Test resolve_for_write with relative path containing subdirectories."""
+        project_root = temp_project_structure["project_root"]
+        paths = PyetmPaths(start=project_root)
+
+        result = paths.resolve_for_write("subdir/nested/output.txt")
+        expected = project_root / "outputs" / "subdir" / "nested" / "output.txt"
+        assert result == expected
+        assert result.parent.exists()
+
+    def test_resolve_for_write_custom_default_dir(self, temp_project_structure):
+        """Test resolve_for_write with custom default directory."""
+        project_root = temp_project_structure["project_root"]
+        paths = PyetmPaths(start=project_root)
+
+        result = paths.resolve_for_write("output.txt", default_dir="custom")
+        expected = project_root / "custom" / "output.txt"
+        assert result == expected
+        assert result.parent.exists()
+
+    def test_resolve_for_write_string_input(self, temp_project_structure):
+        """Test resolve_for_write with string input."""
+        project_root = temp_project_structure["project_root"]
+        paths = PyetmPaths(start=project_root)
+
+        result = paths.resolve_for_write("output.txt")
+        assert result == project_root / "outputs" / "output.txt"
+        assert result.parent.exists()
+
+    def test_pathlike_type_annotation(self):
+        """Test that PathLikeOrStr type annotation works correctly."""
+        paths = PyetmPaths()
+
+        # Test with string
+        result1 = paths.resolve_for_read("test.txt")
+        assert isinstance(result1, Path)
+
+        # Test with Path
+        result2 = paths.resolve_for_read(Path("test.txt"))
+        assert isinstance(result2, Path)
+
+    def test_edge_case_empty_string(self, temp_project_structure):
+        """Test edge case with empty string path."""
+        project_root = temp_project_structure["project_root"]
+        paths = PyetmPaths(start=project_root)
+
+        result = paths.resolve_for_read("")
+        # Empty string should be treated as current directory
+        assert result == Path("")
+
+    def test_edge_case_dot_path(self, temp_project_structure):
+        """Test edge case with dot (current directory) path."""
+        project_root = temp_project_structure["project_root"]
+        paths = PyetmPaths(start=project_root)
+
+        with patch("pathlib.Path.cwd", return_value=project_root):
+            result = paths.resolve_for_read(".")
+            assert result == Path(".")
+
+    def test_complex_project_structure(self):
+        """Test with a more complex, realistic project structure."""
+        with tempfile.TemporaryDirectory() as temp_dir:
+            temp_path = Path(temp_dir)
+
+            # Create nested project structure
+            project = temp_path / "my_project"
+            project.mkdir()
+            (project / "inputs").mkdir()
+            (project / "outputs").mkdir()
+
+            src = project / "src" / "deep" / "nested"
+            src.mkdir(parents=True)
+
+            # Test from deep nested location
+            paths = PyetmPaths(start=src)
+
+            inputs_dir = paths.inputs_dir()
+            outputs_dir = paths.outputs_dir()
+
+            assert inputs_dir == project / "inputs"
+            assert outputs_dir == project / "outputs"
+
+    @pytest.mark.parametrize(
+        "path_input,expected_type",
+        [
+            ("string_path.txt", str),
+            (Path("path_object.txt"), Path),
+        ],
+    )
+    def test_path_input_types(self, path_input, expected_type, temp_project_structure):
+        """Test that both string and Path inputs are handled correctly."""
+        project_root = temp_project_structure["project_root"]
+        paths = PyetmPaths(start=project_root)
+
+        result_read = paths.resolve_for_read(path_input)
+        result_write = paths.resolve_for_write(path_input)
+
+        assert isinstance(result_read, Path)
+        assert isinstance(result_write, Path)
+
+    def test_concurrent_access_safety(self, temp_project_structure):
+        """Test that the class behaves correctly with multiple instances."""
+        project_root = temp_project_structure["project_root"]
+
+        paths1 = PyetmPaths(start=project_root)
+        paths2 = PyetmPaths(start=project_root / "inputs")
+
+        result1 = paths1.resolve_for_read("test_file.txt")
+        result2 = paths2.resolve_for_read("test_file.txt")
+
+        # Both should work independently
+        assert isinstance(result1, Path)
+        assert isinstance(result2, Path)