hydrobot 0.7.0__tar.gz → 0.7.2__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (107) hide show
  1. {hydrobot-0.7.0 → hydrobot-0.7.2}/HISTORY.rst +11 -0
  2. {hydrobot-0.7.0 → hydrobot-0.7.2}/PKG-INFO +9 -7
  3. {hydrobot-0.7.0 → hydrobot-0.7.2}/README.rst +5 -5
  4. {hydrobot-0.7.0 → hydrobot-0.7.2}/hydrobot/__init__.py +1 -1
  5. {hydrobot-0.7.0 → hydrobot-0.7.2}/hydrobot/rf_processor.py +1 -7
  6. {hydrobot-0.7.0 → hydrobot-0.7.2}/hydrobot.egg-info/PKG-INFO +9 -7
  7. {hydrobot-0.7.0 → hydrobot-0.7.2}/hydrobot.egg-info/requires.txt +3 -1
  8. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/rainfall/rain_script.py +6 -22
  9. {hydrobot-0.7.0 → hydrobot-0.7.2}/pyproject.toml +6 -4
  10. {hydrobot-0.7.0 → hydrobot-0.7.2}/.editorconfig +0 -0
  11. {hydrobot-0.7.0 → hydrobot-0.7.2}/.github/ISSUE_TEMPLATE.md +0 -0
  12. {hydrobot-0.7.0 → hydrobot-0.7.2}/.gitignore +0 -0
  13. {hydrobot-0.7.0 → hydrobot-0.7.2}/.pre-commit-config.yaml +0 -0
  14. {hydrobot-0.7.0 → hydrobot-0.7.2}/.readthedocs.yaml +0 -0
  15. {hydrobot-0.7.0 → hydrobot-0.7.2}/AUTHORS.rst +0 -0
  16. {hydrobot-0.7.0 → hydrobot-0.7.2}/CONTRIBUTING.rst +0 -0
  17. {hydrobot-0.7.0 → hydrobot-0.7.2}/LICENSE +0 -0
  18. {hydrobot-0.7.0 → hydrobot-0.7.2}/MANIFEST.in +0 -0
  19. {hydrobot-0.7.0 → hydrobot-0.7.2}/Makefile +0 -0
  20. {hydrobot-0.7.0 → hydrobot-0.7.2}/docs/Makefile +0 -0
  21. {hydrobot-0.7.0 → hydrobot-0.7.2}/docs/authors.rst +0 -0
  22. {hydrobot-0.7.0 → hydrobot-0.7.2}/docs/conf.py +0 -0
  23. {hydrobot-0.7.0 → hydrobot-0.7.2}/docs/contributing.rst +0 -0
  24. {hydrobot-0.7.0 → hydrobot-0.7.2}/docs/history.rst +0 -0
  25. {hydrobot-0.7.0 → hydrobot-0.7.2}/docs/hydrobot.rst +0 -0
  26. {hydrobot-0.7.0 → hydrobot-0.7.2}/docs/index.rst +0 -0
  27. {hydrobot-0.7.0 → hydrobot-0.7.2}/docs/installation.rst +0 -0
  28. {hydrobot-0.7.0 → hydrobot-0.7.2}/docs/make.bat +0 -0
  29. {hydrobot-0.7.0 → hydrobot-0.7.2}/docs/modules.rst +0 -0
  30. {hydrobot-0.7.0 → hydrobot-0.7.2}/docs/readme.rst +0 -0
  31. {hydrobot-0.7.0 → hydrobot-0.7.2}/docs/usage.rst +0 -0
  32. {hydrobot-0.7.0 → hydrobot-0.7.2}/hydrobot/config/DissolvedOxygenQualityCodeEvaluator_QC_config.csv +0 -0
  33. {hydrobot-0.7.0 → hydrobot-0.7.2}/hydrobot/config/QualityCodeEvaluator_QC_config.csv +0 -0
  34. {hydrobot-0.7.0 → hydrobot-0.7.2}/hydrobot/config/Three_letter_codes.yaml +0 -0
  35. {hydrobot-0.7.0 → hydrobot-0.7.2}/hydrobot/config/TwoLevelQualityCodeEvaluator_QC_config.csv +0 -0
  36. {hydrobot-0.7.0 → hydrobot-0.7.2}/hydrobot/data_acquisition.py +0 -0
  37. {hydrobot-0.7.0 → hydrobot-0.7.2}/hydrobot/data_sources.py +0 -0
  38. {hydrobot-0.7.0 → hydrobot-0.7.2}/hydrobot/data_structure.py +0 -0
  39. {hydrobot-0.7.0 → hydrobot-0.7.2}/hydrobot/do_processor.py +0 -0
  40. {hydrobot-0.7.0 → hydrobot-0.7.2}/hydrobot/evaluator.py +0 -0
  41. {hydrobot-0.7.0 → hydrobot-0.7.2}/hydrobot/filters.py +0 -0
  42. {hydrobot-0.7.0 → hydrobot-0.7.2}/hydrobot/htmlmerger.py +0 -0
  43. {hydrobot-0.7.0 → hydrobot-0.7.2}/hydrobot/measurement_specific_functions/__init__.py +0 -0
  44. {hydrobot-0.7.0 → hydrobot-0.7.2}/hydrobot/measurement_specific_functions/rainfall.py +0 -0
  45. {hydrobot-0.7.0 → hydrobot-0.7.2}/hydrobot/plotter.py +0 -0
  46. {hydrobot-0.7.0 → hydrobot-0.7.2}/hydrobot/processor.py +0 -0
  47. {hydrobot-0.7.0 → hydrobot-0.7.2}/hydrobot/utils.py +0 -0
  48. {hydrobot-0.7.0 → hydrobot-0.7.2}/hydrobot.egg-info/SOURCES.txt +0 -0
  49. {hydrobot-0.7.0 → hydrobot-0.7.2}/hydrobot.egg-info/dependency_links.txt +0 -0
  50. {hydrobot-0.7.0 → hydrobot-0.7.2}/hydrobot.egg-info/top_level.txt +0 -0
  51. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/air_temperature/.gitignore +0 -0
  52. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/air_temperature/at_config.yaml +0 -0
  53. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/air_temperature/at_script.py +0 -0
  54. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/atmospheric_pressure/.gitignore +0 -0
  55. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/atmospheric_pressure/AP_CheckData.R +0 -0
  56. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/atmospheric_pressure/ap_config.yaml +0 -0
  57. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/atmospheric_pressure/ap_script.py +0 -0
  58. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/batch_processing/batch_config.csv +0 -0
  59. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/batch_processing/batch_copy.py +0 -0
  60. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/batch_processing/output_dump/.gitignore +0 -0
  61. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/batch_processing/template/Air Temperature (1.5m)/at_config.yaml +0 -0
  62. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/batch_processing/template/Air Temperature (1.5m)/at_script.py +0 -0
  63. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/batch_processing/template/Soil.accdb +0 -0
  64. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/batch_processing/template/Soil.hts +0 -0
  65. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/dissolved_oxygen/.gitignore +0 -0
  66. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/dissolved_oxygen/DO_CheckData.R +0 -0
  67. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/dissolved_oxygen/do_config.yaml +0 -0
  68. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/dissolved_oxygen/do_script.py +0 -0
  69. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/hilltop_site_info/config.yaml +0 -0
  70. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/hilltop_site_info/server_url_generator.py +0 -0
  71. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/missing_record/Active_Measurements.csv +0 -0
  72. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/missing_record/Active_Measurements_buckets.csv +0 -0
  73. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/missing_record/defunct/Active_Measurements.csv +0 -0
  74. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/missing_record/defunct/missing_script.py +0 -0
  75. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/missing_record/generate_html.py +0 -0
  76. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/missing_record/make_missing_data_csvs.py +0 -0
  77. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/missing_record/output_dump/.gitignore +0 -0
  78. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/missing_record/script_config.yaml +0 -0
  79. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/missing_record/send_email.py +0 -0
  80. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/missing_record/site_list_merge.py +0 -0
  81. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/rainfall/.gitignore +0 -0
  82. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/rainfall/rain_config.yaml +0 -0
  83. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/soil_moisture/.gitignore +0 -0
  84. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/soil_moisture/sm_config.yaml +0 -0
  85. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/soil_moisture/sm_script.py +0 -0
  86. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/water_temperature/.gitignore +0 -0
  87. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/water_temperature/WaterTemp_CheckData.R +0 -0
  88. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/water_temperature/wt_config.yaml +0 -0
  89. {hydrobot-0.7.0 → hydrobot-0.7.2}/prototypes/water_temperature/wt_script.py +0 -0
  90. {hydrobot-0.7.0 → hydrobot-0.7.2}/requirements_dev.txt +0 -0
  91. {hydrobot-0.7.0 → hydrobot-0.7.2}/requirements_test.txt +0 -0
  92. {hydrobot-0.7.0 → hydrobot-0.7.2}/setup.cfg +0 -0
  93. {hydrobot-0.7.0 → hydrobot-0.7.2}/tests/__init__.py +0 -0
  94. {hydrobot-0.7.0 → hydrobot-0.7.2}/tests/conftest.py +0 -0
  95. {hydrobot-0.7.0 → hydrobot-0.7.2}/tests/test_data/site_list_response.xml +0 -0
  96. {hydrobot-0.7.0 → hydrobot-0.7.2}/tests/test_data/test_config.yaml +0 -0
  97. {hydrobot-0.7.0 → hydrobot-0.7.2}/tests/test_data/xml_test_data_file.xml +0 -0
  98. {hydrobot-0.7.0 → hydrobot-0.7.2}/tests/test_data/xml_test_data_no_check.xml +0 -0
  99. {hydrobot-0.7.0 → hydrobot-0.7.2}/tests/test_data/xml_test_data_no_qual.xml +0 -0
  100. {hydrobot-0.7.0 → hydrobot-0.7.2}/tests/test_data_sources.py +0 -0
  101. {hydrobot-0.7.0 → hydrobot-0.7.2}/tests/test_data_structure.py +0 -0
  102. {hydrobot-0.7.0 → hydrobot-0.7.2}/tests/test_evaluator.py +0 -0
  103. {hydrobot-0.7.0 → hydrobot-0.7.2}/tests/test_filters.py +0 -0
  104. {hydrobot-0.7.0 → hydrobot-0.7.2}/tests/test_processor.py +0 -0
  105. {hydrobot-0.7.0 → hydrobot-0.7.2}/tests/test_rainfall.py +0 -0
  106. {hydrobot-0.7.0 → hydrobot-0.7.2}/tests/test_utils.py +0 -0
  107. {hydrobot-0.7.0 → hydrobot-0.7.2}/tests/test_web_integration.py +0 -0
