neuronum 1.2.0__py3-none-any.whl → 1.2.2__py3-none-any.whl

neuronum/neuronum.py

@@ -3,6 +3,8 @@ import socket
 from typing import Optional
 import ssl
 from websocket import create_connection
+from typing import List
+import json
 
 
 class Cell:
@@ -23,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,
@@ -33,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}")
@@ -48,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:
@@ -82,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:
@@ -160,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
@@ -170,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}")
@@ -192,31 +198,46 @@ 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):
+    def sync(self, stx: Optional[str] = None) -> List[str]:
+        stream = []
         try:
-            ws = create_connection(f"wss://{self.network}/ws/{STX}")
-            print(f"Connected to Stream {STX}")
+            auth = {
+                "host": self.host,
+                "password": self.password,
+                "synapse": self.synapse,
+            }
+
+            ws = create_connection(f"wss://{self.network}/sync/{stx}")
+            ws.settimeout(1)
+            print(f"Auth Payload: {auth}")
+            ws.send(json.dumps(auth))
+
         except Exception as e:
             print(f"Failed to connect: {e}")
-            return
+            return stream
 
         try:
             while True:
                 message = ws.recv()
                 print(f"Received Data: {message}")
+                stream.append(message)
         except KeyboardInterrupt:
             print("Closing connection...")
+        except Exception as e:
+            print(f"Error during data collection: {e}")
         finally:
             ws.close()
-    
+            print("Connection closed.")
+
+        return stream
   
 __all__ = ['Cell']

{neuronum-1.2.0.dist-info → neuronum-1.2.2.dist-info}/METADATA

@@ -1,10 +1,11 @@
 Metadata-Version: 2.1
 Name: neuronum
-Version: 1.2.0
+Version: 1.2.2
 Summary: Interact with the Neuronum Network to build, connect & automate economic data streams
-Home-page: https://github.com/neuronumcybernetics/neuronum
+Home-page: https://neuronum.net
 Author: Neuronum Cybernetics
 Author-email: welcome@neuronum.net
+Project-URL: GitHub, https://github.com/neuronumcybernetics/neuronum
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
@@ -25,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
 
@@ -49,24 +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",
-    "key4": "value4"
 }
-
 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,19 +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"
-cell.sync(STX)
+stream = cell.sync()
 ```
+

neuronum-1.2.2.dist-info/RECORD

@@ -0,0 +1,7 @@
+neuronum/__init__.py,sha256=Drsm263_w3_VWgl1YsKLUr8WwVodqV3TSjqpxLjyq_M,46
+neuronum/neuronum.py,sha256=Y0BMTTfBM3E9scEM57aDNj6wkwRH6yA0XwLj0nohodQ,7290
+neuronum-1.2.2.dist-info/LICENSE,sha256=UiZjNHiCyRP6WoZfbYQh9cv4JW96wIofKXmzBJrYSUk,1125
+neuronum-1.2.2.dist-info/METADATA,sha256=nHWQUddV45PHdXejJxwxgca6fhrWk_9OcVrKOnTRSss,3423
+neuronum-1.2.2.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+neuronum-1.2.2.dist-info/top_level.txt,sha256=73zXVVO9UTTiwEcSaXytsJ8n0q47OCwAqPlIh-hzWJU,9
+neuronum-1.2.2.dist-info/RECORD,,

neuronum-1.2.0.dist-info/RECORD

@@ -1,8 +0,0 @@
-neuronum/__init__.py,sha256=Drsm263_w3_VWgl1YsKLUr8WwVodqV3TSjqpxLjyq_M,46
-neuronum/neuronum.py,sha256=06qogFQ_a3dOqa6dgvLadltcYj8mtnxAqBxsYafB2uU,6746
-neuronum-1.2.0.dist-info/LICENSE,sha256=UiZjNHiCyRP6WoZfbYQh9cv4JW96wIofKXmzBJrYSUk,1125
-neuronum-1.2.0.dist-info/METADATA,sha256=zEqH8GXUGxlrw5TtQQ4XwLp00TitmlkxscMA0JYd0Nw,3184
-neuronum-1.2.0.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-neuronum-1.2.0.dist-info/entry_points.txt,sha256=HAUSjcFCB-PSkwnZQy9qEaelZmzS6EmTMjrhPynPKg8,47
-neuronum-1.2.0.dist-info/top_level.txt,sha256=73zXVVO9UTTiwEcSaXytsJ8n0q47OCwAqPlIh-hzWJU,9
-neuronum-1.2.0.dist-info/RECORD,,

neuronum-1.2.0.dist-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-neuronum = neuronum.cli:main