Simplify find_program_by_name now that openadr3 0.2.0 returns coerced models

Upstream python-oa3 POA3-o0j landed: find_program_by_name and
find_ven_by_name now return coerced Pydantic models instead of raw dicts.
Remove the explicit coerce() workaround in VenClient, fix register() to
use attribute access (.id) instead of dict access (["id"]), and bump the
openadr3 dependency to >=0.2.0.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: dcj

pyproject.toml

@@ -25,7 +25,7 @@ classifiers = [
     "Topic :: Software Development :: Libraries",
 ]
 dependencies = [
-    "openadr3>=0.1.0",
+    "openadr3>=0.2.0",
 ]
 
 [project.optional-dependencies]

src/openadr3_client/ven.py

@@ -8,7 +8,6 @@
 
 import httpx
 from openadr3.api import success
-from openadr3.entities import coerce
 from openadr3.entities.models import Event, Program
 
 from openadr3_client.base import BaseClient
@@ -82,7 +81,7 @@ def register(self, ven_name: str) -> VenClient:
         with self._lock:
             existing = self.api.find_ven_by_name(ven_name)
             if existing:
-                vid = existing["id"]
+                vid = existing.id
                 log.info("VEN found, reusing: name=%s id=%s", ven_name, vid)
             else:
                 resp = self.api.create_ven(
@@ -103,20 +102,9 @@ def register(self, ven_name: str) -> VenClient:
     # -- Program lookup --
 
     def find_program_by_name(self, name: str) -> Program | None:
-        """Query VTN for a program by programName. Caches the ID on success.
-
-        Returns a coerced Program model (or None), matching the shape of
-        programs() and poll_events() which also return coerced models.
-        """
-        raw = self.api.find_program_by_name(name)
-        if not raw:
-            return None
-        program = coerce(raw)
-        if not isinstance(program, Program):
-            raise TypeError(
-                f"Expected Program from find_program_by_name, got {type(program).__name__}"
-            )
-        if program.id:
+        """Query VTN for a program by programName. Caches the ID on success."""
+        program = self.api.find_program_by_name(name)
+        if program and program.id:
             self._program_cache[name] = program.id
         return program
 

tests/test_ven.py

@@ -4,6 +4,7 @@
 
 import httpx
 import pytest
+from openadr3.entities import coerce
 from openadr3.entities.models import Program
 
 from openadr3_client.ven import VenClient, extract_topics
@@ -41,7 +42,9 @@ class TestVenClientRegistration:
     @patch("openadr3_client.base.create_ven_client")
     def test_register_existing_ven(self, mock_create):
         mock_api = MagicMock()
-        mock_api.find_ven_by_name.return_value = {"id": "ven-123", "venName": "my-ven"}
+        mock_api.find_ven_by_name.return_value = coerce(
+            {"objectType": "VEN", "id": "ven-123", "venName": "my-ven"}
+        )
         mock_create.return_value = mock_api
 
         with VenClient(url="http://test", token="tok") as ven:
@@ -80,11 +83,9 @@ class TestVenClientProgramLookup:
     @patch("openadr3_client.base.create_ven_client")
     def test_find_program_by_name(self, mock_create):
         mock_api = MagicMock()
-        mock_api.find_program_by_name.return_value = {
-            "objectType": "PROGRAM",
-            "id": "prog-1",
-            "programName": "pricing",
-        }
+        mock_api.find_program_by_name.return_value = coerce(
+            {"objectType": "PROGRAM", "id": "prog-1", "programName": "pricing"}
+        )
         mock_create.return_value = mock_api
 
         with VenClient(url="http://test", token="tok") as ven:
@@ -119,11 +120,9 @@ def test_resolve_program_id_cached(self, mock_create):
     @patch("openadr3_client.base.create_ven_client")
     def test_resolve_program_id_queries(self, mock_create):
         mock_api = MagicMock()
-        mock_api.find_program_by_name.return_value = {
-            "objectType": "PROGRAM",
-            "id": "prog-2",
-            "programName": "dr-program",
-        }
+        mock_api.find_program_by_name.return_value = coerce(
+            {"objectType": "PROGRAM", "id": "prog-2", "programName": "dr-program"}
+        )
         mock_create.return_value = mock_api
 
         with VenClient(url="http://test", token="tok") as ven:
@@ -202,7 +201,9 @@ class TestVenClientMqttTopics:
     @patch("openadr3_client.base.create_ven_client")
     def test_ven_scoped_defaults_to_registered(self, mock_create):
         mock_api = MagicMock()
-        mock_api.find_ven_by_name.return_value = {"id": "ven-99", "venName": "v"}
+        mock_api.find_ven_by_name.return_value = coerce(
+            {"objectType": "VEN", "id": "ven-99", "venName": "v"}
+        )
         mock_create.return_value = mock_api
 
         with VenClient(url="http://test", token="tok") as ven:
@@ -251,11 +252,9 @@ class TestVenClientSubscribe:
     @patch("openadr3_client.base.create_ven_client")
     def test_subscribe_mqtt(self, mock_create):
         mock_api = MagicMock()
-        mock_api.find_program_by_name.return_value = {
-            "objectType": "PROGRAM",
-            "id": "prog-1",
-            "programName": "pricing",
-        }
+        mock_api.find_program_by_name.return_value = coerce(
+            {"objectType": "PROGRAM", "id": "prog-1", "programName": "pricing"}
+        )
         mock_api.get_mqtt_topics_program_events.return_value = _make_response(
             200, {"topics": {"a": "openadr3/programs/prog-1/events"}}
         )