@@ -135,3 +135,14 @@ History
135
135
  * Rainfall processing
136
136
  * Lots of minor documentation upgrades
137
137
  * Start of "processing issues", a place to store warnings for the hydrobot user
138
+
139
+ 0.7.1 (2024-09-19)
140
+ ----------------------------------
141
+
142
+ * Fixing installation dependencies
143
+ * Fixing ramped display
144
+
145
+ 0.7.2 (2024-09-19)
146
+ ----------------------------------
147
+
148
+ * Accurately representing the inaccurate recorder totals.
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: hydrobot
3
- Version: 0.7.0
3
+ Version: 0.7.2
4
4
  Summary: A suite of processing tools for Hilltop hydrological data.
5
5
  Author-email: Nic Mostert <nicolas.mostert@horizons.govt.nz>, Sam Irvine <sam.irvine@horizons.govt.nz>
6
6
  License: GNU General Public License v3
@@ -21,12 +21,14 @@ License-File: AUTHORS.rst
21
21
  Requires-Dist: hilltop-py>=2.3.1
22
22
  Requires-Dist: data-annalist>=0.4.1
23
23
  Requires-Dist: matplotlib>=3.8.0
24
- Requires-Dist: defusedxml>=0.7.1
24
+ Requires-Dist: defusedxml>=0.7.2
25
25
  Requires-Dist: plotly>=5.20.0
