fix(backend): use http adapter for task worker sdk client

This avoids overhead when initializing SSL context.

Signed-off-by: Fatih Acar <[email protected]>

Author: fatih-acar

backend/infrahub/services/adapters/http/__init__.py

@@ -11,6 +11,7 @@ async def get(
         self,
         url: str,
         headers: dict[str, Any] | None = None,
+        timeout: int | None = None,
     ) -> httpx.Response:
         raise NotImplementedError()
 
@@ -21,5 +22,6 @@ async def post(
         json: Any | None = None,
         headers: dict[str, Any] | None = None,
         verify: bool | None = None,
+        timeout: int | None = None,
     ) -> httpx.Response:
         raise NotImplementedError()

backend/infrahub/services/adapters/http/httpx.py

@@ -52,6 +52,7 @@ async def _request(
         json: Any | None = None,
         headers: dict[str, Any] | None = None,
         verify: bool | None = None,
+        timeout: int | None = None,
     ) -> httpx.Response:
         """Returns an httpx.Response object or raises HTTPServerError or child classes."""
         params: dict[str, Any] = {}
@@ -65,7 +66,7 @@ async def _request(
                     method=method,
                     url=url,
                     headers=headers,
-                    timeout=self.settings.timeout,
+                    timeout=timeout or self.settings.timeout,
                     **params,
                 )
             except ssl.SSLCertVerificationError as exc:
@@ -87,11 +88,13 @@ async def get(
         self,
         url: str,
         headers: dict[str, Any] | None = None,
+        timeout: int | None = None,
     ) -> httpx.Response:
         return await self._request(
             method="get",
             url=url,
             headers=headers,
+            timeout=timeout,
         )
 
     async def post(
@@ -101,5 +104,8 @@ async def post(
         json: Any | None = None,
         headers: dict[str, Any] | None = None,
         verify: bool | None = None,
+        timeout: int | None = None,
     ) -> httpx.Response:
-        return await self._request(method="post", url=url, data=data, json=json, headers=headers, verify=verify)
+        return await self._request(
+            method="post", url=url, data=data, json=json, headers=headers, verify=verify, timeout=timeout
+        )

backend/infrahub/workers/dependencies.py

@@ -1,10 +1,12 @@
 from typing import Any
 
+import httpx
 from fast_depends import Depends, inject
 from infrahub_sdk.client import InfrahubClient
 from infrahub_sdk.config import Config
+from infrahub_sdk.types import HTTPMethod
 
-from infrahub import config
+from infrahub import config, services
 from infrahub.components import ComponentType
 from infrahub.constants.environment import INSTALLATION_TYPE
 from infrahub.database import InfrahubDatabase, get_db
@@ -33,8 +35,27 @@ def get_component_type() -> ComponentType:
         raise ValueError("Component type is not set. It needs to be initialized before working with services.") from exc
 
 
+async def internal_requester(
+    url: str,
+    method: HTTPMethod,
+    headers: dict[str, Any],
+    timeout: int,
+    payload: dict | None = None,
+) -> httpx.Response:
+    if method == HTTPMethod.GET:
+        return await get_http().get(url=url, headers=headers, timeout=timeout)
+    if method == HTTPMethod.POST:
+        return await get_http().post(url=url, json=payload, headers=headers, timeout=timeout)
+
+    raise Exception("Unsupported HTTP Method")
+
+
 def build_client() -> InfrahubClient:
-    return InfrahubClient(config=Config(address=config.SETTINGS.main.internal_address, retry_on_failure=True))
+    return InfrahubClient(
+        config=Config(
+            address=config.SETTINGS.main.internal_address, retry_on_failure=True, requester=internal_requester
+        )
+    )
 
 
 @inject

backend/tests/adapters/http.py

@@ -1,19 +1,28 @@
-from typing import Any
+from __future__ import annotations
 
-import httpx
+from typing import TYPE_CHECKING, Any
 
 from infrahub.services.adapters.http import InfrahubHTTP
 
+if TYPE_CHECKING:
+    import ssl
+
+    import httpx
+
 
 class MemoryHTTP(InfrahubHTTP):
     def __init__(self) -> None:
         self._get_response: dict[str, httpx.Response] = {}
         self._post_response: dict[str, httpx.Response] = {}
 
+    def verify_tls(self, verify: bool | None = None) -> bool | ssl.SSLContext:
+        return False
+
     async def get(
         self,
         url: str,
         headers: dict[str, Any] | None = None,
+        timeout: int | None = None,
     ) -> httpx.Response:
         return self._get_response[url]
 
@@ -24,6 +33,7 @@ async def post(
         json: Any | None = None,
         headers: dict[str, Any] | None = None,
         verify: bool | None = None,
+        timeout: int | None = None,
     ) -> httpx.Response:
         return self._post_response[url]