Merge in main

.config_startup.json

@@ -2,7 +2,7 @@
   "EE_ID": "XXXXXXXXXX",
   "SECURED" : true,
   "IO_FORMATTER" : "",
-  "MAIN_LOOP_RESOLUTION" : 5,
+  "MAIN_LOOP_RESOLUTION" : 10,
 
   "SYSTEM_TEMPERATURE_CHECK" : false,
 
@@ -86,28 +86,13 @@
   },
 
   "ADMIN_PIPELINE" : {
-    "MINIO_MONIT_01": {
-      "MINIO_HOST"          : null,
-      "MINIO_ACCESS_KEY"    : null,
-      "MINIO_SECRET_KEY"    : null,
-      "MINIO_SECURE"        : null
-    },
-
-    "REST_CUSTOM_EXEC_01" : {
-      "ALLOW_EMPTY_INPUTS"      : true,
-      "RUN_WITHOUT_IMAGE"       : true,
-      "SEND_MANIFEST_EACH"      : 301
-    },
 
-    "SELF_CHECK_01" : {
-      "DISK_LOW_PRC"  : 0.15,
-      "MEM_LOW_PRC"   : 0.15,
-      "PROCESS_DELAY" : 5
-    },  
+    "NET_CONFIG_MONITOR" : {
+      "PROCESS_DELAY" : 0
+    },
 
     "NET_MON_01" : {
-      "PROCESS_DELAY" : 10,
-      "SUPERVISOR"    : "$EE_SUPERVISOR"
+      "PROCESS_DELAY" : 10
     },
 
     "UPDATE_MONITOR_01" : {
@@ -123,12 +108,8 @@
 
 
       "RELEASE_TAG" : "release-tag-for-yaml-config"
-    },
-
-    "SYSTEM_HEALTH_MONITOR_01": {
-      "PROCESS_DELAY"    : 180,
-      "KERNEL_LOG_LEVEL" : "emerg,alert,crit,err"
     }
+
   },
 
   "COMMUNICATION_ENVIRONMENT" : {

.devcontainer/Dockerfile

@@ -0,0 +1,33 @@
+FROM aidamian/base_edge_node:x86_64-py3.10.12-th2.3.1.cu121-tr4.43.3
+
+WORKDIR /edge_node
+
+COPY  . /edge_node
+
+# set a generic env variable 
+ENV AINODE_DOCKER Yes
+
+# set a generic env variable 
+ENV AINODE_DOCKER_SOURCE main
+
+# set default Execution Engine id
+ENV EE_ID E2dkr
+
+# Temporary fix:
+ENV AINODE_ENV $AI_ENV
+ENV AINODE_ENV_VER $AI_ENV_VER
+
+ENV TZ=Europe/Bucharest
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
+# configure default config_startup file
+ENV EE_CONFIG .config_startup.json
+
+## The following line should NOT be moved to based as it should always be updated
+RUN pip install --no-cache-dir kmonitor naeural_client decentra-vision python-telegram-bot
+## END do not move
+
+ENV AINODE_DEVCONTAINER Yes
+
+
+RUN pip install --no-cache-dir --no-deps naeural-core

.devcontainer/devcontainer.json

@@ -0,0 +1,21 @@
+{
+  "name" : "Edge Node Development Container",
+  "dockerFile" : "Dockerfile",
+  // "image": "aidamian/ds101_2024",
+
+  "runArgs": [
+    //"--gpus=all", // Use this option if you have a GPU
+    "--hostname",
+    "edge_dev"    
+  ],
+
+
+  "customizations": {
+    "vscode" : {
+      "extensions": [
+        "ms-python.python",
+        "ms-toolsai.jupyter"
+      ]
+    }
+  }
+}

.env.template

@@ -1,5 +1,6 @@
 # LOCAL FILE TEMPLATE
 
+
 EE_ID=your-node-name
 EE_SUPERVISOR=true/false
 # GPU setup: cpu or cuda
@@ -33,3 +34,8 @@ EE_NGROK_EDGE_LABEL=ngrok-edge-label
 EE_GITVER=token_for_accessing_private_repositories
 EE_OPENAI=token_for_accessing_openai_api
 EE_HF_TOKEN=token_for_accessing_huggingface_api
+
+
+# EE_ID_01=your-local-cluster-node-01-name
+# EE_ID_02=your-local-cluster-node-02-name
+# EE_ID_03=your-local-cluster-node-03-name

.gitattributes

@@ -0,0 +1,2 @@
+* text=auto
+*.py text eol=lf

.github/workflows/build_develop.yml

@@ -23,6 +23,29 @@ jobs:
           git config --local user.email "action@github.com"
           git config --local user.name "GitHub Action"
 
+      ## version getting and debugging
+
+      - name: Retrieve edge node version
+        id: retrieve_version
+        run: |
+          echo "VERSION=$(cat ver.py | grep -o "'.*'")" >> $GITHUB_ENV
+
+      - name: Check latest naeural_core version
+        id: check_core_latest_version
+        run: |
+          LATEST_VERSION=$(curl -s https://pypi.org/pypi/naeural-core/json | jq -r '.info.version')
+          echo "LATEST_NAEURAL_CORE_VERSION=$LATEST_VERSION" >> $GITHUB_ENV          
+
+      - name: Debug version
+        run: |
+          VERSION=${VERSION//\'/}
+          echo "Develop version to build: '$VERSION'"
+          echo "Latest naeural_core version on PyPI: '$LATEST_NAEURAL_CORE_VERSION'"
+        env:
+          VERSION: ${{ env.VERSION }}
+          LATEST_NAEURAL_CORE_VERSION: ${{ env.LATEST_NAEURAL_CORE_VERSION }}
+
+      ## End of version getting and debugging
 
       - name: Log in to Docker Hub
         uses: docker/login-action@v3

.github/workflows/build_main.yml

@@ -23,17 +23,30 @@ jobs:
           git config --local user.email "action@github.com"
           git config --local user.name "GitHub Action"
 
-      - name: Retrieve version
+
+      ## version getting and debugging
+
+      - name: Retrieve edge node version
         id: retrieve_version
         run: |
           echo "VERSION=$(cat ver.py | grep -o "'.*'")" >> $GITHUB_ENV
 
+      - name: Check latest naeural_core version
+        id: check_core_latest_version
+        run: |
+          LATEST_VERSION=$(curl -s https://pypi.org/pypi/naeural-core/json | jq -r '.info.version')
+          echo "LATEST_NAEURAL_CORE_VERSION=$LATEST_VERSION" >> $GITHUB_ENV          
+
       - name: Debug version
         run: |
           VERSION=${VERSION//\'/}
-          echo "Version to tag: '$VERSION'"
+          echo "Develop version to build: '$VERSION'"
+          echo "Latest naeural_core version on PyPI: '$LATEST_NAEURAL_CORE_VERSION'"
         env:
           VERSION: ${{ env.VERSION }}
+          LATEST_NAEURAL_CORE_VERSION: ${{ env.LATEST_NAEURAL_CORE_VERSION }}
+
+      ## End of version getting and debugging
 
       - name: Create image tag
         id: create_image_tag

.gitignore

@@ -148,8 +148,6 @@ inference/model_testing/_local_cache/_logs/MPTF.txt
 inference/model_testing/_local_cache/_logs/20211224_102325_MPTF_001_log.txt
 
 
-# vscode stuff
-.vscode
 plugins/libs/_cache/
 core/utils/_cache/
 plugins/business/scoring_plugins/_local_cache/

.vscode/launch.json

@@ -0,0 +1,18 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Python: File",
+      "type": "python",
+      "request": "launch",
+      "program": "${file}",
+      "justMyCode": true,
+
+      "console": "integratedTerminal",
+      "pythonArgs": ["-i"]
+  }
+  ]
+}

Dockerfile

@@ -27,10 +27,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 # configure default config_startup file
 ENV EE_CONFIG .config_startup.json
 
-## The following line should NOT be moved to based as it should always be updated
-RUN pip install --no-cache-dir kmonitor PyE2 decentra-vision
-## END do not move
-
+RUN pip install --no-cache-dir -r requirements.txt
 RUN pip install --no-cache-dir --no-deps naeural-core
 
 CMD ["python3","device.py"]

Dockerfile_cpu

@@ -27,10 +27,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 # configure default config_startup file
 ENV EE_CONFIG .config_startup.json
 
-## The following line should NOT be moved to based as it should always be updated
-RUN pip install --no-cache-dir kmonitor PyE2 decentra-vision
-## END do not move
-
-RUN pip install --no-cache-dir --no-deps naeural-core
+RUN pip install --no-cache-dir -r requirements.txt
+RUN pip install --no-cache-dir --no-deps naeural-corere
 
 CMD ["python3","device.py"]

Dockerfile_cpu_dev

@@ -27,10 +27,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 # configure default config_startup file
 ENV EE_CONFIG .config_startup.json
 
-## The following line should NOT be moved to based as it should always be updated
-RUN pip install --no-cache-dir kmonitor PyE2 decentra-vision
-## END do not move
-
+RUN pip install --no-cache-dir -r requirements.txt
 RUN pip install --no-cache-dir --no-deps naeural-core
 
 CMD ["python3","device.py"]

Dockerfile_dev

@@ -27,10 +27,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 # configure default config_startup file
 ENV EE_CONFIG .config_startup.json
 
-## The following line should NOT be moved to based as it should always be updated
-RUN pip install --no-cache-dir kmonitor PyE2 decentra-vision
-## END do not move
-
+RUN pip install --no-cache-dir -r requirements.txt
 RUN pip install --no-cache-dir --no-deps naeural-core
 
 CMD ["python3","device.py"]

Dockerfile_rpi

@@ -27,10 +27,7 @@ ENV EE_CONFIG .config_startup.json
 ENV TZ=Europe/Bucharest
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-## The following line should NOT be moved to based as it should always be updated
-RUN pip install --no-cache-dir kmonitor PyE2 decentra-vision
-## END do not move
-
+RUN pip install --no-cache-dir -r requirements.txt
 RUN pip install --no-cache-dir --no-deps naeural-core
 
 CMD ["/usr/bin/python3","device.py"]

Dockerfile_rpi_dev

@@ -27,10 +27,7 @@ ENV EE_CONFIG .config_startup.json
 ENV TZ=Europe/Bucharest
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-## The following line should NOT be moved to based as it should always be updated
-RUN pip install --no-cache-dir kmonitor PyE2 decentra-vision
-## END do not move
-
+RUN pip install --no-cache-dir -r requirements.txt
 RUN pip install --no-cache-dir --no-deps naeural-core
 
 CMD ["/usr/bin/python3","device.py"]

Dockerfile_tegra

@@ -26,10 +26,7 @@ ENV EE_DEVICE cuda:0
 # configure default config_startup file
 ENV EE_CONFIG .config_startup.json
 
-## The following line should NOT be moved to based as it should always be updated
-RUN pip install --no-cache-dir kmonitor PyE2 decentra-vision
-## END do not move
-
+RUN pip install --no-cache-dir -r requirements.txt
 RUN pip install --no-cache-dir --no-deps naeural-core
 
 CMD ["python3","device.py"]

Dockerfile_tegra_dev

@@ -26,10 +26,7 @@ ENV EE_DEVICE cuda:0
 # configure default config_startup file
 ENV EE_CONFIG .config_startup.json
 
-## The following line should NOT be moved to based as it should always be updated
-RUN pip install --no-cache-dir kmonitor PyE2 decentra-vision
-## END do not move
-
+RUN pip install --no-cache-dir -r requirements.txt
 RUN pip install --no-cache-dir --no-deps naeural-core
 
 CMD ["python3","device.py"]

README.md

@@ -3,9 +3,9 @@
 ## Hello world tutorial
 
 Below is a simple "Hello world!" style application that aims to show how simple and straightforward it is to distribute existing Python code to multiple edge node workers.
-This code uses the PyE2 SDK.
+This code uses the naeural_client SDK.
 
-To execute this code, you can check [PyE2/tutorials/video_presentation/1. hello_world.ipynb](https://github.com/NaeuralEdgeProtocol/PyE2/blob/main/tutorials/video_presentation/1.%20hello_world.ipynb). You can also check our [video tutorial](TODO_Youtube_link).
+To execute this code, you can check [naeural_client/tutorials/video_presentation/1. hello_world.ipynb](https://github.com/NaeuralEdgeProtocol/naeural_client/blob/main/tutorials/video_presentation/1.%20hello_world.ipynb). You can also check our [video tutorial](TODO_Youtube_link).
 
 ### 1. Create `.env` file
 
@@ -107,7 +107,7 @@ For this, we will create a new method, `remote_brute_force_prime_number_generato
 
 
 ```python
-from PyE2 import CustomPluginTemplate
+from naeural_client import CustomPluginTemplate
 
 # through the `plugin` object we get access to the edge node API
 # the CustomPluginTemplate class acts as a documentation for all the available methods and attributes
@@ -144,7 +144,7 @@ We will use the `on_heartbeat` callback to print the nodes.
 
 
 ```python
-from PyE2 import Session
+from naeural_client import Session
 from time import sleep
 
 def on_heartbeat(session: Session, node_id: str, heartbeat: dict):
@@ -194,7 +194,7 @@ Thus, we need to implement a callback method that will handle this.
 
 
 ```python
-from PyE2 import Pipeline
+from naeural_client import Pipeline
 
 # a flag used to close the session when the task is finished
 finished = False
@@ -218,7 +218,7 @@ Now we are ready to deploy our job to the network.
 
 
 ```python
-from PyE2 import DistributedCustomCodePresets as Presets
+from naeural_client import DistributedCustomCodePresets as Presets
 
 _, _ = session.create_chain_dist_custom_job(
     # this is the main node, our entrypoint
@@ -316,11 +316,11 @@ SMIS 143488},
 ```
 
 ```bibtex
-@misc{PyE2,
+@misc{naeural_client,
   author = {Stefan Saraev, Andrei Damian},
-  title = {PyE2: Python SDK for Naeural Edge Protocol},
+  title = {naeural_client: Python SDK for Naeural Edge Protocol},
   year = {2024},
-  howpublished = {\url{https://github.com/NaeuralEdgeProtocol/PyE2}},
+  howpublished = {\url{https://github.com/NaeuralEdgeProtocol/naeural_client}},
 }
 ```
 

constants.py

@@ -0,0 +1,8 @@
+# placeholder for edge-node constants
+
+PROBABLY_NOTHING = 1.618
+
+
+
+if __name__ == '__main__':
+  print("")