26
26
  Requires-Dist: streamlit>=1.33.0
27
27
  Requires-Dist: pyyaml>=6.0.1
28
28
  Requires-Dist: numpy==1.26.4
29
29
  Requires-Dist: openpyxl>=3.1.5
30
+ Requires-Dist: SQLAlchemy~=2.0.30
31
+ Requires-Dist: pyodbc==5.1.0
30
32
  Provides-Extra: test
31
33
  Requires-Dist: pytest>=7.4.2; extra == "test"
32
34
  Requires-Dist: pytest-cov>=4.1.0; extra == "test"
@@ -94,7 +96,7 @@ some external tools are still required to do a full processing. Importantly,
94
96
  the hybrid workflow relies on some R scripts to obtain check data from sources
95
97
  other than Hilltop. Further processing using Hilltop manager is also supported.
96
98
 
97
- NOTE: Hydrobot 0.7.0 supports only Water Temperature processing at the moment,
99
+ NOTE: Hydrobot 0.7.2 supports only Water Temperature processing at the moment,
98
100
  but more measurements will be supported in patches as the processing
99
101
  progresses.
100
102
 
@@ -105,16 +107,16 @@ Initial Setup (Repeat for each release)
105
107
 
106
108
  #. In your favourite shell (if you don't know what that is, use powershell -
