refactor: centralize shared HTTP client logic in stream.py

Move _apply_shared_client into BaseStream so sub-client files
need zero HTTP-related changes. Remove _resolve_http_client from
BaseClient/AsyncBaseClient.

Made-with: Cursor

Author: itsmeadi

getstream/base.py

@@ -158,7 +158,7 @@ def __init__(
             timeout=timeout,
             user_agent=user_agent,
         )
-        http_client = self._resolve_http_client()
+        http_client = getattr(self, "_http_client", None)
         if http_client is not None:
             if not isinstance(http_client, httpx.Client):
                 raise TypeError(
@@ -185,18 +185,6 @@ def __init__(
             self.client = httpx.Client(**client_kwargs)
             self._owns_http_client = True
 
-    def _resolve_http_client(self):
-        """Return a pre-built httpx client if one was provided, checking both
-        the instance attribute (set by BaseStream) and the parent stream
-        back-reference (set by sub-clients like VideoClient)."""
-        client = getattr(self, "_http_client", None)
-        if client is not None:
-            return client
-        stream = getattr(self, "stream", None)
-        if stream is not None:
-            return getattr(stream, "_shared_client", None)
-        return None
-
     def __enter__(self):
         return self
 
@@ -405,7 +393,7 @@ def __init__(
             timeout=timeout,
             user_agent=user_agent,
         )
-        http_client = self._resolve_http_client()
+        http_client = getattr(self, "_http_client", None)
         if http_client is not None:
             if not isinstance(http_client, httpx.AsyncClient):
                 raise TypeError(
@@ -432,15 +420,6 @@ def __init__(
             self.client = httpx.AsyncClient(**client_kwargs)
             self._owns_http_client = True
 
-    def _resolve_http_client(self):
-        client = getattr(self, "_http_client", None)
-        if client is not None:
-            return client
-        stream = getattr(self, "stream", None)
-        if stream is not None:
-            return getattr(stream, "_shared_client", None)
-        return None
-
     async def __aenter__(self):
         return self
 

getstream/chat/async_client.py

@@ -15,14 +15,14 @@
 
 class ChatClient(ChatRestClient):
     def __init__(self, api_key: str, base_url, token, timeout, stream, user_agent=None):
-        self.stream = stream
         super().__init__(
             api_key=api_key,
             base_url=base_url,
             token=token,
             timeout=timeout,
             user_agent=user_agent,
         )
+        self.stream = stream
 
     def channel(self, call_type: str, id: str) -> Channel:
         return Channel(self, call_type, id)

getstream/chat/client.py

@@ -15,14 +15,14 @@
 
 class ChatClient(ChatRestClient):
     def __init__(self, api_key: str, base_url, token, timeout, stream, user_agent=None):
-        self.stream = stream
         super().__init__(
             api_key=api_key,
             base_url=base_url,
             token=token,
             timeout=timeout,
             user_agent=user_agent,
         )
+        self.stream = stream
 
     def channel(self, call_type: str, id: str) -> Channel:
         return Channel(self, call_type, id)

getstream/feeds/client.py

@@ -5,14 +5,14 @@
 
 class FeedsClient(FeedsRestClient):
     def __init__(self, api_key: str, base_url, token, timeout, stream, user_agent=None):
-        self.stream = stream
         super().__init__(
             api_key=api_key,
             base_url=base_url,
             token=token,
             timeout=timeout,
             user_agent=user_agent,
         )
+        self.stream = stream
 
     def feed(
         self, feed_type: str, feed_id: str, custom_data: Optional[Dict] = None

getstream/moderation/async_client.py

@@ -3,11 +3,11 @@
 
 class ModerationClient(ModerationRestClient):
     def __init__(self, api_key: str, base_url, token, timeout, stream, user_agent=None):
-        self.stream = stream
         super().__init__(
             api_key=api_key,
             base_url=base_url,
             token=token,
             timeout=timeout,
             user_agent=user_agent,
         )
+        self.stream = stream

getstream/moderation/client.py

@@ -3,11 +3,11 @@
 
 class ModerationClient(ModerationRestClient):
     def __init__(self, api_key: str, base_url, token, timeout, stream, user_agent=None):
-        self.stream = stream
         super().__init__(
             api_key=api_key,
             base_url=base_url,
             token=token,
             timeout=timeout,
             user_agent=user_agent,
         )
+        self.stream = stream

getstream/stream.py

@@ -6,6 +6,7 @@
 from typing import List, Optional
 from uuid import uuid4
 
+import httpx
 import jwt
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
@@ -87,6 +88,16 @@ def __init__(
         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,
         user_id: str,
@@ -183,13 +194,15 @@ def video(self) -> AsyncVideoClient:
         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
@@ -198,13 +211,15 @@ def chat(self) -> AsyncChatClient:
         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
@@ -213,13 +228,15 @@ def moderation(self) -> AsyncModerationClient:
         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):
@@ -305,13 +322,15 @@ def video(self) -> VideoClient:
         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
@@ -320,13 +339,15 @@ def chat(self) -> ChatClient:
         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
@@ -335,13 +356,15 @@ def moderation(self) -> ModerationClient:
         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
@@ -350,13 +373,15 @@ def feeds(self) -> FeedsClient:
         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")

getstream/video/async_client.py

@@ -12,14 +12,14 @@ def __init__(self, api_key: str, base_url, token, timeout, stream, user_agent=No
         :param timeout: A number representing the time limit for a request
         :param user_agent: Optional custom user agent string
         """
-        self.stream = stream
         super().__init__(
             api_key=api_key,
             base_url=base_url,
             token=token,
             timeout=timeout,
             user_agent=user_agent,
         )
+        self.stream = stream
 
     def call(self, call_type: str, id: str) -> Call:
         return Call(self, call_type, id)

getstream/video/client.py

@@ -12,14 +12,14 @@ def __init__(self, api_key: str, base_url, token, timeout, stream, user_agent=No
         :param timeout: A number representing the time limit for a request
         :param user_agent: Optional custom user agent string
         """
-        self.stream = stream
         super().__init__(
             api_key=api_key,
             base_url=base_url,
             token=token,
             timeout=timeout,
             user_agent=user_agent,
         )
+        self.stream = stream
 
     def call(self, call_type: str, id: str) -> Call:
         return Call(self, call_type, id)