PyHolfuy 0.1__tar.gz → 0.2__tar.gz

{pyholfuy-0.1/pyholfuy.egg-info → pyholfuy-0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyholfuy
-Version: 0.1
+Version: 0.2
 Summary: A Python library for interacting with Holfuy weather stations.
 Author-email: Håvard Dagenborg <haavardj@dagenborg.net>
 License-Expression: MIT
@@ -16,15 +16,7 @@ Provides-Extra: test
 Requires-Dist: aioresponses==0.7.8; extra == "test"
 Requires-Dist: coverage==7.8.0; extra == "test"
 Requires-Dist: mypy==1.15.0; extra == "test"
-Requires-Dist: pytest-asyncio==0.26.0; extra == "test"
-Requires-Dist: pytest-cov==6.1.1; extra == "test"
-Requires-Dist: pytest-error-for-skips==2.0.2; extra == "test"
-Requires-Dist: pytest-timeout==2.3.1; extra == "test"
-Requires-Dist: pytest==8.3.5; extra == "test"
-Requires-Dist: ruff==0.11.7; extra == "test"
-Requires-Dist: syrupy==4.9.1; extra == "test"
 Provides-Extra: dev
-Requires-Dist: pre-commit==4.2.0; extra == "dev"
 Dynamic: license-file
 
 ![Holfy Logo](https://holfuy.com/image/logo/holfuy-logo.png)

{pyholfuy-0.1 → pyholfuy-0.2}/holfuy/__init__.py

@@ -6,9 +6,10 @@ import logging
 from typing import Any
 
 import aiohttp
+from aiohttp import ClientSession
 
 from .const import (
-    CONF_TEMPERATURE_UNIT_CELSUIS,
+    CONF_TEMPERATURE_UNIT_CELSIUS,
     CONF_WIND_SPEED_UNIT_MS,
     CONF_AVERAGING_NEWEST,
     CONF_MODE_JSON,
@@ -45,10 +46,10 @@ class HolfuyService:
     def __init__(
         self,
         api_key: str,
-        websession=None,
-        temperature_unit=CONF_TEMPERATURE_UNIT_CELSUIS,
-        wind_speed_unit=CONF_WIND_SPEED_UNIT_MS,
-        timestamps_in_utc=False,
+        session: ClientSession,
+        temperature_unit:str=CONF_TEMPERATURE_UNIT_CELSIUS,
+        wind_speed_unit:str=CONF_WIND_SPEED_UNIT_MS,
+        timestamps_in_utc:bool=False,
     ) -> None:
         """Initialize the Weather object."""
 
@@ -57,16 +58,8 @@ class HolfuyService:
         self._wind_speed_unit = wind_speed_unit
         self._temperature_unit = temperature_unit
         self._timestamps_in_utc = timestamps_in_utc
+        self._session = session
 
-        if websession is None:
-
-            async def _create_session():
-                return aiohttp.ClientSession()
-
-            loop = asyncio.get_event_loop()
-            self._websession = loop.run_until_complete(_create_session())
-        else:
-            self._websession = websession
 
     async def fetch_data(
         self,
@@ -104,8 +97,9 @@ class HolfuyService:
             params["s"] = STATIONS_ALL
 
         try:
+
             async with asyncio.timeout(TIMEOUT):
-                resp = await self._websession.get(self._api_url, params=params)
+                resp = await self._session.get(self._api_url, params=params)
 
             if resp.status >= 400:
                 _LOGGER.error("%s returned %s", self._api_url, resp.status)
@@ -117,7 +111,7 @@ class HolfuyService:
             # measurements objects. Make data consistent for all request types before it
             #  is returned.
             if stations and len(stations) == 1:
-                result = {"measurements": result}
+                result = {"measurements": [result]}
 
             return result
 

{pyholfuy-0.1 → pyholfuy-0.2}/holfuy/const.py

@@ -11,7 +11,7 @@ CONF_WIND_SPEED_UNIT_KMH = "km/h"
 CONF_WIND_SPEED_UNIT_MS = "m/s"
 CONF_WIND_SPEED_UNIT_MPH = "mph"
 
-CONF_TEMPERATURE_UNIT_CELSUIS = "Celsius"
+CONF_TEMPERATURE_UNIT_CELSIUS = "Celsius"
 CONF_TEMPERATURE_UNIT_FAHRENHEIT = "Fahrenheit"
 
 CONF_OPTION_BATT = "batt"

pyholfuy-0.2/holfuy/test_holfuy.py

@@ -0,0 +1,156 @@
+import asyncio
+from unittest import IsolatedAsyncioTestCase, mock
+from unittest.mock import AsyncMock, patch
+import json
+
+import aiohttp
+
+RESP_142 =  json.loads("""{"stationId":142,"stationName":"THPK Ersfjord","location":{"latitude":"69.70017",
+"longitude":"18.63842","altitude":130},"dateTime":"2025-05-19 15:45:00","wind":{"speed":9.4,"gust":13.3,"min":0,
+"unit":"m/s","direction":245},"battery":4.15,"daily":{"max_temp":0,"min_temp":0},"temperature":0}""")
+
+RESP_ALL = json.loads("""{"measurements":[{"stationId":142,"stationName":"THPK Ersfjord","location":{"latitude":"69.70017",
+"longitude":"18.63842","altitude":130},"dateTime":"2025-05-19 15:45:00","wind":{"speed":9.4,"gust":13.3,"min":0,
+"unit":"m/s","direction":245},"battery":4.15,"daily":{"max_temp":0,"min_temp":0},"temperature":0},
+{"stationId":207,"stationName":"THPK Finnvikdalen","location":{"latitude":"69.76117",
+"longitude":"18.85657","altitude":270},"dateTime":"2025-05-19 15:45:00",
+"wind":{"speed":10,"gust":13.6,"min":0,"unit":"m/s","direction":339},"battery":4.14,
+"daily":{"max_temp":7.5,"min_temp":4.5},"temperature":4.7},{"stationId":299,"stationName":"THPK Fjellheisen",
+"location":{"latitude":"69.63116","longitude":"18.99377","altitude":420},"dateTime":"2025-05-19 15:45:00",
+"wind":{"speed":7.8,"gust":10.3,"min":0,"unit":"m/s","direction":256},"battery":4.14,
+"daily":{"max_temp":5.7,"min_temp":0},"temperature":3.6}]}""")
+
+RESP_AUTHERROR=json.loads("""
+{"measurements":[{"stationId":105,"error":"Sorry, you don't have access for this station.","errorCode":"no_access"},
+{"stationId":106,"error":"Sorry, you don't have access for this station.","errorCode":"no_access"}]}""")
+
+from holfuy import HolfuyService
+
+from holfuy.const import (
+    CONF_TEMPERATURE_UNIT_CELSIUS,
+    CONF_WIND_SPEED_UNIT_MS,
+    CONF_AVERAGING_NEWEST,
+)
+
+
+class TestHolfuyService(IsolatedAsyncioTestCase):
+    def setUp(self):
+        """Set up test cases."""
+        self.session = AsyncMock(spec=aiohttp.ClientSession)
+        self.api = HolfuyService(
+            "test_api_key",
+            self.session,
+            CONF_TEMPERATURE_UNIT_CELSIUS,
+            CONF_WIND_SPEED_UNIT_MS,
+            False,
+        )
+
+    async def test_fetch_data_single_station(self):
+        """Test fetching data for a single station."""
+        mock_response = RESP_142
+
+        mock_resp = AsyncMock()
+        mock_resp.status = 200
+        mock_resp.json = AsyncMock(return_value=mock_response)
+
+        self.session.get = AsyncMock(return_value=mock_resp)
+
+        result = await self.api.fetch_data(["142"])
+
+        expected_params = {
+            "pw": "test_api_key",
+            "m": "JSON",
+            "tu": CONF_TEMPERATURE_UNIT_CELSIUS,
+            "su": CONF_WIND_SPEED_UNIT_MS,
+            "avg": CONF_AVERAGING_NEWEST,
+            "s": "142",
+        }
+
+        self.session.get.assert_called_once_with(
+            "http://api.holfuy.com/live/",
+            params=expected_params
+        )
+
+        self.assertEqual(result["measurements"][0]["stationId"], 142)
+
+    async def test_fetch_data_all_stations(self):
+        """Test fetching data for multiple stations."""
+        mock_response = RESP_ALL
+
+        mock_resp = AsyncMock()
+        mock_resp.status = 200
+        mock_resp.json = AsyncMock(return_value=mock_response)
+        self.session.get = AsyncMock(return_value= mock_resp)
+
+        result = await self.api.fetch_data(None)
+
+        expected_params = {
+            "pw": "test_api_key",
+            "m": "JSON",
+            "tu": CONF_TEMPERATURE_UNIT_CELSIUS,
+            "su": CONF_WIND_SPEED_UNIT_MS,
+            "avg": CONF_AVERAGING_NEWEST,
+            "s": "all",
+        }
+
+        self.session.get.assert_called_once_with(
+            "http://api.holfuy.com/live/",
+            params=expected_params
+        )
+
+        self.assertEqual(result, mock_response)
+
+    async def test_fetch_data_error_response(self):
+        """Test handling of error responses."""
+        mock_resp = AsyncMock()
+        mock_resp.status = 404
+
+        self.session.get = AsyncMock(return_value=mock_resp)
+
+        result = await self.api.fetch_data(None)
+
+        self.assertIsNone(result)
+
+    async def test_fetch_data_invalid_access_token(self):
+        """Test handling of error responses."""
+        mock_resp = AsyncMock()
+        mock_resp.status = 200
+        mock_response =  RESP_AUTHERROR
+
+        mock_resp.json = AsyncMock(return_value=mock_response)
+
+        self.session.get = AsyncMock(return_value=mock_resp)
+
+        result = await self.api.fetch_data(["105","106"])
+
+        expected_params = {
+            "pw": "test_api_key",
+            "m": "JSON",
+            "tu": CONF_TEMPERATURE_UNIT_CELSIUS,
+            "su": CONF_WIND_SPEED_UNIT_MS,
+            "avg": CONF_AVERAGING_NEWEST,
+            "s": "105,106",
+        }
+
+        self.session.get.assert_called_once_with(
+            "http://api.holfuy.com/live/",
+            params=expected_params
+        )
+
+        self.assertEqual(result["measurements"][0]["stationId"], 105)
+
+    async def test_fetch_data_timeout(self):
+        """Test handling of timeout errors."""
+        self.session.get = AsyncMock(side_effect=asyncio.TimeoutError)
+
+        result = await self.api.fetch_data(None)
+
+        self.assertIsNone(result)
+
+    async def test_fetch_data_client_error(self):
+        """Test handling of client errors."""
+        self.session.get = AsyncMock(side_effect=aiohttp.ClientError)
+
+        result = await self.api.fetch_data(None)
+
+        self.assertIsNone(result)

{pyholfuy-0.1 → pyholfuy-0.2/pyholfuy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyholfuy
-Version: 0.1
+Version: 0.2
 Summary: A Python library for interacting with Holfuy weather stations.
 Author-email: Håvard Dagenborg <haavardj@dagenborg.net>
 License-Expression: MIT
@@ -16,15 +16,7 @@ Provides-Extra: test
 Requires-Dist: aioresponses==0.7.8; extra == "test"
 Requires-Dist: coverage==7.8.0; extra == "test"
 Requires-Dist: mypy==1.15.0; extra == "test"
-Requires-Dist: pytest-asyncio==0.26.0; extra == "test"
-Requires-Dist: pytest-cov==6.1.1; extra == "test"
-Requires-Dist: pytest-error-for-skips==2.0.2; extra == "test"
-Requires-Dist: pytest-timeout==2.3.1; extra == "test"
-Requires-Dist: pytest==8.3.5; extra == "test"
-Requires-Dist: ruff==0.11.7; extra == "test"
-Requires-Dist: syrupy==4.9.1; extra == "test"
 Provides-Extra: dev
-Requires-Dist: pre-commit==4.2.0; extra == "dev"
 Dynamic: license-file
 
 ![Holfy Logo](https://holfuy.com/image/logo/holfuy-logo.png)

{pyholfuy-0.1 → pyholfuy-0.2}/pyholfuy.egg-info/SOURCES.txt

@@ -4,6 +4,7 @@ README.md
 pyproject.toml
 holfuy/__init__.py
 holfuy/const.py
+holfuy/test_holfuy.py
 pyholfuy.egg-info/PKG-INFO
 pyholfuy.egg-info/SOURCES.txt
 pyholfuy.egg-info/dependency_links.txt

pyholfuy-0.2/pyholfuy.egg-info/requires.txt

@@ -0,0 +1,8 @@
+aiohttp>=3.9.4
+
+[dev]
+
+[test]
+aioresponses==0.7.8
+coverage==7.8.0
+mypy==1.15.0

{pyholfuy-0.1 → pyholfuy-0.2}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyholfuy"
-version = "0.1"
+version = "0.2"
 description = "A Python library for interacting with Holfuy weather stations."
 authors = [{name="Håvard Dagenborg", email="haavardj@dagenborg.net"}]
 license = "MIT"
@@ -29,24 +29,11 @@ test = [
   "aioresponses==0.7.8",
   "coverage==7.8.0",
   "mypy==1.15.0",
-  "pytest-asyncio==0.26.0",
-  "pytest-cov==6.1.1",
-  "pytest-error-for-skips==2.0.2",
-  "pytest-timeout==2.3.1",
-  "pytest==8.3.5",
-  "ruff==0.11.7",
-  "syrupy==4.9.1",
 ]
 dev = [
-  "pre-commit==4.2.0",
 ]
 
-[tool.ruff]
-line-length = 88
-indent-width = 4
-select = ["E", "F", "W", "C", "N", "Q"]
 
 [tool.pylint]
 max-line-length = 88
 disable = ["C0114", "C0115", "C0116"]
-

pyholfuy-0.1/pyholfuy.egg-info/requires.txt

@@ -1,16 +0,0 @@
-aiohttp>=3.9.4
-
-[dev]
-pre-commit==4.2.0
-
-[test]
-aioresponses==0.7.8
-coverage==7.8.0
-mypy==1.15.0
-pytest-asyncio==0.26.0
-pytest-cov==6.1.1
-pytest-error-for-skips==2.0.2
-pytest-timeout==2.3.1
-pytest==8.3.5
-ruff==0.11.7
-syrupy==4.9.1