fix remaining type issues

Author: lukasIO

livekit-rtc/livekit/rtc/_ffi_client.py

@@ -34,7 +34,7 @@
 atexit.register(_resource_files.close)
 
 
-def _lib_name() -> str | None:
+def _lib_name() -> Optional[str]:
     if platform.system() == "Linux":
         return "liblivekit_ffi.so"
     elif platform.system() == "Darwin":

livekit-rtc/livekit/rtc/data_track.py

@@ -117,7 +117,7 @@ def is_published(self) -> bool:
         req.local_data_track_is_published.track_handle = self._ffi_handle.handle
 
         resp = FfiClient.instance.request(req)
-        return resp.local_data_track_is_published.is_published
+        return bool(resp.local_data_track_is_published.is_published)
 
     async def unpublish(self) -> None:
         """Unpublishes the track."""
@@ -181,7 +181,7 @@ def is_published(self) -> bool:
         req.remote_data_track_is_published.track_handle = self._ffi_handle.handle
 
         resp = FfiClient.instance.request(req)
-        return resp.remote_data_track_is_published.is_published
+        return bool(resp.remote_data_track_is_published.is_published)
 
     def __repr__(self) -> str:
         return (

livekit-rtc/livekit/rtc/room.py

@@ -648,7 +648,7 @@ async def disconnect(
 
         req = proto_ffi.FfiRequest()
         req.disconnect.room_handle = self._ffi_handle.handle  # type: ignore
-        req.disconnect.reason = reason  # type: ignore
+        req.disconnect.reason = reason
         queue = FfiClient.instance.queue.subscribe()
         try:
             resp = FfiClient.instance.request(req)
@@ -884,7 +884,7 @@ def _on_room_event(self, event: proto_room.RoomEvent) -> None:
                 participant,
                 event.participant_encryption_status_changed.is_encrypted,
             )
-        elif which == "participant_permissions_changed":
+        elif which == "participant_permission_changed":
             identity = event.participant_permission_changed.participant_identity
             participant = self._retrieve_participant(identity)
             assert isinstance(participant, Participant)

livekit-rtc/tests/test_e2ee.py

@@ -18,7 +18,7 @@
 class TestKeyProviderOptions:
     """Tests for KeyProviderOptions dataclass."""
 
-    def test_default_values(self):
+    def test_default_values(self) -> None:
         """Test that KeyProviderOptions has correct default values."""
         from livekit.rtc.e2ee import (
             KeyProviderOptions,
@@ -38,7 +38,7 @@ def test_default_values(self):
         assert options.key_ring_size == DEFAULT_KEY_RING_SIZE
         assert options.key_derivation_function == proto_e2ee.KeyDerivationFunction.PBKDF2
 
-    def test_custom_values(self):
+    def test_custom_values(self) -> None:
         """Test KeyProviderOptions with custom values."""
         from livekit.rtc.e2ee import KeyProviderOptions
         from livekit.rtc._proto import e2ee_pb2 as proto_e2ee
@@ -59,7 +59,7 @@ def test_custom_values(self):
         assert options.key_ring_size == 8
         assert options.key_derivation_function == proto_e2ee.KeyDerivationFunction.HKDF
 
-    def test_various_key_lengths(self):
+    def test_various_key_lengths(self) -> None:
         """Test that shared_key accepts various lengths."""
         from livekit.rtc.e2ee import KeyProviderOptions
 
@@ -85,7 +85,7 @@ def test_various_key_lengths(self):
 class TestE2EEOptions:
     """Tests for E2EEOptions dataclass."""
 
-    def test_default_values(self):
+    def test_default_values(self) -> None:
         """Test E2EEOptions default values."""
         from livekit.rtc.e2ee import E2EEOptions, KeyProviderOptions
         from livekit.rtc._proto import e2ee_pb2 as proto_e2ee
@@ -95,7 +95,7 @@ def test_default_values(self):
         assert isinstance(options.key_provider_options, KeyProviderOptions)
         assert options.encryption_type == proto_e2ee.EncryptionType.GCM
 
-    def test_with_shared_key(self):
+    def test_with_shared_key(self) -> None:
         """Test E2EEOptions with a shared key."""
         from livekit.rtc.e2ee import E2EEOptions, KeyProviderOptions
 
@@ -108,7 +108,7 @@ def test_with_shared_key(self):
 class TestProtoMessageBuilding:
     """Tests for proto message building with E2EE options."""
 
-    def test_proto_key_provider_options_fields(self):
+    def test_proto_key_provider_options_fields(self) -> None:
         """Test that proto KeyProviderOptions has all required fields."""
         from livekit.rtc._proto import e2ee_pb2 as proto_e2ee
 
@@ -130,7 +130,7 @@ def test_proto_key_provider_options_fields(self):
         assert proto_options.key_ring_size == 16
         assert proto_options.key_derivation_function == proto_e2ee.KeyDerivationFunction.PBKDF2
 
-    def test_proto_serialization(self):
+    def test_proto_serialization(self) -> None:
         """Test that proto message can be serialized without errors."""
         from livekit.rtc._proto import e2ee_pb2 as proto_e2ee
 
@@ -151,7 +151,7 @@ def test_proto_serialization(self):
         assert parsed.key_ring_size == 16
         assert parsed.key_derivation_function == proto_e2ee.KeyDerivationFunction.PBKDF2
 
-    def test_e2ee_options_proto_serialization(self):
+    def test_e2ee_options_proto_serialization(self) -> None:
         """Test full E2eeOptions proto serialization."""
         from livekit.rtc._proto import e2ee_pb2 as proto_e2ee
 
@@ -174,23 +174,23 @@ def test_e2ee_options_proto_serialization(self):
 class TestPublicExports:
     """Tests for public API exports."""
 
-    def test_key_derivation_function_exported(self):
+    def test_key_derivation_function_exported(self) -> None:
         """Test that KeyDerivationFunction is exported from the package."""
         from livekit.rtc import KeyDerivationFunction
 
         # Verify enum values are accessible
         assert KeyDerivationFunction.PBKDF2 == 0
         assert KeyDerivationFunction.HKDF == 1
 
-    def test_encryption_type_exported(self):
+    def test_encryption_type_exported(self) -> None:
         """Test that EncryptionType is exported from the package."""
         from livekit.rtc import EncryptionType
 
         assert EncryptionType.NONE == 0
         assert EncryptionType.GCM == 1
         assert EncryptionType.CUSTOM == 2
 
-    def test_e2ee_classes_exported(self):
+    def test_e2ee_classes_exported(self) -> None:
         """Test that E2EE classes are exported from the package."""
         from livekit.rtc import E2EEOptions, KeyProviderOptions