Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions resources_servers/example_session_state_mgmt/tests/test_app.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from http.cookiejar import CookieJar
from unittest.mock import MagicMock

from fastapi.testclient import TestClient
from httpx import Cookies

from nemo_gym.server_utils import ServerClient
from resources_servers.example_session_state_mgmt.app import (
Expand All @@ -35,13 +35,13 @@ def test_sanity(self) -> None:
server = StatefulCounterResourcesServer(config=config, server_client=MagicMock(spec=ServerClient))

app = server.setup_webserver()
client = TestClient(app)

class StatelessCookies(Cookies):
def extract_cookies(self, response):
class StatelessCookieJar(CookieJar):
def extract_cookies(self, response: object, request: object) -> None:
# Sessions must come from explicit request cookies, not earlier responses.
pass

client._cookies = StatelessCookies(client._cookies)
client = TestClient(app, cookies=StatelessCookieJar())

# Check that we are at 0
response = client.post("/get_counter_value")
Expand Down
18 changes: 15 additions & 3 deletions resources_servers/gdpval/tests/test_judge_panel.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
from pathlib import Path
from unittest.mock import MagicMock

import httpx
import pytest
from fastapi.testclient import TestClient
from omegaconf import OmegaConf
Expand Down Expand Up @@ -123,9 +124,20 @@ async def create_chat_completion(self, **body):
for judge in panel:
proxy = proxies[judge.base_url]
with TestClient(proxy.setup_webserver()) as transport:
with OpenAI(
base_url=judge.base_url, api_key=judge.api_key, http_client=transport, max_retries=0
) as client:

def forward_request(request: httpx.Request) -> httpx.Response:
response = transport.request(
request.method, str(request.url), headers=request.headers.raw, content=request.content
)
return httpx.Response(response.status_code, headers=response.headers.raw, content=response.content)

# The SDK requires httpx.Client; Starlette may use httpx2 for its TestClient.
with (
httpx.Client(transport=httpx.MockTransport(forward_request)) as http_client,
OpenAI(
base_url=judge.base_url, api_key=judge.api_key, http_client=http_client, max_retries=0
) as client,
):
assert (
send_judge_request(
client,
Expand Down
10 changes: 5 additions & 5 deletions resources_servers/openenv/tests/test_app.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
# limitations under the License.
import sys
import types
from http.cookiejar import CookieJar
from unittest.mock import MagicMock

import pytest
from fastapi.testclient import TestClient
from httpx import Cookies

from nemo_gym.server_utils import ServerClient
from resources_servers.openenv.app import (
Expand All @@ -31,13 +31,13 @@
def _make_test_client(server):
"""Create a TestClient with stateless cookies for session testing."""
app = server.setup_webserver()
client = TestClient(app)

class StatelessCookies(Cookies):
def extract_cookies(self, response):
class StatelessCookieJar(CookieJar):
def extract_cookies(self, response: object, request: object) -> None:
# Sessions must come from explicit request cookies, not earlier responses.
pass

client._cookies = StatelessCookies(client._cookies)
client = TestClient(app, cookies=StatelessCookieJar())
return client


Expand Down
Loading