pkscreener 0.46.20250810.756__cp310-cp310-macosx_13_0_arm64.whl → 0.46.20250908.766__cp310-cp310-macosx_13_0_arm64.whl

{pkscreener-0.46.20250810.756.data → pkscreener-0.46.20250908.766.data}/purelib/pkscreener/classes/StockScreener.py

@@ -35,7 +35,7 @@ warnings.simplefilter("ignore", FutureWarning)
 import pandas as pd
 # from PKDevTools.classes.log import tracelog
 # from PKDevTools.classes.PKTimer import PKTimer
-from PKDevTools.classes import Archiver
+from PKDevTools.classes import Archiver, log
 from PKDevTools.classes.ColorText import colorText
 from PKDevTools.classes.Fetcher import StockDataEmptyException
 from PKDevTools.classes.SuppressOutput import SuppressOutput
@@ -51,6 +51,17 @@ class StockScreener:
         self.isTradingTime = PKDateUtilities.isTradingTime()
         self.configManager = None
 
+    def setupLogger(self, log_level):
+        if log_level > 0:
+            os.environ["PKDevTools_Default_Log_Level"] = str(log_level)
+        log.setup_custom_logger(
+            "pkscreener",
+            log_level,
+            trace=False,
+            log_file_path="pkscreener-logs.txt",
+            filter=None,
+        )
+
     # @tracelog
     def screenStocks(
         self,
@@ -85,6 +96,7 @@ class StockScreener:
         ), "hostRef argument must not be None. It should be an instance of PKMultiProcessorClient"
         if stock is None or len(stock) == 0:
             return None
+        self.setupLogger(log_level=logLevel)
         configManager = hostRef.configManager
         self.configManager = configManager
         screeningDictionary, saveDictionary = self.initResultDictionaries()
@@ -480,7 +492,7 @@ class StockScreener:
                 # Must-run, but only at the end
                 try:
                     if executeOption != 7 or (executeOption == 7 and respChartPattern != 7):
-                    # Only 'doji' and 'inside' is internally implemented by pandas_ta.
+                    # Only 'doji' and 'inside' is internally implemented by pandas_ta_classic.
                     # Otherwise, for the rest of the candle patterns, they also need
                     # TA-Lib. So if TA-Lib is not available, it will throw exception
                     # We can live with no-patterns if user has not installed ta-lib
@@ -682,7 +694,7 @@ class StockScreener:
                             screener.validateCCI(
                                 processedData, screeningDictionary, saveDictionary, minRSI, maxRSI
                             )
-                        if isNotMonitoringDashboard and executeOption != 21 and backtestDuration == 0:
+                        if configManager.enableAdditionalTrendFilters and isNotMonitoringDashboard and executeOption != 21 and backtestDuration == 0:
                             # We don't need to have MFI or fair value data for backtesting because those
                             # are anyways only available for days in the past.
                             # For executeOption 21, we'd have already got the mfiStake and fairValueDiff
@@ -719,28 +731,28 @@ class StockScreener:
             # Capturing Ctr+C Here isn't a great idea
             pass
         except StockDataEmptyException as e: # pragma: no cover
-            # if data is None or (data is not None and not data.isnull().values.all(axis=0)[0]):
-            #     hostRef.default_logger.debug(f"StockDataEmptyException:{stock}: {e}", exc_info=True)
+            if data is None or (data is not None and not data.isnull().values.all(axis=0)[0]):
+                hostRef.default_logger.debug(f"StockDataEmptyException:{stock}: {e}", exc_info=True)
             pass
         except ScreeningStatistics.EligibilityConditionNotMet as e: # pragma: no cover
-            # if userArgsLog:
-            #     hostRef.default_logger.debug(f"EligibilityConditionNotMet:{stock}: {e}", exc_info=True)
+            if userArgsLog:
+                hostRef.default_logger.debug(f"EligibilityConditionNotMet:{stock}: {e}", exc_info=True)
             pass
         except ScreeningStatistics.NotNewlyListed as e: # pragma: no cover
-            # if userArgsLog:
-            #     hostRef.default_logger.debug(f"NotNewlyListed:{stock}: {e}", exc_info=True)
+            if userArgsLog:
+                hostRef.default_logger.debug(f"NotNewlyListed:{stock}: {e}", exc_info=True)
             pass
         except ScreeningStatistics.NotAStageTwoStock as e: # pragma: no cover
-            # if userArgsLog:
-            #     hostRef.default_logger.debug(f"NotAStageTwoStock:{stock}: {e}", exc_info=True)
+            if userArgsLog:
+                hostRef.default_logger.debug(f"NotAStageTwoStock:{stock}: {e}", exc_info=True)
             pass
         except ScreeningStatistics.NotEnoughVolumeAsPerConfig as e: # pragma: no cover 
-            # if userArgsLog:
-            #     hostRef.default_logger.debug(f"NotEnoughVolumeAsPerConfig:{stock}: {e}", exc_info=True)
+            if userArgsLog:
+                hostRef.default_logger.debug(f"NotEnoughVolumeAsPerConfig:{stock}: {e}", exc_info=True)
             pass
         except ScreeningStatistics.DownloadDataOnly as e: # pragma: no cover
-            # if userArgsLog:
-            #     hostRef.default_logger.debug(f"DownloadDataOnly:{stock}: {e}", exc_info=True)
+            if userArgsLog:
+                hostRef.default_logger.debug(f"DownloadDataOnly:{stock}: {e}", exc_info=True)
             try:
                 data = hostRef.objectDictionaryPrimary.get(stock)
                 if data is not None:
@@ -750,7 +762,7 @@ class StockScreener:
             except KeyboardInterrupt: # pragma: no cover
                 raise KeyboardInterrupt
             except Exception as ex:
-                # hostRef.default_logger.debug(f"MFIStatus: {stock}:\n{ex}", exc_info=True)
+                hostRef.default_logger.debug(f"MFIStatus: {stock}:\n{ex}", exc_info=True)
                 pass
             try:
                 screener.getFairValue(stock,hostData=data, force=True,exchangeName=exchangeName)
