vecorel-cli 0.2.19__tar.gz → 0.2.20__tar.gz

{vecorel_cli-0.2.19 → vecorel_cli-0.2.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vecorel-cli
-Version: 0.2.19
+Version: 0.2.20
 Summary: CLI tools such as validation and file format conversion for vecorel.
 Author: Matthias Mohr
 License-Expression: Apache-2.0

{vecorel_cli-0.2.19 → vecorel_cli-0.2.20}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "vecorel-cli"
-version = "0.2.19"
+version = "0.2.20"
 description = "CLI tools such as validation and file format conversion for vecorel."
 readme = "README.md"
 license = "Apache-2.0"

{vecorel_cli-0.2.19 → vecorel_cli-0.2.20}/tests/test_convert.py

@@ -199,3 +199,53 @@ def test_converter_can_keep_the_constants_in_columns(tmp_folder, monkeypatch, ch
     for key in ("admin:country_code", "admin:subdivision_code", "determination_datetime"):
         assert key in schema.names, f"{key} should have stayed a column"
         assert key not in collection, f"{key} should not be in the collection metadata"
+
+
+def test_default_variant_is_chosen_before_get_urls():
+    """A converter that overrides get_urls() must see the default variant, so the
+    default lives in convert() and not in the base get_urls() it replaces."""
+
+    class Converter(BaseConverter):
+        id = "variants"
+        # oldest first: the latest year is still the default
+        variants = {
+            "2024": "https://example.com/2024.gpkg",
+            "2025": "https://example.com/2025.gpkg",
+        }
+
+        def get_urls(self):
+            # like the converters that look their files up by year
+            return {f"https://example.com/{self.variant}/": f"{self.variant}.gpkg"}
+
+    converter = Converter()
+    converter.select_variant(None)
+    assert converter.variant == "2025"
+    assert converter.get_urls() == {"https://example.com/2025/": "2025.gpkg"}
+
+    converter.select_variant("2024")
+    assert converter.variant == "2024"
+    assert converter.get_urls() == {"https://example.com/2024/": "2024.gpkg"}
+
+
+def test_default_variant_is_the_first_declared_unless_the_variants_are_years():
+    class Converter(BaseConverter):
+        id = "variants"
+        variants = {"full": "https://example.com/full.gpkg", "2025": "https://example.com/2025"}
+
+    converter = Converter()
+    converter.select_variant(None)
+    assert converter.variant == "full"
+
+
+def test_get_urls_rejects_an_unknown_variant():
+    class Converter(BaseConverter):
+        id = "variants"
+        variants = {"2025": "https://example.com/2025.gpkg"}
+
+    converter = Converter()
+    converter.select_variant("2025")
+    assert converter.get_urls() == "https://example.com/2025.gpkg"
+
+    converter.select_variant("1999")
+    with pytest.raises(ValueError, match="Unknown variant '1999'"):
+        converter.get_urls()

{vecorel_cli-0.2.19 → vecorel_cli-0.2.20}/vecorel_cli/conversion/base.py

@@ -4,6 +4,7 @@ import hashlib
 import inspect
 import json
 import os
+import re
 import sys
 import tarfile
 import zipfile
@@ -92,6 +93,24 @@ class BaseConverter(LoggerMixin):
                 "variants = {} when the inherited ones do not apply."
             )
 
+    def select_variant(self, variant: Optional[str]) -> None:
+        """Store the requested variant; without one, the default variant is used.
+        Done at the start of convert() rather than in get_urls(), so a converter that
+        overrides get_urls() does not have to repeat the default, and so the default is
+        also set when the user supplies the input files."""
+        self.variant = variant
+        if self.variants and self.variant is None:
+            self.variant = self.default_variant()
+            opts = ", ".join(self.variants)
+            self.warning(f"No variant given, choosing {self.variant} from {opts}")
+
+    def default_variant(self) -> str:
+        """The latest year when the variants are years, otherwise the first declared."""
+        keys = list(self.variants)
+        if all(re.fullmatch(r"\d{4}", key) for key in keys):
+            return max(keys)
+        return keys[0]
+
     def _check_id_mapping(self):
         """Warn before converting when nothing is mapped to the required `id` property.
         Unmapped columns are dropped, which also removes the column filled by
@@ -344,13 +363,11 @@ class BaseConverter(LoggerMixin):
     def get_urls(self):
         urls = self.sources
         if not urls and self.variants:
-            opts = ", ".join(list(self.variants.keys()))
-            if self.variant is None:
-                self.variant = next(iter(self.variants))
-                self.warning(f"Choosing first available variant {self.variant} from {opts}")
+            # the default variant is chosen in convert(), see select_variant()
             if self.variant in self.variants:
                 urls = self.variants[self.variant]
             else:
+                opts = ", ".join(self.variants)
                 raise ValueError(f"Unknown variant '{self.variant}', choose from {opts}")
         return urls
 
@@ -483,7 +500,7 @@ class BaseConverter(LoggerMixin):
         original_geometries=False,
         **kwargs,
     ) -> str:
-        self.variant = variant
+        self.select_variant(variant)
         cid = self.id.strip()
         if self.bbox is not None and len(self.bbox) != 4:
             raise ValueError("If provided, the bounding box must consist of 4 numbers")

{vecorel_cli-0.2.19 → vecorel_cli-0.2.20}/vecorel_cli/conversion/duckdb.py

@@ -74,7 +74,7 @@ class DuckDBBaseConverter(BaseConverter):
         original_geometries=False,
         **kwargs,
     ) -> str:
-        self.variant = variant
+        self.select_variant(variant)
         cid = self.id.strip()
         if self.bbox is not None and len(self.bbox) != 4:
             raise ValueError("If provided, the bounding box must consist of 4 numbers")

{vecorel_cli-0.2.19 → vecorel_cli-0.2.20}/vecorel_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vecorel-cli
-Version: 0.2.19
+Version: 0.2.20
 Summary: CLI tools such as validation and file format conversion for vecorel.
 Author: Matthias Mohr
 License-Expression: Apache-2.0