Update to latest dispatch-api

Renames a few fields, but stays compatible otherwise.

Signed-off-by: Mathias L. Baumann <[email protected]>

Author: Marenz

pyproject.toml

@@ -37,10 +37,11 @@ classifiers = [
 requires-python = ">= 3.11, < 4"
 dependencies = [
   "typing-extensions >= 4.6.1, < 5",
-  "frequenz-api-dispatch == 1.0.0-rc1",
+  #  "frequenz-api-dispatch == 1.0.0-rc1",
+  "frequenz-api-dispatch @ git+https://github.com/frequenz-floss/frequenz-api-dispatch@4274d1a",
   "frequenz-client-base >= 0.8.0, < 0.10.0",
   "frequenz-client-common >= 0.1.0, < 0.4.0",
-  "grpcio >= 1.66.1, < 2",
+  "grpcio >= 1.70.0, < 2",
   "python-dateutil >= 2.8.2, < 3.0",
 ]
 dynamic = ["version"]
@@ -93,7 +94,8 @@ dev-pylint = [
   "pylint == 3.3.6",
   # For checking the noxfile, docs/ script, and tests
   "frequenz-client-dispatch[cli,dev-mkdocs,dev-noxfile,dev-pytest]",
-  "frequenz-api-dispatch == 1.0.0-rc1",
+  #  "frequenz-api-dispatch == 1.0.0-rc1",
+  "frequenz-api-dispatch @ git+https://github.com/frequenz-floss/frequenz-api-dispatch@4274d1a",
 ]
 dev-pytest = [
   "pytest == 8.3.5",

src/frequenz/client/dispatch/_client.py

@@ -148,7 +148,7 @@ def to_interval(
         ) -> PBTimeIntervalFilter | None:
             return (
                 PBTimeIntervalFilter(
-                    **{"from": to_timestamp(from_)}, to=to_timestamp(to)
+                    from_time=to_timestamp(from_), to_time=to_timestamp(to)
                 )
                 if from_ or to
                 else None

src/frequenz/client/dispatch/recurrence.py

@@ -88,8 +88,8 @@ def from_protobuf(cls, pb_criteria: PBRecurrenceRule.EndCriteria) -> "EndCriteri
         match pb_criteria.WhichOneof("count_or_until"):
             case "count":
                 instance.count = pb_criteria.count
-            case "until":
-                instance.until = to_datetime(pb_criteria.until)
+            case "until_time":
+                instance.until = to_datetime(pb_criteria.until_time)
         return instance
 
     def to_protobuf(self) -> PBRecurrenceRule.EndCriteria:
@@ -103,7 +103,7 @@ def to_protobuf(self) -> PBRecurrenceRule.EndCriteria:
         if self.count is not None:
             pb_criteria.count = self.count
         elif self.until is not None:
-            pb_criteria.until.CopyFrom(to_timestamp(self.until))
+            pb_criteria.until_time.CopyFrom(to_timestamp(self.until))
 
         return pb_criteria
 

src/frequenz/client/dispatch/test/_service.py

@@ -180,20 +180,20 @@ def _filter_dispatch(
                 if target != dispatch.target:
                     return False
             if _filter.HasField("start_time_interval"):
-                if start_from := _filter.start_time_interval.__dict__["from"]:
+                if start_from := _filter.start_time_interval.from_time:
                     if dispatch.start_time < _to_dt(start_from):
                         return False
-                if start_to := _filter.start_time_interval.to:
+                if start_to := _filter.start_time_interval.to_time:
                     if dispatch.start_time >= _to_dt(start_to):
                         return False
             if _filter.HasField("end_time_interval"):
-                if end_from := _filter.end_time_interval.__dict__["from"]:
+                if end_from := _filter.end_time_interval.from_time:
                     if (
                         dispatch.duration
                         and dispatch.start_time + dispatch.duration < _to_dt(end_from)
                     ):
                         return False
-                if end_to := _filter.end_time_interval.to:
+                if end_to := _filter.end_time_interval.to_time:
                     if (
                         dispatch.duration
                         and dispatch.start_time + dispatch.duration >= _to_dt(end_to)

src/frequenz/client/dispatch/types.py

@@ -295,7 +295,7 @@ def from_protobuf(cls, pb_object: PBDispatch) -> "Dispatch":
             id=pb_object.metadata.dispatch_id,
             type=pb_object.data.type,
             create_time=to_datetime(pb_object.metadata.create_time),
-            update_time=to_datetime(pb_object.metadata.modification_time),
+            update_time=to_datetime(pb_object.metadata.update_time),
             end_time=(
                 to_datetime(pb_object.metadata.end_time)
                 if pb_object.metadata.HasField("end_time")
@@ -327,7 +327,7 @@ def to_protobuf(self) -> PBDispatch:
             metadata=DispatchMetadata(
                 dispatch_id=self.id,
                 create_time=to_timestamp(self.create_time),
-                modification_time=to_timestamp(self.update_time),
+                update_time=to_timestamp(self.update_time),
                 end_time=(
                     to_timestamp(self.end_time) if self.end_time is not None else None
                 ),