optimuslib 0.0.47__py3-none-any.whl → 0.0.49__py3-none-any.whl

optimuslib/optimuslib.py

@@ -99,33 +99,27 @@
 import logging
 
 # Creating logger
-# logging.basicConfig(level=logging.DEBUG)
-# logging.basicConfig(level=logging.DEBUG, filename='logs.txt', format='%(asctime)s - %(levelname)s - %(message)s', datefmt='%Y-%m-%d %H:%M:%S')
-# logging.basicConfig(level=logging.DEBUG, filename='logs.txt', format='%(asctime)s — %(name)s — %(levelname)s — %(funcName)s:%(lineno)d — %(message)s', datefmt='%d-%b-%y %H:%M:%S')
 log = logging.getLogger(__name__)
 log.setLevel(logging.DEBUG)
-# log.setLevel(logging.INFO)
 
-# # Handler - 1
+# Handler - 1: File Handler
 file = logging.FileHandler('optimuslibLogs.log', 'a', 'utf-8')
-# fileformat = logging.Formatter(fmt='%(asctime)s - %(levelname)s - %(filename)s - %(module)s:%(funcName)s - %(message)s', datefmt='%Y-%m-%d %H:%M:%S')
-fileformat = logging.Formatter(fmt='%(asctime)s - %(levelname)s - %(filename)s - %(funcName)s - %(message)s', datefmt='%Y-%m-%d %H:%M:%S')
+fileformat = logging.Formatter(fmt='%(asctime)s | %(levelname)s | %(filename)s | %(funcName)s | %(message)s', datefmt='%Y-%m-%d %H:%M:%S')
 file.setLevel(logging.DEBUG)
-# file.setLevel(logging.INFO)
 file.setFormatter(fileformat)
 
-# # Handler - 2
+# Handler - 2: Stream Handler
 stream = logging.StreamHandler()
-# streamformat = logging.Formatter(fmt='%(asctime)s - %(levelname)s - %(message)s', datefmt='%Y-%m-%d %H:%M:%S')
-streamformat = fileformat
 stream.setLevel(logging.DEBUG)
-# stream.setLevel(logging.INFO)
-stream.setFormatter(streamformat)
+stream.setFormatter(fileformat)
 
-# # Adding all handlers to the logs
+# Adding handlers to the logger (not to root logger to avoid duplicates)
 log.addHandler(file)
 log.addHandler(stream)
 
+# Prevent propagation to root logger to avoid duplicate logs
+log.propagate = False
+
 def loglib(data):
     log.info(data)
     log.info('%d %s','1', 'a')
@@ -1552,21 +1546,43 @@ from datetime import datetime, timezone
 
 
 def extract_clean_text(msg):
-    """Extract readable text from HTML email"""
-    text = ""
+    text_parts = []
+
     for part in msg.walk():
-        if part.get_content_type() == "text/html":
+        content_type = part.get_content_type()
+        charset = part.get_content_charset()
+
+        log.debug(f"Found MIME part: {content_type}, charset={charset}")
+
+        if content_type in ("text/plain", "text/html"):
             raw = part.get_payload(decode=True)
-            decoded = quopri.decodestring(raw).decode(errors="ignore")
-            soup = BeautifulSoup(decoded, "html.parser")
-            text += soup.get_text(" ")
-    return text
 
+            if not raw:
+                log.debug("Empty payload")
+                continue
+
+            try:
+                decoded = raw.decode(charset or "utf-8", errors="ignore")
+            except Exception:
+                decoded = quopri.decodestring(raw).decode(errors="ignore")
+
+            if content_type == "text/html":
+                soup = BeautifulSoup(decoded, "html.parser")
+                decoded = soup.get_text(" ")
 
-def is_recent(msg):
-    """Check if email was received within MAX_AGE_SECONDS"""
+            text_parts.append(decoded)
+
+    full_text = " ".join(text_parts)
+    log.debug(f"Extracted email text (first 300 chars): {full_text[:300]!r}")
+
+    return full_text
+
+
+
+def is_recent(msg, max_age_seconds):
     date_hdr = msg.get("Date")
     if not date_hdr:
+        log.debug("Email has no Date header")
         return False
 
     try:
@@ -1576,10 +1592,13 @@ def is_recent(msg):
 
         now = datetime.now(timezone.utc)
         age = (now - msg_time).total_seconds()
-        return 0 <= age <= MAX_AGE_SECONDS
-    except Exception:
-        return False
 
