Refactor Agora to extend base class and update exports

- Agora and AsyncAgora now extend base classes instead of duplicating code
- Export only Agora/AsyncAgora (with pool support) from main package
- Add edited files to .fernignore to prevent Fern overwriting

Co-Authored-By: blank@buildwithfern.com <blank@buildwithfern.com>

Author: devin-ai-integration[bot]

.fernignore

@@ -1 +1,4 @@
 # Specify files that shouldn't be modified by Fern
+src/agoraio/pool_client.py
+src/agoraio/__init__.py
+src/agoraio/core/domain.py

src/agoraio/__init__.py

@@ -7,16 +7,13 @@
 
 if typing.TYPE_CHECKING:
     from . import agents, core, phone_numbers, telephony
-    from .client import Agora, AsyncAgora
     from .core.domain import Area, Pool, create_pool
-    from .pool_client import AgoraPool, AsyncAgoraPool
+    from .pool_client import Agora, AsyncAgora
     from .version import __version__
 _dynamic_imports: typing.Dict[str, str] = {
-    "Agora": ".client",
-    "AgoraPool": ".pool_client",
+    "Agora": ".pool_client",
     "Area": ".core.domain",
-    "AsyncAgora": ".client",
-    "AsyncAgoraPool": ".pool_client",
+    "AsyncAgora": ".pool_client",
     "Pool": ".core.domain",
     "__version__": ".version",
     "agents": ".agents",
@@ -48,4 +45,4 @@ def __dir__():
     return sorted(lazy_attrs)
 
 
-__all__ = ["Agora", "AgoraPool", "Area", "AsyncAgora", "AsyncAgoraPool", "Pool", "__version__", "agents", "core", "create_pool", "phone_numbers", "telephony"]
+__all__ = ["Agora", "Area", "AsyncAgora", "Pool", "__version__", "agents", "core", "create_pool", "phone_numbers", "telephony"]

src/agoraio/pool_client.py

@@ -6,19 +6,15 @@
 
 import httpx
 
-from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from .client import Agora as BaseAgora
+from .client import AsyncAgora as BaseAsyncAgora
 from .core.domain import Area, Pool
 
-if typing.TYPE_CHECKING:
-    from .agents.client import AgentsClient, AsyncAgentsClient
-    from .phone_numbers.client import AsyncPhoneNumbersClient, PhoneNumbersClient
-    from .telephony.client import AsyncTelephonyClient, TelephonyClient
 
-
-class AgoraPool:
+class Agora(BaseAgora):
     """
-    AgoraPool is a wrapper around Agora that uses a domain pool
-    for regional URL cycling and automatic domain selection.
+    Agora extends the base client with domain pool support for
+    regional URL cycling and automatic domain selection.
 
     This client automatically:
     - Selects the best domain based on DNS resolution
@@ -46,9 +42,9 @@ class AgoraPool:
 
     Examples
     --------
-    from agoraio import AgoraPool, Area
+    from agoraio import Agora, Area
 
-    client = AgoraPool(
+    client = Agora(
         area=Area.US,
         username="YOUR_USERNAME",
         password="YOUR_PASSWORD",
@@ -67,24 +63,15 @@ def __init__(
         httpx_client: typing.Optional[httpx.Client] = None,
     ):
         self._pool = Pool(area)
-        _defaulted_timeout = (
-            timeout if timeout is not None else 60 if httpx_client is None else httpx_client.timeout.read
-        )
-        self._client_wrapper = SyncClientWrapper(
+        super().__init__(
             base_url=self._pool.get_current_url(),
             username=username,
             password=password,
             headers=headers,
-            httpx_client=httpx_client
-            if httpx_client is not None
-            else httpx.Client(timeout=_defaulted_timeout, follow_redirects=follow_redirects)
-            if follow_redirects is not None
-            else httpx.Client(timeout=_defaulted_timeout),
-            timeout=_defaulted_timeout,
+            timeout=timeout,
+            follow_redirects=follow_redirects,
+            httpx_client=httpx_client,
         )
-        self._agents: typing.Optional[AgentsClient] = None
-        self._telephony: typing.Optional[TelephonyClient] = None
-        self._phone_numbers: typing.Optional[PhoneNumbersClient] = None
 
     @property
     def pool(self) -> Pool:
@@ -122,35 +109,11 @@ def _update_base_url(self) -> None:
         """
         self._client_wrapper._base_url = self._pool.get_current_url()
 
-    @property
-    def agents(self):
-        if self._agents is None:
-            from .agents.client import AgentsClient  # noqa: E402
-
-            self._agents = AgentsClient(client_wrapper=self._client_wrapper)
-        return self._agents
-
-    @property
-    def telephony(self):
-        if self._telephony is None:
-            from .telephony.client import TelephonyClient  # noqa: E402
-
-            self._telephony = TelephonyClient(client_wrapper=self._client_wrapper)
-        return self._telephony
-
-    @property
-    def phone_numbers(self):
-        if self._phone_numbers is None:
-            from .phone_numbers.client import PhoneNumbersClient  # noqa: E402
-
-            self._phone_numbers = PhoneNumbersClient(client_wrapper=self._client_wrapper)
-        return self._phone_numbers
-
 
-class AsyncAgoraPool:
+class AsyncAgora(BaseAsyncAgora):
     """
-    AsyncAgoraPool is a wrapper around AsyncAgora that uses a domain pool
-    for regional URL cycling and automatic domain selection.
+    AsyncAgora extends the base async client with domain pool support for
+    regional URL cycling and automatic domain selection.
 
     This client automatically:
     - Selects the best domain based on DNS resolution
@@ -178,9 +141,9 @@ class AsyncAgoraPool:
 
     Examples
     --------
-    from agoraio import AsyncAgoraPool, Area
+    from agoraio import AsyncAgora, Area
 
-    client = AsyncAgoraPool(
+    client = AsyncAgora(
         area=Area.US,
         username="YOUR_USERNAME",
         password="YOUR_PASSWORD",
@@ -199,24 +162,15 @@ def __init__(
         httpx_client: typing.Optional[httpx.AsyncClient] = None,
     ):
         self._pool = Pool(area)
-        _defaulted_timeout = (
-            timeout if timeout is not None else 60 if httpx_client is None else httpx_client.timeout.read
-        )
-        self._client_wrapper = AsyncClientWrapper(
+        super().__init__(
             base_url=self._pool.get_current_url(),
             username=username,
             password=password,
             headers=headers,
-            httpx_client=httpx_client
-            if httpx_client is not None
-            else httpx.AsyncClient(timeout=_defaulted_timeout, follow_redirects=follow_redirects)
-            if follow_redirects is not None
-            else httpx.AsyncClient(timeout=_defaulted_timeout),
-            timeout=_defaulted_timeout,
+            timeout=timeout,
+            follow_redirects=follow_redirects,
+            httpx_client=httpx_client,
         )
-        self._agents: typing.Optional[AsyncAgentsClient] = None
-        self._telephony: typing.Optional[AsyncTelephonyClient] = None
-        self._phone_numbers: typing.Optional[AsyncPhoneNumbersClient] = None
 
     @property
     def pool(self) -> Pool:
@@ -253,27 +207,3 @@ def _update_base_url(self) -> None:
         Update the base URL in the client wrapper to match the pool's current URL.
         """
         self._client_wrapper._base_url = self._pool.get_current_url()
-
-    @property
-    def agents(self):
-        if self._agents is None:
-            from .agents.client import AsyncAgentsClient  # noqa: E402
-
-            self._agents = AsyncAgentsClient(client_wrapper=self._client_wrapper)
-        return self._agents
-
-    @property
-    def telephony(self):
-        if self._telephony is None:
-            from .telephony.client import AsyncTelephonyClient  # noqa: E402
-
-            self._telephony = AsyncTelephonyClient(client_wrapper=self._client_wrapper)
-        return self._telephony
-
-    @property
-    def phone_numbers(self):
-        if self._phone_numbers is None:
-            from .phone_numbers.client import AsyncPhoneNumbersClient  # noqa: E402
-
-            self._phone_numbers = AsyncPhoneNumbersClient(client_wrapper=self._client_wrapper)
-        return self._phone_numbers