Refactor: Use __get in both sync and async clients for uniform API

Author: Chocapikk

leakix/async_client.py

@@ -59,7 +59,7 @@ async def __aenter__(self) -> "AsyncClient":
     async def __aexit__(self, *args: Any) -> None:
         await self.close()
 
-    async def _get(
+    async def __get(
         self, path: str, params: dict[str, Any] | None = None
     ) -> AbstractResponse:
         """Make a GET request and return an AbstractResponse."""
@@ -85,7 +85,7 @@ async def get(
         if page < 0:
             raise ValueError("Page argument must be a positive integer")
         serialized_query = serialize_queries(queries)
-        return await self._get(
+        return await self.__get(
             "/search",
             params={"scope": scope.value, "q": serialized_query, "page": page},
         )
@@ -117,27 +117,27 @@ async def search(
         """
         if page < 0:
             raise ValueError("Page argument must be a positive integer")
-        r = await self._get(
+        r = await self.__get(
             "/search",
             params={"scope": scope.value, "q": query, "page": page},
         )
         return self._parse_events(r)
 
     async def get_host(self, ipv4: str) -> AbstractResponse:
         """Returns the list of services and associated leaks for a given host."""
-        return self._parse_host_result(await self._get(f"/host/{ipv4}"))
+        return self._parse_host_result(await self.__get(f"/host/{ipv4}"))
 
     async def get_domain(self, domain: str) -> AbstractResponse:
         """Returns the list of services and associated leaks for a given domain."""
-        return self._parse_host_result(await self._get(f"/domain/{domain}"))
+        return self._parse_host_result(await self.__get(f"/domain/{domain}"))
 
     async def get_plugins(self) -> AbstractResponse:
         """Returns the list of plugins the authenticated user has access to."""
-        return self._parse_plugins(await self._get("/api/plugins"))
+        return self._parse_plugins(await self.__get("/api/plugins"))
 
     async def get_subdomains(self, domain: str) -> AbstractResponse:
         """Returns the list of subdomains for a given domain."""
-        return self._parse_subdomains(await self._get(f"/api/subdomains/{domain}"))
+        return self._parse_subdomains(await self.__get(f"/api/subdomains/{domain}"))
 
     async def bulk_export(
         self, queries: list[AbstractQuery] | None = None

leakix/client.py

@@ -23,7 +23,7 @@ class Scope(Enum):
 
 
 class Client(BaseClient):
-    def _get(self, url: str, params: dict[str, Any] | None) -> AbstractResponse:
+    def __get(self, url: str, params: dict[str, Any] | None) -> AbstractResponse:
         r = requests.get(
             url,
             params=params,
@@ -71,7 +71,7 @@ def get(
             raise ValueError("Page argument must be a positive integer")
         serialized_query = serialize_queries(queries)
         url = f"{self.base_url}/search"
-        return self._get(
+        return self.__get(
             url=url,
             params={
                 "scope": scope.value,
@@ -98,7 +98,7 @@ def get_host(self, ipv4: str) -> AbstractResponse:
         moment.
         """
         url = f"{self.base_url}/host/{ipv4}"
-        return self._parse_host_result(self._get(url, params=None))
+        return self._parse_host_result(self.__get(url, params=None))
 
     def get_plugins(self) -> AbstractResponse:
         """
@@ -111,7 +111,7 @@ def get_plugins(self) -> AbstractResponse:
         For the paid plans, have a look at https://leakix.net/plans.
         """
         url = f"{self.base_url}/api/plugins"
-        return self._parse_plugins(self._get(url, params=None))
+        return self._parse_plugins(self.__get(url, params=None))
 
     def get_subdomains(self, domain: str) -> AbstractResponse:
         """
@@ -120,7 +120,7 @@ def get_subdomains(self, domain: str) -> AbstractResponse:
         To get back a JSON/Python dictionary, use the method `to_dict` on the individual element of the response object.
         """
         url = f"{self.base_url}/api/subdomains/{domain}"
-        return self._parse_subdomains(self._get(url, params=None))
+        return self._parse_subdomains(self.__get(url, params=None))
 
     def bulk_export(
         self, queries: list[AbstractQuery] | None = None
@@ -180,7 +180,7 @@ def get_domain(self, domain: str) -> AbstractResponse:
         Returns the list of services and associated leaks for a given domain.
         """
         url = f"{self.base_url}/domain/{domain}"
-        return self._parse_host_result(self._get(url, params=None))
+        return self._parse_host_result(self.__get(url, params=None))
 
     def search(
         self, query: str, scope: Scope = Scope.LEAK, page: int = 0
@@ -195,7 +195,7 @@ def search(
         if page < 0:
             raise ValueError("Page argument must be a positive integer")
         url = f"{self.base_url}/search"
-        r = self._get(
+        r = self.__get(
             url=url,
             params={"scope": scope.value, "q": query, "page": page},
         )