pygazpar 1.3.0a11__py39-none-any.whl → 1.3.0a13__py39-none-any.whl

pygazpar/datasource.py

@@ -94,14 +94,14 @@ class WebDataSource(IDataSource):
 
         params = json.loads(AUTH_TOKEN_PARAMS.format(session_token))
 
-        response = session.get(AUTH_TOKEN_URL, params=params, allow_redirects=True, cookies=jar)
+        response = 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")
 
-        return auth_token
+        return auth_token  # type: ignore
 
     @abstractmethod
     def _loadFromSession(self, auth_token: str, pceIdentifier: str, startDate: date, endDate: date, frequencies: Optional[List[Frequency]] = None) -> MeterReadingsByFrequency:
@@ -211,7 +211,7 @@ class ExcelWebDataSource(WebDataSource):
 
         response = session.get(url)
 
-        if "text/html" in response.headers.get("Content-Type"):
+        if "text/html" in response.headers.get("Content-Type"):  # type: ignore
             raise Exception("An error occurred while loading data. Please check your credentials.")
 
         if response.status_code != 200:
@@ -297,7 +297,7 @@ class JsonWebDataSource(WebDataSource):
             try:
                 response = session.get(downloadUrl)
 
-                if "text/html" in response.headers.get("Content-Type"):
+                if "text/html" in response.headers.get("Content-Type"):  # type: ignore
                     raise Exception("An error occurred while loading data. Please check your credentials.")
 
                 if response.status_code != 200:
@@ -466,7 +466,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["count"] < 7]])
+        df = pd.concat([df[(df["count"] >= 7)], df.tail(1)[df.tail(1)["count"] < 7]])
 
         # Select target columns.
         df = df[["time_period", "start_index_m3", "end_index_m3", "volume_m3", "energy_kwh", "timestamp"]]
@@ -494,7 +494,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["count"] < 28]])
+        df = pd.concat([df[(df["count"] >= 28)], df.tail(1)[df.tail(1)["count"] < 28]])
 
         # Rename columns for their target names.
         df = df.rename(columns={"month_year": "time_period"})
@@ -525,7 +525,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["count"] < 360]])
+        df = pd.concat([df[(df["count"] >= 360)], df.tail(1)[df.tail(1)["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)
+        res = parseByFrequency[dataReadingFrequency](worksheet)  # type: ignore
 
         workbook.close()
 

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.0a11"
+__version__ = "1.3.0a13"

{pygazpar-1.3.0a11.dist-info → pygazpar-1.3.0a13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pygazpar
-Version: 1.3.0a11
+Version: 1.3.0a13
 Summary: Retrieve gas consumption from GrDF web site (French Gas Company)
 Home-page: https://github.com/ssenart/pygazpar
 Author: Stephane Senart
@@ -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.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

{pygazpar-1.3.0a11.dist-info → pygazpar-1.3.0a13.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=nlIWxZ6SNSHf09BVBFIChSHf4dN05lC3LCxUUDRTylg,21470
+pygazpar/datasource.py,sha256=N9OVdJr4BwtA0W8DvKe4PEE4kLKbSEH2wxAYGNk-iIU,21558
 pygazpar/enum.py,sha256=3ZCk4SziXF6pxgP3MuQ1qxYfqB3X5DOV8Rtd0GHsK9w,898
-pygazpar/excelparser.py,sha256=glWlbj22pxYjHGKurOFmhzcVAoWCvfOHn7_Y6GgHUPo,5915
-pygazpar/jsonparser.py,sha256=AWdU3h7UohsOov8HpeP8GNuqcnDmM4r3I7-CI_crDvA,1804
-pygazpar/version.py,sha256=_dBppxmPi6eC2EiB3BcrYBcY9pm4iNlyhbySqBY4Y0Y,25
+pygazpar/excelparser.py,sha256=QNFIErXNgMjGGjsGjdnRxAbNpfVagdYmZQtXRub3_Xc,5931
+pygazpar/jsonparser.py,sha256=OrRdMZNBi7rI4dRGoRW7gjyFwJFk-IvtkRZ_t1XVFrI,1859
+pygazpar/version.py,sha256=fteP4W4hbooBmvXetTEMAiyQM-pQD7RL7NcxjAIFl9Y,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.0a11.dist-info/LICENSE.md,sha256=XsCJx_7_BC9tvmE0ZxS1cTNR7ekurog_ea9ybdZ-8tc,1073
-pygazpar-1.3.0a11.dist-info/METADATA,sha256=Ei4SwL0HLpRu-4cLOdeA-4Ybc1FXCwgMYs3ebmqoPt0,18419
-pygazpar-1.3.0a11.dist-info/WHEEL,sha256=FQUktIEL0Svmrm0vtDnkVkbaotVNpS5un0v2TQiPCxk,93
-pygazpar-1.3.0a11.dist-info/entry_points.txt,sha256=c_FMZPYlRv1w9EqfgWhlkdJOoje7FcglI0UMm2oRLoI,53
-pygazpar-1.3.0a11.dist-info/top_level.txt,sha256=P7qn-XtanDPBLQsTvjvLV71wH8RK0DYbx8tzN_rDS70,23
-pygazpar-1.3.0a11.dist-info/RECORD,,
+pygazpar-1.3.0a13.dist-info/LICENSE.md,sha256=XsCJx_7_BC9tvmE0ZxS1cTNR7ekurog_ea9ybdZ-8tc,1073
+pygazpar-1.3.0a13.dist-info/METADATA,sha256=nlBR51nRfdgOa7BJuz4fJsg89cJzPEFx_D3e5v2a3gA,18949
+pygazpar-1.3.0a13.dist-info/WHEEL,sha256=E6NuJA_MIt2CDvbuRmqVFG99302DhLXEpOp5wbsbDeU,93
+pygazpar-1.3.0a13.dist-info/entry_points.txt,sha256=c_FMZPYlRv1w9EqfgWhlkdJOoje7FcglI0UMm2oRLoI,53
+pygazpar-1.3.0a13.dist-info/top_level.txt,sha256=P7qn-XtanDPBLQsTvjvLV71wH8RK0DYbx8tzN_rDS70,23
+pygazpar-1.3.0a13.dist-info/RECORD,,

{pygazpar-1.3.0a11.dist-info → pygazpar-1.3.0a13.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: py39-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))