Fix clone() and with_...() methods for AsyncClient (#457)

MarshalX · Nov 23, 2024 · 2116fcb · 2116fcb
1 parent d030829
commit 2116fcb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 26 deletions.
diff --git a/packages/atproto_client/client/async_client.py b/packages/atproto_client/client/async_client.py
@@ -8,7 +8,6 @@
 import typing as t
 from asyncio import Lock
 
-import typing_extensions as te
 from atproto_core.uri import AtUri
 
 from atproto_client import models
@@ -77,18 +76,6 @@ async def _import_session_string(self, session_string: str) -> Session:
 
         return import_session
 
-    async def clone(self) -> te.Self:
-        """Clone the client instance.
-
-        Used to customize atproto proxy and set of labeler services.
-
-        Returns:
-            Cloned client instance.
-        """
-        cloned_client = super().clone()
-        cloned_client.me = self.me
-        return cloned_client
-
     async def login(
         self, login: t.Optional[str] = None, password: t.Optional[str] = None, session_string: t.Optional[str] = None
     ) -> 'models.AppBskyActorDefs.ProfileViewDetailed':

diff --git a/packages/atproto_client/client/client.py b/packages/atproto_client/client/client.py
@@ -1,7 +1,6 @@
 import typing as t
 from threading import Lock
 
-import typing_extensions as te
 from atproto_core.uri import AtUri
 
 from atproto_client import models
@@ -68,18 +67,6 @@ def _import_session_string(self, session_string: str) -> Session:
 
         return import_session
 
-    def clone(self) -> te.Self:
-        """Clone the client instance.
-
-        Used to customize atproto proxy and set of labeler services.
-
-        Returns:
-            Cloned client instance.
-        """
-        cloned_client = super().clone()
-        cloned_client.me = self.me
-        return cloned_client
-
     def login(
         self, login: t.Optional[str] = None, password: t.Optional[str] = None, session_string: t.Optional[str] = None
     ) -> 'models.AppBskyActorDefs.ProfileViewDetailed':

diff --git a/packages/atproto_client/client/methods_mixin/headers.py b/packages/atproto_client/client/methods_mixin/headers.py
@@ -20,6 +20,18 @@ class AtprotoServiceType(Enum):
         ATPROTO_LABELER = 'atproto_labeler'
         BSKY_CHAT = 'bsky_chat'
 
+    def clone(self) -> te.Self:
+        """Clone the client instance.
+
+        Used to customize atproto proxy and set of labeler services.
+
+        Returns:
+            Cloned client instance.
+        """
+        cloned_client = super().clone()
+        cloned_client.me = self.me
+        return cloned_client
+
     def with_proxy(self, service_type: t.Union[AtprotoServiceType, str], did: str) -> te.Self:
         """Get a new client instance with the atproto-proxy header configured.