pygazpar 1.2.7__py38-none-any.whl → 1.3.0a6__py38-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:
 
-        self._login(self.__username, self.__password)  # We ignore the return value.
+        auth_token = self._login(self.__username, self.__password)
 
-        res = self._loadFromSession(pceIdentifier, startDate, endDate, frequencies)
+        res = self._loadFromSession(auth_token, pceIdentifier, startDate, endDate, frequencies)
 
         Logger.debug("The data update terminates normally")
 
@@ -88,23 +88,23 @@ class WebDataSource(IDataSource):
 
         jar = http.cookiejar.CookieJar()
 
-        self._session = Session()
-        self._session.headers.update({"Content-Type": "application/json"})
-        self._session.headers.update({"X-Requested-With": "XMLHttpRequest"})
+        session = Session()
+        session.headers.update({"Content-Type": "application/json"})
+        session.headers.update({"X-Requested-With": "XMLHttpRequest"})
 
         params = json.loads(AUTH_TOKEN_PARAMS.format(session_token))
 
-        response = self._session.get(AUTH_TOKEN_URL, params=params, allow_redirects=True, cookies=jar)  # type: ignore
+        response = session.get(AUTH_TOKEN_URL, params=params, allow_redirects=True, cookies=jar)
 
         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 = self._session.cookies.get("auth_token", domain="monespace.grdf.fr")
+        auth_token = session.cookies.get("auth_token", domain="monespace.grdf.fr")
 
-        return auth_token  # type: ignore
+        return auth_token
 
     @abstractmethod
-    def _loadFromSession(self, pceIdentifier: str, startDate: date, endDate: date, frequencies: Optional[List[Frequency]] = None) -> MeterReadingsByFrequency:
+    def _loadFromSession(self, auth_token: str, 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, pceIdentifier: str, startDate: date, endDate: date, frequencies: Optional[List[Frequency]] = None) -> MeterReadingsByFrequency:
+    def _loadFromSession(self, auth_token: str, pceIdentifier: str, startDate: date, endDate: date, frequencies: Optional[List[Frequency]] = None) -> MeterReadingsByFrequency:
 
         res = {}
 
@@ -144,10 +144,7 @@ class ExcelWebDataSource(WebDataSource):
         file_list = glob.glob(data_file_path_pattern)
         for filename in file_list:
             if os.path.isfile(filename):
-                try:
-                    os.remove(filename)
-                except PermissionError:
-                    pass
+                os.remove(filename)
 
         if frequencies is None:
             # Transform Enum in List.
@@ -166,8 +163,16 @@ 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(self._session, downloadUrl, self.__tmpDirectory)
+                    self.__downloadFile(session, downloadUrl, self.__tmpDirectory)
                     break
                 except Exception as e:
 
@@ -189,7 +194,7 @@ class ExcelWebDataSource(WebDataSource):
                 try:
                     # openpyxl does not close the file properly.
                     os.remove(filename)
-                except PermissionError:
+                except Exception:
                     pass
 
             # We compute yearly from daily data.
@@ -203,7 +208,7 @@ class ExcelWebDataSource(WebDataSource):
 
         response = session.get(url)
 
-        if "text/html" in response.headers.get("Content-Type"):  # type: ignore
+        if "text/html" in response.headers.get("Content-Type"):
             raise Exception("An error occurred while loading data. Please check your credentials.")
 
         if response.status_code != 200:
@@ -259,7 +264,7 @@ class JsonWebDataSource(WebDataSource):
 
         super().__init__(username, password)
 
-    def _loadFromSession(self, pceIdentifier: str, startDate: date, endDate: date, frequencies: Optional[List[Frequency]] = None) -> MeterReadingsByFrequency:
+    def _loadFromSession(self, auth_token: str, pceIdentifier: str, startDate: date, endDate: date, frequencies: Optional[List[Frequency]] = None) -> MeterReadingsByFrequency:
 
         res = {}
 
@@ -278,10 +283,18 @@ 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 = self._session.get(downloadUrl)
+                response = session.get(downloadUrl)
 
-                if "text/html" in response.headers.get("Content-Type"):  # type: ignore
+                if "text/html" in response.headers.get("Content-Type"):
                     raise Exception("An error occurred while loading data. Please check your credentials.")
 
                 if response.status_code != 200:
@@ -305,7 +318,7 @@ class JsonWebDataSource(WebDataSource):
         temperaturesUrl = JsonWebDataSource.TEMPERATURES_URL.format(pceIdentifier, endDate.strftime(JsonWebDataSource.INPUT_DATE_FORMAT), days)
 
         # Get weather data.
-        temperatures = self._session.get(temperaturesUrl).text
+        temperatures = session.get(temperaturesUrl).text
 
         # Transform all the data into the target structure.
         daily = JsonParser.parse(data, temperatures, pceIdentifier)
@@ -450,7 +463,7 @@ class FrequencyConverter:
         df = df.sort_values(by=['first_day_of_week'])
 
         # Select rows where we have a full week (7 days) except for the current week.
-        df = pd.concat([df[(df["count"] >= 7)], df.tail(1)[df.tail(1)["count"] < 7]])
+        df = pd.concat([df[(df["count"] >= 7)], df.tail(1)[df["count"] < 7]])
 
         # Select target columns.
         df = df[["time_period", "start_index_m3", "end_index_m3", "volume_m3", "energy_kwh", "timestamp"]]
@@ -478,7 +491,7 @@ class FrequencyConverter:
         df = df.sort_values(by=['first_day_of_month'])
 
         # Select rows where we have a full month (more than 27 days) except for the current month.
-        df = pd.concat([df[(df["count"] >= 28)], df.tail(1)[df.tail(1)["count"] < 28]])
+        df = pd.concat([df[(df["count"] >= 28)], df.tail(1)[df["count"] < 28]])
 
         # Rename columns for their target names.
         df = df.rename(columns={"month_year": "time_period"})
@@ -509,7 +522,7 @@ class FrequencyConverter:
         df = df.sort_values(by=['year'])
 
         # Select rows where we have almost a full year (more than 360) except for the current year.
-        df = pd.concat([df[(df["count"] >= 360)], df.tail(1)[df.tail(1)["count"] < 360]])
+        df = pd.concat([df[(df["count"] >= 360)], df.tail(1)[df["count"] < 360]])
 
         # Rename columns for their target names.
         df = df.rename(columns={"year": "time_period"})

pygazpar/excelparser.py

@@ -33,7 +33,7 @@ class ExcelParser:
 
         worksheet = workbook.active
 
-        res = parseByFrequency[dataReadingFrequency](worksheet)  # type: ignore
+        res = parseByFrequency[dataReadingFrequency](worksheet)
 
         workbook.close()
 

pygazpar/jsonparser.py

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

pygazpar/version.py

@@ -1 +1 @@
-__version__ = "1.2.7"
+__version__ = "1.3.0a6"

{pygazpar-1.2.7.dist-info → pygazpar-1.3.0a6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pygazpar
-Version: 1.2.7
+Version: 1.3.0a6
 Summary: Retrieve gas consumption from GrDF web site (French Gas Company)
 Home-page: https://github.com/ssenart/pygazpar
 Author: Stephane Senart
@@ -22,17 +22,13 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
-Requires-Dist: openpyxl>=2.6.3
-Requires-Dist: requests>=2.26.0
+Requires-Dist: openpyxl >=2.6.3
+Requires-Dist: requests >=2.26.0
 Requires-Dist: pandas
 
 # PyGazpar
-
-## $\text{\color{green}{!!! This library is working again. CAPTCHA has been removed !!!}}$
-
 PyGazpar is a Python library for getting natural gas consumption from GrDF French provider.
 
 Their natural gas meter is called Gazpar. It is wireless and transmit the gas consumption once per day.
@@ -217,35 +213,6 @@ 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.7](https://github.com/ssenart/PyGazpar/compare/1.2.7...1.2.6) - 2025-01-06
-
-### Fixed
-- [#79](https://github.com/ssenart/PyGazpar/issues/79): Fix some unittests that wrongly failed because of the new year.
-
-## [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
-- [#72](https://github.com/ssenart/PyGazpar/issues/72): Remove the warning message "UserWarning: Boolean Series key will be reindexed to match DataFrame index. df = pd.concat([df[(df["count"] >= 7)], df.tail(1)[df["count"] < 7]])".
-
-## [1.2.3](https://github.com/ssenart/PyGazpar/compare/1.2.3...1.2.1) - 2024-10-05
-
-### Added
-- [#70](https://github.com/ssenart/PyGazpar/issues/70): Add Python 3.12 support.
-
-## [1.2.2](https://github.com/ssenart/PyGazpar/compare/1.2.1...1.2.2) - 2024-05-08
-
-### Fixed
-- [#65](https://github.com/ssenart/PyGazpar/issues/65): [Bug] PermissionError happens when loading data from Excel file.
 
 ## [1.2.1](https://github.com/ssenart/PyGazpar/compare/1.2.0...1.2.1) - 2024-05-04
 

{pygazpar-1.2.7.dist-info → pygazpar-1.3.0a6.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=D6VBy4ngQDECQfPVi9ZGhKuuOxNDUHjK-9gTDJlATPI,20699
+pygazpar/datasource.py,sha256=gqOREo9OQaBmqWgaDIgShJrP1dZNVFJoIxUu9Rfxmec,21374
 pygazpar/enum.py,sha256=3ZCk4SziXF6pxgP3MuQ1qxYfqB3X5DOV8Rtd0GHsK9w,898
-pygazpar/excelparser.py,sha256=QNFIErXNgMjGGjsGjdnRxAbNpfVagdYmZQtXRub3_Xc,5931
-pygazpar/jsonparser.py,sha256=OrRdMZNBi7rI4dRGoRW7gjyFwJFk-IvtkRZ_t1XVFrI,1859
-pygazpar/version.py,sha256=49prCLbE3fFzLfxem5rd2dr1iV4_L-bN0N4J7jxU5yA,22
+pygazpar/excelparser.py,sha256=glWlbj22pxYjHGKurOFmhzcVAoWCvfOHn7_Y6GgHUPo,5915
+pygazpar/jsonparser.py,sha256=AWdU3h7UohsOov8HpeP8GNuqcnDmM4r3I7-CI_crDvA,1804
+pygazpar/version.py,sha256=rcyBYFWxUArZ5y56YkLypabOiwSZfCl48nXHK0ebB20,24
 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=BFLz0GNk8qEP4d2-7cAaIcLWpkSnDZo3wRb0AlXBNOQ,5765
+tests/test_client.py,sha256=OwYBeNC66WiykU1IUEf4eZacAU49xQJXsFQY6kYiXCQ,5111
 tests/test_datafileparser.py,sha256=nAeUpOHtelblMpmbrrnf-2GuMjK5ai65veDoymceprE,818
-tests/test_datasource.py,sha256=NTeD3yQEi4fTw8ZWz2cuUUdeFC8QVjChBMw5jyqia40,6149
-pygazpar-1.2.7.dist-info/LICENSE.md,sha256=XsCJx_7_BC9tvmE0ZxS1cTNR7ekurog_ea9ybdZ-8tc,1073
-pygazpar-1.2.7.dist-info/METADATA,sha256=2EYNnKzCnOJz6gzawkwptmVtDPexL3_rj3jGvMGlwqU,19226
-pygazpar-1.2.7.dist-info/WHEEL,sha256=bkapPWmaLinkcP210NpibBONXH5ryQB77NZphDx-h5Y,93
-pygazpar-1.2.7.dist-info/entry_points.txt,sha256=c_FMZPYlRv1w9EqfgWhlkdJOoje7FcglI0UMm2oRLoI,53
-pygazpar-1.2.7.dist-info/top_level.txt,sha256=P7qn-XtanDPBLQsTvjvLV71wH8RK0DYbx8tzN_rDS70,23
-pygazpar-1.2.7.dist-info/RECORD,,
+tests/test_datasource.py,sha256=2BCrnUh9ZbR_dAdvKT9498u5a-jGnC4aZafP7V9iZn8,5983
+pygazpar-1.3.0a6.dist-info/LICENSE.md,sha256=XsCJx_7_BC9tvmE0ZxS1cTNR7ekurog_ea9ybdZ-8tc,1073
+pygazpar-1.3.0a6.dist-info/METADATA,sha256=rAa2dhtTBrI7Bqo53G1ZPN1NgAIBGu7SsWfE0EmUW34,17741
+pygazpar-1.3.0a6.dist-info/WHEEL,sha256=tYIwCB1hVBJgdoQ6yUeZawdeOAGZpZULrUWUiRSsSKs,93
+pygazpar-1.3.0a6.dist-info/entry_points.txt,sha256=c_FMZPYlRv1w9EqfgWhlkdJOoje7FcglI0UMm2oRLoI,53
+pygazpar-1.3.0a6.dist-info/top_level.txt,sha256=P7qn-XtanDPBLQsTvjvLV71wH8RK0DYbx8tzN_rDS70,23
+pygazpar-1.3.0a6.dist-info/RECORD,,

{pygazpar-1.2.7.dist-info → pygazpar-1.3.0a6.dist-info}/WHEEL

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

tests/test_client.py

@@ -1,159 +1,145 @@
-from pygazpar.enum import Frequency
-from pygazpar.client import Client
-from pygazpar.datasource import JsonWebDataSource, TestDataSource, ExcelWebDataSource
-import os
-import pytest
-
-
-class TestClient:
-
-    @classmethod
-    def setup_class(cls):
-        """ setup any state specific to the execution of the given class (which
-        usually contains tests).
-        """
-
-    @classmethod
-    def teardown_class(cls):
-        """ teardown any state that was previously setup with a call to
-        setup_class.
-        """
-
-    def setup_method(self):
-        """ setup any state tied to the execution of the given method in a
-        class.  setup_method is invoked for every test method of a class.
-        """
-        tmpdir = os.path.normpath(f"{os.getcwd()}/tmp")
-
-        # We create the tmp directory if not already exists.
-        if not os.path.exists(tmpdir):
-            os.mkdir(tmpdir)
-
-        self.__username = os.environ["GRDF_USERNAME"]
-        self.__password = os.environ["GRDF_PASSWORD"]
-        self.__pceIdentifier = os.environ["PCE_IDENTIFIER"]
-        self.__tmp_directory = tmpdir
-
-    def teardown_method(self):
-        """ teardown any state that was previously setup with a setup_method
-        call.
-        """
-
-    def test_login_error(self):
-        client = Client(JsonWebDataSource("WrongUsername", "WrongPassword"))
-
-        with pytest.raises(Exception):
-            client.loadSince(self.__pceIdentifier, 365, [Frequency.DAILY])
-
-    def test_hourly_live(self):
-        client = Client(JsonWebDataSource(self.__username, self.__password))
-
-        data = client.loadSince(self.__pceIdentifier, 365, [Frequency.HOURLY])
-
-        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))
-
-        data = client.loadSince(self.__pceIdentifier, 365, [Frequency.DAILY])
-
-        assert (len(data[Frequency.DAILY.value]) > 0)
-
-    def test_weekly_jsonweb(self):
-        client = Client(JsonWebDataSource(self.__username, self.__password))
-
-        data = client.loadSince(self.__pceIdentifier, 365, [Frequency.WEEKLY])
-
-        assert (len(data[Frequency.WEEKLY.value]) >= 51 and len(data[Frequency.WEEKLY.value]) <= 54)
-
-    def test_monthly_jsonweb(self):
-        client = Client(JsonWebDataSource(self.__username, self.__password))
-
-        data = client.loadSince(self.__pceIdentifier, 365, [Frequency.MONTHLY])
-
-        assert (len(data[Frequency.MONTHLY.value]) >= 11 and len(data[Frequency.MONTHLY.value]) <= 13)
-
-    def test_yearly_jsonweb(self):
-        client = Client(JsonWebDataSource(self.__username, self.__password))
-
-        data = client.loadSince(self.__pceIdentifier, 365, [Frequency.YEARLY])
-
-        assert (len(data[Frequency.YEARLY.value]) >= 1)
-
-    def test_daily_excelweb(self):
-        client = Client(ExcelWebDataSource(self.__username, self.__password, self.__tmp_directory))
-
-        data = client.loadSince(self.__pceIdentifier, 365, [Frequency.DAILY])
-
-        assert (len(data[Frequency.DAILY.value]) > 0)
-
-    def test_weekly_excelweb(self):
-        client = Client(ExcelWebDataSource(self.__username, self.__password, self.__tmp_directory))
-
-        data = client.loadSince(self.__pceIdentifier, 365, [Frequency.WEEKLY])
-
-        assert (len(data[Frequency.WEEKLY.value]) >= 51 and len(data[Frequency.WEEKLY.value]) <= 54)
-
-    def test_monthly_excelweb(self):
-        client = Client(ExcelWebDataSource(self.__username, self.__password, self.__tmp_directory))
-
-        data = client.loadSince(self.__pceIdentifier, 365, [Frequency.MONTHLY])
-
-        assert (len(data[Frequency.MONTHLY.value]) >= 12 and len(data[Frequency.MONTHLY.value]) <= 13)
-
-    def test_yearly_excelweb(self):
-        client = Client(ExcelWebDataSource(self.__username, self.__password, self.__tmp_directory))
-
-        data = client.loadSince(self.__pceIdentifier, 365, [Frequency.YEARLY])
-
-        assert (len(data[Frequency.YEARLY.value]) >= 1)
-
-    def test_hourly_sample(self):
-        client = Client(TestDataSource())
-
-        data = client.loadSince(self.__pceIdentifier, 365, [Frequency.HOURLY])
-
-        assert (len(data[Frequency.HOURLY.value]) == 0)
-
-    def test_daily_sample(self):
-        client = Client(TestDataSource())
-
-        data = client.loadSince(self.__pceIdentifier, 365, [Frequency.DAILY])
-
-        assert (len(data[Frequency.DAILY.value]) == 711)
-
-    def test_weekly_sample(self):
-        client = Client(TestDataSource())
-
-        data = client.loadSince(self.__pceIdentifier, 365, [Frequency.WEEKLY])
-
-        assert (len(data[Frequency.WEEKLY.value]) > 0)
-
-    def test_monthly_sample(self):
-        client = Client(TestDataSource())
-
-        data = client.loadSince(self.__pceIdentifier, 365, [Frequency.MONTHLY])
-
-        assert (len(data[Frequency.MONTHLY.value]) > 0)
-
-    def test_yearly_sample(self):
-        client = Client(TestDataSource())
-
-        data = client.loadSince(self.__pceIdentifier, 365, [Frequency.YEARLY])
-
-        assert (len(data[Frequency.YEARLY.value]) == 2)
+from pygazpar.enum import Frequency
+from pygazpar.client import Client
+from pygazpar.datasource import JsonWebDataSource, TestDataSource, ExcelWebDataSource
+import os
+import pytest
+
+
+class TestClient:
+
+    @classmethod
+    def setup_class(cls):
+        """ setup any state specific to the execution of the given class (which
+        usually contains tests).
+        """
+
+    @classmethod
+    def teardown_class(cls):
+        """ teardown any state that was previously setup with a call to
+        setup_class.
+        """
+
+    def setup_method(self):
+        """ setup any state tied to the execution of the given method in a
+        class.  setup_method is invoked for every test method of a class.
+        """
+        tmpdir = os.path.normpath(f"{os.getcwd()}/tmp")
+
+        # We create the tmp directory if not already exists.
+        if not os.path.exists(tmpdir):
+            os.mkdir(tmpdir)
+
+        self.__username = os.environ["GRDF_USERNAME"]
+        self.__password = os.environ["GRDF_PASSWORD"]
+        self.__pceIdentifier = os.environ["PCE_IDENTIFIER"]
+        self.__tmp_directory = tmpdir
+
+    def teardown_method(self):
+        """ teardown any state that was previously setup with a setup_method
+        call.
+        """
+
+    def test_login_error(self):
+        client = Client(JsonWebDataSource("WrongUsername", "WrongPassword"))
+
+        with pytest.raises(Exception):
+            client.loadSince(self.__pceIdentifier, 365, [Frequency.DAILY])
+
+    def test_hourly_live(self):
+        client = Client(JsonWebDataSource(self.__username, self.__password))
+
+        data = client.loadSince(self.__pceIdentifier, 365, [Frequency.HOURLY])
+
+        assert (len(data[Frequency.HOURLY.value]) == 0)
+
+    # @pytest.mark.skip(reason="Requires live data")
+    def test_daily_jsonweb(self):
+        client = Client(JsonWebDataSource(self.__username, self.__password))
+
+        data = client.loadSince(self.__pceIdentifier, 365, [Frequency.DAILY])
+
+        assert (len(data[Frequency.DAILY.value]) > 0)
+
+    def test_weekly_jsonweb(self):
+        client = Client(JsonWebDataSource(self.__username, self.__password))
+
+        data = client.loadSince(self.__pceIdentifier, 365, [Frequency.WEEKLY])
+
+        assert (len(data[Frequency.WEEKLY.value]) >= 51 and len(data[Frequency.WEEKLY.value]) <= 54)
+
+    def test_monthly_jsonweb(self):
+        client = Client(JsonWebDataSource(self.__username, self.__password))
+
+        data = client.loadSince(self.__pceIdentifier, 365, [Frequency.MONTHLY])
+
+        assert (len(data[Frequency.MONTHLY.value]) >= 12 and len(data[Frequency.MONTHLY.value]) <= 13)
+
+    def test_yearly_jsonweb(self):
+        client = Client(JsonWebDataSource(self.__username, self.__password))
+
+        data = client.loadSince(self.__pceIdentifier, 365, [Frequency.YEARLY])
+
+        assert (len(data[Frequency.YEARLY.value]) == 1)
+
+    def test_daily_excelweb(self):
+        client = Client(ExcelWebDataSource(self.__username, self.__password, self.__tmp_directory))
+
+        data = client.loadSince(self.__pceIdentifier, 365, [Frequency.DAILY])
+
+        assert (len(data[Frequency.DAILY.value]) > 0)
+
+    def test_weekly_excelweb(self):
+        client = Client(ExcelWebDataSource(self.__username, self.__password, self.__tmp_directory))
+
+        data = client.loadSince(self.__pceIdentifier, 365, [Frequency.WEEKLY])
+
+        assert (len(data[Frequency.WEEKLY.value]) >= 51 and len(data[Frequency.WEEKLY.value]) <= 54)
+
+    def test_monthly_excelweb(self):
+        client = Client(ExcelWebDataSource(self.__username, self.__password, self.__tmp_directory))
+
+        data = client.loadSince(self.__pceIdentifier, 365, [Frequency.MONTHLY])
+
+        assert (len(data[Frequency.MONTHLY.value]) >= 12 and len(data[Frequency.MONTHLY.value]) <= 13)
+
+    def test_yearly_excelweb(self):
+        client = Client(ExcelWebDataSource(self.__username, self.__password, self.__tmp_directory))
+
+        data = client.loadSince(self.__pceIdentifier, 365, [Frequency.YEARLY])
+
+        assert (len(data[Frequency.YEARLY.value]) == 1)
+
+    def test_hourly_sample(self):
+        client = Client(TestDataSource())
+
+        data = client.loadSince(self.__pceIdentifier, 365, [Frequency.HOURLY])
+
+        assert (len(data[Frequency.HOURLY.value]) == 0)
+
+    def test_daily_sample(self):
+        client = Client(TestDataSource())
+
+        data = client.loadSince(self.__pceIdentifier, 365, [Frequency.DAILY])
+
+        assert (len(data[Frequency.DAILY.value]) == 711)
+
+    def test_weekly_sample(self):
+        client = Client(TestDataSource())
+
+        data = client.loadSince(self.__pceIdentifier, 365, [Frequency.WEEKLY])
+
+        assert (len(data[Frequency.WEEKLY.value]) > 0)
+
+    def test_monthly_sample(self):
+        client = Client(TestDataSource())
+
+        data = client.loadSince(self.__pceIdentifier, 365, [Frequency.MONTHLY])
+
+        assert (len(data[Frequency.MONTHLY.value]) > 0)
+
+    def test_yearly_sample(self):
+        client = Client(TestDataSource())
+
+        data = client.loadSince(self.__pceIdentifier, 365, [Frequency.YEARLY])
+
+        assert (len(data[Frequency.YEARLY.value]) == 2)

tests/test_datasource.py

@@ -1,166 +1,166 @@
-import os
-from pygazpar.datasource import TestDataSource, JsonFileDataSource, ExcelFileDataSource, JsonWebDataSource, ExcelWebDataSource
-from pygazpar.enum import Frequency
-from datetime import date, timedelta
-from dotenv import load_dotenv
-
-
-class TestAllDataSource:
-
-    # ------------------------------------------------------
-    @classmethod
-    def setup_class(cls):
-        """ setup any state specific to the execution of the given class (which
-        usually contains tests).
-        """
-
-    # ------------------------------------------------------
-    @classmethod
-    def teardown_class(cls):
-        """ teardown any state that was previously setup with a call to
-        setup_class.
-        """
-
-    # ------------------------------------------------------
-    def setup_method(self):
-        """ setup any state tied to the execution of the given method in a
-        class.  setup_method is invoked for every test method of a class.
-        """
-        tmpdir = os.path.normpath(f"{os.getcwd()}/tmp")
-
-        # We create the tmp directory if not already exists.
-        if not os.path.exists(tmpdir):
-            os.mkdir(tmpdir)
-
-        load_dotenv()
-
-        self.__username = os.environ["GRDF_USERNAME"]
-        self.__password = os.environ["GRDF_PASSWORD"]
-        self.__pceIdentifier = os.environ["PCE_IDENTIFIER"]
-        self.__tmp_directory = tmpdir
-
-    # ------------------------------------------------------
-    def teardown_method(self):
-        """ teardown any state that was previously setup with a setup_method
-        call.
-        """
-
-    # ------------------------------------------------------
-    def test_sample(self):
-
-        dataSource = TestDataSource()
-
-        endDate = date.today()
-        startDate = endDate + timedelta(days=-365)
-
-        data = dataSource.load(self.__pceIdentifier, startDate, endDate)
-
-        assert (len(data[Frequency.DAILY.value]) == 711)
-
-        assert (len(data[Frequency.WEEKLY.value]) == 102)
-
-        assert (len(data[Frequency.MONTHLY.value]) == 24)
-
-        assert (len(data[Frequency.YEARLY.value]) == 2)
-
-    # ------------------------------------------------------
-    def test_jsonfile_sample(self):
-
-        dataSource = JsonFileDataSource("tests/resources/donnees_informatives.json", "tests/resources/temperatures.json")
-
-        endDate = date.today()
-        startDate = endDate + timedelta(days=-365)
-
-        data = dataSource.load(self.__pceIdentifier, startDate, endDate, [Frequency.DAILY, Frequency.WEEKLY, Frequency.MONTHLY, Frequency.YEARLY])
-
-        assert (len(data[Frequency.DAILY.value]) == 1096)
-
-        assert (len(data[Frequency.WEEKLY.value]) == 155)
-
-        assert (len(data[Frequency.MONTHLY.value]) == 36)
-
-        assert (len(data[Frequency.YEARLY.value]) == 3)
-
-    # ------------------------------------------------------
-    def test_daily_excelfile_sample(self):
-
-        dataSource = ExcelFileDataSource("tests/resources/Donnees_informatives_PCE_DAILY.xlsx")
-
-        endDate = date.today()
-        startDate = endDate + timedelta(days=-365)
-
-        data = dataSource.load(self.__pceIdentifier, startDate, endDate, [Frequency.DAILY])
-
-        assert (len(data[Frequency.DAILY.value]) == 363)
-
-    # ------------------------------------------------------
-    def test_weekly_excelfile_sample(self):
-
-        dataSource = ExcelFileDataSource("tests/resources/Donnees_informatives_PCE_WEEKLY.xlsx")
-
-        endDate = date.today()
-        startDate = endDate + timedelta(days=-365)
-
-        data = dataSource.load(self.__pceIdentifier, startDate, endDate, [Frequency.WEEKLY])
-
-        assert (len(data[Frequency.WEEKLY.value]) == 53)
-
-    # ------------------------------------------------------
-    def test_monthly_excelfile_sample(self):
-
-        dataSource = ExcelFileDataSource("tests/resources/Donnees_informatives_PCE_MONTHLY.xlsx")
-
-        endDate = date.today()
-        startDate = endDate + timedelta(days=-365)
-
-        data = dataSource.load(self.__pceIdentifier, startDate, endDate, [Frequency.MONTHLY])
-
-        assert (len(data[Frequency.MONTHLY.value]) == 13)
-
-    # ------------------------------------------------------
-    def test_yearly_excelfile_sample(self):
-
-        dataSource = ExcelFileDataSource("tests/resources/Donnees_informatives_PCE_DAILY.xlsx")
-
-        endDate = date.today()
-        startDate = endDate + timedelta(days=-365)
-
-        data = dataSource.load(self.__pceIdentifier, startDate, endDate, [Frequency.YEARLY])
-
-        assert (len(data[Frequency.YEARLY.value]) == 1)
-
-    # ------------------------------------------------------
-    def test_jsonweb(self):
-
-        dataSource = JsonWebDataSource(self.__username, self.__password)
-
-        endDate = date.today()
-        startDate = endDate + timedelta(days=-365)
-
-        data = dataSource.load(self.__pceIdentifier, startDate, endDate, [Frequency.DAILY, Frequency.WEEKLY, Frequency.MONTHLY, Frequency.YEARLY])
-
-        assert (len(data[Frequency.DAILY.value]) > 0)
-
-        assert (len(data[Frequency.WEEKLY.value]) >= 51 and len(data[Frequency.WEEKLY.value]) <= 54)
-
-        assert (len(data[Frequency.MONTHLY.value]) >= 11 and len(data[Frequency.MONTHLY.value]) <= 13)
-
-        assert (len(data[Frequency.YEARLY.value]) >= 1)
-
-    # ------------------------------------------------------
-    def test_excelweb(self):
-
-        dataSource = ExcelWebDataSource(self.__username, self.__password, self.__tmp_directory)
-
-        endDate = date.today()
-        startDate = endDate + timedelta(days=-365)
-
-        data = dataSource.load(self.__pceIdentifier, startDate, endDate, [Frequency.DAILY, Frequency.WEEKLY, Frequency.MONTHLY, Frequency.YEARLY])
-
-        assert (len(data[Frequency.DAILY.value]) > 0)
-
-        assert (len(data[Frequency.WEEKLY.value]) >= 51 and len(data[Frequency.WEEKLY.value]) <= 54)
-
-        assert (len(data[Frequency.MONTHLY.value]) >= 12 and len(data[Frequency.MONTHLY.value]) <= 13)
-
-        assert (len(data[Frequency.YEARLY.value]) >= 1)
+import os
+from pygazpar.datasource import TestDataSource, JsonFileDataSource, ExcelFileDataSource, JsonWebDataSource, ExcelWebDataSource
+from pygazpar.enum import Frequency
+from datetime import date, timedelta
+from dotenv import load_dotenv
+
+
+class TestAllDataSource:
+
+    # ------------------------------------------------------
+    @classmethod
+    def setup_class(cls):
+        """ setup any state specific to the execution of the given class (which
+        usually contains tests).
+        """
+
+    # ------------------------------------------------------
+    @classmethod
+    def teardown_class(cls):
+        """ teardown any state that was previously setup with a call to
+        setup_class.
+        """
+
+    # ------------------------------------------------------
+    def setup_method(self):
+        """ setup any state tied to the execution of the given method in a
+        class.  setup_method is invoked for every test method of a class.
+        """
+        tmpdir = os.path.normpath(f"{os.getcwd()}/tmp")
+
+        # We create the tmp directory if not already exists.
+        if not os.path.exists(tmpdir):
+            os.mkdir(tmpdir)
+
+        load_dotenv()
+
+        self.__username = os.environ["GRDF_USERNAME"]
+        self.__password = os.environ["GRDF_PASSWORD"]
+        self.__pceIdentifier = os.environ["PCE_IDENTIFIER"]
+        self.__tmp_directory = tmpdir
+
+    # ------------------------------------------------------
+    def teardown_method(self):
+        """ teardown any state that was previously setup with a setup_method
+        call.
+        """
+
+    # ------------------------------------------------------
+    def test_sample(self):
+
+        dataSource = TestDataSource()
+
+        endDate = date.today()
+        startDate = endDate + timedelta(days=-365)
+
+        data = dataSource.load(self.__pceIdentifier, startDate, endDate)
+
+        assert (len(data[Frequency.DAILY.value]) == 711)
+
+        assert (len(data[Frequency.WEEKLY.value]) == 102)
+
+        assert (len(data[Frequency.MONTHLY.value]) == 24)
+
+        assert (len(data[Frequency.YEARLY.value]) == 2)
+
+    # ------------------------------------------------------
+    def test_jsonfile_sample(self):
+
+        dataSource = JsonFileDataSource("tests/resources/donnees_informatives.json", "tests/resources/temperatures.json")
+
+        endDate = date.today()
+        startDate = endDate + timedelta(days=-365)
+
+        data = dataSource.load(self.__pceIdentifier, startDate, endDate, [Frequency.DAILY, Frequency.WEEKLY, Frequency.MONTHLY, Frequency.YEARLY])
+
+        assert (len(data[Frequency.DAILY.value]) == 1096)
+
+        assert (len(data[Frequency.WEEKLY.value]) == 155)
+
+        assert (len(data[Frequency.MONTHLY.value]) == 36)
+
+        assert (len(data[Frequency.YEARLY.value]) == 3)
+
+    # ------------------------------------------------------
+    def test_daily_excelfile_sample(self):
+
+        dataSource = ExcelFileDataSource("tests/resources/Donnees_informatives_PCE_DAILY.xlsx")
+
+        endDate = date.today()
+        startDate = endDate + timedelta(days=-365)
+
+        data = dataSource.load(self.__pceIdentifier, startDate, endDate, [Frequency.DAILY])
+
+        assert (len(data[Frequency.DAILY.value]) == 363)
+
+    # ------------------------------------------------------
+    def test_weekly_excelfile_sample(self):
+
+        dataSource = ExcelFileDataSource("tests/resources/Donnees_informatives_PCE_WEEKLY.xlsx")
+
+        endDate = date.today()
+        startDate = endDate + timedelta(days=-365)
+
+        data = dataSource.load(self.__pceIdentifier, startDate, endDate, [Frequency.WEEKLY])
+
+        assert (len(data[Frequency.WEEKLY.value]) == 53)
+
+    # ------------------------------------------------------
+    def test_monthly_excelfile_sample(self):
+
+        dataSource = ExcelFileDataSource("tests/resources/Donnees_informatives_PCE_MONTHLY.xlsx")
+
+        endDate = date.today()
+        startDate = endDate + timedelta(days=-365)
+
+        data = dataSource.load(self.__pceIdentifier, startDate, endDate, [Frequency.MONTHLY])
+
+        assert (len(data[Frequency.MONTHLY.value]) == 13)
+
+    # ------------------------------------------------------
+    def test_yearly_excelfile_sample(self):
+
+        dataSource = ExcelFileDataSource("tests/resources/Donnees_informatives_PCE_DAILY.xlsx")
+
+        endDate = date.today()
+        startDate = endDate + timedelta(days=-365)
+
+        data = dataSource.load(self.__pceIdentifier, startDate, endDate, [Frequency.YEARLY])
+
+        assert (len(data[Frequency.YEARLY.value]) == 1)
+
+    # ------------------------------------------------------
+    def test_jsonweb(self):
+
+        dataSource = JsonWebDataSource(self.__username, self.__password)
+
+        endDate = date.today()
+        startDate = endDate + timedelta(days=-365)
+
+        data = dataSource.load(self.__pceIdentifier, startDate, endDate, [Frequency.DAILY, Frequency.WEEKLY, Frequency.MONTHLY, Frequency.YEARLY])
+
+        assert (len(data[Frequency.DAILY.value]) > 0)
+
+        assert (len(data[Frequency.WEEKLY.value]) >= 51 and len(data[Frequency.WEEKLY.value]) <= 54)
+
+        assert (len(data[Frequency.MONTHLY.value]) >= 12 and len(data[Frequency.MONTHLY.value]) <= 13)
+
+        assert (len(data[Frequency.YEARLY.value]) == 1)
+
+    # ------------------------------------------------------
+    def test_excelweb(self):
+
+        dataSource = ExcelWebDataSource(self.__username, self.__password, self.__tmp_directory)
+
+        endDate = date.today()
+        startDate = endDate + timedelta(days=-365)
+
+        data = dataSource.load(self.__pceIdentifier, startDate, endDate, [Frequency.DAILY, Frequency.WEEKLY, Frequency.MONTHLY, Frequency.YEARLY])
+
+        assert (len(data[Frequency.DAILY.value]) > 0)
+
+        assert (len(data[Frequency.WEEKLY.value]) >= 51 and len(data[Frequency.WEEKLY.value]) <= 54)
+
+        assert (len(data[Frequency.MONTHLY.value]) >= 12 and len(data[Frequency.MONTHLY.value]) <= 13)
+
+        assert (len(data[Frequency.YEARLY.value]) == 1)