pygazpar 1.3.0a11__tar.gz → 1.3.0a12__tar.gz

pygazpar-1.3.0a12/CHANGELOG.md

@@ -0,0 +1,225 @@
+# Changelog
+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.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
+
+### Fixed
+- [#64](https://github.com/ssenart/PyGazpar/issues/64): [Issue] Captcha failed issue.
+
+- [#63](https://github.com/ssenart/PyGazpar/issues/63): [Bug] If the latest received consumption is Sunday, then the last weekly period is duplicated.
+
+## [1.2.0](https://github.com/ssenart/PyGazpar/compare/1.1.6...1.2.0) - 2022-12-16
+
+### Changed
+- [#59](https://github.com/ssenart/PyGazpar/issues/59): [Feature] Support both Excel and Json data source format from GrDF site.
+
+- [#60](https://github.com/ssenart/PyGazpar/issues/60): [Feature] Permit to load data at multiple frequencies with one method call.
+
+### Fixed
+- [#47](https://github.com/ssenart/PyGazpar/issues/47): [Bug] No temperature field available.
+
+- [#58](https://github.com/ssenart/PyGazpar/issues/58): [Issue] No data update - GrDF web site is half broken - Download button does not work anymore.
+
+## [1.1.6](https://github.com/ssenart/PyGazpar/compare/1.1.5...1.1.6) - 2022-11-16
+### Fixed
+- [#55](https://github.com/ssenart/PyGazpar/issues/55): Problème de connexion.
+
+## [1.1.5](https://github.com/ssenart/PyGazpar/compare/1.1.4...1.1.5) - 2022-07-11
+### Fixed
+- [#49](https://github.com/ssenart/PyGazpar/issues/49): Authentication failure.
+
+## [1.1.4](https://github.com/ssenart/PyGazpar/compare/1.1.2...1.1.4) - 2022-01-18
+### Changed
+- [#43](https://github.com/ssenart/PyGazpar/issues/43): Downloaded Excel file name has changed from Donnees_informatives_PCE_$dateDebut_$dateFin.xlsx to Donnees_informatives_$numeroPCE_$dateDebut_$dateFin.xlsx.
+
+## [1.1.2](https://github.com/ssenart/PyGazpar/compare/1.1.1...1.1.2) - 2022-01-08
+### Fixed
+- [#39](https://github.com/ssenart/PyGazpar/issues/39): NameError: name 'Frequency' is not defined (thanks [nicolas-r](https://github.com/nicolas-r)).
+- Numéro PCE pas forcément un nombre: Le numéro PCE de mon compteur commence par un 0 et lorsque j'essaie de récupérer mes relevés avec PyGazpar, une erreur de l'API est renvoyée. Le numéro PCE ne doit donc pas être converti en int lorsque il est passé en paramètre mais doit être une string (thanks  [maelgangloff](https://github.com/maelgangloff)).
+
+## [1.1.1](https://github.com/ssenart/PyGazpar/compare/1.1.0...1.1.1) - 2021-12-02
+### Changed
+- Exact same version as 1.1.0 except that 1.1.0 has not been published on Pypi repository.
+
+## [1.1.0](https://github.com/ssenart/PyGazpar/compare/1.0.2...1.1.0) - 2021-12-02
+### Changed
+- Remove Selenium usage and use simple Web request for login and data retrieval.
+
+## [1.0.2](https://github.com/ssenart/PyGazpar/compare/1.0.1...1.0.2) - 2021-11-25
+### Fixed
+- Fix broken command line pygazpar caused by adding the new lastNDays parameter.
+- Fix the error : ValueError: could not convert string to float: 'Index de début de période (m3)'. It occurs because the records in the Excel file now starts at line 10 instead of line 8 before (thanks to [DEFAYArnaud](https://github.com/DEFAYArnaud) for having spotted the issue and bringing the fix).
+
+### Changed
+- In the Excel file, if a cell is empty, then no corresponding key will be inserted in the result dictionary (before we inserted a key with an empty string).
+
+## [1.0.1](https://github.com/ssenart/PyGazpar/compare/1.0.0...1.0.1) - 2021-11-24
+### Fixed
+- Fix typo warning from Pylance preventing 1.0.0 to be published.
+
+## [1.0.0](https://github.com/ssenart/PyGazpar/compare/0.2.0...1.0.0) - 2021-11-24
+### Added
+- New lastNDays parameter to query data only over the last N days period.
+
+### Fixed
+- [#18](https://github.com/ssenart/PyGazpar/issues/18): PyGazpar broken since GRDF Monespace has been upgraded to a new version.
+
+## [0.2.0](https://github.com/ssenart/PyGazpar/compare/0.1.27...0.2.0) - 2021-04-21
+### Added
+- [#12](https://github.com/ssenart/PyGazpar/issues/10): Be able to retrieve consumption not only on a daily basis, but weekly and monthly:
+    - API : Add a new parameter 'meterReadingFrequency' to Client that accepts enumeration: Frequency.DAILY, Frequency.WEEKLY or Frequency.MONTHLY.
+    - Command line : Add a new argument '--frequency' that accepts values : DAILY, WEEKLY or MONTHLY.
+- Be able to test using offline data :
+    - API : Add a new parameter 'testMode' to Clients used to specify whether we want to get some live data (testMode=False) and static testing data (testMode=True).
+    - Command line : Add a new argument '--testMode' (True if specified and False by default).
+
+### Changed
+- Some ouput energy property names have changed:
+    - 'date' => 'time_period'.
+    - 'converter_factor' => 'converter_factor_kwh/m3'.
+    - 'local_temperature' => 'temperature_degC'.
+
+## [0.1.27](https://github.com/ssenart/PyGazpar/compare/0.1.26...0.1.27) - 2021-04-20
+### Fixed
+- [#10](https://github.com/ssenart/PyGazpar/issues/10) : Does not download data file in tmpdir as expected (instead it is downloaded in the default user Download directory). The previous attempt in version 0.1.26 is a failure. The origin of the bug is that we send a relative tmp directory path to Webdriver. Additionally, this path has to be normalized to the runtime OS (using slash or backslash).
+
+## [0.1.26](https://github.com/ssenart/PyGazpar/compare/0.1.25...0.1.26) - 2021-04-18
+### Fixed
+- [#10](https://github.com/ssenart/PyGazpar/issues/10) : Does not download data file in tmpdir as expected (instead it is downloaded in the default user Download directory).
+
+### Added
+- A new parameter to drive whether we want Selenium in headless mode or not (mainly for troubleshooting purpose).
+
+## [0.1.25] - 2021-04-15
+### Fixed
+- Remove useless warning log messages (log message level has been decreased to debug).
+
+## [0.1.24] - 2021-04-14
+### Added
+- README.md amendment (thanks to pbranly).
+
+## [0.1.23] - 2021-04-09
+### Changed
+- Final release with CI/CD workflow improvement.
+
+## [0.1.22] - 2021-04-09
+### Changed
+- Improve CI/CD workflow.
+
+## [0.1.21] - 2021-04-07
+### Changed
+- Cleanup some codes managing Privacy Conditions popup.
+
+## [0.1.20] - 2021-04-07
+### Changed
+- Close an eventual Privacy Conditions popup just before clicking the daily button (instead of Cookie banner).
+
+## [0.1.19] - 2021-04-06
+### Added
+- Close an eventual Cookie popup just before clicking the daily button.
+- Add log messages and screenshot capture around click() and send_keys() methods.
+
+## [0.1.18] - 2021-04-05
+### Fixed
+- Typo in logger usage.
+
+## [0.1.17] - 2021-04-05
+### Fixed
+- Logger name must be different in each instance. Using __name__ is a good practice, we can get the module hierarchy.
+
+## [0.1.16] - 2021-04-05
+### Fixed
+- Logger 'pygazpar' initialization must be done inside the main program and not inside the library.
+
+## [0.1.15] - 2021-04-05
+### Added
+- Many log message to help debugging if GrDF site changes something : pygazpar.log
+- Take a screenshot of the corresponding page where a selenium command fails : error_screenshot.png.
+
+## [0.1.14] - 2020-09-23
+### Fixed
+- GrDF survey popup has to be closed at the home page.
+- GrDF Assistant popup may hide the Download button. We have to close it.
+- GrDF bottom banner that invite to accept cookies may also hide the Download button. We have to accept it.
+
+### Added
+- A new parameter 'lastNRows' to get only the last N most recent records.
+
+## [0.1.13] - 2020-06-30
+### Fixed
+- GrDF data retrieval from Excel file is not limited to the 1000 first rows any more.
+
+## [0.1.12] - 2020-06-30
+### Fixed
+- The previous 0.1.11 is not sufficient. Hence, 2 new changes : First, make configurable the waiting time so the user can adapt to its context usage.
+Second, the condition on clicking on Download button is now based on the corresponding event and not anymore on its identifier. 
+
+## [0.1.11] - 2020-06-29
+### Fixed
+- When GrDF Web site is slower than usual, the client may not wait enough time for pages to load and miss to reach the data file.
+It occurs with the page containing 'Jour' button which is very long to load (I increase the wait to load time from 5s to 30s).
+
+## [0.1.10] - 2020-06-03
+### Fixed
+- Extract rows from Excel until line 1000 (instead of 365 as before).
+
+## [0.1.9] - 2019-08-31
+### Fixed
+- WebDriver window size must be large enough to display all clickable components.
+
+## [0.1.8] - 2019-08-31
+### Changed
+- Use PropertyNameEnum type to store all property names.
+
+## [0.1.7] - 2019-08-29
+### Added
+- Add wait_time option to control how much time the library has to wait for Web page element to load (see https://selenium-python.readthedocs.io/waits.html for details).
+- Add LoginError exception raised when PyGazpar is unable to sign in the GrDF Web site with the given username/password.
+- Refactor all data property names.
+
+## [0.1.6] - 2019-08-26
+### Added
+- Add README.md and CHANGELOG.md.
+- Add Client.data() method to get the updated data.
+
+### Removed
+- Remove Client.data property to get the updated data. Replaced with Client.__data private property.
+
+[0.1.25]: https://github.com/ssenart/PyGazpar/compare/0.1.24...0.1.25
+[0.1.24]: https://github.com/ssenart/PyGazpar/compare/0.1.23...0.1.24
+[0.1.23]: https://github.com/ssenart/PyGazpar/compare/0.1.22...0.1.23
+[0.1.22]: https://github.com/ssenart/PyGazpar/compare/0.1.21...0.1.22
+[0.1.21]: https://github.com/ssenart/PyGazpar/compare/0.1.20...0.1.21
+[0.1.20]: https://github.com/ssenart/PyGazpar/compare/0.1.19...0.1.20
+[0.1.19]: https://github.com/ssenart/PyGazpar/compare/0.1.17...0.1.19
+[0.1.18]: https://github.com/ssenart/PyGazpar/compare/0.1.17...0.1.18
+[0.1.17]: https://github.com/ssenart/PyGazpar/compare/0.1.16...0.1.17
+[0.1.16]: https://github.com/ssenart/PyGazpar/compare/0.1.15...0.1.16
+[0.1.15]: https://github.com/ssenart/PyGazpar/compare/0.1.14...0.1.15
+[0.1.14]: https://github.com/ssenart/PyGazpar/compare/0.1.13...0.1.14
+[0.1.13]: https://github.com/ssenart/PyGazpar/compare/0.1.12...0.1.13
+[0.1.12]: https://github.com/ssenart/PyGazpar/compare/0.1.11...0.1.12
+[0.1.11]: https://github.com/ssenart/PyGazpar/compare/0.1.10...0.1.11
+[0.1.10]: https://github.com/ssenart/PyGazpar/compare/0.1.9...0.1.10
+[0.1.9]: https://github.com/ssenart/PyGazpar/compare/0.1.7...0.1.9
+[0.1.8]: https://github.com/ssenart/PyGazpar/compare/0.1.7...0.1.8
+[0.1.7]: https://github.com/ssenart/PyGazpar/compare/0.1.6...0.1.7
+[0.1.6]: https://github.com/ssenart/PyGazpar/compare/0.1.5...0.1.6

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pygazpar
-Version: 1.3.0a11
+Version: 1.3.0a12
 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
@@ -26,6 +26,9 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
+Requires-Dist: openpyxl>=2.6.3
+Requires-Dist: requests>=2.26.0
+Requires-Dist: pandas
 
 # PyGazpar
 
@@ -217,6 +220,11 @@ 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.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 → pygazpar-1.3.0a12}/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.0a12}/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.0a12/pygazpar/version.py

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pygazpar
-Version: 1.3.0a11
+Version: 1.3.0a12
 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
@@ -26,6 +26,9 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
+Requires-Dist: openpyxl>=2.6.3
+Requires-Dist: requests>=2.26.0
+Requires-Dist: pandas
 
 # PyGazpar
 
@@ -217,6 +220,11 @@ 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.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 → pygazpar-1.3.0a12}/pygazpar.egg-info/SOURCES.txt

@@ -1,3 +1,4 @@
+CHANGELOG.md
 LICENSE.md
 MANIFEST.in
 README.md

pygazpar-1.3.0a11/pygazpar/version.py

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