django-cfg 1.3.7__py3-none-any.whl → 1.3.11__py3-none-any.whl

django_cfg/apps/agents/admin/__init__.py

@@ -1,16 +1,29 @@
 """
-Django admin interfaces for Django Orchestrator.
+Agents admin interfaces using Django Admin Utilities.
+
+Modern, clean admin interfaces with Material Icons and consistent styling.
 """
 
-from .registry_admin import AgentDefinitionAdmin, AgentTemplateAdmin
+from django.contrib import admin
+
+# Import all admin classes
 from .execution_admin import AgentExecutionAdmin, WorkflowExecutionAdmin
+from .registry_admin import AgentDefinitionAdmin, AgentTemplateAdmin
 from .toolsets_admin import ToolExecutionAdmin, ApprovalLogAdmin, ToolsetConfigurationAdmin
 
+# All models are registered in their respective admin files using @admin.register
+# This provides:
+# - Clean separation of concerns
+# - Material Icons integration
+# - Type-safe configurations
+# - Performance optimizations
+# - Consistent styling with django_admin module
+
 __all__ = [
-    'AgentDefinitionAdmin',
-    'AgentTemplateAdmin', 
     'AgentExecutionAdmin',
     'WorkflowExecutionAdmin',
+    'AgentDefinitionAdmin',
+    'AgentTemplateAdmin',
     'ToolExecutionAdmin',
     'ApprovalLogAdmin',
     'ToolsetConfigurationAdmin',

django_cfg/apps/agents/admin/execution_admin.py

@@ -1,9 +1,10 @@
 """
-Execution admin interfaces with Unfold optimization.
+Execution admin interfaces using Django Admin Utilities.
+
+Enhanced execution management with Material Icons and optimized queries.
 """
 
 from django.contrib import admin, messages
-from django.utils.html import format_html
 from django.urls import reverse
 from django.utils.safestring import mark_safe
 from django.db import models
@@ -13,21 +14,32 @@ from django.db.models.fields.json import JSONField
 from datetime import timedelta
 from django_json_widget.widgets import JSONEditorWidget
 from unfold.admin import ModelAdmin, TabularInline
-from unfold.decorators import display, action
-from unfold.enums import ActionVariant
 from unfold.contrib.filters.admin import AutocompleteSelectFilter, AutocompleteSelectMultipleFilter
 from unfold.contrib.forms.widgets import WysiwygWidget
 from django_cfg import ExportMixin, ExportForm
 
+from django_cfg.modules.django_admin import (
+    OptimizedModelAdmin,
+    DisplayMixin,
+    MoneyDisplayConfig,
+    StatusBadgeConfig,
+    DateTimeDisplayConfig,
+    Icons,
+    ActionVariant,
+    display,
+    action
+)
+from django_cfg.modules.django_admin.utils.badges import StatusBadge
+
 from ..models.execution import AgentExecution, WorkflowExecution
 
 
 class AgentExecutionInlineForWorkflow(TabularInline):
-    """Inline for agent executions within workflow with Unfold styling."""
+    """Enhanced inline for agent executions within workflow."""
     
     model = AgentExecution
     verbose_name = "Agent Execution"
-    verbose_name_plural = "🔗 Workflow Steps (Read-only)"
+    verbose_name_plural = "🔗 Workflow Steps"
     extra = 0
     max_num = 0
     can_delete = False
@@ -58,32 +70,33 @@ class AgentExecutionInlineForWorkflow(TabularInline):
     @display(description="Status")
     def status_badge_inline(self, obj):
         """Status badge for inline display."""
-        colors = {
-            'pending': 'bg-yellow-100 text-yellow-800',
-            'running': 'bg-blue-100 text-blue-800', 
-            'completed': 'bg-green-100 text-green-800',
-            'failed': 'bg-red-100 text-red-800',
-            'cancelled': 'bg-gray-100 text-gray-800'
-        }
-        color_class = colors.get(obj.status, 'bg-gray-100 text-gray-800')
-        return format_html(
-            '<span class="inline-flex items-center px-2 py-1 rounded-full text-xs font-medium {}">{}</span>',
-            color_class, obj.get_status_display()
+        status_config = StatusBadgeConfig(
+            custom_mappings={
+                'pending': 'warning',
+                'running': 'info', 
+                'completed': 'success',
+                'failed': 'danger',
+                'cancelled': 'secondary'
+            },
+            show_icons=True,
+            icon=Icons.PLAY_ARROW
         )
+        return self.display_status_auto(obj, 'status', status_config)
     
     @display(description="Execution Time")
     def execution_time_display(self, obj):
         """Execution time display for inline."""
         if obj.execution_time:
             return f"{obj.execution_time:.2f}s"
-        return "-"
+        return "—"
     
     @display(description="Cost")
     def cost_display_inline(self, obj):
         """Cost display for inline."""
         if obj.cost:
-            return f"${obj.cost:.4f}"
-        return "-"
+            config = MoneyDisplayConfig(currency="USD", show_sign=False)
+            return self.display_money_amount(obj, 'cost', config)
+        return "—"
     
     def get_queryset(self, request):
         """Optimize queryset for inline display."""
@@ -91,29 +104,33 @@ class AgentExecutionInlineForWorkflow(TabularInline):
 
 
 @admin.register(AgentExecution)
-class AgentExecutionAdmin(ModelAdmin, ExportMixin):
-    """Admin interface for AgentExecution with Unfold styling."""
+class AgentExecutionAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin, ExportMixin):
+    """Enhanced admin for AgentExecution model using Django Admin Utilities."""
+    
+    # Performance optimization
+    select_related_fields = ['user', 'workflow_execution', 'agent_definition']
     
     # Export-only configuration
     export_form_class = ExportForm
     
     list_display = [
-        'id_display', 'agent_name_display', 'status_badge', 'user', 
-        'execution_metrics', 'cost_display', 'cached_badge', 'created_at'
+        'id_display', 'agent_name_display', 'status_display', 'user_display', 
+        'execution_time_display', 'tokens_display', 'cost_display', 'cached_display', 'created_at_display'
     ]
-    ordering = ['-created_at']
+    list_display_links = ['id_display', 'agent_name_display']
     list_filter = [
         'status', 'cached', 'agent_name', 'created_at',
         ('user', AutocompleteSelectFilter),
         ('workflow_execution', AutocompleteSelectFilter)
     ]
     search_fields = ['agent_name', 'user__username', 'input_prompt', 'output_data']
-    autocomplete_fields = ['user', 'workflow_execution']
+    autocomplete_fields = ['user', 'workflow_execution', 'agent_definition']
     readonly_fields = [
         'id', 'execution_time', 'tokens_used', 'cost', 'cached',
         'created_at', 'started_at', 'completed_at', 'duration_display',
         'input_preview', 'output_preview', 'error_preview'
     ]
+    ordering = ['-created_at']
     
     # Unfold form field overrides
     formfield_overrides = {
@@ -123,7 +140,7 @@ class AgentExecutionAdmin(ModelAdmin, ExportMixin):
     
     fieldsets = (
         ("🚀 Execution Info", {
-            'fields': ('id', 'agent_name', 'user', 'status'),
+            'fields': ('id', 'agent_name', 'agent_definition', 'user', 'status'),
             'classes': ('tab',)
         }),
         ("📝 Input/Output", {
@@ -149,134 +166,139 @@ class AgentExecutionAdmin(ModelAdmin, ExportMixin):
     @display(description="ID")
     def id_display(self, obj):
         """Enhanced ID display."""
-        return format_html(
-            '<span class="font-mono text-sm text-gray-600">#{}</span>',
-            str(obj.id)[:8]
+        config = StatusBadgeConfig(show_icons=True, icon=Icons.TAG)
+        return StatusBadge.create(
+            text=f"#{str(obj.id)[:8]}",
+            variant="secondary",
+            config=config
         )
     
     @display(description="Agent")
     def agent_name_display(self, obj):
         """Enhanced agent name display."""
-        return format_html(
-            '<div class="flex items-center space-x-2">'
-            '<span class="text-blue-600 font-medium">{}</span>'
-            '</div>',
-            obj.agent_name
+        config = StatusBadgeConfig(show_icons=True, icon=Icons.SMART_TOY)
+        return StatusBadge.create(
+            text=obj.agent_name,
+            variant="primary",
+            config=config
         )
     
     @display(description="Status")
-    def status_badge(self, obj):
-        """Status badge with color coding."""
-        colors = {
-            'pending': 'bg-yellow-100 text-yellow-800',
-            'running': 'bg-blue-100 text-blue-800', 
-            'completed': 'bg-green-100 text-green-800',
-            'failed': 'bg-red-100 text-red-800',
-            'cancelled': 'bg-gray-100 text-gray-800'
-        }
-        color_class = colors.get(obj.status, 'bg-gray-100 text-gray-800')
-        return format_html(
-            '<span class="inline-flex items-center px-2 py-1 rounded-full text-xs font-medium {}">{}</span>',
-            color_class, obj.get_status_display()
+    def status_display(self, obj):
+        """Status display with appropriate icons."""
+        status_config = StatusBadgeConfig(
+            custom_mappings={
+                'pending': 'warning',
+                'running': 'info', 
+                'completed': 'success',
+                'failed': 'danger',
+                'cancelled': 'secondary'
+            },
+            show_icons=True,
+            icon=Icons.PLAY_ARROW if obj.status == 'running' else Icons.CHECK_CIRCLE if obj.status == 'completed' else Icons.ERROR if obj.status == 'failed' else Icons.SCHEDULE
         )
+        return self.display_status_auto(obj, 'status', status_config)
     
-    @display(description="Metrics")
-    def execution_metrics(self, obj):
-        """Combined execution metrics."""
-        return format_html(
-            '<div class="text-sm space-y-1">'
-            '<div><span class="font-medium">Time:</span> {}</div>'
-            '<div><span class="font-medium">Tokens:</span> {}</div>'
-            '</div>',
-            f"{obj.execution_time:.2f}s" if obj.execution_time else "-",
-            f"{obj.tokens_used:,}" if obj.tokens_used else "-"
-        )
+    @display(description="User")
+    def user_display(self, obj):
+        """User display with avatar."""
+        if not obj.user:
+            return "—"
+        return self.display_user_simple(obj.user)
+    
+    @display(description="Time")
+    def execution_time_display(self, obj):
+        """Execution time display."""
+        if obj.execution_time:
+            return f"{obj.execution_time:.2f}s"
+        return "—"
+    
+    @display(description="Tokens")
+    def tokens_display(self, obj):
+        """Tokens display."""
+        if obj.tokens_used:
+            return f"{obj.tokens_used:,}"
+        return "—"
     
     @display(description="Cost")
     def cost_display(self, obj):
         """Cost display with formatting."""
         if obj.cost:
-            return format_html(
-                '<span class="font-mono text-green-600">${:.4f}</span>',
-                obj.cost
+            config = MoneyDisplayConfig(
+                currency="USD",
+                show_sign=False,
+                smart_decimal_places=True
             )
-        return "-"
+            return self.display_money_amount(obj, 'cost', config)
+        return "—"
     
     @display(description="Cached", boolean=True)
-    def cached_badge(self, obj):
-        """Cached status badge."""
+    def cached_display(self, obj):
+        """Cached status display."""
         return obj.cached
     
+    @display(description="Created")
+    def created_at_display(self, obj):
+        """Created time with relative display."""
+        config = DateTimeDisplayConfig(show_relative=True)
+        return self.display_datetime_relative(obj, 'created_at', config)
+    
     @display(description="Duration")
     def duration_display(self, obj):
         """Display execution duration."""
         if obj.duration:
             return f"{obj.duration:.2f}s"
-        return "-"
+        return "—"
     
     @display(description="Input Preview")
     def input_preview(self, obj):
         """Preview of input prompt."""
         if not obj.input_prompt:
-            return "-"
-        preview = obj.input_prompt[:200] + "..." if len(obj.input_prompt) > 200 else obj.input_prompt
-        return format_html(
-            '<div class="text-sm text-gray-600 max-w-md">{}</div>',
-            preview
-        )
+            return "—"
+        return obj.input_prompt[:200] + "..." if len(obj.input_prompt) > 200 else obj.input_prompt
     
     @display(description="Output Preview")
     def output_preview(self, obj):
         """Preview of output data."""
         if not obj.output_data:
-            return "-"
-        preview = str(obj.output_data)[:200] + "..." if len(str(obj.output_data)) > 200 else str(obj.output_data)
-        return format_html(
-            '<div class="text-sm text-gray-600 max-w-md">{}</div>',
-            preview
-        )
+            return "—"
+        return str(obj.output_data)[:200] + "..." if len(str(obj.output_data)) > 200 else str(obj.output_data)
     
     @display(description="Error Preview")
     def error_preview(self, obj):
         """Preview of error message."""
         if not obj.error_message:
-            return "-"
-        preview = obj.error_message[:200] + "..." if len(obj.error_message) > 200 else obj.error_message
-        return format_html(
-            '<div class="text-sm text-red-600 max-w-md">{}</div>',
-            preview
-        )
+            return "—"
+        return obj.error_message[:200] + "..." if len(obj.error_message) > 200 else obj.error_message
     
-    @action(description="Retry failed executions", icon="refresh", variant=ActionVariant.WARNING)
+    @action(description="Retry failed executions", variant=ActionVariant.WARNING)
     def retry_failed_executions(self, request, queryset):
         """Retry failed executions."""
         failed_count = queryset.filter(status='failed').count()
         messages.warning(request, f"Retry functionality not implemented yet. {failed_count} failed executions selected.")
     
-    @action(description="Clear cache", icon="clear", variant=ActionVariant.INFO)
+    @action(description="Clear cache", variant=ActionVariant.INFO)
     def clear_cache(self, request, queryset):
         """Clear cache for selected executions."""
         cached_count = queryset.filter(cached=True).count()
         messages.info(request, f"Cache clearing not implemented yet. {cached_count} cached executions selected.")
-    
-    def get_queryset(self, request):
-        """Optimize queryset."""
-        return super().get_queryset(request).select_related('user', 'workflow_execution')
 
 
 @admin.register(WorkflowExecution)
-class WorkflowExecutionAdmin(ModelAdmin, ExportMixin):
-    """Admin interface for WorkflowExecution with Unfold styling."""
+class WorkflowExecutionAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin, ExportMixin):
+    """Enhanced admin for WorkflowExecution model using Django Admin Utilities."""
+    
+    # Performance optimization
+    select_related_fields = ['user']
     
     # Export-only configuration
     export_form_class = ExportForm
     
     list_display = [
-        'id_display', 'name_display', 'pattern_badge', 'status_badge', 'user',
-        'progress_display', 'metrics_display', 'cost_display', 'created_at'
+        'id_display', 'name_display', 'pattern_display', 'status_display', 'user_display',
+        'progress_display', 'total_time_display', 'total_tokens_display', 'cost_display', 'created_at_display'
     ]
-    ordering = ['-created_at']
-    inlines = [AgentExecutionInlineForWorkflow]
+    list_display_links = ['id_display', 'name_display']
     list_filter = [
         'status', 'pattern', 'created_at',
         ('user', AutocompleteSelectFilter)
@@ -288,6 +310,8 @@ class WorkflowExecutionAdmin(ModelAdmin, ExportMixin):
         'created_at', 'started_at', 'completed_at', 'duration_display', 
         'progress_percentage', 'input_preview', 'output_preview', 'error_preview'
     ]
+    ordering = ['-created_at']
+    inlines = [AgentExecutionInlineForWorkflow]
     
     # Unfold form field overrides
     formfield_overrides = {
@@ -327,141 +351,138 @@ class WorkflowExecutionAdmin(ModelAdmin, ExportMixin):
     @display(description="ID")
     def id_display(self, obj):
         """Enhanced ID display."""
-        return format_html(
-            '<span class="font-mono text-sm text-gray-600">#{}</span>',
-            str(obj.id)[:8]
+        config = StatusBadgeConfig(show_icons=True, icon=Icons.TAG)
+        return StatusBadge.create(
+            text=f"#{str(obj.id)[:8]}",
+            variant="secondary",
+            config=config
         )
     
     @display(description="Workflow")
     def name_display(self, obj):
         """Enhanced workflow name display."""
-        return format_html(
-            '<div class="flex items-center space-x-2">'
-            '<span class="text-indigo-600 font-medium">{}</span>'
-            '</div>',
-            obj.name
+        config = StatusBadgeConfig(show_icons=True, icon=Icons.ACCOUNT_TREE)
+        return StatusBadge.create(
+            text=obj.name,
+            variant="primary",
+            config=config
         )
     
     @display(description="Pattern")
-    def pattern_badge(self, obj):
-        """Pattern badge."""
-        colors = {
-            'sequential': 'bg-blue-100 text-blue-800',
-            'parallel': 'bg-green-100 text-green-800',
-            'conditional': 'bg-purple-100 text-purple-800',
-            'loop': 'bg-orange-100 text-orange-800'
-        }
-        color_class = colors.get(obj.pattern, 'bg-gray-100 text-gray-800')
-        return format_html(
-            '<span class="inline-flex items-center px-2 py-1 rounded-full text-xs font-medium {}">{}</span>',
-            color_class, obj.pattern.title() if obj.pattern else 'Unknown'
+    def pattern_display(self, obj):
+        """Pattern display with appropriate icons."""
+        pattern_config = StatusBadgeConfig(
+            custom_mappings={
+                'sequential': 'info',
+                'parallel': 'success',
+                'conditional': 'warning',
+                'loop': 'secondary'
+            },
+            show_icons=True,
+            icon=Icons.LINEAR_SCALE if obj.pattern == 'sequential' else Icons.CALL_SPLIT if obj.pattern == 'parallel' else Icons.DEVICE_HUB if obj.pattern == 'conditional' else Icons.LOOP
+        )
+        return self.display_status_auto(
+            type('obj', (), {'pattern': obj.pattern.title() if obj.pattern else 'Unknown'})(),
+            'pattern',
+            pattern_config
         )
     
     @display(description="Status")
-    def status_badge(self, obj):
-        """Status badge with color coding."""
-        colors = {
-            'pending': 'bg-yellow-100 text-yellow-800',
-            'running': 'bg-blue-100 text-blue-800', 
-            'completed': 'bg-green-100 text-green-800',
-            'failed': 'bg-red-100 text-red-800',
-            'cancelled': 'bg-gray-100 text-gray-800'
-        }
-        color_class = colors.get(obj.status, 'bg-gray-100 text-gray-800')
-        return format_html(
-            '<span class="inline-flex items-center px-2 py-1 rounded-full text-xs font-medium {}">{}</span>',
-            color_class, obj.get_status_display()
+    def status_display(self, obj):
+        """Status display with appropriate icons."""
+        status_config = StatusBadgeConfig(
+            custom_mappings={
+                'pending': 'warning',
+                'running': 'info', 
+                'completed': 'success',
+                'failed': 'danger',
+                'cancelled': 'secondary'
+            },
+            show_icons=True,
+            icon=Icons.PLAY_ARROW if obj.status == 'running' else Icons.CHECK_CIRCLE if obj.status == 'completed' else Icons.ERROR if obj.status == 'failed' else Icons.SCHEDULE
         )
+        return self.display_status_auto(obj, 'status', status_config)
+    
+    @display(description="User")
+    def user_display(self, obj):
+        """User display with avatar."""
+        if not obj.user:
+            return "—"
+        return self.display_user_simple(obj.user)
     
     @display(description="Progress")
     def progress_display(self, obj):
-        """Display progress as a progress bar."""
-        percentage = obj.progress_percentage
-        color_class = 'bg-green-500' if obj.status == 'completed' else 'bg-blue-500' if obj.status == 'running' else 'bg-red-500'
-        
-        return format_html(
-            '<div class="w-24 bg-gray-200 rounded-full h-2">'
-            '<div class="h-2 rounded-full {} flex items-center justify-center text-xs text-white" style="width: {}%;">'
-            '</div>'
-            '</div>'
-            '<div class="text-xs text-gray-600 mt-1">{}%</div>',
-            color_class, percentage, int(percentage)
-        )
-    
-    @display(description="Metrics")
-    def metrics_display(self, obj):
-        """Combined metrics display."""
-        return format_html(
-            '<div class="text-sm space-y-1">'
-            '<div><span class="font-medium">Time:</span> {}</div>'
-            '<div><span class="font-medium">Tokens:</span> {}</div>'
-            '</div>',
-            f"{obj.total_execution_time:.2f}s" if obj.total_execution_time else "-",
-            f"{obj.total_tokens_used:,}" if obj.total_tokens_used else "-"
-        )
+        """Display progress percentage."""
+        return f"{int(obj.progress_percentage)}%"
+    
+    @display(description="Time")
+    def total_time_display(self, obj):
+        """Total execution time display."""
+        if obj.total_execution_time:
+            return f"{obj.total_execution_time:.2f}s"
+        return "—"
+    
+    @display(description="Tokens")
+    def total_tokens_display(self, obj):
+        """Total tokens display."""
+        if obj.total_tokens_used:
+            return f"{obj.total_tokens_used:,}"
+        return "—"
     
     @display(description="Cost")
     def cost_display(self, obj):
         """Cost display with formatting."""
         if obj.total_cost:
-            return format_html(
-                '<span class="font-mono text-green-600">${:.4f}</span>',
-                obj.total_cost
+            config = MoneyDisplayConfig(
+                currency="USD",
+                show_sign=False,
+                smart_decimal_places=True
             )
-        return "-"
+            return self.display_money_amount(obj, 'total_cost', config)
+        return "—"
+    
+    @display(description="Created")
+    def created_at_display(self, obj):
+        """Created time with relative display."""
+        config = DateTimeDisplayConfig(show_relative=True)
+        return self.display_datetime_relative(obj, 'created_at', config)
     
     @display(description="Duration")
     def duration_display(self, obj):
         """Display workflow duration."""
         if obj.duration:
             return f"{obj.duration:.2f}s"
-        return "-"
+        return "—"
     
     @display(description="Input Preview")
     def input_preview(self, obj):
         """Preview of input prompt."""
         if not obj.input_prompt:
-            return "-"
-        preview = obj.input_prompt[:200] + "..." if len(obj.input_prompt) > 200 else obj.input_prompt
-        return format_html(
-            '<div class="text-sm text-gray-600 max-w-md">{}</div>',
-            preview
-        )
+            return "—"
+        return obj.input_prompt[:200] + "..." if len(obj.input_prompt) > 200 else obj.input_prompt
     
     @display(description="Output Preview")
     def output_preview(self, obj):
         """Preview of final output."""
         if not obj.final_output:
-            return "-"
-        preview = str(obj.final_output)[:200] + "..." if len(str(obj.final_output)) > 200 else str(obj.final_output)
-        return format_html(
-            '<div class="text-sm text-gray-600 max-w-md">{}</div>',
-            preview
-        )
+            return "—"
+        return str(obj.final_output)[:200] + "..." if len(str(obj.final_output)) > 200 else str(obj.final_output)
     
     @display(description="Error Preview")
     def error_preview(self, obj):
         """Preview of error message."""
         if not obj.error_message:
-            return "-"
-        preview = obj.error_message[:200] + "..." if len(obj.error_message) > 200 else obj.error_message
-        return format_html(
-            '<div class="text-sm text-red-600 max-w-md">{}</div>',
-            preview
-        )
+            return "—"
+        return obj.error_message[:200] + "..." if len(obj.error_message) > 200 else obj.error_message
     
-    @action(description="Cancel running workflows", icon="stop", variant=ActionVariant.DANGER)
+    @action(description="Cancel running workflows", variant=ActionVariant.DANGER)
     def cancel_running_workflows(self, request, queryset):
         """Cancel running workflows."""
         running_count = queryset.filter(status='running').count()
         messages.warning(request, f"Cancel functionality not implemented yet. {running_count} running workflows selected.")
     
-    @action(description="Retry failed workflows", icon="refresh", variant=ActionVariant.WARNING)
+    @action(description="Retry failed workflows", variant=ActionVariant.WARNING)
     def retry_failed_workflows(self, request, queryset):
         """Retry failed workflows."""
         failed_count = queryset.filter(status='failed').count()
-        messages.warning(request, f"Retry functionality not implemented yet. {failed_count} failed workflows selected.")
-    
-    def get_queryset(self, request):
-        """Optimize queryset."""
-        return super().get_queryset(request).select_related('user')
+        messages.warning(request, f"Retry functionality not implemented yet. {failed_count} failed workflows selected.")