gmakstutis/openrag
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Update container_manager.py

Browse source
This commit is contained in:
Eric Hare 2025-12-12 11:03:25 -08:00
parent 6c7e494dfe
commit 5cec9a8e8a
No known key found for this signature in database
GPG key ID: A73DF73724270AB7
1 changed files with 55 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
src/tui/managers/container_manager.py
View file

@ -293,7 +293,17 @@ class ContainerManager:
use_gpu = not cpu_mode use_gpu = not cpu_mode
# Build compose command with override pattern # Build compose command with override pattern
cmd = self.runtime_info.compose_command + ["-f", str(self.compose_file)] cmd = self.runtime_info.compose_command
# Add --env-file to explicitly specify the .env location
from utils.paths import get_tui_env_file
tui_env_file = get_tui_env_file()
if tui_env_file.exists():
cmd.extend(["--env-file", str(tui_env_file)])
elif Path(".env").exists():
cmd.extend(["--env-file", ".env"])
cmd.extend(["-f", str(self.compose_file)])
if use_gpu and self.gpu_compose_file.exists(): if use_gpu and self.gpu_compose_file.exists():
cmd.extend(["-f", str(self.gpu_compose_file)]) cmd.extend(["-f", str(self.gpu_compose_file)])
cmd.extend(args) cmd.extend(args)
@ -339,7 +349,17 @@ class ContainerManager:
use_gpu = not cpu_mode use_gpu = not cpu_mode
# Build compose command with override pattern # Build compose command with override pattern
cmd = self.runtime_info.compose_command + ["-f", str(self.compose_file)] cmd = self.runtime_info.compose_command
# Add --env-file to explicitly specify the .env location
from utils.paths import get_tui_env_file
tui_env_file = get_tui_env_file()
if tui_env_file.exists():
cmd.extend(["--env-file", str(tui_env_file)])
elif Path(".env").exists():
cmd.extend(["--env-file", ".env"])
cmd.extend(["-f", str(self.compose_file)])
if use_gpu and self.gpu_compose_file.exists(): if use_gpu and self.gpu_compose_file.exists():
cmd.extend(["-f", str(self.gpu_compose_file)]) cmd.extend(["-f", str(self.gpu_compose_file)])
cmd.extend(args) cmd.extend(args)
@ -412,7 +432,17 @@ class ContainerManager:
use_gpu = not cpu_mode use_gpu = not cpu_mode
# Build compose command with override pattern # Build compose command with override pattern
cmd = self.runtime_info.compose_command + ["-f", str(self.compose_file)] cmd = self.runtime_info.compose_command
# Add --env-file to explicitly specify the .env location
from utils.paths import get_tui_env_file
tui_env_file = get_tui_env_file()
if tui_env_file.exists():
cmd.extend(["--env-file", str(tui_env_file)])
elif Path(".env").exists():
cmd.extend(["--env-file", ".env"])
cmd.extend(["-f", str(self.compose_file)])
if use_gpu and self.gpu_compose_file.exists(): if use_gpu and self.gpu_compose_file.exists():
cmd.extend(["-f", str(self.gpu_compose_file)]) cmd.extend(["-f", str(self.gpu_compose_file)])
cmd.extend(args) cmd.extend(args)
@ -818,13 +848,24 @@ class ContainerManager:
async def _parse_compose_images(self) -> list[str]: async def _parse_compose_images(self) -> list[str]:
"""Get resolved image names from compose files using docker/podman compose, with robust fallbacks.""" """Get resolved image names from compose files using docker/podman compose, with robust fallbacks."""
from utils.paths import get_tui_env_file
images: set[str] = set() images: set[str] = set()
# Try both GPU and CPU modes to get all images # Try both GPU and CPU modes to get all images
for use_gpu in [True, False]: for use_gpu in [True, False]:
try: try:
# Build compose command with override pattern # Build compose command with override pattern
cmd = self.runtime_info.compose_command + ["-f", str(self.compose_file)] cmd = self.runtime_info.compose_command
# Add --env-file to explicitly specify the .env location
tui_env_file = get_tui_env_file()
if tui_env_file.exists():
cmd.extend(["--env-file", str(tui_env_file)])
elif Path(".env").exists():
cmd.extend(["--env-file", ".env"])
cmd.extend(["-f", str(self.compose_file)])
if use_gpu and self.gpu_compose_file.exists(): if use_gpu and self.gpu_compose_file.exists():
cmd.extend(["-f", str(self.gpu_compose_file)]) cmd.extend(["-f", str(self.gpu_compose_file)])
cmd.extend(["config", "--format", "json"]) cmd.extend(["config", "--format", "json"])
@ -845,7 +886,16 @@ class ContainerManager:
continue continue
# Fallback to YAML output (for older compose versions) # Fallback to YAML output (for older compose versions)
cmd = self.runtime_info.compose_command + ["-f", str(self.compose_file)] cmd = self.runtime_info.compose_command
# Add --env-file to explicitly specify the .env location
tui_env_file = get_tui_env_file()
if tui_env_file.exists():
cmd.extend(["--env-file", str(tui_env_file)])
elif Path(".env").exists():
cmd.extend(["--env-file", ".env"])
cmd.extend(["-f", str(self.compose_file)])
if use_gpu and self.gpu_compose_file.exists(): if use_gpu and self.gpu_compose_file.exists():
cmd.extend(["-f", str(self.gpu_compose_file)]) cmd.extend(["-f", str(self.gpu_compose_file)])
cmd.append("config") cmd.append("config")