suggestions implemented

Author: Dishant1804

backend/apps/slack/admin/__init__.py

@@ -1,6 +1,5 @@
 """Slack app admin."""
 
-from .chat import ChatAdmin
 from .conversation import ConversationAdmin
 from .event import EventAdmin
 from .member import MemberAdmin

backend/apps/slack/admin/chat.py

@@ -6,7 +6,8 @@
 
 from apps.ai.agent.tools.rag.rag_tool import RagTool
 from apps.slack.blocks import markdown
-from apps.slack.models import Chat, Member, Workspace
+from apps.slack.constants import CONVERSATION_CONTEXT_LIMIT
+from apps.slack.models import Conversation, Workspace
 
 logger = logging.getLogger(__name__)
 
@@ -47,42 +48,41 @@ def process_ai_query(query: str) -> str | None:
     return rag_tool.query(question=query)
 
 
-def get_dm_blocks(query: str, user_id: str, workspace_id: str) -> list[dict]:
+def get_dm_blocks(query: str, workspace_id: str, channel_id: str) -> list[dict]:
     """Get AI response blocks for DM with conversation context.
 
     Args:
         query (str): The user's question.
-        user_id (str): Slack user ID.
         workspace_id (str): Slack workspace ID.
+        channel_id (str): Slack channel ID for the DM.
 
     Returns:
         list: A list of Slack blocks representing the AI response.
 
     """
-    ai_response = process_dm_ai_query(query.strip(), user_id, workspace_id)
+    ai_response = process_dm_ai_query(query.strip(), workspace_id, channel_id)
 
     if ai_response:
         return [markdown(ai_response)]
     return get_error_blocks()
 
 
-def process_dm_ai_query(query: str, user_id: str, workspace_id: str) -> str | None:
+def process_dm_ai_query(query: str, workspace_id: str, channel_id: str) -> str | None:
     """Process the AI query with DM conversation context.
 
     Args:
         query (str): The user's question.
-        user_id (str): Slack user ID.
         workspace_id (str): Slack workspace ID.
+        channel_id (str): Slack channel ID for the DM.
 
     Returns:
         str | None: The AI response or None if error occurred.
 
     """
-    user = Member.objects.get(slack_user_id=user_id)
     workspace = Workspace.objects.get(slack_workspace_id=workspace_id)
+    conversation = Conversation.objects.get(slack_channel_id=channel_id, workspace=workspace)
 
-    chat = Chat.update_data(user, workspace)
-    context = chat.get_context(limit_exchanges=20)
+    context = conversation.get_context(conversation_context_limit=CONVERSATION_CONTEXT_LIMIT)
 
     rag_tool = RagTool(
         chat_model="gpt-4o",
@@ -95,7 +95,7 @@ def process_dm_ai_query(query: str, user_id: str, workspace_id: str) -> str | No
         enhanced_query = query
 
     response = rag_tool.query(question=enhanced_query)
-    chat.add_to_context(query, response)
+    conversation.add_to_context(query, response)
 
     return response
 

backend/apps/slack/common/handlers/ai.py

@@ -2,6 +2,7 @@
 
 from apps.common.constants import NL
 
+CONVERSATION_CONTEXT_LIMIT = 20
 NEST_BOT_NAME = "NestBot"
 
 OWASP_APPSEC_CHANNEL_ID = "#C0F7D6DFH"

backend/apps/slack/constants.py

@@ -81,31 +81,27 @@ def handle_event(self, event, client):
     def handle_dm(self, event, client, channel_id, user_id, text):
         """Handle direct messages with NestBot (DMs)."""
         workspace_id = event.get("team")
+        channel_info = client.conversations_info(channel=channel_id)
 
-        if not workspace_id:
-            try:
-                channel_info = client.conversations_info(channel=channel_id)
-                workspace_id = channel_info["channel"]["team"]
-            except Exception:
-                logger.exception("Failed to fetch workspace ID for DM.")
-                return
+        try:
+            workspace = Workspace.objects.get(slack_workspace_id=workspace_id)
+        except Workspace.DoesNotExist:
+            logger.exception("Workspace not found for DM.")
+            return
+
+        Conversation.update_data(channel_info["channel"], workspace)
 
         try:
-            Member.objects.get(slack_user_id=user_id, workspace__slack_workspace_id=workspace_id)
+            Member.objects.get(slack_user_id=user_id, workspace=workspace)
         except Member.DoesNotExist:
-            try:
-                user_info = client.users_info(user=user_id)
-                workspace = Workspace.objects.get(slack_workspace_id=workspace_id)
-                Member.update_data(user_info["user"], workspace, save=True)
-                logger.info("Created new member for DM")
-            except Exception:
-                logger.exception("Failed to create member for DM.")
-                return
+            user_info = client.users_info(user=user_id)
+            Member.update_data(user_info["user"], workspace, save=True)
+            logger.info("Created new member for DM")
 
         thread_ts = event.get("thread_ts")
 
         try:
-            response_blocks = get_dm_blocks(text, user_id, workspace_id)
+            response_blocks = get_dm_blocks(text, workspace_id, channel_id)
             if response_blocks:
                 client.chat_postMessage(
                     channel=channel_id,

backend/apps/slack/events/message_posted.py

@@ -0,0 +1,17 @@
+# Generated by Django 5.2.6 on 2025-10-08 07:21
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("slack", "0019_conversation_is_nest_bot_assistant_enabled"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="conversation",
+            name="conversation_context",
+            field=models.TextField(blank=True, verbose_name="Conversation context"),
+        ),
+    ]

backend/apps/slack/migrations/0020_chat.py

@@ -1,4 +1,3 @@
-from .chat import Chat
 from .conversation import Conversation
 from .event import Event
 from .member import Member

backend/apps/slack/migrations/0020_conversation_conversation_context.py

@@ -42,6 +42,7 @@ class Meta:
 
     # Additional attributes.
     sync_messages = models.BooleanField(verbose_name="Sync messages", default=False)
+    conversation_context = models.TextField(blank=True, verbose_name="Conversation context")
 
     def __str__(self):
         """Channel human readable representation."""
@@ -105,3 +106,43 @@ def update_data(conversation_data, workspace, *, save=True):
             conversation.save()
 
         return conversation
+
+    def add_to_context(self, user_message: str, bot_response: str | None = None) -> None:
+        """Add messages to the conversation context.
+
+        Args:
+            user_message: The user's message to add to context.
+            bot_response: The bot's response to add to context.
+
+        """
+        if not self.conversation_context:
+            self.conversation_context = ""
+
+        self.conversation_context = f"{self.conversation_context}{f'User: {user_message}\n'}"
+
+        if bot_response:
+            self.conversation_context = f"{self.conversation_context}{f'Bot: {bot_response}\n'}"
+
+        self.save(update_fields=["conversation_context"])
+
+    def get_context(self, conversation_context_limit: int | None = None) -> str:
+        """Get the conversation context.
+
+        Args:
+            conversation_context_limit: Optional limit on number of exchanges to return.
+
+        Returns:
+            The conversation context, potentially limited to recent exchanges.
+
+        """
+        if not self.conversation_context:
+            return ""
+
+        if conversation_context_limit is None:
+            return self.conversation_context
+
+        lines = self.conversation_context.strip().split("\n")
+        if len(lines) <= conversation_context_limit * 2:
+            return self.conversation_context
+
+        return "\n".join(lines[-(conversation_context_limit * 2) :])