Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions src/india_api/internal/inputs/indiadb/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import logging
from typing import Optional
from fastapi import HTTPException
from uuid import UUID

from pvsite_datamodel import DatabaseConnection
from pvsite_datamodel.read import (
Expand Down Expand Up @@ -271,6 +272,9 @@ def get_site_forecast(self, site_uuid: str, email:str) -> list[internal.Predicte
with self._get_session() as session:
check_user_has_access_to_site(session=session, email=email, site_uuid=site_uuid)

if isinstance(site_uuid, str):
site_uuid = UUID(site_uuid)

values = get_latest_forecast_values_by_site(
session,
site_uuids=[site_uuid],
Expand Down Expand Up @@ -303,6 +307,9 @@ def get_site_generation(self, site_uuid: str, email:str) -> list[internal.Actual
with self._get_session() as session:
check_user_has_access_to_site(session=session, email=email, site_uuid=site_uuid)

if isinstance(site_uuid, str):
site_uuid = UUID(site_uuid)

# read actual generations
values = get_pv_generation_by_sites(
session=session, site_uuids=[site_uuid], start_utc=start, end_utc=end
Expand Down
4 changes: 2 additions & 2 deletions src/india_api/internal/inputs/indiadb/test_indiadb.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def test_get_sites_no_sites(self, client, sites) -> None:
assert len(sites_from_api) == 0

def test_get_site_forecast(self, client, sites, forecast_values) -> None:
out = client.get_site_forecast(site_uuid=sites[0].site_uuid, email="test@test.com")
out = client.get_site_forecast(site_uuid=str(sites[0].site_uuid), email="test@test.com")
assert len(out) > 0

def test_get_site_forecast_no_forecast_values(self, client, sites) -> None:
Expand All @@ -96,7 +96,7 @@ def test_get_site_forecast_no_access(self, client, sites) -> None:
_ = client.get_site_forecast(site_uuid=sites[0].site_uuid, email="test2@test.com")

def test_get_site_generation(self, client, sites, generations) -> None:
out = client.get_site_generation(site_uuid=sites[0].site_uuid, email="test@test.com")
out = client.get_site_generation(site_uuid=str(sites[0].site_uuid), email="test@test.com")
assert len(out) > 0

def test_post_site_generation(self, client, sites) -> None:
Expand Down
Loading