Fix return types for server notifications (#13)

* Fix return types for server notifications

* Requested changes

Author: Karolk99

fishjam/_webhook_notifier.py

@@ -8,10 +8,13 @@
 import betterproto
 
 from fishjam.events._protos.fishjam import ServerMessage
-from fishjam.events.allowed_notifications import ALLOWED_NOTIFICATIONS
+from fishjam.events.allowed_notifications import (
+    ALLOWED_NOTIFICATIONS,
+    AllowedNotification,
+)
 
 
-def receive_binary(binary: bytes) -> Union[betterproto.Message, None]:
+def receive_binary(binary: bytes) -> Union[AllowedNotification, None]:
     """
     Transform received protobuf notification to adequate notification instance.
     The available notifications are listed in `fishjam.events` module.

fishjam/_ws_notifier.py

@@ -3,7 +3,7 @@
 """
 
 import asyncio
-from typing import Any, Callable, Literal, cast
+from typing import Callable, Literal, cast
 
 import betterproto
 from websockets import client
@@ -17,7 +17,10 @@
     ServerMessageSubscribeRequest,
     ServerMessageSubscribeResponse,
 )
-from fishjam.events.allowed_notifications import ALLOWED_NOTIFICATIONS
+from fishjam.events.allowed_notifications import (
+    ALLOWED_NOTIFICATIONS,
+    AllowedNotification,
+)
 
 
 class FishjamNotifier:
@@ -41,7 +44,7 @@ def __init__(self, fishjam_url: str, management_token: str):
 
         self._notification_handler: Callable | None = None
 
-    def on_server_notification(self, handler: Callable[[Any], None]):
+    def on_server_notification(self, handler: Callable[[AllowedNotification], None]):
         """
         Decorator used for defining handler for Fishjam Notifications
         """

fishjam/events/allowed_notifications.py

@@ -1,3 +1,5 @@
+from typing import Union
+
 from fishjam.events import (
     ServerMessagePeerAdded,
     ServerMessagePeerConnected,
@@ -27,3 +29,18 @@
     ServerMessageTrackRemoved,
     ServerMessageTrackMetadataUpdated,
 )
+
+AllowedNotification = Union[
+    ServerMessageRoomCreated,
+    ServerMessageRoomDeleted,
+    ServerMessageRoomCrashed,
+    ServerMessagePeerAdded,
+    ServerMessagePeerDeleted,
+    ServerMessagePeerConnected,
+    ServerMessagePeerDisconnected,
+    ServerMessagePeerMetadataUpdated,
+    ServerMessagePeerCrashed,
+    ServerMessageTrackAdded,
+    ServerMessageTrackRemoved,
+    ServerMessageTrackMetadataUpdated,
+]

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fishjam-server-sdk"
-version = "0.6.0"
+version = "0.6.1"
 description = "Python server SDK for the Fishjam Cloud"
 authors = ["Fishjam Team"]
 homepage = "https://github.com/fishjam-cloud/python-server-sdk"