matt/discord-fishbowl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Docker startup script and complete application deployment

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files

138
migrations/versions/004_add_creative_projects.py
View File

@@ -1,7 +1,7 @@
"""Add creative projects tables
"""Initial tables including creative projects
Revision ID: 004
Revises: 003
Revises: None
Create Date: 2024-12-20 12:00:00.000000
"""
@@ -11,11 +11,130 @@ from sqlalchemy.dialects import postgresql
# revision identifiers
revision = '004'
down_revision = '003'
down_revision = None
branch_labels = None
depends_on = None
def upgrade():
# Create characters table first
op.create_table('characters',
sa.Column('id', sa.Integer(), primary_key=True, index=True),
sa.Column('name', sa.String(100), unique=True, nullable=False, index=True),
sa.Column('personality', sa.Text(), nullable=False),
sa.Column('system_prompt', sa.Text(), nullable=False),
sa.Column('interests', sa.JSON(), nullable=False, default=list),
sa.Column('speaking_style', sa.Text(), nullable=False),
sa.Column('background', sa.Text(), nullable=False),
sa.Column('avatar_url', sa.String(500)),
sa.Column('is_active', sa.Boolean(), default=True),
sa.Column('creation_date', sa.DateTime(), server_default=sa.func.now()),
sa.Column('last_active', sa.DateTime(), server_default=sa.func.now()),
sa.Column('last_message_id', sa.Integer())
)
# Create conversations table
op.create_table('conversations',
sa.Column('id', sa.Integer(), primary_key=True, index=True),
sa.Column('channel_id', sa.String(100), nullable=False, index=True),
sa.Column('topic', sa.String(200)),
sa.Column('start_time', sa.DateTime(), server_default=sa.func.now()),
sa.Column('end_time', sa.DateTime()),
sa.Column('is_active', sa.Boolean(), default=True),
sa.Column('participant_count', sa.Integer(), default=0)
)
# Create messages table
op.create_table('messages',
sa.Column('id', sa.Integer(), primary_key=True, index=True),
sa.Column('discord_id', sa.String(100), unique=True, index=True),
sa.Column('conversation_id', sa.Integer(), sa.ForeignKey('conversations.id')),
sa.Column('character_id', sa.Integer(), sa.ForeignKey('characters.id')),
sa.Column('content', sa.Text(), nullable=False),
sa.Column('timestamp', sa.DateTime(), server_default=sa.func.now()),
sa.Column('response_to_id', sa.Integer(), sa.ForeignKey('messages.id')),
sa.Column('metadata', sa.JSON(), default=dict)
)
# Add foreign key for last_message_id after messages table is created
op.create_foreign_key('fk_characters_last_message', 'characters', 'messages', ['last_message_id'], ['id'])
# Create memories table
op.create_table('memories',
sa.Column('id', sa.Integer(), primary_key=True, index=True),
sa.Column('character_id', sa.Integer(), sa.ForeignKey('characters.id'), nullable=False),
sa.Column('memory_type', sa.String(50), nullable=False),
sa.Column('content', sa.Text(), nullable=False),
sa.Column('importance', sa.Float(), default=0.5),
sa.Column('timestamp', sa.DateTime(), server_default=sa.func.now()),
sa.Column('associated_conversation_id', sa.Integer(), sa.ForeignKey('conversations.id')),
sa.Column('associated_character_ids', sa.JSON(), default=list),
sa.Column('metadata', sa.JSON(), default=dict)
)
# Create character_relationships table
op.create_table('character_relationships',
sa.Column('id', sa.Integer(), primary_key=True, index=True),
sa.Column('character_a_id', sa.Integer(), sa.ForeignKey('characters.id'), nullable=False),
sa.Column('character_b_id', sa.Integer(), sa.ForeignKey('characters.id'), nullable=False),
sa.Column('relationship_type', sa.String(50), nullable=False),
sa.Column('strength', sa.Float(), default=0.0),
sa.Column('last_interaction', sa.DateTime(), server_default=sa.func.now()),
sa.Column('interaction_count', sa.Integer(), default=0),
sa.Column('notes', sa.Text()),
sa.Column('metadata', sa.JSON(), default=dict)
)
# Create character_evolution table
op.create_table('character_evolution',
sa.Column('id', sa.Integer(), primary_key=True, index=True),
sa.Column('character_id', sa.Integer(), sa.ForeignKey('characters.id'), nullable=False),
sa.Column('change_type', sa.String(50), nullable=False),
sa.Column('old_value', sa.Text()),
sa.Column('new_value', sa.Text(), nullable=False),
sa.Column('reason', sa.Text()),
sa.Column('timestamp', sa.DateTime(), server_default=sa.func.now()),
sa.Column('metadata', sa.JSON(), default=dict)
)
# Create shared_memories table
op.create_table('shared_memories',
sa.Column('id', sa.Integer(), primary_key=True, index=True),
sa.Column('memory_id', sa.Integer(), sa.ForeignKey('memories.id'), nullable=False),
sa.Column('shared_by_character_id', sa.Integer(), sa.ForeignKey('characters.id'), nullable=False),
sa.Column('shared_with_character_id', sa.Integer(), sa.ForeignKey('characters.id'), nullable=False),
sa.Column('trust_level_at_time_of_sharing', sa.Float(), nullable=False),
sa.Column('shared_at', sa.DateTime(), server_default=sa.func.now()),
sa.Column('integration_status', sa.String(20), default='integrated'),
sa.Column('metadata', sa.JSON(), default=dict)
)
# Create memory_share_requests table
op.create_table('memory_share_requests',
sa.Column('id', sa.Integer(), primary_key=True, index=True),
sa.Column('requester_character_id', sa.Integer(), sa.ForeignKey('characters.id'), nullable=False),
sa.Column('target_character_id', sa.Integer(), sa.ForeignKey('characters.id'), nullable=False),
sa.Column('memory_id', sa.Integer(), sa.ForeignKey('memories.id'), nullable=False),
sa.Column('request_reason', sa.Text(), nullable=False),
sa.Column('status', sa.String(20), default='pending'),
sa.Column('response_reasoning', sa.Text()),
sa.Column('created_at', sa.DateTime(), server_default=sa.func.now()),
sa.Column('responded_at', sa.DateTime()),
sa.Column('metadata', sa.JSON(), default=dict)
)
# Create character_trust_levels table
op.create_table('character_trust_levels',
sa.Column('id', sa.Integer(), primary_key=True, index=True),
sa.Column('character_a_id', sa.Integer(), sa.ForeignKey('characters.id'), nullable=False),
sa.Column('character_b_id', sa.Integer(), sa.ForeignKey('characters.id'), nullable=False),
sa.Column('trust_score', sa.Float(), default=0.3),
sa.Column('relationship_depth', sa.String(20), default='basic'),
sa.Column('interaction_count', sa.Integer(), default=0),
sa.Column('positive_interactions', sa.Integer(), default=0),
sa.Column('last_updated', sa.DateTime(), server_default=sa.func.now()),
sa.Column('metadata', sa.JSON(), default=dict)
)
# Create creative_projects table
op.create_table('creative_projects',
sa.Column('id', sa.String(255), primary_key=True, index=True),
@@ -89,8 +208,17 @@ def upgrade():
op.create_index('ix_invitations_project', 'project_invitations', ['project_id', 'created_at'])
def downgrade():
# Drop tables in reverse order
# Drop tables in reverse order of creation
op.drop_table('project_invitations')
op.drop_table('project_contributions')
op.drop_table('project_collaborators')
op.drop_table('creative_projects')
op.drop_table('creative_projects')
op.drop_table('character_trust_levels')
op.drop_table('memory_share_requests')
op.drop_table('shared_memories')
op.drop_table('character_evolution')
op.drop_table('character_relationships')
op.drop_table('memories')
op.drop_table('messages')
op.drop_table('conversations')
op.drop_table('characters')