neuronum 7.0.1__py3-none-any.whl → 7.0.3__py3-none-any.whl

cli/main.py

@@ -330,11 +330,19 @@ async def async_init_node(descr):
 import asyncio
 import neuronum
 import os
+import json                        
 from dotenv import load_dotenv
 from jinja2 import Environment, FileSystemLoader                        
 
 env = Environment(loader=FileSystemLoader('.'))
-template = env.get_template('ping.html')                        
+template = env.get_template('ping.html')    
+
+with open('config.json', 'r') as f:
+    data = json.load(f)
+terms_url = data['legals']['terms']
+privacy_url = data['legals']['privacy_policy']
+last_update = data['legals']['last_update']                         
+                                           
                         
 load_dotenv()
 host = os.getenv("HOST")
@@ -360,10 +368,10 @@ async def main():
                             
         if txID == "{txID}":  
         
-            def render_html_template(client, ts, data, operation_id):
-                return template.render(client=client, ts=ts, data=data, operation_id=operation_id)
+            def render_html_template(client, ts, data, operation_id, terms_url, privacy_url, last_update):
+                return template.render(client=client, ts=ts, data=data, operation_id=operation_id, terms_url=terms_url, privacy_url=privacy_url, last_update=last_update)
 
-            html_content = render_html_template(client, ts, data, operation_id)       
+            html_content = render_html_template(client, ts, data, operation_id, terms_url, privacy_url, last_update)        
 
             data = {{
                 "json": f"{{operation_id}} - Reply from {nodeID}: Pinged by {{client}} at {{ts}} with data: {{data}}",
@@ -550,6 +558,25 @@ asyncio.run(main())
         }});
     }});
     </script>
+
+    <div id="legal-banner" style="border-radius: 10px;  margin: 15px; position: fixed; bottom: 0; left: 0; right: 0; background-color: #2a2a2a; color: #e0e0e0; padding: 16px; text-align: center; font-size: 14px; z-index: 9999; box-shadow: 0 -2px 10px rgba(0,0,0,0.5);">
+      By continuing, you agree to our 
+      Terms (<span style="color: #8cafff;">{{{{terms_url}}}}</span>) & 
+      Privacy Policy (<span style="color: #8cafff;">{{{{privacy_url}}}}</span>)
+      <br>
+      <button id="accept-legal" style="margin-top: 15px; margin-bottom: 15px; background: #01c07d; color: white; border: none; padding: 8px 16px; border-radius: 6px; cursor: pointer;">Accept</button>
+      <br>
+      Last Update: {{{{last_update}}}}
+    </div>
+
+    <script>
+      const banner = document.getElementById('legal-banner');
+      const acceptBtn = document.getElementById('accept-legal');
+      acceptBtn.addEventListener('click', () => {{
+        banner.remove();
+      }});
+    </script>
+
   </body>
 </html>
 """
@@ -572,8 +599,9 @@ f"""{{
         }}
     ],
     "legals": {{
-        "terms_and_conditions": "https://neuronum.net/legals",
-        "data_privacy": "https://neuronum.net/legals"
+        "terms": "https://url_to_your/terms",
+        "privacy_policy": "https://url_to_your/privacy_policy",
+        "last_update" : "DD/MM/YYYY"
     }}
 }}"""
 )
@@ -593,14 +621,6 @@ To ping this Node via the command-line interface, use the following command:
 
 ***
 
-### 🌐 Via the Web
-
-You can also interact with this Node by simply visiting this URL in your web browser:
-
-[https://neuronum.net/tx/{txID}](https://neuronum.net/tx/{txID})
-
-***
-
 ### 🐍 With Python
 
 For programmatic access, use the following Python code snippet. This script utilizes the `neuronum` library to activate the transaction and receive a response.
@@ -644,7 +664,7 @@ Send the command "Ping Node" to Cellai
 @click.command()
 @click.option('--d', is_flag=True, help="Start node in detached mode")
 def start_node(d):
-    update_node()
+    update_node_at_start()
     pid_file = Path.cwd() / "status.txt"
     system_name = platform.system()
     active_pids = []
@@ -772,7 +792,7 @@ def check_node():
 @click.command()
 @click.option('--d', is_flag=True, help="Restart node in detached mode")
 def restart_node(d):
-    update_node()
+    update_node_at_start()
     pid_file = Path.cwd() / "status.txt"
     system_name = platform.system()
 
@@ -903,6 +923,7 @@ async def async_stop_node():
         click.echo("Error: Unable to stop some node processes.")
 
 
+@click.command()
 def update_node():
     click.echo("Update your Node")
     env_data = {}
@@ -1022,6 +1043,125 @@ async def async_update_node(node_type: str, descr: str, partners:str) -> None:
         click.echo(f"Neuronum Node '{nodeID}' updated!")
 
 
+def update_node_at_start():
+    click.echo("Update your Node")
+    env_data = {}
+
+    try:
+        with open(".env", "r") as f:
+            for line in f:
+                key, value = line.strip().split("=")
+                env_data[key] = value
+
+        host = env_data.get("HOST", "")
+
+    except FileNotFoundError:
+        click.echo("Error: .env with credentials not found")
+        return
+    except Exception as e:
+        click.echo(f"Error reading .env file: {e}")
+        return
+    
+    if host.startswith("CMTY_"):
+        node_type = questionary.select(
+            "Community Cells can only create private Nodes",
+            choices=["private"]
+        ).ask()
+    else:
+        node_type = questionary.select(
+            "Who can view your Node?:",
+            choices=["public", "private", "partners"]
+        ).ask()
+    partners = "None"
+    if node_type == "partners":
+        prompt_msg = (
+            "Enter the list of partners who can view this Node.\n"
+            "Format: partner::cell, partner::cell, partner::cell\n"
+            "Press Enter to leave the list unchanged"
+        )
+        partners = click.prompt(
+            prompt_msg,
+            default="None",
+            show_default=False
+        ).strip()
+    descr = click.prompt(
+        "Update Node description: Type up to 25 characters, or press Enter to leave it unchanged",
+        default="None",
+        show_default=False
+    ).strip()
+    if descr and len(descr) > 25:
+        click.echo("Description too long. Max 25 characters allowed.")
+        return
+    asyncio.run(async_update_node_at_start(node_type, descr, partners))
+
+async def async_update_node_at_start(node_type: str, descr: str, partners:str) -> None:
+    env_data = {}
+
+    try:
+        with open(".env", "r") as f:
+            for line in f:
+                key, value = line.strip().split("=")
+                env_data[key] = value
+
+        nodeID = env_data.get("NODE", "")
+        host = env_data.get("HOST", "")
+        password = env_data.get("PASSWORD", "")
+        network = env_data.get("NETWORK", "")
+        synapse = env_data.get("SYNAPSE", "")
+
+    except FileNotFoundError:
+        click.echo("Error: .env with credentials not found")
+        return
+    except Exception as e:
+        click.echo(f"Error reading .env file: {e}")
+        return
+
+    try:
+        with open("NODE.md", "r") as f:
+            nodemd_file = f.read()
+
+        with open("config.json", "r") as f:
+            config_file = f.read()
+
+    except FileNotFoundError:
+        click.echo("Error: NODE.md file not found")
+        return
+    except Exception as e:
+        click.echo(f"Error reading NODE.md file: {e}")
+        return
+    
+    if node_type == "partners":
+        node_type = partners
+
+    url = f"https://{network}/api/update_node"
+    node = {
+        "nodeID": nodeID,
+        "host": host,
+        "password": password,
+        "synapse": synapse,
+        "node_type": node_type,
+        "nodemd_file": nodemd_file,
+        "config_file": config_file,
+        "descr": descr,
+    }
+
+    async with aiohttp.ClientSession() as session:
+        try:
+            async with session.post(url, json=node) as response:
+                response.raise_for_status()
+                data = await response.json()
+                nodeID = data["nodeID"]
+                node_url = data["node_url"]
+        except aiohttp.ClientError as e:
+            click.echo(f"Error sending request: {e}")
+            return
+
+    if node_type == "public":
+        click.echo(f"Neuronum Node '{nodeID}' updated! Visit: {node_url}")
+    else:
+        click.echo(f"Neuronum Node '{nodeID}' updated!")
+
+
 @click.command()
 def delete_node():
     asyncio.run(async_delete_node())
@@ -1199,6 +1339,7 @@ cli.add_command(view_cell)
 cli.add_command(disconnect_cell)
 cli.add_command(delete_cell)
 cli.add_command(init_node)
+cli.add_command(update_node)
 cli.add_command(start_node)
 cli.add_command(restart_node)
 cli.add_command(stop_node)

{neuronum-7.0.1.dist-info → neuronum-7.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: neuronum
-Version: 7.0.1
+Version: 7.0.3
 Summary: Official client library to interact with the Neuronum Network
 Home-page: https://neuronum.net
 Author: Neuronum Cybernetics
@@ -139,12 +139,6 @@ neuronum start-node                     # start Node
 ------------------
 
 ### **Interact with Neuronum**
-#### **Web-based**
-1. [Visit Neuronum](https://neuronum.net)
-2. [Connect your Cell](https://neuronum.net/connect)
-3. [Explore Transmitters](https://neuronum.net/explore)
-4. Activate Transmitters
-
 #### **Code-based**
 ```python
 import asyncio

neuronum-7.0.3.dist-info/RECORD

@@ -0,0 +1,10 @@
+cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+cli/main.py,sha256=MrRpf9AxBcl9e4B9pFVUxO2V1seliyGBK3XCuUzKjDc,41472
+neuronum/__init__.py,sha256=tAdqNC9rByY_CwG63yAyEe34phBdQ_Vv3FyFpTXQ2wo,45
+neuronum/neuronum.py,sha256=5OjJIAmY7haT6eJ3P767RFk-LTvNFRrlkjB9mOozgN8,17971
+neuronum-7.0.3.dist-info/licenses/LICENSE.md,sha256=m7pw_FktMNCs4tcy2UXP3QQP2S_je28P1SepdYoo0Xo,1961
+neuronum-7.0.3.dist-info/METADATA,sha256=Rn2WcJC83PX7ZmwveVqDQN0-bzkO6TcmO0SBbNPV6xE,5902
+neuronum-7.0.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+neuronum-7.0.3.dist-info/entry_points.txt,sha256=XKYBcRNxGeJpZZkDPsa8HA_RaJ7Km_R_JaUq5T9Nk2U,42
+neuronum-7.0.3.dist-info/top_level.txt,sha256=ru8Fr84cHm6oHr_DcJ8-uaq3RTiuCRFIr6AC8V0zPu4,13
+neuronum-7.0.3.dist-info/RECORD,,

neuronum-7.0.1.dist-info/RECORD

@@ -1,10 +0,0 @@
-cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cli/main.py,sha256=nOoWfn7zdukLZQuGYx-47nINMZVSdPbcdMuu0bDCKzM,36520
-neuronum/__init__.py,sha256=tAdqNC9rByY_CwG63yAyEe34phBdQ_Vv3FyFpTXQ2wo,45
-neuronum/neuronum.py,sha256=5OjJIAmY7haT6eJ3P767RFk-LTvNFRrlkjB9mOozgN8,17971
-neuronum-7.0.1.dist-info/licenses/LICENSE.md,sha256=m7pw_FktMNCs4tcy2UXP3QQP2S_je28P1SepdYoo0Xo,1961
-neuronum-7.0.1.dist-info/METADATA,sha256=ymaVKlx87rwW30nBkXE-wxgPRo8KaI9cfjkV4etqZGM,6098
-neuronum-7.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-neuronum-7.0.1.dist-info/entry_points.txt,sha256=XKYBcRNxGeJpZZkDPsa8HA_RaJ7Km_R_JaUq5T9Nk2U,42
-neuronum-7.0.1.dist-info/top_level.txt,sha256=ru8Fr84cHm6oHr_DcJ8-uaq3RTiuCRFIr6AC8V0zPu4,13
-neuronum-7.0.1.dist-info/RECORD,,