Fix: Widen query type from Query to AbstractQuery

RawQuery extends AbstractQuery directly, not Query. Methods accepting
queries should accept any AbstractQuery subclass.

Author: Chocapikk

leakix/async_client.py

@@ -9,7 +9,7 @@
 
 from leakix.base import DEFAULT_URL, BaseClient
 from leakix.client import Scope
-from leakix.query import Query, serialize_queries
+from leakix.query import AbstractQuery, serialize_queries
 from leakix.response import (
     AbstractResponse,
     ErrorResponse,
@@ -78,7 +78,7 @@ async def _get(
     async def get(
         self,
         scope: Scope,
-        queries: list[Query] | None = None,
+        queries: list[AbstractQuery] | None = None,
         page: int = 0,
     ) -> AbstractResponse:
         """Search LeakIX for services or leaks."""
@@ -91,15 +91,15 @@ async def get(
         )
 
     async def get_service(
-        self, queries: list[Query] | None = None, page: int = 0
+        self, queries: list[AbstractQuery] | None = None, page: int = 0
     ) -> AbstractResponse:
         """Shortcut for get with scope=Scope.SERVICE."""
         return self._parse_events(
             await self.get(Scope.SERVICE, queries=queries, page=page)
         )
 
     async def get_leak(
-        self, queries: list[Query] | None = None, page: int = 0
+        self, queries: list[AbstractQuery] | None = None, page: int = 0
     ) -> AbstractResponse:
         """Shortcut for get with scope=Scope.LEAK."""
         return self._parse_events(
@@ -139,7 +139,9 @@ 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}"))
 
-    async def bulk_export(self, queries: list[Query] | None = None) -> AbstractResponse:
+    async def bulk_export(
+        self, queries: list[AbstractQuery] | None = None
+    ) -> AbstractResponse:
         """Bulk export leaks (Pro API feature)."""
         serialized_query = serialize_queries(queries)
         client = await self._get_client()
@@ -164,7 +166,7 @@ async def bulk_export(self, queries: list[Query] | None = None) -> AbstractRespo
                 return ErrorResponse(response=r, response_json=r.json())
 
     async def bulk_export_stream(
-        self, queries: list[Query] | None = None
+        self, queries: list[AbstractQuery] | None = None
     ) -> AsyncIterator[l9format.L9Aggregation]:
         """
         Streaming version of bulk_export. Yields L9Aggregation objects one by one.

leakix/client.py

@@ -8,7 +8,7 @@
 
 from leakix.base import BaseClient
 from leakix.base import HostResult as HostResult
-from leakix.query import Query, serialize_queries
+from leakix.query import AbstractQuery, serialize_queries
 from leakix.response import (
     AbstractResponse,
     ErrorResponse,
@@ -42,7 +42,7 @@ def __get(self, url: str, params: dict[str, Any] | None) -> AbstractResponse:
     def get(
         self,
         scope: Scope,
-        queries: list[Query] | None = None,
+        queries: list[AbstractQuery] | None = None,
         page: int = 0,
     ) -> AbstractResponse:
         """
@@ -81,13 +81,13 @@ def get(
         )
 
     def get_service(
-        self, queries: list[Query] | None = None, page: int = 0
+        self, queries: list[AbstractQuery] | None = None, page: int = 0
     ) -> AbstractResponse:
         """Shortcut for `get` with the scope `Scope.SERVICE`."""
         return self._parse_events(self.get(Scope.SERVICE, queries=queries, page=page))
 
     def get_leak(
-        self, queries: list[Query] | None = None, page: int = 0
+        self, queries: list[AbstractQuery] | None = None, page: int = 0
     ) -> AbstractResponse:
         """Shortcut for `get` with the scope `Scope.LEAK`."""
         return self._parse_events(self.get(Scope.LEAK, queries=queries, page=page))
@@ -122,7 +122,9 @@ def get_subdomains(self, domain: str) -> AbstractResponse:
         url = f"{self.base_url}/api/subdomains/{domain}"
         return self._parse_subdomains(self.__get(url, params=None))
 
-    def bulk_export(self, queries: list[Query] | None = None) -> AbstractResponse:
+    def bulk_export(
+        self, queries: list[AbstractQuery] | None = None
+    ) -> AbstractResponse:
         url = f"{self.base_url}/bulk/search"
         params = {"q": serialize_queries(queries)}
         r = requests.get(url, params=params, headers=self.headers, stream=True)
@@ -140,7 +142,7 @@ def bulk_export(self, queries: list[Query] | None = None) -> AbstractResponse:
             return ErrorResponse(response=r, response_json=r.json())
 
     def bulk_export_last_event(
-        self, queries: list[Query] | None = None
+        self, queries: list[AbstractQuery] | None = None
     ) -> AbstractResponse:
         response = self.bulk_export(queries)
         if response.is_success():
@@ -154,7 +156,9 @@ def bulk_export_last_event(
                 aggreg.events = [sorted_events[0]]
         return response
 
-    def bulk_service(self, queries: list[Query] | None = None) -> AbstractResponse:
+    def bulk_service(
+        self, queries: list[AbstractQuery] | None = None
+    ) -> AbstractResponse:
         url = f"{self.base_url}/bulk/service"
         params = {"q": serialize_queries(queries)}
         r = requests.get(url, params=params, headers=self.headers, stream=True)
@@ -198,7 +202,7 @@ def search(
         return self._parse_events(r)
 
     def bulk_export_stream(
-        self, queries: list[Query] | None = None
+        self, queries: list[AbstractQuery] | None = None
     ) -> Iterator[l9format.L9Aggregation]:
         """
         Streaming version of bulk_export. Yields L9Aggregation objects one by one.

leakix/query.py

@@ -77,7 +77,7 @@ def serialize(self) -> str:
         return self.raw_q
 
 
-def serialize_queries(queries: list[Query] | None) -> str:
+def serialize_queries(queries: list[AbstractQuery] | None) -> str:
     """Serialize a list of queries into a query string for the API."""
     if queries is None or len(queries) == 0:
         return EmptyQuery().serialize()