🔧 fix session_id management

Author: shroominic

codeboxapi/box/codebox.py

@@ -126,13 +126,13 @@ async def astart(self) -> CodeBoxStatus:
             if settings.VERBOSE:
                 print(f"{self} is already started!")
             return CodeBoxStatus(status="started")
-        self.session_id = (
-            await abase_request(
-                self.aiohttp_session,
-                method="GET",
-                endpoint="/codebox/start",
-            )
-        )["id"]
+        self.session_id = UUID(
+            int=(
+                await abase_request(
+                    self.aiohttp_session, method="GET", endpoint="/codebox/start"
+                )
+            )["id"]
+        )
         if settings.VERBOSE:
             print(f"{self} started!")
         return CodeBoxStatus(status="started")
@@ -287,12 +287,14 @@ async def arestart(self) -> CodeBoxStatus:
         )
 
     def stop(self) -> CodeBoxStatus:
-        return CodeBoxStatus(
+        status = CodeBoxStatus(
             **self.codebox_request(
                 method="POST",
                 endpoint="/stop",
             )
         )
+        self.session_id = None
+        return status
 
     async def astop(self) -> CodeBoxStatus:
         status = CodeBoxStatus(
@@ -301,6 +303,7 @@ async def astop(self) -> CodeBoxStatus:
                 endpoint="/stop",
             )
         )
+        self.session_id = None
         if self.aiohttp_session:
             await self.aiohttp_session.close()
             self.aiohttp_session = None

codeboxapi/box/localbox.py

@@ -506,15 +506,17 @@ async def arestart(self) -> CodeBoxStatus:
         return CodeBoxStatus(status="restarted")
 
     def stop(self) -> CodeBoxStatus:
-        for pid in self._jupyter_pids:
-            print(f"Killing {pid}")
-            os.kill(pid, signal.SIGTERM)
-
-        if self.jupyter is not None:
-            self.jupyter.terminate()
-            self.jupyter.wait()
-            self.jupyter = None
-            time.sleep(2)
+        try:
+            if self.jupyter is not None:
+                self.jupyter.terminate()
+                self.jupyter.wait()
+                self.jupyter = None
+                time.sleep(2)
+            else:
+                for pid in self._jupyter_pids:
+                    os.kill(pid, signal.SIGTERM)
+        except ProcessLookupError:
+            pass
 
         if self.ws is not None:
             try: