naeural-client 2.1.1__tar.gz → 2.1.2__tar.gz

{naeural_client-2.1.1 → naeural_client-2.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: naeural_client
-Version: 2.1.1
+Version: 2.1.2
 Summary: `naeural_client` is the Python SDK required for client app development for the Naeural Edge Protocol Edge Protocol framework
 Project-URL: Homepage, https://github.com/Naeural Edge ProtocolEdgeProtocol/naeural_client
 Project-URL: Bug Tracker, https://github.com/Naeural Edge ProtocolEdgeProtocol/naeural_client/issues

{naeural_client-2.1.1 → naeural_client-2.1.2}/naeural_client/_ver.py

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

{naeural_client-2.1.1 → naeural_client-2.1.2}/naeural_client/base/generic_session.py

@@ -1717,10 +1717,12 @@ class GenericSession(BaseDecentrAIObject):
       *,
       node,
       name,
-      signature=PLUGIN_SIGNATURES.CUSTOM_WEB_APP_01,
+      signature=PLUGIN_SIGNATURES.BASIC_TELEGRAM_BOT_01,
       message_handler=None,
       telegram_bot_token=None,
       telegram_bot_token_env_key=ENVIRONMENT.TELEGRAM_BOT_TOKEN_ENV_KEY,
+      telegram_bot_name=None,
+      telegram_bot_name_env_key=ENVIRONMENT.TELEGRAM_BOT_NAME_ENV_KEY,
       **kwargs
     ):
       
@@ -1731,6 +1733,12 @@ class GenericSession(BaseDecentrAIObject):
         if telegram_bot_token is None:
           message = f"Warning! No Telegram bot token provided as via env {ENVIRONMENT.TELEGRAM_BOT_TOKEN_ENV_KEY} or explicitly as `telegram_bot_token` param."
           raise ValueError(message)
+        
+      if telegram_bot_name is None:
+        telegram_bot_name = os.getenv(telegram_bot_name_env_key)
+        if telegram_bot_name is None:
+          message = f"Warning! No Telegram bot name provided as via env {ENVIRONMENT.TELEGRAM_BOT_NAME_ENV_KEY} or explicitly as `telegram_bot_name` param."
+          raise ValueError(message)
       
 
       pipeline: Pipeline = self.create_pipeline(
@@ -1741,12 +1749,15 @@ class GenericSession(BaseDecentrAIObject):
       
       func_name, func_args, func_base64_code = pipeline._get_method_data(message_handler)
       if len(func_args) != 2:
-        raise ValueError("The message handler function must have exactly 2 arguments: `instance` and `data`.")
+        raise ValueError("The message handler function must have exactly 3 arguments: `plugin`, `message` and `user`.")
       
+      obfuscated_token = telegram_bot_token[:4] + "*" * (len(telegram_bot_token) - 4)      
+      self.P(f"Creating telegram bot {telegram_bot_name} with token {obfuscated_token}...", color='b')      
       instance = pipeline.create_plugin_instance(
         signature=signature,
         instance_id=self.log.get_unique_id(),
         telegram_bot_token=telegram_bot_token,
+        telegram_bot_name=telegram_bot_name,
         message_handler=func_base64_code,
         message_handler_args=func_args, # mandatory message and user
         message_handler_name=func_name, # not mandatory

{naeural_client-2.1.1 → naeural_client-2.1.2}/naeural_client/code_cheker/base.py

@@ -550,8 +550,14 @@ class BaseCodeChecker:
 
     name = method.__name__
     args = list(map(str, inspect.signature(method).parameters.values()))
-    if args[0] in ['self', 'cls', 'plugin']:
+    ## 
+    first_arg = args[0]
+    first_arg = first_arg.split(':')[0]
+    first_arg = first_arg.split('=')[0]
+    first_arg = first_arg.strip()
+    if first_arg in ['self', 'cls', 'plugin']:
       args = args[1:]
+    ##      
     source = self.get_function_source_code(method)
     base64_code = self.code_to_base64(source)
 
@@ -560,7 +566,7 @@ class BaseCodeChecker:
 
 if __name__ == '__main__':
   
-  def some_function(plugin, x):
+  def some_function(plugin : int, x):
     """
     A simple function that adds 1 to the input.
 

{naeural_client-2.1.1 → naeural_client-2.1.2}/naeural_client/const/environment.py

@@ -30,3 +30,4 @@ class ENVIRONMENT:
   AIXP_SECURED = 'AIXP_SECURED'
   
   TELEGRAM_BOT_TOKEN_ENV_KEY = 'TELEGRAM_BOT_TOKEN'
+  TELEGRAM_BOT_NAME_ENV_KEY = 'TELEGRAM_BOT_NAME'

{naeural_client-2.1.1 → naeural_client-2.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "naeural_client"
-version = "2.1.1"
+version = "2.1.2"
 authors = [
   { name="Stefan Saraev", email="saraevstefan@gmail.com" },
   { name="Andrei Ionut Damian", email="andrei.damian@me.com" },

{naeural_client-2.1.1 → naeural_client-2.1.2}/tutorials/ex10_telegram_echo_bot.py

@@ -1,13 +1,11 @@
 import os
+import time
 
 from naeural_client import Session, CustomPluginTemplate, PLUGIN_TYPES
 
-
 def reply(plugin: CustomPluginTemplate, message: str, user: str):
   """
-  This function is used to reply to a message.
-  
-  The given parameters are mandatory
+  This function is used to reply to a message. The given parameters are mandatory
   """
   # for each user message we increase a counter
   plugin.int_cache[user] += 1 # int_cache is a default dict that allows persistence in the plugin
@@ -18,12 +16,14 @@ def reply(plugin: CustomPluginTemplate, message: str, user: str):
 
 if __name__ == "__main__":
   # TELEGRAM_BOT_TOKEN_ENV_KEY = "TELEGRAM_BOT_TOKEN"  # this is the default - we can specify a env key here
-  MY_NODE = None # we can specify a node here, if we want to connect to a specific
+  my_node = os.getenv("TARGET_NODE") # we can specify a node here, if we want to connect to a specific
     
   session = Session() # assume .env is available and will be used for the connection and tokens
+  time.sleep(10) # wait 10 sec to collect network status
   
-  if MY_NODE:
-    node = MY_NODE
+  if my_node:
+    node = my_node
+    session.P(f"Using the specified node: {node}", color='b')
   else:
     session.wait_for_any_node() # we wait for any node to present itself as active
     node = session.get_active_nodes()[0] # we get the first active node
@@ -31,13 +31,13 @@ if __name__ == "__main__":
       
   # now we create a telegram bot pipeline & plugin instance
   # we can chose to use the token directly or use the environment key
-  # instance: PLUGIN_TYPES.BASIC_TELEGRAM_BOT_01
+  # instance: PLUGIN_TYPES.BASIC_TELEGRAM_BOT_01  
   pipeline, _ = session.create_telegram_simple_bot(
     node=node,
     name="telegram_bot_echo",
     # telegram_bot_token=os.getenv("TELEGRAM_BOT_TOKEN"),  # we use the token directly
     # telegram_bot_token_env_key=TELEGRAM_BOT_TOKEN_ENV_KEY, # not mandatory - we can use the default
-    reply_function=reply,
+    message_handler=reply,
   )
   
   pipeline.deploy() # we deploy the pipeline
@@ -46,7 +46,7 @@ if __name__ == "__main__":
   #   next code is not mandatory - it is used to keep the session open and cleanup the resources
   #   in production, you would not need this code as the script can close after the pipeline will be sent  
   session.run(
-    wait=60,  # we run the session for 60 seconds
+    wait=120,  # we run the session for 60 seconds
     close_pipelines=True,  # we close the pipelines after the session
     close_session=True,  # we close the session after the session
   )