neuronum 1.3.0__tar.gz → 1.3.2__tar.gz

{neuronum-1.3.0 → neuronum-1.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: neuronum
-Version: 1.3.0
+Version: 1.3.2
 Summary: Interact with the Neuronum Network to build, connect & automate economic data streams
 Home-page: https://neuronum.net
 Author: Neuronum Cybernetics
@@ -133,7 +133,7 @@ cell.clear(CTX)
 ```
 
 ### Streams (STX)
-Stream data:
+Stream data to your private Stream (STX):
 ```bash
 label = "your_label"
 data = {
@@ -144,7 +144,19 @@ data = {
 cell.stream(label, data)
 ```
 
-Sync stream:
+Stream data to a public Stream (STX):
+```bash
+STX = "id::stx"
+label = "your_label"
+data = {
+    "key1": "value1",
+    "key2": "value2",
+    "key3": "value3",
+}
+cell.stream(label, data, STX)
+```
+
+Sync data from your private Stream (STX):
 ```bash
 stream = cell.sync()
 for operation in stream:
@@ -155,3 +167,15 @@ for operation in stream:
     operator = operation.get("operator")
 ```
 
+Sync data from a public Stream (STX):
+```bash
+STX = "id::stx"
+stream = cell.sync(STX)
+for operation in stream:
+    label = operation.get("label")
+    value = operation.get("data").get("key1")
+    ts = operation.get("time")
+    stxID = operation.get("stxID")
+    operator = operation.get("operator")
+```
+

{neuronum-1.3.0 → neuronum-1.3.2}/README.md

@@ -116,7 +116,7 @@ cell.clear(CTX)
 ```
 
 ### Streams (STX)
-Stream data:
+Stream data to your private Stream (STX):
 ```bash
 label = "your_label"
 data = {
@@ -127,7 +127,19 @@ data = {
 cell.stream(label, data)
 ```
 
-Sync stream:
+Stream data to a public Stream (STX):
+```bash
+STX = "id::stx"
+label = "your_label"
+data = {
+    "key1": "value1",
+    "key2": "value2",
+    "key3": "value3",
+}
+cell.stream(label, data, STX)
+```
+
+Sync data from your private Stream (STX):
 ```bash
 stream = cell.sync()
 for operation in stream:
@@ -138,3 +150,15 @@ for operation in stream:
     operator = operation.get("operator")
 ```
 
+Sync data from a public Stream (STX):
+```bash
+STX = "id::stx"
+stream = cell.sync(STX)
+for operation in stream:
+    label = operation.get("label")
+    value = operation.get("data").get("key1")
+    ts = operation.get("time")
+    stxID = operation.get("stxID")
+    operator = operation.get("operator")
+```
+

{neuronum-1.3.0 → neuronum-1.3.2}/neuronum/neuronum.py

@@ -24,6 +24,16 @@ class Cell:
 
     def __repr__(self) -> str:
         return f"Cell(host={self.host}, password={self.password}, network={self.network}, synapse={self.synapse})"
+    
+    
+    def authenticate(self, stx: Optional[str] = None):
+        credentials = f"{self.host}\n{self.password}\n{self.synapse}\n{stx}\n"
+        self.sock.sendall(credentials.encode('utf-8'))
+
+        response = self.sock.recv(1024).decode('utf-8')
+        print(response)
+        return "Authentication successful" in response
+    
 
     def activate(self, txID: str, data: dict):
         url = f"https://{self.network}/activateTX/{txID}"
@@ -161,29 +171,31 @@ class Cell:
 
 
     def stream(self, label: str, data: dict, stx: Optional[str] = None):
+        """Stream data after authenticating once."""
         context = ssl.create_default_context()
         context.check_hostname = True
         context.verify_mode = ssl.CERT_REQUIRED
+
         raw_sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         self.sock = context.wrap_socket(raw_sock, server_hostname=self.network)
 
         print("SSL socket set")
 
         try:
-
-            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, stx):
+            if not self.authenticate(stx):
                 print("Authentication failed. Cannot stream.")
                 return
 
+            # Stream data
+            stream = {
+                "label": label,
+                "data": data,
+            }
+
             self.sock.sendall(json.dumps(stream).encode('utf-8'))
             print(f"Sent: {stream}")
 
@@ -197,16 +209,6 @@ class Cell:
             self.sock.close()
             print("SSL connection closed.")
 
-
-    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: Optional[str] = None) -> Generator[str, None, None]:
         auth = {
             "host": self.host,
@@ -218,7 +220,7 @@ class Cell:
         while True:
             try:
                 ws = create_connection(f"wss://{self.network}/sync/{stx}")
-                ws.settimeout(1)
+                ws.settimeout(10)
                 ws.send(json.dumps(auth))
                 print("Connected to WebSocket.")
 
@@ -228,7 +230,7 @@ class Cell:
                         operation = json.loads(raw_operation)
                         yield operation
                     except socket.timeout:
-                        print("Timeout occurred, no data received.")
+                        print("Waiting for stream...")
                     except KeyboardInterrupt:
                         print("Closing connection...")
                         ws.close()

{neuronum-1.3.0 → neuronum-1.3.2}/neuronum.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: neuronum
-Version: 1.3.0
+Version: 1.3.2
 Summary: Interact with the Neuronum Network to build, connect & automate economic data streams
 Home-page: https://neuronum.net
 Author: Neuronum Cybernetics
@@ -133,7 +133,7 @@ cell.clear(CTX)
 ```
 
 ### Streams (STX)
-Stream data:
+Stream data to your private Stream (STX):
 ```bash
 label = "your_label"
 data = {
@@ -144,7 +144,19 @@ data = {
 cell.stream(label, data)
 ```
 
-Sync stream:
+Stream data to a public Stream (STX):
+```bash
+STX = "id::stx"
+label = "your_label"
+data = {
+    "key1": "value1",
+    "key2": "value2",
+    "key3": "value3",
+}
+cell.stream(label, data, STX)
+```
+
+Sync data from your private Stream (STX):
 ```bash
 stream = cell.sync()
 for operation in stream:
@@ -155,3 +167,15 @@ for operation in stream:
     operator = operation.get("operator")
 ```
 
+Sync data from a public Stream (STX):
+```bash
+STX = "id::stx"
+stream = cell.sync(STX)
+for operation in stream:
+    label = operation.get("label")
+    value = operation.get("data").get("key1")
+    ts = operation.get("time")
+    stxID = operation.get("stxID")
+    operator = operation.get("operator")
+```
+

{neuronum-1.3.0 → neuronum-1.3.2}/setup.py

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