django-cfg 1.4.104__tar.gz → 1.4.106__tar.gz

{django_cfg-1.4.104 → django_cfg-1.4.106}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-cfg
-Version: 1.4.104
+Version: 1.4.106
 Summary: Modern Django framework with type-safe Pydantic v2 configuration, Next.js admin integration, real-time WebSockets, and 8 enterprise apps. Replace settings.py with validated models, 90% less code. Production-ready with AI agents, auto-generated TypeScript clients, and zero-config features.
 Project-URL: Homepage, https://djangocfg.com
 Project-URL: Documentation, https://djangocfg.com

{django_cfg-1.4.104 → django_cfg-1.4.106}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "django-cfg"
-version = "1.4.104"
+version = "1.4.106"
 description = "Modern Django framework with type-safe Pydantic v2 configuration, Next.js admin integration, real-time WebSockets, and 8 enterprise apps. Replace settings.py with validated models, 90% less code. Production-ready with AI agents, auto-generated TypeScript clients, and zero-config features."
 readme = "README.md"
 keywords = [ "django", "configuration", "pydantic", "settings", "type-safety", "pydantic-settings", "django-environ", "startup-validation", "ide-autocomplete", "nextjs-admin", "react-admin", "websocket", "centrifugo", "real-time", "typescript-generation", "ai-agents", "enterprise-django", "django-settings", "type-safe-config", "modern-django",]

{django_cfg-1.4.104 → django_cfg-1.4.106}/src/django_cfg/__init__.py

@@ -32,7 +32,7 @@ Example:
 default_app_config = "django_cfg.apps.DjangoCfgConfig"
 
 # Version information
-__version__ = "1.4.104"
+__version__ = "1.4.106"
 __license__ = "MIT"
 
 # Import registry for organized lazy loading

{django_cfg-1.4.104 → django_cfg-1.4.106}/src/django_cfg/core/generation/core_generators/templates.py

@@ -96,42 +96,57 @@ class TemplateSettingsGenerator:
 
     def _discover_app_templates(self) -> List[Path]:
         """
-        Auto-discover template directories from django-cfg apps.
+        Auto-discover template directories from django-cfg apps and modules.
 
         Looks for:
         - app/templates/
         - app/admin_interface/templates/
         - app/frontend/templates/
+        - modules/*/templates/
 
         Returns:
             List of discovered template directory paths
         """
         app_templates = []
 
-        # Find django-cfg apps directory
+        # Find django-cfg directory
         django_cfg_dir = Path(__file__).parent.parent.parent.parent
-        apps_dir = django_cfg_dir / 'apps'
-
-        if not apps_dir.exists():
-            return app_templates
-
-        # Scan each app directory
-        for app_dir in apps_dir.iterdir():
-            if not app_dir.is_dir():
-                continue
-
-            # Skip special directories
-            if app_dir.name.startswith(('@', '_', '.')):
-                continue
 
-            # Look for common template directory patterns
-            possible_template_dirs = [
-                app_dir / 'templates',
-                app_dir / 'admin_interface' / 'templates',
-                app_dir / 'frontend' / 'templates',
-            ]
-
-            for template_dir in possible_template_dirs:
+        # Scan apps directory
+        apps_dir = django_cfg_dir / 'apps'
+        if apps_dir.exists():
+            for app_dir in apps_dir.iterdir():
+                if not app_dir.is_dir():
+                    continue
+
+                # Skip special directories
+                if app_dir.name.startswith(('@', '_', '.')):
+                    continue
+
+                # Look for common template directory patterns
+                possible_template_dirs = [
+                    app_dir / 'templates',
+                    app_dir / 'admin_interface' / 'templates',
+                    app_dir / 'frontend' / 'templates',
+                ]
+
+                for template_dir in possible_template_dirs:
+                    if template_dir.exists() and template_dir.is_dir():
+                        app_templates.append(template_dir)
+
+        # Scan modules directory for templates
+        modules_dir = django_cfg_dir / 'modules'
+        if modules_dir.exists():
+            for module_dir in modules_dir.iterdir():
+                if not module_dir.is_dir():
+                    continue
+
+                # Skip special directories
+                if module_dir.name.startswith(('@', '_', '.')):
+                    continue
+
+                # Check if module has templates directory
+                template_dir = module_dir / 'templates'
                 if template_dir.exists() and template_dir.is_dir():
                     app_templates.append(template_dir)
 

django_cfg-1.4.106/src/django_cfg/modules/django_admin/IMPORT_EXPORT_FIX.md

@@ -0,0 +1,72 @@
+# Import/Export Button Fix
+
+## Problem
+
+Import/Export buttons in `PydanticAdmin` were displaying incorrectly because:
+
+1. `PydanticAdmin` was using the original `ImportExportModelAdmin` from django-import-export
+2. Original django-import-export templates don't integrate properly with Unfold UI
+3. Buttons were styled as tabs instead of toolbar buttons
+
+## Solution
+
+Updated `PydanticAdmin` base class to use django_cfg's custom `ImportExportMixin`:
+
+### Before
+```python
+class UnfoldImportExportModelAdmin(ImportExportModelAdmin, UnfoldModelAdmin):
+    pass
+```
+
+### After
+```python
+class UnfoldImportExportModelAdmin(UnfoldModelAdmin, ImportExportMixin):
+    pass
+```
+
+## Changes Made
+
+1. **MRO (Method Resolution Order)**:
+   - `UnfoldModelAdmin` comes first (for template priority)
+   - `ImportExportMixin` comes second (adds import/export functionality)
+
+2. **Custom Templates** (`django_cfg.modules.django_import_export`):
+   - Custom `change_list_*.html` templates that extend Unfold's base
+   - Properly styled import/export buttons as round icons
+   - Import button: green with upload icon
+   - Export button: blue with download icon
+
+3. **Integration**:
+   - Uses Unfold's forms (`ImportForm`, `ExportForm`)
+   - Buttons appear in `object-tools-items` block (next to "Add" button)
+   - Full dark mode support
+
+## Result
+
+Now `PydanticAdmin` admins with `import_export_enabled=True` will have:
+- ✅ Properly styled import/export buttons
+- ✅ Consistent Unfold UI
+- ✅ Round icon buttons matching the design system
+- ✅ Correct positioning in the toolbar
+
+## Usage
+
+No changes required in user code - this fix is automatic:
+
+```python
+from django_cfg.modules.django_admin import AdminConfig
+from django_cfg.modules.django_admin.base import PydanticAdmin
+
+config = AdminConfig(
+    model=MyModel,
+    import_export_enabled=True,
+    resource_class=MyModelResource,
+    list_display=["name", "status"],
+)
+
+@admin.register(MyModel)
+class MyModelAdmin(PydanticAdmin):
+    config = config
+```
+
+The import/export buttons will now display correctly!

{django_cfg-1.4.104 → django_cfg-1.4.106}/src/django_cfg/modules/django_admin/base/pydantic_admin.py

@@ -24,17 +24,24 @@ def _get_base_admin_class():
 
     MRO (Method Resolution Order):
         UnfoldImportExportModelAdmin
-          └─ ImportExportModelAdmin  # Import/Export functionality
-          └─ UnfoldModelAdmin        # Unfold UI
+          └─ UnfoldModelAdmin        # Unfold UI (first for template priority)
+          └─ ImportExportMixin       # Import/Export functionality (django_cfg custom)
                └─ Django ModelAdmin
 
     This ensures both Unfold UI and Import/Export work together seamlessly.
