django-agent-studio 0.3.0__py3-none-any.whl → 0.3.2__py3-none-any.whl

django_agent_studio/agents/dynamic.py

@@ -266,9 +266,8 @@ class DynamicAgentRuntime(AgentRuntime):
                 **model_settings,
             )
 
-            # Emit the final assistant message
-            if result.final_content:
-                await ctx.emit(EventType.ASSISTANT_MESSAGE, {"content": result.final_content})
+            # Note: run_agentic_loop already emits ASSISTANT_MESSAGE events,
+            # so we don't emit here to avoid duplicate messages in the UI.
 
             return RunResult(
                 final_output={"response": result.final_content},

django_agent_studio/api/serializers.py

@@ -17,6 +17,10 @@ from django_agent_runtime.models import (
     AgentSystemMember,
     AgentSystemVersion,
     AgentSystemSnapshot,
+    # Collaborator models
+    CollaboratorRole,
+    AgentCollaborator,
+    SystemCollaborator,
 )
 
 
@@ -621,3 +625,138 @@ class PublishVersionSerializer(serializers.Serializer):
         default=False,
         help_text="Whether to make this the active version immediately",
     )
+
+
+# =============================================================================
+# Collaborator Serializers for Multi-User Access Control
+# =============================================================================
+
+
+class AgentCollaboratorSerializer(serializers.ModelSerializer):
+    """Serializer for AgentCollaborator."""
+
+    user_email = serializers.SerializerMethodField()
+    user_name = serializers.SerializerMethodField()
+    added_by_email = serializers.SerializerMethodField()
+    role_display = serializers.CharField(source='get_role_display', read_only=True)
+    can_view = serializers.BooleanField(read_only=True)
+    can_edit = serializers.BooleanField(read_only=True)
+    can_admin = serializers.BooleanField(read_only=True)
+
+    class Meta:
+        model = AgentCollaborator
+        fields = [
+            "id",
+            "agent",
+            "user",
+            "user_email",
+            "user_name",
+            "role",
+            "role_display",
+            "can_view",
+            "can_edit",
+            "can_admin",
+            "added_by",
+            "added_by_email",
+            "added_at",
+            "updated_at",
+        ]
+        read_only_fields = ["id", "added_by", "added_at", "updated_at"]
+
+    def get_user_email(self, obj):
+        """Return email or username as identifier."""
+        if obj.user:
+            return obj.user.email or getattr(obj.user, 'username', None) or str(obj.user)
+        return None
+
+    def get_user_name(self, obj):
+        """Return full name, or fall back to email/username."""
+        if obj.user:
+            if hasattr(obj.user, 'get_full_name'):
+                name = obj.user.get_full_name()
+                if name:
+                    return name
+            return obj.user.email or getattr(obj.user, 'username', None) or str(obj.user)
+        return None
+
+    def get_added_by_email(self, obj):
+        """Return added_by email or username."""
+        if obj.added_by:
+            return obj.added_by.email or getattr(obj.added_by, 'username', None) or str(obj.added_by)
+        return None
+
+
+class SystemCollaboratorSerializer(serializers.ModelSerializer):
+    """Serializer for SystemCollaborator."""
+
+    user_email = serializers.SerializerMethodField()
+    user_name = serializers.SerializerMethodField()
+    added_by_email = serializers.SerializerMethodField()
+    role_display = serializers.CharField(source='get_role_display', read_only=True)
+    can_view = serializers.BooleanField(read_only=True)
+    can_edit = serializers.BooleanField(read_only=True)
+    can_admin = serializers.BooleanField(read_only=True)
+
+    class Meta:
+        model = SystemCollaborator
+        fields = [
+            "id",
+            "system",
+            "user",
+            "user_email",
+            "user_name",
+            "role",
+            "role_display",
+            "can_view",
+            "can_edit",
+            "can_admin",
+            "added_by",
+            "added_by_email",
+            "added_at",
+            "updated_at",
+        ]
+        read_only_fields = ["id", "added_by", "added_at", "updated_at"]
+
+    def get_user_email(self, obj):
+        """Return email or username as identifier."""
+        if obj.user:
+            return obj.user.email or getattr(obj.user, 'username', None) or str(obj.user)
+        return None
+
+    def get_user_name(self, obj):
+        """Return full name, or fall back to email/username."""
+        if obj.user:
+            if hasattr(obj.user, 'get_full_name'):
+                name = obj.user.get_full_name()
+                if name:
+                    return name
+            return obj.user.email or getattr(obj.user, 'username', None) or str(obj.user)
+        return None
+
+    def get_added_by_email(self, obj):
+        """Return added_by email or username."""
+        if obj.added_by:
+            return obj.added_by.email or getattr(obj.added_by, 'username', None) or str(obj.added_by)
+        return None
+
+
+class AddCollaboratorSerializer(serializers.Serializer):
+    """Serializer for adding a collaborator by email or username."""
+
+    email = serializers.CharField(
+        help_text="Email or username of the user to add as collaborator"
+    )
+    role = serializers.ChoiceField(
+        choices=CollaboratorRole.choices,
+        default=CollaboratorRole.VIEWER,
+        help_text="Role to grant: viewer, editor, or admin",
+    )
+
+
+class UpdateCollaboratorRoleSerializer(serializers.Serializer):
+    """Serializer for updating a collaborator's role."""
+
+    role = serializers.ChoiceField(
+        choices=CollaboratorRole.choices,
+        help_text="New role: viewer, editor, or admin",
+    )

django_agent_studio/api/urls.py

@@ -300,4 +300,39 @@ urlpatterns = [
         views.AgentSpecDocumentView.as_view(),
         name="agent_spec_document",
     ),
+
+    # ==========================================================================
+    # Collaborator Management Endpoints
+    # ==========================================================================
+
+    # Agent collaborators
+    path(
+        "agents/<uuid:agent_id>/collaborators/",
+        views.AgentCollaboratorListCreateView.as_view(),
+        name="agent_collaborator_list",
+    ),
+    path(
+        "agents/<uuid:agent_id>/collaborators/<uuid:pk>/",
+        views.AgentCollaboratorDetailView.as_view(),
+        name="agent_collaborator_detail",
+    ),
+
+    # System collaborators
+    path(
+        "systems/<uuid:system_id>/collaborators/",
+        views.SystemCollaboratorListCreateView.as_view(),
+        name="system_collaborator_list",
+    ),
+    path(
+        "systems/<uuid:system_id>/collaborators/<uuid:pk>/",
+        views.SystemCollaboratorDetailView.as_view(),
+        name="system_collaborator_detail",
+    ),
+
+    # User search for collaborator autocomplete
+    path(
+        "users/search/",
+        views.UserSearchView.as_view(),
+        name="user_search",
+    ),
 ]