remove extra git config init since it is already done in client.py

Author: xingyaoww

opendevin/runtime/client/runtime.py

@@ -22,7 +22,6 @@
 )
 from opendevin.events.action.action import Action
 from opendevin.events.observation import (
-    CmdOutputObservation,
     ErrorObservation,
     NullObservation,
     Observation,
@@ -98,8 +97,6 @@ async def ainit(self, env_vars: dict[str, str] | None = None):
         )
         logger.info(f'Container initialized with env vars: {env_vars}')
 
-        await self._init_git_config()
-
     @staticmethod
     def _init_docker_client() -> docker.DockerClient:
         try:
@@ -183,16 +180,6 @@ async def _init_container(
             await self.close(close_client=False)
             raise e
 
-    async def _init_git_config(self):
-        action = CmdRunAction(
-            'git config --global user.name "opendevin" && '
-            'git config --global user.email "[email protected]"'
-        )
-        logger.info(f'Setting git config: {action}')
-        obs: Observation = await self.run_action(action)
-        assert isinstance(obs, CmdOutputObservation)
-        assert obs.exit_code == 0, f'Failed to set git config: {obs}'
-
     async def _ensure_session(self):
         await asyncio.sleep(1)
         if self.session is None or self.session.closed:
@@ -204,7 +191,8 @@ async def _ensure_session(self):
         wait=tenacity.wait_exponential(multiplier=2, min=4, max=60),
     )
     async def _wait_until_alive(self):
-        logger.info('Reconnecting session')
+        logger.info('Waiting for the runtime to be alive...')
+        self._print_container_logs()
         async with aiohttp.ClientSession() as session:
             async with session.get(f'{self.api_url}/alive') as response:
                 if response.status == 200:
@@ -218,21 +206,31 @@ async def _wait_until_alive(self):
     def sandbox_workspace_dir(self):
         return self.config.workspace_mount_path_in_sandbox
 
+    def _print_container_logs(self, tail: int = 1000, debug: bool = False):
+        try:
+            container = self.docker_client.containers.get(self.container_name)
+            logs = container.logs(tail=tail).decode('utf-8')
+            if debug:
+                logger_fn = logger.debug
+            else:
+                logger_fn = logger.info
+            logger_fn(
+                f'==== Container logs ====\n{logs}\n==== End of container logs ===='
+            )
+        except docker.errors.NotFound:
+            pass
+
     async def close(self, close_client: bool = True):
         if self.session is not None and not self.session.closed:
             await self.session.close()
 
-        containers = self.docker_client.containers.list(all=True)
-        for container in containers:
-            try:
-                if container.name.startswith(self.container_name_prefix):
-                    logs = container.logs(tail=1000).decode('utf-8')
-                    logger.debug(
-                        f'==== Container logs ====\n{logs}\n==== End of container logs ===='
-                    )
-                    container.remove(force=True)
-            except docker.errors.NotFound:
-                pass
+        self._print_container_logs(tail=1000, debug=True)
+        container = self.docker_client.containers.get(self.container_name)
+        try:
+            if container.name.startswith(self.container_name_prefix):
+                container.remove(force=True)
+        except docker.errors.NotFound:
+            pass
         if close_client:
             self.docker_client.close()