107
109
  it's already installed on windows), create a new virtual environment using
108
- this python interpreter and name it "hydrobot0.7.0". It's important that
110
+ this python interpreter and name it "hydrobot0.7.2". It's important that
109
111
  this is stored somewhere locally. For example, it could be stored in a
110
112
  "Hydrobot" folder in the C: drive, which would need the command::
111
113
 
112
- python -m venv C:/Hydrobot/hydrobot0.7.0/
114
+ python -m venv C:/Hydrobot/hydrobot0.7.2/
113
115
 
114
116
  #. Activate this virtual environment. In powershell this should be something
115
117
  like::
116
118
 
117
- C:/Hydrobot/hydrobot0.7.0/Scripts/Activate.ps1
119
+ C:/Hydrobot/hydrobot0.7.2/Scripts/Activate.ps1
118
120
 
119
121
  #. With your venv active, install the latest version of Hydrobot using pip::
120
122
 
@@ -156,7 +158,7 @@ Processing Steps
156
158
  instructions) and activate it. To activate, in your shell type the location
157
159
  of the "Activate.ps1" script in the venv/Scripts folder, e.g.::
158
160
 
159
- C:/Hydrobot/hydrobot0.7.0/Scripts/Activate.ps1
161
+ C:/Hydrobot/hydrobot0.7.2/Scripts/Activate.ps1
160
162
 
161
163
  You can ensure it is active by typing `gcm python` and confirm that your
162
164
  python interpreter (under "Source") is running from your venv folder.
@@ -49,7 +49,7 @@ some external tools are still required to do a full processing. Importantly,
49
49
  the hybrid workflow relies on some R scripts to obtain check data from sources
50
50
  other than Hilltop. Further processing using Hilltop manager is also supported.
51
51
 
52
- NOTE: Hydrobot 0.7.0 supports only Water Temperature processing at the moment,
52
+ NOTE: Hydrobot 0.7.2 supports only Water Temperature processing at the moment,
53
53
  but more measurements will be supported in patches as the processing
54
54
  progresses.
55
55
 
@@ -60,16 +60,16 @@ Initial Setup (Repeat for each release)
60
60
 
61
61
  #. In your favourite shell (if you don't know what that is, use powershell -
62
62
  it's already installed on windows), create a new virtual environment using
63
- this python interpreter and name it "hydrobot0.7.0". It's important that
63
+ this python interpreter and name it "hydrobot0.7.2". It's important that
64
64
  this is stored somewhere locally. For example, it could be stored in a
