pkscreener 0.46.20250213.708__tar.gz → 0.46.20250213.710__tar.gz

{pkscreener-0.46.20250213.708 → pkscreener-0.46.20250213.710}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.2
 Name: pkscreener
-Version: 0.46.20250213.708
+Version: 0.46.20250213.710
 Summary: A Python-based stock screener for NSE, India with alerts to Telegram Channel (pkscreener)
 Home-page: https://github.com/pkjmesra/pkscreener
-Download-URL: https://github.com/pkjmesra/pkscreener/archive/v0.46.20250213.708.zip
+Download-URL: https://github.com/pkjmesra/pkscreener/archive/v0.46.20250213.710.zip
 Author: pkjmesra
 Author-email: pkjmesra@gmail.com
 License: OSI Approved (MIT)
@@ -33,8 +33,8 @@ Requires-Dist: pandas
 Requires-Dist: pandas_ta
 Requires-Dist: pefile<2024.8.26,>=2023.2.7
 Requires-Dist: Pillow
-Requires-Dist: PKDevTools>=0.13.20250126.231
-Requires-Dist: PKNSETools>=0.1.20250122.136
+Requires-Dist: PKDevTools>=0.13.20250126.233
+Requires-Dist: PKNSETools>=0.1.20250122.137
 Requires-Dist: Pyarrow
 Requires-Dist: pyppeteer
 Requires-Dist: pytz
@@ -392,15 +392,15 @@ After you have finished the run, go to that copied path, zip the contents of the
 [MADE-IN-INDIA-badge]: https://img.shields.io/badge/MADE%20WITH%20%E2%9D%A4%20IN-INDIA-orange
 [MADE-IN-INDIA]: https://en.wikipedia.org/wiki/India
 [Windows-badge]: https://img.shields.io/badge/Windows-0078D6?logo=windows&logoColor=white
-[Windows]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.706/pkscreenercli.exe
+[Windows]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.709/pkscreenercli.exe
 [Linux-badge_x64]: https://img.shields.io/badge/Linux(x64)-FCC624?logo=linux&logoColor=black
-[Linux_x64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.706/pkscreenercli_x64.bin
+[Linux_x64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.709/pkscreenercli_x64.bin
 [Linux-badge_arm64]: https://img.shields.io/badge/Linux(arm64)-FCC624?logo=linux&logoColor=black
-[Linux_arm64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.706/pkscreenercli_arm64.bin
+[Linux_arm64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.709/pkscreenercli_arm64.bin
 [Mac OS-badge_x64]: https://img.shields.io/badge/mac%20os(x64)-D3D3D3?logo=apple&logoColor=000000
-[Mac OS_x64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.706/pkscreenercli_x64.run
+[Mac OS_x64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.709/pkscreenercli_x64.run
 [Mac OS-badge_arm64]: https://img.shields.io/badge/mac%20os(arm64)-D3D3D3?logo=apple&logoColor=000000
-[Mac OS_arm64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.706/pkscreenercli_arm64.run
+[Mac OS_arm64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.709/pkscreenercli_arm64.run
 [GitHub release (latest by date)-badge]: https://img.shields.io/github/v/release/pkjmesra/PKScreener
 [GitHub release (latest by date)]: https://github.com/pkjmesra/PKScreener/releases/latest
 [pypi-badge]: https://img.shields.io/pypi/v/pkscreener.svg?style=flat-square

{pkscreener-0.46.20250213.708 → pkscreener-0.46.20250213.710}/README.md

@@ -328,15 +328,15 @@ After you have finished the run, go to that copied path, zip the contents of the
 [MADE-IN-INDIA-badge]: https://img.shields.io/badge/MADE%20WITH%20%E2%9D%A4%20IN-INDIA-orange
 [MADE-IN-INDIA]: https://en.wikipedia.org/wiki/India
 [Windows-badge]: https://img.shields.io/badge/Windows-0078D6?logo=windows&logoColor=white
-[Windows]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.706/pkscreenercli.exe
+[Windows]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.709/pkscreenercli.exe
 [Linux-badge_x64]: https://img.shields.io/badge/Linux(x64)-FCC624?logo=linux&logoColor=black
-[Linux_x64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.706/pkscreenercli_x64.bin
+[Linux_x64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.709/pkscreenercli_x64.bin
 [Linux-badge_arm64]: https://img.shields.io/badge/Linux(arm64)-FCC624?logo=linux&logoColor=black
-[Linux_arm64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.706/pkscreenercli_arm64.bin
+[Linux_arm64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.709/pkscreenercli_arm64.bin
 [Mac OS-badge_x64]: https://img.shields.io/badge/mac%20os(x64)-D3D3D3?logo=apple&logoColor=000000
-[Mac OS_x64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.706/pkscreenercli_x64.run
+[Mac OS_x64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.709/pkscreenercli_x64.run
 [Mac OS-badge_arm64]: https://img.shields.io/badge/mac%20os(arm64)-D3D3D3?logo=apple&logoColor=000000
-[Mac OS_arm64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.706/pkscreenercli_arm64.run
+[Mac OS_arm64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.709/pkscreenercli_arm64.run
 [GitHub release (latest by date)-badge]: https://img.shields.io/github/v/release/pkjmesra/PKScreener
 [GitHub release (latest by date)]: https://github.com/pkjmesra/PKScreener/releases/latest
 [pypi-badge]: https://img.shields.io/pypi/v/pkscreener.svg?style=flat-square

{pkscreener-0.46.20250213.708 → pkscreener-0.46.20250213.710}/pkscreener/README.txt

@@ -328,15 +328,15 @@ After you have finished the run, go to that copied path, zip the contents of the
 [MADE-IN-INDIA-badge]: https://img.shields.io/badge/MADE%20WITH%20%E2%9D%A4%20IN-INDIA-orange
 [MADE-IN-INDIA]: https://en.wikipedia.org/wiki/India
 [Windows-badge]: https://img.shields.io/badge/Windows-0078D6?logo=windows&logoColor=white
-[Windows]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.706/pkscreenercli.exe
+[Windows]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.709/pkscreenercli.exe
 [Linux-badge_x64]: https://img.shields.io/badge/Linux(x64)-FCC624?logo=linux&logoColor=black
-[Linux_x64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.706/pkscreenercli_x64.bin
+[Linux_x64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.709/pkscreenercli_x64.bin
 [Linux-badge_arm64]: https://img.shields.io/badge/Linux(arm64)-FCC624?logo=linux&logoColor=black
-[Linux_arm64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.706/pkscreenercli_arm64.bin
+[Linux_arm64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.709/pkscreenercli_arm64.bin
 [Mac OS-badge_x64]: https://img.shields.io/badge/mac%20os(x64)-D3D3D3?logo=apple&logoColor=000000
-[Mac OS_x64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.706/pkscreenercli_x64.run
+[Mac OS_x64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.709/pkscreenercli_x64.run
 [Mac OS-badge_arm64]: https://img.shields.io/badge/mac%20os(arm64)-D3D3D3?logo=apple&logoColor=000000
-[Mac OS_arm64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.706/pkscreenercli_arm64.run
+[Mac OS_arm64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.709/pkscreenercli_arm64.run
 [GitHub release (latest by date)-badge]: https://img.shields.io/github/v/release/pkjmesra/PKScreener
 [GitHub release (latest by date)]: https://github.com/pkjmesra/PKScreener/releases/latest
 [pypi-badge]: https://img.shields.io/pypi/v/pkscreener.svg?style=flat-square

{pkscreener-0.46.20250213.708 → pkscreener-0.46.20250213.710}/pkscreener/classes/MarketMonitor.py

@@ -95,31 +95,35 @@ class MarketMonitor(SingletonMixin, metaclass=SingletonType):
         return option
 
     def saveMonitorResultStocks(self, results_df):
+        try:
+            self.alertStocks = []
+            lastSavedResults = self.monitorResultStocks[str(self.monitorIndex)]
+            lastSavedResults = lastSavedResults.split(",")
+        except:
+            lastSavedResults = []
+            pass
+        prevOutput_results = ""
         if results_df is None or results_df.empty:
             prevOutput_results = "NONE"
         else:
             prevOutput_results = results_df[~results_df.index.duplicated(keep='first')]
             prevOutput_results = prevOutput_results.index
-            # # Maybe the index is an int ?
-            # prevOutput_results = [str(stock) for stock in prevOutput_results]
-            try:
-                lastSavedResults = self.monitorResultStocks[str(self.monitorIndex)]
-                if lastSavedResults is not None and len(lastSavedResults) > 0:
-                    lastSavedResults = lastSavedResults.split(",")
-                    s = set(lastSavedResults)
-                    self.alertStocks = [x for x in prevOutput_results if x not in s]
-                else:
-                    self.alertStocks = []
-            except: # pragma: no cover
-                pass
             prevOutput_results = ",".join(prevOutput_results)
-        if len(self.monitorResultStocks.keys()) > 0 and len(self.monitorResultStocks[str(self.monitorIndex)]) > 0 and prevOutput_results == "NONE":
+        if len(self.monitorResultStocks.keys()) > self.monitorIndex and len(self.monitorResultStocks[str(self.monitorIndex)]) > 0 and prevOutput_results == "NONE":
             prevOutput_results = self.monitorResultStocks[str(self.monitorIndex)]
-        self.monitorResultStocks[str(self.monitorIndex)] = prevOutput_results
+        addedStocks = list(set(prevOutput_results.split(',')) - set(lastSavedResults))  # Elements in new df but not in the saved df
+        if len(self.alertStocks) != len(addedStocks) and len(addedStocks) > 0:
+            self.alertStocks = addedStocks
+        diffAlerts = list(set(self.alertStocks) - set(addedStocks))
+        if len(diffAlerts) > 0:
+            self.alertStocks = addedStocks
+        if len(addedStocks) > 0:
+            self.monitorResultStocks[str(self.monitorIndex)] = prevOutput_results
 
     def refresh(self, screen_df:pd.DataFrame=None, screenOptions=None, chosenMenu="", dbTimestamp="", telegram=False):
         highlightRows = []
         highlightCols = []
+        telegram_df = None
         if screen_df is None or screen_df.empty or screenOptions is None:
             return
         screen_monitor_df = screen_df.copy()

{pkscreener-0.46.20250213.708 → pkscreener-0.46.20250213.710}/pkscreener/classes/WorkflowManager.py

@@ -91,6 +91,29 @@ def run_workflow(command=None, user=None, options=None, workflowType="B",repo=No
         if workflow_name is None or workflow_postData is None or ghp_token is None:
             raise Exception("workflow_name, workflow_postData, and ghp_token must NOT be blank!")
         data = workflow_postData
+    elif workflowType == "S": # Scanner job kick off for 1-on-1 alerts
+        cmd_options = options.replace("_",":")
+        if workflow_name is None:
+            workflow_name = "w8-workflow-alert-scan_generic.yml"
+        if 'ALERT_TRIGGER' in os.environ.keys() and os.environ["ALERT_TRIGGER"] == 'Y':
+            alertTrigger = 'Y'
+        else:
+            alertTrigger = 'N'
+        if user is None or len(user) == 0:
+            user = ""
+        data = (
+                    '{"ref":"'
+                    + branch
+                    + '","inputs":{"user":"'
+                    + f"{user}"
+                    + '","params":"'
+                    + f'{cmd_options}'
+                    + f'","ref":"{branch}","alertTrigger":"'
+                    + f"{alertTrigger}"
+                    + '","name":"'
+                    + f"{command}"
+                    + '"}}'
+                )
 
     if ghp_token is None:
         _, _, _, ghp_token = PKEnvironment().secrets

pkscreener-0.46.20250213.710/pkscreener/classes/__init__.py

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

{pkscreener-0.46.20250213.708 → pkscreener-0.46.20250213.710}/pkscreener/pkscreenerbot.py

@@ -654,9 +654,16 @@ def subscribeToScannerAlerts(update: Update, context: CallbackContext) -> str:
                     menuText = f"You need at least <b>₹ {requiredBalance}</b> to subscribe to <b>{scanId} alerts for a day</b> ! Your current balance <b>₹ {alertUser.balance}</b> is <b>insufficient</b>. {payWall}"
                 else:
                     # Sufficient balance to subscribe to scanId
+                    needsNewJobKickedOff = False
+                    subscribedUsers = dbManager.usersForScannerJobId(scannerJobId=scanId)
+                    if subscribedUsers is None or len(subscribedUsers) == 0:
+                        # This is the first user who's requesting this scanner
+                        needsNewJobKickedOff = True
                     subscribed = dbManager.updateAlertSubscriptionModel(user.id,requiredBalance,scanId)
                     if subscribed:
                         menuText = f"You have been added to receive the alerts for {scanId}. Please note that it is valid only for today during Market Hours and resets right after that. You will need to re-subscribe again if you need it on the next day. Thank you for trusting PKScreener!"
+                        if needsNewJobKickedOff:
+                            run_workflow(f"{scanId}_{user.id}", str(user.id), f'--systemlaunched -a y -m {str(scanId).upper().replace("_",":")}', workflowType="S")
                     else:
                         menuText = "We encountered an error updating your subscription! Please reach out to @ItsOnlyPK on Telegram with your UTR and subscription scanner details."
     

{pkscreener-0.46.20250213.708 → pkscreener-0.46.20250213.710}/pkscreener/requirements.txt

@@ -19,8 +19,8 @@ pandas_ta #>=0.3.14b0
 # and https://github.com/pyinstaller/pyinstaller/issues/7269
 pefile>=2023.2.7,<2024.8.26
 Pillow #>=9.5.0,<=9.5.0 # Keep at this version because getsize_multiline is deprecated/removed in higher versions
-PKDevTools>=0.13.20250126.231
-PKNSETools>=0.1.20250122.136
+PKDevTools>=0.13.20250126.233
+PKNSETools>=0.1.20250122.137
 Pyarrow #>=17.0.0
 pyppeteer #>=2.0.0
 pytz #>=2024.2

{pkscreener-0.46.20250213.708 → pkscreener-0.46.20250213.710}/pkscreener.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.2
 Name: pkscreener
-Version: 0.46.20250213.708
+Version: 0.46.20250213.710
 Summary: A Python-based stock screener for NSE, India with alerts to Telegram Channel (pkscreener)
 Home-page: https://github.com/pkjmesra/pkscreener
-Download-URL: https://github.com/pkjmesra/pkscreener/archive/v0.46.20250213.708.zip
+Download-URL: https://github.com/pkjmesra/pkscreener/archive/v0.46.20250213.710.zip
 Author: pkjmesra
 Author-email: pkjmesra@gmail.com
 License: OSI Approved (MIT)
@@ -33,8 +33,8 @@ Requires-Dist: pandas
 Requires-Dist: pandas_ta
 Requires-Dist: pefile<2024.8.26,>=2023.2.7
 Requires-Dist: Pillow
-Requires-Dist: PKDevTools>=0.13.20250126.231
-Requires-Dist: PKNSETools>=0.1.20250122.136
+Requires-Dist: PKDevTools>=0.13.20250126.233
+Requires-Dist: PKNSETools>=0.1.20250122.137
 Requires-Dist: Pyarrow
 Requires-Dist: pyppeteer
 Requires-Dist: pytz
@@ -392,15 +392,15 @@ After you have finished the run, go to that copied path, zip the contents of the
 [MADE-IN-INDIA-badge]: https://img.shields.io/badge/MADE%20WITH%20%E2%9D%A4%20IN-INDIA-orange
 [MADE-IN-INDIA]: https://en.wikipedia.org/wiki/India
 [Windows-badge]: https://img.shields.io/badge/Windows-0078D6?logo=windows&logoColor=white
-[Windows]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.706/pkscreenercli.exe
+[Windows]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.709/pkscreenercli.exe
 [Linux-badge_x64]: https://img.shields.io/badge/Linux(x64)-FCC624?logo=linux&logoColor=black
-[Linux_x64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.706/pkscreenercli_x64.bin
+[Linux_x64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.709/pkscreenercli_x64.bin
 [Linux-badge_arm64]: https://img.shields.io/badge/Linux(arm64)-FCC624?logo=linux&logoColor=black
-[Linux_arm64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.706/pkscreenercli_arm64.bin
+[Linux_arm64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.709/pkscreenercli_arm64.bin
 [Mac OS-badge_x64]: https://img.shields.io/badge/mac%20os(x64)-D3D3D3?logo=apple&logoColor=000000
-[Mac OS_x64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.706/pkscreenercli_x64.run
+[Mac OS_x64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.709/pkscreenercli_x64.run
 [Mac OS-badge_arm64]: https://img.shields.io/badge/mac%20os(arm64)-D3D3D3?logo=apple&logoColor=000000
-[Mac OS_arm64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.706/pkscreenercli_arm64.run
+[Mac OS_arm64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250213.709/pkscreenercli_arm64.run
 [GitHub release (latest by date)-badge]: https://img.shields.io/github/v/release/pkjmesra/PKScreener
 [GitHub release (latest by date)]: https://github.com/pkjmesra/PKScreener/releases/latest
 [pypi-badge]: https://img.shields.io/pypi/v/pkscreener.svg?style=flat-square

{pkscreener-0.46.20250213.708 → pkscreener-0.46.20250213.710}/pkscreener.egg-info/requires.txt

@@ -15,8 +15,8 @@ pandas
 pandas_ta
 pefile<2024.8.26,>=2023.2.7
 Pillow
-PKDevTools>=0.13.20250126.231
-PKNSETools>=0.1.20250122.136
+PKDevTools>=0.13.20250126.233
+PKNSETools>=0.1.20250122.137
 Pyarrow
 pyppeteer
 pytz

pkscreener-0.46.20250213.708/pkscreener/classes/__init__.py

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