selfhostyourtech/cubbi
2
0
Fork 0
mirror of https://github.com/Monadical-SAS/cubbi.git synced 2025-12-21 04:39:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(cli): separate session state into its own session.yaml file

Browse Source
This commit is contained in:
Mathieu Virbel
2025-03-11 22:58:31 -06:00
parent 133583b941
commit 7736573b84
5 changed files with 103 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mcontainer/container.py
View File

@@ -10,11 +10,17 @@ from docker.errors import DockerException, ImageNotFound
from .models import Session, SessionStatus
from .config import ConfigManager
from .session import SessionManager
class ContainerManager:
def __init__(self, config_manager: Optional[ConfigManager] = None):
def __init__(
self,
config_manager: Optional[ConfigManager] = None,
session_manager: Optional[SessionManager] = None,
):
self.config_manager = config_manager or ConfigManager()
self.session_manager = session_manager or SessionManager()
try:
self.client = docker.from_env()
# Test connection
@@ -329,8 +335,10 @@ class ContainerManager:
ports=ports,
)
# Save session to config as JSON-compatible dict
self.config_manager.add_session(session_id, session.model_dump(mode="json"))
# Save session to the session manager as JSON-compatible dict
self.session_manager.add_session(
session_id, session.model_dump(mode="json")
)
return session
@@ -365,7 +373,6 @@ class ContainerManager:
# Execute interactive shell in container
# The init-status.sh script will automatically show logs if needed
print(f"Connecting to session {session_id}...")
os.system(f"docker exec -it {session.container_id} /bin/bash")
return True
@@ -392,7 +399,7 @@ class ContainerManager:
container = self.client.containers.get(session.container_id)
container.stop()
container.remove()
self.config_manager.remove_session(session.id)
self.session_manager.remove_session(session.id)
return True
except DockerException as e:
print(f"Error closing session {session.id}: {e}")
@@ -425,8 +432,8 @@ class ContainerManager:
# Stop and remove container
container.stop()
container.remove()
# Remove from config
self.config_manager.remove_session(session.id)
# Remove from session storage
self.session_manager.remove_session(session.id)
# Notify about completion
if progress_callback: