PKDevTools 0.13.20250211.223__tar.gz → 0.13.20250212.224__tar.gz

{pkdevtools-0.13.20250211.223 → pkdevtools-0.13.20250212.224}/PKDevTools/classes/DBManager.py

@@ -333,6 +333,9 @@ class DBManager:
                 self.conn = None
 
     def getUsers(self):
+        """
+        Returns all active PKUser instances in the database or an empty list if none is found.
+        """
         try:
             users = []
             cursor = self.connection() #.cursor()
@@ -354,6 +357,10 @@ class DBManager:
         return users
 
     def alertsForUser(self,userID:int):
+        """
+        Returns a PKUser instance with user's updated balance for daily alerts 
+        and relevant subscribed scannerJobs for a given userID or None.
+        """
         try:
             users = []
             cursor = self.connection()
@@ -374,6 +381,10 @@ class DBManager:
         return users[0] if len(users) > 0 else None
 
     def scannerJobsWithActiveUsers(self):
+        """
+        Returns all such PKScannerJob instances with (scannerIDs and subscribed userIds)
+        where there's at least one subscribed user.
+        """
         try:
             scanners = []
             cursor = self.connection()
@@ -393,6 +404,10 @@ class DBManager:
         return scanners
     
     def usersForScannerJobId(self,scannerJobId:str):
+        """
+        Returns userIds that are subscribed to a given scannerJobId or an 
+        empty list if that scannerJobId is not found.
+        """
         try:
             scanners = []
             cursor = self.connection()
@@ -412,6 +427,10 @@ class DBManager:
         return scanners[0].userIds if len(scanners) > 0 else []
 
     def updateAlertSubscriptionModel(self,userID,charge:float,scanId:str):
