ratio1 3.4.65__tar.gz → 3.4.66__tar.gz

{ratio1-3.4.65 → ratio1-3.4.66}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ratio1
-Version: 3.4.65
+Version: 3.4.66
 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.65 → ratio1-3.4.66}/pyproject.toml

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

{ratio1-3.4.65 → ratio1-3.4.66}/ratio1/_ver.py

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

{ratio1-3.4.65 → ratio1-3.4.66}/ratio1/comm/mqtt_wrapper.py

@@ -131,7 +131,7 @@ class MQTTWrapper(BaseCommWrapper):
         cert_file = impresources.files(certs).joinpath(cert_file_name)
 
         if cert_file.exists():
-          self.P("Using certificate file: {}".format(cert_file_name))
+          self.P("Using certificate file: {}".format(cert_file))
           mqttc.tls_set(cert_file)
         else:
           self.P("No certificate provided, using default TLS")
@@ -139,7 +139,7 @@ class MQTTWrapper(BaseCommWrapper):
       # end if certificate not provided
       else:
         if os.path.exists(cert_path):
-          self.P("Using certificate file: {}".format(cert_path))
+          self.P("Using certificate file path: {}".format(cert_path))
           mqttc.tls_set(cert_path)
         else:
           self.P("Certificate file not found: {}".format(cert_path), color='r', verbosity=1)

{ratio1-3.4.65 → ratio1-3.4.66}/tutorials/ex21_telegram_community_bot.py

@@ -229,6 +229,13 @@ def reply(plugin: CustomPluginTemplate, message: str, user: str, chat_id: str):
       message += f"- {wallet}\n"
     return message
   
+  def handle_network_status():
+    nodes = plugin.netmon.available_nodes_prefixed
+    if not nodes:
+      return "No nodes are currently online."
+    message = f"Total {len(nodes)} online  Ratio1 nodes reported by `{plugin.ee_id}`"
+    return message
+  
   def handle_nodes():
     user_watched_wallets = plugin.obj_cache.get(watched_wallets_cache_key).get(chat_id, [])
     if not user_watched_wallets:
@@ -265,25 +272,43 @@ def reply(plugin: CustomPluginTemplate, message: str, user: str, chat_id: str):
     return handle_unwatch()
   if message.startswith("/nodes"):
     return handle_nodes()
-  if message.startswith("/start"):
+  if message.startswith("/network_status"):
+    return handle_network_status()
+  if message.startswith("/start"):    
     return handle_start()
 
   return "Please use the /watch command followed by your Ethereum Wallet address to start watching the nodes on your wallet."
 
 if __name__ == "__main__":   
+  PIPELINE_NAME = "ratio1_telegram_bot"
+
   session = Session() 
-  
+
   node = os.getenv("RATIO1_NODE")
-  print(f"Connecting to node: {node}")
+  chat_id = os.getenv("TELEGRAM_CHAT_ID")
+  telegram_bot_token = os.getenv("TELEGRAM_BOT_TOKEN")
+  if chat_id is None or telegram_bot_token is None:
+    raise ValueError("Please set the TELEGRAM_CHAT_ID and TELEGRAM_BOT_TOKEN environment variables.")
+  else:
+    session.P("Using environment variables for chat_id and telegram_bot_token.")
+
+  session.P(f"Connecting to node: {node}")
   session.wait_for_node(node)
   
-  pipeline, _ = session.create_telegram_simple_bot(
-    node=node,
-    name="ratio1_telegram_bot",
-    telegram_bot_token=os.getenv("TELEGRAM_BOT_TOKEN"),
-    chat_id=os.getenv("TELEGRAM_CHAT_ID"),
-    message_handler=reply,
-    processing_handler=loop_processing,
-  )
-
-  pipeline.deploy()
+  COMMAND = "STOP" # "START" or "STOP"
+  
+  if COMMAND == "START":
+    pipeline, _ = session.create_telegram_simple_bot(
+      node=node,
+      name=PIPELINE_NAME,
+      telegram_bot_token=telegram_bot_token,
+      chat_id=chat_id,
+      message_handler=reply,
+      processing_handler=loop_processing,
+    )
+    pipeline.deploy()
+  elif COMMAND == "STOP":
+    session.P("Stopping the bot from target node...")
+    session.close_pipeline(node_addr=node, pipeline_name=PIPELINE_NAME)
+  
+  session.wait(seconds=10, close_session_on_timeout=True)