Refactor OTP handling to continue with email fallback on SMS failure; add timeout parameter to email OTP function and improve SMS client initialization

app/services/otp_service.py

@@ -27,14 +27,13 @@ class BookMyServiceOTPModel:
             print(f"✅ OTP {otp} sent to {phone}. SID: {sid}")
         except Exception as sms_error:
             print(f"⚠️ SMS failed: {sms_error}")
-            if is_email(identifier):
-                try:
-                    send_email_otp(identifier, otp)
-                    print(f"✅ OTP {otp} sent to {identifier} via email fallback.")
-                except Exception as email_error:
-                    raise HTTPException(status_code=500, detail=f"SMS and email both failed: {email_error}")
-            else:
-                raise HTTPException(status_code=500, detail="SMS failed and no fallback available.")
+            # Continue even if SMS fails
+        if is_email(identifier):
+            try:
+                send_email_otp(identifier, otp)
+                print(f"✅ OTP {otp} sent to {identifier} via email fallback.")
+            except Exception as email_error:
+                print(f"⚠️ Email failed: {email_error}")
 
     @staticmethod
     async def verify_otp(identifier: str, otp: str):

app/utils/email_utils.py

@@ -2,13 +2,13 @@ import smtplib
 from email.mime.text import MIMEText
 from app.core.config import settings
 
-async def send_email_otp(to_email: str, otp: str):
+async def send_email_otp(to_email: str, otp: str, timeout: float = 10.0):
     msg = MIMEText(f"Your OTP is {otp}. It is valid for 5 minutes.")
     msg["Subject"] = "Your One-Time Password"
     msg["From"] = settings.SMTP_FROM
     msg["To"] = to_email
 
-    server = smtplib.SMTP(settings.SMTP_HOST, settings.SMTP_PORT)
+    server = smtplib.SMTP(settings.SMTP_HOST, settings.SMTP_PORT, timeout=timeout)
     server.connect(settings.SMTP_HOST, settings.SMTP_PORT)
     server.starttls()
     server.login(settings.SMTP_USER, settings.SMTP_PASS)

app/utils/sms_utils.py

@@ -1,9 +1,10 @@
-
 from twilio.rest import Client
+from twilio.http.http_client import TwilioHttpClient
 from app.core.config import settings
 
 def send_sms_otp(phone: str, otp: str) -> str:
-    client = Client(settings.TWILIO_ACCOUNT_SID, settings.TWILIO_AUTH_TOKEN)
+    http_client = TwilioHttpClient(timeout=10)  # 10 seconds timeout
+    client = Client(settings.TWILIO_ACCOUNT_SID, settings.TWILIO_AUTH_TOKEN, http_client=http_client)
 
     message = client.messages.create(
         from_=settings.TWILIO_SMS_FROM,