coverage, fix http request blocker

Author: justinsheu

.github/workflows/ci.yaml

@@ -90,4 +90,10 @@ jobs:
         run: |      
           SECRET_VARS=$(aws secretsmanager get-secret-value --secret-id gh-actions/api-keys/judgeval --query SecretString --output text)
           export $(echo "$SECRET_VARS" | jq -r 'to_entries | .[] | "\(.key)=\(.value)"')
-          pipenv run pytest ./e2etests
+          pipenv run pytest --durations=0 --cov=. --cov-config=.coveragerc --cov-report=html ./e2etests
+
+      - name: Upload coverage HTML report
+        uses: actions/upload-artifact@v4
+        with:
+          name: coverage-html
+          path: htmlcov

src/tests/conftest.py

@@ -14,7 +14,7 @@ def get_error_info():
         return inspect.getframeinfo(caller_frame)
 
     def is_external_url(url):
-        return isinstance(url, str) and url.startswith(('http://', 'https://'))
+        return isinstance(url, str) and url.startswith(('http://', 'https://')) and not url.startswith('http://testserver') # FastAPI TestClient base url starts with http://testserver
 
     # Store original methods
     original_requests = {
@@ -32,7 +32,8 @@ def is_external_url(url):
         'put': httpx.put,
         'delete': httpx.delete,
         'head': httpx.head,
-        'patch': httpx.patch
+        'patch': httpx.patch,
+        'request': httpx.request
     }
 
     original_httpx_client = {
@@ -63,7 +64,6 @@ def wrapper(*args, **kwargs):
     def make_blocked_httpx_module(method_name, original_func):
         def wrapper(*args, **kwargs):
             url = args[0] if args else kwargs.get('url', '')
-            print("url:", url)
             if not is_external_url(url):
                 filtered_kwargs = {k: v for k, v in kwargs.items() if v is not None}
                 return original_func(*args, **filtered_kwargs)
@@ -77,34 +77,62 @@ def wrapper(*args, **kwargs):
 
     def make_blocked_httpx_client(method_name, original_func):
         def wrapper(self, *args, **kwargs):
-            url = args[0] if args else kwargs.get('url', '')
-            print("url:", url)
-            if not is_external_url(url):
+            from httpx import URL
+
+            if method_name == "request" and len(args) >= 2:
+                method, url_arg = args[0], args[1]
+            else:
+                url_arg = args[0] if args else kwargs.get('url', '')
+
+            if isinstance(url_arg, str) and hasattr(self, 'base_url') and self.base_url:
+                full_url = URL(self.base_url).join(URL(url_arg))
+            else:
+                full_url = url_arg
+
+            if not is_external_url(str(full_url)):
                 filtered_kwargs = {k: v for k, v in kwargs.items() if v is not None}
                 return original_func(self, *args, **filtered_kwargs)
+
             caller = get_error_info()
             raise RuntimeError(
-                f"Blocked httpx.Client.{method_name.upper()} to {url}\n"
+                f"Blocked httpx.Client.{method_name.upper()} to {full_url}\n"
                 f"Called from: {caller.filename}:{caller.lineno} in {caller.function}\n"
                 f"Please mock this request in your test."
             )
+
         return wrapper
+
 
     def make_blocked_httpx_async_client(method_name, original_func):
         async def wrapper(self, *args, **kwargs):
-            url = args[0] if args else kwargs.get('url', '')
-            print("url:", url)
-            if not is_external_url(url):
+            from httpx import URL
+
+            # Extract method and url argument based on call signature
+            if method_name == "request" and len(args) >= 2:
+                method, url_arg = args[0], args[1]
+            else:
+                url_arg = args[0] if args else kwargs.get('url', '')
+
+            # Reconstruct full URL
+            if isinstance(url_arg, str) and hasattr(self, 'base_url') and self.base_url:
+                full_url = URL(self.base_url).join(URL(url_arg))
+            else:
+                full_url = url_arg
+
+            if not is_external_url(str(full_url)):
                 filtered_kwargs = {k: v for k, v in kwargs.items() if v is not None}
                 return await original_func(self, *args, **filtered_kwargs)
+
             caller = get_error_info()
             raise RuntimeError(
-                f"Blocked httpx.AsyncClient.{method_name.upper()} to {url}\n"
+                f"Blocked httpx.AsyncClient.{method_name.upper()} to {full_url}\n"
                 f"Called from: {caller.filename}:{caller.lineno} in {caller.function}\n"
                 f"Please mock this request in your test."
             )
+
         return wrapper
 
+
     def blocked_urllib(*args, **kwargs):
         url = args[0] if args else kwargs.get('url', '')
         if not is_external_url(url):
@@ -131,5 +159,6 @@ def blocked_urllib(*args, **kwargs):
     # Patch httpx.AsyncClient instance methods
     for method, original_func in original_httpx_async_client.items():
         monkeypatch.setattr(httpx.AsyncClient, method, make_blocked_httpx_async_client(method, original_func))
+
     # Patch urllib
-    monkeypatch.setattr(urllib.request, "urlopen", blocked_urllib)
+    monkeypatch.setattr(urllib.request, "urlopen", blocked_urllib)