udata-hydra-csvapi 0.3.2.dev4__py3-none-any.whl → 0.3.2.dev8__py3-none-any.whl

api_tabular/__init__.py

@@ -1,12 +1,13 @@
 import os
 import tomllib
 from pathlib import Path
+from typing import Any
 
 
 class Configurator:
     """Loads a dict of config from TOML file(s) and behaves like an object, ie config.VALUE"""
 
-    configuration = None
+    configuration: dict[str, Any] | None = None
 
     def __init__(self):
         if not self.configuration:
@@ -27,6 +28,8 @@ class Configurator:
         for config_key in configuration:
             if config_key in os.environ:
                 value = os.getenv(config_key)
+                if value is None:
+                    continue
                 # Casting env value
                 if isinstance(configuration[config_key], list):
                     value = value.split(",")
@@ -46,6 +49,7 @@ class Configurator:
         self.check()
 
     def override(self, **kwargs):
+        assert self.configuration is not None
         self.configuration.update(kwargs)
         self.check()
 
@@ -54,10 +58,12 @@ class Configurator:
         pass
 
     def __getattr__(self, __name):
+        assert self.configuration is not None
         return self.configuration.get(__name)
 
     @property
     def __dict__(self):
+        assert self.configuration is not None
         return self.configuration
 
 

api_tabular/core/data.py

@@ -1,6 +1,5 @@
-from typing import AsyncGenerator
-
 from aiohttp import ClientSession, web
+from aiohttp.web import StreamResponse
 from aiohttp.web_request import Request
 
 from api_tabular import config
@@ -14,7 +13,7 @@ async def stream_data(
     url: str,
     accept_format: str,
     response_headers: dict,
-) -> AsyncGenerator[bytes, None]:
+) -> StreamResponse:
     res = await session.head(f"{url}&limit=1&", headers={"Prefer": "count=exact"})
     if not res.ok:
         handle_exception(res.status, "Database error", await res.json(), None)

api_tabular/core/swagger.py

@@ -1,3 +1,5 @@
+from typing import cast
+
 import yaml
 
 from api_tabular.core.utils import is_aggregation_allowed
@@ -196,14 +198,16 @@ def swagger_parameters(resource_columns: dict, resource_id: str) -> list:
             ):
                 continue
             if op in TYPE_POSSIBILITIES[value["python_type"]]:
