pygazpar 1.3.0a12__py311-none-any.whl → 1.3.0a14__py311-none-any.whl

pygazpar/datasource.py

@@ -59,9 +59,9 @@ class WebDataSource(IDataSource):
     # ------------------------------------------------------
     def load(self, pceIdentifier: str, startDate: date, endDate: date, frequencies: Optional[List[Frequency]] = None) -> MeterReadingsByFrequency:
 
-        auth_token = self._login(self.__username, self.__password)
+        self._login(self.__username, self.__password)  # We ignore the return value.
 
-        res = self._loadFromSession(auth_token, pceIdentifier, startDate, endDate, frequencies)
+        res = self._loadFromSession(pceIdentifier, startDate, endDate, frequencies)
 
         Logger.debug("The data update terminates normally")
 
@@ -88,23 +88,23 @@ class WebDataSource(IDataSource):
 
         jar = http.cookiejar.CookieJar()
 
-        session = Session()
-        session.headers.update({"Content-Type": "application/json"})
-        session.headers.update({"X-Requested-With": "XMLHttpRequest"})
+        self._session = Session()
+        self._session.headers.update({"Content-Type": "application/json"})
+        self._session.headers.update({"X-Requested-With": "XMLHttpRequest"})
 
         params = json.loads(AUTH_TOKEN_PARAMS.format(session_token))
 
-        response = session.get(AUTH_TOKEN_URL, params=params, allow_redirects=True, cookies=jar)  # type: ignore
+        response = self._session.get(AUTH_TOKEN_URL, params=params, allow_redirects=True, cookies=jar)  # type: ignore
 
         if response.status_code != 200:
             raise Exception(f"An error occurred while getting the auth token. Status code: {response.status_code} - {response.text}")
 
-        auth_token = session.cookies.get("auth_token", domain="monespace.grdf.fr")
+        auth_token = self._session.cookies.get("auth_token", domain="monespace.grdf.fr")
 
         return auth_token  # type: ignore
 
     @abstractmethod
-    def _loadFromSession(self, auth_token: str, pceIdentifier: str, startDate: date, endDate: date, frequencies: Optional[List[Frequency]] = None) -> MeterReadingsByFrequency:
+    def _loadFromSession(self, pceIdentifier: str, startDate: date, endDate: date, frequencies: Optional[List[Frequency]] = None) -> MeterReadingsByFrequency:
         pass
 
 
@@ -133,7 +133,7 @@ class ExcelWebDataSource(WebDataSource):
         self.__tmpDirectory = tmpDirectory
 
     # ------------------------------------------------------
-    def _loadFromSession(self, auth_token: str, pceIdentifier: str, startDate: date, endDate: date, frequencies: Optional[List[Frequency]] = None) -> MeterReadingsByFrequency:
+    def _loadFromSession(self, pceIdentifier: str, startDate: date, endDate: date, frequencies: Optional[List[Frequency]] = None) -> MeterReadingsByFrequency:
 
         res = {}
 
@@ -166,16 +166,8 @@ class ExcelWebDataSource(WebDataSource):
             retry = 10
             while retry > 0:
 
-                # Create a session.
-                session = Session()
-                session.headers.update({"Host": "monespace.grdf.fr"})
-                session.headers.update({"Domain": "grdf.fr"})
-                session.headers.update({"X-Requested-With": "XMLHttpRequest"})
-                session.headers.update({"Accept": "application/json"})
-                session.cookies.set("auth_token", auth_token, domain="monespace.grdf.fr")
-
                 try:
-                    self.__downloadFile(session, downloadUrl, self.__tmpDirectory)
+                    self.__downloadFile(self._session, downloadUrl, self.__tmpDirectory)
                     break
                 except Exception as e:
 
@@ -267,7 +259,7 @@ class JsonWebDataSource(WebDataSource):
 
         super().__init__(username, password)
 
-    def _loadFromSession(self, auth_token: str, pceIdentifier: str, startDate: date, endDate: date, frequencies: Optional[List[Frequency]] = None) -> MeterReadingsByFrequency:
+    def _loadFromSession(self, pceIdentifier: str, startDate: date, endDate: date, frequencies: Optional[List[Frequency]] = None) -> MeterReadingsByFrequency:
 
         res = {}
 
@@ -286,16 +278,8 @@ class JsonWebDataSource(WebDataSource):
         retry = 10
         while retry > 0:
 
-            # Create a session.
-            session = Session()
-            session.headers.update({"Host": "monespace.grdf.fr"})
-            session.headers.update({"Domain": "grdf.fr"})
-            session.headers.update({"X-Requested-With": "XMLHttpRequest"})
-            session.headers.update({"Accept": "application/json"})
-            session.cookies.set("auth_token", auth_token, domain="monespace.grdf.fr")
-
             try:
-                response = session.get(downloadUrl)
+                response = self._session.get(downloadUrl)
 
                 if "text/html" in response.headers.get("Content-Type"):  # type: ignore
                     raise Exception("An error occurred while loading data. Please check your credentials.")
@@ -321,7 +305,7 @@ class JsonWebDataSource(WebDataSource):
         temperaturesUrl = JsonWebDataSource.TEMPERATURES_URL.format(pceIdentifier, endDate.strftime(JsonWebDataSource.INPUT_DATE_FORMAT), days)
 
         # Get weather data.
-        temperatures = session.get(temperaturesUrl).text
+        temperatures = self._session.get(temperaturesUrl).text
 
         # Transform all the data into the target structure.
         daily = JsonParser.parse(data, temperatures, pceIdentifier)

pygazpar/jsonparser.py

@@ -29,7 +29,7 @@ class JsonParser:
 
         for releve in data[pceIdentifier]['releves']:
             temperature = releve['temperature']
-            if temperature is None:
+            if temperature is None and temperatures is not None and len(temperatures) > 0:
                 temperature = temperatures.get(releve['journeeGaziere'])
 
             item = {}

pygazpar/version.py

@@ -1 +1 @@
-__version__ = "1.3.0a12"
+__version__ = "1.3.0a14"

{pygazpar-1.3.0a12.dist-info → pygazpar-1.3.0a14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pygazpar
-Version: 1.3.0a12
+Version: 1.3.0a14
 Summary: Retrieve gas consumption from GrDF web site (French Gas Company)
 Home-page: https://github.com/ssenart/pygazpar
 Download-URL: https://github.com/ssenart/pygazpar/releases
@@ -220,6 +220,16 @@ 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).
 
+## [1.2.6](https://github.com/ssenart/PyGazpar/compare/1.2.6...1.2.5) - 2025-01-03
+
+### Fixed
+- [#77](https://github.com/ssenart/PyGazpar/issues/77): Some error may occur while requesting data from GrDF API.
+
+## [1.2.5](https://github.com/ssenart/PyGazpar/compare/1.2.5...1.2.4) - 2024-12-21
+
+### Fixed
+- [#75](https://github.com/ssenart/PyGazpar/issues/75): Fix an error when no temperature data is available.
+
 ## [1.2.4](https://github.com/ssenart/PyGazpar/compare/1.2.4...1.2.3) - 2024-10-09
 
 ### Fixed

{pygazpar-1.3.0a12.dist-info → pygazpar-1.3.0a14.dist-info}/RECORD

@@ -1,11 +1,11 @@
 pygazpar/__init__.py,sha256=qshO_XZbDA2Wrt80ABDs0MoScqJytClAuIJjAnILglk,309
 pygazpar/__main__.py,sha256=Pt3PInX7QiWcs0aBKZN90NTaU8KFnrQiZ5Hsow1eR5U,3177
 pygazpar/client.py,sha256=JdVm0jZbeibwtTumcRbUSFadfXnCUClPMjL95_J6p5Y,2595
-pygazpar/datasource.py,sha256=N9OVdJr4BwtA0W8DvKe4PEE4kLKbSEH2wxAYGNk-iIU,21558
+pygazpar/datasource.py,sha256=D6VBy4ngQDECQfPVi9ZGhKuuOxNDUHjK-9gTDJlATPI,20699
 pygazpar/enum.py,sha256=3ZCk4SziXF6pxgP3MuQ1qxYfqB3X5DOV8Rtd0GHsK9w,898
 pygazpar/excelparser.py,sha256=QNFIErXNgMjGGjsGjdnRxAbNpfVagdYmZQtXRub3_Xc,5931
-pygazpar/jsonparser.py,sha256=AWdU3h7UohsOov8HpeP8GNuqcnDmM4r3I7-CI_crDvA,1804
-pygazpar/version.py,sha256=NYLHmRgRpna4gqXDsWvEWKVyypmZM3RBiuJ43vesebY,25
+pygazpar/jsonparser.py,sha256=OrRdMZNBi7rI4dRGoRW7gjyFwJFk-IvtkRZ_t1XVFrI,1859
+pygazpar/version.py,sha256=PmDAmw10ADg9AEzlwKqIjkV015azg3jlJE14KxjkD10,25
 pygazpar/resources/daily_data_sample.json,sha256=YJovtrNUMs257magTfyxiewLmecySFypcelbGFUUeT8,199583
 pygazpar/resources/hourly_data_sample.json,sha256=N1F-Xz3GaBn2H1p7uKzhkhKCQV8QVR0t76XD6wmFtXA,3
 pygazpar/resources/monthly_data_sample.json,sha256=yrr4SqrB2MubeVU2HX_FRDZKHIhC0LXCqkO1iqnFWcg,3351
@@ -16,12 +16,12 @@ samples/excelSample.py,sha256=ltAl-bBz9-U9YI802JpcIswra-vDS7tR_KL5VNdxJ5c,765
 samples/jsonSample.py,sha256=sYAIusdEJhZdwDAMgHqoWcwDR0FA2eWhSt_2gL_mJRk,736
 samples/testSample.py,sha256=UeirdEtezHwfZDv_75oxul17YzGWn5yZuHfJYTF3Ez0,387
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/test_client.py,sha256=DVGGubMPMM56LvQW-4_pCouvG9qTCbVZVPoRTBGuCU4,5111
+tests/test_client.py,sha256=UiJCqy_Nctl_YDSVpdaYfrbUEzuu9Td22a4WxNnIhJw,5606
 tests/test_datafileparser.py,sha256=nAeUpOHtelblMpmbrrnf-2GuMjK5ai65veDoymceprE,818
 tests/test_datasource.py,sha256=Fkn9BOGVKITAgrx9XipR1_ykT7rdvPyt_PAg3ftjfSU,5983
-pygazpar-1.3.0a12.dist-info/LICENSE.md,sha256=XsCJx_7_BC9tvmE0ZxS1cTNR7ekurog_ea9ybdZ-8tc,1073
-pygazpar-1.3.0a12.dist-info/METADATA,sha256=NuwxgC5w4f_2V6xuEaEtZJCq6KsZsPOf3g9P_QZGoJI,18744
-pygazpar-1.3.0a12.dist-info/WHEEL,sha256=ddUgEVTfDeUbT0ItkaS95LmKPb9e_DpzUkQwFnNilG4,94
-pygazpar-1.3.0a12.dist-info/entry_points.txt,sha256=dNJjC6RYY3FeJIe0hZL9Kcr6vKEx1qkZ71e6Slocb7I,52
-pygazpar-1.3.0a12.dist-info/top_level.txt,sha256=P7qn-XtanDPBLQsTvjvLV71wH8RK0DYbx8tzN_rDS70,23
-pygazpar-1.3.0a12.dist-info/RECORD,,
+pygazpar-1.3.0a14.dist-info/LICENSE.md,sha256=XsCJx_7_BC9tvmE0ZxS1cTNR7ekurog_ea9ybdZ-8tc,1073
+pygazpar-1.3.0a14.dist-info/METADATA,sha256=rsknEaRsdxc7fkASSIhBDRgv34CORVDnodZyCs_mZSk,19156
+pygazpar-1.3.0a14.dist-info/WHEEL,sha256=2aRSX09k7pmd4gPs96VOQ860h0v0t30ka6JGHtpC3BY,94
+pygazpar-1.3.0a14.dist-info/entry_points.txt,sha256=dNJjC6RYY3FeJIe0hZL9Kcr6vKEx1qkZ71e6Slocb7I,52
+pygazpar-1.3.0a14.dist-info/top_level.txt,sha256=P7qn-XtanDPBLQsTvjvLV71wH8RK0DYbx8tzN_rDS70,23
+pygazpar-1.3.0a14.dist-info/RECORD,,

{pygazpar-1.3.0a12.dist-info → pygazpar-1.3.0a14.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.44.0)
+Generator: bdist_wheel (0.45.1)
 Root-Is-Purelib: true
 Tag: py311-none-any
 

tests/test_client.py

@@ -52,6 +52,20 @@ class TestClient:
 
         assert (len(data[Frequency.HOURLY.value]) == 0)
 
+    def test_one_day_jsonweb(self):
+        client = Client(JsonWebDataSource(self.__username, self.__password))
+
+        data = client.loadSince(self.__pceIdentifier, 1, [Frequency.DAILY])
+
+        assert (len(data[Frequency.DAILY.value]) <= 1)
+
+    def test_two_days_jsonweb(self):
+        client = Client(JsonWebDataSource(self.__username, self.__password))
+
+        data = client.loadSince(self.__pceIdentifier, 2, [Frequency.DAILY])
+
+        assert (len(data[Frequency.DAILY.value]) <= 2)
+
     # @pytest.mark.skip(reason="Requires live data")
     def test_daily_jsonweb(self):
         client = Client(JsonWebDataSource(self.__username, self.__password))