PKDevTools 0.13.20250213.231__tar.gz → 0.13.20250213.233__tar.gz

{pkdevtools-0.13.20250213.231 → pkdevtools-0.13.20250213.233}/PKDevTools/classes/GmailReader.py

@@ -31,26 +31,30 @@ from PKDevTools.classes.Environment import PKEnvironment
 class PKGmailReader:
 
     @classmethod
-    def getTransactions(self,user=None, password=None, label=None,senderEmail=None,forNthDayFromToday=0):
+    def getTransactions(self,user=None, password=None, label=None,senderEmail=None,forNthDayFromToday=0,utr=None):
         imap_url = 'imap.gmail.com'
         try:
             mail = imaplib.IMAP4_SSL(imap_url)
             mail.login(user, password)
-            mail.select(label,readonly=True)  # Connect to the labeled inbox.
+            ## Make sure emails can be modified (not read-only)
+            mail.select(label,readonly=False)  # Connect to the labeled inbox.
             today = datetime.date.today()
             pastDate = (today - datetime.timedelta(forNthDayFromToday))
             date = pastDate.strftime("%d-%b-%Y")
 
             # result, data  = mail.search(None,f'FROM "{senderEmail}"',"UNSEEN")
             # result, data = mail.uid('search', None, "UNSEEN") # (ALL/UNSEEN)
-            result, data = mail.uid('search', None, f'FROM "{senderEmail}" (SENTON %s)' % date)
+            # Search for UNSEEN emails from the sender on a specific date
+            result, data = mail.uid('search', None, f'UNSEEN FROM "{senderEmail}" (SENTON %s)' % date)
 
             i = len(data[0].split())
             transactions = {}
+            # if result == "OK":
             for x in range(i):
                 latest_email_uid = data[0].split()[x]
                 result, email_data = mail.uid('fetch', latest_email_uid, '(RFC822)')
-                # result, email_data = conn.store(num,'-FLAGS','\\Seen') 
+                # if result == "OK":
+                # result, email_data = conn.store(num,'+FLAGS','\\Seen') 
                 # this might work to set flag to seen, if it doesn't already
                 raw_email = email_data[0][1]
                 raw_email_string = raw_email.decode('utf-8')
@@ -80,6 +84,11 @@ class PKGmailReader:
                             # that identifies each Unified Payments Interface (UPI) transaction. 
                             # It's also known as the Unique Transaction Reference (UTR) number.
                             transactionNumber = transactionInfo.split("/")[2]
+                            
+                            if utr is not None and str(transactionNumber) == str(utr):
+                                # Mark email as read if UTR matches
+                                mail.uid('store', latest_email_uid, '+FLAGS', '\\Seen')
+
                             senderName = transactionInfo.split("/")[3]
                             senderBank = transactionInfo.split("/")[-1]
                             transactions[transactionNumber] = {"UTR":transactionNumber,"dateAndTime":dateAndTime,"amountPaid":amountCredited,
@@ -100,22 +109,23 @@ class PKGmailReader:
         return transactions
 
     @classmethod
-    def getTransactionsDict(self,forNthDayFromToday=0):
+    def getTransactionsDict(self,forNthDayFromToday=0,utr=None):
         secrets = PKEnvironment().allSecrets
         trans = PKGmailReader.getTransactions(secrets["MCU"],
                                               secrets["MCAP"],
                                               secrets["MCL"],
                                               secrets["MS"],
-                                              forNthDayFromToday=forNthDayFromToday)
+                                              forNthDayFromToday=forNthDayFromToday,
+                                              utr=utr)
         return trans
     
     @classmethod
     def matchUTR(self,utr=None):
         if utr is not None and len(str(utr)) > 1:
             foundTransaction = None
-            for days in [0,1]:
+            for days in [0,1,2,3]:
                 try:
