tweak logs, fix lru_cache bug

code/kmd_ntx_api/table.py

@@ -942,7 +942,6 @@ def get_notary_epoch_scores_table(request, notary=None):
                                     epoch_id = epoch.split("_")[1]
                                 else:
                                     epoch_id = epoch
-                                logger.calc(f"{server} {epoch} {coin}")
                                 row = {
                                     "notary": notary,
                                     "season": season.replace("_", " "),

code/scripts/alerts.py

@@ -20,7 +20,7 @@
 TELEGRAM_CHAT_ID = os.getenv('TELEGRAM_CHAT_ID')
 
 def send_telegram(msg):
-    t = datetime.now(timezone.utc).timestamp().strftime('%Y-%m-%d %H:%M:%S')
+    t = datetime.now(timezone.utc).strftime('%Y-%m-%d %H:%M:%S')
     payload = {
         'chat_id': TELEGRAM_CHAT_ID,
         'text': f"{t}: {msg}"

code/scripts/const_seasons.py

@@ -319,7 +319,6 @@ def epochs(self):
                             }
                         )
                         epoch_coins = self.coins_between(season, server, time_breaks[i], time_breaks[i + 1] - 1)
-                        logger.calc(f"{season} {server} {epoch}")
                         season_epochs_dict[server][epoch].update(
                             {
                                 "coins": epoch_coins,

code/scripts/decorators.py

@@ -18,6 +18,6 @@ def wrapper_print_runtime(*args, **kwargs):
         start = time.perf_counter()
         x = func(*args, **kwargs)
         end = time.perf_counter()
-        logger.info(f">>> {end-start:.3f} sec to complete {func.__name__!r}")
+        logger.calc(f">>> {end-start:.3f} sec to complete {func.__name__!r}")
         return x
     return wrapper_print_runtime

code/scripts/lib_helper.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3.12
+from functools import lru_cache
 from lib_const import *
 from const_seasons import SEASONS
 from lib_urls import *
@@ -13,11 +14,13 @@ def safe_div(x,y):
     return float(x/y)
 
 
+@lru_cache(maxsize=None)
 def handle_translate_coins(coin):
     if coin in TRANSLATE_COINS:
         return TRANSLATE_COINS[coin]
     return coin
 
+@lru_cache(maxsize=None)
 def handle_translate_coins_reverse(coin):
     if coin in REVERSE_TRANSLATE_COINS:
         return REVERSE_TRANSLATE_COINS[coin]
@@ -30,6 +33,7 @@ def get_dpow_coin_src(src):
         return src
 
 
+@lru_cache(maxsize=None)
 def get_nn_region_split(notary):
     x = notary.split("_")
     region = x[-1]
@@ -44,6 +48,7 @@ def get_results_or_none(cursor):
         return ()
 
 
+@lru_cache(maxsize=None)
 def translate_dpow_server(server):
     if server.lower() == "dpow-3p":
         return "Third_Party"
@@ -86,6 +91,7 @@ def get_notary_address_lists(vin):
     return notary_list, address_list
 
 
+@lru_cache(maxsize=None)
 def is_notary_ltc_address(addr):
     if addr in ALL_SEASON_NOTARY_LTC_ADDRESSES:
         return True
@@ -128,13 +134,15 @@ def is_postseason(timestamp=None, block=None):
     return False
 
 
+@lru_cache(maxsize=None)
 def get_pubkeys(season, server):
     if season in NOTARY_PUBKEYS:
         if server in NOTARY_PUBKEYS[season]:
             return NOTARY_PUBKEYS[season][server]
     return []
 
 
+@lru_cache(maxsize=None)
 def get_address_from_notary(season, notary, coin):
     if season in SEASONS.INFO:
         for server in SEASONS.INFO[season]["servers"]:
@@ -157,14 +165,15 @@ def has_season_started(season, by_block=False):
     return False
 
 
+@lru_cache(maxsize=None)
 def get_season_notaries(season):
     if season in SEASONS.INFO:
         notaries = SEASONS.INFO[season]["notaries"]
         notaries.sort()
         return notaries
     return []
 
-
+@lru_cache(maxsize=None)
 def get_season_coins(season=None, server=None, epoch=None):
     coins = []
     if not season:
@@ -184,6 +193,7 @@ def get_season_coins(season=None, server=None, epoch=None):
     return coins
 
 
+@lru_cache(maxsize=None)
 def get_season_servers(season):
     if season in SEASONS.INFO:
         servers = list(SEASONS.INFO[season]["servers"].keys())
@@ -192,6 +202,7 @@ def get_season_servers(season):
     return []
 
 
+@lru_cache(maxsize=None)
 def get_season_server_epochs(season, server):
     if season in SEASONS.INFO:
         if server in SEASONS.INFO[season]["servers"]:

code/scripts/lib_rpc.py

@@ -48,7 +48,7 @@ def def_credentials(coin):
         logger.info("Unable to set RPC proxy, please confirm rpcuser, rpcpassword and rpcport are set in "+coin_config_file)
 
 def get_ntx_txids(start, end):
-    logger.calc(f"Getting nxt txids from blocks {start}-{end}")
+    logger.info(f"Getting nxt txids from blocks {start}-{end}")
     return RPC["KMD"].getaddresstxids({"addresses": [lib_const.NTX_ADDR], "start":start, "end":end})
 
 

code/scripts/lib_validate.py

@@ -132,7 +132,6 @@ def get_coin_epoch_score_at(season, server, coin, timestamp, testnet=False):
 
 
 def calc_epoch_score(server, num_coins):
-    logger.info(f"[calc_epoch_score] {server} {num_coins}")
     if num_coins == 0:
         return 0
     if server == "Main":

code/scripts/logger.py

@@ -101,13 +101,16 @@ def addLoggingLevel(levelName, levelNum, methodName=None):
     methodName = methodName or levelName.lower()
     if hasattr(logging, levelName) or hasattr(logging.getLoggerClass(), methodName):
         raise AttributeError(f"{levelName} or {methodName} already defined")
-
+    if levelName.lower() in ["info", "debug", "warning", "error"]:
+        stacklevel = 1
+    else:
+        stacklevel = 2
     def logForLevel(self, message, *args, **kwargs):
         if self.isEnabledFor(levelNum):
-            self._log(levelNum, message, args, **kwargs)
+            self._log(levelNum, message, args, **kwargs, stacklevel=stacklevel)
 
     def logToRoot(message, *args, **kwargs):
-        logging.log(levelNum, message, *args, **kwargs)
+        logging.log(levelNum, message, *args, **kwargs, stacklevel=stacklevel)
 
     logging.addLevelName(levelNum, levelName)
     setattr(logging.getLoggerClass(), methodName, logForLevel)

code/scripts/models.py

@@ -596,9 +596,7 @@ def update(self):
                     self.coin_ntx_pct, self.timestamp, self.season,
                     self.notarised_date)
         if self.validated():
-            logger.info(f"Updating [notarised_count_daily] {self.notarised_date} {self.notary}")
-            if self.notary == "dragonhound_DEV":
-                logger.info(f"Updating [notarised_count_daily] {row_data}")
+            logger.debug(f"Updating [notarised_count_daily] {self.notarised_date} {self.notary}")
             update_daily_notarised_count_row(row_data)
         else:
             logger.warning(f"[notarised_count_daily_row] Row data invalid!")

code/scripts/test_season_ntx_dict.py

@@ -0,0 +1,12 @@
+import json
+
+with open("season_ntx_dict_notaries.json", "r") as f:
+    notaries_data = json.load(f)
+
+with open("season_ntx_dict_servers.json", "r") as f:
+    servers_data = json.load(f)
+
+with open("season_ntx_dict_coins.json", "r") as f:
+    coins_data = json.load(f)
+
+