fix logging + add synced_commit to healthcheck

Author: caroljung-cg

src/codegen/cli/commands/run/run_daemon.py

@@ -22,7 +22,7 @@ def run_daemon(session: CodegenSession, function, diff_preview: int | None = Non
     with create_spinner(f"Running {function.name}...") as status:
         try:
             client = _get_docker_client(session)
-            run_output = client.run_function(function)
+            run_output = client.run_function(function, commit=not diff_preview)
             rich.print(f"✅ Ran {function.name} successfully")
 
             if run_output.logs:
@@ -54,10 +54,11 @@ def run_daemon(session: CodegenSession, function, diff_preview: int | None = Non
                 rich.print("")
                 rich.print("[yellow] No changes were produced by this codemod[/yellow]")
 
-            rich.print("[green]✓ Changes have been applied to your local filesystem[/green]")
-            rich.print("[yellow]→ Don't forget to commit your changes:[/yellow]")
-            rich.print(format_command("git add ."))
-            rich.print(format_command("git commit -m 'Applied codemod changes'"))
+            if diff_preview:
+                rich.print("[green]✓ Changes have been applied to your local filesystem[/green]")
+                rich.print("[yellow]→ Don't forget to commit your changes:[/yellow]")
+                rich.print(format_command("git add ."))
+                rich.print(format_command("git commit -m 'Applied codemod changes'"))
 
         except ServerError as e:
             status.stop()

src/codegen/cli/commands/start/main.py

@@ -29,6 +29,7 @@ def start_command(port: int | None, platform: str, detached: bool = False, skip_
     repo_config = RepoConfig.from_repo_path(str(repo_path))
     if (container := DockerContainer.get(repo_config.name)) is not None:
         if force:
+            rich.print(f"[yellow]Removing existing runner {repo_config.name} to force restart[/yellow]")
             container.remove()
         else:
             return _handle_existing_container(repo_config, container, force)
@@ -100,6 +101,7 @@ def _run_docker_container(repo_config: RepoConfig, port: int, detached: bool) ->
         "REPOSITORY_OWNER": LocalGitRepo(repo_config.repo_path).owner,
         "REPOSITORY_PATH": container_repo_path,
         "GITHUB_TOKEN": SecretsConfig().github_token,
+        "PYTHONUNBUFFERED": "1",  # Ensure Python output is unbuffered
     }
     envvars_args = [arg for k, v in envvars.items() for arg in ("--env", f"{k}={v}")]
     mount_args = ["-v", f"{repo_config.repo_path}:{container_repo_path}"]
@@ -110,3 +112,7 @@ def _run_docker_container(repo_config: RepoConfig, port: int, detached: bool) ->
 
     rich.print(f"run_cmd: {str.join(' ', run_cmd)}")
     subprocess.run(run_cmd, check=True)
+
+    if detached:
+        rich.print("[yellow]Container started in detached mode. To view logs, run:[/yellow]")
+        rich.print(f"[bold]docker logs -f {repo_config.name}[/bold]")

src/codegen/runner/clients/docker_client.py

@@ -17,8 +17,8 @@ def __init__(self, container: DockerContainer):
             raise Exception(msg)
         super().__init__(container.host, container.port)
 
-    def run_function(self, function: DecoratedFunction) -> CodemodRunResult:
-        req = RunFunctionRequest(function_name=function.name, codemod_source=function.source, commit=True)
+    def run_function(self, function: DecoratedFunction, commit: bool) -> CodemodRunResult:
+        req = RunFunctionRequest(function_name=function.name, codemod_source=function.source, commit=commit)
         response = self.post(RUN_FUNCTION_ENDPOINT, req.model_dump())
         return CodemodRunResult.model_validate(response.json())
 

src/codegen/runner/models/apis.py

@@ -19,6 +19,7 @@
 
 class ServerInfo(BaseModel):
     repo_name: str | None = None
+    synced_commit: str | None = None
     warmup_state: WarmupState = WarmupState.PENDING
 
 

src/codegen/runner/sandbox/server.py

@@ -45,6 +45,7 @@ async def lifespan(server: FastAPI):
         runner = SandboxRunner(repo_config=repo_config)
         server_info.warmup_state = WarmupState.PENDING
         await runner.warmup()
+        server_info.synced_commit = runner.commit.hexsha
         server_info.warmup_state = WarmupState.COMPLETED
     except Exception:
         logger.exception("Failed to build graph during warmup")

src/codegen/runner/servers/local_daemon.py

@@ -17,6 +17,12 @@
 from codegen.runner.sandbox.runner import SandboxRunner
 from codegen.shared.enums.programming_language import ProgrammingLanguage
 
+logging.basicConfig(
+    level=logging.INFO,
+    format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
+    force=True,
+)
+
 logger = logging.getLogger(__name__)
 
 server_info: ServerInfo
@@ -42,14 +48,15 @@ async def lifespan(server: FastAPI):
         runner = SandboxRunner(repo_config=repo_config)
         server_info.warmup_state = WarmupState.PENDING
         await runner.warmup()
+        server_info.synced_commit = runner.commit.hexsha
         server_info.warmup_state = WarmupState.COMPLETED
     except Exception:
         logger.exception("Failed to build graph during warmup")
         server_info.warmup_state = WarmupState.FAILED
 
-    logger.info("Sandbox fastapi server is ready to accept requests")
+    logger.info("Local daemon is ready to accept requests!")
     yield
-    logger.info("Shutting down sandbox fastapi server")
+    logger.info("Shutting down local daemon server")
 
 
 app = FastAPI(lifespan=lifespan)