pygazpar 1.3.0a11__tar.gz → 1.3.0a13__tar.gz

{pygazpar-1.3.0a11/pygazpar.egg-info → pygazpar-1.3.0a13}/PKG-INFO

@@ -1,12 +1,12 @@
 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
-Download-URL: https://github.com/ssenart/pygazpar/releases
 Author: Stephane Senart
 Author-email: stephane.senart@gmail.com
 License: MIT
+Download-URL: https://github.com/ssenart/pygazpar/releases
 Project-URL: Home, https://github.com/ssenart/pygazpar
 Project-URL: Source, https://github.com/ssenart/pygazpar
 Project-URL: Issues, https://github.com/ssenart/PyGazpar/issues
@@ -217,6 +217,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
@@ -453,3 +463,5 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+

{pygazpar-1.3.0a11 → pygazpar-1.3.0a13}/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-1.3.0a11 → pygazpar-1.3.0a13}/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-1.3.0a11 → pygazpar-1.3.0a13}/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-1.3.0a13/pygazpar/version.py

@@ -0,0 +1 @@
+__version__ = "1.3.0a13"

{pygazpar-1.3.0a11 → pygazpar-1.3.0a13/pygazpar.egg-info}/PKG-INFO

@@ -1,12 +1,12 @@
 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
-Download-URL: https://github.com/ssenart/pygazpar/releases
 Author: Stephane Senart
 Author-email: stephane.senart@gmail.com
 License: MIT
+Download-URL: https://github.com/ssenart/pygazpar/releases
 Project-URL: Home, https://github.com/ssenart/pygazpar
 Project-URL: Source, https://github.com/ssenart/pygazpar
 Project-URL: Issues, https://github.com/ssenart/PyGazpar/issues
@@ -217,6 +217,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
@@ -453,3 +463,5 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+

{pygazpar-1.3.0a11 → pygazpar-1.3.0a13}/pygazpar.egg-info/entry_points.txt

@@ -1,2 +1,3 @@
 [console_scripts]
 pygazpar = pygazpar.__main__:main
+

{pygazpar-1.3.0a11 → pygazpar-1.3.0a13}/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))

pygazpar-1.3.0a11/pygazpar/version.py

@@ -1 +0,0 @@
-__version__ = "1.3.0a11"