Refactor FactsClient methods to remove optional query parameters

- Updated `build_forward_request` and `send_forward_request` methods in `FactsClient` to eliminate the optional `query_params` argument, simplifying the request handling process.
- Adjusted related calls in `facts_router` to align with the new method signatures, ensuring consistent behavior across the application.

Author: omer9564

horizon/facts/client.py

@@ -1,4 +1,4 @@
-from typing import Annotated, Any
+from typing import Annotated
 from urllib.parse import urljoin
 
 from fastapi import Depends, HTTPException
@@ -31,7 +31,9 @@ def client(self) -> AsyncClient:
         return self._client
 
     async def build_forward_request(
-        self, request: FastApiRequest, path: str, *, query_params: dict[str, Any] | None = None
+        self,
+        request: FastApiRequest,
+        path: str,
     ) -> HttpxRequest:
         """
         Build an HTTPX request from a FastAPI request to forward to the facts service.
@@ -55,7 +57,7 @@ async def build_forward_request(
         return self.client.build_request(
             method=request.method,
             url=full_path,
-            params={**request.query_params, **(query_params or {})},
+            params=request.query_params,
             headers=forward_headers,
             content=request.stream(),
         )
@@ -65,15 +67,17 @@ async def send(self, request: HttpxRequest, *, stream: bool = False) -> HttpxRes
         return await self.client.send(request, stream=stream)
 
     async def send_forward_request(
-        self, request: FastApiRequest, path: str, *, query_params: dict[str, Any] | None = None
+        self,
+        request: FastApiRequest,
+        path: str,
     ) -> HttpxResponse:
         """
         Send a forward request to the facts service.
         :param request: FastAPI request
         :param path: Backend facts service path to forward to
         :return: HTTPX response
         """
-        forward_request = await self.build_forward_request(request, path, query_params=query_params)
+        forward_request = await self.build_forward_request(request, path)
         return await self.send(forward_request)
 
     @staticmethod

horizon/facts/router.py

@@ -207,7 +207,6 @@ async def unassign_user_role(
         update_subscriber,
         wait_timeout,
         path=f"/users/{user_id}/roles",
-        query_params={"return_deleted": True},
         entries_callback=create_role_assignment_data_entries,
         timeout_policy=timeout_policy,
     )
@@ -246,7 +245,6 @@ async def delete_role_assignment(
         update_subscriber,
         wait_timeout,
         path="/role_assignments",
-        query_params={"return_deleted": True},
         entries_callback=create_role_assignment_data_entries,
         timeout_policy=timeout_policy,
     )
@@ -341,13 +339,12 @@ async def forward_request_then_wait_for_update(
     wait_timeout: float | None,
     *,
     path: str,
-    query_params: dict[str, Any] | None = None,
     update_id: UUID | None = None,
     entries_callback: Callable[[FastApiRequest, dict[str, Any], UUID | None], Iterable[DataSourceEntry]],
     timeout_policy: TimeoutPolicy = TimeoutPolicy.IGNORE,
 ) -> Response:
     _update_id = update_id or uuid4()
-    response = await client.send_forward_request(request, path, query_params=query_params)
+    response = await client.send_forward_request(request, path)
     body = client.extract_body(response)
     if body is None:
         return client.convert_response(response)