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

Update container_manager.py

Browse source
This commit is contained in:
Eric Hare 2025-12-12 10:42:47 -08:00
parent 9854302680
commit 6c7e494dfe
No known key found for this signature in database
GPG key ID: A73DF73724270AB7
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -114,21 +114,21 @@ class ContainerManager:
self._compose_search_log += " ✗ NOT FOUND" self._compose_search_log += " ✗ NOT FOUND"
# Finally check package resources # Finally check package resources
self._compose_search_log += "\n 3. Package resources: " self._compose_search_log += f"\n 3. Package resources: "
try: try:
pkg_files = files("tui._assets") pkg_files = files("tui._assets")
self._compose_search_log += f"{pkg_files}" self._compose_search_log += f"{pkg_files}"
compose_resource = pkg_files / filename compose_resource = pkg_files / filename
if compose_resource.is_file(): if compose_resource.is_file():
self._compose_search_log += " ✓ FOUND, copying to TUI directory" self._compose_search_log += f" ✓ FOUND, copying to TUI directory"
# Copy to TUI directory # Copy to TUI directory
tui_path.parent.mkdir(parents=True, exist_ok=True) tui_path.parent.mkdir(parents=True, exist_ok=True)
content = compose_resource.read_text() content = compose_resource.read_text()
tui_path.write_text(content) tui_path.write_text(content)
return tui_path return tui_path
else: else:
self._compose_search_log += " ✗ NOT FOUND" self._compose_search_log += f" ✗ NOT FOUND"
except Exception as e: except Exception as e:
self._compose_search_log += f" ✗ SKIPPED ({e})" self._compose_search_log += f" ✗ SKIPPED ({e})"
# Don't log this as an error since it's expected when running from source # Don't log this as an error since it's expected when running from source
@ -151,9 +151,17 @@ class ContainerManager:
even if os.environ has stale values. even if os.environ has stale values.
""" """
from dotenv import load_dotenv from dotenv import load_dotenv
from utils.paths import get_tui_env_file
env = dict(os.environ) # Start with current environment env = dict(os.environ) # Start with current environment
env_file = Path(".env")
# Check centralized TUI .env location first
tui_env_file = get_tui_env_file()
if tui_env_file.exists():
env_file = tui_env_file
else:
# Fall back to CWD .env for backward compatibility
env_file = Path(".env")
if env_file.exists(): if env_file.exists():
try: try:
@ -162,6 +170,7 @@ class ContainerManager:
load_dotenv(dotenv_path=env_file, override=True) load_dotenv(dotenv_path=env_file, override=True)
# Update our dict with all environment variables (including those from .env) # Update our dict with all environment variables (including those from .env)
env.update(os.environ) env.update(os.environ)
logger.debug(f"Loaded environment from {env_file}")
except Exception as e: except Exception as e:
logger.debug(f"Error reading .env file for Docker Compose: {e}") logger.debug(f"Error reading .env file for Docker Compose: {e}")