Fix conflict

Author: jackcook

src/guidellm/backend/openai.py

@@ -60,6 +60,8 @@ class OpenAIHTTPBackend(Backend):
         If not provided, the default timeout provided from settings is used.
     :param http2: If True, uses HTTP/2 for requests to the OpenAI server.
         Defaults to True.
+    :param follow_redirects: If True, the HTTP client will follow redirect responses.
+        If not provided, the default value from settings is used.
     :param max_output_tokens: The maximum number of tokens to request for completions.
         If not provided, the default maximum tokens provided from settings is used.
     :param extra_query: Query parameters to include in requests to the OpenAI server.
@@ -78,6 +80,7 @@ def __init__(
         project: Optional[str] = None,
         timeout: Optional[float] = None,
         http2: Optional[bool] = True,
+        follow_redirects: Optional[bool] = None,
         max_output_tokens: Optional[int] = None,
         extra_query: Optional[Union[dict[str, str], dict[str, dict[str, str]]]] = None,
     ):
@@ -105,6 +108,11 @@ def __init__(
         self.project = project or settings.openai.project
         self.timeout = timeout if timeout is not None else settings.request_timeout
         self.http2 = http2 if http2 is not None else settings.request_http2
+        self.follow_redirects = (
+            follow_redirects
+            if follow_redirects is not None
+            else settings.request_follow_redirects
+        )
         self.max_output_tokens = (
             max_output_tokens
             if max_output_tokens is not None
@@ -138,6 +146,7 @@ def info(self) -> dict[str, Any]:
             "max_output_tokens": self.max_output_tokens,
             "timeout": self.timeout,
             "http2": self.http2,
+            "follow_redirects": self.follow_redirects,
             "authorization": bool(self.authorization),
             "organization": self.organization,
             "project": self.project,
@@ -346,7 +355,11 @@ def _get_async_client(self) -> httpx.AsyncClient:
         :return: The async HTTP client.
         """
         if self._async_client is None:
-            client = httpx.AsyncClient(http2=self.http2, timeout=self.timeout)
+            client = httpx.AsyncClient(
+                http2=self.http2,
+                timeout=self.timeout,
+                follow_redirects=self.follow_redirects,
+            )
             self._async_client = client
         else:
             client = self._async_client
@@ -492,12 +505,14 @@ async def _iterative_completions_request(
             raise ValueError(f"Unsupported type: {type_}")
 
         logger.info(
-            "{} making request: {} to target: {} using http2: {} for "
-            "timeout: {} with headers: {} and params: {} and payload: {}",
+            "{} making request: {} to target: {} using http2: {} following "
+            "redirects: {} for timeout: {} with headers: {} and params: {} and ",
+            "payload: {}",
             self.__class__.__name__,
             request_id,
             target,
             self.http2,
+            self.follow_redirects,
             self.timeout,
             headers,
             params,
@@ -591,6 +606,7 @@ async def _iterative_completions_request(
                 payload=payload,
                 timeout=self.timeout,
                 http2=self.http2,
+                follow_redirects=self.follow_redirects,
             ),
             start_time=start_time,
             end_time=iter_time,

src/guidellm/backend/response.py

@@ -53,6 +53,7 @@ class RequestArgs(StandardBaseModel):
         content and other configurations.
     :param timeout: The timeout for the request in seconds, if any.
     :param http2: Whether HTTP/2 was used for the request, if applicable.
+    :param follow_redirects: Whether the request should follow redirect responses.
     """
 
     target: str
@@ -61,6 +62,7 @@ class RequestArgs(StandardBaseModel):
     payload: dict[str, Any]
     timeout: Optional[float] = None
     http2: Optional[bool] = None
+    follow_redirects: Optional[bool] = None
 
 
 class ResponseSummary(StandardBaseModel):

src/guidellm/config.py

@@ -115,6 +115,7 @@ class Settings(BaseSettings):
     default_sweep_number: int = 10
 
     # HTTP settings
+    request_follow_redirects: bool = True
     request_timeout: int = 60 * 5  # 5 minutes
     request_http2: bool = True
 

tests/unit/backend/test_openai_backend.py

@@ -16,6 +16,7 @@ def test_openai_http_backend_default_initialization():
     assert backend.project == settings.openai.project
     assert backend.timeout == settings.request_timeout
     assert backend.http2 is True
+    assert backend.follow_redirects is True
     assert backend.max_output_tokens == settings.openai.max_output_tokens
     assert backend.extra_query is None
 
@@ -30,6 +31,7 @@ def test_openai_http_backend_intialization():
         project="test-proj",
         timeout=10,
         http2=False,
+        follow_redirects=False,
         max_output_tokens=100,
         extra_query={"foo": "bar"},
     )
@@ -40,6 +42,7 @@ def test_openai_http_backend_intialization():
     assert backend.project == "test-proj"
     assert backend.timeout == 10
     assert backend.http2 is False
+    assert backend.follow_redirects is False
     assert backend.max_output_tokens == 100
     assert backend.extra_query["foo"] == "bar"
 

tests/unit/backend/test_response.py

@@ -81,6 +81,7 @@ def test_request_args_default_initialization():
     )
     assert args.timeout is None
     assert args.http2 is None
+    assert args.follow_redirects is None
 
 
 @pytest.mark.smoke
@@ -96,12 +97,14 @@ def test_request_args_initialization():
         },
         timeout=10.0,
         http2=True,
+        follow_redirects=True,
     )
     assert args.target == "http://example.com"
     assert args.headers == {"Authorization": "Bearer token"}
     assert args.payload == {"query": "Hello, world!"}
     assert args.timeout == 10.0
     assert args.http2 is True
+    assert args.follow_redirects is True
 
 
 @pytest.mark.smoke