pkscreener 0.46.20250210.703__cp312-cp312-win_amd64.whl → 0.46.20250213.705__cp312-cp312-win_amd64.whl

{pkscreener-0.46.20250210.703.data → pkscreener-0.46.20250213.705.data}/purelib/pkscreener/README.txt

@@ -4,8 +4,8 @@
 | [![MADE-IN-INDIA][MADE-IN-INDIA-badge]][MADE-IN-INDIA] | [![GitHub release (latest by date)][GitHub release (latest by date)-badge]][GitHub release (latest by date)] | [![Downloads][Downloads-badge]][Downloads] | ![latest download][Latest-Downloads-badge]  | [![Docker Pulls][Docker Pulls-badge]][Docker Status] |
 | :-------------: | :-----------------: | :-----------------: | :-----------------: | :-----------------: |
 | Platforms | [![Windows][Windows-badge]][Windows] | [![Linux(x64)][Linux-badge_x64]][Linux_x64] [![Linux(arm64)][Linux-badge_arm64]][Linux_arm64] | [![Mac OS(x64)][Mac OS-badge_x64]][Mac OS_x64] [![Mac OS(arm64)][Mac OS-badge_arm64]][Mac OS_arm64] | [![Docker Status][Docker Status-badge]][Docker Status] |
-| Package / Docs | [![Documentation][Documentation-badge]][Documentation] | [![PyPI][pypi-badge]][pypi] | [![is wheel][wheel-badge]][pypi] | ![github license][github-license] |
-| Tests | [![CodeFactor][Codefactor-badge]][Codefactor] | [![Coverage Status][Coverage-Status-badge]][Coverage-Status] | [![codecov][codecov-badge]][codecov] | [![After Market][After Market-badge]][After Market] |
+| Package / Docs | [![Documentation][Documentation-badge]][Documentation] [![OpenSSF Best Practices][OpenSSF-Badge]][OpenSSF-pkscreener]  | [![PyPI][pypi-badge]][pypi] | [![is wheel][wheel-badge]][pypi] | ![github license][github-license] |
+| Tests/Code-Quality | [![CodeFactor][Codefactor-badge]][Codefactor] | [![Coverage Status][Coverage-Status-badge]][Coverage-Status] | [![codecov][codecov-badge]][codecov] | [![After Market][After Market-badge]][After Market] |
 
 ## What is PKScreener?
 | Telegram Alerts | Nifty AI Prediction | Scheduling Cron Jobs | On-Demand Telegram Bot | Backtesting / Growth of 10k|
