slm-open-api-package 0.2.2__tar.gz → 0.2.3__tar.gz

{slm_open_api_package-0.2.2 → slm_open_api_package-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: slm_open_api_package
-Version: 0.2.2
+Version: 0.2.3
 Summary: Add your description here
 Author: Sofus Vingaard
 Author-email: Sofus Vingaard <sofus.krebsvingaard@hbkworld.com>

{slm_open_api_package-0.2.2 → slm_open_api_package-0.2.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "slm_open_api_package"
-version = "0.2.2"
+version = "0.2.3"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.12"

{slm_open_api_package-0.2.2 → slm_open_api_package-0.2.3}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "slm_open_api_package"
-version = "0.2.2"
+version = "0.2.3"
 description = "Add your description here"
 readme = "README.md"
 authors = [

{slm_open_api_package-0.2.2 → slm_open_api_package-0.2.3}/src/slm_api/example_multi.py

@@ -22,7 +22,7 @@ from slm_api.helpers import stream_handlers as sh
 from slm_api.helpers.data_handler import DataHandler
 from slm_api.helpers.https_requests import UseHttps
 
-UseHttps(use_https=False)
+# UseHttps(use_https=False)
 
 host, ip = webxi_helper.set_host_ip(__file__)
 

{slm_open_api_package-0.2.2 → slm_open_api_package-0.2.3}/src/slm_api/helpers/https_requests.py

@@ -18,6 +18,14 @@ class WebxiAdapter(HTTPAdapter):
         kwargs["assert_hostname"] = False  # urllib3 does its own SAN check independent of ssl_context.check_hostname
         return super().init_poolmanager(*args, **kwargs)
 
+def build_ssl_context():
+    """SSLContext trusting only webxi_root.pem, with hostname checking disabled."""
+    ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+    ctx.load_verify_locations(cafile=str(_CERT_FILE))
+    ctx.check_hostname = False
+    ctx.verify_mode = ssl.CERT_REQUIRED
+    return ctx
+
 
 _session = requests.Session()
 if _CERT_FILE.is_file():
@@ -26,6 +34,8 @@ if _CERT_FILE.is_file():
 class UseHttps:
     use_https = True  # class attribute: shared, module-wide default
 
+    
+
     def __init__(self, use_https=None):
         if use_https is not None:
             UseHttps.use_https = use_https

{slm_open_api_package-0.2.2 → slm_open_api_package-0.2.3}/src/slm_api/helpers/stream_handler.py

@@ -20,8 +20,12 @@ def setup_stream(host,ip,sequenceID,StreamName):
     if not (response.status_code == 201):  
         print(response.text)
         raise Exception("Cannot start stream, could be bacause of to many streams open on the device")
-    return 'ws://' + ip + response.json()["URI"][0]
-
+    https = https_requests.UseHttps.use_https
+    if https:
+        return 'wss://' + ip + response.json()["URI"][0]
+    else:
+        return 'ws://' + ip + response.json()["URI"][0]
+    
 def get_stream_ID(host, streamName):
     """This function shows how to find the ID of a specific stream with specific name"""
     streams = https_requests.get(host, "/WebXi/Streams?recursive").json()

{slm_open_api_package-0.2.2 → slm_open_api_package-0.2.3}/src/slm_api/helpers/websocket_handler.py

@@ -1,8 +1,10 @@
 import websockets
 import asyncio
+from . import https_requests
 
 async def next_async_websocket(uri, packetHandler):
     """Function which awaits response from the websocket and calls the packetHandler"""
-    async with websockets.connect(uri, ping_interval = None) as websocket:
+    ssl_context = https_requests.build_ssl_context() if uri.startswith("wss://") else None
+    async with websockets.connect(uri, ping_interval=None, ssl=ssl_context) as websocket:
         async for message in websocket:
             packetHandler(message)

{slm_open_api_package-0.2.2 → slm_open_api_package-0.2.3}/src/slm_api/helpers/webxi_helper_functions.py

@@ -7,13 +7,17 @@ from slm_api.helpers.https_requests import get, put
 
 # Functions to turn on/off BB freq weights and sequences. These are used in the examples to make sure the wanted sequences are enabled on the SLM.
 def turn_off_bb_freq_weight(host):
+    
     for endpoint in (
         "/webxi/Applications/SLM/Setup/BBFreqWeightB",
         "/webxi/Applications/SLM/Setup/BBFreqWeightZ",
         "/webxi/Applications/SLM/Setup/BBFreqWeightA",
         "/webxi/Applications/SLM/Setup/BBFreqWeightC",
     ):
-        put(host , endpoint, json=False, timeout=10)
+        try:
+            put(host , endpoint, json=False, timeout=10)
+        except requests.exceptions.HTTPError as exc:
+            print(f"Skipping {endpoint}: {exc}")
 
 def turn_on_bb_freq_weight(host, weights, fast=False):
     weights = [weights] if isinstance(weights, str) else weights

slm_open_api_package-0.2.3/src/slm_api/multi_instrument_example.py

@@ -0,0 +1,83 @@
+"""
+18. Stream FastLAF (Sequence 115)
+-----------------------------------
+Streams the FastLAF (LAeq) broadband Leq value from sequence 115
+and pretty-prints each received value to the terminal.
+
+Sequence 115 properties:
+  Name:            FastLAF
+  LocalName:       LAeq
+  FunctionType:    BroadbandLeq
+  DataType:        Int16
+  Scale:           0.01
+  Weighting:       A
+  AveragingMode:   Linear
+  Unit:            dB re 20uPa
+"""
+
+import time
+import threading
+
+# Reuse existing help functions
+import slm_api.helpers.stream_handler as stream
+import slm_api.helpers.measurment_handler as meas
+from slm_api.helpers.stream_handlers import WebXiStreamHandler
+from slm_api.helpers.data_handler import DataHandler
+
+# enums
+from slm_api.enums.sequence_id_enum import SequenceIdEnums
+from slm_api.enums.fast_log_intervals_enum import FastLogInterval
+from slm_api.helpers import webxi_helper_functions as webxi_helper
+
+SCALE = 0.01  # Raw Int16 value * SCALE = dB
+
+# WebXi header timestamps are 64-bit fixed-point seconds since the Unix epoch
+# (Q32.32): upper 32 bits = whole seconds, lower 32 bits = fraction of a second.
+WEBXI_TICKS_PER_SECOND = 2 ** 32
+
+FAST_LOGGING_INTERVAL_MS = FastLogInterval.interval_1000ms.value
+SEQUENCE_ID = SequenceIdEnums.LAeq.value
+sequenceNames = ["FastLAF"]
+
+
+class PrintDataHandler(DataHandler):
+    def handle(self, timestamp, name, local, value, unit, **_ignored):
+        print(f"{timestamp}{name} ({local}): {value:7.2f} {unit}")
+
+
+if __name__ == "__main__":
+
+    streams = []
+    devices = [
+        ("http://192.168.1.216", "192.168.1.216"),
+        ("http://192.168.1.191", "192.168.1.191"),
+        ("http://192.168.1.183", "192.168.1.183"),
+    ]
+
+    for dev_host, dev_ip in devices:
+        webxi_helper.turn_off_bb_freq_weight(dev_host)
+        webxi_helper.turn_on_bb_freq_weight(dev_host, "A")
+
+        s = WebXiStreamHandler(
+            host=dev_host,
+            ip=dev_ip,
+            sequenceID=SEQUENCE_ID,
+            fast_logging_interval=FAST_LOGGING_INTERVAL_MS,
+            streamName=f"Stream_{dev_ip}",
+        )
+        s.setDataHandler(PrintDataHandler())
+        streams.append(s)
+
+    for s in streams:
+        threading.Thread(target=s.startStream, daemon=True).start()
+
+    try:
+        while True:
+            time.sleep(1)
+    except KeyboardInterrupt:
+        for s in streams:
+            if s.data_handler is not None:
+                s.data_handler.close()
+            stream.delete_stream(s.host, s.streamName)
+            meas.stop_measurement(s.host)
+        print("\nStreams stopped by user.")