@@ -758,24 +770,24 @@ class StockScreener:
             except KeyboardInterrupt: # pragma: no cover
                 raise KeyboardInterrupt
             except Exception as ex:
-                # hostRef.default_logger.debug(f"FairValue: {stock}:\n{ex}", exc_info=True)
+                hostRef.default_logger.debug(f"FairValue: {stock}:\n{ex}", exc_info=True)
                 pass
             pass
         except ScreeningStatistics.LTPNotInConfiguredRange as e: # pragma: no cover
-            # if userArgsLog:
-            #     hostRef.default_logger.debug(f"LTPNotInConfiguredRange:{stock}: {e}", exc_info=True)
+            if userArgsLog:
+                hostRef.default_logger.debug(f"LTPNotInConfiguredRange:{stock}: {e}", exc_info=True)
             pass
         except KeyError as e: # pragma: no cover
-            # if userArgsLog:
-            #     hostRef.default_logger.debug(f"KeyError:{stock}: {e}", exc_info=True)
+            if userArgsLog:
+                hostRef.default_logger.debug(f"KeyError:{stock}: {e}", exc_info=True)
             pass
         except OSError as e: # pragma: no cover
-            # if userArgsLog:
-            #     hostRef.default_logger.debug(f"OSError:{stock}: {e}", exc_info=True)
+            if userArgsLog:
+                hostRef.default_logger.debug(f"OSError:{stock}: {e}", exc_info=True)
             pass
         except Exception as e:  # pragma: no cover
-            # if userArgsLog:
-            #     hostRef.default_logger.debug(f"Exception:{stock}: {e}", exc_info=True)
+            if userArgsLog:
+                hostRef.default_logger.debug(f"Exception:{stock}: {e}", exc_info=True)
             if testbuild or printCounter:
                 import traceback
                 traceback.print_exc()
@@ -905,19 +917,19 @@ class StockScreener:
         fullData = None
         processedData = None
         ohlc_dict = {
-            'Open':'first',
-            'High':'max',
-            'Low':'min',
-            'Close':'last',
+            "open":'first',
+            "high":'max',
+            "low":'min',
+            "close":'last',
             'Adj Close': 'last',
-            'Volume':'sum'
+            "volume":'sum'
         }
         candleDuration = self.configManager.candleDurationInt
         candleDurationFrequency = self.configManager.candleDurationFrequency
         durationFrequency = "T" if candleDurationFrequency=="m" else ("H" if candleDurationFrequency=="h" else ("M" if candleDurationFrequency=="mo" else ("W" if candleDurationFrequency=="wk" else "T")))
         if int(candleDuration) >= 1 and (candleDurationFrequency in ["m","h","mo","wk"]):
             data = data.resample(f'{candleDuration}{durationFrequency}', offset='15min').agg(ohlc_dict)
-            data = data[data["High"]>0] # resampling can introduce 0 value rows for non-market hours
+            data = data[data["high"]>0] # resampling can introduce 0 value rows for non-market hours
         if backtestDuration == 0:
             fullData, processedData = screener.preprocessData(
                     data, daysToLookback=configManager.effectiveDaysToLookback
@@ -1049,6 +1061,7 @@ class StockScreener:
             else:
                 data.rename(columns={"index": "Date"}, inplace=True)
             data.set_index("Date", inplace=True)
+            data.index = pd.to_datetime(data.index)
         except: # pragma: no cover
             pass
         if ((shouldCache and not self.isTradingTime and (hostData is None  or hostDataLength == 0)) or downloadOnly) \
@@ -1130,7 +1143,7 @@ class StockScreener:
             "52Wk-L",
             "RSI",
             "RSIi",
-            "Volume",
+            "volume",
             "22-Pd",
             "Consol.",
             "Breakout",
@@ -1148,7 +1161,7 @@ class StockScreener:
             "52Wk-L": 0,
             "RSI": 0,
             "RSIi": 0,
-            "Volume": "",
+            "volume": "",
             "22-Pd": "",
             "Consol.": "Range:0%",
             "Breakout": "BO: 0 R: 0",
@@ -1166,7 +1179,7 @@ class StockScreener:
             "52Wk-L": 0,
             "RSI": 0,
             "RSIi": 0,
-            "Volume": "",
+            "volume": "",
             "22-Pd": "",
             "Consol.": "Range:0%",
             "Breakout": "BO: 0 R: 0",

{pkscreener-0.46.20250810.756.data → pkscreener-0.46.20250908.766.data}/purelib/pkscreener/classes/Utility.py

@@ -73,6 +73,7 @@ artText = f"{getArtText()}\n"
 STD_ENCODING=sys.stdout.encoding if sys.stdout is not None else 'utf-8'
 
 def marketStatus():
+    return "NA"
     # task = PKTask("Nifty 50 Market Status",MarketStatus().getMarketStatus)
     lngStatus = MarketStatus().marketStatus
     nseStatus = ""
@@ -85,8 +86,8 @@ def marketStatus():
     # scheduleTasks(tasksList=[task])
     if lngStatus == "":
         lngStatus = MarketStatus().getMarketStatus(exchangeSymbol="^IXIC" if configManager.defaultIndex == 15 else "^NSEI")
-    if "Close" in lngStatus and nseStatus == "Open":
-        lngStatus = lngStatus.replace("Closed","Open")
+    if "close" in lngStatus and nseStatus == "open":
+        lngStatus = lngStatus.replace("Closed","open")
     if len(next_bell) > 0 and next_bell not in lngStatus:
         lngStatus = f"{lngStatus} | Next Bell: {colorText.WARN}{next_bell.replace('T',' ').split('+')[0]}{colorText.END}"
     return (lngStatus +"\n") if lngStatus is not None else "\n"
@@ -141,7 +142,7 @@ class tools:
                 pass
 
     @Halo(text='', spinner='dots')
-    def tryFetchFromServer(cache_file,repoOwner="pkjmesra",repoName="PKScreener",directory="actions-data-download",hideOutput=False,branchName="actions-data-download"):
+    def tryFetchFromServer(cache_file,repoOwner="pkjmesra",repoName="PKScreener",directory="results/Data",hideOutput=False,branchName="refs/heads/actions-data-download"):
         if not hideOutput:
             OutputControls().printOutput(
                         colorText.FAIL

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

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

{pkscreener-0.46.20250810.756.data → pkscreener-0.46.20250908.766.data}/purelib/pkscreener/globals.py

@@ -320,7 +320,7 @@ def getSummaryCorrectnessOfStrategy(resultdf, summaryRequired=True):
                     )
                 )
             detaildf = detaildf.replace(np.nan, "", regex=True)
-            detaildf.loc[:, "Volume"] = detaildf.loc[:, "Volume"].apply(
+            detaildf.loc[:, "volume"] = detaildf.loc[:, "volume"].apply(
                 lambda x: Utility.tools.formatRatio(x, configManager.volumeRatio)
             )
             detaildf.sort_values(
@@ -754,7 +754,7 @@ def labelDataForPrinting(screenResults, saveResults, configManager, volumeRatio,
             saveResults['RSI'] = saveResults['RSI'].astype(str) + "/" + saveResults['RSIi'].astype(str)
             screenResults.rename(columns={"RSI": "RSI/i"},inplace=True)
             saveResults.rename(columns={"RSI": "RSI/i"},inplace=True)
-        sortKey = ["Volume"] if "RSI" not in menuChoiceHierarchy else ("RSIi" if (isTrading or "RSIi" in saveResults.columns) else "RSI")
+        sortKey = ["volume"] if "RSI" not in menuChoiceHierarchy else ("RSIi" if (isTrading or "RSIi" in saveResults.columns) else "RSI")
         ascending = [False if "RSI" not in menuChoiceHierarchy else True]
         if executeOption == 21:
             if reversalOption in [3,5,6,7]:
@@ -769,20 +769,20 @@ def labelDataForPrinting(screenResults, saveResults, configManager, volumeRatio,
                     sortKey = ["SuperConfSort"]
                     ascending = [False]
                 else:
-                    sortKey = ["Volume"]
+                    sortKey = ["volume"]
                     ascending = [False]
             elif reversalOption in [4]:
                 if "deviationScore" in saveResults.columns:
                     sortKey = ["deviationScore"]
                     ascending = [True]
                 else:
-                    sortKey = ["Volume"]
+                    sortKey = ["volume"]
                     ascending = [False]
         elif executeOption == 23:
-            sortKey = ["bbands_ulr_ratio_max5"] if "bbands_ulr_ratio_max5" in screenResults.columns else ["Volume"]
+            sortKey = ["bbands_ulr_ratio_max5"] if "bbands_ulr_ratio_max5" in screenResults.columns else ["volume"]
             ascending = [False]
         elif executeOption == 27: # ATR Cross
-            sortKey = ["ATR"] if "ATR" in screenResults.columns else ["Volume"]
+            sortKey = ["ATR"] if "ATR" in screenResults.columns else ["volume"]
             ascending = [False]
         elif executeOption == 31: # DEEL Momentum
             sortKey = ["%Chng"]
@@ -824,12 +824,12 @@ def labelDataForPrinting(screenResults, saveResults, configManager, volumeRatio,
             screenResults.set_index("Stock", inplace=True)
         if "Stock" in saveResults.columns:
             saveResults.set_index("Stock", inplace=True)
-        screenResults['Volume'] = screenResults['Volume'].astype(str)
-        saveResults['Volume'] = saveResults['Volume'].astype(str)
-        screenResults.loc[:, "Volume"] = screenResults.loc[:, "Volume"].apply(
+        screenResults["volume"] = screenResults["volume"].astype(str)
+        saveResults["volume"] = saveResults["volume"].astype(str)
+        screenResults.loc[:, "volume"] = screenResults.loc[:, "volume"].apply(
             lambda x: Utility.tools.formatRatio(float(ImageUtility.PKImageTools.removeAllColorStyles(x)), volumeRatio) if len(str(x).strip()) > 0 else ''
         )
-        saveResults.loc[:, "Volume"] = saveResults.loc[:, "Volume"].apply(
+        saveResults.loc[:, "volume"] = saveResults.loc[:, "volume"].apply(
             lambda x: str(x) + "x"
         )
         screenResults.rename(
@@ -1823,7 +1823,7 @@ def main(userArgs=None,optionalFinalOutcome_df=None):
                 prediction, pText, sText = screener.getNiftyPrediction(
                     df=fetcher.fetchLatestNiftyDaily(proxyServer=fetcher.proxyServer)
                 )
-                warningText = "\nNifty AI prediction works best if you request after market is closed. It may not be accurate while market is still open!" if "Open" in Utility.marketStatus() else ""
+                warningText = "\nNifty AI prediction works best if you request after market is closed. It may not be accurate while market is still open!" if "open" in Utility.marketStatus() else ""
                 try:
                     todayHoliday, todayOccassion = PKDateUtilities.isHoliday(PKDateUtilities.currentDateTime())
                     nextWeekday = PKDateUtilities.nextWeekday()
@@ -1916,10 +1916,12 @@ def main(userArgs=None,optionalFinalOutcome_df=None):
                 pass
         loadCount = len(stockDictPrimary) if stockDictPrimary is not None else 0
         # Let's use screening only for the stocks for which we could get the data.
-        savedOrDownloadedKeys = list(stockDictPrimary.keys())
-        missingStocks = set(listStockCodes) - set(savedOrDownloadedKeys)
-        OutputControls().printOutput(f"{colorText.GREEN}  [+] Adding {len(listStockCodes)-len(missingStocks)} stocks out of {len(listStockCodes)} to the queue...{colorText.END}")
-        listStockCodes = list(set(listStockCodes)-set(missingStocks)) if not downloadOnly else listStockCodes
+        savedOrDownloadedKeys = listStockCodes if (userArgs.options is not None and "," in userArgs.options) else list(stockDictPrimary.keys())
+        missingStocks = set(listStockCodes) - set([ x.replace("-BE","").replace("-BZ","") for x in savedOrDownloadedKeys ])
+        # print(missingStocks)
+        # default_logger().debug(missingStocks)
+        OutputControls().printOutput(f"{colorText.GREEN}  [+] Adding {len(savedOrDownloadedKeys)-len(missingStocks)} stocks out of {len(savedOrDownloadedKeys)} to the queue...{colorText.END}")
+        listStockCodes = list(set(savedOrDownloadedKeys)-set(missingStocks)) if not downloadOnly else savedOrDownloadedKeys
         if downloadOnly:
             OutputControls().printOutput(
                 colorText.WARN
@@ -2336,7 +2338,7 @@ def analysisFinalResults(screenResults,saveResults,optionalFinalOutcome_df,runOp
         analysis_df = screenResults.copy()
     else:
         analysis_df = pd.DataFrame()
-    index_columns = ["Stock","%Chng","Volume","Pattern","MA-Signal","Trend(22Prds)","Trend","LTP","LTP@Alert","AlertTime","SqrOff","SqrOffLTP","SqrOffDiff","EoDDiff","DayHighTime","DayHigh","DayHighDiff"]
+    index_columns = ["Stock","%Chng","volume","Pattern","MA-Signal","Trend(22Prds)","Trend","LTP","LTP@Alert","AlertTime","SqrOff","SqrOffLTP","SqrOffDiff","EoDDiff","DayHighTime","DayHigh","DayHighDiff"]
     final_index_columns = []
     firstScanKey = userPassedArgs.options.split(">|")[0]
     for column in index_columns:
@@ -2474,7 +2476,7 @@ def FinishBacktestDataCleanup(backtest_df, df_xray):
                 "22": "22-Pd",
                 "30": "30-Pd",
                 "T": "Trend",
-                "V": "Volume",
+                "V": "volume",
                 "M": "MA-Signal",
             }
     if configManager.enablePortfolioCalculations:
@@ -3259,17 +3261,17 @@ def printNotifySaveScreenedResults(
                             with pd.option_context('mode.chained_assignment', None):
                                 caption_df.rename(columns={"DayHighDiff": "Hgh","EoDDiff":"EoD"}, inplace=True)
                         else:
-                            caption_df = saveResultsTrimmed[['LTP','%Chng','Volume']].head(configManager.telegramSampleNumberRows)
+                            caption_df = saveResultsTrimmed[['LTP','%Chng',"volume"]].head(configManager.telegramSampleNumberRows)
                             caption_df.loc[:, "LTP"] = caption_df.loc[:, "LTP"].apply(
                                 lambda x: str(int(round(float(x),0)))
                             )
                             caption_df.loc[:, "%Chng"] = caption_df.loc[:, "%Chng"].apply(
                                 lambda x: f'{int(round(float(x.split(" ")[0].replace("%","")),0))}%'
                             )
-                            caption_df.loc[:, "Volume"] = caption_df.loc[:, "Volume"].apply(
+                            caption_df.loc[:, "volume"] = caption_df.loc[:, "volume"].apply(
                                 lambda x: f'{int(round(float(x.replace("x","")),0))}x' if (len(x.replace("x","").strip()) > 0 and not pd.isna(float(x.replace("x","")))) else ''
                             )
-                            caption_df.rename(columns={"%Chng": "Ch%","Volume":"Vol"}, inplace=True)
+                            caption_df.rename(columns={"%Chng": "Ch%","volume":"Vol"}, inplace=True)
                     except: # pragma: no cover
                         cols = [list(saveResultsTrimmed.columns)[0]]
                         cols.extend(list(saveResultsTrimmed.columns[5:]))
@@ -3285,7 +3287,7 @@ def printNotifySaveScreenedResults(
                     ).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("Hgh  |","Hgh|").replace("EoD  |","EoD|").replace("x  ","x")
                     caption_results = ImageUtility.PKImageTools.removeAllColorStyles(caption_results.replace("-E-----N-----E-----R","-E-----N----E---R").replace("=E=====N=====E=====R","=E=====N====E===R"))
                     suggestion_text = "Try @nse_pkscreener_bot for more scans! <i><b><u>You agree that you have read</u></b>:https://pkjmesra.github.io/PKScreener/Disclaimer.txt</i> <b>and accept TOS</b>: https://pkjmesra.github.io/PKScreener/tos.txt <b>STOP using and exit from channel/group, if you do not</b>"
-                    finalCaption = f"{caption}.Feel free to share on social media.Open attached image for more. Samples:<pre>{caption_results}</pre>{elapsed_text} {suggestion_text}"
+                    finalCaption = f"{caption}.Feel free to share on social media.open attached image for more. Samples:<pre>{caption_results}</pre>{elapsed_text} {suggestion_text}"
                 if not testing:
                     if PKDateUtilities.isTradingTime() and not PKDateUtilities.isTodayHoliday()[0]:
                         kite_file_path, kite_caption = sendKiteBasketOrderReviewDetails(saveResultsTrimmed,runOptionName,caption,user)
@@ -3705,11 +3707,11 @@ def runScanners(
                 if result is not None:
                     if not userPassedArgs.monitor and len(lstscreen) > 0 and userPassedArgs is not None and userPassedArgs.options.split(":")[2] in ["29"]:
                         scr_df = pd.DataFrame(lstscreen)
-                        existingColumns = ["Stock","%Chng","LTP","Volume"]
+                        existingColumns = ["Stock","%Chng","LTP","volume"]
                         newColumns = ["BidQty","AskQty","LwrCP","UprCP","VWAP","DayVola","Del(%)"]
                         existingColumns.extend(newColumns)
                         scr_df = scr_df[existingColumns]
-                        scr_df.sort_values(by=["Volume","BidQty"], ascending=False, inplace=True)
+                        scr_df.sort_values(by=["volume","BidQty"], ascending=False, inplace=True)
                         tabulated_results = colorText.miniTabulator().tb.tabulate(
                                 scr_df,
                                 headers="keys",

{pkscreener-0.46.20250810.756.data → pkscreener-0.46.20250908.766.data}/purelib/pkscreener/pkscreenerbot.py

@@ -61,6 +61,7 @@ MINUTES_2_IN_SECONDS = 120
 OWNER_USER = "Itsonlypk"
 APOLOGY_TEXT = "Apologies! The @nse_pkscreener_bot is NOT available for the time being! We are working with our host GitHub and other data source providers to sort out pending invoices and restore the services soon! Thanks for your patience and support! 🙏"
 
+from pkscreener.classes import VERSION
 from PKDevTools.classes.Environment import PKEnvironment
 from PKDevTools.classes.PKDateUtilities import PKDateUtilities
 from PKDevTools.classes.ColorText import colorText
@@ -142,6 +143,7 @@ m3 = menus()
 m4 = menus()
 int_timer = None
 _updater = None
+QR_CODE_PAYMENT_LINK="upi://pay?pa=PKSCREENER@APL&pn=PKSCREENER&tn=undefined&am=undefined"
 
 TOP_LEVEL_SCANNER_MENUS = ["X", "B", "MI","DV", "P"] # 
 TOP_LEVEL_SCANNER_SKIP_MENUS = ["M", "S", "F", "G", "C", "T", "D", "I", "E", "U", "L", "Z", "P"] # Last item will be skipped.
@@ -278,7 +280,7 @@ def matchUTR(update: Update, context: CallbackContext) -> str:
         if len(args) > 0: # UTR
             matchedTran = PKGmailReader.matchUTR(utr=args[0])
             if matchedTran is not None:
-                updatedResults = f"We have found the following transaction for the provided UTR:\n{matchedTran}\n\nYour subscription is being enabled soon!\n\nPlease check with /OTP in the next couple of minutes!\n\nThank you for trusting PKScreener!"
+                updatedResults = f"We have found the following transaction for the provided UTR:\n{matchedTran}\nYour subscription is being enabled soon!\nPlease check with /OTP in the next couple of minutes!\nThank you for trusting PKScreener!"
                 try:
                     results = updateSubscription(user.id,int(float(matchedTran.get("amountPaid"))))
                     if results is not None:
@@ -288,15 +290,16 @@ def matchUTR(update: Update, context: CallbackContext) -> str:
                     updatedResults = f"{updatedResults} Uh oh! We ran into a problem enabling your subscription.\nPlease reach out to @ItsOnlyPK to resolve."
                     pass
             else:
-                updatedResults = "We could not find any transaction details with the provided UTR.\nUPI transaction reference number is a 12-digit alphanumeric/numeric code that serves as a unique identifier for transactions. It is also known as the Unique Transaction Reference (UTR) number.\nYou can find your UPI reference number in the UPI-enabled app you used to make the transaction.\nFor example, you can find your UPI reference number in the History section of Google Pay. \nIn the Paytm app, you can find it by clicking View Details.\n\nIf you still cannot find it, please drop a message with transaction details/snapshot to @ItsOnlyPK to enable subscription."
+                updatedResults = "We could not find any transaction details with the provided UTR.\nUPI transaction reference number is a 12-digit alphanumeric/numeric code that serves as a unique identifier for transactions. It is also known as the Unique Transaction Reference (UTR) number.\nYou can find your UPI reference number in the UPI-enabled app you used to make the transaction.\nFor example, you can find your UPI reference number in the History section of Google Pay. \nIn the Paytm app, you can find it by clicking View Details.\nIf you still cannot find it, please drop a message with transaction details/snapshot to @ItsOnlyPK to enable subscription."
         else:
-            updatedResults = "Did you forget to include the UTR number with /Check ?\nYou should use it like this:\n\n/Check UTR_Here\n\nUPI transaction reference number is a 12-digit alphanumeric/numeric code that serves as a unique identifier for transactions. It is also known as the Unique Transaction Reference (UTR) number.\nYou can find your UPI reference number in the UPI-enabled app you used to make the transaction.\nFor example, you can find your UPI reference number in the History section of Google Pay. \nIn the Paytm app, you can find it by clicking View Details.\n\nIf you still cannot find it, please drop a message with transaction details/snapshot to @ItsOnlyPK to enable subscription."
+            updatedResults = "Did you forget to include the UTR number with /Check ?\nYou should use it like this:\n/Check UTR_Here\nUPI transaction reference number is a 12-digit alphanumeric/numeric code that serves as a unique identifier for transactions. It is also known as the Unique Transaction Reference (UTR) number.\nYou can find your UPI reference number in the UPI-enabled app you used to make the transaction.\nFor example, you can find your UPI reference number in the History section of Google Pay. \nIn the Paytm app, you can find it by clicking View Details.\nIf you still cannot find it, please drop a message with transaction details/snapshot to @ItsOnlyPK to enable subscription."
     update.message.reply_text(sanitiseTexts(updatedResults), reply_markup=default_markup(user=user),parse_mode="HTML")
     shareUpdateWithChannel(update=update, context=context, optionChoices=f"/otp\n{updatedResults}")
     return START_ROUTES
 
 def editMessageText(query,editedText,reply_markup):
-    editedText = f"{PKDateUtilities.currentDateTime()}:\n{editedText}"
+    # .replace(microsecond=0).isoformat()
+    editedText = f"PKScreener <b>v{VERSION}</b>\n{PKDateUtilities.currentDateTime()}:\n{editedText}"
     if query is not None and hasattr(query, "edit_message_text"):
         query.edit_message_text(text=editedText, reply_markup=reply_markup,parse_mode="HTML")
 
@@ -359,7 +362,7 @@ def start(update: Update, context: CallbackContext, updatedResults=None, monitor
         menuText = f"{menuText}\nClick /start if you want to restart the session."
     else:
         if not isUserSubscribed(user):
-            updatedResults = f"Thank you for choosing Intraday Monitor!\n\nThis scan request is, however, protected and is only available to premium subscribers. It seems like you are not subscribed to the paid/premium subscription to PKScreener.\nPlease checkout all premium options by sending out a request:\n/OTP\n\nFor basic/unpaid users, you can try out the following:\n/X_0 StockCode1,StockCode2,etc.\n/X_N\n/X_1"
+            updatedResults = f"Thank you for choosing Intraday Monitor!\nThis scan request is, however, protected and is only available to premium subscribers. It seems like you are not subscribed to the paid/premium subscription to PKScreener.\nPlease checkout all premium options by sending out a request:\n/OTP\nFor basic/unpaid users, you can try out the following:\n/X_0 StockCode1,StockCode2,etc.\n/X_N\n/X_1"
             updatedResults = f"{updatedResults}\nClick /start if you want to restart the session."
         chosenBotMenuOption = f"{chosenBotMenuOption}\nInt. Monitor. MonitorIndex:{monitorIndex}\n{updatedResults}"
         menuText = updatedResults
@@ -665,7 +668,7 @@ def viewSubscriptionOptions(update:Update,context:CallbackContext,sendOTP=False)
                     subscriptionModelNames = f"{subscriptionModelNames}\n₹ {str(value).ljust(6)}: {name} (Only Basic Scans are free)\n"
                 else:
                     subscriptionModelNames = f"{subscriptionModelNames}\n₹ {str(value).ljust(6)}: {name}"
-            subscriptionModelNames = f"{subscriptionModelNames}</pre>\nPlease pay to subscribe:\n1. Using UPI(India) to <a href='https://tinyurl.com/v7h3t233'>PKScreener@APL</a> or\n2. Proudly <a href='https://github.com/sponsors/pkjmesra?frequency=recurring&sponsor=pkjmesra'><b>sponsor</b></a>\n\nPlease drop a message to @ItsOnlyPK on Telegram after paying to enable subscription manually or use \n\n/check UPI_UTR_HERE_After_Making_Payment to share transaction reference number to automatically enable subscription after making payment via UPI\n"
+            subscriptionModelNames = f"{subscriptionModelNames}</pre>\nPlease pay to subscribe:\n1. Using UPI(India) to <a href='https://tinyurl.com/v7h3t233'>PKScreener@APL</a> or\n2. Proudly <a href='https://github.com/sponsors/pkjmesra?frequency=recurring&sponsor=pkjmesra'><b>sponsor</b></a>\nPlease send\n/check UPI_UTR_HERE_After_Making_Payment to share transaction reference number to automatically enable subscription after making payment via UPI\n. If it is not auto-enabled, please drop a message to @ItsOnlyPK on Telegram after paying to enable subscription manually."
 
             subscriptionModelName = PKUserSusbscriptions().subscriptionValueKeyPairs[subsModel]
             if subscriptionModelName != PKSubscriptionModel.No_Subscription.name:
@@ -678,7 +681,7 @@ def viewSubscriptionOptions(update:Update,context:CallbackContext,sendOTP=False)
             if otpValue == 0:
                 updatedResults = f"We are having difficulty generating OTP for your {userText}. Please try again later or reach out to @ItsOnlyPK."
             else:
-                updatedResults = f"Please use the following to login to PKScreener:\n{userText}\n<b>OTP</b>     : <code>{otpValue}</code>\n\nCurrent subscription : <b>{subscriptionModelName}</b>.\nCurrent alerts balance: <b>₹ {alertUser.balance if alertUser is not None else 0}</b> {scannerJobsSubscribed}. {subscriptionModelNames}"
+                updatedResults = f"Please use the following to login to PKScreener:\n{userText}\n<b>OTP</b>     : <code>{otpValue}</code>\nCurrent subscription : <b>{subscriptionModelName}</b>.\nCurrent alerts balance: <b>₹ {alertUser.balance if alertUser is not None else 0}</b> {scannerJobsSubscribed}. {subscriptionModelNames}"
         else:
             updatedResults = f"Current subscription: <b>{subscriptionModelName}</b>.\nCurrent alerts balance: <b>₹ {alertUser.balance if alertUser is not None else 0}</b> {scannerJobsSubscribed}. {subscriptionModelNames}"
         
@@ -733,7 +736,7 @@ def subscribeToScannerAlerts(update: Update, context: CallbackContext) -> str:
     menuText = ""
     requiredBalance = 40 if str(scanId).upper().startswith("P") else 31
     # upi://pay?pa=PKScreener@APL&pn=PKScreener&cu=INR
-    payWall = "Please pay to subscribe:\n1. Using UPI(India) to <a href='https://tinyurl.com/v7h3t233'>PKScreener@APL</a> or\n2. Proudly <a href='https://github.com/sponsors/pkjmesra?frequency=recurring&sponsor=pkjmesra'>sponsor</a>\n\nPlease drop a message to @ItsOnlyPK along with UTR and Scan details on Telegram after paying to enable subscription manually or use \n\n/check UPI_UTR_HERE_After_Making_Payment to share transaction reference number to automatically update your balance after making payment via UPI.\nAfter that you can try re-subscribing!"
+    payWall = "Please pay to subscribe:\n1. Using UPI(India) to <a href='https://tinyurl.com/v7h3t233'>PKScreener@APL</a> or\n2. Proudly <a href='https://github.com/sponsors/pkjmesra?frequency=recurring&sponsor=pkjmesra'>sponsor</a>\nPlease use\n/check UPI_UTR_HERE_After_Making_Payment to share transaction reference number to automatically update your balance after making payment via UPI.\nAfter that you can try re-subscribing!\nIf you still face any problem, please drop a message to @ItsOnlyPK along with UTR and Scan details on Telegram after paying to enable subscription manually."
     if alertUser is not None and alertUser.balance >= 0:
         # User has some balance
         if len(alertUser.scannerJobs) > 0:
@@ -1249,7 +1252,7 @@ def Level2(update: Update, context: CallbackContext) -> str:
             )
             optionChoices = f"{optionChoices}{f' > {selection[4]}' if len(selection) > 4 else ''}".replace(" > >","").strip()
             expectedTime = f"{'10 to 15' if '> 15' in optionChoices else '1 to 2'}"
-            menuText = f"Thank you for choosing {optionChoices.replace(' >  > ','')}. You will receive the notification/results in about {expectedTime} minutes. It generally takes 1-2 minutes for NSE (2000+) stocks and 10-15 minutes for NASDAQ (7300+).\n\nPKScreener had been free for a long time, but owing to cost/budgeting issues, only a basic set of features will always remain free for everyone. Consider donating to help cover the basic server costs or subscribe to premium, if not subscribed yet:\n\nUPI (India): <a href='https://tinyurl.com/v7h3t233'>PKScreener@APL</a> \n\nor <a href='https://github.com/sponsors/pkjmesra?frequency=recurring&sponsor=pkjmesra'>sponsor</a>"
+            menuText = f"Thank you for choosing {optionChoices.replace(' >  > ','')}. You will receive the notification/results in about {expectedTime} minutes. It generally takes 1-2 minutes for NSE (2000+) stocks and 10-15 minutes for NASDAQ (7300+).\nPKScreener had been free for a long time, but owing to cost/budgeting issues, only a basic set of features will always remain free for everyone. Consider donating to help cover the basic server costs or subscribe to premium, if not subscribed yet:\nUPI (India): <a href='https://tinyurl.com/v7h3t233'>PKScreener@APL</a>\nor <a href='https://github.com/sponsors/pkjmesra?frequency=recurring&sponsor=pkjmesra'>sponsor</a>"
 
             reply_markup = default_markup(user=user)
             options = ":".join(selection)
@@ -1445,7 +1448,7 @@ def launchScreener(options, user, context, optionChoices, update):
                     isBasicScanRequest = True
                     break
             if not isBasicScanRequest:
-                responseText = f"Thank you for choosing {scanRequest}!\n\nThis {'Backtest' if str(scanRequest).startswith('B') else 'Scan'} request is, however, protected and is only available to premium subscribers. It seems like you are not subscribed to the paid/premium subscription to PKScreener.\nPlease checkout all premium options by sending out a request:\n\n/OTP\n\nFor basic/unpaid users, you can try out the following:\n/X_0 StockCode1,StockCode2,etc.\n/X_N\n/X_1\n"
+                responseText = f"Thank you for choosing {scanRequest}!\nThis {'Backtest' if str(scanRequest).startswith('B') else 'Scan'} request is, however, protected and is only available to premium subscribers. It seems like you are not subscribed to the paid/premium subscription to PKScreener.\nPlease checkout all premium options by sending out a request:\n/OTP\nFor basic/unpaid users, you can try out the following:\n/X_0 StockCode1,StockCode2,etc.\n/X_N\n/X_1\n"
                 if update is not None and update.message is not None:
                     update.message.reply_text(sanitiseTexts(responseText),reply_markup=default_markup(user=user),parse_mode="HTML")
                 else:
@@ -1461,10 +1464,10 @@ def launchScreener(options, user, context, optionChoices, update):
                 optionChoices = optionChoices[:-1]
             if str(optionChoices).split("_")[2] == "6" and str(optionChoices).split("_")[3] == "7":
                 optionChoices = f"{optionChoices}_3" # Lorenzian Any/All
-            responseText = f"Thank you for choosing {optionChoices}!\n\nHere are the results:\n\nInsights: https://pkjmesra.github.io/PKScreener/Backtest-Reports/PKScreener_{optionChoices}_Insights_DateSorted.html"
-            responseText = f"{responseText}\n\nSummary: https://pkjmesra.github.io/PKScreener/Backtest-Reports/PKScreener_{optionChoices}_Summary_StockSorted.html"
-            responseText = f"{responseText}\n\nStock-wise: https://pkjmesra.github.io/PKScreener/Backtest-Reports/PKScreener_{optionChoices}_backtest_result_StockSorted.html"
-            responseText = f"{responseText}\n\nOther Reports: https://pkjmesra.github.io/PKScreener/BacktestReports.html"
+            responseText = f"Thank you for choosing {optionChoices}!\nHere are the results:\nInsights: https://pkjmesra.github.io/PKScreener/Backtest-Reports/PKScreener_{optionChoices}_Insights_DateSorted.html"
+            responseText = f"{responseText}\nSummary: https://pkjmesra.github.io/PKScreener/Backtest-Reports/PKScreener_{optionChoices}_Summary_StockSorted.html"
+            responseText = f"{responseText}\nStock-wise: https://pkjmesra.github.io/PKScreener/Backtest-Reports/PKScreener_{optionChoices}_backtest_result_StockSorted.html"
+            responseText = f"{responseText}\nOther Reports: https://pkjmesra.github.io/PKScreener/BacktestReports.html"
             if update is not None and update.message is not None:
                 update.message.reply_text(sanitiseTexts(responseText),reply_markup=default_markup(user=user),parse_mode="HTML")
             else:
@@ -1535,7 +1538,7 @@ def BBacktests(update: Update, context: CallbackContext) -> str:
         ]
     ]
     reply_markup = InlineKeyboardMarkup(keyboard)
-    responseText = "Backtesting NOT implemented yet in this Bot!\n\n\nYou can use backtesting by downloading the software from https://github.com/pkjmesra/PKScreener/"
+    responseText = "Backtesting NOT implemented yet in this Bot!\nYou can use backtesting by downloading the software from https://github.com/pkjmesra/PKScreener/"
     responseText = f"{responseText}\nClick /start if you want to restart the session."
     editMessageText(query=query,editedText=sanitiseTexts(responseText),reply_markup=default_markup(user=user))
     registerUser(user)
@@ -1571,7 +1574,7 @@ def end(update: Update, context: CallbackContext) -> str:
     """
     query = update.callback_query
     query.answer()
-    responseText = "See https://github.com/pkjmesra/PKScreener/ for more details or join https://t.me/PKScreener. \n\n\nSee you next time!"
+    responseText = "See https://github.com/pkjmesra/PKScreener/ for more details or join https://t.me/PKScreener. \nSee you next time!"
     responseText = f"{responseText}\nClick /start if you want to restart the session."
     editMessageText(query=query,editedText=sanitiseTexts(responseText),reply_markup=default_markup(query.from_user))
     return ConversationHandler.END
@@ -1635,9 +1638,9 @@ def error_handler(update: object, context: CallbackContext) -> None:
     message = (
         f"An exception was raised while handling an update\n"
         f"<pre>update = {html.escape(json.dumps(update_str, indent=2, ensure_ascii=False))}"
-        "</pre>\n\n"
-        f"<pre>context.chat_data = {html.escape(str(context.chat_data))}</pre>\n\n"
-        f"<pre>context.user_data = {html.escape(str(context.user_data))}</pre>\n\n"
+        "</pre>\n"
+        f"<pre>context.chat_data = {html.escape(str(context.chat_data))}</pre>\n"
+        f"<pre>context.user_data = {html.escape(str(context.user_data))}</pre>\n"
         f"<pre>{html.escape(tb_string)}</pre>"
     )
 
@@ -2030,7 +2033,7 @@ def sendRequestSubmitted(optionChoices, update, context):
             return
     # Get user that sent /start and log his name
     user = updateCarrier.from_user
-    menuText = f"Thank you for choosing {optionChoices}. You will receive the notification/results in about 1-2 minutes! \n\nConsider donating to help keep this project going:\nUPI: <a href='https://tinyurl.com/v7h3t233'>PKScreener@APL</a> \nor <a href='https://github.com/sponsors/pkjmesra?frequency=recurring&sponsor=pkjmesra'>sponsor</a>"
+    menuText = f"Thank you for choosing {optionChoices}. You will receive the notification/results in about 1-2 minutes! \nConsider donating to help keep this project going:\nUPI: <a href='https://tinyurl.com/v7h3t233'>PKScreener@APL</a> \nor <a href='https://github.com/sponsors/pkjmesra?frequency=recurring&sponsor=pkjmesra'>sponsor</a>"
     update.message.reply_text(sanitiseTexts(menuText),reply_markup=default_markup(user=user),parse_mode="HTML")
     # help_command(update=update, context=context)
     shareUpdateWithChannel(
@@ -2097,7 +2100,7 @@ def help_command(update: Update, context: CallbackContext) -> None:
     """Send a message when the command /help is issued."""
     if update is not None and update.message is not None:
         update.message.reply_text(
-            sanitiseTexts(f"You can begin by typing in /start (Recommended) and hit send!\nOR\nChoose an option:\n{cmdText}\n\nWe recommend you start by clicking on this /start"),
+            sanitiseTexts(f"You can begin by typing in /start (Recommended) and hit send!\nOR\nChoose an option:\n{cmdText}\nWe recommend you start by clicking on this /start"),
             reply_markup=default_markup(user=user),parse_mode="HTML"
         )  #  \n\nThis bot restarts every hour starting at 5:30am IST until 10:30pm IST to keep it running on free servers. If it does not respond, please try again in a minutes to avoid the restart duration!
         query = update.message

{pkscreener-0.46.20250810.756.data → pkscreener-0.46.20250908.766.data}/purelib/pkscreener/pkscreenercli.py

@@ -426,6 +426,7 @@ def setupLogger(shouldLog=False, trace=False):
     OutputControls().printOutput(colorText.GREEN + f"  [+] {log_file_path}"+colorText.END)
     OutputControls().printOutput(colorText.FAIL + "  [+] If you need to share, open this folder, copy and zip the log file to share.\n" + colorText.END)
     # logger = multiprocessing.log_to_stderr(log.logging.DEBUG)
+    os.environ["PKDevTools_Default_Log_Level"] = str(log.logging.DEBUG)
     log.setup_custom_logger(
         "pkscreener",
         log.logging.DEBUG,
@@ -433,31 +434,30 @@ def setupLogger(shouldLog=False, trace=False):
         log_file_path=log_file_path,
         filter=None,
     )
-    os.environ["PKDevTools_Default_Log_Level"] = str(log.logging.DEBUG)
 
 def warnAboutDependencies():
     if not Imports["talib"]:
         OutputControls().printOutput(
                 colorText.FAIL
-                + "  [+] TA-Lib is not installed. Looking for pandas_ta."
+                + "  [+] TA-Lib is not installed. Looking for pandas_ta_classic."
                 + colorText.END
             )
         sleep(1)
         issueLink = "https://github.com/pkjmesra/PKScreener"
         issueLink = f"\x1b[97m\x1b]8;;{issueLink}\x1b\\{issueLink}\x1b]8;;\x1b\\\x1b[0m"
-        if Imports["pandas_ta"]:
+        if Imports["pandas_ta_classic"]:
             taLink = "https://github.com/ta-lib/ta-lib-python"
             taLink = f"\x1b[97m\x1b]8;;{taLink}\x1b\\{taLink}\x1b]8;;\x1b\\\x1b[0m"
             OutputControls().printOutput(
                 colorText.GREEN
-                + f"  [+] Found and falling back on pandas_ta.\n  [+] For full coverage(candle patterns), you may wish to read the README file in PKScreener repo :  {issueLink}\n  [+] or follow instructions from\n  [+] {taLink}"
+                + f"  [+] Found and falling back on pandas_ta_classic.\n  [+] For full coverage(candle patterns), you may wish to read the README file in PKScreener repo :  {issueLink}\n  [+] or follow instructions from\n  [+] {taLink}"
                 + colorText.END
             )
             sleep(1)
         else:
             OutputControls().printOutput(
                 colorText.FAIL
-                + f"  [+] Neither ta-lib nor pandas_ta was located. You need at least one of them to continue! \n  [+] Please follow instructions from README file under PKScreener repo: {issueLink}"
+                + f"  [+] Neither ta-lib nor pandas_ta_classic was located. You need at least one of them to continue! \n  [+] Please follow instructions from README file under PKScreener repo: {issueLink}"
                 + colorText.END
             )
             OutputControls().takeUserInput("Press any key to try anyway...")
@@ -933,10 +933,10 @@ def pkscreenercli():
                 OutputControls().printOutput(e)
                 traceback.print_exc()
             pass
-        finally:
-            from PKDevTools.classes.PKBackupRestore import restore_backup
-            restore_backup()
-            sleep(3)
+        # finally:
+        #     from PKDevTools.classes.PKBackupRestore import restore_backup
+        #     restore_backup()
+        #     sleep(3)
         #     import threading
         #     from pkscreener.globals import tryLoadDataOnBackgroundThread
         #     ping_thread = threading.Thread(target=tryLoadDataOnBackgroundThread, daemon=True)