DEFAULT_HOST and PORT

Author: imapersonman

interpreter/core/async_core.py

@@ -701,6 +701,9 @@ async def chat_completion(request: ChatCompletionRequest):
 
 
 class Server:
+    DEFAULT_HOST = "127.0.0.1"
+    DEFAULT_PORT = 8000
+
     def __init__(self, async_interpreter, host=None, port=None):
         self.app = FastAPI()
         router = create_router(async_interpreter)
@@ -720,7 +723,9 @@ async def validate_api_key(request: Request, call_next):
                 )
 
         self.app.include_router(router)
-        self.config = uvicorn.Config(app=self.app, host=host or os.getenv("HOST", "127.0.0.1"), port=port or int(os.getenv("PORT", "8000")))
+        h = host or os.getenv("HOST", Server.DEFAULT_HOST)
+        p = port or int(os.getenv("PORT", Server.DEFAULT_PORT))
+        self.config = uvicorn.Config(app=self.app, host=h, port=p)
         self.uvicorn_server = uvicorn.Server(self.config)
 
     @property

tests/core/test_async_core.py

@@ -5,18 +5,42 @@
 
 
 class TestServerConstruction(TestCase):
-    def test_host_and_port_from_env_1(self):
-        fake_host = "fake_host"
-        fake_port = 1234
+    """
+    Tests to make sure that the underlying server is configured correctly when constructing
+    the Server object.
+    """
 
-        with mock.patch.dict(os.environ, {"HOST": fake_host, "PORT": str(fake_port)}):
+    def test_host_and_port_defaults(self):
+        """
+        Tests that a Server object takes on the default host and port when
+        a) no host and port are passed in, and
+        b) no HOST and PORT are set.
+        """
+        with mock.patch.dict(os.environ, {}):
             s = Server(AsyncInterpreter())
-            self.assertEqual(s.host, fake_host)
-            self.assertEqual(s.port, fake_port)
+            self.assertEqual(s.host, Server.DEFAULT_HOST)
+            self.assertEqual(s.port, Server.DEFAULT_PORT)
+        
+    def test_host_and_port_passed_in(self):
+        """
+        Tests that a Server object takes on the passed-in host and port when they are passed-in,
+        ignoring the surrounding HOST and PORT env vars.
+        """
+        host = "the-really-real-host"
+        port = 2222
 
-    def test_host_and_port_from_env_2(self):
-        fake_host = "some-other-fake-host"
-        fake_port = 4321
+        with mock.patch.dict(os.environ, {"HOST": "this-is-supes-fake", "PORT": "9876"}):
+            sboth = Server(AsyncInterpreter(), host, port)
+            self.assertEqual(sboth.host, host)
+            self.assertEqual(sboth.port, port)
+        
+    def test_host_and_port_from_env_1(self):
+        """
+        Tests that the Server object takes on the HOST and PORT env vars as host and port when
+        nothing has been passed in.
+        """
+        fake_host = "fake_host"
+        fake_port = 1234
 
         with mock.patch.dict(os.environ, {"HOST": fake_host, "PORT": str(fake_port)}):
             s = Server(AsyncInterpreter())