65
65
  "Hydrobot" folder in the C: drive, which would need the command::
66
66
 
67
- python -m venv C:/Hydrobot/hydrobot0.7.0/
67
+ python -m venv C:/Hydrobot/hydrobot0.7.2/
68
68
 
69
69
  #. Activate this virtual environment. In powershell this should be something
70
70
  like::
71
71
 
72
- C:/Hydrobot/hydrobot0.7.0/Scripts/Activate.ps1
72
+ C:/Hydrobot/hydrobot0.7.2/Scripts/Activate.ps1
73
73
 
74
74
  #. With your venv active, install the latest version of Hydrobot using pip::
75
75
 
@@ -111,7 +111,7 @@ Processing Steps
111
111
  instructions) and activate it. To activate, in your shell type the location
112
112
  of the "Activate.ps1" script in the venv/Scripts folder, e.g.::
113
113
 
114
- C:/Hydrobot/hydrobot0.7.0/Scripts/Activate.ps1
114
+ C:/Hydrobot/hydrobot0.7.2/Scripts/Activate.ps1
115
115
 
116
116
  You can ensure it is active by typing `gcm python` and confirm that your
117
117
  python interpreter (under "Source") is running from your venv folder.
@@ -2,4 +2,4 @@
2
2
 
3
3
  __author__ = """Nic Mostert"""
4
4
  __email__ = "nicolas.mostert@horizons.govt.nz"
5
- __version__ = "0.7.0"
5
+ __version__ = "0.7.2"
@@ -534,7 +534,7 @@ class RFProcessor(Processor):
534
534
  ramped_standard = filters.trim_series(
535
535
  self.ramped_standard, self.check_data["Value"]
536
536
  )
537
- ramped_standard *= 1000
537
+ ramped_standard = ramped_standard.copy() * 1000
538
538
 
