pkscreener 0.46.20250222.732__tar.gz → 0.46.20250222.733__tar.gz

{pkscreener-0.46.20250222.732 → pkscreener-0.46.20250222.733}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.2
 Name: pkscreener
-Version: 0.46.20250222.732
+Version: 0.46.20250222.733
 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.20250222.732.zip
+Download-URL: https://github.com/pkjmesra/pkscreener/archive/v0.46.20250222.733.zip
 Author: pkjmesra
 Author-email: pkjmesra@gmail.com
 License: OSI Approved (MIT)
@@ -33,7 +33,7 @@ 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.238
+Requires-Dist: PKDevTools>=0.13.20250126.240
 Requires-Dist: PKNSETools>=0.1.20250122.138
 Requires-Dist: Pyarrow
 Requires-Dist: pyppeteer
@@ -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.20250221.731/pkscreenercli.exe
+[Windows]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250222.732/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.20250221.731/pkscreenercli_x64.bin
+[Linux_x64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250222.732/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.20250221.731/pkscreenercli_arm64.bin
+[Linux_arm64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250222.732/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.20250221.731/pkscreenercli_x64.run
+[Mac OS_x64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250222.732/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.20250221.731/pkscreenercli_arm64.run
+[Mac OS_arm64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250222.732/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.20250222.732 → pkscreener-0.46.20250222.733}/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.20250221.731/pkscreenercli.exe
+[Windows]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250222.732/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.20250221.731/pkscreenercli_x64.bin
+[Linux_x64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250222.732/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.20250221.731/pkscreenercli_arm64.bin
+[Linux_arm64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250222.732/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.20250221.731/pkscreenercli_x64.run
+[Mac OS_x64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250222.732/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.20250221.731/pkscreenercli_arm64.run
+[Mac OS_arm64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250222.732/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.20250222.732 → pkscreener-0.46.20250222.733}/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.20250221.731/pkscreenercli.exe
+[Windows]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250222.732/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.20250221.731/pkscreenercli_x64.bin
+[Linux_x64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250222.732/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.20250221.731/pkscreenercli_arm64.bin
+[Linux_arm64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250222.732/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.20250221.731/pkscreenercli_x64.run
+[Mac OS_x64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250222.732/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.20250221.731/pkscreenercli_arm64.run
+[Mac OS_arm64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250222.732/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.20250222.732 → pkscreener-0.46.20250222.733}/pkscreener/classes/PKAnalytics.py

@@ -25,6 +25,7 @@
 """
 
 import os
+import sys
 # import base64
 from sys import platform
 import platform
@@ -41,7 +42,7 @@ from PKDevTools.classes.Singleton import SingletonType, SingletonMixin
 from PKDevTools.classes.pubsub.publisher import PKUserService
 from PKDevTools.classes.pubsub.subscriber import notification_service
 from pkscreener.classes import VERSION
-
+from pkscreener.classes.ConfigManager import tools, parser
 class PKAnalyticsService(SingletonMixin, metaclass=SingletonType):
     def __init__(self):
         super(PKAnalyticsService, self).__init__()
@@ -52,9 +53,14 @@ class PKAnalyticsService(SingletonMixin, metaclass=SingletonType):
         self.app_version = VERSION
         self.start_time = time.time()
         self.isRunner = "RUNNER" in os.environ.keys()
+        self.onefile = getattr(sys, 'frozen', False) and hasattr(sys, '_MEIPASS')
+        self.configManager = tools()
+        self.configManager.getConfig(parser)
 
     def collectMetrics(self,user=None):
         try:
+            if not self.configManager.enableUsageAnalytics:
+                return
             self.userName = self.getUserName()
             metrics = self.getApproxLocationInfo()
             self.locationInfo = metrics
@@ -92,6 +98,8 @@ class PKAnalyticsService(SingletonMixin, metaclass=SingletonType):
         return data
     
     def send_event(self,event_name,params={}):
+        if not self.configManager.enableUsageAnalytics:
+            return
         if isinstance(self.locationInfo,str):
             self.collectMetrics()
         event_params = {
@@ -100,7 +108,9 @@ class PKAnalyticsService(SingletonMixin, metaclass=SingletonType):
             "os_version": self.os_version,
             "app_version": self.app_version,
             "elapsed_time": str(time.time() - self.start_time),
-            "is_Runner": self.isRunner
+            "is_runner": self.isRunner,
+            "is_container": str(os.environ.get("PKSCREENER_DOCKER", "")).lower() in ("yes", "y", "on", "true", "1"),
+            "one_file_bundle": self.onefile
         }
         if len(params) > 0:
             for key in params:

{pkscreener-0.46.20250222.732 → pkscreener-0.46.20250222.733}/pkscreener/classes/PKScanRunner.py

@@ -412,7 +412,7 @@ class PKScanRunner:
                 cleanup_on_sigterm()
         OutputControls().printOutput(
             colorText.FAIL
-            + f"[+] Using Period:{colorText.END}{colorText.GREEN}{PKScanRunner.configManager.period}{colorText.END}{colorText.FAIL} and Duration:{colorText.END}{colorText.GREEN}{PKScanRunner.configManager.duration}{colorText.END}{colorText.FAIL} for scan! You can change this in user config."
+            + f"\n  [+] Using Period:{colorText.END}{colorText.GREEN}{PKScanRunner.configManager.period}{colorText.END}{colorText.FAIL} and Duration:{colorText.END}{colorText.GREEN}{PKScanRunner.configManager.duration}{colorText.END}{colorText.FAIL} for scan! You can change this in user config."
             + colorText.END
         )
         start_time = time.time()

pkscreener-0.46.20250222.733/pkscreener/classes/__init__.py

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

{pkscreener-0.46.20250222.732 → pkscreener-0.46.20250222.733}/pkscreener/globals.py

@@ -625,6 +625,7 @@ def initPostLevel0Execution(
             str(indexOption).upper() in ["S", "E", "W"]:
             ensureMenusLoaded(menuOption,indexOption,executeOption)
             if not PKPremiumHandler.hasPremium(m1.find(str(indexOption).upper())):
+                PKAnalyticsService().send_event(f"non_premium_user_{menuOption}_{indexOption}_{executeOption}")
                 return None, None
         if indexOption == "" or indexOption is None:
             indexOption = int(configManager.defaultIndex)
@@ -679,10 +680,11 @@ def initPostLevel1Execution(indexOption, executeOption=None, skip=[], retrial=Fa
             )
             selectedMenu = m1.find(indexOption)
             m2.renderForMenu(selectedMenu=selectedMenu, skip=skip)
-            stockIndexCode = "18"
+            stockIndexCode = str(len(level1_index_options_sectoral.keys()))
             if indexOption == "S":
                 ensureMenusLoaded("X",indexOption,executeOption)
                 if not PKPremiumHandler.hasPremium(selectedMenu):
+                    PKAnalyticsService().send_event(f"non_premium_user_X_{indexOption}_{executeOption}")
                     PKAnalyticsService().send_event("app_exit")
                     sys.exit(0)
                 indexKeys = level1_index_options_sectoral.keys()
@@ -711,6 +713,7 @@ def initPostLevel1Execution(indexOption, executeOption=None, skip=[], retrial=Fa
                 OutputControls().printOutput(colorText.END, end="")
             ensureMenusLoaded("X",indexOption,executeOption)
             if not PKPremiumHandler.hasPremium(m2.find(str(executeOption))):
+                PKAnalyticsService().send_event(f"non_premium_user_X_{indexOption}_{executeOption}")
                 return None, None
             if executeOption == "":
                 executeOption = 1
@@ -922,7 +925,6 @@ def main(userArgs=None,optionalFinalOutcome_df=None):
         mkt_monitor_dict = mp_manager.dict()
         # Let's start monitoring the market monitor
         startMarketMonitor(mkt_monitor_dict,keyboardInterruptEvent)
-        PKAnalyticsService().send_event("market_monitor_started")
         
     keyboardInterruptEventFired = False
     if stockDictPrimary is None:
@@ -953,7 +955,7 @@ def main(userArgs=None,optionalFinalOutcome_df=None):
     if menuOption in ["F", "M", "S", "B", "G", "C", "P", "D"] or selectedMenu.isPremium:
         ensureMenusLoaded(menuOption,indexOption,executeOption)
         if not PKPremiumHandler.hasPremium(selectedMenu):
-            PKAnalyticsService().send_event(f"non_premium_user_{menuOption}")
+            PKAnalyticsService().send_event(f"non_premium_user_{menuOption}_{indexOption}_{executeOption}")
             PKAnalyticsService().send_event("app_exit")
             sys.exit(0)
     if menuOption in ["M", "D", "I", "L", "F"]:
@@ -1789,6 +1791,7 @@ def main(userArgs=None,optionalFinalOutcome_df=None):
     if str(indexOption).isnumeric() and int(indexOption) > 1 and executeOption <= MAX_SUPPORTED_MENU_OPTION:
         ensureMenusLoaded(menuOption,indexOption,executeOption)
         if not PKPremiumHandler.hasPremium(m2.find(str(executeOption).upper())):
+            PKAnalyticsService().send_event(f"non_premium_user_{menuOption}_{indexOption}_{executeOption}")
             PKAnalyticsService().send_event("app_exit")
             sys.exit(0)
     if (
@@ -1801,6 +1804,7 @@ def main(userArgs=None,optionalFinalOutcome_df=None):
         try:
             if str(indexOption).upper() in ["W", "E", "S"]:
                 if not PKPremiumHandler.hasPremium(m1.find(str(indexOption).upper())):
+                    PKAnalyticsService().send_event(f"non_premium_user_{menuOption}_{indexOption}_{executeOption}")
                     PKAnalyticsService().send_event("app_exit")
                     sys.exit(0)
             if indexOption == "W":
@@ -2201,6 +2205,7 @@ def main(userArgs=None,optionalFinalOutcome_df=None):
             OutputControls().printOutput(colorText.END, end="")
             ensureMenusLoaded(menuOption,indexOption,executeOption)
             if not PKPremiumHandler.hasPremium(m0.find(str(pinOption).upper())):
+                PKAnalyticsService().send_event(f"non_premium_user_pin_{menuOption}_{indexOption}_{executeOption}_{pinOption}")
                 PKAnalyticsService().send_event("app_exit")
                 sys.exit(0)
             if pinOption in ["1","2"]:
@@ -2868,7 +2873,8 @@ def updateMenuChoiceHierarchy():
     if ((":0:" in runOptionName or "_0_" in runOptionName) and userPassedArgs.progressstatus is not None) or userPassedArgs.progressstatus is not None:
         runOptionName = userPassedArgs.progressstatus.split("=>")[0].split("  [+] ")[1].strip()
     reportTitle = f"{runOptionName} | {reportTitle}" if runOptionName is not None else reportTitle
-    PKAnalyticsService().send_event(runOptionName)
+    if len(runOptionName) >= 5:
+        PKAnalyticsService().send_event(runOptionName)
     OutputControls().printOutput(
         colorText.FAIL
         + f"  [+] You chose: {reportTitle} "

{pkscreener-0.46.20250222.732 → pkscreener-0.46.20250222.733}/pkscreener/pkscreenercli.py

@@ -311,7 +311,8 @@ argParser.add_argument(
     help="runs and tests all options",
     required=False,
 )
-
+from PKDevTools.classes.FunctionTimeouts import ping
+from pkscreener.classes.PKAnalytics import PKAnalyticsService
 def csv_split(s):
     return list(csv.reader([s], delimiter=' '))[0]
 
@@ -918,6 +919,7 @@ def updateConfig(args):
             configManager.duration = "1d"
             configManager.setConfig(ConfigManager.parser,default=True, showFileCreatedText=False)
 
+@ping(interval=60,instance=PKAnalyticsService())
 def pkscreenercli():
     global originalStdOut, args
     if sys.platform.startswith("darwin"):

{pkscreener-0.46.20250222.732 → pkscreener-0.46.20250222.733}/pkscreener/requirements.txt

@@ -19,7 +19,7 @@ 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.238
+PKDevTools>=0.13.20250126.240
 PKNSETools>=0.1.20250122.138
 Pyarrow #>=17.0.0
 pyppeteer #>=2.0.0

{pkscreener-0.46.20250222.732 → pkscreener-0.46.20250222.733}/pkscreener.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.2
 Name: pkscreener
-Version: 0.46.20250222.732
+Version: 0.46.20250222.733
 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.20250222.732.zip
+Download-URL: https://github.com/pkjmesra/pkscreener/archive/v0.46.20250222.733.zip
 Author: pkjmesra
 Author-email: pkjmesra@gmail.com
 License: OSI Approved (MIT)
@@ -33,7 +33,7 @@ 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.238
+Requires-Dist: PKDevTools>=0.13.20250126.240
 Requires-Dist: PKNSETools>=0.1.20250122.138
 Requires-Dist: Pyarrow
 Requires-Dist: pyppeteer
@@ -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.20250221.731/pkscreenercli.exe
+[Windows]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250222.732/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.20250221.731/pkscreenercli_x64.bin
+[Linux_x64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250222.732/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.20250221.731/pkscreenercli_arm64.bin
+[Linux_arm64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250222.732/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.20250221.731/pkscreenercli_x64.run
+[Mac OS_x64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250222.732/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.20250221.731/pkscreenercli_arm64.run
+[Mac OS_arm64]: https://github.com/pkjmesra/PKScreener/releases/download/0.46.20250222.732/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.20250222.732 → pkscreener-0.46.20250222.733}/pkscreener.egg-info/requires.txt

@@ -15,7 +15,7 @@ pandas
 pandas_ta
 pefile<2024.8.26,>=2023.2.7
 Pillow
-PKDevTools>=0.13.20250126.238
+PKDevTools>=0.13.20250126.240
 PKNSETools>=0.1.20250122.138
 Pyarrow
 pyppeteer

pkscreener-0.46.20250222.732/pkscreener/classes/__init__.py

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