django-agent-studio 0.3.0__tar.gz → 0.3.4__tar.gz

{django_agent_studio-0.3.0 → django_agent_studio-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-agent-studio
-Version: 0.3.0
+Version: 0.3.4
 Summary: Visual agent builder and management studio for Django - build custom GPTs with a two-pane interface
 Author: Chris Barry
 License: Business Source License 1.1
@@ -126,6 +126,9 @@ A visual agent builder and management interface for Django applications. Create,
 
 | Version | Date | Changes |
 |---------|------|---------|
+| **0.3.3** | 2026-01-30 | **Logout & Scroll Fixes** - Added logout button to header, fixed embedded chat widget scrolling with proper flex layout |
+| **0.3.2** | 2026-01-30 | **Multi-User Access Control** - Collaborator management UI, user search autocomplete, supports both email and username-based User models, system creation from homepage, permission inheritance display |
+| **0.3.1** | 2026-01-30 | **Bug Fixes** - Fixed duplicate message emit in dynamic agents, fixed escapejs encoding in templates, added 800px max-width constraint to system test view |
 | **0.3.0** | 2026-01-29 | **System Listing & Navigation** - Browse and test multi-agent systems from homepage, fixed URL routing for My Systems/My Agents links, system creation now supports optional entry agent |
 | **0.2.0** | 2026-01-28 | **Multi-Agent Systems** - System management UI, shared memory configuration, memory privacy controls, builder tools for managing agent systems |
 | **0.1.9** | 2026-01-27 | Spec documents migration, improved builder agent |

{django_agent_studio-0.3.0 → django_agent_studio-0.3.4}/README.md

@@ -6,6 +6,9 @@ A visual agent builder and management interface for Django applications. Create,
 
 | Version | Date | Changes |
 |---------|------|---------|
+| **0.3.3** | 2026-01-30 | **Logout & Scroll Fixes** - Added logout button to header, fixed embedded chat widget scrolling with proper flex layout |
+| **0.3.2** | 2026-01-30 | **Multi-User Access Control** - Collaborator management UI, user search autocomplete, supports both email and username-based User models, system creation from homepage, permission inheritance display |
+| **0.3.1** | 2026-01-30 | **Bug Fixes** - Fixed duplicate message emit in dynamic agents, fixed escapejs encoding in templates, added 800px max-width constraint to system test view |
 | **0.3.0** | 2026-01-29 | **System Listing & Navigation** - Browse and test multi-agent systems from homepage, fixed URL routing for My Systems/My Agents links, system creation now supports optional entry agent |
 | **0.2.0** | 2026-01-28 | **Multi-Agent Systems** - System management UI, shared memory configuration, memory privacy controls, builder tools for managing agent systems |
 | **0.1.9** | 2026-01-27 | Spec documents migration, improved builder agent |

{django_agent_studio-0.3.0 → django_agent_studio-0.3.4}/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},
@@ -627,8 +626,13 @@ class DynamicAgentRuntime(AgentRuntime):
             return ""
     
     def _build_tool_schemas(self, config: dict) -> list:
-        """Build OpenAI-format tool schemas from config."""
+        """Build OpenAI-format tool schemas from config.
+
+        Includes both regular tools and sub-agent tools.
+        """
         schemas = []
+
+        # Add regular tools
         for tool in config.get("tools", []):
             # Skip the _meta field when building schema
             schema = {
@@ -636,22 +640,68 @@ class DynamicAgentRuntime(AgentRuntime):
                 "function": tool.get("function", {}),
             }
             schemas.append(schema)
+
+        # Add sub-agent tools in OpenAI format
+        for sub_tool in config.get("sub_agent_tools", []):
+            schema = {
+                "type": "function",
+                "function": {
+                    "name": sub_tool.get("name"),
+                    "description": sub_tool.get("description", ""),
+                    "parameters": {
+                        "type": "object",
+                        "properties": {
+                            "message": {
+                                "type": "string",
+                                "description": f"The message or task to send to the {sub_tool.get('name')} agent",
+                            },
+                            "context": {
+                                "type": "string",
+                                "description": "Optional additional context to include",
+                            },
+                        },
+                        "required": ["message"],
+                    },
+                },
+            }
+            schemas.append(schema)
+            logger.debug(f"Added sub-agent tool schema: {sub_tool.get('name')}")
+
         return schemas
 
     def _build_tool_map(self, config: dict) -> dict:
-        """Build a map of tool name to execution info."""
+        """Build a map of tool name to execution info.
+
+        Includes both regular tools and sub-agent tools.
+        """
         tool_map = {}
