django-cfg 1.3.13__py3-none-any.whl → 1.4.0__py3-none-any.whl

django_cfg/modules/{django_email.py → django_email/service.py}

@@ -5,7 +5,7 @@ This email service automatically configures itself based on the DjangoConfig ins
 without requiring manual parameter passing.
 """
 
-from typing import List, Optional, Dict, Any, Union
+from typing import List, Optional, Dict, Any
 import socket
 from smtplib import SMTPException
 import logging
@@ -14,7 +14,7 @@ from django.template.loader import render_to_string
 from django.utils.html import strip_tags
 from django.conf import settings
 
-from . import BaseCfgModule
+from ..base import BaseCfgModule
 
 logger = logging.getLogger(__name__)
 
@@ -22,27 +22,27 @@ logger = logging.getLogger(__name__)
 class DjangoEmailService(BaseCfgModule):
     """
     Auto-configuring email service that gets settings from DjangoConfig.
-    
+
     Usage:
         from django_cfg.modules import DjangoEmailService
-        
+
         email = DjangoEmailService()
         email.send_simple("Test", "Hello World!", ["user@example.com"])
     """
-    
+
     def __init__(self):
         """Initialize email service with auto-discovered config."""
         self.config = self.get_config()
         self.email_config = getattr(self.config, 'email', None)
-    
+
     def _handle_email_sending(self, email_func, *args, **kwargs):
         """
         Wrapper for email sending with proper timeout/exception handling.
-        
+
         Args:
             email_func: Email sending function to call
             *args, **kwargs: Arguments to pass to the function
-            
+
         Returns:
             Result of email_func or 0 on timeout/error
         """
@@ -63,7 +63,7 @@ class DjangoEmailService(BaseCfgModule):
             if not kwargs.get('fail_silently', False):
                 raise
             return 0
-    
+
     def send_simple(
         self,
         subject: str,
@@ -74,19 +74,19 @@ class DjangoEmailService(BaseCfgModule):
     ) -> int:
         """
         Send a simple text email.
-        
+
         Args:
             subject: Email subject
             message: Email message (plain text)
             recipient_list: List of recipient email addresses
             from_email: Sender email (auto-detected if not provided)
             fail_silently: Whether to fail silently on errors
-            
+
         Returns:
             Number of emails sent successfully
         """
         from_email = self._get_formatted_from_email(from_email)
-        
+
         return self._handle_email_sending(
             send_mail,
             subject=subject,
@@ -95,7 +95,7 @@ class DjangoEmailService(BaseCfgModule):
             recipient_list=recipient_list,
             fail_silently=fail_silently,
         )
-    
+
     def send_html(
         self,
         subject: str,
@@ -107,7 +107,7 @@ class DjangoEmailService(BaseCfgModule):
     ) -> int:
         """
         Send an HTML email with optional plain text alternative.
-        
+
         Args:
             subject: Email subject
             html_message: HTML email content
@@ -115,15 +115,15 @@ class DjangoEmailService(BaseCfgModule):
             text_message: Plain text alternative (auto-generated if not provided)
             from_email: Sender email (auto-detected if not provided)
             fail_silently: Whether to fail silently on errors
-            
+
         Returns:
             Number of emails sent successfully
         """
         from_email = self._get_formatted_from_email(from_email)
-        
+
         if text_message is None:
             text_message = strip_tags(html_message)
-        
+
         return self._handle_email_sending(
             send_mail,
             subject=subject,
@@ -133,7 +133,7 @@ class DjangoEmailService(BaseCfgModule):
             html_message=html_message,
             fail_silently=fail_silently,
         )
-    
+
     def send_template(
         self,
         subject: str,
@@ -145,7 +145,7 @@ class DjangoEmailService(BaseCfgModule):
     ) -> int:
         """
         Send an email using a Django template.
-        
+
         Args:
             subject: Email subject
             template_name: Template name (without .html extension)
@@ -153,24 +153,24 @@ class DjangoEmailService(BaseCfgModule):
             recipient_list: List of recipient email addresses
             from_email: Sender email (auto-detected if not provided)
             fail_silently: Whether to fail silently on errors
-            
+
         Returns:
             Number of emails sent successfully
         """
         from_email = self._get_formatted_from_email(from_email)
-        
+
         # Prepare context with auto-added values
         context = self._prepare_template_context(context)
-        
+
         # Render HTML template
         html_message = render_to_string(f"{template_name}.html", context)
-        
+
         # Try to render plain text template
         try:
             text_message = render_to_string(f"{template_name}.txt", context)
         except:
             text_message = strip_tags(html_message)
-        
+
         return self.send_html(
             subject=subject,
             html_message=html_message,
@@ -179,7 +179,7 @@ class DjangoEmailService(BaseCfgModule):
             from_email=from_email,
             fail_silently=fail_silently,
         )
-    
+
     def send_multipart(
         self,
         subject: str,
@@ -192,7 +192,7 @@ class DjangoEmailService(BaseCfgModule):
     ) -> bool:
         """
         Send a multipart email with attachments.
-        
+
         Args:
             subject: Email subject
             recipient_list: List of recipient email addresses
@@ -201,15 +201,15 @@ class DjangoEmailService(BaseCfgModule):
             from_email: Sender email (auto-detected if not provided)
             attachments: List of (filename, content, mimetype) tuples
             fail_silently: Whether to fail silently on errors
-            
+
         Returns:
             True if email was sent successfully, False otherwise
         """
         from_email = self._get_formatted_from_email(from_email)
-        
+
         if not html_content and not text_content:
             raise ValueError("Either html_content or text_content must be provided")
-        
+
         def _send_multipart_email():
             email = EmailMultiAlternatives(
                 subject=subject,
@@ -217,24 +217,24 @@ class DjangoEmailService(BaseCfgModule):
                 from_email=from_email,
                 to=recipient_list,
             )
-            
+
             if html_content:
                 email.attach_alternative(html_content, "text/html")
-            
+
             if attachments:
                 for filename, content, mimetype in attachments:
                     email.attach(filename, content, mimetype)
-            
+
             email.send(fail_silently=fail_silently)
             return True
-        
+
         try:
             return self._handle_email_sending(_send_multipart_email) or False
         except Exception as e:
             if not fail_silently:
                 raise e
             return False
-    
+
     def send_with_attachments(
         self,
         subject: str,
@@ -249,7 +249,7 @@ class DjangoEmailService(BaseCfgModule):
     ) -> bool:
         """
         Universal method to send emails with attachments.
-        
+
         Args:
             subject: Email subject
             recipient_list: List of recipient email addresses
@@ -260,40 +260,40 @@ class DjangoEmailService(BaseCfgModule):
             context: Template context variables (required if template_name provided)
             from_email: Sender email (auto-detected if not provided)
             fail_silently: Whether to fail silently on errors
-            
+
         Returns:
             True if email was sent successfully, False otherwise
         """
         html_content = None
         text_content = None
-        
+
         if template_name:
             # Template-based email
             if not context:
                 context = {}
-            
+
             # Prepare context with auto-added values
             context = self._prepare_template_context(context)
-            
+
             # Render templates
             html_content = render_to_string(f"{template_name}.html", context)
             try:
                 text_content = render_to_string(f"{template_name}.txt", context)
             except:
                 text_content = strip_tags(html_content)
-                
+
         elif html_message:
             # HTML email
             html_content = html_message
             text_content = message or strip_tags(html_message)
-            
+
         elif message:
             # Simple text email
             text_content = message
-            
+
         else:
             raise ValueError("Must provide either message, html_message, or template_name")
-        
+
         return self.send_multipart(
             subject=subject,
             recipient_list=recipient_list,
@@ -303,78 +303,78 @@ class DjangoEmailService(BaseCfgModule):
             attachments=attachments,
             fail_silently=fail_silently,
         )
-    
+
     def _prepare_template_context(self, context: Dict[str, Any], email_log_id: Optional[str] = None) -> Dict[str, Any]:
         """
         Prepare template context with auto-added values from config.
-        
+
         Args:
             context: Original context dictionary
             email_log_id: Optional email log ID for tracking
-            
+
         Returns:
             Updated context with auto-added values
         """
         # Create a copy to avoid modifying the original
         updated_context = context.copy()
-        
+
         # Auto-add project_name from config if not provided
         if 'project_name' not in updated_context:
             updated_context['project_name'] = self.config.project_name
-        
+
         # Auto-add logo_url from config if not provided
         if 'logo_url' not in updated_context and self.config.project_logo:
             updated_context['logo_url'] = self.config.project_logo
-        
+
         # Auto-add site_url from config if not provided
         if 'site_url' not in updated_context:
             updated_context['site_url'] = self.config.site_url
-        
+
         # Add tracking URLs if email_log_id is provided
         if email_log_id:
             base_url = self.config.api_url.rstrip('/')
             updated_context['tracking_pixel_url'] = f"{base_url}/cfg/newsletter/track/open/{email_log_id}/"
             updated_context['tracking_click_url'] = f"{base_url}/cfg/newsletter/track/click/{email_log_id}"
-            
+
         return updated_context
-    
+
     def _get_default_from_email(self) -> str:
         """Get the default from email address."""
-        if self.email_config and self.email_config.default_from_email:
-            return self.email_config.default_from_email
-        
+        if self.email_config and self.email_config.default_from:
+            return self.email_config.default_from
+
         # Fallback to Django settings
         return getattr(settings, 'DEFAULT_FROM_EMAIL', 'webmaster@localhost')
-    
+
     def _get_formatted_from_email(self, from_email: Optional[str] = None) -> str:
         """
         Get formatted from email with project name.
-        
+
         Args:
             from_email: Optional custom from email
-            
+
         Returns:
             Formatted email in format: "Project Name <email@example.com>"
         """
         if from_email is None:
             from_email = self._get_default_from_email()
-        
+
         # If email already contains name (has < and >), return as is
         if '<' in from_email and '>' in from_email:
             return from_email
-        
+
         # Format with project name
         project_name = self.config.project_name
         return f'"{project_name}" <{from_email}>'
-    
+
     def is_configured(self) -> bool:
         """Check if email is properly configured."""
         return self.email_config is not None and bool(self.email_config.host)
-    
+
     def get_backend_info(self) -> Dict[str, Any]:
         """Get information about the current email backend."""
         backend = getattr(settings, 'EMAIL_BACKEND', 'django.core.mail.backends.smtp.EmailBackend')
-        
+
         info = {
             'backend': backend,
             'configured': self.is_configured(),
@@ -383,25 +383,25 @@ class DjangoEmailService(BaseCfgModule):
             'use_tls': getattr(settings, 'EMAIL_USE_TLS', False),
             'use_ssl': getattr(settings, 'EMAIL_USE_SSL', False),
         }
-        
+
         if self.email_config:
             info.update({
-                'default_from_email': self.email_config.default_from_email,
+                'default_from_email': self.email_config.default_from,
                 'default_from_name': getattr(self.email_config, 'default_from_name', None),
             })
-        
+
         return info
-    
+
     # Backward compatibility aliases
-    def send_html_with_attachments(self, subject: str, html_message: str, recipient_list: List[str], 
-                                 attachments: List[tuple], text_message: Optional[str] = None, 
+    def send_html_with_attachments(self, subject: str, html_message: str, recipient_list: List[str],
+                                 attachments: List[tuple], text_message: Optional[str] = None,
                                  from_email: Optional[str] = None, fail_silently: bool = False) -> bool:
         """Alias for send_with_attachments with HTML message."""
         return self.send_with_attachments(
             subject=subject, recipient_list=recipient_list, attachments=attachments,
             html_message=html_message, message=text_message, from_email=from_email, fail_silently=fail_silently
         )
-    
+
     def send_template_with_attachments(self, subject: str, template_name: str, context: Dict[str, Any],
                                      recipient_list: List[str], attachments: List[tuple],
                                      from_email: Optional[str] = None, fail_silently: bool = False) -> bool:
@@ -410,7 +410,7 @@ class DjangoEmailService(BaseCfgModule):
             subject=subject, recipient_list=recipient_list, attachments=attachments,
             template_name=template_name, context=context, from_email=from_email, fail_silently=fail_silently
         )
-    
+
     def send_template_with_tracking(
         self,
         subject: str,
@@ -423,7 +423,7 @@ class DjangoEmailService(BaseCfgModule):
     ) -> int:
         """
         Send an email using a Django template with tracking support.
-        
+
         Args:
             subject: Email subject
             template_name: Template name (without .html extension)
@@ -432,24 +432,24 @@ class DjangoEmailService(BaseCfgModule):
             email_log_id: Email log ID for tracking
             from_email: Sender email (auto-detected if not provided)
             fail_silently: Whether to fail silently on errors
