ratio1 3.4.76__tar.gz → 3.4.78__tar.gz

{ratio1-3.4.76 → ratio1-3.4.78}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ratio1
-Version: 3.4.76
+Version: 3.4.78
 Summary: `ratio1` or Ration1 SDK is the Python SDK required for client app development for the Ratio1 ecosystem
 Project-URL: Homepage, https://github.com/Ratio1/ratio1_sdk
 Project-URL: Bug Tracker, https://github.com/Ratio1/ratio1_sdk/issues

{ratio1-3.4.76 → ratio1-3.4.78}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ratio1"
-version = "3.4.76"
+version = "3.4.78"
 authors = [
   { name="Andrei Ionut Damian", email="andrei.damian@ratio1.ai" },
   { name="Cristan Bleotiu", email="cristian.bleotiu@ratio1.ai" },

{ratio1-3.4.76 → ratio1-3.4.78}/ratio1/_ver.py

@@ -1,4 +1,4 @@
-__VER__ = "3.4.76"
+__VER__ = "3.4.78"
 
 if __name__ == "__main__":
   with open("pyproject.toml", "rt") as fd:

{ratio1-3.4.76 → ratio1-3.4.78}/ratio1/cli/cli_commands.py

@@ -75,6 +75,7 @@ CLI_COMMANDS = {
                 "--owner" : "Get the apps for a particular owner/initiator",
                 "--full": "Include admin apps (flag)",
                 "--json": "Output the entire JSON config of applications (flag)",
+                "--wide": "Display all available information (flag)",
             }
         },
         "networks": {

{ratio1-3.4.76 → ratio1-3.4.78}/ratio1/cli/nodes.py

@@ -151,6 +151,7 @@ def get_apps(args):
   show_full = args.full
   as_json = args.json
   owner = args.owner
+  wide = args.wide
 
   # 1. Init session
   from ratio1 import Session
@@ -203,6 +204,9 @@ def get_apps(args):
         ), 
         color='b'
       )
+      
+      if not wide:        
+        df_apps = df_apps[['Node Alias', 'Owner Alias', 'App', 'Plugin', 'Id', 'Probe', 'LastError']]
       log_with_color(f"{df_apps}\n")
     #end if as_json
   #end if res is not None

{ratio1-3.4.76 → ratio1-3.4.78}/ratio1/code_cheker/base.py

@@ -229,7 +229,7 @@ class BaseCodeChecker:
     for line in lines:
       rstripped = line.rstrip()
       stripped = line.lstrip()
-      is_loop = stripped.startswith(('while', 'for'))
+      is_loop = stripped.startswith(('while ', 'for '))
       has_loop = has_loop or is_loop
       if is_loop and rstripped[-1] != ':':
         parts = line.split(':')

{ratio1-3.4.76 → ratio1-3.4.78}/tutorials/ex21_telegram_community_bot.py

@@ -35,6 +35,8 @@ def loop_processing(plugin: CustomPluginTemplate):
   diskapi_epoch_review_file_name = "ratio1_epoch_review_data.pkl"
   diskapi_watched_wallets_file_name = "ratio1_watched_wallets_data.pkl"
 
+  need_last_epoch_info = "need_last_epoch_info"
+
   def get_erc721_total_supply(contract_address: str) -> int:
     return int(plugin.requests.post("https://base-mainnet.public.blastapi.io", json={
       "jsonrpc": "2.0",
@@ -93,6 +95,7 @@ def loop_processing(plugin: CustomPluginTemplate):
     plugin.obj_cache[alert_cache_key] = {}
     plugin.obj_cache[watched_wallets_loops_delay_cache_key] = 30
     plugin.obj_cache[cache_already_read_key] = True # We use this flag to read the cache only once at the first run
+    
 
   # Check users' watched wallets and notify if any node is offline
   if plugin.obj_cache.get(watched_wallets_loops_delay_cache_key) == 30:
@@ -123,9 +126,12 @@ def loop_processing(plugin: CustomPluginTemplate):
   else:
     plugin.obj_cache[watched_wallets_loops_delay_cache_key] += 1
 
+
+  need_info = plugin.obj_cache.get(need_last_epoch_info, False)
+
   # Check if the epoch review has already been processed for the last epoch
   if plugin.obj_cache.get(epoch_review_cache_key) is not None:
-    if plugin.obj_cache.get(epoch_review_cache_key).get(last_epoch) is not None:
+    if plugin.obj_cache.get(epoch_review_cache_key).get(last_epoch) is not None and not need_info:
       return
     else:
       plugin.P("Epoch review not processed for last epoch, continuing with processing.")
@@ -133,6 +139,8 @@ def loop_processing(plugin: CustomPluginTemplate):
     plugin.P("No epoch review data found, initializing cache.")
     plugin.obj_cache[epoch_review_cache_key] = {}
     plugin.obj_cache[watched_wallets_cache_key] = {}
+    
+  plugin.obj_cache[need_last_epoch_info] = False # set false no matter wwhat as we display the info
 
   # Get all the required data for the epoch review
   last_epoch_nd_mining, nodes_count, nd_count, mnd_count, gnd_count = get_nodes_details()
@@ -143,17 +151,20 @@ def loop_processing(plugin: CustomPluginTemplate):
   current_burn = float(tokenDetails["burned"])
   nd_current_burn = float(tokenDetails["ndContractBurn"])
   current_poai_burn = current_burn - nd_current_burn
-  circulating_supply = tokenDetails["circulatingSupply"]
-  total_supply = tokenDetails["totalSupply"]
+  circulating_supply = float(tokenDetails["circulatingSupply"])
+  total_supply = float(tokenDetails["totalSupply"])
   burned_last_epoch = get_burned_last_epoch(current_burn)
   burned_poai_last_epoch = get_poai_burned_last_epoch(current_poai_burn)
+  price_url = 'https://api.coingecko.com/api/v3/simple/price?ids=ratio1&vs_currencies=usd'
+  r1_usdc = plugin.requests.get(price_url).json().get("ratio1", {}).get("usd", 0)
+  poai_usdc_last_epoch = burned_poai_last_epoch / 0.15 * r1_usdc
   burned_nd_last_epoch = burned_last_epoch - burned_poai_last_epoch
   plugin.P(f"Burned last epoch: {burned_last_epoch}, ND burned last epoch: {burned_nd_last_epoch}, PoAI burned last epoch: {burned_poai_last_epoch}, Current burn: {current_burn}, Circulating supply: {circulating_supply}, Total supply: {total_supply}")
 
   nd_supply = get_erc721_total_supply("0xE658DF6dA3FB5d4FBa562F1D5934bd0F9c6bd423")
   mnd_supply = get_erc721_total_supply("0x0C431e546371C87354714Fcc1a13365391A549E2")
   total_licenses = nd_supply + mnd_supply
-  plugin.P(f"Total ND supply: {nd_supply}, Total MND supply: {mnd_supply}, Total Licenses: {total_licenses}")
+  plugin.P(f"Total ND supply: {nd_supply}, Total MND supply: {mnd_supply}, Total Licenses: {total_licenses}")  
 
   # Prepare the message to send to the group chat
   message = f"📆 Epoch {last_epoch} Summary\n\n"
@@ -165,6 +176,7 @@ def loop_processing(plugin: CustomPluginTemplate):
   if burned_nd_last_epoch > 0:
     message += f"🔥 Last Epoch License Sales Burn: {(burned_nd_last_epoch):,.2f} R1\n"
   if burned_poai_last_epoch > 0:
+    message += f"🎁 Last Epoch PoAI Rewards: {(poai_usdc_last_epoch):,.2f} USDC\n"
     message += f"🔥 Last Epoch PoAI Burn: {(burned_poai_last_epoch):,.2f} R1\n"
   message += f"🔥 Total Burn: {(current_burn):,.2f} R1\n"
   plugin.send_message_to_user(user_id=plugin.cfg_chat_id, text=message)
@@ -186,7 +198,7 @@ def reply(plugin: CustomPluginTemplate, message: str, user: str, chat_id: str):
   """
   watched_wallets_cache_key = f"ratio1_watched_wallets"
   diskapi_watched_wallets_file_name = "ratio1_watched_wallets_data.pkl"
-
+  
   def handle_watch():
     user_watched_wallets = plugin.obj_cache.get(watched_wallets_cache_key).get(chat_id, [])
     message_parts = message.split(" ")
@@ -270,6 +282,15 @@ def reply(plugin: CustomPluginTemplate, message: str, user: str, chat_id: str):
   
   def handle_start():
     return "Welcome to the Ratio1 Bot! Use /watch <wallet_address> to start watching your nodes. You will receive notifications when your nodes are offline."
+  
+  def hands_last_epoch_info():
+    need_last_epoch_info = "need_last_epoch_info"
+    if user in plugin.cfg_admins:
+      plugin.obj_cache[need_last_epoch_info] = True
+      msg = f"Hi Master {user}! Forcing last epoch info display."
+    else:
+      msg = f"Sorry {user}, you are not authorized to force last epoch info display."
+    return msg
 
   # We do not want to reply to messages in the Ratio1 Community Group
   if str(chat_id) == str(plugin.cfg_chat_id):
@@ -290,6 +311,8 @@ def reply(plugin: CustomPluginTemplate, message: str, user: str, chat_id: str):
     return handle_network_status()
   if message.startswith("/start"):    
     return handle_start()
+  if message.startswith("/last_epoch_info"):    
+    return hands_last_epoch_info()
 
   return "Please use the /watch command followed by your Ethereum Wallet address to start watching the nodes on your wallet."
 
@@ -311,7 +334,7 @@ if __name__ == "__main__":
     session.P(f"Connecting to node: {node}")
     session.wait_for_node(node)
     
-    COMMAND = "STOP" # "START" or "STOP"
+    COMMAND = "START" # "START" or "STOP"
     
     if COMMAND == "START":
       pipeline, _ = session.create_telegram_simple_bot(
@@ -321,6 +344,7 @@ if __name__ == "__main__":
         chat_id=chat_id,
         message_handler=reply,
         processing_handler=loop_processing,
+        admins=['401110073', '683223680'],
       )
       pipeline.deploy()
     elif COMMAND == "STOP":