inversion des arguments

InseeFrLab · Oct 20, 2023 · 7a358b2 · 7a358b2
1 parent 5ad042b
commit 7a358b2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/cartiflette/download/download.py b/cartiflette/download/download.py
@@ -91,8 +91,8 @@ def _upload_raw_dataset_to_s3(
                         "year": layer.year,
                         "borders": None,
                         "crs": layer.crs,
-                        "filter_by": None,
-                        "value": None,
+                        "filter_by": "origin",
+                        "value": "raw",
                         "vectorfile_format": layer.format,
                         "provider": layer.provider,
                         "dataset_family": layer.dataset_family,

diff --git a/cartiflette/utils/create_path_bucket.py b/cartiflette/utils/create_path_bucket.py
@@ -59,14 +59,14 @@ def create_path_bucket(config: ConfigDict) -> str:
 
     write_path = (
         f"{bucket}/{path_within_bucket}"
+        f"/{provider=}"
+        f"/{dataset_family=}"
+        f"/{source=}"
         f"/{year=}"
         f"/administrative_level={borders}"
         f"/{crs=}"
         f"/{filter_by}={value}"
         f"/{vectorfile_format=}"
-        f"/{provider=}"
-        f"/{dataset_family=}"
-        f"/{source=}"
         f"/{territory=}"
     ).replace("'", "")
 

diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,9 @@
+geopandas
+openpyxl
+PyYAML
+py7zr
+requests
+s3fs
+topojson
+tqdm
+xlrd