+
+        # Add regular tools
         for tool in config.get("tools", []):
             func_info = tool.get("function", {})
             tool_name = func_info.get("name")
             if tool_name:
                 # Get execution metadata from _meta field
                 meta = tool.get("_meta", {})
+                # Check both function_path (DynamicTool) and builtin_ref (AgentTool)
                 tool_map[tool_name] = {
-                    "function_path": meta.get("function_path"),
+                    "function_path": meta.get("function_path") or meta.get("builtin_ref"),
                     "tool_id": meta.get("tool_id"),
                     "is_dynamic": meta.get("is_dynamic", False),
+                    "is_sub_agent": False,
                 }
+
+        # Add sub-agent tools
+        for sub_tool in config.get("sub_agent_tools", []):
+            tool_name = sub_tool.get("name")
+            if tool_name:
+                tool_map[tool_name] = {
+                    "is_sub_agent": True,
+                    "agent_slug": sub_tool.get("agent_slug"),
+                    "context_mode": sub_tool.get("context_mode", "message_only"),
+                }
+                logger.debug(f"Added sub-agent tool to map: {tool_name} -> {sub_tool.get('agent_slug')}")
+
         return tool_map
 
     async def _execute_tool(
@@ -662,8 +712,22 @@ class DynamicAgentRuntime(AgentRuntime):
         executor: "DynamicToolExecutor",
         ctx: RunContext,
     ) -> str:
-        """Execute a tool and return its result."""
+        """Execute a tool and return its result.
+
+        Handles both regular tools and sub-agent tools.
+        """
         tool_info = tool_map.get(tool_name, {})
+
+        # Check if this is a sub-agent tool
+        if tool_info.get("is_sub_agent"):
+            return await self._execute_sub_agent_tool(
+                tool_name=tool_name,
+                tool_args=tool_args,
+                tool_info=tool_info,
+                ctx=ctx,
+            )
+
+        # Regular tool execution
         function_path = tool_info.get("function_path")
 
         if not function_path:
@@ -691,3 +755,98 @@ class DynamicAgentRuntime(AgentRuntime):
             logger.exception(f"Error executing tool {tool_name}")
             return json.dumps({"error": str(e)})
 
+    async def _execute_sub_agent_tool(
+        self,
+        tool_name: str,
+        tool_args: dict,
+        tool_info: dict,
+        ctx: RunContext,
+    ) -> str:
+        """Execute a sub-agent tool by invoking the sub-agent.
+
+        Args:
+            tool_name: Name of the sub-agent tool
+            tool_args: Arguments passed to the tool (message, context)
+            tool_info: Tool metadata including agent_slug and context_mode
+            ctx: Parent agent's run context
+
+        Returns:
+            JSON string with the sub-agent's response
+        """
+        from agent_runtime_core.multi_agent import (
+            AgentTool as AgentToolCore,
+            InvocationMode,
+            ContextMode,
+            invoke_agent,
+        )
+        from django_agent_runtime.runtime.registry import get_runtime_async
+
+        sub_agent_slug = tool_info.get("agent_slug")
+        context_mode_str = tool_info.get("context_mode", "message_only")
+
+        # Map context_mode string to enum
+        context_mode_map = {
+            'message_only': ContextMode.MESSAGE_ONLY,
+            'summary': ContextMode.SUMMARY,
+            'full': ContextMode.FULL,
+        }
+        context_mode = context_mode_map.get(context_mode_str, ContextMode.MESSAGE_ONLY)
+
+        message = tool_args.get("message", "")
+        additional_context = tool_args.get("context")
+
+        if not message:
+            return json.dumps({"error": "Missing required parameter: message"})
+
+        try:
+            # Get the sub-agent's runtime
+            sub_agent_runtime = await get_runtime_async(sub_agent_slug)
+
+            # Create an AgentTool wrapper for the sub-agent
+            agent_tool = AgentToolCore(
+                agent=sub_agent_runtime,
+                name=tool_name,
+                description=f"Sub-agent: {sub_agent_slug}",
+                invocation_mode=InvocationMode.DELEGATE,
+                context_mode=context_mode,
+                metadata={
+                    'sub_agent_slug': sub_agent_slug,
+                    'parent_run_id': str(ctx.run_id) if ctx.run_id else None,
+                },
+            )
+
+            # Get conversation history from parent context
+            conversation_history = list(ctx.input_messages)
+
+            # Invoke the sub-agent
+            logger.info(f"Invoking sub-agent '{sub_agent_slug}' via tool '{tool_name}'")
+            result = await invoke_agent(
+                agent_tool=agent_tool,
+                message=message,
+                parent_ctx=ctx,
+                conversation_history=conversation_history,
+                additional_context=additional_context,
+            )
+
+            logger.info(f"Sub-agent '{sub_agent_slug}' completed for tool '{tool_name}'")
+
+            return json.dumps({
+                "response": result.response,
+                "sub_agent": result.sub_agent_key,
+                "handoff": result.handoff,
+            })
+
+        except KeyError as e:
+            logger.error(f"Sub-agent not found: {sub_agent_slug} - {e}")
+            return json.dumps({
+                "error": f"Sub-agent not found: {sub_agent_slug}",
+                "tool": tool_name,
+            })
+        except Exception as e:
+            logger.exception(f"Error invoking sub-agent '{sub_agent_slug}'")
+            return json.dumps({
+                "error": str(e),
+                "tool": tool_name,
+                "sub_agent": sub_agent_slug,
+            })
+