+                op_name = cast(str, OPERATORS_DESCRIPTIONS[op]["name"])
+                op_description = cast(str, OPERATORS_DESCRIPTIONS[op]["description"])
                 parameters_list.extend(
                     [
                         {
-                            "name": OPERATORS_DESCRIPTIONS[op]["name"].format(key),
+                            "name": op_name.format(key),
                             "in": "query",
                             "description": (
-                                (s := OPERATORS_DESCRIPTIONS[op]["description"]).format(
-                                    *[key for _ in range(s.count("{}"))]
+                                op_description.format(
+                                    *[key for _ in range(op_description.count("{}"))]
                                 )
                             ),
                             "required": False,

api_tabular/core/url.py

@@ -20,4 +20,4 @@ def url_for(request: Request, route: str, *args, **kwargs) -> str:
     router = request.app.router
     if kwargs.pop("_external", None):
         return external_url(router[route].url_for(**kwargs))
-    return router[route].url_for(**kwargs)
+    return str(router[route].url_for(**kwargs))

api_tabular/core/utils.py

@@ -1,3 +1,4 @@
+from aiohttp.client import ClientResponse
 from aiohttp.web_response import Response
 
 from api_tabular import config
@@ -8,10 +9,12 @@ def is_aggregation_allowed(resource_id: str) -> bool:
     return resource_id in config.ALLOW_AGGREGATION
 
 
-def process_total(res: Response) -> int:
+def process_total(res: Response | ClientResponse) -> int:
     # the Content-Range looks like this: '0-49/21777'
     # see https://docs.postgrest.org/en/stable/references/api/pagination_count.html
     raw_total = res.headers.get("Content-Range")
+    if raw_total is None:
+        raise ValueError("Missing Content-Range header")
     _, str_total = raw_total.split("/")
     return int(str_total)
 

{udata_hydra_csvapi-0.3.2.dev4.dist-info → udata_hydra_csvapi-0.3.2.dev8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: udata-hydra-csvapi
-Version: 0.3.2.dev4
+Version: 0.3.2.dev8
 Summary: API for CSV converted by udata-hydra
 Author-email: "data.gouv.fr" <opendatateam@data.gouv.fr>
 License-Expression: MIT
@@ -538,15 +538,20 @@ Tests are automatically run in CI/CD. See [`.circleci/config.yml`](.circleci/con
 
 ## 🤝 Contributing
 
-### 🧹 Code Linting and Formatting
+### 🧹 Code Linting, Formatting and Type Checking
 
-This project follows PEP 8 style guidelines using [Ruff](https://astral.sh/ruff/) for linting and formatting. **Either running these commands manually or installing the pre-commit hook is required before submitting contributions.**
+This project follows PEP 8 style guidelines using [Ruff](https://astral.sh/ruff/) for linting and formatting, and [ty](https://docs.astral.sh/ty/) for type checking. **Either running these commands manually or installing the pre-commit hook is required before submitting contributions.**
 
 ```shell
 # Lint (including import sorting) and format code
 uv run ruff check --fix && uv run ruff format
+
+# Type check (ty)
+uv run ty check
 ```
 
+By default `ty check` checks the project root; pass paths to check specific files or directories. See the [ty CLI reference](https://docs.astral.sh/ty/reference/cli/) for options.
+
 ### 🔗 Pre-commit Hooks
 
 This repository uses a [pre-commit](https://pre-commit.com/) hook which lint and format code before each commit. **Installing the pre-commit hook is required for contributions.**

{udata_hydra_csvapi-0.3.2.dev4.dist-info → udata_hydra_csvapi-0.3.2.dev8.dist-info}/RECORD

@@ -1,22 +1,22 @@
-api_tabular/__init__.py,sha256=QgIzdXI5gOJ1NDR8yX5KEuorArg79D3HujIOXrgjzgo,2078
+api_tabular/__init__.py,sha256=Qso9RRp2-D3hxKwsx4jjBG0LRxHOP699ZuI4v188Om4,2325
 api_tabular/config_default.toml,sha256=3zQMpzr87qwd23dG_scGUptj0T3IUOjaHecI4ppJBqY,384
 api_tabular/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-api_tabular/core/data.py,sha256=VYzrrKg40TSmdTVYV2t85sUnJItcvV2iAS4DpSFefaE,1469
+api_tabular/core/data.py,sha256=5j-3d_el7LMoHpn6V__UdhYHD6GiJbwdH67jrnOYWZQ,1459
 api_tabular/core/error.py,sha256=xRt6fkQfsiupv0tWWzdX0DJjAKbw1n0tRxFyt15VBLA,1062
 api_tabular/core/health.py,sha256=5VAgsu2t1Ave9n3YduzM3E7aUflBJ3pY1LUrrjT-d6w,775
 api_tabular/core/query.py,sha256=m98cO16mVkz0cSNICesgjC8MNVEfDW_645sz-DTd2Pw,5576
 api_tabular/core/sentry.py,sha256=fN5MrDZszLnzLXF3b_nUymPVB0ffNn4PI7xS1GtJNyE,948
-api_tabular/core/swagger.py,sha256=cehCCC6K8n5qELG-b5QsQObNGj6DOBMPkROhssYVLyY,14049
-api_tabular/core/url.py,sha256=heMenA-0kx2GNcCPF2ViDBZMDFkdT03Jzunm4WadAc8,756
-api_tabular/core/utils.py,sha256=06dBcGgP7Zrhy1nnS2AHhILqLy_wNsuQcWyJp01fRVY,887
+api_tabular/core/swagger.py,sha256=0RZFu941CD3qWt2R6e3nnlcrkYjjAHU5eOFl4jH2liA,14188
+api_tabular/core/url.py,sha256=af7VKfrMtKMzlHrGgtLDLuRBim4qFv7xlt2PYxAyW2g,761
+api_tabular/core/utils.py,sha256=SWU1gVkOq728-eZHmZzlyA3pQg6kelEf3SMlL-uEbns,1032
 api_tabular/core/version.py,sha256=OKLg0l1CpDRHV2hsqVgtSihoo3tg0aMG6kzMILtQ-bY,250
 api_tabular/metrics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 api_tabular/metrics/app.py,sha256=5kZXzAiFh1tSNYO5GEz67m4zTsTVyoIkgcelDGyT1zE,4637
 api_tabular/tabular/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 api_tabular/tabular/app.py,sha256=JgqL1svglQ_fD5ndhft_Cm7HmTh5FuyoxYUPGS1_l-o,6771
 api_tabular/tabular/utils.py,sha256=BL2nl04-3imBQG-RZiYvVMjxoBORi4lwrKq8NiWecLY,4487
-udata_hydra_csvapi-0.3.2.dev4.dist-info/licenses/LICENSE,sha256=fb-HAYw94ffh--z1cZrWbpk6YKM0p9WFG7kdd0K7uGQ,1062
-udata_hydra_csvapi-0.3.2.dev4.dist-info/METADATA,sha256=k5cWClk8rVaOfftCDrNX-6dRYP3NKCQcvcgAYwDf9DI,18869
-udata_hydra_csvapi-0.3.2.dev4.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
-udata_hydra_csvapi-0.3.2.dev4.dist-info/top_level.txt,sha256=MAaK09hxwPhIBBC0i1TdEBAgdu3W_gXnAZqk767gVak,12
-udata_hydra_csvapi-0.3.2.dev4.dist-info/RECORD,,
+udata_hydra_csvapi-0.3.2.dev8.dist-info/licenses/LICENSE,sha256=fb-HAYw94ffh--z1cZrWbpk6YKM0p9WFG7kdd0K7uGQ,1062
+udata_hydra_csvapi-0.3.2.dev8.dist-info/METADATA,sha256=wlHNzh9fQQSuy3lvGCpHb26fiw2mghgr7gyBPVxFzig,19156
+udata_hydra_csvapi-0.3.2.dev8.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
+udata_hydra_csvapi-0.3.2.dev8.dist-info/top_level.txt,sha256=MAaK09hxwPhIBBC0i1TdEBAgdu3W_gXnAZqk767gVak,12
+udata_hydra_csvapi-0.3.2.dev8.dist-info/RECORD,,