PKDevTools 0.13.20250214.235__tar.gz → 0.13.20250221.237__tar.gz

{pkdevtools-0.13.20250214.235 → pkdevtools-0.13.20250221.237}/PKDevTools/classes/DBManager.py

@@ -88,7 +88,14 @@ class PKUser:
         user.subscriptionmodel= row[7] if len(row) > 7 else None
         user.lastotp= row[8] if len(row) > 8 else None
         return user
-    
+
+    def payingUserFromDBRecord(row):
+        user = PKUser()
+        user.userid= row[0] if len(row) > 0 else None
+        user.subscriptionmodel = row[1] if len(row) > 1 else None
+        user.balance= row[2] if len(row) > 2 else None
+        return user
+
     def userFromAlertsRecord(row,user=None):
         if user is None:
             user = PKUser()
@@ -338,7 +345,7 @@ class DBManager:
                 self.conn.close()
                 self.conn = None
 
-    def getUsers(self,fieldName=None):
+    def getUsers(self,fieldName=None,where=None):
         """
         Returns all active PKUser instances in the database or an empty list if none is found.
         Returns only the fieldName if requested.
@@ -346,7 +353,7 @@ class DBManager:
         try:
             users = []
             cursor = self.connection() #.cursor()
-            records = cursor.execute(f"SELECT {'*' if fieldName is None else fieldName} FROM users") #.fetchall()
+            records = cursor.execute(f"SELECT {'*' if fieldName is None else fieldName} FROM users {where if where is not None else ''}") #.fetchall()
             for row in records.rows:
                 users.append(PKUser.userFromDBRecord(row))
             # cursor.close()
@@ -635,3 +642,35 @@ class DBManager:
                 self.conn.close()
                 self.conn = None
         return success
+
+    def getPayingUsers(self):
+        """
+        Returns all active PKUser instances in the database who either have a subscription model
+        or have a alerts balance.
+        """
+        try:
+            users = []
+            cursor = self.connection() #.cursor()
+            query_paying_users = """
+                SELECT DISTINCT u.userId, u.subscriptionmodel, a.balance
+                FROM users u
+                LEFT JOIN alertsubscriptions a ON u.userId = a.userId
+                WHERE COALESCE(a.balance, 0) > 0 OR (u.subscriptionmodel != '' and u.subscriptionmodel != '0');
+
+            """
+            records = cursor.execute(query_paying_users)
+            for row in records.rows:
+                users.append(PKUser.payingUserFromDBRecord(row))
+            # cursor.close()
+            if len(records.columns) > 0 and len(records.rows) <= 0:
+                # Let's tell the user
+                default_logger().debug(f"Paying Users not found!")
+        except Exception as e: # pragma: no cover
+            print(f"Could not getPayingUsers\n{e}")
+            default_logger().debug(e, exc_info=True)
+            pass
+        finally:
+            if self.conn is not None:
+                self.conn.close()
+                self.conn = None
+        return users

pkdevtools-0.13.20250221.237/PKDevTools/classes/__init__.py

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

{pkdevtools-0.13.20250214.235 → pkdevtools-0.13.20250221.237}/PKDevTools/classes/pubsub/publisher.py

@@ -29,3 +29,8 @@ class PKUserService:
         print(f"[UserService] Notifying for scanner: {scannerID} with notification: {notification}")
         # Publish the event
         globalEventsSignal.send(self, scannerID=scannerID,notification=notification)
+
+    def send_event(self, event_name, event_params=None):
+        """Send a custom event to Google Analytics."""
+        # Publish the event
+        globalEventsSignal.send(self, eventType="ga",event_name=event_name,event_params=event_params)

pkdevtools-0.13.20250221.237/PKDevTools/classes/pubsub/subscriber.py

@@ -0,0 +1,84 @@
+"""
+    The MIT License (MIT)
+
+    Copyright (c) 2023 pkjmesra
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+
+"""
+import uuid
+import requests
+from PKDevTools.classes.pubsub.events import globalEventsSignal
+from PKDevTools.classes.DBManager import DBManager
+from PKDevTools.classes.Telegram import send_message
+
+class PKNotificationService:
+    def __init__(self):
+        # Subscribe to the event
+        globalEventsSignal.connect(self.notify)
+
+    def notify(self, sender, **kwargs):
+        if 'eventType' in kwargs:
+            if kwargs['eventType'] == "ga":
+                # Capture GA event
+                event_name = kwargs['event_name']
+                event_params = kwargs['event_params']
+                if event_params is None:
+                    event_params = {}
+
+                payload = {
+                    "client_id": str(uuid.uuid4()),  # Unique client ID for GA
+                    "events": [{
+                        "name": event_name,
+                        "params": event_params
+                    }]
+                }
+                # Google Analytics API Details
+                MEASUREMENT_ID = "G-T0TLV56Y0C"
+                API_SECRET = "2dD6iqHQQl2EzhCvHXA7EQ"
+                GA_ENDPOINT = f"https://www.google-analytics.com/mp/collect?measurement_id={MEASUREMENT_ID}&api_secret={API_SECRET}"
+
+                try:
+                    response = requests.post(GA_ENDPOINT, json=payload)
+                    # if response.status_code == 204:
+                    #     print(f"Event '{event_name}' sent successfully")
+                    # else:
+                    #     print(f"Error sending event: {response.text}")
+                except Exception as e:
+                    # print(f"Failed to send event: {e}")
+                    pass
+        else:
+            notificationText = kwargs['notification'] if 'notification' in kwargs else ""
+            scannerID = kwargs['scannerID'] if 'scannerID' in kwargs else ""
+            print(f"[Notification] Notifying for {scannerID} with data: {notificationText}")
+            dbManager = DBManager()
+            try:
+                if len(str(scannerID)) > 0:
+                    userIDs = dbManager.usersForScannerJobId(scannerJobId=scannerID)
+                    if len(userIDs) > 0:
+                        for userID in userIDs:
+                            send_message(message=notificationText,userID=userID,parse_type="HTML",)
+                else:
+                    print(f"Error encountered:\n0 length scannerID passed for {notificationText}")
+            except Exception as e:
+                print(f"Error encountered:\n{e}")
+                pass
+
+# Ensure the subscriber is instantiated so it listens to events
+notification_service = PKNotificationService()

{pkdevtools-0.13.20250214.235 → pkdevtools-0.13.20250221.237}/PKDevTools.egg-info/PKG-INFO

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

{pkdevtools-0.13.20250214.235 → pkdevtools-0.13.20250221.237}/PKG-INFO

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

pkdevtools-0.13.20250214.235/PKDevTools/classes/__init__.py

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

pkdevtools-0.13.20250214.235/PKDevTools/classes/pubsub/subscriber.py

@@ -1,54 +0,0 @@
-"""
-    The MIT License (MIT)
-
-    Copyright (c) 2023 pkjmesra
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all
-    copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-    SOFTWARE.
-
-"""
-from PKDevTools.classes.pubsub.events import globalEventsSignal
-from PKDevTools.classes.DBManager import DBManager
-from PKDevTools.classes.Telegram import send_message
-
-class PKNotificationService:
-    def __init__(self):
-        # Subscribe to the event
-        globalEventsSignal.connect(self.notify)
-
-    def notify(self, sender, **kwargs):
-        notificationText = kwargs['notification'] if 'notification' in kwargs else ""
-        scannerID = kwargs['scannerID'] if 'scannerID' in kwargs else ""
-        print(f"[Notification] Notifying for {scannerID} with data: {notificationText}")
-        dbManager = DBManager()
-        try:
-            if len(str(scannerID)) > 0:
-                userIDs = dbManager.usersForScannerJobId(scannerJobId=scannerID)
-                if len(userIDs) > 0:
-                    for userID in userIDs:
-                        send_message(message=notificationText,userID=userID,parse_type="HTML",)
-            else:
-                print(f"Error encountered:\n0 length scannerID passed for {notificationText}")
-        except Exception as e:
-            print(f"Error encountered:\n{e}")
-            pass
-
-
-
-# Ensure the subscriber is instantiated so it listens to events
-notification_service = PKNotificationService()