Skip to content

Deploy #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 254 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
254 commits
Select commit Hold shift + click to select a range
ef785cb
Added gunicorn and rocfile for deploy
luke-marshall Nov 22, 2018
a1db341
Fixing procfile
luke-marshall Nov 22, 2018
6e5c2ab
Updating the AllTariffs.json file
NavidHaghdadi Nov 26, 2018
ca2355f
Added the distributor to the fields.
NavidHaghdadi Nov 26, 2018
af5b897
added a function for retail tariff
NavidHaghdadi Nov 28, 2018
700c51d
Added multiple new tariffs
NavidHaghdadi Dec 2, 2018
75ac543
Added flask CORS
luke-marshall Dec 19, 2018
c7f2196
Dele
NavidHaghdadi Jan 10, 2019
68bb0dd
Deleting old files
NavidHaghdadi Jan 10, 2019
ee526a1
Updating the new file with new tariffs
NavidHaghdadi Jan 10, 2019
639e534
Add tariff quality check for adding new tariffs
NavidHaghdadi Jan 10, 2019
3ab48bb
Added network tariff call
NavidHaghdadi Jan 11, 2019
a49eee7
added network tariffs json file
NavidHaghdadi Jan 11, 2019
607bcef
Some spelling corrections in DUOS, etc
NavidHaghdadi Jan 16, 2019
c1ff8d4
More update on the tariff file
NavidHaghdadi Jan 16, 2019
9ab7cf7
Updating network tariffs
NavidHaghdadi Jan 16, 2019
95b4f9b
Fixed some typos
NavidHaghdadi Jan 17, 2019
47e311f
Fixed some typos
NavidHaghdadi Jan 17, 2019
541db83
minor edit
NavidHaghdadi Aug 8, 2019
f4f730b
Changed name of retail tariff file
NavidHaghdadi Aug 8, 2019
f265424
Moved files from the application folder to data processing folder
NavidHaghdadi Aug 8, 2019
c5ee535
Update README.md
NavidHaghdadi Aug 8, 2019
27e0f52
Update api.py
NavidHaghdadi Aug 8, 2019
e2d845a
Adding versions to the json files
NavidHaghdadi Aug 8, 2019
4f6544e
more edits for adding version to json files
NavidHaghdadi Aug 8, 2019
853944d
Update api.py
NavidHaghdadi Aug 8, 2019
f8a95f3
The tracking versions of retail and network tariff is done
NavidHaghdadi Aug 8, 2019
0bb6330
testing
NavidHaghdadi Aug 8, 2019
087bf21
Still versioning the files
NavidHaghdadi Aug 8, 2019
a21d7d2
New network tariffs added for United Energy, Powercor, Jemena, AusNet…
NavidHaghdadi Aug 8, 2019
8069331
Removed the create tariff files as they are now in a separate reposit…
NavidHaghdadi Aug 8, 2019
89c7a6f
The version is added as a new item to the NETWORK json file.
NavidHaghdadi Aug 8, 2019
d0681e3
Added weather data from NASA Power
NavidHaghdadi Aug 13, 2019
860dac1
testing jsonify
NavidHaghdadi Aug 13, 2019
3a19ce5
Update api.py
NavidHaghdadi Aug 13, 2019
c1acd5d
Added weather data
NavidHaghdadi Aug 13, 2019
da0d53c
Added few locations and updated the weather data API
NavidHaghdadi Aug 13, 2019
cc5c92c
Added NASA data for 222 location (since 20180101)
NavidHaghdadi Aug 16, 2019
ec18a40
Update api.py
NavidHaghdadi Aug 16, 2019
6ada602
Version 4 of network tariffs (compatible by new bill_calc)
NavidHaghdadi Sep 3, 2019
bc6ade6
Update nasa_power.db
NavidHaghdadi Oct 29, 2019
90a059a
Reset network tariffs to version one and did some changes to fix the …
NavidHaghdadi Nov 13, 2019
8eb7410
Fixed some minor issues
NavidHaghdadi Nov 13, 2019
b5b410b
Testing reading PDF of tariffs
NavidHaghdadi Nov 18, 2019
f21ef22
updated api
NavidHaghdadi Nov 18, 2019
4f0477f
updated folder of pdfs
NavidHaghdadi Nov 18, 2019
f27d40d
updated tariff map
NavidHaghdadi Nov 18, 2019
2fb5f83
updated api
NavidHaghdadi Nov 18, 2019
e26f5f4
funny mistake!
NavidHaghdadi Nov 18, 2019
1feb44d
Re-check!
NavidHaghdadi Nov 18, 2019
6319bc9
testing api
NavidHaghdadi Nov 18, 2019
03a6a74
testing api
NavidHaghdadi Nov 18, 2019
6567904
testing
NavidHaghdadi Nov 18, 2019
18c1d94
testing
NavidHaghdadi Nov 18, 2019
4a1c3ad
Fixed error in reading pdf
NavidHaghdadi Nov 19, 2019
c2cf532
Update api.py
NavidHaghdadi Nov 19, 2019
02ab2e8
Update api.py
NavidHaghdadi Nov 19, 2019
be72f6a
Added tariff documents for several tariffs in 2017 and 2019
NavidHaghdadi Nov 19, 2019
6aaaebc
Updating some tariff docs
NavidHaghdadi Nov 19, 2019
5f70776
Updated Reatil tariffs in the API to make it compatible with tariff t…
NavidHaghdadi Nov 19, 2019
7fa8b29
Added retail_TDA specificly for TDA.
NavidHaghdadi Nov 19, 2019
8f72168
Update api.py
NavidHaghdadi Nov 19, 2019
bcfbc1a
Fixed a typo in a tariff
NavidHaghdadi Nov 20, 2019
6cbc42d
Renamed the tariff API to make it different from current version bein…
NavidHaghdadi Nov 20, 2019
6221a3d
Fixed a typo in FiT
NavidHaghdadi Nov 21, 2019
6570292
Fixed missing "Year" field for some tariffs
NavidHaghdadi Nov 25, 2019
bf0e5e0
Added a sample Time varying FiT tariff
NavidHaghdadi Nov 28, 2019
2d72691
update weather data query to be inclusive of start and end dates and …
NavidHaghdadi Dec 15, 2019
034c8c5
updated "Infinity" in the tariff API
NavidHaghdadi Dec 16, 2019
a249a73
update "Infinity" in the network tariffs as well
NavidHaghdadi Dec 16, 2019
1b386d9
Update nasa_power.db
NavidHaghdadi Dec 23, 2019
c7f467b
Update nasa_power.db
NavidHaghdadi Jan 18, 2020
02a48a6
Update AllTariffs_Retail.json
NavidHaghdadi Feb 10, 2020
a34d54d
updated NASA data to April 2020
NavidHaghdadi Apr 24, 2020
8a3380b
Update nasa_power.db
NavidHaghdadi Nov 1, 2020
c25d5c0
Merge branch 'deploy' of https://github.com/UNSW-CEEM/Tariff-API into…
NavidHaghdadi Nov 1, 2020
44ba8ef
Update nasa_power.db
NavidHaghdadi Nov 1, 2020
f3c3147
Update AllTariffs_Retail.json
NavidHaghdadi Jan 10, 2021
ef125e8
Updated retail tariffs to representative tariffs for each DNSP
NavidHaghdadi Jan 10, 2021
0d60a0a
Update AllTariffs_Retail.json
NavidHaghdadi Jan 21, 2021
24f0427
Update nasa data upto end of Feb2021
NavidHaghdadi Mar 5, 2021
c02e9ad
Adding load profile format change to the api
NavidHaghdadi Apr 3, 2021
5419bf4
update api.py to convert webgraph and nem12 files
NavidHaghdadi Apr 5, 2021
bc013a7
Adding DNSP finder
NavidHaghdadi Apr 8, 2021
e74ec4d
Update api.py
NavidHaghdadi Apr 9, 2021
e9c4e1e
Update api.py
NavidHaghdadi Apr 9, 2021
af7c6c6
Revert "Update api.py"
NavidHaghdadi Apr 22, 2021
f1c8178
Revert "Revert "Update api.py""
NavidHaghdadi Apr 22, 2021
f0b0019
Revert "Update api.py"
NavidHaghdadi Apr 22, 2021
8a80084
remove the dnsp finder
NavidHaghdadi Apr 22, 2021
34c0a1d
Update api.py
NavidHaghdadi Apr 22, 2021
1d82d21
Update load profile processing
NavidHaghdadi Jun 2, 2021
4a2880a
adding DNSP finder
NavidHaghdadi Aug 15, 2021
62da704
Update api.py
NavidHaghdadi Aug 15, 2021
6aae8c6
Hiding the new change
NavidHaghdadi Aug 16, 2021
55cf605
remove reqs
NavidHaghdadi Aug 20, 2021
0c4383c
Update nasa data up to Aug2021
NavidHaghdadi Aug 20, 2021
ff5058b
updating pipfile and pipfile.lock and adding dnsp finder
NavidHaghdadi Aug 20, 2021
61a0b6c
Import geojson and shapely
NavidHaghdadi Aug 20, 2021
7b0ad04
Update nasa_power.db
NavidHaghdadi Sep 25, 2021
2b00801
Update AllTariffs_Retail.json
NavidHaghdadi Sep 25, 2021
1ee0e88
added new business tariffs
NavidHaghdadi Sep 26, 2021
adc75d1
Update AllTariffs_Retail.json
NavidHaghdadi Sep 27, 2021
3ab86f1
Update AllTariffs_Retail_v3.json
NavidHaghdadi Sep 27, 2021
489f8ea
adding default tariff for sunspot
NavidHaghdadi Sep 27, 2021
9da60f6
Update api.py
NavidHaghdadi Sep 27, 2021
0238b02
edit tariffs
NavidHaghdadi Oct 8, 2021
0c52ae6
Update nasa_power.db
NavidHaghdadi Nov 5, 2021
1ffc603
update weather api to find the closest lat_long
NavidHaghdadi Nov 10, 2021
bcd2b60
Update api.py
NavidHaghdadi Nov 10, 2021
e9e76aa
Update api.py
NavidHaghdadi Nov 10, 2021
7832891
Update nasa_power.db
NavidHaghdadi Feb 9, 2022
a53359e
Update nasa_power.db
NavidHaghdadi May 5, 2022
41725ac
Update AllTariffs_Retail_v2.json
NavidHaghdadi Aug 26, 2022
673c3b9
update NASA data
NavidHaghdadi Aug 28, 2022
9803b26
Update Pipfile.lock
NavidHaghdadi Sep 2, 2022
1c301ec
update pip file to use python 3.9
NavidHaghdadi Sep 2, 2022
05312ad
Adding Benchmarking data
NavidHaghdadi Sep 4, 2022
b48df22
Added bus type customers
NavidHaghdadi Sep 11, 2022
5d4ae0e
replacing Actewagl with EvoEnergy
NavidHaghdadi Sep 11, 2022
380f9ae
Updating all sunspot tariffs in Sep 2022
NavidHaghdadi Sep 11, 2022
85c79a3
update bus loads to 1990 to match typical load
NavidHaghdadi Sep 11, 2022
3dbd416
Adding the list of business customers
NavidHaghdadi Sep 16, 2022
a6b7ee7
adding a temporary bus load list file just for temp access by Nabeen
NavidHaghdadi Sep 16, 2022
05bcb9c
Use QLD for NT and WA for AER benchmarking
NavidHaghdadi Sep 20, 2022
79804d9
Adding offgrid tariff and updating business customers load profiles
NavidHaghdadi Sep 23, 2022
3ed3fb8
making FiT zero for off-grid sites
NavidHaghdadi Sep 23, 2022
358b12f
Changing Small Business to SmallBusiness so it works in the sunspot f…
NavidHaghdadi Sep 29, 2022
2940cd6
changing the names to more meaningful names
NavidHaghdadi Sep 29, 2022
31670f3
fixing the initial tariff name
NavidHaghdadi Sep 30, 2022
39648ab
update AERBenchmark for M and L households and renaming initial tariff
NavidHaghdadi Oct 2, 2022
f0fcf59
fix minor issue with AER benchmarking
NavidHaghdadi Oct 3, 2022
f9df6df
Adding the new DNSPs
NavidHaghdadi Oct 8, 2022
27fdb7d
Update nasa_power.db
NavidHaghdadi Oct 12, 2022
45a25d7
Update README.md
NavidHaghdadi Oct 21, 2022
2ae0e42
Update nasa_power.db
NavidHaghdadi Oct 29, 2022
ffd9d8f
changing WP shoulder name to super offpeak
NavidHaghdadi Oct 31, 2022
09accba
testingDemandTariff
NavidHaghdadi Nov 4, 2022
06bb12b
Update AllTariffs_Retail_v51.json
NavidHaghdadi Nov 4, 2022
fb850cf
Adding Demand tariffs
NavidHaghdadi Nov 6, 2022
bad37b3
Adding more demand tariffs
NavidHaghdadi Nov 9, 2022
6df3e4e
Update nasa_power.db
NavidHaghdadi Nov 30, 2022
569dbf5
Create nasa_power_temp.db
NavidHaghdadi Dec 8, 2022
55e52e3
Update nasa_power.db
NavidHaghdadi Dec 10, 2022
de46a32
Update nasa_power.db
NavidHaghdadi Jan 10, 2023
648f2df
adding weather 2 for testing
NavidHaghdadi Jan 10, 2023
bb13c81
Add weather update code
jessnn Jan 10, 2023
812874d
update pipfile to include requests library
jessnn Jan 10, 2023
3c7a806
Update NASA weather data test
jessnn Feb 15, 2023
78bc049
Update NASA weather data
jessnn Feb 16, 2023
bb11183
Update NASA weather data
jessnn Feb 27, 2023
dcaea5d
Update NASA weather data
jessnn Mar 13, 2023
3dd3f38
Update NASA Weather Data
jessnn Mar 27, 2023
ee4723f
Update NASA weather data
jessnn Apr 11, 2023
6cd169e
Fix small retail load profile
jessnn Apr 16, 2023
b73fdb8
Update NASA weather data
jessnn Apr 25, 2023
94e8b25
Update NASA weather data
jessnn May 12, 2023
7a409a4
Update NASA weather data
jessnn May 22, 2023
5661ded
Update NASA weather data
jessnn Jun 6, 2023
f832683
Add variable FiTs to v7
jessnn Jun 7, 2023
a949057
Add shading_calculator
jessnn Jun 15, 2023
cb851d1
Add shading_calculator to api.py
jessnn Jun 15, 2023
557d39b
Revert adding shading_calculator to api
jessnn Jun 15, 2023
db455fb
Add calculate_shading
jessnn Jun 15, 2023
9927494
Update variable FiTs values and format
jessnn Jun 16, 2023
1ab5421
Add large commercial tariffs
jessnn Jun 16, 2023
70e6912
Add large commercial tariffs to the api
jessnn Jun 16, 2023
81cad45
Update AllTariffs_LargeCommercial.json to fix Infinity
NavidHaghdadi Jun 19, 2023
a650496
Update AllTariffs_Retail_v9.json replace Infinity with "Infinity"
jessnn Jun 19, 2023
949efcb
Update NASA weather data
jessnn Jun 19, 2023
f5b200f
Update large commercial tariffs
jessnn Jun 23, 2023
85dd660
Update shading_calculator
jessnn Jun 28, 2023
b7663a3
Add fix for Evoenergy capitalization error
jessnn Jun 29, 2023
e45d6f9
convert shading values from float to string
jessnn Jun 30, 2023
d90375c
Update NASA weather data
jessnn Aug 1, 2023
91c389a
Update NASA weather data
jessnn Aug 14, 2023
26b48ff
Update NASA weather data
jessnn Sep 8, 2023
4af5cb4
Add geopandas to process LGA boundaries shapefile
jessnn Sep 13, 2023
cc80cb8
Add new function for finding LGA of a location
jessnn Sep 13, 2023
e7ed514
Update AllTariffs_Retail to have most recent data
jessnn Sep 13, 2023
8536cf5
Remove geopandas
jessnn Sep 14, 2023
398b1cc
Revert adding lga finder
jessnn Sep 14, 2023
6468f8f
Add LGA shapefiles
jessnn Sep 18, 2023
bf8c4f4
Add geopandas back
jessnn Sep 18, 2023
03e8b0d
Add find_lga function and geopandas package
jessnn Sep 18, 2023
5e24636
Updata NASA Weather Data
jessnn Sep 18, 2023
021821e
Update NASA weather data
jessnn Oct 3, 2023
0fe3185
Update NASA weather data
jessnn Oct 15, 2023
5b0392c
Add files via upload
jessnn Oct 16, 2023
7a3b533
Replace "Infinity" with "Infinity
jessnn Oct 16, 2023
03c7e62
Replace Infinity with "Infinity" in retailers
jessnn Oct 16, 2023
81ab919
Revert to tariffs v9 because of 0 tariffs in new version
jessnn Oct 16, 2023
a57c7d6
Update AllTariffs_Retail.json to v10
jessnn Oct 16, 2023
967d0a7
Revert AllTariffs_Retail.json to v9 because for some reason the front…
jessnn Oct 16, 2023
5e8a49d
multiprocess shading array generation
jessnn Nov 7, 2023
a486856
set max_workers
jessnn Nov 7, 2023
fbcd026
change max_workers due to server memory quota exceeding
jessnn Nov 7, 2023
d56726a
revert multiprocessing of shading calc until we solve memory issue
jessnn Nov 7, 2023
292d340
Now we have upgraded heroku server, multiprocessing should work.
jessnn Nov 12, 2023
2b081e6
Update NASA weather data
jessnn Nov 13, 2023
0decdd1
New algorithm for calculating the shading, back to serial processing …
jessnn Nov 16, 2023
849cb98
Update tariffs with 2023 data
jessnn Nov 23, 2023
43bcf76
Revert tariffs to v9
jessnn Nov 24, 2023
20ea88c
Update and use 2023 tariffs
jessnn Nov 24, 2023
e261a99
Update NASA weather data
jessnn Nov 28, 2023
71adac4
Add missing variable FiTs
jessnn Nov 28, 2023
7d11acf
Add sentry_sdk to pipfile and pipfile.lock
jessnn Dec 8, 2023
e9f32a6
Add sentry error capturing, record inputs for shading calculator in s…
jessnn Dec 8, 2023
479ce96
Adding off-grid tariffs
jessnn Dec 14, 2023
461b49b
Updata NASA weather data
jessnn Jan 1, 2024
7bb5272
Update NASA weather data
jessnn Jan 15, 2024
952e0ae
Update NASA weather data
jessnn Jan 21, 2024
3c53966
Update NASA weather data
jessnn Jan 29, 2024
67f8e0b
Update NASA weather data
jessnn Feb 5, 2024
defefa0
Update NASA weather data
jessnn Feb 16, 2024
5f8ef4e
Update NASA Weather Data
jessnn Feb 27, 2024
202624f
Update NASA Weather Data
jessnn Mar 17, 2024
cf9ca61
Remove white space from "Date_accessed "
jessnn Mar 26, 2024
c736d73
Update NASA weather data
jessnn Apr 5, 2024
f115f79
Update NASA Weather Data
jessnn Apr 16, 2024
929c67f
Update NASA weather data
jessnn Apr 23, 2024
1ee82a1
Updata NASA weather data
jessnn Apr 29, 2024
2564312
Updata NASA weather data
jessnn May 21, 2024
4fb7bee
Update NASA weather data
jessnn May 27, 2024
09cf353
Update NASA weather data
jessnn Jun 28, 2024
118a439
Use average values if postcode is null
jessnn Jul 1, 2024
1b77d5a
Update NASA Weather Data
jessnn Jul 8, 2024
f497579
Updata NASA weather data
jessnn Jul 22, 2024
6f3dae6
Updata NASA weather data
jessnn Aug 5, 2024
d2c533d
Update NASA weather data
jessnn Aug 19, 2024
51f3120
Update NASA weather data
jessnn Sep 2, 2024
a6ecc04
Update NASA weather data
jessnn Sep 17, 2024
de1b224
Update NASA weather data
jessnn Oct 3, 2024
eeaeb47
Capitalize "t" in "BlockDailyFiT" in AllTariffs_Retail.json
jessnn Oct 9, 2024
b315b64
Update with 2023-2024 tariffs
jessnn Oct 10, 2024
d8fdb8b
Update NASA weather data
jessnn Oct 13, 2024
3b27c40
Add apartment load profiles
jessnn Oct 28, 2024
6cfbfff
Rename apartment profiles columns
jessnn Oct 29, 2024
0570137
Add function for pv & load disaggregation
jessnn Nov 6, 2024
bae5642
Add sample data file for pv load disaggregation
jessnn Nov 6, 2024
282cc02
Rename data file for pv load disaggregation
jessnn Nov 6, 2024
0728996
Update NASA weather data
jessnn Nov 7, 2024
b6dbdd2
Update business load profiles - add pools, ...
jessnn Nov 13, 2024
66e7d8b
Update NASA weather data
jessnn Jan 9, 2025
41b303b
Updata NASA weather data
jessnn Feb 6, 2025
45c41cb
Update residential/small business tariffs
jessnn Feb 14, 2025
dddd961
Update NASA weather data
jessnn Mar 5, 2025
e22f714
Adding off-grid tariffs to AllTariffs_Retail.json
jessnn Mar 24, 2025
9765aea
Update some TOU labels
jessnn Mar 26, 2025
9b8afb5
Update NASA weather data
jessnn Apr 4, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"python.pythonPath": "/Users/lukemarshall/.local/share/virtualenvs/Tariff-API-N-8um7LN/bin/python"
}
36 changes: 22 additions & 14 deletions Pipfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,22 @@
[[source]]
url = "https://pypi.org/simple"
verify_ssl = true
name = "pypi"

[packages]
flask = "*"
pyfladesk = "*"
routes = "*"

[dev-packages]

[requires]
python_version = "3.7"
[[source]]
url = "https://pypi.org/simple"
verify_ssl = true
name = "pypi"

[packages]
flask = "*"
pyfladesk = "*"
routes = "*"
pandas = "*"
gunicorn = "*"
flask-cors = "*"
geojson = "*"
geopandas = "*"
shapely = "*"
requests = "*"
sentry_sdk = "*"

[dev-packages]

[requires]
python_version = "3.9"
636 changes: 590 additions & 46 deletions Pipfile.lock

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Procfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
web: gunicorn application:app
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# Getting Started

1. You can skip this if you want and install the dependencies yourself - i think this is just flask at the moment. I recommend using pipenv though - install it with your favoured package manager, then just run `pipenv install`

2. Run run.py - if you've installed the packages to your machine, just `python run.py` or if you're using pipenv, use `pipenv run python run.py`
This repository contains the codes for generating tariff database and putting them on the Collaboration on Energy and Environmental Markets (CEEM) API centre. The address is https://ceem-api.herokuapp.com/. Currently you can call https://ceem-api.herokuapp.com/electricity-tariffs/retail for the available lists of network and retail tariffs
26,929 changes: 26,929 additions & 0 deletions application/AERBenchmark.csv

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions application/AllData.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions application/AllData_Demog.json

Large diffs are not rendered by default.

Loading