-            
+
         Returns:
             Number of emails sent successfully
         """
         from_email = self._get_formatted_from_email(from_email)
-        
+
         # Prepare context with auto-added values and tracking
         context = self._prepare_template_context(context, email_log_id)
-        
+
         # Render HTML template
         html_message = render_to_string(f"{template_name}.html", context)
-        
+
         # Try to render plain text template
         try:
             text_message = render_to_string(f"{template_name}.txt", context)
         except:
             text_message = strip_tags(html_message)
-        
+
         return self.send_html(
             subject=subject,
             html_message=html_message,
@@ -460,39 +460,4 @@ class DjangoEmailService(BaseCfgModule):
         )
 
 
-# Convenience function for quick access
-def send_email(
-    subject: str,
-    message: str,
-    recipient_list: List[str],
-    from_email: Optional[str] = None,
-    fail_silently: bool = False,
-) -> int:
-    """
-    Send a simple email using auto-configured service.
-    
-    Args:
-        subject: Email subject
-        message: Email message
-        recipient_list: List of recipient email addresses
-        from_email: Sender email (auto-detected if not provided)
-        fail_silently: Whether to fail silently on errors
-        
-    Returns:
-        Number of emails sent successfully
-    """
-    email_service = DjangoEmailService()
-    return email_service.send_simple(
-        subject=subject,
-        message=message,
-        recipient_list=recipient_list,
-        from_email=from_email,
-        fail_silently=fail_silently,
-    )
-
-
-# Export public API
-__all__ = [
-    'DjangoEmailService', 
-    'send_email'
-]
+__all__ = ["DjangoEmailService"]

django_cfg/modules/django_email/utils.py

@@ -0,0 +1,40 @@
+"""
+Email utilities and convenience functions.
+"""
+
+from typing import List, Optional
+
+from .service import DjangoEmailService
+
+
+def send_email(
+    subject: str,
+    message: str,
+    recipient_list: List[str],
+    from_email: Optional[str] = None,
+    fail_silently: bool = False,
+) -> int:
+    """
+    Send a simple email using auto-configured service.
+
+    Args:
+        subject: Email subject
+        message: Email message
+        recipient_list: List of recipient email addresses
+        from_email: Sender email (auto-detected if not provided)
+        fail_silently: Whether to fail silently on errors
+
+    Returns:
+        Number of emails sent successfully
+    """
+    email_service = DjangoEmailService()
+    return email_service.send_simple(
+        subject=subject,
+        message=message,
+        recipient_list=recipient_list,
+        from_email=from_email,
+        fail_silently=fail_silently,
+    )
+
+
+__all__ = ["send_email"]

django_cfg/modules/django_health/__init__.py

@@ -0,0 +1,9 @@
+"""
+Django Health Check Module for django_cfg.
+
+Auto-configuring health check endpoints.
+"""
+
+from .service import DjangoHealth
+
+__all__ = ["DjangoHealth"]

django_cfg/modules/{django_health.py → django_health/service.py}

@@ -208,34 +208,36 @@ class HealthCheckView(View):
             }
     
     def _check_configuration(self) -> Dict[str, Any]:
-        """Check Django Config Toolkit configuration."""
+        """Check Django-CFG configuration."""
         try:
-            from django_cfg import ConfigToolkit
-            
-            toolkit = ConfigToolkit()
-            
+            from django_cfg.core.state import get_current_config
+            from django.conf import settings
+
+            config = get_current_config()
+
             config_status = {
                 "status": "healthy",
-                "toolkit": {
-                    "version": "1.0.0",
-                    "init_time_ms": toolkit._init_time_ms,
-                    "config_count": toolkit._config_count,
-                    "environment": toolkit.environment,
-                    "debug": toolkit.debug
-                },
-                "features": {
-                    "unfold": toolkit.unfold_enabled,
-                    "revolution": toolkit.revolution_enabled,
-                    "constance": toolkit.constance_enabled,
-                    "logging": toolkit.logging_enabled
+                "django_cfg": {
+                    "version": "1.3.13",
+                    "debug": settings.DEBUG,
+                    "environment": "development" if settings.DEBUG else "production",
+                    "secret_key_length": len(settings.SECRET_KEY) if hasattr(settings, 'SECRET_KEY') else 0
                 }
             }
-            
+
+            # Add config info if available
+            if config:
+                config_status["django_cfg"].update({
+                    "project_name": config.project_name if hasattr(config, 'project_name') else "Unknown",
+                    "enable_accounts": config.enable_accounts if hasattr(config, 'enable_accounts') else False,
+                    "enable_tasks": config.enable_tasks if hasattr(config, 'enable_tasks') else False,
+                })
+
             # Validate configuration
-            if not toolkit.secret_key or len(toolkit.secret_key) < 50:
+            if not hasattr(settings, 'SECRET_KEY') or len(settings.SECRET_KEY) < 50:
                 config_status["status"] = "warning"
-                config_status["warnings"] = ["Secret key is too short"]
-            
+                config_status["warnings"] = ["Secret key is too short or not set"]
+
             return config_status
             
         except Exception as e: