django-cfg 1.4.21__py3-none-any.whl → 1.4.24__py3-none-any.whl

django_cfg/apps/agents/admin/toolsets_admin.py

@@ -4,46 +4,43 @@ Toolsets admin interfaces using Django Admin Utilities.
 Enhanced toolset management with Material Icons and optimized queries.
 """
 
+from datetime import timedelta
+
 from django.contrib import admin, messages
-from django.urls import reverse
-from django.utils.safestring import mark_safe
 from django.db import models
-from django.db.models import Count, Avg, Sum, Q
-from django.utils import timezone
 from django.db.models.fields.json import JSONField
-from datetime import timedelta
+from django.utils import timezone
 from django_json_widget.widgets import JSONEditorWidget
-from unfold.admin import ModelAdmin, TabularInline
-from unfold.contrib.filters.admin import AutocompleteSelectFilter, AutocompleteSelectMultipleFilter
+from unfold.admin import ModelAdmin
+from unfold.contrib.filters.admin import AutocompleteSelectFilter
 from unfold.contrib.forms.widgets import WysiwygWidget
-from django_cfg import ExportMixin, ExportForm
 
+from django_cfg import ExportForm, ExportMixin
 from django_cfg.modules.django_admin import (
-    OptimizedModelAdmin,
-    DisplayMixin,
-    MoneyDisplayConfig,
-    StatusBadgeConfig,
+    ActionVariant,
     DateTimeDisplayConfig,
+    DisplayMixin,
     Icons,
-    ActionVariant,
+    OptimizedModelAdmin,
+    StatusBadgeConfig,
+    action,
     display,
-    action
 )
 from django_cfg.modules.django_admin.utils.badges import StatusBadge
 
-from ..models.toolsets import ToolExecution, ApprovalLog, ToolsetConfiguration
+from ..models.toolsets import ApprovalLog, ToolExecution, ToolsetConfiguration
 
 
 @admin.register(ToolExecution)
 class ToolExecutionAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin, ExportMixin):
     """Enhanced admin for ToolExecution model using Django Admin Utilities."""
-    
+
     # Performance optimization
     select_related_fields = ['agent_execution', 'approval_log']
-    
+
     # Export-only configuration
     export_form_class = ExportForm
-    
+
     list_display = [
         'id_display', 'tool_name_display', 'toolset_display', 'status_display',
         'duration_display', 'retry_count_display', 'created_at_display'
@@ -59,13 +56,13 @@ class ToolExecutionAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin, ExportMi
         'id', 'execution_time', 'retry_count', 'created_at', 'started_at', 'completed_at'
     ]
     ordering = ['-created_at']
-    
+
     # Unfold form field overrides
     formfield_overrides = {
         models.TextField: {"widget": WysiwygWidget},
         JSONField: {"widget": JSONEditorWidget},
     }
-    
+
     fieldsets = (
         ("🔧 Tool Info", {
             'fields': ('id', 'tool_name', 'toolset_class', 'agent_execution'),
@@ -88,9 +85,9 @@ class ToolExecutionAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin, ExportMi
             'classes': ('tab', 'collapse')
         }),
     )
-    
+
     actions = ['retry_failed_executions', 'clear_errors']
-    
+
     @display(description="ID")
     def id_display(self, obj):
         """Enhanced ID display."""
@@ -100,7 +97,7 @@ class ToolExecutionAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin, ExportMi
             variant="secondary",
             config=config
         )
-    
+
     @display(description="Tool")
     def tool_name_display(self, obj):
         """Enhanced tool name display."""
@@ -110,23 +107,23 @@ class ToolExecutionAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin, ExportMi
             variant="primary",
             config=config
         )
-    
+
     @display(description="Toolset")
     def toolset_display(self, obj):
         """Toolset class display with badge."""
         if not obj.toolset_class:
             return "—"
-        
+
         # Extract class name from full path
         class_name = obj.toolset_class.split('.')[-1] if '.' in obj.toolset_class else obj.toolset_class
-        
+
         config = StatusBadgeConfig(show_icons=True, icon=Icons.EXTENSION)
         return StatusBadge.create(
             text=class_name,
             variant="info",
             config=config
         )
-    
+
     @display(description="Status")
     def status_display(self, obj):
         """Status display with appropriate icons."""
@@ -142,14 +139,14 @@ class ToolExecutionAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin, ExportMi
             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="Duration")
     def duration_display(self, obj):
         """Execution duration display."""
         if obj.execution_time:
             return f"{obj.execution_time:.3f}s"
         return "—"
-    
+
     @display(description="Retries")
     def retry_count_display(self, obj):
         """Retry count display with badge."""
@@ -162,19 +159,19 @@ class ToolExecutionAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin, ExportMi
                 config=config
             )
         return "0"
-    
+
     @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)
-    
+
     @action(description="Retry failed executions", variant=ActionVariant.WARNING)
     def retry_failed_executions(self, request, queryset):
         """Retry failed tool 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 error messages", variant=ActionVariant.INFO)
     def clear_errors(self, request, queryset):
         """Clear error messages from executions."""
@@ -185,13 +182,13 @@ class ToolExecutionAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin, ExportMi
 @admin.register(ApprovalLog)
 class ApprovalLogAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin, ExportMixin):
     """Enhanced admin for ApprovalLog model using Django Admin Utilities."""
-    
+
     # Performance optimization
     select_related_fields = ['approved_by']
-    
+
     # Export-only configuration
     export_form_class = ExportForm
-    
+
     list_display = [
         'approval_id_display', 'tool_name_display', 'status_display',
         'approved_by_display', 'decision_time_display', 'expires_at_display'
@@ -207,13 +204,13 @@ class ApprovalLogAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin, ExportMixi
         'id', 'requested_at', 'decided_at', 'expires_at'
     ]
     ordering = ['-requested_at']
-    
+
     # Unfold form field overrides
     formfield_overrides = {
         models.TextField: {"widget": WysiwygWidget},
         JSONField: {"widget": JSONEditorWidget},
     }
-    
+
     fieldsets = (
         ("🔐 Approval Info", {
             'fields': ('id', 'tool_name', 'status', 'approved_by'),
@@ -228,9 +225,9 @@ class ApprovalLogAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin, ExportMixi
             'classes': ('tab',)
         }),
     )
-    
+
     actions = ['approve_pending', 'reject_pending', 'extend_expiry']
-    
+
     @display(description="Approval ID")
     def approval_id_display(self, obj):
         """Enhanced approval ID display."""
@@ -240,7 +237,7 @@ class ApprovalLogAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin, ExportMixi
             variant="secondary",
             config=config
         )
-    
+
     @display(description="Tool")
     def tool_name_display(self, obj):
         """Enhanced tool name display."""
@@ -250,7 +247,7 @@ class ApprovalLogAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin, ExportMixi
             variant="primary",
             config=config
         )
-    
+
     @display(description="Status")
     def status_display(self, obj):
         """Status display with appropriate icons."""
@@ -265,30 +262,30 @@ class ApprovalLogAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin, ExportMixi
             icon=Icons.CHECK_CIRCLE if obj.status == 'approved' else Icons.CANCEL if obj.status == 'rejected' else Icons.SCHEDULE if obj.status == 'pending' else Icons.TIMER_OFF
         )
         return self.display_status_auto(obj, 'status', status_config)
-    
+
     @display(description="Approved By")
     def approved_by_display(self, obj):
         """Approved by user display."""
         if not obj.approved_by:
             return "—"
         return self.display_user_simple(obj.approved_by)
-    
+
     @display(description="Decision Time")
     def decision_time_display(self, obj):
         """Decision time display."""
         if obj.decision_time:
             return f"{obj.decision_time:.2f}s"
         return "—"
-    
+
     @display(description="Expires")
     def expires_at_display(self, obj):
         """Expiry time with relative display."""
         if not obj.expires_at:
             return "—"
-        
+
         config = DateTimeDisplayConfig(show_relative=True)
         return self.display_datetime_relative(obj, 'expires_at', config)
-    
+
     @action(description="Approve pending", variant=ActionVariant.SUCCESS)
     def approve_pending(self, request, queryset):
         """Approve pending approvals."""
@@ -298,7 +295,7 @@ class ApprovalLogAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin, ExportMixi
             decision_time=timezone.now()
         )
         messages.success(request, f"Approved {updated} pending requests.")
-    
+
     @action(description="Reject pending", variant=ActionVariant.DANGER)
     def reject_pending(self, request, queryset):
         """Reject pending approvals."""
@@ -308,11 +305,10 @@ class ApprovalLogAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin, ExportMixi
             decision_time=timezone.now()
         )
         messages.warning(request, f"Rejected {updated} pending requests.")
-    
+
     @action(description="Extend expiry", variant=ActionVariant.INFO)
     def extend_expiry(self, request, queryset):
         """Extend expiry time for pending approvals."""
-        from datetime import timedelta
         new_expiry = timezone.now() + timedelta(hours=24)
         updated = queryset.filter(status='pending').update(expires_at=new_expiry)
         messages.info(request, f"Extended expiry for {updated} approvals by 24 hours.")
@@ -321,13 +317,13 @@ class ApprovalLogAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin, ExportMixi
 @admin.register(ToolsetConfiguration)
 class ToolsetConfigurationAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin, ExportMixin):
     """Enhanced admin for ToolsetConfiguration model using Django Admin Utilities."""
-    
+
     # Performance optimization
     select_related_fields = ['created_by']
-    
+
     # Export-only configuration
     export_form_class = ExportForm
-    
+
     list_display = [
         'name_display', 'toolset_class_display', 'status_display',
         'usage_count_display', 'created_by_display', 'created_at_display'
@@ -343,13 +339,13 @@ class ToolsetConfigurationAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin, E
         'id', 'created_at', 'updated_at'
     ]
     ordering = ['-created_at']
-    
+
     # Unfold form field overrides
     formfield_overrides = {
         models.TextField: {"widget": WysiwygWidget},
         JSONField: {"widget": JSONEditorWidget},
     }
-    
+
     fieldsets = (
         ("⚙️ Configuration Info", {
             'fields': ('id', 'name', 'description', 'toolset_class'),
@@ -368,9 +364,9 @@ class ToolsetConfigurationAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin, E
             'classes': ('tab', 'collapse')
         }),
     )
-    
+
     actions = ['activate_configurations', 'deactivate_configurations', 'reset_usage']
-    
+
     @display(description="Configuration Name")
     def name_display(self, obj):
         """Enhanced configuration name display."""
@@ -380,23 +376,23 @@ class ToolsetConfigurationAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin, E
             variant="primary",
             config=config
         )
-    
+
     @display(description="Toolset Class")
     def toolset_class_display(self, obj):
         """Toolset class display with badge."""
         if not obj.toolset_class:
             return "—"
-        
+
         # Extract class name from full path
         class_name = obj.toolset_class.split('.')[-1] if '.' in obj.toolset_class else obj.toolset_class
-        
+
         config = StatusBadgeConfig(show_icons=True, icon=Icons.EXTENSION)
         return StatusBadge.create(
             text=class_name,
             variant="info",
             config=config
         )
-    
+
     @display(description="Status")
     def status_display(self, obj):
         """Status display based on active state."""
@@ -406,41 +402,41 @@ class ToolsetConfigurationAdmin(OptimizedModelAdmin, DisplayMixin, ModelAdmin, E
         else:
             config = StatusBadgeConfig(show_icons=True, icon=Icons.PAUSE_CIRCLE)
             return StatusBadge.create(text="Inactive", variant="secondary", config=config)
-    
+
     @display(description="Usage")
     def usage_count_display(self, obj):
         """Usage count display."""
         if not obj.usage_count:
             return "Not used"
         return f"{obj.usage_count} times"
-    
+
     @display(description="Created By")
     def created_by_display(self, obj):
         """Created by user display."""
         if not obj.created_by:
             return "—"
         return self.display_user_simple(obj.created_by)
-    
+
     @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)
-    
+
     @action(description="Activate configurations", variant=ActionVariant.SUCCESS)
     def activate_configurations(self, request, queryset):
         """Activate selected configurations."""
         updated = queryset.update(is_active=True)
         messages.success(request, f"Activated {updated} configurations.")
-    
+
     @action(description="Deactivate configurations", variant=ActionVariant.WARNING)
     def deactivate_configurations(self, request, queryset):
         """Deactivate selected configurations."""
         updated = queryset.update(is_active=False)
         messages.warning(request, f"Deactivated {updated} configurations.")
-    
+
     @action(description="Reset usage count", variant=ActionVariant.INFO)
     def reset_usage(self, request, queryset):
         """Reset usage count for selected configurations."""
         updated = queryset.update(usage_count=0)
-        messages.info(request, f"Reset usage count for {updated} configurations.")
+        messages.info(request, f"Reset usage count for {updated} configurations.")

django_cfg/apps/agents/apps.py

@@ -7,12 +7,12 @@ from django.apps import AppConfig
 
 class AgentsConfig(AppConfig):
     """Django app configuration for Django Agents."""
-    
+
     default_auto_field = 'django.db.models.BigAutoField'
     name = 'django_cfg.apps.agents'
     label = 'django_cfg_agents'
     verbose_name = 'Django Agents'
-    
+
     def ready(self):
         """Initialize app when Django starts."""
         # Import signal handlers
@@ -20,7 +20,7 @@ class AgentsConfig(AppConfig):
             from . import signals  # noqa
         except ImportError:
             pass
-        
+
         # Initialize orchestrator registry
         try:
             from .integration.registry import initialize_registry

django_cfg/apps/agents/core/__init__.py

@@ -2,15 +2,15 @@
 Core components for Django Orchestrator.
 """
 
-from .django_agent import DjangoAgent
-from .orchestrator import SimpleOrchestrator
 from .dependencies import DjangoDeps
+from .django_agent import DjangoAgent
+from .exceptions import AgentNotFoundError, ExecutionError, OrchestratorError
 from .models import ExecutionResult, WorkflowConfig
-from .exceptions import OrchestratorError, AgentNotFoundError, ExecutionError
+from .orchestrator import SimpleOrchestrator
 
 __all__ = [
     "DjangoAgent",
-    "SimpleOrchestrator", 
+    "SimpleOrchestrator",
     "DjangoDeps",
     "ExecutionResult",
     "WorkflowConfig",

django_cfg/apps/agents/core/dependencies.py

@@ -3,7 +3,8 @@ Dependency injection classes for Django Orchestrator.
 """
 
 from dataclasses import dataclass, field
-from typing import Dict, Any, Optional, TYPE_CHECKING
+from typing import TYPE_CHECKING, Any, Dict, Optional
+
 from django.http import HttpRequest
 
 # Re-export RunContext from pydantic_ai for convenience
@@ -18,11 +19,11 @@ __all__ = ["DjangoDeps", "ContentDeps", "RunContext"]
 @dataclass
 class DjangoDeps:
     """Standard Django dependencies for agent execution."""
-    
+
     user: "AbstractUser"
     request: Optional[HttpRequest] = None
     session_data: Dict[str, Any] = field(default_factory=dict)
-    
+
     @classmethod
     async def from_request(cls, request: HttpRequest) -> 'DjangoDeps':
         """Create dependencies from Django request."""
