getstream 3.1.2__tar.gz → 3.2.0__tar.gz

{getstream-3.1.2 → getstream-3.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: getstream
-Version: 3.1.2
+Version: 3.2.0
 Summary: GetStream Python SDK - Build scalable activity feeds, chat, and video calling applications
 Author-email: sachaarbonel <sacha.arbonel@hotmail.fr>, tbarbugli <tbarbugli@gmail.com>
 License-File: LICENSE.md

{getstream-3.1.2 → getstream-3.2.0}/getstream/base.py

@@ -158,12 +158,38 @@ class BaseClient(TelemetryEndpointMixin, BaseConfig, ResponseParserMixin, ABC):
             timeout=timeout,
             user_agent=user_agent,
         )
-        self.client = httpx.Client(
-            base_url=self.base_url or "",
-            headers=self.headers,
-            params=self.params,
-            timeout=httpx.Timeout(self.timeout),
-        )
+        http_client = getattr(self, "_http_client", None)
+        if http_client is not None:
+            if not isinstance(http_client, httpx.Client):
+                raise TypeError(
+                    f"http_client must be an httpx.Client instance, "
+                    f"got {type(http_client).__name__}"
+                )
+            http_client.headers.update(self.headers)
+            http_client.params = http_client.params.merge(self.params)
+            http_client.base_url = self.base_url or ""
+            if self.timeout is not None:
+                http_client.timeout = httpx.Timeout(self.timeout)
+            self.client = http_client
+            self._owns_http_client = False
+        else:
+            transport = getattr(self, "_transport", None)
+            if transport is not None:
+                self.client = httpx.Client(
+                    base_url=self.base_url or "",
+                    headers=self.headers,
+                    params=self.params,
+                    timeout=httpx.Timeout(self.timeout),
+                    transport=transport,
+                )
+            else:
+                self.client = httpx.Client(
+                    base_url=self.base_url or "",
+                    headers=self.headers,
+                    params=self.params,
+                    timeout=httpx.Timeout(self.timeout),
+                )
+            self._owns_http_client = True
 
     def __enter__(self):
         return self
@@ -348,8 +374,13 @@ class BaseClient(TelemetryEndpointMixin, BaseConfig, ResponseParserMixin, ABC):
     def close(self):
         """
         Close HTTPX client.
+
+        If the client was provided externally via ``http_client``, this is a
+        no-op — the caller that created the client is responsible for closing
+        it.
         """
-        self.client.close()
+        if getattr(self, "_owns_http_client", True):
+            self.client.close()
 
 
 class AsyncBaseClient(TelemetryEndpointMixin, BaseConfig, ResponseParserMixin, ABC):
@@ -368,12 +399,38 @@ class AsyncBaseClient(TelemetryEndpointMixin, BaseConfig, ResponseParserMixin, A
             timeout=timeout,
             user_agent=user_agent,
         )
-        self.client = httpx.AsyncClient(
-            base_url=self.base_url or "",
-            headers=self.headers,
-            params=self.params,
-            timeout=httpx.Timeout(self.timeout),
-        )
+        http_client = getattr(self, "_http_client", None)
+        if http_client is not None:
+            if not isinstance(http_client, httpx.AsyncClient):
+                raise TypeError(
+                    f"http_client must be an httpx.AsyncClient instance, "
+                    f"got {type(http_client).__name__}"
+                )
+            http_client.headers.update(self.headers)
+            http_client.params = http_client.params.merge(self.params)
+            http_client.base_url = self.base_url or ""
+            if self.timeout is not None:
+                http_client.timeout = httpx.Timeout(self.timeout)
+            self.client = http_client
+            self._owns_http_client = False
+        else:
+            transport = getattr(self, "_transport", None)
+            if transport is not None:
+                self.client = httpx.AsyncClient(
+                    base_url=self.base_url or "",
+                    headers=self.headers,
+                    params=self.params,
+                    timeout=httpx.Timeout(self.timeout),
+                    transport=transport,
+                )
+            else:
+                self.client = httpx.AsyncClient(
+                    base_url=self.base_url or "",
+                    headers=self.headers,
+                    params=self.params,
+                    timeout=httpx.Timeout(self.timeout),
+                )
+            self._owns_http_client = True
 
     async def __aenter__(self):
         return self
