revert 979311c (abandon new show hash proposal) but improve typing

Author: vasarhelyi

src/flockwave/server/ext/crazyflie/driver.py

@@ -392,11 +392,7 @@ async def handle_command_trick(self, uav: "CrazyflieUAV", *params: str) -> str:
         )
 
     async def handle_command___show_upload(
-        self,
-        uav: "CrazyflieUAV",
-        *,
-        show: ShowSpecification,
-        show_hash: str | None = None,
+        self, uav: "CrazyflieUAV", *, show: ShowSpecification
     ):
         """Handles a drone show upload request for the given UAV.
 
@@ -405,7 +401,6 @@ async def handle_command___show_upload(
 
         Parameters:
             show: the show data for a single UAV
-            show_hash: the hash of the entire show data for all UAVs
         """
         await uav.upload_show(show, remember=True)
         if self.preferred_controller is not None:

src/flockwave/server/ext/mavlink/driver.py

@@ -385,11 +385,7 @@ async def handle_command_show(self, uav: "MAVLinkUAV", command: str | None = Non
             raise RuntimeError(f"Unknown subcommand: {command!r}")
 
     async def handle_command___show_upload(
-        self,
-        uav: "MAVLinkUAV",
-        *,
-        show: ShowSpecification,
-        show_hash: str | None = None,
+        self, uav: "MAVLinkUAV", *, show: ShowSpecification
     ):
         """Handles a drone show upload request for the given UAV.
 
@@ -398,7 +394,6 @@ async def handle_command___show_upload(
 
         Parameters:
             show: the show data for a single UAV
-            show_hash: optional hash of the entire global show configuration
         """
         try:
             await uav.upload_show(show)

src/flockwave/server/ext/show/logging.py

@@ -47,9 +47,6 @@ class ShowUploadLoggingMiddleware:
     Used to decide whether it's a new show upload or most likely not.
     """
 
-    _last_show_upload_hash: str | None = None
-    """The hash of the last show upload that was seen by the middleware."""
-
     _log: Logger
     """Logger that the middleware will write to."""
 
@@ -63,14 +60,13 @@ def __init__(self, log: Logger):
         self._log = log
 
     def __call__(self, message: FlockwaveMessage, sender: Client) -> FlockwaveMessage:
-        show, show_hash = self._extract_show_and_hash(message)
+        show = self._extract_show(message)
         if show:
             now = monotonic()
             fingerprint = self._get_show_fingerprint(show)
 
             should_log = (
-                show_hash != self._last_show_upload_hash
-                or fingerprint != self._last_show_upload_fingerprint
+                fingerprint != self._last_show_upload_fingerprint
                 or now - self._last_show_upload_command_at >= 30
             )
             if should_log:
@@ -85,26 +81,20 @@ def __call__(self, message: FlockwaveMessage, sender: Client) -> FlockwaveMessag
 
             self._last_show_upload_command_at = now
             self._last_show_upload_fingerprint = fingerprint
-            self._last_show_upload_hash = show_hash
 
         return message
 
-    def _extract_show_and_hash(
-        self, message: FlockwaveMessage
-    ) -> tuple[ShowSpecification | None, str | None]:
+    def _extract_show(self, message: FlockwaveMessage) -> ShowSpecification | None:
         """Checks whether the given message is a show upload and extracts the
-        show specification and the show hash out of the message if it is.
+        show specification out of the message if it is.
         """
         type = message.get_type()
         if type == "OBJ-CMD":
             cmd = message.body.get("command", "")
             if cmd == "__show_upload":
                 kwds = message.body.get("kwds", {})
-                if isinstance(kwds, dict):
-                    show = kwds.get("show", None)
-                    show_hash = kwds.get("show_hash", None)
-                    return show, show_hash
-        return None, None
+                if isinstance(kwds, dict) and "show" in kwds:
+                    return kwds["show"]
 
     @property
     def last_show_metadata(self) -> ShowMetadata | None:

src/flockwave/server/ext/virtual_uavs/driver.py

@@ -1166,11 +1166,7 @@ async def handle_command___mission_upload(
         await sleep(0.25 + random() * 0.5)
 
     async def handle_command___show_upload(
-        self,
-        uav: VirtualUAV,
-        *,
-        show: ShowSpecification,
-        show_hash: str | None = None,
+        self, uav: VirtualUAV, *, show: ShowSpecification
     ) -> None:
         """Handles a drone show upload request for the given UAV.
 
@@ -1179,7 +1175,6 @@ async def handle_command___show_upload(
 
         Parameters:
             show: the show data for a single UAV
-            show_hash: optional hash of the entire global show configuration
         """
         uav.handle_show_upload(show)
         await sleep(0.25 + random() * 0.5)