{django_agent_studio-0.3.0 → django_agent_studio-0.3.4}/api/serializers.py

@@ -17,6 +17,10 @@ from django_agent_runtime.models import (
     AgentSystemMember,
     AgentSystemVersion,
     AgentSystemSnapshot,
+    # Collaborator models
+    CollaboratorRole,
+    AgentCollaborator,
+    SystemCollaborator,
 )
 
 
@@ -499,8 +503,8 @@ class AgentSystemVersionSerializer(serializers.ModelSerializer):
 class AgentSystemListSerializer(serializers.ModelSerializer):
     """Serializer for listing AgentSystems."""
 
-    entry_agent_name = serializers.CharField(source='entry_agent.name', read_only=True)
-    entry_agent_slug = serializers.CharField(source='entry_agent.slug', read_only=True)
+    entry_agent = serializers.SerializerMethodField()
+    members = AgentSystemMemberSerializer(many=True, read_only=True)
     member_count = serializers.SerializerMethodField()
     active_version = serializers.SerializerMethodField()
 
@@ -512,8 +516,7 @@ class AgentSystemListSerializer(serializers.ModelSerializer):
             "name",
             "description",
             "entry_agent",
-            "entry_agent_name",
-            "entry_agent_slug",
+            "members",
             "is_active",
             "member_count",
             "active_version",
@@ -522,6 +525,16 @@ class AgentSystemListSerializer(serializers.ModelSerializer):
         ]
         read_only_fields = ["id", "created_at", "updated_at"]
 
+    def get_entry_agent(self, obj):
+        if obj.entry_agent:
+            return {
+                "id": str(obj.entry_agent.id),
+                "name": obj.entry_agent.name,
+                "slug": obj.entry_agent.slug,
+                "icon": obj.entry_agent.icon,
+            }
+        return None
+
     def get_member_count(self, obj):
         return obj.members.count()
 
@@ -535,8 +548,6 @@ class AgentSystemListSerializer(serializers.ModelSerializer):
 class AgentSystemDetailSerializer(serializers.ModelSerializer):
     """Serializer for AgentSystem detail view."""
 
-    entry_agent_name = serializers.CharField(source='entry_agent.name', read_only=True)
-    entry_agent_slug = serializers.CharField(source='entry_agent.slug', read_only=True)
     members = AgentSystemMemberSerializer(many=True, read_only=True)
     versions = AgentSystemVersionSerializer(many=True, read_only=True)
     dependency_graph = serializers.SerializerMethodField()
@@ -549,8 +560,6 @@ class AgentSystemDetailSerializer(serializers.ModelSerializer):
             "name",
             "description",
             "entry_agent",
-            "entry_agent_name",
-            "entry_agent_slug",
             "is_active",
             "members",
             "versions",
@@ -563,6 +572,20 @@ class AgentSystemDetailSerializer(serializers.ModelSerializer):
     def get_dependency_graph(self, obj):
         return obj.get_dependency_graph()
 
+    def to_representation(self, instance):
+        """Return entry_agent as an object for reading."""
+        data = super().to_representation(instance)
+        if instance.entry_agent:
+            data['entry_agent'] = {
+                "id": str(instance.entry_agent.id),
+                "name": instance.entry_agent.name,
+                "slug": instance.entry_agent.slug,
+                "icon": instance.entry_agent.icon,
+            }
+        else:
+            data['entry_agent'] = None
+        return data
+
 
 class AgentSystemCreateSerializer(serializers.Serializer):
     """Serializer for creating an AgentSystem."""
@@ -621,3 +644,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-0.3.0 → django_agent_studio-0.3.4}/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",
+    ),
 ]