-                    transactions = PKGmailReader.getTransactionsDict(forNthDayFromToday=days)
+                    transactions = PKGmailReader.getTransactionsDict(forNthDayFromToday=days,utr=utr)
                     if str(utr) in transactions.keys():
                         foundTransaction = transactions.get(str(utr))
                         break

{pkdevtools-0.13.20250213.231 → pkdevtools-0.13.20250213.233}/PKDevTools/classes/NSEMarketStatus.py

@@ -22,6 +22,7 @@
     SOFTWARE.
 
 """
+import sys
 import multiprocessing
 if __name__ == '__main__':
     multiprocessing.freeze_support()
@@ -85,6 +86,9 @@ class NSEMarketStatus(SingletonMixin, metaclass=SingletonType):
         return shouldFetch, next_bell, filePath, modifiedDateTime
 
     def getNextBell(self):
+        if not 'pytest' in sys.modules:
+            return '2025-02-14T09:15:00+05:30'
+
         next_bell = self.marketStatus.get("next_bell")
         if next_bell is not None:
             return next_bell

{pkdevtools-0.13.20250213.231 → pkdevtools-0.13.20250213.233}/PKDevTools/classes/UserSubscriptions.py

@@ -67,12 +67,18 @@ class PKUserSusbscriptions:
             pass
 
     @classmethod
-    def updateSubscription(self,userID,subscription:PKSubscriptionModel=PKSubscriptionModel.No_Subscription):
+    def updateSubscription(self,userID,subscription:PKSubscriptionModel=PKSubscriptionModel.No_Subscription,subValue=0):
         dbManager = DBManager()
         user = None
         dbUsers = dbManager.getUserByID(userID=userID)
         if len(dbUsers) > 0:
             user = dbUsers[0]
+            if subValue > 0 and (subscription.value != subValue or subscription.value < PKSubscriptionModel.All_Scans_1_Day.value):
+                # Update the balance instead of the standard subscription
+                toppedUp = dbManager.topUpAlertSubscriptionBalance(userID=userID,topup=subValue)
+                if not toppedUp:
+                    print(f"Could not top-up alert balance {subValue} for user:{userID}")
+                return
             user.subscriptionmodel = str(subscription.value)
         else:
             user = PKUser.userFromDBRecord([userID,"","","","","","",str(subscription.value),0])

pkdevtools-0.13.20250213.233/PKDevTools/classes/__init__.py

@@ -0,0 +1 @@
+VERSION='0.13.20250213.233'

{pkdevtools-0.13.20250213.231 → pkdevtools-0.13.20250213.233}/PKDevTools.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.2
 Name: PKDevTools
-Version: 0.13.20250213.231
+Version: 0.13.20250213.233
 Summary: A general day-to-day toolset for PKScreener repos
 Home-page: https://github.com/pkjmesra/PKDevTools
-Download-URL: https://github.com/pkjmesra/PKDevTools/archive/v0.13.20250213.231.zip
+Download-URL: https://github.com/pkjmesra/PKDevTools/archive/v0.13.20250213.233.zip
 Author: pkjmesra
 Author-email: pkjmesra@gmail.com
 License: OSI Approved (MIT)

{pkdevtools-0.13.20250213.231 → pkdevtools-0.13.20250213.233}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.2
 Name: PKDevTools
-Version: 0.13.20250213.231
+Version: 0.13.20250213.233
 Summary: A general day-to-day toolset for PKScreener repos
 Home-page: https://github.com/pkjmesra/PKDevTools
-Download-URL: https://github.com/pkjmesra/PKDevTools/archive/v0.13.20250213.231.zip
+Download-URL: https://github.com/pkjmesra/PKDevTools/archive/v0.13.20250213.233.zip
 Author: pkjmesra
 Author-email: pkjmesra@gmail.com
 License: OSI Approved (MIT)

pkdevtools-0.13.20250213.231/PKDevTools/classes/__init__.py

@@ -1 +0,0 @@
-VERSION='0.13.20250213.231'