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:
@@ -8,9 +8,9 @@ from typing import Dict, List, Any, Optional
|
||||
from collections import defaultdict, Counter
|
||||
|
||||
from sqlalchemy import select, func, and_, or_, desc
|
||||
from ...database.connection import get_db_session
|
||||
from ...database.models import Character, Conversation, Message, CharacterRelationship
|
||||
from ..models import (
|
||||
from database.connection import get_db_session
|
||||
from database.models import Character, Conversation, Message, CharacterRelationship
|
||||
from admin.models import (
|
||||
TopicTrend, RelationshipAnalytics, CommunityHealth,
|
||||
EngagementMetrics, Relationship
|
||||
)
|
||||
|
||||
@@ -8,9 +8,9 @@ from typing import List, Dict, Any, Optional
|
||||
import logging
|
||||
|
||||
from sqlalchemy import select, func, and_, or_, desc, asc
|
||||
from ...database.connection import get_db_session
|
||||
from ...database.models import Character, Message, Memory, CharacterRelationship, CharacterEvolution
|
||||
from ..models import (
|
||||
from database.connection import get_db_session
|
||||
from database.models import Character, Message, Memory, CharacterRelationship, CharacterEvolution
|
||||
from admin.models import (
|
||||
CharacterProfile, CharacterStatusEnum, PersonalityEvolution,
|
||||
Relationship, MemorySummary, CreativeWork
|
||||
)
|
||||
|
||||
@@ -8,9 +8,9 @@ from typing import List, Dict, Any, Optional
|
||||
import logging
|
||||
|
||||
from sqlalchemy import select, func, and_, or_, desc, asc, text
|
||||
from ...database.connection import get_db_session
|
||||
from ...database.models import Conversation, Message, Character
|
||||
from ..models import ConversationSummary, ConversationDetail, SearchResult
|
||||
from database.connection import get_db_session
|
||||
from database.models import Conversation, Message, Character
|
||||
from admin.models import ConversationSummary, ConversationDetail, SearchResult
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
@@ -10,10 +10,10 @@ from collections import deque
|
||||
import logging
|
||||
|
||||
from sqlalchemy import select, func, and_, desc
|
||||
from ...database.connection import get_db_session
|
||||
from ...database.models import Character, Conversation, Message, Memory
|
||||
from ..models import DashboardMetrics, ActivityEvent, ActivityType
|
||||
from .websocket_manager import WebSocketManager
|
||||
from database.connection import get_db_session
|
||||
from database.models import Character, Conversation, Message, Memory
|
||||
from admin.models import DashboardMetrics, ActivityEvent, ActivityType
|
||||
from admin.services.websocket_manager import WebSocketManager
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ from typing import Dict, List, Any, Optional
|
||||
import psutil
|
||||
import json
|
||||
|
||||
from ..models import SystemStatus, SystemStatusEnum, SystemConfiguration, LogEntry
|
||||
from admin.models import SystemStatus, SystemStatusEnum, SystemConfiguration, LogEntry
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user