539
539
  data_blob_list += [
540
540
  data_structure.standard_to_xml_structure(
@@ -575,12 +575,6 @@ class RFProcessor(Processor):
575
575
  scaled_check_data = self.check_data.copy()
576
576
  scaled_check_data["Value"] = scaled_check_data["Value"] * 1000
577
577
 
578
- scaled_check_data["Recorder Total"] = (
579
- self.ramped_standard[
580
- utils.find_last_indices(self.ramped_standard, scaled_check_data)
581
- ].diff()
582
- * 1000
583
- )
584
578
  data_blob_list += [
585
579
  data_structure.check_to_xml_structure(
586
580
  item_info_dicts=[
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: hydrobot
3
- Version: 0.7.0
3
+ Version: 0.7.2
4
4
  Summary: A suite of processing tools for Hilltop hydrological data.
5
5
  Author-email: Nic Mostert <nicolas.mostert@horizons.govt.nz>, Sam Irvine <sam.irvine@horizons.govt.nz>
6
6
  License: GNU General Public License v3
@@ -21,12 +21,14 @@ License-File: AUTHORS.rst
21
21
  Requires-Dist: hilltop-py>=2.3.1
22
22
  Requires-Dist: data-annalist>=0.4.1
23
23
  Requires-Dist: matplotlib>=3.8.0
24
- Requires-Dist: defusedxml>=0.7.1
24
+ Requires-Dist: defusedxml>=0.7.2
25
25
  Requires-Dist: plotly>=5.20.0
26
26
  Requires-Dist: streamlit>=1.33.0
27
27
  Requires-Dist: pyyaml>=6.0.1
28
28
  Requires-Dist: numpy==1.26.4
29
29
  Requires-Dist: openpyxl>=3.1.5
30
+ Requires-Dist: SQLAlchemy~=2.0.30
31
+ Requires-Dist: pyodbc==5.1.0
30
32
  Provides-Extra: test
31
33
  Requires-Dist: pytest>=7.4.2; extra == "test"
32
34
  Requires-Dist: pytest-cov>=4.1.0; extra == "test"
@@ -94,7 +96,7 @@ some external tools are still required to do a full processing. Importantly,
94
96
  the hybrid workflow relies on some R scripts to obtain check data from sources
95
97
  other than Hilltop. Further processing using Hilltop manager is also supported.
96
98
 
97
- NOTE: Hydrobot 0.7.0 supports only Water Temperature processing at the moment,
99
+ NOTE: Hydrobot 0.7.2 supports only Water Temperature processing at the moment,
98
100
  but more measurements will be supported in patches as the processing
99
101
  progresses.
100
102
 
@@ -105,16 +107,16 @@ Initial Setup (Repeat for each release)
105
107
 
106
108
  #. In your favourite shell (if you don't know what that is, use powershell -
107
109
  it's already installed on windows), create a new virtual environment using
108
- this python interpreter and name it "hydrobot0.7.0". It's important that
110
+ this python interpreter and name it "hydrobot0.7.2". It's important that
109
111
  this is stored somewhere locally. For example, it could be stored in a
110
112
  "Hydrobot" folder in the C: drive, which would need the command::
111
113
 
112
- python -m venv C:/Hydrobot/hydrobot0.7.0/
114
+ python -m venv C:/Hydrobot/hydrobot0.7.2/
113
115
 
114
116
  #. Activate this virtual environment. In powershell this should be something
115
117
  like::
116
118
 
117
- C:/Hydrobot/hydrobot0.7.0/Scripts/Activate.ps1
119
+ C:/Hydrobot/hydrobot0.7.2/Scripts/Activate.ps1
118
120
 
119
121
  #. With your venv active, install the latest version of Hydrobot using pip::
120
122
 
@@ -156,7 +158,7 @@ Processing Steps
156
158
  instructions) and activate it. To activate, in your shell type the location
157
159
  of the "Activate.ps1" script in the venv/Scripts folder, e.g.::
158
160
 
159
- C:/Hydrobot/hydrobot0.7.0/Scripts/Activate.ps1
161
+ C:/Hydrobot/hydrobot0.7.2/Scripts/Activate.ps1
160
162
 
161
163
  You can ensure it is active by typing `gcm python` and confirm that your
162
164
  python interpreter (under "Source") is running from your venv folder.
@@ -1,12 +1,14 @@
1
1
  hilltop-py>=2.3.1
2
2
  data-annalist>=0.4.1
3
3
  matplotlib>=3.8.0
4
- defusedxml>=0.7.1
4
+ defusedxml>=0.7.2
5
5
  plotly>=5.20.0
6
6
  streamlit>=1.33.0
7
7
  pyyaml>=6.0.1
8
8
  numpy==1.26.4
9
9
  openpyxl>=3.1.5
10
+ SQLAlchemy~=2.0.30
11
+ pyodbc==5.1.0
10
12
 
11
13
  [all]
12
14
  hydrobot[dev,docs,test]
@@ -10,12 +10,9 @@ streamlit run .\rain_script.py
10
10
  import platform
11
11
 
12
12
  import pandas as pd
13
- import pyodbc
14
13
  import sqlalchemy as db
15
- import streamlit as st
16
14
  from sqlalchemy.engine import URL
17
15
 
18
- import hydrobot
19
16
  from hydrobot.filters import trim_series
20
17
  from hydrobot.rf_processor import RFProcessor
21
18
 
@@ -24,13 +21,6 @@ from hydrobot.rf_processor import RFProcessor
24
21
  #######################################################################################
25
22
  data, ann = RFProcessor.from_config_yaml("rain_config.yaml")
26
23
 
27
- st.set_page_config(
28
- page_title="Hydrobot" + hydrobot.__version__, layout="wide", page_icon="💦"
29
- )
30
- st.title(f"{data.site}")
31
- st.header(f"{data.standard_measurement_name}")
32
-
33
- st.dataframe(data.standard_data, use_container_width=True)
34
24
  #######################################################################################
35
25
  # Importing all check data that is not obtainable from Hilltop
36
26
  # (So far Hydrobot only speaks to Hilltop)
@@ -38,8 +28,6 @@ st.dataframe(data.standard_data, use_container_width=True)
38
28
  check_col = "Value"
39
29
  logger_col = "Logger"
40
30
 
41
- st.write(pyodbc.drivers())
42
-
43
31
  if platform.system() == "Windows":
44
32
  hostname = "SQL3.horizons.govt.nz"
45
33
  elif platform.system() == "Linux":
@@ -56,7 +44,7 @@ connection_url = URL.create(
56
44
  )
57
45
  engine = db.create_engine(connection_url)
58
46
 
59
- query = """SELECT TOP (10) Hydro_Inspection.arrival_time,
47
+ query = """SELECT Hydro_Inspection.arrival_time,
60
48
  Hydro_Inspection.weather,
61
49
  Hydro_Inspection.notes,
62
50
  Hydro_Inspection.departure_time,
@@ -95,8 +83,11 @@ rainfall_checks = rainfall_checks.loc[
95
83
  & (rainfall_checks.arrival_time <= data.to_date)
96
84
  ]
97
85
 
98
- check_data = pd.DataFrame(rainfall_checks[["arrival_time", "flask", "notes"]].copy())
86
+ check_data = pd.DataFrame(
87
+ rainfall_checks[["arrival_time", "flask", "notes", "primary_total"]].copy()
88
+ )
99
89
 
90
+ check_data["Recorder Total"] = check_data.loc[:, "primary_total"]
100
91
  check_data["Recorder Time"] = check_data.loc[:, "arrival_time"]
101
92
  check_data = check_data.set_index("arrival_time")
102
93
  check_data.index = pd.to_datetime(check_data.index)
@@ -116,6 +107,7 @@ check_data = check_data[
116
107
  "Value",
117
108
  "Changes",
118
109
  "Recorder Time",
110
+ "Recorder Total",
119
111
  "Comment",
120
112
  "Source",
121
113
  "QC",
@@ -192,11 +184,3 @@ with open("pyplot.json", "w", encoding="utf-8") as file:
192
184
  file.write(str(fig.to_json()))
193
185
  with open("pyplot.html", "w", encoding="utf-8") as file:
194
186
  file.write(str(fig.to_html()))
195
-
196
- st.plotly_chart(fig)
197
-
198
- st.dataframe(data.processing_issues, use_container_width=True)
199
- st.dataframe(all_checks, use_container_width=True)
200
- st.dataframe(data.check_data, use_container_width=True)
201
- st.dataframe(data.quality_data, use_container_width=True)
202
- st.dataframe(data.standard_data, use_container_width=True)
@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
5
5
  [project]
6
6
  name = "hydrobot"
7
7
  description = "A suite of processing tools for Hilltop hydrological data."
8
- version = "0.7.0"
8
+ version = "0.7.2"
9
9
  authors = [
10
10
  { name = "Nic Mostert", email = "nicolas.mostert@horizons.govt.nz" },
11
11
  { name = "Sam Irvine", email = "sam.irvine@horizons.govt.nz" }
@@ -15,12 +15,14 @@ dependencies = [
15
15
  "hilltop-py>=2.3.1",
16
16
  "data-annalist>=0.4.1",
17
17
  "matplotlib>=3.8.0",
18
- "defusedxml>=0.7.1",
18
+ "defusedxml>=0.7.2",
19
19
  "plotly>=5.20.0",
20
20
  "streamlit>=1.33.0",
21
21
  "pyyaml>=6.0.1",
22
22
  "numpy==1.26.4",
23
- "openpyxl>=3.1.5"
23
+ "openpyxl>=3.1.5",
24
+ "SQLAlchemy~=2.0.30",
25
+ "pyodbc==5.1.0"
24
26
  ]
25
27
  classifiers=[
26
28
  "Development Status :: 3 - Alpha",
@@ -104,7 +106,7 @@ convention = "numpy"
104
106
  "prototypes" = ["D"]
105
107
 
106
108
  [tool.bumpversion]
107
- current_version = "0.7.0"
109
+ current_version = "0.7.2"
108
110
  commit = true
109
111
  tag = true
110
112
  tag_name = "{new_version}"
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes