Skip to content

Uk national#157

Merged
devsjc merged 115 commits intomainfrom
uk-national
Feb 4, 2026
Merged

Uk national#157
devsjc merged 115 commits intomainfrom
uk-national

Conversation

@peterdudfield
Copy link
Contributor

@peterdudfield peterdudfield commented Dec 17, 2025 •
edited
Loading

Pull Request

Description

Move uk-national over to this quartz-api

  • National routes
  • GSP routes
  • status routes - this loads from the old database for the moment. This will change in the future
  • system routes

Currently

  • forecast/all takes about ~13 seconds, which is to slow (benchmark from old app was). We currently looping over ForecastAtTimestamp
  • pvlive/all takes about ~10 seconds

#147

How Has This Been Tested?

  • CI tests
  • ran locally, and UAT from airflow run against the API
  • deployed and ran on aws,
  • and UAT from airflow run against the API
  • deploy UI to use this API - link

dont do in this PR: add end to end test for uk-national with the app #179
dont do in this PR: add seperate UAT in airflow that tests it

Checklist:

  • My code follows OCF's coding style guidelines
  • I have performed a self-review of my own code
  • I have made corresponding changes to the documentation
  • I have added tests that prove my fix is effective or that my feature works
  • I have checked my code and corrected any misspellings

@peterdudfield
add framework for UK national and GSP
0aab57c
@peterdudfield
add gsp locations route
ac833c2
@peterdudfield
lint
f35f5b9
@peterdudfield
Merge branch 'main' into uk-national-and-gsp-framework
7a60342
@peterdudfield
Merge branch 'main' into uk-national-and-gsp-locations
5128fd3
@peterdudfield
PR comments
c382360
@peterdudfield
Update TODO elexon
caba26b
@peterdudfield
remove legacy routes
8d09c92
@peterdudfield
add start to getting national forecast
d16be98
@peterdudfield
Merge commit 'b1c66bee95de4ee6e27f7a4aa27865bd039d5523' into uk-natio…
c18b8be 
…nal-and-gsp-locations

# Conflicts:
#	src/quartz_api/cmd/main.py
#	src/quartz_api/internal/backends/dataplatform/client.py
#	src/quartz_api/internal/models.py
@peterdudfield
Merge commit 'b1c66bee95de4ee6e27f7a4aa27865bd039d5523' into uk-natio…
6203f51 
…nal-and-gsp-framework

# Conflicts:
#	src/quartz_api/cmd/main.py
@peterdudfield
rename + lint
3c7e911
@peterdudfield
Merge branch 'uk-national-and-gsp-framework' into uk-national-and-gsp…
459c24e 
…-locations

# Conflicts:
#	src/quartz_api/cmd/main.py
#	src/quartz_api/internal/service/uk_national/gsp.py
#	src/quartz_api/internal/service/uk_national/national.py
#	src/quartz_api/internal/service/uk_national/system.py
@peterdudfield
Merge branch 'uk-national-and-gsp-framework' into national/forecast
3110128 
# Conflicts:
#	src/quartz_api/internal/service/uk_national/national.py
@peterdudfield
get working for model_name
f01f99c
@peterdudfield
Merge commit 'ba856c2ed063512c437dbc9cd10472bf3d1ec146' into national…
618d0c7 
…/forecast
@peterdudfield
Merge branch 'main' into national/forecast
b9b3fb0 
# Conflicts:
#	src/quartz_api/internal/service/uk_national/national.py
@peterdudfield
Merge branch 'main' into uk-national-and-gsp-locations
702b73b 
# Conflicts:
#	src/quartz_api/internal/service/uk_national/gsp.py
#	src/quartz_api/internal/service/uk_national/national.py
#	src/quartz_api/internal/service/uk_national/system.py
@peterdudfield
lint
e3e068f
@peterdudfield
lint
0996fbf
@peterdudfield
national/pvlive
7ac4a80
@peterdudfield
lint
b038e79
@peterdudfield
Merge branch 'national/pvlive' into uk-national-and-gsp-locations
cce60d6 
# Conflicts:
#	src/quartz_api/internal/backends/dataplatform/client.py
@peterdudfield
tidy up
332f540
@peterdudfield
add options for get_window
2a8cb85
@peterdudfield
Merge branch 'start-end' into national/forecast
74ee1d6
@peterdudfield
add start and end datetime
91445bf
@peterdudfield
add start and end filters
539c4c8
@peterdudfield
lint
9297666
@peterdudfield
Merge branch 'start-end' into national/pvlive
0469b5b
@peterdudfield
Copy link
Contributor Author

peterdudfield commented Jan 21, 2026

BTW, i got a linting error

B008 Do not perform function call `dt.datetime.now` in argument defaults; instead, perform the call within the function, or read the default from a module-level singleton variable

you ok with this @devsjc ?

devsjc
devsjc reviewed Jan 22, 2026
View reviewed changes
@devsjc devsjc merged commit 3da22ed into main Feb 4, 2026
4 checks passed
@devsjc devsjc deleted the uk-national branch February 4, 2026 11:46
@peterdudfield peterdudfield mentioned this pull request Feb 4, 2026
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@devsjc devsjc devsjc requested changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@peterdudfield @devsjc @braddf