ka9q-python 3.4.0__tar.gz → 3.4.2__tar.gz

{ka9q_python-3.4.0/ka9q_python.egg-info → ka9q_python-3.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ka9q-python
-Version: 3.4.0
+Version: 3.4.2
 Summary: Python interface for ka9q-radio control and monitoring
 Home-page: https://github.com/mijahauan/ka9q-python
 Author: Michael Hauan AC0G
@@ -48,6 +48,7 @@ Control radiod channels for any application: AM/FM/SSB radio, WSPR monitoring, S
 
 - [Features](#features)
 - [Installation](#installation)
+- [Getting Started](docs/GETTING_STARTED.md)
 - [Quick Start](#quick-start)
 - [Documentation](#documentation)
 - [Examples](#examples)

{ka9q_python-3.4.0 → ka9q_python-3.4.2}/README.md

@@ -13,6 +13,7 @@ Control radiod channels for any application: AM/FM/SSB radio, WSPR monitoring, S
 
 - [Features](#features)
 - [Installation](#installation)
+- [Getting Started](docs/GETTING_STARTED.md)
 - [Quick Start](#quick-start)
 - [Documentation](#documentation)
 - [Examples](#examples)

{ka9q_python-3.4.0 → ka9q_python-3.4.2}/examples/stream_example.py

@@ -123,15 +123,13 @@ def main():
     if args.discover:
         print("Discovering channels...")
         channels = discover_channels(timeout=3.0)
-        channel = None
-        for ch in channels:
-            if ch.ssrc == args.ssrc:
-                channel = ch
-                break
+        
+        # FIX: Properly access the channel from the dictionary
+        channel = channels.get(args.ssrc)
         
         if channel is None:
             print(f"SSRC {args.ssrc} not found in discovered channels")
-            print(f"Available SSRCs: {[ch.ssrc for ch in channels]}")
+            print(f"Available SSRCs: {list(channels.keys())}")
             return 1
         
         print(f"Found channel: {channel.frequency/1e6:.3f} MHz, {channel.sample_rate} Hz")

{ka9q_python-3.4.0 → ka9q_python-3.4.2}/ka9q/__init__.py

@@ -56,7 +56,7 @@ Lower-level usage (explicit control):
         )
         print(f"Created channel with SSRC: {ssrc}")
 """
-__version__ = '3.3.0'
+__version__ = '3.4.2'
 __author__ = 'Michael Hauan AC0G'
 
 from .control import RadiodControl, allocate_ssrc

{ka9q_python-3.4.0 → ka9q_python-3.4.2}/ka9q/control.py

@@ -25,6 +25,7 @@ import struct
 import secrets
 import logging
 import threading
+import hashlib
 import re
 import time
 from dataclasses import dataclass, field
@@ -100,18 +101,25 @@ def allocate_ssrc(
         >>> ssrc2 = allocate_ssrc(10.0e6, "iq", 16000)
         >>> assert ssrc == ssrc2
     """
-    # Match signal-recorder's StreamSpec.__hash__() algorithm
-    key = (
-        round(frequency_hz),      # Frequency rounded to nearest Hz
-        preset.lower(),           # Preset normalized to lowercase
-        sample_rate,              # Sample rate as-is
-        agc,                      # AGC boolean
-        round(gain, 1),           # Gain rounded to 0.1 dB
-        destination,              # Destination address (None or string)
-        encoding                  # Encoding type (int)
+    # Create a stable string key from parameters
+    # The format and rounding match signal-recorder's StreamSpec hash logic.
+    key_str = (
+        f"{round(frequency_hz)}|"      # Frequency rounded to nearest Hz
+        f"{preset.lower()}|"           # Preset normalized to lowercase
+        f"{sample_rate}|"              # Sample rate
+        f"{'1' if agc else '0'}|"      # AGC as 1/0
+        f"{round(gain, 1)}|"           # Gain rounded to 0.1 dB
+        f"{destination or ''}|"        # Destination (empty string if None)
+        f"{encoding}"                  # Encoding type
     )
-    # Keep positive, 31 bits (matches signal-recorder)
-    return hash(key) & 0x7FFFFFFF
+    
+    # Use SHA-256 for a stable, platform-independent hash
+    h = hashlib.sha256(key_str.encode()).digest()
+    
+    # Convert first 4 bytes to integer (big-endian)
+    # Keep positive and 31 bits to match signal-recorder's SSRC range
+    ssrc_full = int.from_bytes(h[:4], byteorder='big')
+    return ssrc_full & 0x7FFFFFFF
 
 
 # Input validation functions
@@ -1964,6 +1972,8 @@ class RadiodControl:
                 status['rf_atten'] = decode_float(data, optlen)
             elif type_val == StatusType.RF_AGC:
                 status['rf_agc'] = decode_int(data, optlen)
+            elif type_val == StatusType.DESCRIPTION:
+                status['description'] = decode_string(data, optlen)
             elif type_val == StatusType.PRESET:
                 status['preset'] = decode_string(data, optlen)
             elif type_val == StatusType.LOW_EDGE:

{ka9q_python-3.4.0 → ka9q_python-3.4.2}/ka9q/discovery.py

@@ -33,6 +33,7 @@ class ChannelInfo:
     gps_time: Optional[int] = None  # GPS nanoseconds when RTP_TIMESNAP was captured
     rtp_timesnap: Optional[int] = None  # RTP timestamp at GPS_TIME
     encoding: int = 0  # stream encoding (0=none, 4=F32, etc)
+    description: Optional[str] = None  # SDR hardware description
 
 
 def _create_status_listener_socket(multicast_addr: str, interface: Optional[str] = None) -> socket.socket:
@@ -208,7 +209,8 @@ def discover_channels_native(status_address: str, listen_duration: float = 2.0,
                 port=port,
                 gps_time=status.get('gps_time'),
                 rtp_timesnap=status.get('rtp_timesnap'),
-                encoding=status.get('encoding', 0)
+                encoding=status.get('encoding', 0),
+                description=status.get('description')
             )
             
             # Store or update channel info

{ka9q_python-3.4.0 → ka9q_python-3.4.2/ka9q_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ka9q-python
-Version: 3.4.0
+Version: 3.4.2
 Summary: Python interface for ka9q-radio control and monitoring
 Home-page: https://github.com/mijahauan/ka9q-python
 Author: Michael Hauan AC0G
@@ -48,6 +48,7 @@ Control radiod channels for any application: AM/FM/SSB radio, WSPR monitoring, S
 
 - [Features](#features)
 - [Installation](#installation)
+- [Getting Started](docs/GETTING_STARTED.md)
 - [Quick Start](#quick-start)
 - [Documentation](#documentation)
 - [Examples](#examples)

{ka9q_python-3.4.0 → ka9q_python-3.4.2}/ka9q_python.egg-info/SOURCES.txt

@@ -43,6 +43,7 @@ tests/conftest.py
 tests/test_addressing.py
 tests/test_channel_verification.py
 tests/test_create_split_encoding.py
+tests/test_decode_description.py
 tests/test_decode_functions.py
 tests/test_encode_functions.py
 tests/test_encode_socket.py

{ka9q_python-3.4.0 → ka9q_python-3.4.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ka9q-python"
-version = "3.4.0"
+version = "3.4.2"
 description = "Python interface for ka9q-radio control and monitoring"
 readme = "README.md"
 authors = [

{ka9q_python-3.4.0 → ka9q_python-3.4.2}/setup.py

@@ -12,7 +12,7 @@ long_description = readme.read_text() if readme.exists() else ''
 
 setup(
     name='ka9q-python',
-    version='3.4.0',
+    version='3.4.2',
     description='Python interface for ka9q-radio control and monitoring',
     long_description=long_description,
     long_description_content_type='text/markdown',

ka9q_python-3.4.2/tests/test_decode_description.py

@@ -0,0 +1,46 @@
+import sys
+import unittest
+from pathlib import Path
+from unittest.mock import patch, MagicMock
+
+# Add parent directory to path
+sys.path.insert(0, str(Path(__file__).parent.parent))
+
+from ka9q.control import RadiodControl
+from ka9q.types import StatusType
+
+class TestDescriptionDecoding(unittest.TestCase):
+    """Test SDR description decoding"""
+    
+    @patch('ka9q.control.RadiodControl._connect', return_value=None)
+    def test_decode_description(self, mock_connect):
+        """Verify that _decode_status_response decodes StatusType.DESCRIPTION correctly"""
+        # Create a RadiodControl instance (now safe due to mock)
+        control = RadiodControl("radiod.local")
+        
+        # Manually set attributes that __init__ might not have set due to mocked _connect
+        control.status_mcast_addr = "239.1.1.1"
+        control.metrics = MagicMock()
+        # Create a dummy status packet with a description
+        # Format: Packet Type (0), Tag (4), Length (N), Data (SDR Name)
+        description = "AirspyHF+"
+        desc_bytes = description.encode('utf-8')
+        desc_len = len(desc_bytes)
+        
+        # Construct buffer
+        # 0x00: Status packet type
+        # 0x04: StatusType.DESCRIPTION
+        # desc_len: Length
+        # desc_bytes: SDR Name
+        # 0xff: StatusType.EOL
+        buffer = bytes([0, StatusType.DESCRIPTION, desc_len]) + desc_bytes + bytes([StatusType.EOL])
+        
+        # Decode
+        status = control._decode_status_response(buffer)
+        
+        # Verify
+        self.assertIn('description', status)
+        self.assertEqual(status['description'], description)
+
+if __name__ == "__main__":
+    unittest.main()