wip

Author: caroljung-cg

src/codegen/runner/clients/codebase_client.py

@@ -1,10 +1,13 @@
 """Client used to abstract the weird stdin/stdout communication we have with the sandbox"""
 
 import logging
+import os
+import subprocess
 
 from codegen.git.schemas.repo_config import RepoConfig
 from codegen.runner.clients.server_client import LocalServerClient
 from codegen.runner.models.apis import SANDBOX_SERVER_PORT
+from codegen.shared.configs.session_configs import config
 
 logger = logging.getLogger(__name__)
 
@@ -22,15 +25,50 @@ def __init__(self, repo_config: RepoConfig, git_access_token: str | None, host:
         self.git_access_token = git_access_token
         super().__init__(server_path=RUNNER_SERVER_PATH, host=host, port=port)
 
-    def _get_envs(self):
+    def _get_envs(self) -> dict:
         envs = super()._get_envs()
-        envs.update(
-            {
-                "CODEGEN_REPOSITORY__REPO_PATH": self.repo_config.repo_path,
-                "CODEGEN_REPOSITORY__REPO_NAME": self.repo_config.name,
-                "CODEGEN_REPOSITORY__FULL_NAME": self.repo_config.full_name,
-                "CODEGEN_REPOSITORY__LANGUAGE": self.repo_config.language.value,
-                "CODEGEN_SECRETS__GITHUB_TOKEN": self.git_access_token,
-            }
-        )
+        codebase_envs = {
+            "CODEGEN_REPOSITORY__REPO_PATH": self.repo_config.repo_path,
+            "CODEGEN_REPOSITORY__REPO_NAME": self.repo_config.name,
+            "CODEGEN_REPOSITORY__FULL_NAME": self.repo_config.full_name,
+            "CODEGEN_REPOSITORY__LANGUAGE": self.repo_config.language.value,
+        }
+        if self.git_access_token is not None:
+            codebase_envs["CODEGEN_SECRETS__GITHUB_TOKEN"] = self.git_access_token
+
+        envs.update(codebase_envs)
         return envs
+
+    def _start_server(self, server_path: str) -> None:
+        """Start the FastAPI server in a subprocess"""
+        codebase_envs = {
+            "CODEGEN_REPOSITORY__REPO_PATH": self.repo_config.repo_path,
+            "CODEGEN_REPOSITORY__REPO_NAME": self.repo_config.name,
+            "CODEGEN_REPOSITORY__FULL_NAME": self.repo_config.full_name,
+            "CODEGEN_REPOSITORY__LANGUAGE": self.repo_config.language.value,
+        }
+        if self.git_access_token is not None:
+            codebase_envs["CODEGEN_SECRETS__GITHUB_TOKEN"] = self.git_access_token
+
+        envs = os.environ.copy()
+        envs.update(codebase_envs)
+        logger.info(f"Starting local server on {self.base_url} with envvars: {envs}")
+
+        self._process = subprocess.Popen(
+            [
+                "uvicorn",
+                server_path,
+                "--host",
+                self.host,
+                "--port",
+                str(self.port),
+            ],
+            env=envs,
+        )
+        self._wait_for_server()
+
+
+if __name__ == "__main__":
+    test_config = RepoConfig.from_repo_path("/Users/caroljung/git/codegen/codegen-agi")
+    client = CodebaseClient(test_config, config.secrets.github_token)
+    print(client.healthcheck())

src/codegen/runner/clients/server_client.py

@@ -36,7 +36,7 @@ def __del__(self):
             self._process.terminate()
             self._process.wait()
 
-    def _get_envs(self):
+    def _get_envs(self) -> dict:
         return os.environ.copy()
 
     def _start_server(self, server_path: str) -> None:
@@ -57,7 +57,7 @@ def _start_server(self, server_path: str) -> None:
         )
         self._wait_for_server()
 
-    def _wait_for_server(self, timeout: int = 60, interval: float = 0.1) -> None:
+    def _wait_for_server(self, timeout: int = 10, interval: float = 0.1) -> None:
         """Wait for the server to start by polling the health endpoint"""
         start_time = time.time()
         while (time.time() - start_time) < timeout: