fix: set git config + misc daemon improvements

Author: caroljung-cg

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

@@ -108,7 +108,7 @@ def _run_docker_container(repo_config: RepoConfig, port: int, detached: bool) ->
     entry_point = f"uv run --frozen uvicorn codegen.runner.servers.local_daemon:app --host {_default_host} --port {port}"
     port_args = ["-p", f"{port}:{port}"]
     detached_args = ["-d"] if detached else []
-    run_cmd = ["docker", "run", *detached_args, *port_args, *name_args, *mount_args, *envvars_args, CODEGEN_RUNNER_IMAGE, entry_point]
+    run_cmd = ["docker", "run", "--rm", *detached_args, *port_args, *name_args, *mount_args, *envvars_args, CODEGEN_RUNNER_IMAGE, entry_point]
 
     rich.print(f"run_cmd: {str.join(' ', run_cmd)}")
     subprocess.run(run_cmd, check=True)

src/codegen/git/repo_operator/repo_operator.py

@@ -145,31 +145,25 @@ def git_cli(self) -> GitCLI:
         for level in levels:
             with git_cli.config_reader(level) as reader:
                 if reader.has_option("user", "name") and not username:
-                    username = reader.get("user", "name")
-                    user_level = level
+                    username = username or reader.get("user", "name")
+                    user_level = user_level or level
                 if reader.has_option("user", "email") and not email:
-                    email = reader.get("user", "email")
-                    email_level = level
-        if self.bot_commit:
-            self._set_bot_email(git_cli)
+                    email = email or reader.get("user", "email")
+                    email_level = email_level or level
+
+        # We need a username and email to commit, so if they're not set, set them to the bot's
+        if not username or self.bot_commit:
             self._set_bot_username(git_cli)
-        else:
-            # we need a username and email to commit, so if they're not set, set them to the bot's
-            # Case 1: username is not set: set it to the bot's
-            if not username:
-                self._set_bot_username(git_cli)
-            # Case 2: username is set to the bot's at the repo level, but something else is set at the user level: unset it
-            elif username != CODEGEN_BOT_NAME and user_level != "repository":
-                self._unset_bot_username(git_cli)
-            #  3: Caseusername is only set at the repo level: do nothing
-            else:
-                pass  # no-op to make the logic clearer
-            # Repeat for email
-            if not email:
-                self._set_bot_email(git_cli)
+        if not email or self.bot_commit:
+            self._set_bot_email(git_cli)
 
-            elif email != CODEGEN_BOT_EMAIL and email_level != "repository":
+        # If user config is set at a level above the repo level: unset it
+        if not self.bot_commit:
+            if username and username != CODEGEN_BOT_NAME and user_level != "repository":
+                self._unset_bot_username(git_cli)
+            if email and email != CODEGEN_BOT_EMAIL and email_level != "repository":
                 self._unset_bot_email(git_cli)
+
         return git_cli
 
     @property

src/codegen/runner/servers/local_daemon.py

@@ -14,14 +14,15 @@
 )
 from codegen.runner.models.codemod import Codemod, CodemodRunResult
 from codegen.runner.sandbox.runner import SandboxRunner
+from codegen.shared.logging.get_logger import get_colored_logger
 
 # Configure logging at module level
 logging.basicConfig(
     level=logging.INFO,
     format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
     force=True,
 )
-logger = logging.getLogger(__name__)
+logger = get_colored_logger(__name__)
 
 server_info: ServerInfo
 runner: SandboxRunner
@@ -43,7 +44,7 @@ async def lifespan(server: FastAPI):
         runner.op.git_cli.git.config("user.name", CODEGEN_BOT_NAME)
 
         # Parse the codebase
-        logger.info(f"Starting up sandbox fastapi server for repo_name={repo_config.name}")
+        logger.info(f"Starting up fastapi server for repo_name={repo_config.name}")
         server_info.warmup_state = WarmupState.PENDING
         await runner.warmup()
         server_info.synced_commit = runner.commit.hexsha

src/codegen/shared/logging/get_logger.py

@@ -2,32 +2,31 @@
 
 import colorlog
 
-handler = colorlog.StreamHandler()
-handler.setFormatter(
-    colorlog.ColoredFormatter(
-        "%(white)s%(asctime)s - %(name)s - %(log_color)s%(levelname)s%(reset)s%(white)s - %(message_log_color)s%(message)s",
-        log_colors={
-            "DEBUG": "cyan",
-            "INFO": "green",
-            "WARNING": "yellow",
-            "ERROR": "red",
-            "CRITICAL": "red,bg_white",
-        },
-        secondary_log_colors={
-            "message": {
+
+def get_colored_logger(name: str) -> logging.Logger:
+    handler = colorlog.StreamHandler()
+    handler.setFormatter(
+        colorlog.ColoredFormatter(
+            "%(white)s%(asctime)s - %(name)s - %(log_color)s%(levelname)s%(reset)s%(white)s - %(message_log_color)s%(message)s",
+            log_colors={
                 "DEBUG": "cyan",
-                "INFO": "blue",
+                "INFO": "green",
                 "WARNING": "yellow",
                 "ERROR": "red",
                 "CRITICAL": "red,bg_white",
-            }
-        },
+            },
+            secondary_log_colors={
+                "message": {
+                    "DEBUG": "cyan",
+                    "INFO": "blue",
+                    "WARNING": "yellow",
+                    "ERROR": "red",
+                    "CRITICAL": "red,bg_white",
+                }
+            },
+        )
     )
-)
-
 
-def get_logger(name: str, level: int = logging.INFO) -> logging.Logger:
     logger = logging.getLogger(name)
     logger.addHandler(handler)
-    logger.setLevel(level)
     return logger