@@ -382,8 +439,14 @@ class AsyncBaseClient(TelemetryEndpointMixin, BaseConfig, ResponseParserMixin, A
         await self.aclose()
 
     async def aclose(self):
-        """Close HTTPX async client (closes pools/keep-alives)."""
-        await self.client.aclose()
+        """Close HTTPX async client (closes pools/keep-alives).
+
+        If the client was provided externally via ``http_client``, this is a
+        no-op — the caller that created the client is responsible for closing
+        it.
+        """
+        if getattr(self, "_owns_http_client", True):
+            await self.client.aclose()
 
     async def _upload_multipart(
         self,

{getstream-3.1.2 → getstream-3.2.0}/getstream/stream.py

@@ -6,6 +6,7 @@ import time
 from typing import List, Optional
 from uuid import uuid4
 
+import httpx
 import jwt
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
@@ -47,7 +48,12 @@ class BaseStream:
         timeout: Optional[float] = 6.0,
         base_url: Optional[str] = BASE_URL,
         user_agent: Optional[str] = None,
+        transport=None,
+        http_client=None,
     ):
+        if transport is not None and http_client is not None:
+            raise ValueError("Cannot specify both 'transport' and 'http_client'")
+
         if None in (api_key, api_secret, timeout, base_url):
             s = Settings()  # loads from env and optional .env
             api_key = api_key or s.api_key
@@ -68,10 +74,29 @@ class BaseStream:
 
         self.base_url = validate_and_clean_url(base_url)
         self.user_agent = user_agent
+        self._transport = transport
+        self._http_client = http_client
         self.token = self._create_token()
         super().__init__(
             self.api_key, self.base_url, self.token, self.timeout, self.user_agent
         )
+        # After super().__init__(), self.client is fully built and configured.
+        # When the user provided custom HTTP config, sub-clients share this
+        # client instead of each building their own.
+        if transport is not None or http_client is not None:
+            self._shared_client = self.client
+        else:
+            self._shared_client = None
+
+    def _apply_shared_client(self, sub_client):
+        """Replace a sub-client's auto-created httpx client with the shared
+        one built from user-provided transport/http_client config."""
+        if self._shared_client is not None:
+            if isinstance(sub_client.client, httpx.Client):
+                sub_client.client.close()
+            sub_client.client = self._shared_client
+            sub_client._owns_http_client = False
+        return sub_client
 
     def create_token(
         self,
@@ -169,13 +194,15 @@ class AsyncStream(BaseStream, AsyncCommonClient):
         Video stream client.
 
         """
-        return AsyncVideoClient(
-            api_key=self.api_key,
-            base_url=self.base_url,
-            token=self.token,
-            timeout=self.timeout,
-            stream=self,
-            user_agent=self.user_agent,
+        return self._apply_shared_client(
+            AsyncVideoClient(
+                api_key=self.api_key,
+                base_url=self.base_url,
+                token=self.token,
+                timeout=self.timeout,
+                stream=self,
+                user_agent=self.user_agent,
+            )
         )
 
     @cached_property
@@ -184,13 +211,15 @@ class AsyncStream(BaseStream, AsyncCommonClient):
         Chat stream client.
 
         """
-        return AsyncChatClient(
-            api_key=self.api_key,
-            base_url=self.base_url,
-            token=self.token,
-            timeout=self.timeout,
-            stream=self,
-            user_agent=self.user_agent,
+        return self._apply_shared_client(
+            AsyncChatClient(
+                api_key=self.api_key,
+                base_url=self.base_url,
+                token=self.token,
+                timeout=self.timeout,
+                stream=self,
+                user_agent=self.user_agent,
+            )
         )
 
     @cached_property
@@ -199,13 +228,15 @@ class AsyncStream(BaseStream, AsyncCommonClient):
         Moderation stream client.
 
         """
-        return AsyncModerationClient(
-            api_key=self.api_key,
-            base_url=self.base_url,
-            token=self.token,
-            timeout=self.timeout,
-            stream=self,
-            user_agent=self.user_agent,
+        return self._apply_shared_client(
+            AsyncModerationClient(
+                api_key=self.api_key,
+                base_url=self.base_url,
+                token=self.token,
+                timeout=self.timeout,
+                stream=self,
+                user_agent=self.user_agent,
+            )
         )
 
     async def aclose(self):
@@ -291,13 +322,15 @@ class Stream(BaseStream, CommonClient):
         Video stream client.
 
         """
-        return VideoClient(
-            api_key=self.api_key,
-            base_url=self.base_url,
-            token=self.token,
-            timeout=self.timeout,
-            stream=self,
-            user_agent=self.user_agent,
+        return self._apply_shared_client(
+            VideoClient(
+                api_key=self.api_key,
+                base_url=self.base_url,
+                token=self.token,
+                timeout=self.timeout,
+                stream=self,
+                user_agent=self.user_agent,
+            )
         )
 
     @cached_property
@@ -306,13 +339,15 @@ class Stream(BaseStream, CommonClient):
         Chat stream client.
 
         """
-        return ChatClient(
-            api_key=self.api_key,
-            base_url=self.base_url,
-            token=self.token,
-            timeout=self.timeout,
-            stream=self,
-            user_agent=self.user_agent,
+        return self._apply_shared_client(
+            ChatClient(
+                api_key=self.api_key,
+                base_url=self.base_url,
+                token=self.token,
+                timeout=self.timeout,
+                stream=self,
+                user_agent=self.user_agent,
+            )
         )
 
     @cached_property
@@ -321,13 +356,15 @@ class Stream(BaseStream, CommonClient):
         Moderation stream client.
 
         """
-        return ModerationClient(
-            api_key=self.api_key,
-            base_url=self.base_url,
-            token=self.token,
-            timeout=self.timeout,
-            stream=self,
-            user_agent=self.user_agent,
+        return self._apply_shared_client(
+            ModerationClient(
+                api_key=self.api_key,
+                base_url=self.base_url,
+                token=self.token,
+                timeout=self.timeout,
+                stream=self,
+                user_agent=self.user_agent,
+            )
         )
 
     @cached_property
@@ -336,13 +373,15 @@ class Stream(BaseStream, CommonClient):
         Feeds stream client.
 
         """
-        return FeedsClient(
-            api_key=self.api_key,
-            base_url=self.base_url,
-            token=self.token,
-            timeout=self.timeout,
-            stream=self,
-            user_agent=self.user_agent,
+        return self._apply_shared_client(
+            FeedsClient(
+                api_key=self.api_key,
+                base_url=self.base_url,
+                token=self.token,
+                timeout=self.timeout,
+                stream=self,
+                user_agent=self.user_agent,
+            )
         )
 
     @telemetry.operation_name("getstream.api.common.create_user")