repeaterbook 0.2.0__py3-none-any.whl → 0.2.2__py3-none-any.whl

repeaterbook/models.py

@@ -165,6 +165,11 @@ EmergencyJSON: TypeAlias = Literal[
 ServiceTypeJSON: TypeAlias = Literal["GMRS"]
 
 
+# RepeaterBook has some variability between North America vs ROW exports.
+# In practice, fields can appear/disappear (e.g. NA includes County/ARES/... and
+# omits Region; ROW can include extra keys like "sponsor").
+#
+# Keep this TypedDict intentionally permissive for runtime robustness.
 RepeaterJSON = TypedDict(
     "RepeaterJSON",
     {
@@ -179,6 +184,11 @@ RepeaterJSON = TypedDict(
         "Region": str | None,
         "State": str,
         "Country": str,
+        "County": str,
+        "ARES": str,
+        "RACES": str,
+        "SKYWARN": str,
+        "CANWARN": str,
         "Lat": str,
         "Long": str,
         "Precise": ZeroOneJSON,
@@ -206,7 +216,9 @@ RepeaterJSON = TypedDict(
         "System Fusion": YesNoJSON,
         "Notes": str,
         "Last Update": str,
+        "sponsor": object,
     },
+    total=False,
 )
 
 

repeaterbook/queries.py

@@ -16,7 +16,7 @@ from typing import TYPE_CHECKING, NamedTuple
 
 from haversine import haversine  # type: ignore[import-untyped]
 from loguru import logger
-from sqlmodel import or_
+from sqlmodel import and_, or_
 
 from repeaterbook.models import Repeater
 from repeaterbook.utils import Radius, square_bounds
@@ -24,17 +24,16 @@ from repeaterbook.utils import Radius, square_bounds
 if TYPE_CHECKING:  # pragma: no cover
     from collections.abc import Iterable
 
-    from sqlalchemy.sql._typing import _ColumnExpressionArgument
     from sqlalchemy.sql.elements import ColumnElement
 
 
-def square(radius: Radius) -> tuple[_ColumnExpressionArgument[bool] | bool, ...]:
+def square(radius: Radius) -> ColumnElement[bool]:
     """Return a query for repeaters within a given square.
 
     Note: This is a square, not a circle. Use `filter_radius` afterwards.
     """
     bounds = square_bounds(radius=radius)
-    return (
+    return and_(
         Repeater.latitude >= bounds.south,
         Repeater.latitude <= bounds.north,
         Repeater.longitude >= bounds.west,

repeaterbook/services.py

@@ -107,6 +107,7 @@ USE_MAP: Final = {
     "OPEN": Use.OPEN,
     "PRIVATE": Use.PRIVATE,
     "CLOSED": Use.CLOSED,
+    "": Use.OPEN,  # Some export payloads include empty Use; treat as OPEN.
 }
 
 STATUS_MAP: Final = {
@@ -125,54 +126,90 @@ def parse_date(date_str: str) -> date:
 
 
 def json_to_model(j: RepeaterJSON, /) -> Repeater:
-    """Converts a JSON object to a Repeater model."""
+    """Converts a JSON object to a Repeater model.
+
+    RepeaterBook export payloads vary slightly between endpoints.
+
+    - `exportROW.php` may include extra keys like `sponsor`.
+    - `export.php` (North America) includes keys like `County`/`ARES`/… and may omit
+      `Region`.
+
+    This function should be resilient to those differences.
+    """
+
+    def s(key: str) -> str:
+        v = j.get(key, "")
+        if v is None:
+            return ""
+        return str(v)
+
+    def b(key: str, *, default: bool = False) -> bool:
+        """Parse RepeaterBook boolean-ish fields.
+
+        RepeaterBook uses a mix of "Yes"/"No" strings and 1/0 ints.
+        Missing/unknown values fall back to `default`.
+        """
+        return BOOL_MAP.get(j.get(key), default)
+
     return Repeater.model_validate(
         Repeater(
-            state_id=j["State ID"],
-            repeater_id=j["Rptr ID"],
-            frequency=j["Frequency"],
-            input_frequency=j["Input Freq"],
-            pl_ctcss_uplink=j["PL"] or None,
-            pl_ctcss_tsq_downlink=j["TSQ"] or None,
-            location_nearest_city=j["Nearest City"],
-            landmark=j["Landmark"] or None,
-            region=j["Region"],
-            state=j["State"],
-            country=j["Country"],
-            latitude=j["Lat"],
-            longitude=j["Long"],
-            precise=BOOL_MAP[j["Precise"]],
-            callsign=j["Callsign"],
-            use_membership=USE_MAP[j["Use"]],
-            operational_status=STATUS_MAP[j["Operational Status"]],
-            allstar_node=j["AllStar Node"],
-            echolink_node=str(j["EchoLink Node"]) or None,
-            irlp_node=j["IRLP Node"] or None,
-            wires_node=j["Wires Node"] or None,
-            analog_capable=BOOL_MAP[j["FM Analog"]],
-            fm_bandwidth=j["FM Bandwidth"].replace(" kHz", "") or None,
-            dmr_capable=BOOL_MAP[j["DMR"]],
-            dmr_color_code=j["DMR Color Code"] or None,
-            dmr_id=str(j["DMR ID"]) or None,
-            d_star_capable=BOOL_MAP[j["D-Star"]],
-            nxdn_capable=BOOL_MAP[j["NXDN"]],
-            apco_p_25_capable=BOOL_MAP[j["APCO P-25"]],
-            p_25_nac=j["P-25 NAC"] or None,
-            m17_capable=BOOL_MAP[j["M17"]],
-            m17_can=j["M17 CAN"] or None,
-            tetra_capable=BOOL_MAP[j["Tetra"]],
-            tetra_mcc=j["Tetra MCC"] or None,
-            tetra_mnc=j["Tetra MNC"] or None,
-            yaesu_system_fusion_capable=BOOL_MAP[j["System Fusion"]],
-            notes=j["Notes"] or None,
-            last_update=parse_date(j["Last Update"]),
+            state_id=s("State ID"),
+            repeater_id=int(j.get("Rptr ID", 0) or 0),
+            frequency=s("Frequency"),
+            input_frequency=s("Input Freq"),
+            pl_ctcss_uplink=s("PL") or None,
+            pl_ctcss_tsq_downlink=s("TSQ") or None,
+            location_nearest_city=s("Nearest City"),
+            landmark=s("Landmark") or None,
+            region=j.get("Region"),
+            country=s("Country") or None,
+            county=s("County") or None,
+            state=s("State") or None,
+            latitude=s("Lat"),
+            longitude=s("Long"),
+            precise=BOOL_MAP[j.get("Precise", 0)],
+            callsign=s("Callsign") or None,
+            use_membership=USE_MAP.get(s("Use"), Use.OPEN),
+            operational_status=(
+                STATUS_MAP[s("Operational Status")]
+                if s("Operational Status")
+                else Status.UNKNOWN
+            ),
+            ares=s("ARES") or None,
+            races=s("RACES") or None,
+            skywarn=s("SKYWARN") or None,
+            canwarn=s("CANWARN") or None,
+            allstar_node=s("AllStar Node") or None,
+            echolink_node=s("EchoLink Node") or None,
+            irlp_node=s("IRLP Node") or None,
+            wires_node=s("Wires Node") or None,
+            analog_capable=b("FM Analog", default=False),
+            fm_bandwidth=s("FM Bandwidth").replace(" kHz", "") or None,
+            dmr_capable=b("DMR", default=False),
+            dmr_color_code=s("DMR Color Code") or None,
+            dmr_id=s("DMR ID") or None,
+            d_star_capable=b("D-Star", default=False),
+            nxdn_capable=b("NXDN", default=False),
+            apco_p_25_capable=b("APCO P-25", default=False),
+            p_25_nac=s("P-25 NAC") or None,
+            m17_capable=b("M17", default=False),
+            m17_can=s("M17 CAN") or None,
+            tetra_capable=b("Tetra", default=False),
+            tetra_mcc=s("Tetra MCC") or None,
+            tetra_mnc=s("Tetra MNC") or None,
+            yaesu_system_fusion_capable=b("System Fusion", default=False),
+            notes=s("Notes") or None,
+            last_update=parse_date(s("Last Update")),
         )
     )
 
 
 @attrs.frozen
 class RepeaterBookAPI:
-    """RepeaterBook API client."""
+    """RepeaterBook API client.
+
+    Must read https://www.repeaterbook.com/wiki/doku.php?id=api before using.
+    """
 
     base_url: URL = attrs.Factory(lambda: URL("https://repeaterbook.com"))
     app_name: str = "RepeaterBook Python SDK"

{repeaterbook-0.2.0.dist-info → repeaterbook-0.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: repeaterbook
-Version: 0.2.0
+Version: 0.2.2
 Summary: Python utility to work with data from RepeaterBook.
 Project-URL: homepage, https://github.com/MicaelJarniac/repeaterbook
 Project-URL: source, https://github.com/MicaelJarniac/repeaterbook
@@ -112,6 +112,10 @@ Python utility to work with data from RepeaterBook.
 
 Read RepeaterBook's official [API documentation](https://www.repeaterbook.com/wiki/doku.php?id=api) for more information.
 
+## Related Projects
+- https://github.com/MicaelJarniac/opengd77
+- https://github.com/MicaelJarniac/ogdrb
+
 ## See Also
 - https://github.com/afourney/hamkit/tree/main/packages/repeaterbook
 - https://github.com/desertblade/OpenGD77-Repeaterbook

repeaterbook-0.2.2.dist-info/RECORD

@@ -0,0 +1,11 @@
+repeaterbook/__init__.py,sha256=EGIRvLGcrzX5ZD8ZoU13XyL825rFS9zPNRS1RSQwilg,251
+repeaterbook/database.py,sha256=oAqCKGWjD4bQk62rsHTZQO0ESzn7UDrmNg78TZVznjY,1954
+repeaterbook/models.py,sha256=a3-_t6Q6h3kvbOvPiqwMFUN_ZgNMthtuUgjyXEvjv0w,6868
+repeaterbook/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+repeaterbook/queries.py,sha256=1VgGNviH5NDCBjc4Q1rt3ORmbrzRsdL2_X_yxGc86DA,3100
+repeaterbook/services.py,sha256=lb7KZxwM5pCA7tms4LTYh-I0XRG0sq-Uogd_3FCmS8U,11480
+repeaterbook/utils.py,sha256=QI5aWci8b3GAIi7l3PfT51sg4TTlwzoHtamNKTGkaaI,1453
+repeaterbook-0.2.2.dist-info/METADATA,sha256=vZ9RrQFIqUWBj2mPhTH0GHj5IKGBAxO3NFhXrYaYXT0,7930
+repeaterbook-0.2.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+repeaterbook-0.2.2.dist-info/licenses/LICENSE,sha256=TtbMt69RbQyifR_It2bTHKdlLR1Dj6x2A5y_oLOyoVk,1071
+repeaterbook-0.2.2.dist-info/RECORD,,

{repeaterbook-0.2.0.dist-info → repeaterbook-0.2.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.27.0
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py3-none-any

repeaterbook-0.2.0.dist-info/RECORD

@@ -1,11 +0,0 @@
-repeaterbook/__init__.py,sha256=EGIRvLGcrzX5ZD8ZoU13XyL825rFS9zPNRS1RSQwilg,251
-repeaterbook/database.py,sha256=oAqCKGWjD4bQk62rsHTZQO0ESzn7UDrmNg78TZVznjY,1954
-repeaterbook/models.py,sha256=iKvrMadYdsP1Zi-xqzChHmlT4lL36Crt93xK2q5M814,6422
-repeaterbook/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-repeaterbook/queries.py,sha256=eUS714SY7wbGZY6DyOEAnE27zkOIw9HuKteO2bBU7YY,3186
-repeaterbook/services.py,sha256=qct31P_4nV5_rfeGs6bDfIs_ur5heR0CF4HbTNy2GEM,10195
-repeaterbook/utils.py,sha256=QI5aWci8b3GAIi7l3PfT51sg4TTlwzoHtamNKTGkaaI,1453
-repeaterbook-0.2.0.dist-info/METADATA,sha256=rskdgxik9LIFmRFfTFqJ1ahQCYdTO4ZMe5ID_6eWShw,7824
-repeaterbook-0.2.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-repeaterbook-0.2.0.dist-info/licenses/LICENSE,sha256=TtbMt69RbQyifR_It2bTHKdlLR1Dj6x2A5y_oLOyoVk,1071
-repeaterbook-0.2.0.dist-info/RECORD,,