Skip to content
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

Add a national end point, that provides elexon BMRS solar foreacsts from elexonpy package #347

Merged
Merged
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
e125c2a
added import statements of elexonpy
14Richa Jul 17, 2024
1ab3837
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 17, 2024
aec73d2
resolve conflicts
14Richa Jul 18, 2024
9b302f9
Merge branch '14Richa/solar-forecast-endpoint' of github.com:14Richa/…
14Richa Jul 18, 2024
bae31a9
added API for solar forecast
14Richa Jul 18, 2024
9158800
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 18, 2024
81af713
minor fix
14Richa Jul 19, 2024
9ca6cf0
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 19, 2024
746d979
minor fix
14Richa Jul 19, 2024
f6cad5d
Merge branch '14Richa/solar-forecast-endpoint' of github.com:14Richa/…
14Richa Jul 19, 2024
8b988ab
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 19, 2024
299497d
changed function name
14Richa Jul 19, 2024
f03e377
Merge branch '14Richa/solar-forecast-endpoint' of github.com:14Richa/…
14Richa Jul 19, 2024
0193ad0
added filter functionality
14Richa Jul 19, 2024
e4b19e4
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 19, 2024
bc5cece
added API link
14Richa Jul 19, 2024
a1ddc32
Merge branch '14Richa/solar-forecast-endpoint' of github.com:14Richa/…
14Richa Jul 19, 2024
f86c36b
minor fix
14Richa Jul 20, 2024
25a345b
remove try except block
14Richa Jul 20, 2024
f254216
changed bmrs to elexon
14Richa Jul 20, 2024
67a2293
minor fix
14Richa Jul 23, 2024
e01ea24
resolving pre hook
14Richa Jul 23, 2024
b12e8c2
minor fix in docstring
14Richa Jul 24, 2024
c40b4ec
removed router
14Richa Jul 24, 2024
7d21b13
minor fix in naming
14Richa Jul 24, 2024
841554a
added elexonpy in requirement.txt file
14Richa Jul 24, 2024
448bd81
resolve hook error
14Richa Jul 25, 2024
8e8167a
minor fix
14Richa Jul 25, 2024
e734329
added response model
14Richa Jul 27, 2024
0d0cc1c
fixed unit test
14Richa Jul 27, 2024
e53d7a8
remove plevel
14Richa Jul 27, 2024
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
2 changes: 1 addition & 1 deletion src/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ async def add_process_time_header(request: Request, call_next):
# Dependency
v0_route_solar = "/v0/solar/GB"
v0_route_system = "/v0/system/GB"

app.include_router(national_router, prefix="/v0/solar/national")
14Richa marked this conversation as resolved.
Show resolved Hide resolved
app.include_router(national_router, prefix=f"{v0_route_solar}/national")
app.include_router(gsp_router, prefix=f"{v0_route_solar}/gsp")
app.include_router(status_router, prefix=f"{v0_route_solar}")
Expand Down
92 changes: 63 additions & 29 deletions src/national.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
"""National API routes"""

import os
from datetime import datetime, timedelta
from typing import List, Optional, Union

import pandas as pd
import structlog
from fastapi import APIRouter, Depends, HTTPException, Request, Security
from elexonpy.api.generation_forecast_api import GenerationForecastApi
from elexonpy.api_client import ApiClient
from fastapi import APIRouter, Depends, HTTPException, Query, Request, Security
from fastapi_auth0 import Auth0User
from nowcasting_datamodel.read.read import get_latest_forecast_for_gsps
from sqlalchemy.orm.session import Session
Expand All @@ -21,14 +25,64 @@

logger = structlog.stdlib.get_logger()


adjust_limit = float(os.getenv("ADJUST_MW_LIMIT", 0.0))
get_plevels = bool(os.getenv("GET_PLEVELS", True))

router = APIRouter(
tags=["National"],
)

# Initialize Elexon API client
api_client = ApiClient()
forecast_api = GenerationForecastApi(api_client)


peterdudfield marked this conversation as resolved.
Show resolved Hide resolved
@router.get("/elexon", summary="Get BMRS Solar Forecast")
14Richa marked this conversation as resolved.
Show resolved Hide resolved
@limiter.limit(f"{N_CALLS_PER_HOUR}/hour")
def get_elexon_forecast(
request: Request,
start_datetime_utc: datetime = Query(
default=datetime.utcnow() - timedelta(days=3), description="Start date and time in UTC"
),
end_datetime_utc: datetime = Query(
default=datetime.utcnow() + timedelta(days=3), description="End date and time in UTC"
),
process_type: str = Query("Day Ahead", description="Process type"),
):
"""
Fetch BMRS solar forecasts from the Elexon API.
14Richa marked this conversation as resolved.
Show resolved Hide resolved

Args:
request (Request): The request object containing metadata about the HTTP request.
start_datetime_utc (datetime): The start date and time in UTC.
end_datetime_utc (datetime): The end date and time in UTC.
process_type (str): The type of process (e.g., 'Day Ahead').

Returns:
dict: Dictionary containing the fetched BMRS solar forecast data.

External API:
[Elexon API Documentation]
(https://bmrs.elexon.co.uk/api-documentation/endpoint/forecast/generation/wind-and-solar/day-ahead)
"""
response = forecast_api.forecast_generation_wind_and_solar_day_ahead_get(
14Richa marked this conversation as resolved.
Show resolved Hide resolved
_from=start_datetime_utc.isoformat(),
to=end_datetime_utc.isoformat(),
process_type=process_type,
format="json",
)

if not response.data:
return {"data": []}

df = pd.DataFrame([item.to_dict() for item in response.data])

# Filter to include only solar forecasts
solar_df = df[df["business_type"] == "Solar generation"]
result = {"data": solar_df.to_dict(orient="records")}

return result

14Richa marked this conversation as resolved.
Show resolved Hide resolved

@router.get(
"/forecast",
Expand All @@ -47,7 +101,9 @@ def get_national_forecast(
end_datetime_utc: Optional[str] = None,
creation_limit_utc: Optional[str] = None,
) -> Union[NationalForecast, List[NationalForecastValue]]:
"""Get the National Forecast
"""

Fetch national forecasts.

This route returns the most recent forecast for each _target_time_.

Expand All @@ -67,6 +123,9 @@ def get_national_forecast(
- **creation_utc_limit**: optional, only return forecasts made before this datetime.
Note you can only go 7 days back at the moment

Returns:
dict: The national forecast data.

"""
logger.debug("Get national forecasts")

Expand Down Expand Up @@ -182,35 +241,10 @@ def get_national_pvlive(

#### Parameters
- **regime**: can choose __in-day__ or __day-after__
"""

"""
logger.info(f"Get national PV Live estimates values " f"for regime {regime} for {user}")

return get_truth_values_for_a_specific_gsp_from_database(
session=session, gsp_id=0, regime=regime
)


@router.get(
"/bmrs",
response_model=dict,
# dependencies=[Depends(get_auth_implicit_scheme())],
summary="Get BMRS Forecast",
)
# @cache_response
@limiter.limit(f"{N_CALLS_PER_HOUR}/hour")
def get_bmrs_forecast(
request: Request,
# session: Session = Depends(get_session),
# user: Auth0User = Security(get_user()),
) -> dict:
"""

This route returns the most recent BMRS forecast for each _target_time_.

#### Parameters

"""
logger.debug("Get bmrs forecast")

return {"message": "This route is not yet implemented. Please check back later."}