Fix Docker startup script and complete application deployment

- Update docker-start.sh to force correct profiles (qdrant, admin)
- Fix PostgreSQL port mapping from 5432 to 15432 across all configs
- Resolve MCP import conflicts by renaming src/mcp to src/mcp_servers
- Fix admin interface StaticFiles mount syntax error
- Update LLM client to support both Ollama and OpenAI-compatible APIs
- Configure host networking for Discord bot container access
- Correct database connection handling for async context managers
- Update environment variables and Docker compose configurations
- Add missing production dependencies and Dockerfile improvements
This commit is contained in:
root
2025-07-05 15:09:29 -07:00
parent 824b118e93
commit 3d9e8ffbf0
59 changed files with 1100 additions and 244 deletions

View File

@@ -7,14 +7,14 @@ from dataclasses import dataclass, asdict
from enum import Enum
import logging
from ..database.connection import get_db_session
from ..database.models import Character as CharacterModel, Conversation, Message, Memory
from ..characters.character import Character
from ..characters.enhanced_character import EnhancedCharacter
from ..llm.client import llm_client, prompt_manager
from ..llm.prompt_manager import advanced_prompt_manager
from ..utils.config import get_settings, get_character_settings
from ..utils.logging import (log_conversation_event, log_character_action,
from database.connection import get_db_session
from database.models import Character as CharacterModel, Conversation, Message, Memory
from characters.character import Character
from characters.enhanced_character import EnhancedCharacter
from llm.client import llm_client, prompt_manager
from llm.prompt_manager import advanced_prompt_manager
from utils.config import get_settings, get_character_settings
from utils.logging import (log_conversation_event, log_character_action,
log_autonomous_decision, log_error_with_context)
from sqlalchemy import select, and_, or_, func, desc
@@ -402,8 +402,8 @@ class ConversationEngine:
# Use EnhancedCharacter if RAG systems are available
if self.vector_store and self.memory_sharing_manager:
# Find the appropriate MCP servers for this character
from ..mcp.self_modification_server import mcp_server
from ..mcp.file_system_server import filesystem_server
from mcp.self_modification_server import mcp_server
from mcp.file_system_server import filesystem_server
# Find creative projects MCP server
creative_projects_mcp = None

View File

@@ -7,8 +7,8 @@ from dataclasses import dataclass
from enum import Enum
import logging
from ..utils.logging import log_autonomous_decision, log_error_with_context, log_system_health
from ..utils.config import get_settings
from utils.logging import log_autonomous_decision, log_error_with_context, log_system_health
from utils.config import get_settings
logger = logging.getLogger(__name__)