+        log.debug(f"Email age (seconds): {age}")
+        return 0 <= age <= max_age_seconds
+
+    except Exception as e:
+        log.exception("Failed to parse email date")
+        return False
 
 def input_with_timeout(prompt, timeout):
     """Get user input with timeout"""
@@ -1612,28 +1631,46 @@ def poll_for_otp(EMAIL, APP_PASSWORD, SENDER, SUBJECT, POLL_INTERVAL, POLL_TIMEO
         # 🔑 Gmail IMAP requires re-select to refresh UNSEEN
         mail.select("inbox", readonly=False)
 
-        status, messages = mail.search(
-            None,
-            f'(UNSEEN FROM "{SENDER}" SUBJECT "{SUBJECT}")'
-        )
+        filter = f'(UNSEEN FROM "{SENDER}" SUBJECT "{SUBJECT}")'
+        log.debug(f"IMAP search filter: {filter}")
+        status, messages = mail.search(None,filter)
 
         ids = messages[0].split()
 
+        log.debug(f"IMAP search status: {status}")
+        log.debug(f"Message IDs returned: {ids}")
+
         for eid in ids:
             _, data = mail.fetch(eid, "(RFC822)")
             msg = email.message_from_bytes(data[0][1])
 
-            if not is_recent(msg):
+            log.debug(f"From: {msg.get('From')}")
+            log.debug(f"Subject: {msg.get('Subject')}")
+            log.debug(f"Date: {msg.get('Date')}")
+
+            if not is_recent(msg, MAX_AGE_SECONDS):
                 continue
 
             body = extract_clean_text(msg)
-            match = re.search(r"OTP[^0-9]*(\d{6})", body, re.IGNORECASE)
 
-            if match:
-                # mark email as read
-                mail.store(eid, "+FLAGS", "\\Seen")
-                mail.logout()
-                return match.group(1)
+            if not body.strip():
+                log.warning("Email body extracted but empty")
+                continue
+
+            log.debug("Running OTP regex scan")
+
+            match = re.search(r"\b(\d{4,8})\b", body)
+
+            if not match:
+                log.warning("No OTP match found in email body")
+                continue
+
+            otp = match.group(1)
+            log.info(f"OTP extracted successfully: {otp}")
+
+            mail.store(eid, "+FLAGS", "\\Seen")
+            mail.logout()
+            return otp
 
         log.info("Waiting for OTP...")
         time.sleep(POLL_INTERVAL)
@@ -1643,10 +1680,11 @@ def poll_for_otp(EMAIL, APP_PASSWORD, SENDER, SUBJECT, POLL_INTERVAL, POLL_TIMEO
 
 
 def get_gmail_otp(EMAIL, APP_PASSWORD, SENDER, SUBJECT,POLL_INTERVAL,POLL_TIMEOUT,MAX_AGE_SECONDS,MANUAL_INPUT_TIMEOUT):
+
     """Get OTP automatically or fall back to manual input"""
     try:
         otp = poll_for_otp(EMAIL, APP_PASSWORD, SENDER, SUBJECT, POLL_INTERVAL, POLL_TIMEOUT, MAX_AGE_SECONDS)
-        log.info("OTP received automatically:", otp)
+        log.info(f"OTP received automatically: {otp}")
         return otp
 
     except TimeoutError:

{optimuslib-0.0.47.dist-info → optimuslib-0.0.49.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: optimuslib
-Version: 0.0.47
+Version: 0.0.49
 Summary: Function Library for mostly used codes
 Author: Shomi Nanwani
 Requires-Python: >=3.9,<4.0

optimuslib-0.0.49.dist-info/RECORD

@@ -0,0 +1,5 @@
+optimuslib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+optimuslib/optimuslib.py,sha256=nZPdZXFPB0uOWqp3xMx5e9d5Yrd3qdRkFWOm7WqCufo,65665
+optimuslib-0.0.49.dist-info/METADATA,sha256=1T3JxGmn2y7HlZVlvhP4IWzOb9g9hZJEbRRWW0iSMd4,723
+optimuslib-0.0.49.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
+optimuslib-0.0.49.dist-info/RECORD,,

optimuslib-0.0.47.dist-info/RECORD

@@ -1,5 +0,0 @@
-optimuslib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-optimuslib/optimuslib.py,sha256=G0k0nO98nOmoG2kVsroA_wDVf7eC-3bTIe8m9LT_Spc,64967
-optimuslib-0.0.47.dist-info/METADATA,sha256=ruM-YP1zzXsL3awy5p4au78JdF0QF0CjM7_uoCyZZDo,723
-optimuslib-0.0.47.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
-optimuslib-0.0.47.dist-info/RECORD,,