@@ -31,7 +32,7 @@ class DjangoDeps:
             request=request,
             session_data=dict(request.session) if request.session else {}
         )
-    
+
     @classmethod
     async def from_user_id(cls, user_id: int) -> 'DjangoDeps':
         """Create dependencies from user ID."""
@@ -39,12 +40,12 @@ class DjangoDeps:
         User = get_user_model()
         user = await User.objects.aget(id=user_id)
         return cls(user=user)
-    
+
     @classmethod
     async def from_user(cls, user: "AbstractUser") -> 'DjangoDeps':
         """Create dependencies from user instance."""
         return cls(user=user)
-    
+
     def to_dict(self) -> Dict[str, Any]:
         """Convert to dictionary for serialization."""
         return {
@@ -58,19 +59,19 @@ class DjangoDeps:
 @dataclass
 class ContentDeps(DjangoDeps):
     """Content-specific dependencies."""
-    
+
     content_id: Optional[int] = None
     content_type: str = "article"
     target_audience: str = "general"
-    
+
     async def get_content(self):
         """Get content object if content_id is provided."""
         if not self.content_id:
             return None
-        
+
         # Import here to avoid circular imports
         from django.apps import apps
-        
+
         try:
             Content = apps.get_model('your_app', 'Content')  # Adjust app name
             return await Content.objects.aget(id=self.content_id)
@@ -81,19 +82,19 @@ class ContentDeps(DjangoDeps):
 @dataclass
 class DataProcessingDeps(DjangoDeps):
     """Dependencies for data processing agents."""
-    
+
     dataset_id: Optional[int] = None
     processing_options: Dict[str, Any] = field(default_factory=dict)
     batch_size: int = 100
-    
+
     async def get_dataset(self):
         """Get dataset object if dataset_id is provided."""
         if not self.dataset_id:
             return None
-        
+
         # Import here to avoid circular imports
         from django.apps import apps
-        
+
         try:
             Dataset = apps.get_model('your_app', 'Dataset')  # Adjust app name
             return await Dataset.objects.aget(id=self.dataset_id)
@@ -104,19 +105,19 @@ class DataProcessingDeps(DjangoDeps):
 @dataclass
 class BusinessLogicDeps(DjangoDeps):
     """Dependencies for business logic agents."""
-    
+
     business_context: Dict[str, Any] = field(default_factory=dict)
     rules_version: str = "latest"
     organization_id: Optional[int] = None
-    
+
     async def get_organization(self):
         """Get organization object if organization_id is provided."""
         if not self.organization_id:
             return None
-        
+
         # Import here to avoid circular imports
         from django.apps import apps
-        
+
         try:
             Organization = apps.get_model('your_app', 'Organization')  # Adjust app name
             return await Organization.objects.aget(id=self.organization_id)
@@ -127,15 +128,15 @@ class BusinessLogicDeps(DjangoDeps):
 @dataclass
 class IntegrationDeps(DjangoDeps):
     """Dependencies for external integration agents."""
-    
+
     api_credentials: Dict[str, str] = field(default_factory=dict)
     service_config: Dict[str, Any] = field(default_factory=dict)
     rate_limit_key: Optional[str] = None
-    
+
     def get_api_key(self, service_name: str) -> Optional[str]:
         """Get API key for specific service."""
         return self.api_credentials.get(f"{service_name}_api_key")
-    
+
     def get_service_config(self, service_name: str) -> Dict[str, Any]:
         """Get configuration for specific service."""
         return self.service_config.get(service_name, {})
@@ -144,11 +145,11 @@ class IntegrationDeps(DjangoDeps):
 @dataclass
 class TestDeps:
     """Simple dependencies for testing."""
-    
+
     user_id: int
     test_data: Dict[str, Any] = field(default_factory=dict)
     mock_responses: Dict[str, Any] = field(default_factory=dict)
-    
+
     def get_mock_response(self, key: str) -> Any:
         """Get mock response for testing."""
         return self.mock_responses.get(key)