django-cfg 1.1.52__tar.gz → 1.1.54__tar.gz

{django_cfg-1.1.52 → django_cfg-1.1.54}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-cfg
-Version: 1.1.52
+Version: 1.1.54
 Summary: 🚀 Production-ready Django configuration framework with type-safe settings, smart automation, and modern developer experience
 Project-URL: Homepage, https://github.com/markolofsen/django-cfg
 Project-URL: Documentation, https://django-cfg.readthedocs.io
@@ -30,6 +30,7 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: System :: Systems Administration
 Classifier: Typing :: Typed
 Requires-Python: <4.0,>=3.12
+Requires-Dist: beautifulsoup4<5.0.0,>=4.13.5
 Requires-Dist: cachetools>=6.1.0
 Requires-Dist: click>=8.2.0
 Requires-Dist: colorlog>=6.9.0
@@ -42,6 +43,7 @@ Requires-Dist: django-cors-headers>=4.7.0
 Requires-Dist: django-extensions>=4.1
 Requires-Dist: django-filter>=25.0
 Requires-Dist: django-json-widget>=2.0.3
+Requires-Dist: django-ratelimit<5.0.0,>=4.1.0
 Requires-Dist: django-redis>=6.0.0
 Requires-Dist: django-revolution>=1.0.34
 Requires-Dist: django-unfold>=0.64.0
@@ -53,8 +55,10 @@ Requires-Dist: drf-spectacular-sidecar>=2025.8.1
 Requires-Dist: drf-spectacular>=0.28.0
 Requires-Dist: hiredis>=2.0.0
 Requires-Dist: loguru>=0.7.0
+Requires-Dist: lxml<7.0.0,>=6.0.1
 Requires-Dist: ngrok>=1.5.1; python_version >= '3.12'
 Requires-Dist: openai<2.0.0,>=1.107.1
+Requires-Dist: pgvector<0.5.0,>=0.4.1
 Requires-Dist: psycopg[binary,pool]>=3.2.0
 Requires-Dist: pydantic-yaml>=1.6.0
 Requires-Dist: pydantic<3.0,>=2.11
@@ -68,6 +72,7 @@ Requires-Dist: requests<3.0.0,>=2.32.5
 Requires-Dist: rich>=14.1.0
 Requires-Dist: sendgrid<7.0.0,>=6.12.4
 Requires-Dist: tiktoken<0.12.0,>=0.11.0
+Requires-Dist: toml<0.11.0,>=0.10.2
 Requires-Dist: twilio<10.0.0,>=9.8.0
 Requires-Dist: whitenoise>=6.8.0
 Provides-Extra: dev

{django_cfg-1.1.52 → django_cfg-1.1.54}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "django-cfg"
-version = "1.1.52"
+version = "1.1.54"
 description = "🚀 Production-ready Django configuration framework with type-safe settings, smart automation, and modern developer experience"
 readme = "README.md"
 license = {text = "MIT"}
@@ -75,12 +75,13 @@ dependencies = [
     "djangorestframework-simplejwt[token-blacklist]>=5.5.0",
     "drf-nested-routers>=0.94.2",
     "django-filter>=25.0",
+    "django-ratelimit (>=4.1.0,<5.0.0)",
     "drf-spectacular>=0.28.0",
     "drf-spectacular-sidecar>=2025.8.1",
     "django-json-widget>=2.0.3",
     "django-extensions>=4.1",
     "django-constance>=4.3.2",
-    "django-revolution>=1.0.34",  # Temporarily commented for local dev
+    "django-revolution>=1.0.34",
     "django-unfold>=0.64.0",
     "django-redis>=6.0.0",
     "redis>=6.4.0",
@@ -97,6 +98,12 @@ dependencies = [
     "openai (>=1.107.1,<2.0.0)",
     "twilio (>=9.8.0,<10.0.0)",
     "sendgrid (>=6.12.4,<7.0.0)",
+
+    # Knowbase
+    "beautifulsoup4 (>=4.13.5,<5.0.0)",
+    "lxml (>=6.0.1,<7.0.0)",
+    "pgvector (>=0.4.1,<0.5.0)",
+    "toml (>=0.10.2,<0.11.0)",
 ]
 
 [project.optional-dependencies]

{django_cfg-1.1.52 → django_cfg-1.1.54}/requirements-dev.txt

@@ -3,6 +3,7 @@
 # Do not edit manually!
 
 PyYAML>=6.0
+beautifulsoup4 (>=4.13.5,<5.0.0)
 black>=23.0.0
 build>=1.0.0
 cachetools>=6.1.0
@@ -18,6 +19,7 @@ django-dramatiq>=0.14.0,<1.0
 django-extensions>=4.1
 django-filter>=25.0
 django-json-widget>=2.0.3
+django-ratelimit (>=4.1.0,<5.0.0)
 django-redis>=6.0.0
 django-revolution>=1.0.34
 django-unfold>=0.64.0
@@ -34,12 +36,14 @@ flake8>=6.0.0
 hiredis>=2.0.0
 isort>=5.12.0
 loguru>=0.7.0
+lxml (>=6.0.1,<7.0.0)
 mkdocs-material>=9.0.0
 mkdocs>=1.5.0
 mkdocstrings[python]>=0.22.0
 mypy>=1.5.0
 ngrok>=1.5.1; python_version>='3.12'
 openai (>=1.107.1,<2.0.0)
+pgvector (>=0.4.1,<0.5.0)
 pre-commit>=3.0.0
 psycopg[binary,pool]>=3.2.0
 pyTelegramBotAPI>=4.28.0
@@ -60,6 +64,7 @@ rich>=13.0.0
 rich>=14.1.0
 sendgrid (>=6.12.4,<7.0.0)
 tiktoken (>=0.11.0,<0.12.0)
+toml (>=0.10.2,<0.11.0)
 tomlkit>=0.13.3
 twilio (>=9.8.0,<10.0.0)
 twine>=4.0.0

{django_cfg-1.1.52 → django_cfg-1.1.54}/requirements-test.txt

@@ -3,6 +3,7 @@
 # Do not edit manually!
 
 PyYAML>=6.0
+beautifulsoup4 (>=4.13.5,<5.0.0)
 cachetools>=6.1.0
 click>=8.2.0
 colorlog>=6.9.0
@@ -15,6 +16,7 @@ django-cors-headers>=4.7.0
 django-extensions>=4.1
 django-filter>=25.0
 django-json-widget>=2.0.3
+django-ratelimit (>=4.1.0,<5.0.0)
 django-redis>=6.0.0
 django-revolution>=1.0.34
 django-unfold>=0.64.0
@@ -28,8 +30,10 @@ drf-spectacular>=0.28.0
 factory-boy>=3.2.0
 hiredis>=2.0.0
 loguru>=0.7.0
+lxml (>=6.0.1,<7.0.0)
 ngrok>=1.5.1; python_version>='3.12'
 openai (>=1.107.1,<2.0.0)
+pgvector (>=0.4.1,<0.5.0)
 psycopg[binary,pool]>=3.2.0
 pyTelegramBotAPI>=4.28.0
 pydantic-yaml>=1.6.0
@@ -47,5 +51,6 @@ requests (>=2.32.5,<3.0.0)
 rich>=14.1.0
 sendgrid (>=6.12.4,<7.0.0)
 tiktoken (>=0.11.0,<0.12.0)
+toml (>=0.10.2,<0.11.0)
 twilio (>=9.8.0,<10.0.0)
 whitenoise>=6.8.0

{django_cfg-1.1.52 → django_cfg-1.1.54}/requirements.txt

@@ -3,6 +3,7 @@
 # Do not edit manually!
 
 PyYAML>=6.0
+beautifulsoup4 (>=4.13.5,<5.0.0)
 cachetools>=6.1.0
 click>=8.2.0
 colorlog>=6.9.0
@@ -15,6 +16,7 @@ django-cors-headers>=4.7.0
 django-extensions>=4.1
 django-filter>=25.0
 django-json-widget>=2.0.3
+django-ratelimit (>=4.1.0,<5.0.0)
 django-redis>=6.0.0
 django-revolution>=1.0.34
 django-unfold>=0.64.0
@@ -26,8 +28,10 @@ drf-spectacular-sidecar>=2025.8.1
 drf-spectacular>=0.28.0
 hiredis>=2.0.0
 loguru>=0.7.0
+lxml (>=6.0.1,<7.0.0)
 ngrok>=1.5.1; python_version>='3.12'
 openai (>=1.107.1,<2.0.0)
+pgvector (>=0.4.1,<0.5.0)
 psycopg[binary,pool]>=3.2.0
 pyTelegramBotAPI>=4.28.0
 pydantic-yaml>=1.6.0
@@ -40,5 +44,6 @@ requests (>=2.32.5,<3.0.0)
 rich>=14.1.0
 sendgrid (>=6.12.4,<7.0.0)
 tiktoken (>=0.11.0,<0.12.0)
+toml (>=0.10.2,<0.11.0)
 twilio (>=9.8.0,<10.0.0)
 whitenoise>=6.8.0

{django_cfg-1.1.52 → django_cfg-1.1.54}/src/django_cfg/__init__.py

@@ -38,9 +38,9 @@ default_app_config = "django_cfg.apps.DjangoCfgConfig"
 from typing import TYPE_CHECKING
 
 # Version information
-__version__ = "1.1.52"
-__author__ = "ReformsAI Team"
-__email__ = "info@reforms.ai"
+__version__ = "1.1.54"
+__author__ = "Unrealos Team"
+__email__ = "info@unrealos.com"
 __license__ = "MIT"
 
 # Core exports - only import when needed to avoid circular imports

{django_cfg-1.1.52 → django_cfg-1.1.54}/src/django_cfg/apps/accounts/admin/__init__.py

@@ -7,7 +7,6 @@ from .otp import OTPSecretAdmin
 from .registration_source import RegistrationSourceAdmin, UserRegistrationSourceAdmin
 from .activity import UserActivityAdmin
 from .group import GroupAdmin
-from .twilio_response import TwilioResponseAdmin
 
 __all__ = [
     'CustomUserAdmin',
@@ -16,5 +15,4 @@ __all__ = [
     'UserRegistrationSourceAdmin',
     'UserActivityAdmin',
     'GroupAdmin',
-    'TwilioResponseAdmin',
 ]

{django_cfg-1.1.52 → django_cfg-1.1.54}/src/django_cfg/apps/accounts/admin/filters.py

@@ -96,57 +96,3 @@ class ActivityTypeFilter(admin.SimpleListFilter):
         elif self.value():
             return queryset.filter(activity_type=self.value())
         return queryset
-
-
-class TwilioResponseStatusFilter(admin.SimpleListFilter):
-    title = "Response Status"
-    parameter_name = "twilio_status"
-
-    def lookups(self, request, model_admin):
-        return (
-            ("successful", "Successful"),
-            ("failed", "Failed"),
-            ("pending", "Pending"),
-            ("with_errors", "With Errors"),
-            ("recent", "Recent (24h)"),
-        )
-
-    def queryset(self, request, queryset):
-        now = timezone.now()
-        if self.value() == "successful":
-            return queryset.filter(
-                status__in=['sent', 'delivered', 'approved'],
-                error_code__isnull=True
-            )
-        elif self.value() == "failed":
-            return queryset.filter(
-                status__in=['failed', 'undelivered', 'rejected']
-            )
-        elif self.value() == "pending":
-            return queryset.filter(status='pending')
-        elif self.value() == "with_errors":
-            return queryset.exclude(error_code__isnull=True)
-        elif self.value() == "recent":
-            return queryset.filter(created_at__gte=now - timedelta(hours=24))
-        return queryset
-
-
-class TwilioResponseTypeFilter(admin.SimpleListFilter):
-    title = "Response Type"
-    parameter_name = "twilio_response_type"
-
-    def lookups(self, request, model_admin):
-        return (
-            ("api_send", "API Send"),
-            ("api_verify", "API Verify"),
-            ("webhook_status", "Webhook Status"),
-            ("webhook_delivery", "Webhook Delivery"),
-            ("otp_related", "OTP Related"),
-        )
-
-    def queryset(self, request, queryset):
-        if self.value() == "otp_related":
-            return queryset.filter(otp_secret__isnull=False)
-        elif self.value():
-            return queryset.filter(response_type=self.value())
-        return queryset

{django_cfg-1.1.52 → django_cfg-1.1.54}/src/django_cfg/apps/accounts/admin/otp.py

@@ -8,18 +8,16 @@ from unfold.admin import ModelAdmin
 
 from ..models import OTPSecret
 from .filters import OTPStatusFilter
-from .twilio_response import TwilioResponseInline
 
 
 @admin.register(OTPSecret)
 class OTPSecretAdmin(ModelAdmin):
-    list_display = ["recipient", "channel_type", "secret", "status", "twilio_responses_count", "created", "expires"]
+    list_display = ["recipient", "channel_type", "secret", "status", "created", "expires"]
     list_display_links = ["recipient", "secret"]
     list_filter = [OTPStatusFilter, "channel_type", "is_used", "created_at"]
     search_fields = ["recipient", "secret"]
     readonly_fields = ["created_at", "expires_at"]
     ordering = ["-created_at"]
-    inlines = [TwilioResponseInline]
 
     fieldsets = (
         (
@@ -59,12 +57,3 @@ class OTPSecretAdmin(ModelAdmin):
         return naturaltime(obj.expires_at)
 
     expires.short_description = "Expires"
-
-    def twilio_responses_count(self, obj):
-        """Count of related Twilio responses."""
-        count = obj.twilio_responses.count()
-        if count == 0:
-            return "—"
-        return f"{count} response{'s' if count != 1 else ''}"
-
-    twilio_responses_count.short_description = "Twilio"

{django_cfg-1.1.52 → django_cfg-1.1.54}/src/django_cfg/apps/accounts/managers/user_manager.py

@@ -246,11 +246,6 @@ class UserManager(UserManager):
             return user.first_name
         elif user.last_name:
             return user.last_name
-        
-        # For phone users with temp email, use display_username instead
-        if user.email and user.email.startswith('phone_') and '@temp.' in user.email:
-            return self.get_display_username(user)
-        
         return user.email
 
     def get_initials(self, user) -> str:
@@ -267,17 +262,6 @@ class UserManager(UserManager):
             return user.first_name[0].upper()
         elif user.last_name:
             return user.last_name[0].upper()
-        
-        # For phone users with temp email, use username initials instead
-        if user.email and user.email.startswith('phone_') and '@temp.' in user.email:
-            if user.username:
-                # Take first two characters of username
-                clean_username = user.username.replace("_", "").replace("-", "").replace(".", "")
-                if len(clean_username) >= 2:
-                    return f"{clean_username[0]}{clean_username[1]}".upper()
-                elif len(clean_username) == 1:
-                    return clean_username[0].upper()
-        
         return user.email[0].upper()
 
     def get_display_username(self, user) -> str:

django_cfg-1.1.54/src/django_cfg/apps/accounts/migrations/0004_delete_twilioresponse.py

@@ -0,0 +1,16 @@
+# Generated by Django 5.2.6 on 2025-09-16 18:57
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('django_cfg_accounts', '0003_twilioresponse'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='TwilioResponse',
+        ),
+    ]

{django_cfg-1.1.52 → django_cfg-1.1.54}/src/django_cfg/apps/accounts/models.py

@@ -203,99 +203,6 @@ class OTPSecret(models.Model):
         ]
 
 
-class TwilioResponse(models.Model):
-    """
-    Store Twilio API responses and webhook events.
-    
-    This model tracks all interactions with Twilio including:
-    - API responses from sending messages/OTP
-    - Webhook events for delivery status updates
-    - Error tracking and debugging information
-    """
-    
-    RESPONSE_TYPES = [
-        ('api_send', 'API Send Request'),
-        ('api_verify', 'API Verify Request'),
-        ('webhook_status', 'Webhook Status Update'),
-        ('webhook_delivery', 'Webhook Delivery Report'),
-    ]
-    
-    SERVICE_TYPES = [
-        ('whatsapp', 'WhatsApp'),
-        ('sms', 'SMS'),
-        ('voice', 'Voice'),
-        ('email', 'Email'),
-        ('verify', 'Verify API'),
-    ]
-    
-    # Basic info
-    response_type = models.CharField(max_length=20, choices=RESPONSE_TYPES)
-    service_type = models.CharField(max_length=10, choices=SERVICE_TYPES)
-    
-    # Twilio identifiers
-    message_sid = models.CharField(max_length=34, blank=True, help_text="Twilio Message SID")
-    verification_sid = models.CharField(max_length=34, blank=True, help_text="Twilio Verification SID")
-    
-    # Request/Response data
-    request_data = models.JSONField(default=dict, help_text="Original request parameters")
-    response_data = models.JSONField(default=dict, help_text="Twilio API response")
-    
-    # Status tracking
-    status = models.CharField(max_length=20, blank=True, help_text="Message/Verification status")
-    error_code = models.CharField(max_length=10, blank=True, help_text="Twilio error code")
-    error_message = models.TextField(blank=True, help_text="Error description")
-    
-    # Recipient info
-    to_number = models.CharField(max_length=20, blank=True, help_text="Recipient phone/email")
-    from_number = models.CharField(max_length=20, blank=True, help_text="Sender phone/email")
-    
-    # Pricing
-    price = models.DecimalField(max_digits=10, decimal_places=6, null=True, blank=True)
-    price_unit = models.CharField(max_length=3, blank=True, help_text="Currency code")
-    
-    # Timestamps
-    created_at = models.DateTimeField(auto_now_add=True)
-    updated_at = models.DateTimeField(auto_now=True)
-    twilio_created_at = models.DateTimeField(null=True, blank=True, help_text="Timestamp from Twilio")
-    
-    # Relations
-    otp_secret = models.ForeignKey(
-        'OTPSecret', 
-        on_delete=models.SET_NULL, 
-        null=True, 
-        blank=True,
-        related_name='twilio_responses',
-        help_text="Related OTP if applicable"
-    )
-    
-    class Meta:
-        app_label = 'django_cfg_accounts'
-        verbose_name = 'Twilio Response'
-        verbose_name_plural = 'Twilio Responses'
-        ordering = ['-created_at']
-        indexes = [
-            models.Index(fields=['message_sid']),
-            models.Index(fields=['verification_sid']),
-            models.Index(fields=['status', 'created_at']),
-            models.Index(fields=['response_type', 'service_type']),
-        ]
-    
-    def __str__(self):
-        identifier = self.message_sid or self.verification_sid or 'Unknown'
-        return f"{self.get_service_type_display()} {self.get_response_type_display()} - {identifier}"
-    
-    @property
-    def is_successful(self):
-        """Check if the response indicates success."""
-        success_statuses = ['sent', 'delivered', 'pending', 'approved']
-        return self.status.lower() in success_statuses if self.status else False
-    
-    @property
-    def has_error(self):
-        """Check if the response has an error."""
-        return bool(self.error_code or self.error_message)
-
-
 class UserActivity(models.Model):
     """
     User activity log.

{django_cfg-1.1.52 → django_cfg-1.1.54}/src/django_cfg/apps/accounts/serializers/otp.py

@@ -26,7 +26,7 @@ class OTPRequestSerializer(serializers.Serializer):
     source_url = serializers.URLField(
         required=False,
         allow_blank=True,
-        help_text="Source URL for tracking registration (e.g., https://reforms.ai)",
+        help_text="Source URL for tracking registration (e.g., https://unrealos.com)",
     )
 
     def validate_identifier(self, value):
@@ -76,7 +76,7 @@ class OTPVerifySerializer(serializers.Serializer):
     source_url = serializers.URLField(
         required=False,
         allow_blank=True,
-        help_text="Source URL for tracking login (e.g., https://reforms.ai)",
+        help_text="Source URL for tracking login (e.g., https://unrealos.com)",
     )
 
     def validate_identifier(self, value):

{django_cfg-1.1.52 → django_cfg-1.1.54}/src/django_cfg/apps/accounts/services/otp_service.py

@@ -6,7 +6,7 @@ from typing import Optional, Tuple
 import re
 
 from django_cfg.modules.django_telegram import DjangoTelegram
-from django_cfg.modules.django_twilio import SimpleTwilioService, send_whatsapp_otp_hybrid, verify_otp
+from django_cfg.modules.django_twilio import SimpleTwilioService
 from ..models import OTPSecret, CustomUser
 from ..utils.notifications import AccountNotifications
 from ..signals import notify_failed_otp_attempt
@@ -28,53 +28,6 @@ class OTPService:
         phone_pattern = r'^\+[1-9]\d{6,14}$'  # E.164 format: minimum 7 digits, maximum 15
         return bool(re.match(phone_pattern, clean_phone))
     
-    @staticmethod
-    def _get_temp_email_domain(source_url: Optional[str] = None) -> str:
-        """
-        Get domain for temporary email addresses.
-        
-        Priority:
-        1. Extract domain from source_url
-        2. Use config.site_url domain
-        3. Fallback to 'temp.local'
-        """
-        try:
-            from django_cfg.core.config import get_current_config
-            from urllib.parse import urlparse
-            
-            config = get_current_config()
-            
-            # Try to extract domain from source_url
-            if source_url:
-                try:
-                    parsed = urlparse(source_url)
-                    if parsed.netloc:
-                        # Remove www. prefix if present
-                        domain = parsed.netloc
-                        if domain.startswith("www."):
-                            domain = domain[4:]
-                        return domain
-                except:
-                    pass
-            
-            # Try to use config.site_url domain
-            if config and config.site_url:
-                try:
-                    parsed = urlparse(config.site_url)
-                    if parsed.netloc:
-                        domain = parsed.netloc
-                        if domain.startswith("www."):
-                            domain = domain[4:]
-                        return domain
-                except:
-                    pass
-            
-            # Fallback to temp.local
-            return "temp.local"
-            
-        except Exception:
-            return "temp.local"
-
     @staticmethod
     def _determine_channel(identifier: str) -> str:
         """Determine if identifier is email or phone."""
@@ -161,10 +114,8 @@ class OTPService:
                     user = CustomUser.objects.get(phone=cleaned_identifier)
                     created = False
                 except CustomUser.DoesNotExist:
-                    # Create user with temp email based on phone and domain
-                    phone_clean = cleaned_identifier.replace('+', '').replace(' ', '')
-                    domain = OTPService._get_temp_email_domain(source_url)
-                    temp_email = f"phone_{phone_clean}@{domain}"
+                    # Create user with temp email based on phone
+                    temp_email = f"phone_{cleaned_identifier.replace('+', '').replace(' ', '')}@temp.local"
                     user, created = CustomUser.objects.register_user(
                         temp_email, source_url=source_url
                     )
@@ -219,36 +170,10 @@ class OTPService:
                     user, otp_code, is_new_user=created, source_url=source_url, channel='email'
                 )
             else:  # phone channel
-                # Use hybrid WhatsApp OTP from twilio_service
-                success, message = send_whatsapp_otp_hybrid(cleaned_identifier, otp_code)
-                
-                if not success:
-                    logger.error(f"❌ Failed to send phone OTP to {cleaned_identifier[:8]}: {message}")
-                    return False, "phone_send_failed"
-                
-                logger.info(f"🎉 Phone OTP sent successfully to {cleaned_identifier[:8]}: {message}")
-                
-                # Send telegram notification for admin
-                try:
-                    # Extract method from message (e.g., "OTP sent via WhatsApp... (Direct WhatsApp)")
-                    method_used = "Hybrid WhatsApp"
-                    if "(Direct WhatsApp)" in message:
-                        method_used = "Direct WhatsApp"
-                    elif "(Verify API)" in message:
-                        method_used = "Verify API"
-                    
-                    DjangoTelegram.send_info(
-                        f"📱 Phone OTP Request ({method_used})",
-                        {
-                            "phone": cleaned_identifier,
-                            "method": method_used,
-                            "user_type": "New User" if created else "Existing User",
-                            "source_url": source_url or "Direct",
-                            "timestamp": timezone.now().strftime("%Y-%m-%d %H:%M:%S UTC")
-                        }
-                    )
-                except Exception as e:
-                    logger.error(f"Failed to send telegram notification: {e}")
+                # Send OTP via SMS using Twilio
+                AccountNotifications.send_phone_otp_notification(
+                    user, otp_code, cleaned_identifier, is_new_user=created, source_url=source_url
+                )
 
             return True, "success"
         except Exception as e:
@@ -306,47 +231,26 @@ class OTPService:
             return None
 
         try:
-            if channel == 'phone':
-                # Use Twilio Verify API for phone OTP verification
-                try:
-                    is_valid, message = verify_otp(cleaned_identifier, cleaned_otp)
-                    if not is_valid:
-                        logger.warning(f"Twilio Verify API: Invalid OTP for {cleaned_identifier}")
-                        
-                        # Send notification for failed OTP attempt
-                        AccountNotifications.send_failed_otp_attempt(
-                            cleaned_identifier, channel=channel, reason=f"Verify API: {message}"
-                        )
-                        
-                        return None
-                    
-                    logger.info(f"Twilio Verify API: OTP verified for {cleaned_identifier}")
-                    
-                except Exception as e:
-                    logger.error(f"Twilio Verify API error during verification: {e}")
-                    return None
-            else:
-                # Use OTPSecret for email channel
-                otp_secret = OTPSecret.objects.filter(
-                    recipient=cleaned_identifier,
-                    channel_type=channel,
-                    secret=cleaned_otp,
-                    is_used=False,
-                    expires_at__gt=timezone.now(),
-                ).first()
+            otp_secret = OTPSecret.objects.filter(
+                recipient=cleaned_identifier,
+                channel_type=channel,
+                secret=cleaned_otp,
+                is_used=False,
+                expires_at__gt=timezone.now(),
+            ).first()
 
-                if not otp_secret or not otp_secret.is_valid:
-                    logger.warning(f"Invalid OTP for {cleaned_identifier} ({channel})")
-                    
-                    # Send notification for failed OTP attempt
-                    AccountNotifications.send_failed_otp_attempt(
-                        cleaned_identifier, channel=channel, reason="Invalid or expired OTP"
-                    )
-                    
-                    return None
+            if not otp_secret or not otp_secret.is_valid:
+                logger.warning(f"Invalid OTP for {cleaned_identifier} ({channel})")
+                
+                # Send notification for failed OTP attempt
+                AccountNotifications.send_failed_otp_attempt(
+                    cleaned_identifier, channel=channel, reason="Invalid or expired OTP"
+                )
+                
+                return None
 
-                # Mark OTP as used
-                otp_secret.mark_used()
+            # Mark OTP as used
+            otp_secret.mark_used()
 
             # Get user based on channel
             try: