neuronum 1.2.1__tar.gz → 1.2.3__tar.gz

{neuronum-1.2.1 → neuronum-1.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: neuronum
-Version: 1.2.1
+Version: 1.2.3
 Summary: Interact with the Neuronum Network to build, connect & automate economic data streams
 Home-page: https://neuronum.net
 Author: Neuronum Cybernetics
@@ -26,21 +26,21 @@ Interact with the `Neuronum Network` to build, connect & automate economic data
 ## Business Cell Features
 - **Transmitters (TX)**: Automate economic data transfer + Circuits Integration
 - **Circuits (CTX)**: A simple Key-Value-Label database to store economic data
-- **Streams (STX)**: Stream economic data to synchronize devices & databases in real time (beta)
+- **Streams (STX)**: Stream economic data to synchronize devices and databases in real time
 
 ## Community Cell Features
 - **Circuits (CTX)**: A simple Key-Value-Label database (perfect for testing and side projects)
+- **Streams (STX)**: Stream economic data to synchronize devices and databases in real time
 
 ## Getting Started
 Create your Neuronum Business/Community Cell: [Create Cell](https://neuronum.net/createcell)
 
-
 Install the Neuronum library using pip:
 ```bash
 pip install neuronum
 ```
 
-Set & test Cell connection:
+Set and test Cell connection:
 ```bash
 import neuronum
 
@@ -50,23 +50,22 @@ password="your_password",
 network="neuronum.net",
 synapse="your_synapse"
 )
-
 cell.test_connection()
 ```
 
+### Transmitters (TX)
 Activate Transmitter (TX):
 ```bash
 TX = "id::tx"
-
 data = {
     "key1": "value1",
     "key2": "value2",
     "key3": "value3",
 }
-
 cell.activate(TX, data)
 ```
 
+### Circuits (CTX)
 Store data on your private Circuit (CTX):
 ```bash
 label = "your_label"
@@ -81,7 +80,6 @@ cell.store(label, data)
 Store data on a public Circuit (CTX):
 ```bash
 CTX = "id::ctx"
-
 label = "your_label"
 data = {
     "key1": "value1",
@@ -94,7 +92,6 @@ cell.store(label, data, CTX)
 Load data from your private Circuit (CTX):
 ```bash
 label = "your_label"
-
 data = cell.load(label)
 key1 = data["key1"]
 key2 = data["key2"]
@@ -104,9 +101,7 @@ key3 = data["key3"]
 Load data from a public Circuit (CTX):
 ```bash
 CTX = "id::ctx"
-
 label = "your_label"
-
 data = cell.load(label, CTX)
 key1 = data["key1"]
 key2 = data["key2"]
@@ -122,20 +117,24 @@ data = cell.delete(label)
 Delete data from a public Circuit (CTX):
 ```bash
 CTX = "id::ctx"
-
 label = "your_label"
 data = cell.delete(label, CTX)
 ```
 
+### Streams (STX)
 Stream data:
 ```bash
-data = "your_data"
-cell.stream(data)
+label = "your_label"
+data = {
+    "key1": "value1",
+    "key2": "value2",
+    "key3": "value3",
+}
+cell.stream(label, data)
 ```
 
-Sync data:
+Sync stream:
 ```bash
-STX = "stx::id"
-data = cell.sync(STX)
+stream = cell.sync()
 ```
 

{neuronum-1.2.1 → neuronum-1.2.3}/README.md

@@ -9,21 +9,21 @@ Interact with the `Neuronum Network` to build, connect & automate economic data
 ## Business Cell Features
 - **Transmitters (TX)**: Automate economic data transfer + Circuits Integration
 - **Circuits (CTX)**: A simple Key-Value-Label database to store economic data
-- **Streams (STX)**: Stream economic data to synchronize devices & databases in real time (beta)
+- **Streams (STX)**: Stream economic data to synchronize devices and databases in real time
 
 ## Community Cell Features
 - **Circuits (CTX)**: A simple Key-Value-Label database (perfect for testing and side projects)
+- **Streams (STX)**: Stream economic data to synchronize devices and databases in real time
 
 ## Getting Started
 Create your Neuronum Business/Community Cell: [Create Cell](https://neuronum.net/createcell)
 
-
 Install the Neuronum library using pip:
 ```bash
 pip install neuronum
 ```
 
-Set & test Cell connection:
+Set and test Cell connection:
 ```bash
 import neuronum
 
@@ -33,23 +33,22 @@ password="your_password",
 network="neuronum.net",
 synapse="your_synapse"
 )
-
 cell.test_connection()
 ```
 
+### Transmitters (TX)
 Activate Transmitter (TX):
 ```bash
 TX = "id::tx"
-
 data = {
     "key1": "value1",
     "key2": "value2",
     "key3": "value3",
 }
-
 cell.activate(TX, data)
 ```
 
+### Circuits (CTX)
 Store data on your private Circuit (CTX):
 ```bash
 label = "your_label"
@@ -64,7 +63,6 @@ cell.store(label, data)
 Store data on a public Circuit (CTX):
 ```bash
 CTX = "id::ctx"
-
 label = "your_label"
 data = {
     "key1": "value1",
@@ -77,7 +75,6 @@ cell.store(label, data, CTX)
 Load data from your private Circuit (CTX):
 ```bash
 label = "your_label"
-
 data = cell.load(label)
 key1 = data["key1"]
 key2 = data["key2"]
@@ -87,9 +84,7 @@ key3 = data["key3"]
 Load data from a public Circuit (CTX):
 ```bash
 CTX = "id::ctx"
-
 label = "your_label"
-
 data = cell.load(label, CTX)
 key1 = data["key1"]
 key2 = data["key2"]
@@ -105,20 +100,24 @@ data = cell.delete(label)
 Delete data from a public Circuit (CTX):
 ```bash
 CTX = "id::ctx"
-
 label = "your_label"
 data = cell.delete(label, CTX)
 ```
 
+### Streams (STX)
 Stream data:
 ```bash
-data = "your_data"
-cell.stream(data)
+label = "your_label"
+data = {
+    "key1": "value1",
+    "key2": "value2",
+    "key3": "value3",
+}
+cell.stream(label, data)
 ```
 
-Sync data:
+Sync stream:
 ```bash
-STX = "stx::id"
-data = cell.sync(STX)
+stream = cell.sync()
 ```
 

{neuronum-1.2.1 → neuronum-1.2.3}/neuronum/neuronum.py

@@ -4,6 +4,7 @@ from typing import Optional
 import ssl
 from websocket import create_connection
 from typing import List
+import json
 
 
 class Cell:
@@ -24,8 +25,8 @@ class Cell:
     def __repr__(self) -> str:
         return f"Cell(host={self.host}, password={self.password}, network={self.network}, synapse={self.synapse})"
 
-    def activate(self, txID: str, data: dict, base_url: str = "https://{network}/activateTX"):
-        full_url = base_url.format(network=self.network) + f"/{txID}"
+    def activate(self, txID: str, data: dict):
+        url = f"https://{self.network}/activateTX/{txID}"
 
         TX = {
             "data": data,
@@ -34,13 +35,13 @@ class Cell:
 
         try:
             response = requests.post(
-                full_url,
+                url,
                 json=TX,
             )
 
             response.raise_for_status()
 
-            print(f"Response from FastAPI backend: {response.json()}")
+            print(f"Response from Neuronum: {response.json()}")
 
         except requests.exceptions.RequestException as e:
             print(f"Error sending request: {e}")
@@ -49,17 +50,15 @@ class Cell:
 
 
 
-    def test_connection(self, base_url: str = "https://{network}/testConnection"):
-            full_url = base_url.format(network=self.network)
-
-            print(f"Full URL: {full_url}")
+    def test_connection(self):
+            url = f"https://{self.network}/testConnection"
 
             test = {
                 "cell": self.to_dict() 
             }
 
             try:
-                response = requests.post(full_url, json=test)
+                response = requests.post(url, json=test)
                 response.raise_for_status()
                 print(response.json())
             except requests.exceptions.RequestException as e:
@@ -83,7 +82,7 @@ class Cell:
         try:
             response = requests.post(full_url, json=store)
             response.raise_for_status()
-            print(f"Response from FastAPI backend: {response.json()}")
+            print(f"Response from Neuronum: {response.json()}")
         except requests.exceptions.RequestException as e:
             print(f"Error sending request: {e}")
         except Exception as e:
@@ -161,7 +160,7 @@ class Cell:
 
 
 
-    def stream(self, data):
+    def stream(self, label: str, data: dict, stx: Optional[str] = None):
         context = ssl.create_default_context()
         context.check_hostname = True
         context.verify_mode = ssl.CERT_REQUIRED
@@ -171,16 +170,22 @@ class Cell:
         print("SSL socket set")
 
         try:
-            print(f"Connecting to {self.network} on port 55555...")
+
+            stream = {
+                "label": label,
+                "data": data,
+            }
+
+            print(f"Connecting to {self.network}")
             self.sock.connect((self.network, 55555))
             print("SSL socket connected")
 
-            if not self.authenticate(self.sock):
+            if not self.authenticate(self.sock, stx):
                 print("Authentication failed. Cannot stream.")
                 return
 
-            self.sock.sendall(data.encode('utf-8'))
-            print(f"Sent: {data}")
+            self.sock.sendall(json.dumps(stream).encode('utf-8'))
+            print(f"Sent: {stream}")
 
         except ssl.SSLError as e:
             print(f"SSL error occurred: {e}")
@@ -193,38 +198,49 @@ class Cell:
             print("SSL connection closed.")
 
 
-    def authenticate(self, sock):
-        credentials = f"{self.host}\n{self.password}\n{self.synapse}\n"
-        sock.sendall(credentials.encode('utf-8'))
-        
-        response = sock.recv(1024).decode('utf-8')
-        print(response)
-        return "Authentication successful" in response
+    def authenticate(self, sock, stx: Optional[str] = None):
+            credentials = f"{self.host}\n{self.password}\n{self.synapse}\n{stx}\n"
+            sock.sendall(credentials.encode('utf-8'))
+            
+            response = sock.recv(1024).decode('utf-8')
+            print(response)
+            return "Authentication successful" in response
     
 
-    def sync(self, STX: str) -> List[str]:
-        data = []
-        try:
-            ws = create_connection(f"wss://{self.network}/ws/{STX}")
-            print(f"Connected to Stream {STX}")
-        except Exception as e:
-            print(f"Failed to connect: {e}")
-            return data
+    def sync(self, stx: Optional[str] = None) -> List[str]:
+        stream = []
+        auth = {
+            "host": self.host,
+            "password": self.password,
+            "synapse": self.synapse,
+        }
+        print(f"Auth Payload: {auth}")
 
-        try:
-            while True:
-                message = ws.recv()
-                print(f"Received Data: {message}")
-                data.append(message)
-        except KeyboardInterrupt:
-            print("Closing connection...")
-        except Exception as e:
-            print(f"Error during data collection: {e}")
-        finally:
-            ws.close()
-            print("Connection closed.")
+        while True:
+            try:
+                ws = create_connection(f"wss://{self.network}/sync/{stx}")
+                ws.settimeout(1)  # Set timeout for receiving data
+                ws.send(json.dumps(auth))
+                print("Connected to WebSocket.")
+
+                while True:
+                    try:
+                        message = ws.recv()
+                        print(f"Received Data: {message}")
+                        stream.append(message)
+                    except socket.timeout:
+                        # Timeout occurred, but keep the connection open
+                        print("Timeout occurred, no data received.")
+                    except KeyboardInterrupt:
+                        print("Closing connection...")
+                        ws.close()
+                        return stream
+            except Exception as e:
+                print(f"Connection failed: {e}")
+            finally:
+                if ws:
+                    ws.close()
+                    print("Connection closed, retrying...")
 
-        return data
-    
   
 __all__ = ['Cell']

{neuronum-1.2.1 → neuronum-1.2.3}/neuronum.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: neuronum
-Version: 1.2.1
+Version: 1.2.3
 Summary: Interact with the Neuronum Network to build, connect & automate economic data streams
 Home-page: https://neuronum.net
 Author: Neuronum Cybernetics
@@ -26,21 +26,21 @@ Interact with the `Neuronum Network` to build, connect & automate economic data
 ## Business Cell Features
 - **Transmitters (TX)**: Automate economic data transfer + Circuits Integration
 - **Circuits (CTX)**: A simple Key-Value-Label database to store economic data
-- **Streams (STX)**: Stream economic data to synchronize devices & databases in real time (beta)
+- **Streams (STX)**: Stream economic data to synchronize devices and databases in real time
 
 ## Community Cell Features
 - **Circuits (CTX)**: A simple Key-Value-Label database (perfect for testing and side projects)
+- **Streams (STX)**: Stream economic data to synchronize devices and databases in real time
 
 ## Getting Started
 Create your Neuronum Business/Community Cell: [Create Cell](https://neuronum.net/createcell)
 
-
 Install the Neuronum library using pip:
 ```bash
 pip install neuronum
 ```
 
-Set & test Cell connection:
+Set and test Cell connection:
 ```bash
 import neuronum
 
@@ -50,23 +50,22 @@ password="your_password",
 network="neuronum.net",
 synapse="your_synapse"
 )
-
 cell.test_connection()
 ```
 
+### Transmitters (TX)
 Activate Transmitter (TX):
 ```bash
 TX = "id::tx"
-
 data = {
     "key1": "value1",
     "key2": "value2",
     "key3": "value3",
 }
-
 cell.activate(TX, data)
 ```
 
+### Circuits (CTX)
 Store data on your private Circuit (CTX):
 ```bash
 label = "your_label"
@@ -81,7 +80,6 @@ cell.store(label, data)
 Store data on a public Circuit (CTX):
 ```bash
 CTX = "id::ctx"
-
 label = "your_label"
 data = {
     "key1": "value1",
@@ -94,7 +92,6 @@ cell.store(label, data, CTX)
 Load data from your private Circuit (CTX):
 ```bash
 label = "your_label"
-
 data = cell.load(label)
 key1 = data["key1"]
 key2 = data["key2"]
@@ -104,9 +101,7 @@ key3 = data["key3"]
 Load data from a public Circuit (CTX):
 ```bash
 CTX = "id::ctx"
-
 label = "your_label"
-
 data = cell.load(label, CTX)
 key1 = data["key1"]
 key2 = data["key2"]
@@ -122,20 +117,24 @@ data = cell.delete(label)
 Delete data from a public Circuit (CTX):
 ```bash
 CTX = "id::ctx"
-
 label = "your_label"
 data = cell.delete(label, CTX)
 ```
 
+### Streams (STX)
 Stream data:
 ```bash
-data = "your_data"
-cell.stream(data)
+label = "your_label"
+data = {
+    "key1": "value1",
+    "key2": "value2",
+    "key3": "value3",
+}
+cell.stream(label, data)
 ```
 
-Sync data:
+Sync stream:
 ```bash
-STX = "stx::id"
-data = cell.sync(STX)
+stream = cell.sync()
 ```
 

{neuronum-1.2.1 → neuronum-1.2.3}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='neuronum',
-    version='1.2.1',
+    version='1.2.3',
     author='Neuronum Cybernetics',
     author_email='welcome@neuronum.net',
     description='Interact with the Neuronum Network to build, connect & automate economic data streams',