neuronum 2.0.5__tar.gz → 2.0.7__tar.gz

{neuronum-2.0.5 → neuronum-2.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: neuronum
-Version: 2.0.5
+Version: 2.0.7
 Summary: Official client library to interact with the Neuronum Network
 Home-page: https://neuronum.net
 Author: Neuronum Cybernetics
@@ -35,8 +35,8 @@ Dynamic: summary
 
 Build, deploy and automate serverless data infrastructures for an interconnected world with `Neuronum`
 
-### **What's New in neuronum==2.0.5?**
-- **Nodes/Node-CLI**: Logic update: `neuronum init-node --sync` and `neuronum init-node --stream` are not longer required flags
+### **What's New in neuronum==2.0.7?**
+- **Nodes/Node-CLI**: Updated logic: Node Type and Description are now declared during `neuronum register-node` instead of `neuronum init-node`
 
 ### New Feature Set
 - **Cells/Cell-CLI**: Create and manage Neuronum Cells from the command line
@@ -44,7 +44,7 @@ Build, deploy and automate serverless data infrastructures for an interconnected
 - **Transmitters (TX)**: Automate economic data transfer
 - **Circuits (CTX)**: Store data in Key-Value-Label databases
 - **Streams (STX)**: Stream, synchronize and control data in real time
-- **Contracts/Tokens**: Automate services exchange and authorization between Cells and Nodes
+- **Contracts/Tokens**: Automate service exchange and authorization between Cells and Nodes
 - **Cellai**: A local running task assistant in development (version 0.0.1) 
 
 ### Installation

{neuronum-2.0.5 → neuronum-2.0.7}/README.md

@@ -4,8 +4,8 @@
 
 Build, deploy and automate serverless data infrastructures for an interconnected world with `Neuronum`
 
-### **What's New in neuronum==2.0.5?**
-- **Nodes/Node-CLI**: Logic update: `neuronum init-node --sync` and `neuronum init-node --stream` are not longer required flags
+### **What's New in neuronum==2.0.7?**
+- **Nodes/Node-CLI**: Updated logic: Node Type and Description are now declared during `neuronum register-node` instead of `neuronum init-node`
 
 ### New Feature Set
 - **Cells/Cell-CLI**: Create and manage Neuronum Cells from the command line
@@ -13,7 +13,7 @@ Build, deploy and automate serverless data infrastructures for an interconnected
 - **Transmitters (TX)**: Automate economic data transfer
 - **Circuits (CTX)**: Store data in Key-Value-Label databases
 - **Streams (STX)**: Stream, synchronize and control data in real time
-- **Contracts/Tokens**: Automate services exchange and authorization between Cells and Nodes
+- **Contracts/Tokens**: Automate service exchange and authorization between Cells and Nodes
 - **Cellai**: A local running task assistant in development (version 0.0.1) 
 
 ### Installation

{neuronum-2.0.5 → neuronum-2.0.7}/cli/main.py

@@ -7,6 +7,7 @@ import os
 import neuronum
 import json
 import platform
+import glob
 
 @click.group()
 def cli():
@@ -244,17 +245,10 @@ def delete_cell():
  
 
 @click.command()
-@click.option('--sync', nargs=1, default=None, help="Optional stream ID for sync.")
-@click.option('--stream', nargs=1, default=None, help="Optional stream ID for stream.")
+@click.option('--sync', multiple=True, default=None, help="Optional stream IDs for sync.")
+@click.option('--stream', multiple=True, default=None, help="Optional stream ID for stream.")
 def init_node(sync, stream):
 
-    node_type = questionary.select(
-        "Choose Node type:",
-        choices=["public", "private"]
-    ).ask()
-
-    descr = click.prompt("Node description (max. 25 characters)")
-
     credentials_folder_path = Path.home() / ".neuronum"
     env_path = credentials_folder_path / ".env"
 
@@ -278,8 +272,8 @@ def init_node(sync, stream):
         click.echo(f"Error reading .env file: {e}")
         return
 
-    url = f"https://{network}/api/init_node/{node_type}"
-    node = {"descr": descr, "host": host, "password": password, "synapse": synapse}
+    url = f"https://{network}/api/init_node"
+    node = {"host": host, "password": password, "synapse": synapse}
 
     try:
         response = requests.post(url, json=node)
@@ -330,11 +324,12 @@ def init_node(sync, stream):
     nodemd_path = project_path / "NODE.md"
     nodemd_path.write_text("## Use this NODE.md file to add instructions on how to interact with your node\n")
 
-    stx = sync or stream or "n9gW3LxQcecI::stx"
+    stx = sync[0] if sync else (stream[0] if stream else "n9gW3LxQcecI::stx")
 
     if sync:
-        sync_path = project_path / "sync.py"
-        sync_path.write_text(f"""\
+        for stx in sync:
+            sync_path = project_path / f"sync_{stx.replace('::stx', '')}.py"
+            sync_path.write_text(f"""\
 import neuronum
 import os
 from dotenv import load_dotenv
@@ -365,8 +360,9 @@ for operation in stream:
 
 
     if stream:
-        stream_path = project_path / "stream.py"
-        stream_path.write_text(f"""\
+        for stx in stream:
+            stream_path = project_path / f"stream_{stx.replace('::stx', '')}.py"
+            stream_path.write_text(f"""\
 import neuronum
 import os
 from dotenv import load_dotenv
@@ -435,7 +431,8 @@ def start_node():
     click.echo("Starting Node...")
 
     project_path = Path.cwd()
-    script_files = ["main.py", "sync.py", "stream.py"]
+
+    script_files = ["main.py"] + glob.glob("sync_*.py") + glob.glob("stream_*.py")
 
     processes = []
 
@@ -467,17 +464,20 @@ def stop_node():
         system_name = platform.system()
 
         for pid in pids:
-            if system_name == "Windows":
-                subprocess.run(
-                    ["taskkill", "/F", "/PID", str(pid)],
-                    stdout=subprocess.DEVNULL,
-                    stderr=subprocess.DEVNULL
-                )
-            else:
-                os.kill(pid, 9)
+            try:
+                if system_name == "Windows":
+                    subprocess.run(
+                        ["taskkill", "/F", "/PID", str(pid)],
+                        stdout=subprocess.DEVNULL,
+                        stderr=subprocess.DEVNULL
+                    )
+                else:
+                    os.kill(pid, 9)
+            except ProcessLookupError:
+                click.echo(f"Warning: Process {pid} already stopped or does not exist.")
 
         os.remove("node_pid.txt")
-        click.echo("Node stopped successfully!")
+        click.echo(f"Node stopped successfully! {len(pids)} processes terminated.")
 
     except FileNotFoundError:
         click.echo("Error: No active node process found.")
@@ -506,6 +506,13 @@ def register_node():
     except Exception as e:
         print(f"Error reading .env file: {e}")
         return
+    
+    node_type = questionary.select(
+        "Choose Node type:",
+        choices=["public", "private"]
+    ).ask()
+
+    descr = click.prompt("Node description (max. 25 characters)")
 
     try:
         with open("NODE.md", "r") as f: 
@@ -518,10 +525,11 @@ def register_node():
         print(f"Error reading NODE.md file: {e}")
         return
 
-    url = f"https://{network}/api/register_node"
+    url = f"https://{network}/api/register_node/{node_type}"
 
     node = {
         "nodeID": nodeID,
+        "descr": descr,
         "host": host,
         "password": password,
         "synapse": synapse,

{neuronum-2.0.5 → neuronum-2.0.7}/neuronum.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: neuronum
-Version: 2.0.5
+Version: 2.0.7
 Summary: Official client library to interact with the Neuronum Network
 Home-page: https://neuronum.net
 Author: Neuronum Cybernetics
@@ -35,8 +35,8 @@ Dynamic: summary
 
 Build, deploy and automate serverless data infrastructures for an interconnected world with `Neuronum`
 
-### **What's New in neuronum==2.0.5?**
-- **Nodes/Node-CLI**: Logic update: `neuronum init-node --sync` and `neuronum init-node --stream` are not longer required flags
+### **What's New in neuronum==2.0.7?**
+- **Nodes/Node-CLI**: Updated logic: Node Type and Description are now declared during `neuronum register-node` instead of `neuronum init-node`
 
 ### New Feature Set
 - **Cells/Cell-CLI**: Create and manage Neuronum Cells from the command line
@@ -44,7 +44,7 @@ Build, deploy and automate serverless data infrastructures for an interconnected
 - **Transmitters (TX)**: Automate economic data transfer
 - **Circuits (CTX)**: Store data in Key-Value-Label databases
 - **Streams (STX)**: Stream, synchronize and control data in real time
-- **Contracts/Tokens**: Automate services exchange and authorization between Cells and Nodes
+- **Contracts/Tokens**: Automate service exchange and authorization between Cells and Nodes
 - **Cellai**: A local running task assistant in development (version 0.0.1) 
 
 ### Installation

{neuronum-2.0.5 → neuronum-2.0.7}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='neuronum',
-    version='2.0.5',
+    version='2.0.7',
     author='Neuronum Cybernetics',
     author_email='welcome@neuronum.net',
     description='Official client library to interact with the Neuronum Network',