neuronum 2.0.2__py3-none-any.whl → 2.0.4__py3-none-any.whl

cli/main.py

@@ -6,8 +6,7 @@ import subprocess
 import os
 import neuronum
 import json
-import sys
-import cellai
+import platform
 
 @click.group()
 def cli():
@@ -245,8 +244,9 @@ def delete_cell():
  
 
 @click.command()
-@click.option('--sync', default=None, help="Optional stream ID to generate the sync template.")
-def init_node(sync):
+@click.option('--sync', required=True, nargs=1, help="Stream ID required for sync.")
+@click.option('--stream', required=True, nargs=1, help="Stream ID required for stream.")
+def init_node(sync, stream):
 
     node_type = questionary.select(
         "Choose Node type:",
@@ -255,12 +255,10 @@ def init_node(sync):
 
     descr = click.prompt("Node description (max. 25 characters)")
 
-    stream = sync if sync else "n9gW3LxQcecI::stx"
-
     credentials_folder_path = Path.home() / ".neuronum"
     env_path = credentials_folder_path / ".env"
 
-    env_data = {}
+    env_data = {}  
 
     try:
         with open(env_path, "r") as f:
@@ -280,22 +278,7 @@ def init_node(sync):
         click.echo(f"Error reading .env file: {e}")
         return
 
-    cell = neuronum.Cell(
-    host=host,         
-    password=password,                         
-    network=network,                        
-    synapse=synapse
-    )
-
-    cells = cell.list_cells()
-    tx = cell.list_tx()
-    ctx = cell.list_ctx()
-    stx = cell.list_stx()
-    contracts = cell.list_contracts()
-    nodes = cell.list_nodes()
-
     url = f"https://{network}/api/init_node/{node_type}"
-
     node = {"descr": descr, "host": host, "password": password, "synapse": synapse}
 
     try:
@@ -310,37 +293,80 @@ def init_node(sync):
     project_path = Path(node_filename)
     project_path.mkdir(exist_ok=True)
 
-    env_path = project_path / ".env"
-    env_path.write_text(f"NODE={nodeID}\nHOST={host}\nPASSWORD={password}\nNETWORK={network}\nSYNAPSE={synapse}\n")
-
-    gitignore_path = project_path / ".gitignore"
-    gitignore_path.write_text(f".env\n")
+    cell = neuronum.Cell(
+        host=host,         
+        password=password,                         
+        network=network,                        
+        synapse=synapse
+    )
 
-    cells_path = Path("cells.json")
-    cells_path.write_text(json.dumps(cells, indent=4))
+    cells = cell.list_cells()
+    tx = cell.list_tx()
+    ctx = cell.list_ctx()
+    stx = cell.list_stx()
+    contracts = cell.list_contracts()
+    nodes = cell.list_nodes()
 
+    cells_path = project_path / "cells.json"
     tx_path = project_path / "transmitters.json"
-    tx_path.write_text(json.dumps(tx, indent=4))
-
     ctx_path = project_path / "circuits.json"
-    ctx_path.write_text(json.dumps(ctx, indent=4))
-
     stx_path = project_path / "streams.json"
-    stx_path.write_text(json.dumps(stx, indent=4))
-
     contracts_path = project_path / "contracts.json"
-    contracts_path.write_text(json.dumps(contracts, indent=4))
-
     nodes_path = project_path / "nodes.json"
+
+    cells_path.write_text(json.dumps(cells, indent=4))
+    tx_path.write_text(json.dumps(tx, indent=4))
+    ctx_path.write_text(json.dumps(ctx, indent=4))
+    stx_path.write_text(json.dumps(stx, indent=4))
+    contracts_path.write_text(json.dumps(contracts, indent=4))
     nodes_path.write_text(json.dumps(nodes, indent=4))
 
+    env_path = project_path / ".env"
+    env_path.write_text(f"NODE={nodeID}\nHOST={host}\nPASSWORD={password}\nNETWORK={network}\nSYNAPSE={synapse}\n")
+
+    gitignore_path = project_path / ".gitignore"
+    gitignore_path.write_text(".env\n")
+
     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                        
+    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"
+
+    if sync:
+        sync_path = project_path / "sync.py"
+        sync_path.write_text(f"""\
+import neuronum
+import os
+from dotenv import load_dotenv
+
+load_dotenv()
+host = os.getenv("HOST")
+password = os.getenv("PASSWORD")
+network = os.getenv("NETWORK")
+synapse = os.getenv("SYNAPSE")
+
+cell = neuronum.Cell(
+    host=host,
+    password=password,
+    network=network,
+    synapse=synapse
+)
+
+STX = "{stx}"
+stream = cell.sync(STX)
+for operation in stream:
+    label = operation.get("label")
+    data = operation.get("data")
+    ts = operation.get("time")
+    stxID = operation.get("stxID")
+    operator = operation.get("operator")
+    print(label, data, ts, stxID, operator)
 """)
-        
-    main_path = project_path / "main.py"
-    main_path.write_text(f"""\
+
+
+    if stream:
+        stream_path = project_path / "stream.py"
+        stream_path.write_text(f"""\
 import neuronum
 import os
 from dotenv import load_dotenv
@@ -358,37 +384,76 @@ cell = neuronum.Cell(
     synapse=synapse
 )
 
-STX = "{stream}"
+STX = "{stx}"
+label = "your_label"
+while True:
+    data = {{
+        "key1": "value1",
+        "key2": "value2",
+        "key3": "value3",
+    }}
+    cell.stream(label, data, STX)
+""")
+    
+    if not sync and not stream:
+        main_path = project_path / "main.py" 
+        main_path.write_text(f"""\
+import neuronum
+import os
+from dotenv import load_dotenv
+
+load_dotenv()
+host = os.getenv("HOST")
+password = os.getenv("PASSWORD")
+network = os.getenv("NETWORK")
+synapse = os.getenv("SYNAPSE")
+
+cell = neuronum.Cell(
+    host=host,
+    password=password,
+    network=network,
+    synapse=synapse
+)
+                             
+STX = "{stx}"
 stream = cell.sync(STX)
 for operation in stream:
     label = operation.get("label")
-    value = operation.get("data").get("message")
+    message = operation.get("data").get("message")
     ts = operation.get("time")
     stxID = operation.get("stxID")
     operator = operation.get("operator")
-    print(label, value, ts, stxID, operator)                              
+    print(label, message, ts, stxID, operator)
 """)
 
     click.echo(f"Neuronum Node '{nodeID}' initialized!")
 
 
+
 @click.command()
 def start_node():
     click.echo("Starting Node...")
 
     project_path = Path.cwd()
-    main_file = project_path / "main.py"
+    script_files = ["main.py", "sync.py", "stream.py"]
 
-    if not main_file.exists():
-        click.echo("Error: main.py not found. Make sure the node is set up.")
-        return
+    processes = []
 
-    process = subprocess.Popen(["python", str(main_file)], start_new_session=True)
+    for script in script_files:
+        script_path = project_path / script
+        if script_path.exists():
+            process = subprocess.Popen(["python", str(script_path)], start_new_session=True)
+            processes.append(process.pid)
+
+    if not processes:
+        click.echo("Error: No valid node script found. Ensure the node is set up correctly.")
+        return
 
     with open("node_pid.txt", "w") as f:
-        f.write(str(process.pid))
+        f.write("\n".join(map(str, processes)))
+
+    click.echo(f"Node started successfully! Running {len(processes)} scripts: {', '.join(script_files)}")
 
-    click.echo("Node started successfully!")
 
 
 @click.command()
@@ -397,12 +462,27 @@ def stop_node():
 
     try:
         with open("node_pid.txt", "r") as f:
-            pid = int(f.read().strip())
-        os.kill(pid, 9) 
+            pids = [int(pid.strip()) for pid in f.readlines()]
+
+        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)
+
         os.remove("node_pid.txt")
         click.echo("Node stopped successfully!")
+
     except FileNotFoundError:
         click.echo("Error: No active node process found.")
+    except subprocess.CalledProcessError:
+        click.echo("Error: Unable to stop some node processes.")
 
 
 @click.command()

{neuronum-2.0.2.dist-info → neuronum-2.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: neuronum
-Version: 2.0.2
+Version: 2.0.4
 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.2?**
-- **Cellai**: A local running task assistant in development (version 0.0.1)
+### **What's New in neuronum==2.0.4?**
+- **Nodes/Node-CLI**: Logic update: `neuronum init-node` now defaults to the Hello, Neuronum! Stream
 
 ### New Feature Set
 - **Cells/Cell-CLI**: Create and manage Neuronum Cells from the command line
@@ -83,7 +83,7 @@ $ neuronum delete-cell
 
 List Cells:
 ```python                                            
-cellsList = cell.list_cells()                                     # list Nodes
+cellsList = cell.list_cells()                                     # list Cells
 ```
 
 ### Nodes/Node-CLI
@@ -91,7 +91,17 @@ Neuronum Nodes are soft- and hardware components that power the Neuronum Network
 
 Initialize a Node:
 ```sh
-$ neuronum init-node                                              # neuronum init-node --sync id::stx (optional)  
+$ neuronum init-node                                    
+```
+
+Initialize a Node with stream template:
+```sh
+$ neuronum init-node --stream id::stx                        
+```
+
+Initialize a Node with sync template:
+```sh
+$ neuronum init-node --sync id::stx                   
 ```
 
 Start a Node:

{neuronum-2.0.2.dist-info → neuronum-2.0.4.dist-info}/RECORD

@@ -1,12 +1,12 @@
 cellai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cellai/cellai.py,sha256=g5oBz-Xx6T4-JWzUs-TJ4y9nHtDmA_IpXh_188OqAZA,281
 cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cli/main.py,sha256=iIhQ3a-LIuUI29yFm7GvZ6rmXouWpscI1HFVjFpmYlk,18341
+cli/main.py,sha256=cyRz-MAUAZMh-3aeYN0Mw1W1todYXBy7hR941332Gu0,20532
 neuronum/__init__.py,sha256=Drsm263_w3_VWgl1YsKLUr8WwVodqV3TSjqpxLjyq_M,46
 neuronum/neuronum.py,sha256=rkc16omTxjWBEgBXP0rCeab1S3lYDKz1zx_i-tdFjlY,17544
-neuronum-2.0.2.dist-info/licenses/LICENSE,sha256=UiZjNHiCyRP6WoZfbYQh9cv4JW96wIofKXmzBJrYSUk,1125
-neuronum-2.0.2.dist-info/METADATA,sha256=yKiaiZnuBpoCijDL_yR40n4NYB3K63_MnW2UmIZb2C0,13765
-neuronum-2.0.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-neuronum-2.0.2.dist-info/entry_points.txt,sha256=XKYBcRNxGeJpZZkDPsa8HA_RaJ7Km_R_JaUq5T9Nk2U,42
-neuronum-2.0.2.dist-info/top_level.txt,sha256=gqN5tyGnBKMPSzvWQONO4rpTf4gQPMi77O3KAKx88LQ,20
-neuronum-2.0.2.dist-info/RECORD,,
+neuronum-2.0.4.dist-info/licenses/LICENSE,sha256=UiZjNHiCyRP6WoZfbYQh9cv4JW96wIofKXmzBJrYSUk,1125
+neuronum-2.0.4.dist-info/METADATA,sha256=dQtPEM3wpMOFnCeaiyjEp-WoOtukKzB2voabWzABqgU,13959
+neuronum-2.0.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+neuronum-2.0.4.dist-info/entry_points.txt,sha256=XKYBcRNxGeJpZZkDPsa8HA_RaJ7Km_R_JaUq5T9Nk2U,42
+neuronum-2.0.4.dist-info/top_level.txt,sha256=gqN5tyGnBKMPSzvWQONO4rpTf4gQPMi77O3KAKx88LQ,20
+neuronum-2.0.4.dist-info/RECORD,,