+        """
+        Updates alertsubscriptions with balance update as well as scanner jobs 
+        for a given user in the same table
+        """
         try:
             success = False
             result = self.connection().execute("""

{pkdevtools-0.13.20250211.223 → pkdevtools-0.13.20250212.224}/PKDevTools/classes/UserSubscriptions.py

@@ -29,13 +29,13 @@ from PKDevTools.classes.PKDateUtilities import PKDateUtilities
 
 class PKSubscriptionModel(Enum):
     No_Subscription = 0
-    One_Regular_Scan_Unlimited_Alerts_One_Day = 31
-    One_Piped_Scan_Unlimited_Alerts_One_Day = 40
-    All_Scans_One_Day = 130
-    All_Scans_One_Week = 600
-    All_Scans_One_Month = 2000
-    All_Scans_Six_Months = 11000
-    All_Scans_One_Year = 22000
+    One_Reg_Scan_Alerts_1_Day = 31
+    One_Piped_Scan_Alerts_1_Day = 40
+    All_Scans_1_Day = 130
+    All_Scans_1_Week = 600
+    All_Scans_1_Month = 2000
+    All_Scans_6_Months = 11000
+    All_Scans_1_Year = 22000
 
 class PKUserSusbscriptions:
 
@@ -126,15 +126,15 @@ class PKUserSusbscriptions:
             # the subscription validity has not been updated so far
             # Update validity of subscription
             n = 1
-            if user.subscriptionmodel == str(PKSubscriptionModel.All_Scans_One_Day.value):
+            if user.subscriptionmodel == str(PKSubscriptionModel.All_Scans_1_Day.value):
                 n = 1
-            elif user.subscriptionmodel == str(PKSubscriptionModel.All_Scans_One_Week.value):
+            elif user.subscriptionmodel == str(PKSubscriptionModel.All_Scans_1_Week.value):
                 n = 6
-            elif user.subscriptionmodel == str(PKSubscriptionModel.All_Scans_One_Month.value):
+            elif user.subscriptionmodel == str(PKSubscriptionModel.All_Scans_1_Month.value):
                 n = 29
-            elif user.subscriptionmodel == str(PKSubscriptionModel.All_Scans_Six_Months.value):
+            elif user.subscriptionmodel == str(PKSubscriptionModel.All_Scans_6_Months.value):
                 n = 179
-            elif user.subscriptionmodel == str(PKSubscriptionModel.All_Scans_One_Year.value):
+            elif user.subscriptionmodel == str(PKSubscriptionModel.All_Scans_1_Year.value):
                 n = 364
             user.otpvaliduntil = PKDateUtilities.YmdStringFromDate(PKDateUtilities.currentDateTime(),n=n)
             created, fileKey = dbManager.refreshOTPForUser(user)
@@ -170,24 +170,24 @@ class PKUserSusbscriptions:
     def subscriptionKeyValuePairs(self):
         return {
             f"{PKSubscriptionModel.No_Subscription.name}":f"{str(PKSubscriptionModel.No_Subscription.value)}",
-            f"{PKSubscriptionModel.One_Regular_Scan_Unlimited_Alerts_One_Day.name}":f"{str(PKSubscriptionModel.One_Regular_Scan_Unlimited_Alerts_One_Day.value)}",
-            f"{PKSubscriptionModel.One_Piped_Scan_Unlimited_Alerts_One_Day.name}":f"{str(PKSubscriptionModel.One_Piped_Scan_Unlimited_Alerts_One_Day.value)}",
-            f"{PKSubscriptionModel.All_Scans_One_Day.name}":f"{str(PKSubscriptionModel.All_Scans_One_Day.value)}",
-            f"{PKSubscriptionModel.All_Scans_One_Week.name}":f"{str(PKSubscriptionModel.All_Scans_One_Week.value)}",
-            f"{PKSubscriptionModel.All_Scans_One_Month.name}":f"{str(PKSubscriptionModel.All_Scans_One_Month.value)}",
-            f"{PKSubscriptionModel.All_Scans_Six_Months.name}":f"{str(PKSubscriptionModel.All_Scans_Six_Months.value)}",
-            f"{PKSubscriptionModel.All_Scans_One_Year.name}":f"{str(PKSubscriptionModel.All_Scans_One_Year.value)}"
+            f"{PKSubscriptionModel.One_Reg_Scan_Alerts_1_Day.name}":f"{str(PKSubscriptionModel.One_Reg_Scan_Alerts_1_Day.value)}",
+            f"{PKSubscriptionModel.One_Piped_Scan_Alerts_1_Day.name}":f"{str(PKSubscriptionModel.One_Piped_Scan_Alerts_1_Day.value)}",
+            f"{PKSubscriptionModel.All_Scans_1_Day.name}":f"{str(PKSubscriptionModel.All_Scans_1_Day.value)}",
+            f"{PKSubscriptionModel.All_Scans_1_Week.name}":f"{str(PKSubscriptionModel.All_Scans_1_Week.value)}",
+            f"{PKSubscriptionModel.All_Scans_1_Month.name}":f"{str(PKSubscriptionModel.All_Scans_1_Month.value)}",
+            f"{PKSubscriptionModel.All_Scans_6_Months.name}":f"{str(PKSubscriptionModel.All_Scans_6_Months.value)}",
+            f"{PKSubscriptionModel.All_Scans_1_Year.name}":f"{str(PKSubscriptionModel.All_Scans_1_Year.value)}"
         }
 
     @property
     def subscriptionValueKeyPairs(self):
         return {
             f"{PKSubscriptionModel.No_Subscription.value}":f"{str(PKSubscriptionModel.No_Subscription.name)}",
-            f"{PKSubscriptionModel.One_Regular_Scan_Unlimited_Alerts_One_Day.value}":f"{str(PKSubscriptionModel.One_Regular_Scan_Unlimited_Alerts_One_Day.name)}",
-            f"{PKSubscriptionModel.One_Piped_Scan_Unlimited_Alerts_One_Day.value}":f"{str(PKSubscriptionModel.One_Piped_Scan_Unlimited_Alerts_One_Day.name)}",
-            f"{PKSubscriptionModel.All_Scans_One_Day.value}":f"{str(PKSubscriptionModel.All_Scans_One_Day.name)}",
-            f"{PKSubscriptionModel.All_Scans_One_Week.value}":f"{str(PKSubscriptionModel.All_Scans_One_Week.name)}",
-            f"{PKSubscriptionModel.All_Scans_One_Month.value}":f"{str(PKSubscriptionModel.All_Scans_One_Month.name)}",
-            f"{PKSubscriptionModel.All_Scans_Six_Months.value}":f"{str(PKSubscriptionModel.All_Scans_Six_Months.name)}",
-            f"{PKSubscriptionModel.All_Scans_One_Year.value}":f"{str(PKSubscriptionModel.All_Scans_One_Year.name)}"
+            f"{PKSubscriptionModel.One_Reg_Scan_Alerts_1_Day.value}":f"{str(PKSubscriptionModel.One_Reg_Scan_Alerts_1_Day.name)}",
+            f"{PKSubscriptionModel.One_Piped_Scan_Alerts_1_Day.value}":f"{str(PKSubscriptionModel.One_Piped_Scan_Alerts_1_Day.name)}",
+            f"{PKSubscriptionModel.All_Scans_1_Day.value}":f"{str(PKSubscriptionModel.All_Scans_1_Day.name)}",
+            f"{PKSubscriptionModel.All_Scans_1_Week.value}":f"{str(PKSubscriptionModel.All_Scans_1_Week.name)}",
+            f"{PKSubscriptionModel.All_Scans_1_Month.value}":f"{str(PKSubscriptionModel.All_Scans_1_Month.name)}",
+            f"{PKSubscriptionModel.All_Scans_6_Months.value}":f"{str(PKSubscriptionModel.All_Scans_6_Months.name)}",
+            f"{PKSubscriptionModel.All_Scans_1_Year.value}":f"{str(PKSubscriptionModel.All_Scans_1_Year.name)}"
         }

pkdevtools-0.13.20250212.224/PKDevTools/classes/__init__.py

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

{pkdevtools-0.13.20250211.223 → pkdevtools-0.13.20250212.224}/PKDevTools.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.2
 Name: PKDevTools
-Version: 0.13.20250211.223
+Version: 0.13.20250212.224
 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.20250211.223.zip
+Download-URL: https://github.com/pkjmesra/PKDevTools/archive/v0.13.20250212.224.zip
 Author: pkjmesra
 Author-email: pkjmesra@gmail.com
 License: OSI Approved (MIT)

{pkdevtools-0.13.20250211.223 → pkdevtools-0.13.20250212.224}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.2
 Name: PKDevTools
-Version: 0.13.20250211.223
+Version: 0.13.20250212.224
 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.20250211.223.zip
+Download-URL: https://github.com/pkjmesra/PKDevTools/archive/v0.13.20250212.224.zip
 Author: pkjmesra
 Author-email: pkjmesra@gmail.com
 License: OSI Approved (MIT)

pkdevtools-0.13.20250211.223/PKDevTools/classes/__init__.py

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