leancpms-cli 0.1.0__tar.gz → 0.1.2__tar.gz

{leancpms_cli-0.1.0 → leancpms_cli-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: leancpms-cli
-Version: 0.1.0
+Version: 0.1.2
 Summary: The cpms command alone: a client of a LeanCPMS instance's JSON API
 License-Expression: AGPL-3.0-or-later
 License-File: LICENSE
@@ -34,8 +34,8 @@ Until then, from a GitHub release (a tag `cli-v<version>`) or straight
 from the repository:
 
 ```bash
-gh release download cli-v0.1.0 --repo forsslund/leancpms --pattern '*.whl'
-uv tool install ./leancpms_cli-0.1.0-py3-none-any.whl
+gh release download cli-v0.1.2 --repo forsslund/leancpms --pattern '*.whl'
+uv tool install ./leancpms_cli-0.1.2-py3-none-any.whl
 # or
 uv tool install "git+https://github.com/forsslund/leancpms#subdirectory=cli"
 ```
@@ -194,7 +194,7 @@ Raise `version` in both `cli/pyproject.toml` and the root `pyproject.toml`
 (a test keeps them equal), then tag and push:
 
 ```bash
-git tag cli-v0.1.1 && git push origin cli-v0.1.1
+git tag cli-v0.1.2 && git push origin cli-v0.1.2
 ```
 
 `.github/workflows/release-cli.yml` builds the wheel and sdist, smoke-tests

{leancpms_cli-0.1.0 → leancpms_cli-0.1.2}/README.md

@@ -22,8 +22,8 @@ Until then, from a GitHub release (a tag `cli-v<version>`) or straight
 from the repository:
 
 ```bash
-gh release download cli-v0.1.0 --repo forsslund/leancpms --pattern '*.whl'
-uv tool install ./leancpms_cli-0.1.0-py3-none-any.whl
+gh release download cli-v0.1.2 --repo forsslund/leancpms --pattern '*.whl'
+uv tool install ./leancpms_cli-0.1.2-py3-none-any.whl
 # or
 uv tool install "git+https://github.com/forsslund/leancpms#subdirectory=cli"
 ```
@@ -182,7 +182,7 @@ Raise `version` in both `cli/pyproject.toml` and the root `pyproject.toml`
 (a test keeps them equal), then tag and push:
 
 ```bash
-git tag cli-v0.1.1 && git push origin cli-v0.1.1
+git tag cli-v0.1.2 && git push origin cli-v0.1.2
 ```
 
 `.github/workflows/release-cli.yml` builds the wheel and sdist, smoke-tests

{leancpms_cli-0.1.0 → leancpms_cli-0.1.2}/cpms/manifest/schema.py

@@ -96,6 +96,26 @@ class Theme(Strict):
     logo_url: Annotated[str, StringConstraints(pattern=r"^https://\S+$", max_length=500)] | None = None
 
 
+# A bare host name as a browser sends it: lower case, no scheme, port or path (charge.example.org).
+DriverHost = Annotated[
+    str,
+    StringConstraints(
+        max_length=253, pattern=r"^[a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?(\.[a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?)*$"
+    ),
+]
+
+
+# A browser origin of the organization's own driver front end (architecture §3.1): https, a host and
+# perhaps a port, nothing after it. http only for localhost, for development.
+DriverOrigin = Annotated[
+    str,
+    StringConstraints(
+        max_length=300,
+        pattern=r"^(https://[a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?(\.[a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?)*|http://localhost)(:[0-9]{1,5})?$",
+    ),
+]
+
+
 class Organization(Strict):
     key: OrganizationKey
     name: str
@@ -109,6 +129,19 @@ class Organization(Strict):
     # The eMI3 operator id, e.g. "SE*KEL": the OCPI party (country code, party id) and the EVSE ids' prefix.
     operator_id: Annotated[str, StringConstraints(pattern=r"^[A-Z]{2}\*[A-Z0-9]{3}$")] | None = None
     theme: Theme | None = None
+    # The hosts on which this organization's driver pages are its own: `/` there lists its sites.
+    driver_hosts: list[DriverHost] = []
+    # The organization's own driver front ends, on domains of its own: they may call the driver API's
+    # start and session endpoints from a browser, and payment may return to them (architecture §3.1).
+    driver_origins: list[DriverOrigin] = []
+
+    @model_validator(mode="after")
+    def _unique_hosts(self):  # type: ignore[no-untyped-def]
+        if len(set(self.driver_hosts)) != len(self.driver_hosts):
+            raise ValueError("driver_hosts: a host is listed twice")
+        if len(set(self.driver_origins)) != len(self.driver_origins):
+            raise ValueError("driver_origins: an origin is listed twice")
+        return self
 
 
 class OrganizationDocument(Strict):
@@ -221,11 +254,17 @@ class PricelistDocument(Strict):
     def _references(self):  # type: ignore[no-untyped-def]
         _unique(self.tariffs, "key", "tariff")
         _unique(self.plans, "key", "plan")
-        tariffs = {t.key for t in self.tariffs}
+        tariffs = {t.key: t for t in self.tariffs}
         plans = {p.key: p for p in self.plans}
         for p in self.plans:
             if p.tariff not in tariffs:
                 raise ValueError(f"plan {p.key!r} names unknown tariff {p.tariff!r}")
+        roaming = {p.key for p in self.plans if p.requires == "roaming"}
+        if self.channels.roaming:
+            roaming.add(self.channels.roaming.default)
+        for key in sorted(roaming & plans.keys()):
+            if tariffs[plans[key].tariff].kind != "flat":  # partners take fixed prices (architecture §6.1)
+                raise ValueError(f"roaming plan {key!r} needs a flat tariff, not {plans[key].tariff!r}")
         for key in self.channels.adhoc:
             if key not in plans:
                 raise ValueError(f"channel adhoc names unknown plan {key!r}")
@@ -339,6 +378,9 @@ class Site(Strict):
     postal_code: str | None = None
     country: Annotated[str, StringConstraints(pattern=r"^[A-Z]{3}$")] = "SWE"  # ISO 3166-1 alpha-3
     coordinates: Coordinates | None = None
+    # OCPI 2.2.1 ParkingType, shown by Nobil and roaming apps; optional, also when published.
+    parking_type: Literal["along_motorway", "parking_garage", "parking_lot", "on_driveway", "on_street",
+                          "underground_garage"] | None = None
     timezone: TimeZone | None = None  # defaults to the organization's display_timezone
     publish: bool = False  # in OCPI (Nobil, roaming) only when true
     notes: str | None = None

{leancpms_cli-0.1.0 → leancpms_cli-0.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "leancpms-cli"
-version = "0.1.0"
+version = "0.1.2"
 description = "The cpms command alone: a client of a LeanCPMS instance's JSON API"
 readme = "README.md"
 license = "AGPL-3.0-or-later"