bear-tools 0.2.0__tar.gz → 0.2.2__tar.gz

{bear_tools-0.2.0 → bear_tools-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bear-tools
-Version: 0.2.0
+Version: 0.2.2
 Summary: An assortment of QA/Automation related tools
 License: MIT
 Author: Sean Foley

{bear_tools-0.2.0 → bear_tools-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "bear-tools"
-version = "0.2.0"
+version = "0.2.2"
 description = "An assortment of QA/Automation related tools"
 authors = ["Sean Foley <sean.foley.engr@gmail.com>"]
 license = "MIT"

{bear_tools-0.2.0 → bear_tools-0.2.2}/src/bear_tools/cereal/__init__.py

@@ -1,5 +1,3 @@
-from pathlib import Path
-
 SERVER_ADDRESS:   str = 'localhost'
 SERVER_PORT_BASE: int = 14441
 
@@ -8,6 +6,3 @@ SERVER_COMMAND_CODE_SHUTDOWN: str = '__shutdown'
 SERVER_COMMAND_GET_CONFIG:    str = '__config'
 SERVER_COMMAND_ANNOTATE:      str = '__annotate:'
 END_OF_MESSAGE:               bytes = b'\x00\x00\x00'  # All network messages terminated with this detectable blob
-
-package_dir: Path = Path(__file__).parent.absolute()
-config_path: Path = Path(package_dir / 'config.yaml')

{bear_tools-0.2.0 → bear_tools-0.2.2}/src/bear_tools/cereal/client.py

@@ -330,7 +330,7 @@ class CerealClient(threading.Thread):
         are visually distinct.
 
         :param text: Message (command) to send
-        :param expect_output: If True, return camera output up to {timeout_sec} after sending the message
+        :param expect_output: If True, return device output up to {timeout_sec} after sending the message
         :param timeout_sec: How long to wait for expected output to start+stop before returning whatever we have
         :return: If {expect_output}, a list[str] containing output observed a result of sending {text}; otherwise, []
         """
@@ -345,7 +345,7 @@ class CerealClient(threading.Thread):
         Used internally by :meth:`send` and :meth:`annotate`.
 
         :param text: Message (command) to send
-        :param expect_output: If True, return camera output up to {timeout_sec} after sending the message
+        :param expect_output: If True, return device output up to {timeout_sec} after sending the message
         :param timeout_sec: How long to wait for expected output to start+stop before returning whatever we have
         :return: If {expect_output}, a list[str] containing output observed a result of sending {text}; otherwise, []
         """

{bear_tools-0.2.0 → bear_tools-0.2.2}/src/bear_tools/cereal/serial_manager.py

@@ -337,6 +337,7 @@ class SerialManager(threading.Thread):
         self.__talking_stick = threading.Lock()
         self.__stop_event = threading.Event()
         self.__processing_input = False  # input to this system from the serial device
+        self.__line_buffer: str = ''  # Holds trailing partial line across read() calls
 
         self.device:            serial.Serial | None = None
         self.listeners:         list[SerialListener] = []
@@ -447,22 +448,23 @@ class SerialManager(threading.Thread):
         """
         Generator Method
 
-        Split raw bytes from the serial device into lines, prepending timestamps to each
+        Split raw bytes from the serial device into lines, prepending timestamps to each.
+        Incomplete trailing fragments are buffered in ``__line_buffer`` and prepended to the
+        next chunk so that log lines are never split across two timestamps.
 
         :param raw: Raw bytes read from the serial device
         """
 
-        text = raw.decode(encoding='utf-8', errors='ignore')
+        text = self.__line_buffer + raw.decode(encoding='utf-8', errors='ignore')
+        self.__line_buffer = ''
         lines = text.split('\n')
 
-        for line in lines[:-1]:  # last line may be incomplete
-            timestamp = f'[{get_timestamp()}] ' if self.add_timestamps else ''
-            yield f'{timestamp}{line}\n'
+        # Last element is either '' (if text ended with \n) or an incomplete fragment
+        self.__line_buffer = lines.pop()
 
-        # Keep the last (possibly incomplete) fragment for the caller to handle
-        if lines[-1]:
+        for line in lines:
             timestamp = f'[{get_timestamp()}] ' if self.add_timestamps else ''
-            yield f'{timestamp}{lines[-1]}\n'
+            yield f'{timestamp}{line}\n'
 
 
     def run(self) -> None:

{bear_tools-0.2.0 → bear_tools-0.2.2}/src/bear_tools/cereal/server.py

@@ -80,7 +80,7 @@ class CerealServer(socketserver.ThreadingTCPServer):
         """
         Initializer
 
-        :param name: Nickname for the server (e.g. 'RTOS', 'Linux')
+        :param name: Nickname for the server (e.g. 'DeviceA', 'DeviceB')
         :param address: The ipaddress or host name on which the server should listen
         :param port: The port number that the server communicates through
         :param device_path: The path to a serial device

{bear_tools-0.2.0 → bear_tools-0.2.2}/src/bear_tools/enhanced_enum.py

@@ -38,7 +38,7 @@ class EnhancedEnum(Enum):
         """Return the member whose value equals `value`, or None if not found."""
         try:
             return cls(value)
-        except ValueError:
+        except (ValueError, TypeError):
             return None
 
     @classmethod
@@ -46,7 +46,7 @@ class EnhancedEnum(Enum):
         """Return the member name for `value`, or None if not found."""
         try:
             return cls(value).name
-        except ValueError:
+        except (ValueError, TypeError):
             return None
 
 

{bear_tools-0.2.0 → bear_tools-0.2.2}/src/bear_tools/macos_utils.py

@@ -70,6 +70,46 @@ def get_current_ssid() -> str | None:
     return get_current_ssid_macos15()
 
 
+def get_ssid_for_interface(interface: str) -> str | None:
+    """
+    Get the SSID currently joined on a specific Wi-Fi interface
+
+    :param interface: The wireless interface to query (e.g. 'en0', 'en1')
+    :return: The SSID joined on `interface` if any; None otherwise
+    """
+
+    macos_version: str = platform.mac_ver()[0]
+    if macos_version.startswith('14'):
+        return get_current_ssid_macos14_and_older(interface=interface)
+    return get_current_ssid_macos15(interface=interface)
+
+
+def get_local_ip_for_ssid(ssid: str, max_interface_index: int = 9) -> str | None:
+    """
+    Find this Mac's local IPv4 address on the NIC currently joined to a given SSID
+
+    Iterates `en0` through `en<max_interface_index>` looking for an interface that reports the
+    requested SSID via `networksetup -getairportnetwork` (or its macOS 15+ equivalent), then
+    returns the IPv4 address bound to that interface via `ipconfig getifaddr`.
+
+    :param ssid: The SSID to match against
+    :param max_interface_index: Highest `en<N>` index to probe (default 9)
+    :return: The IPv4 address as a string if found; None otherwise
+    """
+
+    for index in range(max_interface_index + 1):
+        interface = f'en{index}'
+        if get_ssid_for_interface(interface) != ssid:
+            continue
+        try:
+            output: str = subprocess.check_output(['ipconfig', 'getifaddr', interface]).decode().strip()
+        except subprocess.CalledProcessError:
+            continue
+        if output:
+            return output
+    return None
+
+
 if __name__ == '__main__':
-    ssid: str | None = get_current_ssid()
-    print(f'ssid: "{ssid}"')
+    _ssid: str | None = get_current_ssid()
+    print(f'ssid: "{_ssid}"')