ips-api-client 0.1.0__tar.gz → 0.2.0__tar.gz

{ips_api_client-0.1.0 → ips_api_client-0.2.0}/CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.2.0] - 2026-07-11
+
+### Added
+- Parse the ORP live state string (`lblorpState`) into `PoolReading.orp_state`.
+- Detect the live overfeed lockout condition per channel via
+  `PoolReading.ph_overfeed` / `orp_overfeed` (tri-state: True/False/None) and the
+  `state_is_overfeed()` helper.
+
 ## [0.1.0] - 2025-10-21
 
 ### Added

{ips_api_client-0.1.0/ips_api_client.egg-info → ips_api_client-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ips-api-client
-Version: 0.1.0
+Version: 0.2.0
 Summary: Async Python client for IPS Controllers pool monitoring system
 Home-page: https://github.com/stgarrity/ips-api-client
 Author: Steve Garrity
@@ -62,6 +62,7 @@ async def main():
             # Get detailed reading
             detail = await client.get_controller_detail(controller.controller_id)
             print(f"  pH Setpoint: {detail.ph_setpoint}")
+            print(f"  ORP Setpoint: {detail.orp_setpoint}")
             print(f"  pH State: {detail.ph_state}")
 
 asyncio.run(main())
@@ -84,6 +85,7 @@ asyncio.run(main())
 - Controller status
 - Last reading timestamp
 - pH setpoint and state
+- ORP setpoint
 
 ## License
 

{ips_api_client-0.1.0 → ips_api_client-0.2.0}/README.md

@@ -28,6 +28,7 @@ async def main():
             # Get detailed reading
             detail = await client.get_controller_detail(controller.controller_id)
             print(f"  pH Setpoint: {detail.ph_setpoint}")
+            print(f"  ORP Setpoint: {detail.orp_setpoint}")
             print(f"  pH State: {detail.ph_state}")
 
 asyncio.run(main())
@@ -50,6 +51,7 @@ asyncio.run(main())
 - Controller status
 - Last reading timestamp
 - pH setpoint and state
+- ORP setpoint
 
 ## License
 

{ips_api_client-0.1.0 → ips_api_client-0.2.0}/ips_api/__init__.py

@@ -1,6 +1,6 @@
 """IPS Controllers API Client Library."""
 
-__version__ = "0.1.0"
+__version__ = "0.1.1"
 
 from .client import IPSClient
 from .models import PoolController, PoolReading, ControllerStatus

{ips_api_client-0.1.0 → ips_api_client-0.2.0}/ips_api/client.py

@@ -213,7 +213,13 @@ class IPSClient:
                 raise SessionExpiredError("Session has expired")
 
             reading = parse_device_detail(html)
-            _LOGGER.debug(f"Retrieved reading: pH={reading.ph}, ORP={reading.orp}")
+            _LOGGER.debug(
+                "Retrieved reading: pH=%s, ORP=%s, pH setpoint=%s, ORP setpoint=%s",
+                reading.ph,
+                reading.orp,
+                reading.ph_setpoint,
+                reading.orp_setpoint,
+            )
 
             return reading
 

{ips_api_client-0.1.0 → ips_api_client-0.2.0}/ips_api/models.py

@@ -17,7 +17,14 @@ class PoolReading:
 
     # Additional details (from detail page)
     ph_state: Optional[str] = None
+    orp_state: Optional[str] = None
     ph_setpoint: Optional[float] = None
+    orp_setpoint: Optional[int] = None
+
+    # Live overfeed lockout condition per channel.
+    # True = in overfeed, False = known not in overfeed, None = state unknown.
+    ph_overfeed: Optional[bool] = None
+    orp_overfeed: Optional[bool] = None
 
 
 @dataclass

{ips_api_client-0.1.0 → ips_api_client-0.2.0}/ips_api/parser.py

@@ -112,6 +112,39 @@ def parse_int(value: str) -> Optional[int]:
         return None
 
 
+def extract_first_number(value: str) -> Optional[str]:
+    """Extract the first numeric token from a string."""
+    if not value or not value.strip():
+        return None
+
+    match = re.search(r'([0-9]+(?:\.[0-9]+)?)', value)
+    if not match:
+        return None
+
+    return match.group(1)
+
+
+def state_is_overfeed(state: Optional[str]) -> Optional[bool]:
+    """Determine if a live pH/ORP state string reports an overfeed lockout.
+
+    The controller state is a compound, dash/comma separated string (e.g.
+    "Normal - No Flow" or "Overfeed - No Flow"). When the unit exceeds its feed
+    limit it locks out dosing and adds an "Overfeed" token to this string.
+
+    Args:
+        state: Live state string from the detail page, or None.
+
+    Returns:
+        True if the state reports overfeed, False if the state is known and does
+        not report overfeed, or None if the state is missing/unknown.
+    """
+    if state is None or not state.strip():
+        return None
+
+    normalized = re.sub(r'\s+', '', state).lower()
+    return 'overfeed' in normalized
+
+
 def extract_status_from_icon(img_src: str) -> str:
     """Extract status from icon filename.
 
@@ -244,23 +277,33 @@ def parse_device_detail(html: str) -> PoolReading:
     orp_elem = soup.find('span', id='lblOrpNum')
     temp_elem = soup.find('span', id='lblTempValue')
     ph_state_elem = soup.find('span', id='lblpHState')
+    orp_state_elem = soup.find('span', id='lblorpState')
     ph_setpoint_elem = soup.find('span', id='lblphSetpoint')
+    orp_setpoint_elem = soup.find('span', id='lblorpSetpoint')
     timestamp_elem = soup.find('span', id='lblLastReading')
 
-    # Extract pH setpoint from text like "Setpoint: 7.3"
-    ph_setpoint = None
-    if ph_setpoint_elem:
-        setpoint_text = ph_setpoint_elem.get_text()
-        match = re.search(r'([0-9.]+)', setpoint_text)
-        if match:
-            ph_setpoint = parse_float(match.group(1))
+    ph_setpoint = parse_float(
+        extract_first_number(ph_setpoint_elem.get_text() if ph_setpoint_elem else '')
+        or ''
+    )
+    orp_setpoint = parse_int(
+        extract_first_number(orp_setpoint_elem.get_text() if orp_setpoint_elem else '')
+        or ''
+    )
+
+    ph_state = ph_state_elem.get_text(strip=True) if ph_state_elem else None
+    orp_state = orp_state_elem.get_text(strip=True) if orp_state_elem else None
 
     reading = PoolReading(
         ph=parse_float(ph_elem.get_text() if ph_elem else ''),
         orp=parse_int(orp_elem.get_text() if orp_elem else ''),
         temperature=parse_float(temp_elem.get_text() if temp_elem else ''),
-        ph_state=ph_state_elem.get_text(strip=True) if ph_state_elem else None,
+        ph_state=ph_state,
+        orp_state=orp_state,
         ph_setpoint=ph_setpoint,
+        orp_setpoint=orp_setpoint,
+        ph_overfeed=state_is_overfeed(ph_state),
+        orp_overfeed=state_is_overfeed(orp_state),
         timestamp=parse_datetime(timestamp_elem.get_text() if timestamp_elem else ''),
     )
 

{ips_api_client-0.1.0 → ips_api_client-0.2.0/ips_api_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ips-api-client
-Version: 0.1.0
+Version: 0.2.0
 Summary: Async Python client for IPS Controllers pool monitoring system
 Home-page: https://github.com/stgarrity/ips-api-client
 Author: Steve Garrity
@@ -62,6 +62,7 @@ async def main():
             # Get detailed reading
             detail = await client.get_controller_detail(controller.controller_id)
             print(f"  pH Setpoint: {detail.ph_setpoint}")
+            print(f"  ORP Setpoint: {detail.orp_setpoint}")
             print(f"  pH State: {detail.ph_state}")
 
 asyncio.run(main())
@@ -84,6 +85,7 @@ asyncio.run(main())
 - Controller status
 - Last reading timestamp
 - pH setpoint and state
+- ORP setpoint
 
 ## License
 

{ips_api_client-0.1.0 → ips_api_client-0.2.0}/ips_api_client.egg-info/SOURCES.txt

@@ -16,4 +16,5 @@ ips_api_client.egg-info/SOURCES.txt
 ips_api_client.egg-info/dependency_links.txt
 ips_api_client.egg-info/requires.txt
 ips_api_client.egg-info/top_level.txt
-tests/test_client.py
+tests/test_client.py
+tests/test_parser.py

{ips_api_client-0.1.0 → ips_api_client-0.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ips-api-client"
-version = "0.1.0"
+version = "0.2.0"
 authors = [
     {name = "Steve Garrity", email = "sgarrity@gmail.com"}
 ]

{ips_api_client-0.1.0 → ips_api_client-0.2.0}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="ips-api-client",
-    version="0.1.0",
+    version="0.2.0",
     author="Steve Garrity",
     author_email="sgarrity@gmail.com",
     description="API client for IPS Controllers pool monitoring system",

{ips_api_client-0.1.0 → ips_api_client-0.2.0}/tests/test_client.py

@@ -68,6 +68,7 @@ async def main():
             print(f"      Temperature: {detail.temperature}")
             print(f"      pH State: {detail.ph_state}")
             print(f"      pH Setpoint: {detail.ph_setpoint}")
+            print(f"      ORP Setpoint: {detail.orp_setpoint}")
             print(f"      Timestamp: {detail.timestamp}")
 
         print("\n" + "=" * 80)

ips_api_client-0.2.0/tests/test_parser.py

@@ -0,0 +1,70 @@
+"""Unit tests for DeviceDetail parsing and overfeed detection."""
+
+import os
+import sys
+
+import pytest
+
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
+
+from ips_api.parser import parse_device_detail, state_is_overfeed
+
+FIXTURES = os.path.join(os.path.dirname(__file__), 'fixtures')
+
+
+def _load(name: str) -> str:
+    with open(os.path.join(FIXTURES, name)) as f:
+        return f.read()
+
+
+@pytest.mark.parametrize(
+    "state, expected",
+    [
+        ("Overfeed - No Flow", True),
+        ("Demand, Overfeed - No Flow", True),
+        ("over feed", True),  # spacing/case insensitive
+        ("OVERFEED", True),
+        ("Normal - No Flow", False),
+        ("Low Alert - No Demand - No Flow", False),
+        ("", None),
+        ("   ", None),
+        (None, None),
+    ],
+)
+def test_state_is_overfeed(state, expected):
+    assert state_is_overfeed(state) is expected
+
+
+def test_parse_device_detail_normal():
+    reading = parse_device_detail(_load('device_detail_normal.html'))
+
+    assert reading.ph == 7.20
+    assert reading.orp == 725
+    assert reading.temperature == 82
+    assert reading.ph_setpoint == 7.3
+    assert reading.orp_setpoint == 740
+    assert reading.ph_state == "Normal - No Flow"
+    assert reading.orp_state == "Demand, In Delay - No Flow"
+    # No overfeed, but state is known -> False (not None)
+    assert reading.ph_overfeed is False
+    assert reading.orp_overfeed is False
+
+
+def test_parse_device_detail_overfeed():
+    reading = parse_device_detail(_load('device_detail_overfeed.html'))
+
+    assert reading.ph_state == "Overfeed - No Flow"
+    assert reading.orp_state == "Demand, Overfeed - No Flow"
+    assert reading.ph_overfeed is True
+    assert reading.orp_overfeed is True
+
+
+def test_parse_device_detail_missing_state():
+    # No state spans at all -> overfeed flags are None (unknown), not False
+    html = '<html><body><span id="lblphNum">7.2</span></body></html>'
+    reading = parse_device_detail(html)
+
+    assert reading.ph_state is None
+    assert reading.orp_state is None
+    assert reading.ph_overfeed is None
+    assert reading.orp_overfeed is None