Merge pull request #583 from Open-Source-Legal/feature/epic-546-discussion-threading

JSv4 · web-flow · commit 425c1576e2a5 · 2025-10-28T19:57:29.000-05:00
Epic #546: Discussion Threads - Core Threading & Agent Type Support
diff --git a/config/graphql/graphene_types.py b/config/graphql/graphene_types.py
@@ -1401,6 +1401,16 @@ class Meta:
         interfaces = [relay.Node]
         connection_class = CountableConnection
 
+    @classmethod
+    def get_queryset(cls, queryset, info):
+        if issubclass(type(queryset), QuerySet):
+            return queryset.visible_to_user(info.context.user)
+        elif "RelatedManager" in str(type(queryset)):
+            # https://stackoverflow.com/questions/11320702/import-relatedmanager-from-django-db-models-fields-related
+            return queryset.all().visible_to_user(info.context.user)
+        else:
+            return queryset
+
 
 class UserFeedbackType(AnnotatePermissionsForReadMixin, DjangoObjectType):
     class Meta:
diff --git a/opencontractserver/conversations/migrations/0005_chatmessage_agent_type_chatmessage_deleted_at_and_more.py b/opencontractserver/conversations/migrations/0005_chatmessage_agent_type_chatmessage_deleted_at_and_more.py
@@ -0,0 +1,68 @@
+# Generated by Django 4.2.24 on 2025-10-27 01:29
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("conversations", "0004_alter_chatmessage_options_alter_conversation_options"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="chatmessage",
+            name="agent_type",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("document_agent", "Document Agent"),
+                    ("corpus_agent", "Corpus Agent"),
+                ],
+                help_text="The specific agent type that generated this message (for LLM messages)",
+                max_length=32,
+                null=True,
+            ),
+        ),
+        migrations.AddField(
+            model_name="chatmessage",
+            name="deleted_at",
+            field=models.DateTimeField(
+                blank=True,
+                help_text="Timestamp when the message was soft-deleted",
+                null=True,
+            ),
+        ),
+        migrations.AddField(
+            model_name="chatmessage",
+            name="parent_message",
+            field=models.ForeignKey(
+                blank=True,
+                help_text="Parent message for threaded replies",
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="replies",
+                to="conversations.chatmessage",
+            ),
+        ),
+        migrations.AddField(
+            model_name="conversation",
+            name="conversation_type",
+            field=models.CharField(
+                choices=[("chat", "Chat"), ("thread", "Thread")],
+                default="chat",
+                help_text="Type of conversation: chat (agent-based) or thread (discussion)",
+                max_length=32,
+            ),
+        ),
+        migrations.AddField(
+            model_name="conversation",
+            name="deleted_at",
+            field=models.DateTimeField(
+                blank=True,
+                help_text="Timestamp when the conversation was soft-deleted",
+                null=True,
+            ),
+        ),
+    ]
diff --git a/opencontractserver/conversations/models.py b/opencontractserver/conversations/models.py
@@ -2,15 +2,16 @@
 
 import django
 from django.contrib.auth import get_user_model
+from django.core.exceptions import ValidationError
 from django.db import models
-from django.forms import ValidationError
 from guardian.models import GroupObjectPermissionBase, UserObjectPermissionBase
 
 from opencontractserver.annotations.models import Annotation
 from opencontractserver.corpuses.models import Corpus
 from opencontractserver.documents.models import Document
 from opencontractserver.shared.defaults import jsonfield_default_value
 from opencontractserver.shared.fields import NullableJSONField
+from opencontractserver.shared.Managers import BaseVisibilityManager
 from opencontractserver.shared.Models import BaseOCModel
 
 User = get_user_model()
@@ -29,6 +30,82 @@ class MessageStateChoices(models.TextChoices):
     AWAITING_APPROVAL = "awaiting_approval", "Awaiting Approval"
 
 
+# Conversation types for distinguishing between agent chats and discussion threads
+class ConversationTypeChoices(models.TextChoices):
+    CHAT = "chat", "Chat"  # Default for agent-based conversations
+    THREAD = "thread", "Thread"  # For discussion threads
+
+
+# Agent types for multi-agent conversation support
+class AgentTypeChoices(models.TextChoices):
+    DOCUMENT_AGENT = "document_agent", "Document Agent"
+    CORPUS_AGENT = "corpus_agent", "Corpus Agent"
+
+
+# Custom QuerySet for soft delete functionality
+class SoftDeleteQuerySet(models.QuerySet):
+    """
+    QuerySet that filters soft-deleted objects and implements user visibility.
+    """
+
+    def visible_to_user(self, user=None):
+        """
+        Returns queryset filtered to objects visible to the user.
+        Maintains soft-delete filtering from the base queryset.
+        """
+        from django.apps import apps
+        from django.contrib.auth.models import AnonymousUser
+        from django.db.models import Q
+
+        # Handle None user as anonymous
+        if user is None:
+            user = AnonymousUser()
+
+        # Start with current queryset (already has soft-delete filtering)
+        queryset = self
+
+        # Superusers see everything
+        if hasattr(user, "is_superuser") and user.is_superuser:
+            return queryset.order_by("created")
+
+        # Anonymous users only see public items
+        if user.is_anonymous:
+            return queryset.filter(is_public=True)
+
+        # Authenticated users: public, created by them, or explicitly shared
+        model_name = self.model._meta.model_name
+        app_label = self.model._meta.app_label
+
+        try:
+            permission_model_name = f"{model_name}userobjectpermission"
+            permission_model_type = apps.get_model(app_label, permission_model_name)
+            permitted_ids = permission_model_type.objects.filter(
+                permission__codename=f"read_{model_name}", user_id=user.id
+            ).values_list("content_object_id", flat=True)
+
+            return queryset.filter(
+                Q(creator_id=user.id) | Q(is_public=True) | Q(id__in=permitted_ids)
+            )
+        except LookupError:
+            # Fallback if permission model doesn't exist
+            return queryset.filter(Q(creator_id=user.id) | Q(is_public=True))
+
+
+# Custom manager for soft delete functionality
+class SoftDeleteManager(BaseVisibilityManager):
+    """
+    Manager that filters out soft-deleted objects by default and implements
+    user visibility permissions via BaseVisibilityManager.
+    Use Model.all_objects to access soft-deleted objects.
+    """
+
+    def get_queryset(self):
+        # Return our custom queryset, filtered for non-deleted objects
+        return SoftDeleteQuerySet(self.model, using=self._db).filter(
+            deleted_at__isnull=True
+        )
+
+
 class ConversationUserObjectPermission(UserObjectPermissionBase):
     """
     Permissions for Conversation objects at the user level.
@@ -73,6 +150,17 @@ class Conversation(BaseOCModel):
         auto_now=True,
         help_text="Timestamp when the conversation was last updated",
     )
+    conversation_type = models.CharField(
+        max_length=32,
+        choices=ConversationTypeChoices.choices,
+        default=ConversationTypeChoices.CHAT,
+        help_text="Type of conversation: chat (agent-based) or thread (discussion)",
+    )
+    deleted_at = models.DateTimeField(
+        null=True,
+        blank=True,
+        help_text="Timestamp when the conversation was soft-deleted",
+    )
     chat_with_corpus = models.ForeignKey(
         Corpus,
         on_delete=models.SET_NULL,
@@ -90,6 +178,10 @@ class Conversation(BaseOCModel):
         null=True,
     )
 
+    # Managers
+    objects = SoftDeleteManager()  # Default manager excludes soft-deleted
+    all_objects = models.Manager()  # Access all objects including soft-deleted
+
     class Meta:
         constraints = [
             django.db.models.CheckConstraint(
@@ -156,6 +248,21 @@ class Meta:
         choices=TYPE_CHOICES,
         help_text="The type of message (SYSTEM, HUMAN, or LLM)",
     )
+    agent_type = models.CharField(
+        max_length=32,
+        choices=AgentTypeChoices.choices,
+        blank=True,
+        null=True,
+        help_text="The specific agent type that generated this message (for LLM messages)",
+    )
+    parent_message = models.ForeignKey(
+        "self",
+        on_delete=models.CASCADE,
+        related_name="replies",
+        blank=True,
+        null=True,
+        help_text="Parent message for threaded replies",
+    )
     content = models.TextField(
         help_text="The textual content of the chat message",
     )
@@ -169,6 +276,11 @@ class Meta:
         auto_now_add=True,
         help_text="Timestamp when the chat message was created",
     )
+    deleted_at = models.DateTimeField(
+        null=True,
+        blank=True,
+        help_text="Timestamp when the message was soft-deleted",
+    )
 
     source_document = models.ForeignKey(
         Document,
@@ -198,6 +310,10 @@ class Meta:
         help_text="Lifecycle state of the message for quick filtering",
     )
 
+    # Managers
+    objects = SoftDeleteManager()  # Default manager excludes soft-deleted
+    all_objects = models.Manager()  # Access all objects including soft-deleted
+
     def __str__(self) -> str:
         return (
             f"ChatMessage {self.pk} - {self.msg_type} "
diff --git a/opencontractserver/tests/test_threading.py b/opencontractserver/tests/test_threading.py
