send messages from worker

Author: raphaeltm

.devcontainer/Dockerfile

@@ -0,0 +1,4 @@
+FROM mcr.microsoft.com/devcontainers/python:3.12-bookworm
+
+# Install django cli
+RUN pip install django

.devcontainer/devcontainer.json

@@ -0,0 +1,10 @@
+{
+  "build": {
+    "dockerfile": "Dockerfile",
+    "context": ".."
+  },
+  "features": {
+    "ghcr.io/defanglabs/devcontainer-feature/defang-cli:1.0.4": {},
+    "ghcr.io/devcontainers/features/docker-in-docker:2": {}
+  }
+}

.env.dev

@@ -0,0 +1,2 @@
+POSTGRES_PASSWORD=postgres
+DJANGO_SECRET_KEY=insecure-default-key-for-dev

.env.local

@@ -0,0 +1,25 @@
+name: Deploy
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
+
+    steps:
+    - name: Checkout Repo
+      uses: actions/checkout@v4
+
+    - name: Deploy
+      uses: DefangLabs/[email protected]
+      with:
+        config-env-vars: DJANGO_SECRET_KEY POSTGRES_PASSWORD
+      env:
+        DJANGO_SECRET_KEY: ${{ secrets.DJANGO_SECRET_KEY }}
+        POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}

.github/workflows/deploy.yaml

@@ -6,7 +6,7 @@ ENV PYTHONDONTWRITEBYTECODE=1
 ENV PYTHONUNBUFFERED=1
 
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends gcc libpq-dev && \
+    apt-get install -y --no-install-recommends curl gcc libpq-dev netcat-traditional && \
     rm -rf /var/lib/apt/lists/*
 
 COPY requirements.txt .

app/Dockerfile

@@ -56,24 +56,7 @@ async def receive(self, text_data):
 
         # Start moderation in background
         from .tasks import moderate_message_content
-        result = moderate_message_content.delay(message_obj.id)
-        
-        # Wait for moderation result (with timeout)
-        try:
-            moderation_result = result.get(timeout=2)  # 2 second timeout
-            if moderation_result.get('is_flagged', False):
-                # Send moderation result to room group
-                await self.channel_layer.group_send(
-                    self.room_group_name,
-                    {
-                        'type': 'moderation_update',
-                        'message_id': message_obj.id,
-                        'status': 'flagged',
-                        'notes': moderation_result.get('notes', {})
-                    }
-                )
-        except Exception as e:
-            print(f'Error getting moderation result: {e}')
+        moderate_message_content.delay(message_obj.id)
 
     async def chat_message(self, event):
         # Send message to WebSocket
@@ -86,6 +69,7 @@ async def chat_message(self, event):
         }))
 
     async def moderation_update(self, event):
+        print(f"Moderation update received: {event}")
         # Send moderation update to WebSocket
         await self.send(text_data=json.dumps({
             'type': 'moderation',

app/chat/consumers.py

@@ -0,0 +1,8 @@
+from django.core.management.base import BaseCommand
+from django.contrib.auth import get_user_model
+
+class Command(BaseCommand):
+    def handle(self, *args, **options):
+        User = get_user_model()
+        if not User.objects.filter(username='admin').exists():
+            User.objects.create_superuser('admin', '[email protected]', 'admin')

app/chat/management/commands/createsuperauto.py

@@ -5,6 +5,10 @@
 from better_profanity import profanity
 import nltk
 from .models import Room, Message
+from asgiref.sync import async_to_sync
+from channels.layers import get_channel_layer
+from django.utils.text import slugify
+
 
 # Download required NLTK data
 if os.getenv('WORKER') == '1':
@@ -55,13 +59,29 @@ def moderate_message_content(message_id):
         message.moderated_at = timezone.now()
         message.save()
 
-        return {
+        response = {
             'message_id': message_id,
             'is_flagged': message.is_flagged,
             'status': message.moderation_status,
             'notes': moderation_notes
         }
 
+        channel_layer = get_channel_layer()
+        room_group_name = f"chat_{slugify(message.room.name)}" 
+
+        print(f"Sending moderation update to room group: {room_group_name}")
+        async_to_sync(channel_layer.group_send)(
+            room_group_name,
+            {
+                'type': 'moderation_update',
+                'message_id': message_id,
+                'status': message.moderation_status,
+                'notes': moderation_notes,
+            }
+        )
+
+        return response
+
     except Message.DoesNotExist:
         return f"Message with id {message_id} not found"
 

app/chat/tasks.py

@@ -27,20 +27,10 @@
         <h2 class="mb-4">Chat Room: {{ room.name }}</h2>
         <div class="chat-messages" id="chat-messages">
             {% for message in messages %}
-            <div class="message" id="message-{{ message.id }}" {% if message.is_flagged %}style="display: none;"{% endif %}>
+            <div class="message" id="message-{{ message.id }}">
                 <span class="message-user">{{ message.user.username }}</span>
                 <span class="message-time">{{ message.created_at|date:'H:i' }}</span>
                 <div class="message-content">{{ message.content }}</div>
-                {% if message.is_flagged %}
-                <div class="alert alert-warning mt-1">
-                    <small>This message has been flagged for review.</small>
-                    {% if message.moderation_notes %}
-                    <button type="button" class="btn btn-sm btn-link" onclick="showModerationDetails('{{ message.id }}')">
-                        View Details
-                    </button>
-                    {% endif %}
-                </div>
-                {% endif %}
             </div>
             {% endfor %}
         </div>
@@ -98,6 +88,9 @@ <h2 class="mb-4">Chat Room: {{ room.name }}</h2>
             // Handle moderation update
             const messageDiv = document.querySelector(`#message-${data.message_id}`);
             if (messageDiv && data.status === 'flagged') {
+                // remove message content
+                messageDiv.querySelector('.message-content').remove();
+
                 // Add warning message
                 const warningHtml = `
                     <div class="alert alert-warning mt-1">