Skip to content

feat(proto): Add p2,98,25,75; refactor tests #181

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.

Sign up for GitHub

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

Merged
devsjc merged 1 commit into from
Jul 7, 2026
Merged

feat(proto): Add p2,98,25,75; refactor tests #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,14 @@ Forecaster represents a generative source of predicted values.

| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
| location_uuid | [string](#string) | | || location_name | [string](#string) | | || value_fraction | [float](#float) | | || effective_capacity_watts | [uint64](#uint64) | | || latlng | [LatLng](#ocf-dp-LatLng) | | || metadata | [google.protobuf.Struct](#google-protobuf-Struct) | | || initialization_timestamp_utc | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | || created_timestamp_utc | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | |
| location_uuid | [string](#string) | | || location_name | [string](#string) | | || value_fraction | [float](#float) | | || effective_capacity_watts | [uint64](#uint64) | | || latlng | [LatLng](#ocf-dp-LatLng) | | || metadata | [google.protobuf.Struct](#google-protobuf-Struct) | | || initialization_timestamp_utc | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | || created_timestamp_utc | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | || other_statistics_fractions | [GetForecastAtTimestampResponse.Value.OtherStatisticsFractionsEntry](#ocf-dp-GetForecastAtTimestampResponse-Value-OtherStatisticsFractionsEntry) | repeated | |
</details><a name="ocf-dp-GetForecastAtTimestampResponse-Value-OtherStatisticsFractionsEntry"></a>
<details><summary>GetForecastAtTimestampResponse.Value.OtherStatisticsFractionsEntry</summary>


| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
| key | [string](#string) | | || value | [float](#float) | | |
</details><a name="ocf-dp-GetLatestForecastsRequest"></a>
<details><summary>GetLatestForecastsRequest</summary>

Expand Down
84 changes: 83 additions & 1 deletion internal/server/postgres/dataserverimpl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,13 @@ func (s *DataPlatformDataServiceServerImpl) CreateForecast(
for i, value := range req.Values {
paramsList[i] = db.CreatePredictedValuesParams{
HorizonMins: int16(value.HorizonMins),
P02Sip: extractSIPStatPtrFromMap(value.OtherStatisticsFractions, "p02"),
P10Sip: extractSIPStatPtrFromMap(value.OtherStatisticsFractions, "p10"),
P25Sip: extractSIPStatPtrFromMap(value.OtherStatisticsFractions, "p25"),
P50Sip: int16(value.P50Fraction * 30000.0),
P75Sip: extractSIPStatPtrFromMap(value.OtherStatisticsFractions, "p75"),
P90Sip: extractSIPStatPtrFromMap(value.OtherStatisticsFractions, "p90"),
P98Sip: extractSIPStatPtrFromMap(value.OtherStatisticsFractions, "p98"),
ForecastUuid: dbForecast.ForecastUuid,
}
}
Expand Down Expand Up @@ -523,9 +527,13 @@ func (s *DataPlatformDataServiceServerImpl) StreamForecastData(
&row.ForecasterVersion,
&row.CreatedAtUtc,
&row.HorizonMins,
&row.P02Sip,
&row.P10Sip,
&row.P25Sip,
&row.P50Sip,
&row.P75Sip,
&row.P90Sip,
&row.P98Sip,
&row.CapacityWatts,
&row.Metadata,
&row.InitTimeUtc,
Expand All @@ -537,14 +545,30 @@ func (s *DataPlatformDataServiceServerImpl) StreamForecastData(
}

otherStatistics := make(map[string]float32)
if row.P02Sip != nil {
otherStatistics["p02"] = float32(*row.P02Sip) / 30000.0
}

if row.P10Sip != nil {
otherStatistics["p10"] = float32(*row.P10Sip) / 30000.0
}

if row.P25Sip != nil {
otherStatistics["p25"] = float32(*row.P25Sip) / 30000.0
}

if row.P75Sip != nil {
otherStatistics["p75"] = float32(*row.P75Sip) / 30000.0
}

if row.P90Sip != nil {
otherStatistics["p90"] = float32(*row.P90Sip) / 30000.0
}

if row.P98Sip != nil {
otherStatistics["p98"] = float32(*row.P98Sip) / 30000.0
}

metadata := make(map[string]string)
if req.IncludeMetadata && row.Metadata != nil {
for k, v := range row.Metadata.AsMap() {
Expand Down Expand Up @@ -1057,6 +1081,31 @@ func (s *DataPlatformDataServiceServerImpl) GetForecastAtTimestamp(

values := make([]*pb.GetForecastAtTimestampResponse_Value, len(dbPredictions))
for i, value := range dbPredictions {
otherStats := make(map[string]float32)
if value.P02Sip != nil {
otherStats["p02"] = float32(*value.P02Sip) / 30000.0
}

if value.P10Sip != nil {
otherStats["p10"] = float32(*value.P10Sip) / 30000.0
}

if value.P25Sip != nil {
otherStats["p25"] = float32(*value.P25Sip) / 30000.0
}

if value.P75Sip != nil {
otherStats["p75"] = float32(*value.P75Sip) / 30000.0
}

if value.P90Sip != nil {
otherStats["p90"] = float32(*value.P90Sip) / 30000.0
}

if value.P98Sip != nil {
otherStats["p98"] = float32(*value.P98Sip) / 30000.0
}

values[i] = &pb.GetForecastAtTimestampResponse_Value{
ValueFraction: float32(value.P50Sip) / 30000.0,
EffectiveCapacityWatts: uint64(value.CapacityWatts),
Expand All @@ -1069,6 +1118,7 @@ func (s *DataPlatformDataServiceServerImpl) GetForecastAtTimestamp(
Metadata: value.Metadata,
InitializationTimestampUtc: timestamppb.New(value.InitTimeUtc.Time),
CreatedTimestampUtc: timestamppb.New(value.CreatedAtUtc.Time),
OtherStatisticsFractions: otherStats,
}
}

Expand Down Expand Up @@ -1378,7 +1428,7 @@ func (s *DataPlatformDataServiceServerImpl) UpdateLocation(
lsprms := db.GetSourceAtTimestampParams{
GeometryUuid: uuid.MustParse(req.LocationUuid),
SourceTypeID: int16(req.EnergySource.Number()),
AtTimestampUtc: pgtype.Timestamp{Time: req.ValidFromUtc.AsTime(), Valid: true},
AtTimestampUtc: pgtype.Timestamp{Time: validFrom, Valid: true},
Comment thread
devsjc marked this conversation as resolved.
}

dbSource, err := querier.GetSourceAtTimestamp(ctx, lsprms)
Expand Down Expand Up @@ -1618,14 +1668,30 @@ func (s *DataPlatformDataServiceServerImpl) GetForecastAsTimeseries(
out := make([]*pb.GetForecastAsTimeseriesResponse_Value, len(dbPreds))
for i, pred := range dbPreds {
otherStats := make(map[string]float32)
if pred.P02Sip != nil {
otherStats["p02"] = float32(*pred.P02Sip) / 30000.0
}

if pred.P10Sip != nil {
otherStats["p10"] = float32(*pred.P10Sip) / 30000.0
}

if pred.P25Sip != nil {
otherStats["p25"] = float32(*pred.P25Sip) / 30000.0
}

if pred.P75Sip != nil {
otherStats["p75"] = float32(*pred.P75Sip) / 30000.0
}

if pred.P90Sip != nil {
otherStats["p90"] = float32(*pred.P90Sip) / 30000.0
}

if pred.P98Sip != nil {
otherStats["p98"] = float32(*pred.P98Sip) / 30000.0
}

out[i] = &pb.GetForecastAsTimeseriesResponse_Value{
TargetTimestampUtc: timestamppb.New(
pred.InitTimeUtc.Time.Add(time.Duration(pred.HorizonMins) * time.Minute),
Expand Down Expand Up @@ -1718,14 +1784,30 @@ func (s *DataPlatformDataServiceServerImpl) GetForecastAsTimeseries(
values := make([]*pb.GetForecastAsTimeseriesResponse_Value, len(dbValues))
for i, value := range dbValues {
otherStats := make(map[string]float32)
if value.P02Sip != nil {
otherStats["p02"] = float32(*value.P02Sip) / 30000.0
}

if value.P10Sip != nil {
otherStats["p10"] = float32(*value.P10Sip) / 30000.0
}

if value.P25Sip != nil {
otherStats["p25"] = float32(*value.P25Sip) / 30000.0
}

if value.P75Sip != nil {
otherStats["p75"] = float32(*value.P75Sip) / 30000.0
}

if value.P90Sip != nil {
otherStats["p90"] = float32(*value.P90Sip) / 30000.0
}

if value.P98Sip != nil {
otherStats["p98"] = float32(*value.P98Sip) / 30000.0
}

values[i] = &pb.GetForecastAsTimeseriesResponse_Value{
TargetTimestampUtc: timestamppb.New(value.TargetTimeUtc.Time),
P50ValueFraction: float32(value.P50Sip) / 30000.0,
Expand Down
Loading
Loading