+
+    Uses django_cfg's custom ImportExportMixin which includes:
+    - Custom templates for proper Unfold styling
+    - Unfold forms (ImportForm, ExportForm)
+    - Properly styled import/export buttons
     """
-    from import_export.admin import ImportExportModelAdmin
+    # Use original ImportExportModelAdmin with Unfold
+    from import_export.admin import ImportExportModelAdmin as BaseImportExportModelAdmin
     from unfold.admin import ModelAdmin as UnfoldModelAdmin
 
-    class UnfoldImportExportModelAdmin(ImportExportModelAdmin, UnfoldModelAdmin):
-        """Combined Unfold + Import/Export admin base class."""
+    class UnfoldImportExportModelAdmin(BaseImportExportModelAdmin, UnfoldModelAdmin):
+        """Combined Import/Export + Unfold admin base class."""
+        # Import/Export should come FIRST in MRO to get its get_urls() method
         pass
 
     return UnfoldImportExportModelAdmin
@@ -122,8 +129,65 @@ class PydanticAdminMixin:
         cls.preserve_filters = config.preserve_filters
 
         # Import/Export configuration
-        if config.import_export_enabled and config.resource_class:
-            cls.resource_class = config.resource_class
+        if config.import_export_enabled:
+            # Set import/export template
+            cls.change_list_template = 'admin/import_export/change_list_import_export.html'
+
+            if config.resource_class:
+                # Use provided resource class
+                cls.resource_class = config.resource_class
+            else:
+                # Auto-generate resource class
+                cls.resource_class = cls._generate_resource_class(config)
+
+            # Override changelist_view to add import/export context
+            original_changelist_view = cls.changelist_view
+
+            def changelist_view_with_import_export(self, request, extra_context=None):
+                if extra_context is None:
+                    extra_context = {}
+                extra_context['has_import_permission'] = self.has_import_permission(request)
+                extra_context['has_export_permission'] = self.has_export_permission(request)
+                return original_changelist_view(self, request, extra_context)
+
+            cls.changelist_view = changelist_view_with_import_export
+
+    @classmethod
+    def _generate_resource_class(cls, config: AdminConfig):
+        """Auto-generate a ModelResource class for import/export."""
+        from import_export import resources
+
+        target_model = config.model
+
+        # Get all model fields
+        model_fields = []
+        for field in target_model._meta.get_fields():
+            # Skip relations and auto fields that shouldn't be imported
+            if field.concrete and not field.many_to_many:
+                # Skip password fields for security
+                if 'password' not in field.name.lower():
+                    model_fields.append(field.name)
+
+        # Create dynamic resource class with explicit Meta attributes
+        meta_attrs = {
+            'model': target_model,
+            'fields': tuple(model_fields),
+            'import_id_fields': ['id'] if 'id' in model_fields else [],
+            'skip_unchanged': True,
+            'report_skipped': True,
+        }
+
+        # Create Meta class
+        ResourceMeta = type('Meta', (), meta_attrs)
+
+        # Create Resource class
+        AutoGeneratedResource = type(
+            f'{target_model.__name__}Resource',
+            (resources.ModelResource,),
+            {'Meta': ResourceMeta}
+        )
+
+        return AutoGeneratedResource
 
     @classmethod
     def _build_list_display(cls, config: AdminConfig) -> List[str]:

{django_cfg-1.4.104 → django_cfg-1.4.106}/src/django_cfg/modules/django_import_export/README.md

@@ -74,8 +74,26 @@ The module automatically works with:
 - Django-cfg configuration system
 - All original django-import-export features
 
+## Custom Templates
+
+This module includes custom templates for proper Unfold integration:
+
+### Button Styling
+- Import/Export buttons are styled as round icon buttons matching Unfold's design
+- Import button: Green with upload icon
+- Export button: Blue with download icon
+- Positioned next to the "Add" button in the admin interface
+
+### Template Locations
+Templates are located in `templates/admin/import_export/`:
+- `change_list_import_export.html` - For both import and export
+- `change_list_import.html` - Import only
+- `change_list_export.html` - Export only
+- `change_list_import_item.html` - Import button template
+- `change_list_export_item.html` - Export button template
+
 ## Full Documentation
 
 For complete documentation, see the official [django-import-export docs](https://django-import-export.readthedocs.io/).
 
-This module adds no additional functionality - it's purely for convenience and consistency within the django-cfg ecosystem.
+This module adds custom Unfold-styled templates for better visual integration with the admin interface.

{django_cfg-1.4.104 → django_cfg-1.4.106}/src/django_cfg/modules/django_import_export/__init__.py

@@ -22,6 +22,14 @@ class ImportExportMixin(BaseImportExportMixin):
     import_form_class = ImportForm
     export_form_class = ExportForm
 
+    def changelist_view(self, request, extra_context=None):
+        """Add import/export permissions to context."""
+        if extra_context is None:
+            extra_context = {}
+        extra_context['has_import_permission'] = self.has_import_permission(request)
+        extra_context['has_export_permission'] = self.has_export_permission(request)
+        return super().changelist_view(request, extra_context)
+
 
 class ImportExportModelAdmin(BaseImportExportModelAdmin):
     """Django-CFG enhanced ImportExportModelAdmin with custom templates and Unfold forms."""

django_cfg-1.4.106/src/django_cfg/modules/django_import_export/apps.py

@@ -0,0 +1,16 @@
+from django.apps import AppConfig
+
+
+class DjangoImportExportConfig(AppConfig):
+    """Django Import/Export integration app configuration."""
+
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'django_cfg.modules.django_import_export'
+    label = 'django_cfg_import_export'
+    verbose_name = 'Django Import/Export Integration'
+
+    def ready(self):
+        """Initialize module classes when Django is ready."""
+        # Import and setup classes here to avoid AppRegistryNotReady
+        from . import _setup_classes
+        _setup_classes()

django_cfg-1.4.106/src/django_cfg/modules/django_import_export/templates/admin/import_export/change_list_export.html

@@ -0,0 +1,6 @@
+{% extends "admin/change_list.html" %}
+
+{% block object-tools-items %}
+    {{ block.super }}
+    {% include "admin/import_export/change_list_export_item.html" %}
+{% endblock %}

django_cfg-1.4.106/src/django_cfg/modules/django_import_export/templates/admin/import_export/change_list_export_item.html

@@ -0,0 +1,7 @@
+{% load admin_urls i18n %}
+
+{% if has_export_permission %}
+    <a href="export/{{ cl.get_query_string }}" class="bg-blue-600 flex items-center h-9 justify-center -my-1 rounded-full w-9 hover:bg-blue-700" title="{% trans 'Export' %}">
+        <span class="material-symbols-outlined text-white">download</span>
+    </a>
+{% endif %}

django_cfg-1.4.106/src/django_cfg/modules/django_import_export/templates/admin/import_export/change_list_import.html

@@ -0,0 +1,6 @@
+{% extends "admin/change_list.html" %}
+
+{% block object-tools-items %}
+    {{ block.super }}
+    {% include "admin/import_export/change_list_import_item.html" %}
+{% endblock %}

django_cfg-1.4.106/src/django_cfg/modules/django_import_export/templates/admin/import_export/change_list_import_export.html

@@ -0,0 +1,39 @@
+{% extends "admin/change_list.html" %}
+
+{% block extrahead %}
+    {{ block.super }}
+    <style>
+        /* Object Tools - Admin toolbar buttons */
+        .object-tools {
+            display: flex !important;
+            gap: 1rem !important; /* 16px gap between groups */
+            align-items: center !important;
+        }
+
+        /* Remove extra spacing from individual object-tools items */
+        .object-tools > * {
+            margin: 0 !important;
+        }
+
+        /* Import/Export button group */
+        .import-export-group {
+            display: flex !important;
+            gap: 0.5rem !important; /* 8px gap between import/export buttons */
+            align-items: center !important;
+        }
+
+        /* Separator before import/export group */
+        .import-export-separator {
+            margin: 0 0.5rem !important; /* 8px margin on each side */
+        }
+    </style>
+{% endblock %}
+
+{% block object-tools-items %}
+    {{ block.super }}
+    <span class="block bg-base-200 h-5 w-px dark:bg-base-700 import-export-separator"></span>
+    <div class="import-export-group">
+        {% include "admin/import_export/change_list_import_item.html" %}
+        {% include "admin/import_export/change_list_export_item.html" %}
+    </div>
+{% endblock %}

django_cfg-1.4.106/src/django_cfg/modules/django_import_export/templates/admin/import_export/change_list_import_item.html

@@ -0,0 +1,7 @@
+{% load admin_urls i18n %}
+
+{% if has_import_permission %}
+    <a href="import/" class="bg-green-600 flex items-center h-9 justify-center -my-1 rounded-full w-9 hover:bg-green-700" title="{% trans 'Import' %}">
+        <span class="material-symbols-outlined text-white">upload</span>
+    </a>
+{% endif %}

{django_cfg-1.4.104 → django_cfg-1.4.106}/src/django_cfg/templates/admin/DUAL_TAB_ARCHITECTURE.md

@@ -180,6 +180,63 @@ resetIframe(tab) {
 **Why Reset?**
 This ensures that when users switch back to a tab, it starts from the home page rather than whatever route they navigated to previously.
 
+### Open in New Window
+
+The External Admin tab (Tab 2) includes an "Open in New Window" button that allows users to break out of the iframe and work in a dedicated browser window/tab:
+
+```javascript
+openInNewWindow() {
+    // Get the current iframe URL for the External Admin tab
+    const iframe = document.getElementById('nextjs-dashboard-iframe-nextjs');
+    if (iframe) {
+        const currentUrl = iframe.src || iframe.getAttribute('data-original-src');
+        if (currentUrl) {
+            window.open(currentUrl, '_blank', 'noopener,noreferrer');
+        }
+    }
+}
+```
+
+**Features:**
+- Only visible when External Admin tab is active (`x-show="activeTab === 'nextjs'"`)
+- Opens current iframe URL in new window with `noopener,noreferrer` security flags
+- Preserves current route via `postMessage` tracking (see below)
+- Styled as action button with icon and text label
+
+**How Route Tracking Works:**
+
+In **production** (same-origin), `iframe.src` updates automatically:
+```javascript
+// iframe.src reflects current URL automatically
+window.open(iframe.src, '_blank');
+```
+
+In **development** (cross-origin), we track navigation via `postMessage`:
+```javascript
+// iframe sends navigation events
+case 'iframe-navigation':
+    if (data?.path) {
+        alpineData.currentNextjsPath = data.path;  // Track path
+    }
+
+// Button uses tracked path
+openInNewWindow() {
+    const url = new URL(baseUrl);
+    url.pathname = this.currentNextjsPath;  // Apply tracked path
+    window.open(url.toString(), '_blank');
+}
+```
+
+**Why postMessage?**
+Cross-origin iframes cannot access `iframe.src` due to browser security (CORS). The iframe must explicitly send navigation events via `postMessage`.
+
+**Why This is Useful:**
+- Full browser features (address bar, bookmarks, etc.)
+- No iframe sandbox restrictions
+- Easier debugging (browser DevTools)
+- Better for complex workflows that require multiple windows
+- Copy/paste and other browser features work better
+
 ## Static File Serving
 
 ### Built-in Admin (Tab 1)

{django_cfg-1.4.104 → django_cfg-1.4.106}/src/django_cfg/templates/admin/index.html

@@ -136,6 +136,7 @@
         <div x-data="{
             activeTab: 'builtin',
             previousTab: 'builtin',
+            currentNextjsPath: '',
             switchTab(tab) {
                 if (this.previousTab !== tab) {
                     // Reset iframe to initial URL when switching tabs
@@ -152,6 +153,34 @@
                     const originalSrc = iframe.getAttribute('data-original-src') || iframe.src;
                     iframe.src = originalSrc;
                 }
+                // Reset path when resetting iframe
+                if (tab === 'nextjs') {
+                    this.currentNextjsPath = '';
+                }
+            },
+            openInNewWindow() {
+                // Get the current iframe URL for the External Admin tab
+                const iframe = document.getElementById('nextjs-dashboard-iframe-nextjs');
+                if (!iframe) return;
+
+                // Get base URL from iframe src or data-original-src
+                let baseUrl = iframe.src || iframe.getAttribute('data-original-src');
+
+                // If we have a tracked path from postMessage, use it
+                if (this.currentNextjsPath) {
+                    try {
+                        const url = new URL(baseUrl);
+                        // Replace pathname with tracked path
+                        url.pathname = this.currentNextjsPath;
+                        baseUrl = url.toString();
+                    } catch (e) {
+                        console.warn('[Django-CFG] Failed to construct URL with path:', e);
+                    }
+                }
+
+                if (baseUrl) {
+                    window.open(baseUrl, '_blank', 'noopener,noreferrer');
+                }
             }
         }">
             {% if is_frontend_dev_mode %}
@@ -200,12 +229,25 @@
                         </button>
                     </nav>
 
-                    <!-- Version info -->
-                    <div class="py-4 text-xs text-gray-400 dark:text-gray-500">
-                        {% load django_cfg %}
-                        <a href="{% lib_site_url %}" class="text-blue-600 hover:text-blue-700">
-                            {% lib_name %}
-                        </a>
+                    <!-- Actions & Version info -->
+                    <div class="flex items-center gap-4 py-4">
+                        <!-- Open in new window button (only for External Admin tab) -->
+                        <button @click="openInNewWindow()"
+                                x-show="activeTab === 'nextjs'"
+                                title="Open in new window"
+                                class="flex items-center gap-1.5 px-3 py-1.5 text-xs font-medium rounded-md text-gray-600 hover:text-gray-900 hover:bg-gray-100 dark:text-gray-400 dark:hover:text-gray-100 dark:hover:bg-gray-700 transition-all duration-150"
+                                style="display: none;">
+                            <span class="material-icons" style="font-size: 16px;">open_in_new</span>
+                            <span>Open in New Window</span>
+                        </button>
+
+                        <!-- Version info -->
+                        <div class="text-xs text-gray-400 dark:text-gray-500">
+                            {% load django_cfg %}
+                            <a href="{% lib_site_url %}" class="text-blue-600 hover:text-blue-700">
+                                {% lib_name %}
+                            </a>
+                        </div>
                     </div>
                 </div>
                 </div>
@@ -419,7 +461,18 @@
                             break;
 
                         case 'iframe-navigation':
-                            // console.log('[Django-CFG] iframe navigated to:', data.path);
+                            console.log('[Django-CFG] iframe navigated to:', data?.path);
+                            // Track current path for "Open in New Window" button
+                            if (iframe.id === 'nextjs-dashboard-iframe-nextjs' && data?.path) {
+                                // Update Alpine.js data
+                                const alpineEl = document.querySelector('[x-data]');
+                                if (alpineEl && window.Alpine) {
+                                    const alpineData = window.Alpine.$data(alpineEl);
+                                    if (alpineData) {
+                                        alpineData.currentNextjsPath = data.path;
+                                    }
+                                }
+                            }
                             break;
 
                         default: