livekit-api 0.2.1__tar.gz → 0.4.0__tar.gz

{livekit-api-0.2.1 → livekit-api-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: livekit-api
-Version: 0.2.1
+Version: 0.4.0
 Summary: Python Server API for LiveKit
 Home-page: https://github.com/livekit/python-sdks
 License: Apache-2.0
@@ -19,13 +19,13 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3 :: Only
-Requires-Python: >=3.7.0
+Requires-Python: >=3.8.0
 Description-Content-Type: text/markdown
 Requires-Dist: pyjwt>=2.0.0
-Requires-Dist: aiohttp>=3.8.0
-Requires-Dist: protobuf>=3.1.0
-Requires-Dist: types-protobuf>=3.1.0
-Requires-Dist: livekit-protocol>=0.2.0
+Requires-Dist: aiohttp>=3.9.0
+Requires-Dist: protobuf==4.25.1
+Requires-Dist: types-protobuf<5,>=4
+Requires-Dist: livekit-protocol~=0.3.0
 
 # LiveKit Server APIs
 

{livekit-api-0.2.1 → livekit-api-0.4.0}/livekit/api/__init__.py

@@ -17,12 +17,13 @@
 
 # flake8: noqa
 # re-export packages from protocol
-from livekit.protocol.egress import *
-from livekit.protocol.ingress import *
-from livekit.protocol.models import *
-from livekit.protocol.room import *
-from livekit.protocol.webhook import *
+from livekit.protocol.egress import *  # type: ignore
+from livekit.protocol.ingress import *  # type: ignore
+from livekit.protocol.models import *  # type: ignore
+from livekit.protocol.room import *  # type: ignore
+from livekit.protocol.webhook import *  # type: ignore
 
+from .twirp_client import TwirpError, TwirpErrorCode
 from .livekit_api import LiveKitAPI
 from .access_token import VideoGrants, AccessToken, TokenVerifier
 from .webhook import WebhookReceiver

{livekit-api-0.2.1 → livekit-api-0.4.0}/livekit/api/_service.py

@@ -1,7 +1,7 @@
 from typing import Dict
 import aiohttp
 from abc import ABC
-from ._twirp_client import TwirpClient
+from .twirp_client import TwirpClient
 from .access_token import AccessToken, VideoGrants
 
 AUTHORIZATION = "authorization"
@@ -9,7 +9,7 @@ AUTHORIZATION = "authorization"
 
 class Service(ABC):
     def __init__(
-        self, host: str, api_key: str, api_secret: str, session: aiohttp.ClientSession
+        self, session: aiohttp.ClientSession, host: str, api_key: str, api_secret: str
     ):
         self._client = TwirpClient(session, host, "livekit")
         self.api_key = api_key

{livekit-api-0.2.1 → livekit-api-0.4.0}/livekit/api/access_token.py

@@ -18,6 +18,7 @@ import re
 import datetime
 import os
 import jwt
+from typing import Optional, List
 
 DEFAULT_TTL = datetime.timedelta(hours=6)
 DEFAULT_LEEWAY = datetime.timedelta(minutes=1)
@@ -43,7 +44,7 @@ class VideoGrants:
     # TrackSource types that a participant may publish.
     # When set, it supercedes CanPublish. Only sources explicitly set here can be
     # published
-    can_publish_sources: list[str] = dataclasses.field(default_factory=list)
+    can_publish_sources: List[str] = dataclasses.field(default_factory=list)
 
     # by default, a participant is not allowed to update its own metadata
     can_update_own_metadata: bool = False
@@ -74,14 +75,18 @@ class Claims:
 class AccessToken:
     def __init__(
         self,
-        api_key: str = os.getenv("LIVEKIT_API_KEY", ""),
-        api_secret: str = os.getenv("LIVEKIT_API_SECRET", ""),
+        api_key: Optional[str] = None,
+        api_secret: Optional[str] = None,
     ) -> None:
+        api_key = api_key or os.getenv("LIVEKIT_API_KEY")
+        api_secret = api_secret or os.getenv("LIVEKIT_API_SECRET")
+
+        if not api_key or not api_secret:
+            raise ValueError("api_key and api_secret must be set")
+
         self.api_key = api_key  # iss
         self.api_secret = api_secret
         self.claims = Claims()
-        if not api_key or not api_secret:
-            raise ValueError("api_key and api_secret must be set")
 
         # default jwt claims
         self.identity = ""  # sub
@@ -137,11 +142,17 @@ class AccessToken:
 class TokenVerifier:
     def __init__(
         self,
-        api_key: str = os.getenv("LIVEKIT_API_KEY", ""),
-        api_secret: str = os.getenv("LIVEKIT_API_SECRET", ""),
+        api_key: Optional[str] = None,
+        api_secret: Optional[str] = None,
         *,
         leeway: datetime.timedelta = DEFAULT_LEEWAY,
     ) -> None:
+        api_key = api_key or os.getenv("LIVEKIT_API_KEY")
+        api_secret = api_secret or os.getenv("LIVEKIT_API_SECRET")
+
+        if not api_key or not api_secret:
+            raise ValueError("api_key and api_secret must be set")
+
         self.api_key = api_key
         self.api_secret = api_secret
         self._leeway = leeway

livekit-api-0.4.0/livekit/api/livekit_api.py

@@ -0,0 +1,46 @@
+import aiohttp
+import os
+from .room_service import RoomService
+from .egress_service import EgressService
+from .ingress_service import IngressService
+from typing import Optional
+
+
+class LiveKitAPI:
+    def __init__(
+        self,
+        url: Optional[str] = None,
+        api_key: Optional[str] = None,
+        api_secret: Optional[str] = None,
+        *,
+        timeout: aiohttp.ClientTimeout = aiohttp.ClientTimeout(total=60),  # 60 seconds
+    ):
+        url = url or os.getenv("LIVEKIT_URL")
+        api_key = api_key or os.getenv("LIVEKIT_API_KEY")
+        api_secret = api_secret or os.getenv("LIVEKIT_API_SECRET")
+
+        if not url:
+            raise ValueError("url must be set")
+
+        if not api_key or not api_secret:
+            raise ValueError("api_key and api_secret must be set")
+
+        self._session = aiohttp.ClientSession(timeout=timeout)
+        self._room = RoomService(self._session, url, api_key, api_secret)
+        self._ingress = IngressService(self._session, url, api_key, api_secret)
+        self._egress = EgressService(self._session, url, api_key, api_secret)
+
+    @property
+    def room(self):
+        return self._room
+
+    @property
+    def ingress(self):
+        return self._ingress
+
+    @property
+    def egress(self):
+        return self._egress
+
+    async def aclose(self):
+        await self._session.close()

livekit-api-0.2.1/livekit/api/_twirp_client.py → livekit-api-0.4.0/livekit/api/twirp_client.py

@@ -23,8 +23,16 @@ DEFAULT_PREFIX = "twirp"
 
 class TwirpError(Exception):
     def __init__(self, code: str, msg: str) -> None:
-        self.code = code
-        self.msg = msg
+        self._code = code
+        self._msg = msg
+
+    @property
+    def code(self) -> str:
+        return self._code
+
+    @property
+    def message(self) -> str:
+        return self._msg
 
 
 class TwirpErrorCode:
@@ -59,8 +67,6 @@ class TwirpClient:
         pkg: str,
         prefix: str = DEFAULT_PREFIX,
     ) -> None:
-        self._session = aiohttp.ClientSession()
-
         parse_res = urlparse(host)
         scheme = parse_res.scheme
         if scheme.startswith("ws"):
@@ -70,6 +76,7 @@ class TwirpClient:
         self.host = host.rstrip("/")
         self.pkg = pkg
         self.prefix = prefix
+        self._session = session
 
     async def request(
         self,

livekit-api-0.4.0/livekit/api/version.py

@@ -0,0 +1 @@
+__version__ = "0.4.0"

{livekit-api-0.2.1 → livekit-api-0.4.0}/livekit_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: livekit-api
-Version: 0.2.1
+Version: 0.4.0
 Summary: Python Server API for LiveKit
 Home-page: https://github.com/livekit/python-sdks
 License: Apache-2.0
@@ -19,13 +19,13 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3 :: Only
-Requires-Python: >=3.7.0
+Requires-Python: >=3.8.0
 Description-Content-Type: text/markdown
 Requires-Dist: pyjwt>=2.0.0
-Requires-Dist: aiohttp>=3.8.0
-Requires-Dist: protobuf>=3.1.0
-Requires-Dist: types-protobuf>=3.1.0
-Requires-Dist: livekit-protocol>=0.2.0
+Requires-Dist: aiohttp>=3.9.0
+Requires-Dist: protobuf==4.25.1
+Requires-Dist: types-protobuf<5,>=4
+Requires-Dist: livekit-protocol~=0.3.0
 
 # LiveKit Server APIs
 

{livekit-api-0.2.1 → livekit-api-0.4.0}/livekit_api.egg-info/SOURCES.txt

@@ -3,12 +3,12 @@ pyproject.toml
 setup.py
 livekit/api/__init__.py
 livekit/api/_service.py
-livekit/api/_twirp_client.py
 livekit/api/access_token.py
 livekit/api/egress_service.py
 livekit/api/ingress_service.py
 livekit/api/livekit_api.py
 livekit/api/room_service.py
+livekit/api/twirp_client.py
 livekit/api/version.py
 livekit/api/webhook.py
 livekit_api.egg-info/PKG-INFO

livekit-api-0.4.0/livekit_api.egg-info/requires.txt

@@ -0,0 +1,5 @@
+pyjwt>=2.0.0
+aiohttp>=3.9.0
+protobuf==4.25.1
+types-protobuf<5,>=4
+livekit-protocol~=0.3.0

{livekit-api-0.2.1 → livekit-api-0.4.0}/setup.py

@@ -46,13 +46,13 @@ setuptools.setup(
     keywords=["webrtc", "realtime", "audio", "video", "livekit"],
     license="Apache-2.0",
     packages=setuptools.find_namespace_packages(include=["livekit.*"]),
-    python_requires=">=3.7.0",
+    python_requires=">=3.8.0",
     install_requires=[
         "pyjwt>=2.0.0",
-        "aiohttp>=3.8.0",
-        "protobuf>=3.1.0",
-        "types-protobuf>=3.1.0",
-        "livekit-protocol>=0.2.0",
+        "aiohttp>=3.9.0",
+        "protobuf==4.25.1",
+        "types-protobuf>=4,<5",
+        "livekit-protocol~=0.3.0",
     ],
     package_data={
         "livekit.api": ["py.typed", "*.pyi", "**/*.pyi"],

{livekit-api-0.2.1 → livekit-api-0.4.0}/tests/test_access_token.py

@@ -45,7 +45,7 @@ def test_verify_token_expired():
     token = (
         AccessToken(TEST_API_KEY, TEST_API_SECRET)
         .with_identity("test_identity")
-        .with_ttl(datetime.timedelta(seconds=0))
+        .with_ttl(datetime.timedelta(seconds=-1))
         .to_jwt()
     )
 

livekit-api-0.2.1/livekit/api/livekit_api.py

@@ -1,35 +0,0 @@
-import aiohttp
-import os
-from .room_service import RoomService
-from .egress_service import EgressService
-from .ingress_service import IngressService
-
-
-class LiveKitAPI:
-    def __init__(
-        self,
-        url: str = os.getenv("LIVEKIT_URL", "http://localhost:7880"),
-        api_key: str = os.getenv("LIVEKIT_API_KEY", ""),
-        api_secret: str = os.getenv("LIVEKIT_API_SECRET", ""),
-        *,
-        timeout: float = 60,  # 1 minutes by default
-    ):
-        self._session = aiohttp.ClientSession(timeout=timeout)
-        self._room = RoomService(url, api_key, api_secret, self._session)
-        self._ingress = IngressService(url, api_key, api_secret, self._session)
-        self._egress = EgressService(url, api_key, api_secret, self._session)
-
-    @property
-    def room(self):
-        return self._room
-
-    @property
-    def ingress(self):
-        return self._ingress
-
-    @property
-    def egress(self):
-        return self._egress
-
-    async def aclose(self):
-        await self._session.close()

livekit-api-0.2.1/livekit/api/version.py

@@ -1 +0,0 @@
-__version__ = "0.2.1"

livekit-api-0.2.1/livekit_api.egg-info/requires.txt

@@ -1,5 +0,0 @@
-pyjwt>=2.0.0
-aiohttp>=3.8.0
-protobuf>=3.1.0
-types-protobuf>=3.1.0
-livekit-protocol>=0.2.0