@@ -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.20250210.702/pkscreenercli.exe
+[Windows]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250212.704/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.20250210.702/pkscreenercli_x64.bin
+[Linux_x64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250212.704/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.20250210.702/pkscreenercli_arm64.bin
+[Linux_arm64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250212.704/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.20250210.702/pkscreenercli_x64.run
+[Mac OS_x64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250212.704/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.20250210.702/pkscreenercli_arm64.run
+[Mac OS_arm64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250212.704/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
@@ -372,6 +372,8 @@ After you have finished the run, go to that copied path, zip the contents of the
 [New Release]: https://github.com/pkjmesra/PKScreener/actions/workflows/w1-workflow-build-matrix.yml
 [Docker-Build-badge]: https://github.com/pkjmesra/PKScreener/actions/workflows/w15-docker-image.yml/badge.svg
 [Docker-Build]: https://github.com/pkjmesra/PKScreener/actions/workflows/w15-docker-image.yml
+[OpenSSF-Badge]:https://www.bestpractices.dev/projects/10011/badge
+[OpenSSF-pkscreener]: https://www.bestpractices.dev/projects/10011
 
 <!-- [![Docker Build][Docker-Build-badge]][Docker-Build] [![PKScreener Test - New Features][New Features-badge]][New Features] [![w9. After-Market Data Gen][After Market-badge]][After Market] [![1. PKScreener Build - New Release][New Release-badge]][New Release] [![Documentation][Documentation-badge]][Documentation]
 

{pkscreener-0.46.20250210.703.data → pkscreener-0.46.20250213.705.data}/purelib/pkscreener/classes/MarketMonitor.py

@@ -54,6 +54,7 @@ class MarketMonitor(SingletonMixin, metaclass=SingletonType):
             self.alertOptions = alertOptions
             self.hiddenColumns = ""
             self.alertStocks = []
+            self.firstAlertTriggered = False
             self.pinnedIntervalWaitSeconds = pinnedIntervalWaitSeconds
             # self.monitorNames = {}
             # We are going to present the dataframes in a 3x3 matrix with limited set of columns
@@ -127,23 +128,42 @@ class MarketMonitor(SingletonMixin, metaclass=SingletonType):
         if self.isPinnedSingleMonitorMode:
             screen_monitor_df = screen_monitor_df[screen_monitor_df.columns[:14]]
             self.monitor_df = screen_monitor_df
-        else:
-            screen_monitor_df.reset_index(inplace=True)
-            screen_monitor_df = screen_monitor_df[["Stock", "LTP", "%Chng","52Wk-H","RSI/i" if "RSI/i" in screen_monitor_df.columns else "RSI","Volume"]].head(self.maxNumRowsInEachResult-1)
-            # Import Utility here since Utility has dependency on PKScheduler which in turn has dependency on 
-            # multiprocessing, which behaves erratically if imported at the top.
-            screen_monitor_df.loc[:, "%Chng"] = screen_monitor_df.loc[:, "%Chng"].astype(str).apply(
-                        lambda x: ImageUtility.PKImageTools.roundOff(str(x).split("% (")[0] + colorText.END,0)
+            if "RUNNER" in os.environ.keys():
+                self.monitor_df.reset_index(inplace=True)
+                with pd.option_context('mode.chained_assignment', None):
+                    self.monitor_df = self.monitor_df[["Stock", "LTP", "%Chng","52Wk-H","RSI/i" if "RSI/i" in self.monitor_df.columns else "RSI","Volume"]]
+                    # Import Utility here since Utility has dependency on PKScheduler which in turn has dependency on 
+                    # multiprocessing, which behaves erratically if imported at the top.
+                    self.monitor_df.loc[:, "%Chng"] = self.monitor_df.loc[:, "%Chng"].astype(str).apply(
+                                lambda x: ImageUtility.PKImageTools.roundOff(str(x).split("% (")[0] + colorText.END,0)
+                            )
+                    self.monitor_df.loc[:, "52Wk-H"] = self.monitor_df.loc[:, "52Wk-H"].astype(str).apply(
+                        lambda x: ImageUtility.PKImageTools.roundOff(x,0)
                     )
-            screen_monitor_df.loc[:, "52Wk-H"] = screen_monitor_df.loc[:, "52Wk-H"].astype(str).apply(
-                lambda x: ImageUtility.PKImageTools.roundOff(x,0)
-            )
-            screen_monitor_df.loc[:, "Volume"] = screen_monitor_df.loc[:, "Volume"].astype(str).apply(
-                lambda x: ImageUtility.PKImageTools.roundOff(x,0)
-            )
-            screen_monitor_df.rename(columns={"%Chng": "Ch%","Volume":"Vol","52Wk-H":"52WkH", "RSI":"RSI/i"}, inplace=True)
-            telegram_df = self.updateDataFrameForTelegramMode(telegram, screen_monitor_df)
-        
+                    self.monitor_df.loc[:, "Volume"] = self.monitor_df.loc[:, "Volume"].astype(str).apply(
+                        lambda x: ImageUtility.PKImageTools.roundOff(x,0)
+                    )
+                    self.monitor_df.rename(columns={"%Chng": "Ch%","Volume":"Vol","52Wk-H":"52WkH", "RSI":"RSI/i"}, inplace=True)
+                    telegram_df = self.updateDataFrameForTelegramMode(telegram or "RUNNER" in os.environ.keys(), self.monitor_df)
+                    self.monitor_df.set_index("Stock",inplace=True)
+            
+        if not self.isPinnedSingleMonitorMode:
+            screen_monitor_df.reset_index(inplace=True)
+            with pd.option_context('mode.chained_assignment', None):
+                screen_monitor_df = screen_monitor_df[["Stock", "LTP", "%Chng","52Wk-H","RSI/i" if "RSI/i" in screen_monitor_df.columns else "RSI","Volume"]].head(self.maxNumRowsInEachResult-1)
+                # Import Utility here since Utility has dependency on PKScheduler which in turn has dependency on 
+                # multiprocessing, which behaves erratically if imported at the top.
+                screen_monitor_df.loc[:, "%Chng"] = screen_monitor_df.loc[:, "%Chng"].astype(str).apply(
+                            lambda x: ImageUtility.PKImageTools.roundOff(str(x).split("% (")[0] + colorText.END,0)
+                        )
+                screen_monitor_df.loc[:, "52Wk-H"] = screen_monitor_df.loc[:, "52Wk-H"].astype(str).apply(
+                    lambda x: ImageUtility.PKImageTools.roundOff(x,0)
+                )
+                screen_monitor_df.loc[:, "Volume"] = screen_monitor_df.loc[:, "Volume"].astype(str).apply(
+                    lambda x: ImageUtility.PKImageTools.roundOff(x,0)
+                )
+                screen_monitor_df.rename(columns={"%Chng": "Ch%","Volume":"Vol","52Wk-H":"52WkH", "RSI":"RSI/i"}, inplace=True)
+            telegram_df = self.updateDataFrameForTelegramMode(telegram or "RUNNER" in os.environ.keys(), screen_monitor_df)
         
         if monitorPosition is not None:
             startRowIndex, startColIndex = monitorPosition
@@ -197,7 +217,8 @@ class MarketMonitor(SingletonMixin, metaclass=SingletonType):
                     stockName = (f"{colorText.BOLD}{colorText.WHITE_FG_BRED_BG}{stock}{colorText.END}") if stockName in self.alertStocks else stock
                     updatedStocks.append(stockName)
                 self.monitor_df.reset_index(inplace=True)
-                self.monitor_df["Stock"] = updatedStocks
+                with pd.option_context('mode.chained_assignment', None):
+                    self.monitor_df["Stock"] = updatedStocks
                 self.monitor_df.set_index("Stock",inplace=True)
 
         self.monitor_df = self.monitor_df.replace(np.nan, "-", regex=True)
@@ -241,6 +262,21 @@ class MarketMonitor(SingletonMixin, metaclass=SingletonType):
             if telegram:
                 self.updateIfRunningInTelegramBotMode(screenOptions, chosenMenu, dbTimestamp, telegram, telegram_df)
         else:
+            if ((screenOptions in self.alertOptions and numRecords > 3) or len(self.alertStocks) > 0 or not self.firstAlertTriggered): # Alert conditions met? Sound alert!
+                # numRecords is actually new lines. Top 3 lines are only headers
+                if telegram_df is not None:
+                    telegram_df.reset_index(inplace=True)
+                    notify_df = telegram_df[telegram_df["Stock"].isin(self.alertStocks)] if self.firstAlertTriggered else telegram_df
+                    notify_df = notify_df[["Stock","LTP","Ch%","Vol"]].head(50)
+                    if len(notify_df) > 0:
+                        notify_output = self.updateIfRunningInTelegramBotMode(screenOptions, chosenMenu, dbTimestamp, False, notify_df,maxcolwidths=None)
+                        if len(notify_output) > 0:
+                            from PKDevTools.classes.pubsub.publisher import PKUserService
+                            from PKDevTools.classes.pubsub.subscriber import notification_service
+                            PKUserService().notify_user(scannerID=self.getScanOptionName(screenOptions),notification=notify_output)
+                            self.firstAlertTriggered = True
+                    # notify_df = self.monitor_df.reindex(self.alertStocks)  # Includes missing stocks, if any. Returns NaN for such cases
+                Utility.tools.alertSound(beeps=5)
             sleep(self.pinnedIntervalWaitSeconds)
 
     def updateDataFrameForTelegramMode(self, telegram, screen_monitor_df):
@@ -272,34 +308,45 @@ class MarketMonitor(SingletonMixin, metaclass=SingletonType):
                 pass
         return telegram_df
 
-    def updateIfRunningInTelegramBotMode(self, screenOptions, chosenMenu, dbTimestamp, telegram, telegram_df):
-        if telegram and telegram_df is not None:
+    def updateIfRunningInTelegramBotMode(self, screenOptions, chosenMenu, dbTimestamp, telegram, telegram_df,maxcolwidths=[None,None,4,3]):
+        result_output = ""
+        telegram_df_tabulated = ""
+        if telegram_df is not None:
             STD_ENCODING=sys.stdout.encoding if sys.stdout is not None else 'utf-8'
-            
-            telegram_df_tabulated = colorText.miniTabulator().tabulate(
-                            telegram_df,
-                            headers="keys",
-                            tablefmt=colorText.No_Pad_GridFormat,
-                            showindex=False,
-                            maxcolwidths=[None,None,4,3]
-                        ).encode("utf-8").decode(STD_ENCODING).replace("-K-----S-----C-----R","-K-----S----C---R").replace("%  ","% ").replace("=K=====S=====C=====R","=K=====S====C===R").replace("Vol  |","Vol|").replace("x  ","x")
+            try:
+                telegram_df_tabulated = colorText.miniTabulator().tabulate(
+                                telegram_df,
+                                headers="keys",
+                                tablefmt=colorText.No_Pad_GridFormat,
+                                showindex=False,
+                                maxcolwidths=maxcolwidths if maxcolwidths is not None else None
+                            ).encode("utf-8").decode(STD_ENCODING).replace("-K-----S-----C-----R","-K-----S----C---R").replace("%  ","% ").replace("=K=====S=====C=====R","=K=====S====C===R").replace("Vol  |","Vol|").replace("x  ","x")
+            except Exception as e:
+                default_logger().debug(e,exc_info=True)
+                pass
             telegram_df_tabulated = telegram_df_tabulated.replace("-E-----N-----E-----R","-E-----N----E---R").replace("=E=====N=====E=====R","=E=====N====E===R")
             choiceSegments = chosenMenu.split(">")
             optionName = self.getScanOptionName(screenOptions)
             chosenMenu = f"{choiceSegments[-2]}>{choiceSegments[-1]}" if (len(choiceSegments)>=4 or len(choiceSegments[-1]) <= 10) else f"{choiceSegments[-1]}"
-            result_output = f"Latest data as of:{dbTimestamp}\n<b>{optionName}{chosenMenu}</b> [{screenOptions}]\n<pre>{telegram_df_tabulated}</pre>"
+            result_output = f"Latest data as of {dbTimestamp}\n<b>[{optionName}] {chosenMenu}</b> [{screenOptions}]\n<pre>{telegram_df_tabulated}</pre>"
             try:
-                filePath = os.path.join(Archiver.get_user_data_dir(), f"monitor_outputs_{self.monitorIndex}.txt")
-                f = open(filePath, "w")
-                f.write(result_output)
-                f.close()
+                if telegram:
+                    filePath = os.path.join(Archiver.get_user_data_dir(), f"monitor_outputs_{self.monitorIndex}.txt")
+                    f = open(filePath, "w")
+                    f.write(result_output)
+                    f.close()
             except: # pragma: no cover
                 pass
+        return result_output
 
     def getScanOptionName(self, screenOptions):
         from pkscreener.classes.MenuOptions import PREDEFINED_SCAN_MENU_VALUES
         if screenOptions is None:
             return ""
+        baseIndex = 12
+        baseIndices = screenOptions.split(":")
+        if len(baseIndices) > 1:
+            baseIndex = baseIndices[1]
         choices = f"--systemlaunched -a y -e -o '{screenOptions.replace('C:','X:').replace('D:','')}'"
         indexNum = -1
         try:
@@ -308,5 +355,5 @@ class MarketMonitor(SingletonMixin, metaclass=SingletonType):
             pass
         optionName = ""
         if indexNum >= 0:
-            optionName = f"{('P_1_'+str(indexNum +1)+':') if '>|' in choices else optionName}"
+            optionName = f"{('P_1_'+str(indexNum +1)+'_'+str(baseIndex)) if '>|' in choices else screenOptions.replace(':D','').replace(':','_')}"
         return optionName

pkscreener-0.46.20250213.705.data/purelib/pkscreener/classes/__init__.py

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

{pkscreener-0.46.20250210.703.data → pkscreener-0.46.20250213.705.data}/purelib/pkscreener/globals.py

@@ -1145,6 +1145,9 @@ def main(userArgs=None,optionalFinalOutcome_df=None):
                 stockListParam = f" --stocklist {userPassedArgs.stocklist}" if userPassedArgs.stocklist else ""
                 slicewindowParam = f" --slicewindow {userPassedArgs.slicewindow}" if userPassedArgs.slicewindow else ""
                 fnameParam = f" --fname {resultsContentsEncoded}" if resultsContentsEncoded else ""
+                if userPassedArgs.monitor and "-e -o" in scannerOptionQuoted:
+                    # We've been launched in monitor mode. Get rid of -e -o
+                    scannerOptionQuoted = scannerOptionQuoted.replace("-e -o","-m")
                 OutputControls().printOutput(f"{colorText.GREEN}Launching PKScreener with piped scanners. If it does not launch, please try with the following:{colorText.END}\n{colorText.FAIL}{launcher} {scannerOptionQuoted}{requestingUser}{enableLog}{backtestParam}{enableTelegramMode}{stockListParam}{slicewindowParam}{fnameParam}{colorText.END}")
                 sleep(2)
                 os.system(f"{launcher} {scannerOptionQuoted}{requestingUser}{enableLog}{backtestParam}{enableTelegramMode}{stockListParam}{slicewindowParam}{fnameParam}")
@@ -3995,9 +3998,9 @@ def sendMessageToTelegramChannel(
                     os.remove(f)
             except: # pragma: no cover
                 pass
-        if message is None and mediagroup:
-            sendMessageToTelegramChannel(message=f"No scan results found for {menuChoiceHierarchy}", user=user)
-            return
+        # if message is None and mediagroup:
+        #     sendMessageToTelegramChannel(message=f"No scan results found for {menuChoiceHierarchy}", user=user)
+        #     return
         handleAlertSubscriptions(user,message)
     if user is not None:
         if str(user) != str(DEV_CHANNEL_ID) and userPassedArgs is not None and not userPassedArgs.monitor: