naeural-client 2.6.36__tar.gz → 2.6.38__tar.gz

{naeural_client-2.6.36 → naeural_client-2.6.38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: naeural_client
-Version: 2.6.36
+Version: 2.6.38
 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/NaeuralEdgeProtocol/naeural_client
 Project-URL: Bug Tracker, https://github.com/NaeuralEdgeProtocol/naeural_client/issues

{naeural_client-2.6.36 → naeural_client-2.6.38}/naeural_client/_ver.py

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

{naeural_client-2.6.36 → naeural_client-2.6.38}/naeural_client/bc/base.py

@@ -947,8 +947,29 @@ class BaseBlockEngine:
       True if the current address is in the list.
 
     """
+    return self.address_in_list(self.address, lst_addresses)
+  
+  def address_in_list(self, node_address, lst_addresses):
+    """
+    Checks if the address is in the list of addresses
+
+    Parameters
+    ----------
+    node_address : str
+      the address.
+      
+    lst_addresses : list
+      the list of addresses.
+
+    Returns
+    -------
+    bool
+      True if the address is in the list.
+
+    """
+    node_address = self._remove_prefix(node_address)
     lst = [self._remove_prefix(x) for x in lst_addresses if x is not None]
-    return self.address_no_prefix in lst
+    return node_address in lst
   
   @property
   def address(self):
@@ -977,6 +998,14 @@ class BaseBlockEngine:
     Returns a tuple with the allowed list (prefixed) and a list with names
     """
     return self._load_and_maybe_create_allowed(return_names=True, return_prefix=True)
+  
+  
+  @property
+  def whitelist_with_prefixes(self):
+    """
+    Returns the allowed command senders (prefixed) for the current node
+    """
+    return self._load_and_maybe_create_allowed(return_names=False, return_prefix=True)
 
   
   def maybe_remove_prefix(self, address):

{naeural_client-2.6.36 → naeural_client-2.6.38}/naeural_client/logging/base_logger.py

@@ -460,20 +460,37 @@ class BaseLogger(object):
     import platform
     import subprocess
     import re
+    import multiprocessing
     str_system = platform.system()
     if str_system == "Windows":
       self.processor_platform = platform.processor()
+      
     elif str_system == "Darwin":
       os.environ['PATH'] = os.environ['PATH'] + os.pathsep + '/usr/sbin'
       command ="sysctl -n machdep.cpu.brand_string"
       self.processor_platform = subprocess.check_output(command, shell=True).strip().decode('utf-8')
+      
     elif str_system == "Linux":
       command = "cat /proc/cpuinfo"
       all_info = subprocess.check_output(command, shell=True).decode().strip()
+      proc_platform = None
       for line in all_info.split("\n"):
         if "model name" in line:
-          self.processor_platform = re.sub( ".*model name.*:", "", line,1)    
+          proc_platform = re.sub( ".*model name.*:", "", line,1)    
           break
+      if proc_platform is None:
+        cores = multiprocessing.cpu_count()
+        proc_platform = "Unknown"
+        try:
+          lscpu_out = subprocess.check_output("lscpu", shell=True).decode().strip()
+          match_vendor = re.search(r"Vendor ID:\s+(.*)", lscpu_out)
+          if match_vendor:
+            proc_platform = match_vendor.group(1)
+        except:
+          pass          
+        proc_platform = f"{proc_platform} {cores} cores"
+      #endif no model name
+      self.processor_platform = proc_platform
     return
   
   def get_processor_platform(self):

{naeural_client-2.6.36 → naeural_client-2.6.38}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "naeural_client"
-version = "2.6.36"
+version = "2.6.38"
 authors = [
   { name="Andrei Ionut Damian", email="andrei.damian@me.com" },
   { name="Cristan Bleotiu", email="cristibleotiu@gmail.com" },

naeural_client-2.6.38/xperimental/_checks/cstore_check.py

@@ -0,0 +1,71 @@
+import requests
+import json
+import pandas as pd
+
+if __name__ == "__main__":
+
+  CHECK_STATUS = False
+  CHECK_VALUE  = True
+
+  if CHECK_STATUS:
+    N = 4
+
+    # the provided url, note: if this does not return json directly, it might need adjustment
+    url_status = "https://cstore-ratio1.ngrok.app/get_status"
+    server_alias_counts = {}
+
+    for i in range(N):
+      try:
+        response = requests.get(url_status)
+        response.raise_for_status()
+        data = response.json()
+      except Exception as e:
+        print(f"error occurred during request {i+1}: {e}, response: {response.text}")
+        continue
+
+      # extract nodes data from the json response
+      result = data.get("result", {})
+      server_alias = result.get("server_alias")
+      ver = result.get("server_version")
+      if server_alias:
+        server_alias_counts[server_alias] = server_alias_counts.get(server_alias, 0) + 1
+      keys = result.get("keys", {})
+      # create and display the pand
+      print(f"Response #{i+1} from {server_alias} v{ver} with {len(keys)} keys")
+      # update the server_alias counts
+
+    print("\nserver_alias counts: {server_alias_counts}\n\n")
+    
+  if CHECK_VALUE:
+    N = 2    
+    KEY_TO_CHECK = "K3-nen-aid03-2fb8"
+
+    # the provided url, note: if this does not return json directly, it might need adjustment
+    url_value = "https://cstore-ratio1.ngrok.app/get_value"
+    server_alias_counts = {}
+
+    bearer_token = "admin"
+    headers = {"Authorization": f"Bearer {bearer_token}"}
+    
+    params = {"cstore_key": KEY_TO_CHECK}
+
+    for i in range(N):
+      try:
+        response = requests.get(url_value, headers=headers, params=params)        
+        response.raise_for_status()
+        data = response.json()
+      except Exception as e:
+        print(f"error occurred during request {i+1}: {e}, response: {response.text}")
+        continue
+
+      # extract nodes data from the json response
+      result = data.get("result", {})
+      server_alias = result.get("server_alias")
+      ver = result.get("server_version")
+      if server_alias:
+        server_alias_counts[server_alias] = server_alias_counts.get(server_alias, 0) + 1      
+      # create and display the pand
+      print(f"Response #{i+1} from {server_alias} v{ver}: {result}")
+      # update the server_alias counts
+
+    print("\nserver_alias counts:", server_alias_counts)

{naeural_client-2.6.36/xperimental/ora → naeural_client-2.6.38/xperimental/_checks}/ora_check.py

@@ -38,7 +38,8 @@ if __name__ == "__main__":
 
     # create and display the pandas dataframe for this request
     df = pd.DataFrame(node_list)
-    print(f"\nResponse #{i+1} from {server_alias}:")
+    ver = result.get("server_version")
+    print(f"\nResponse #{i+1} from {server_alias} v{ver}:")
     print(df)
 
     # update the server_alias counts

naeural_client-2.6.38/xperimental/test1.py

@@ -0,0 +1,49 @@
+from naeural_client import Session, CustomPluginTemplate, PLUGIN_TYPES
+
+def run_predict(plugin: CustomPluginTemplate, inputs: list[int], nr_steps: int) -> list:
+  """
+  Here we use the Ratio1 build in basic ML internal API
+  """
+  preds = plugin.basic_ts_fit_predict(inputs, nr_steps)
+  # now we apply some simple heuristic to get the lower and upper bounds
+  lower_bound = []
+  upper_bound = []
+  heuristic_factor = 0.1
+  for pred in preds:
+    lower_bound.append(int(pred - abs(pred * heuristic_factor)))
+    upper_bound.append(int(pred + abs(pred * heuristic_factor)))
+  #endfor
+  result = {
+    "predictions": [round(x,1) for x in preds],
+    "lower_bound": lower_bound,
+    "upper_bound": upper_bound
+  }
+  return result
+
+
+if __name__ == '__main__':
+  
+  session = Session(silent=True)
+  my_node = "0xai_ApM1AbzLq1VtsLIidmvzt1Nv4Cyl5Wed0fHNMoZv9u4X"
+  
+  app, _ = session.create_web_app(
+    node=my_node,
+    name="ratio1_simple_predict_webapp",
+    endpoints=[
+      {
+        "function": run_predict,
+        "method": "post",
+      },        
+    ]
+  )
+  try:
+    url = app.deploy()
+    print("Webapp deployed at: ", url)
+  except Exception as e:
+    print("Error deploying webapp: ", e)
+  
+  session.wait(
+    close_pipeline_on_timeout=True,
+    close_session_on_timeout=True,
+    seconds=300
+  )

naeural_client-2.6.36/tutorials/ex02_deploy_end_to_end.ipynb

@@ -1,25 +0,0 @@
-{
- "cells": [
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "# End to end deployment example"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "First thing first lets"
-   ]
-  }
- ],
- "metadata": {
-  "language_info": {
-   "name": "python"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 2
-}

naeural_client-2.6.36/xperimental/.example_env

@@ -1,11 +0,0 @@
-AIXP_USERNAME=username
-AIXP_USER=username
-
-AIXP_PASSWORD=password
-AIXP_PASS=password
-AIXP_PWD=password
-
-AIXP_HOSTNAME=hostname
-AIXP_HOST=hostname
-
-AIXP_PORT=8888

naeural_client-2.6.36/xperimental/names/gen1.py

@@ -1,58 +0,0 @@
-import random
-import uuid
-import nltk
-from nltk.corpus import wordnet as wn
-import re
-
-# Ensure WordNet is downloaded
-try:
-  wn.synsets('example')
-except LookupError:
-  nltk.download('wordnet')
-
-# Define a regex pattern to include only alphabetic words
-word_pattern = re.compile(r'^[a-zA-Z]+$')
-
-# Pre-fetch and clean adjective list from WordNet
-adjectives = list(set(
-  lemma.name().lower()
-  for synset in wn.all_synsets(pos=wn.ADJ)
-  for lemma in synset.lemmas()
-  if word_pattern.match(lemma.name())
-))
-
-# Pre-fetch and clean noun list from WordNet
-nouns = list(set(
-  lemma.name().lower()
-  for synset in wn.all_synsets(pos=wn.NOUN)
-  for lemma in synset.lemmas()
-  if word_pattern.match(lemma.name())
-))
-
-def generate_random_name():
-  """
-  Generates a random name in the format:
-  'adjective-noun-xx'
-  
-  Where:
-  - 'adjective' is a randomly selected adjective from WordNet.
-  - 'noun' is a randomly selected noun from WordNet.
-  - 'xx' is a two-character hexadecimal suffix.
-  
-  Returns:
-      str: The generated name.
-  """
-  # Select a random adjective and noun
-  adj = random.choice(adjectives)
-  noun = random.choice(nouns)
-  
-  # Generate a two-character hexadecimal suffix
-  suffix = uuid.uuid4().hex[:2]
-  
-  # Combine into the final name
-  return f"{adj}-{noun}-{suffix}"
-
-# Example usage
-if __name__ == "__main__":
-  for _ in range(5):
-    print(generate_random_name())

naeural_client-2.6.36/xperimental/names/gen2.py

@@ -1,45 +0,0 @@
-import nltk
-from nltk.corpus import brown
-from nltk import pos_tag
-from collections import Counter
-import string
-
-nltk.download('brown')       # Brown Corpus
-nltk.download('universal_tagset')  # Universal POS Tagset
-nltk.download('punkt')       # Tokenizer models
-nltk.download('averaged_perceptron_tagger_eng')
-
-
-# Load sentences from the Brown Corpus
-sentences = brown.sents()
-
-
-# Initialize a list to hold all nouns
-nouns = []
-
-# Iterate through each sentence in the corpus
-for sentence in sentences:
-    # Tokenize and tag each sentence
-    tagged_sentence = pos_tag(sentence, tagset='universal')
-    
-    # Extract words tagged as 'NOUN'
-    for word, tag in tagged_sentence:
-        if tag == 'NOUN':
-            # Clean the word: remove punctuation and make lowercase
-            word = word.lower().strip(string.punctuation)
-            # Ensure the word is alphabetic and has exactly 4 letters
-            if word.isalpha() and len(word) == 4:
-                nouns.append(word)
-
-
-# Count the frequency of each noun
-noun_freq = Counter(nouns)
-
-# Filter nouns to ensure they have exactly 4 letters (redundant if already filtered)
-four_letter_nouns = {word: freq for word, freq in noun_freq.items() if len(word) == 4}
-
-lst_nouns = [(word, freq) for word, freq in four_letter_nouns.items()]
-lst_sorted = sorted(lst_nouns, key=lambda x: x[1], reverse=True)
-nouns = [word for word, freq in lst_sorted[:250]]
-
-

naeural_client-2.6.36/xperimental/names/gen3.py

@@ -1,45 +0,0 @@
-import nltk
-from nltk.corpus import brown
-from nltk import pos_tag
-from collections import Counter
-import string
-
-nltk.download('brown')       # Brown Corpus
-nltk.download('universal_tagset')  # Universal POS Tagset
-nltk.download('punkt')       # Tokenizer models
-nltk.download('averaged_perceptron_tagger_eng')
-
-
-# Load sentences from the Brown Corpus
-sentences = brown.sents()
-
-
-# Initialize a list to hold all adjs
-adjs = []
-
-# Iterate through each sentence in the corpus
-for sentence in sentences:
-    # Tokenize and tag each sentence
-    tagged_sentence = pos_tag(sentence, tagset='universal')
-    
-    # Extract words tagged as 'adj'
-    for word, tag in tagged_sentence:
-        if tag == 'ADJ':
-            # Clean the word: remove punctuation and make lowercase
-            word = word.lower().strip(string.punctuation)
-            # Ensure the word is alphabetic and has exactly 4 letters
-            if word.isalpha() and len(word) == 4:
-                adjs.append(word)
-
-
-# Count the frequency of each adj
-adj_freq = Counter(adjs)
-
-# Filter adjs to ensure they have exactly 4 letters (redundant if already filtered)
-four_letter_adjs = {word: freq for word, freq in adj_freq.items() if len(word) == 4}
-
-lst_adjs = [(word, freq) for word, freq in four_letter_adjs.items()]
-lst_sorted = sorted(lst_adjs, key=lambda x: x[1], reverse=True)
-adjs = [word for word, freq in lst_sorted[:250]]
-
-