requests are prompts (#1398)

Because the BaaS service thinks of them as prompts, make the IndirectSUT expose SUT requests as prompts

Author: wpietri

src/modelgauge/suts/indirect_sut.py

@@ -10,11 +10,10 @@
 from modelgauge.ready import ReadyResponse
 from modelgauge.secret_values import InjectSecret
 from modelgauge.sut import PromptResponseSUT, SUTResponse, SUTOptions
-from modelgauge.suts.openai_client import _USER_ROLE as USER_ROLE, OpenAIChatRequest, OpenAIChatMessage
 from modelgauge.sut_capabilities import AcceptsTextPrompt
 from modelgauge.sut_decorator import modelgauge_sut
 from modelgauge.sut_definition import SUTDefinition
-
+from modelgauge.suts.openai_client import _USER_ROLE as USER_ROLE, OpenAIChatRequest, OpenAIChatMessage
 
 DEFAULT_PORT = 7777
 
@@ -93,6 +92,7 @@ def debug_info():
             }
 
         @app.get("/requests", response_model_exclude_none=True)
+        @app.get("/prompts", response_model_exclude_none=True)
         def get_requests() -> list[IndirectSUTRequest]:
             return list(self.outstanding_requests.values())
 

tests/modelgauge_tests/sut_tests/test_indirect_sut.py

@@ -1,8 +1,8 @@
-import pytest
-from fastapi.testclient import TestClient
 from queue import Queue
 from unittest.mock import patch, MagicMock
 
+import pytest
+from fastapi.testclient import TestClient
 
 from modelgauge.prompt import TextPrompt
 from modelgauge.sut import SUTOptions
@@ -73,14 +73,14 @@ def client(self, server):
         return TestClient(server.app)
 
     def test_requests(self, client, server, sut_request):
-        client_response = client.get("/requests")
+        client_response = client.get("/prompts")
         assert client_response.status_code == 200
         assert client_response.json() == []
 
         server.outstanding_requests[sut_request.request_id] = sut_request
         for _ in range(2):
             # Make sure we keep the request in the outstanding requests
-            client_response = client.get("/requests")
+            client_response = client.get("/prompts")
             assert client_response.status_code == 200
             assert client_response.json() == [
                 {