Fix calandar history

Author: Bre77

.changeset/strong-parts-write.md

@@ -0,0 +1,5 @@
+---
+"@teslemetry/api": patch
+---
+
+Fix types for calandarHistory

packages/api/src/TeslemetryEnergyApi.ts

@@ -19,39 +19,19 @@ import {
 import { reuse } from "./reuse.js";
 import { scheduler } from "./scheduler.js";
 
-// Derive event types from the calendar history response union type
-type CalendarHistoryEvents = NonNullable<
-  NonNullable<
-    GetApi1EnergySitesByIdCalendarHistoryResponse["response"]
-  >["events"]
->[number];
-
 // Extract specific event types based on discriminating properties
-export type BackupHistoryEvent = Extract<
-  CalendarHistoryEvents,
-  { duration?: number }
->;
-export type EnergyHistoryEvent = Exclude<
-  CalendarHistoryEvents,
-  { duration?: number }
->;
-
 export type BackupHistoryResponse = {
-  response?: {
-    events?: BackupHistoryEvent[];
-    total_events?: number;
-  };
+  response: Extract<
+    GetApi1EnergySitesByIdCalendarHistoryResponse["response"],
+    { events?: any }
+  >;
 };
-
 export type EnergyHistoryResponse = {
-  response?: {
-    events?: EnergyHistoryEvent[];
-    total_events?: number;
-  };
+  response: Extract<
+    GetApi1EnergySitesByIdCalendarHistoryResponse["response"],
+    { time_series?: any }
+  >;
 };
-export type EnergyHistorySummary = Partial<
-  Omit<EnergyHistoryEvent, "timestamp">
->;
 
 // Interface for event type safety
 type TeslemetryEnergyEventMap = {
@@ -433,32 +413,4 @@ export class TeslemetryEnergyApi extends EventEmitter {
       }
     };
   }
-
-  /**
-   * Sum energy history entries to find the total energy usage of each type.
-   * @param energyHistory
-   */
-  public sumEnergyHistory(
-    energyHistory: EnergyHistoryResponse,
-  ): EnergyHistorySummary {
-    const summary: EnergyHistorySummary = {};
-
-    if (!energyHistory?.response?.events) {
-      return summary;
-    }
-
-    for (const event of energyHistory.response.events) {
-      for (const [key, value] of Object.entries(event)) {
-        if (key === "timestamp") continue;
-
-        if (typeof value === "number") {
-          const typedKey = key as keyof Omit<EnergyHistoryEvent, "timestamp">;
-          const currentValue = summary[typedKey] as number | undefined;
-          summary[typedKey] = (currentValue ?? 0) + value;
-        }
-      }
-    }
-
-    return summary;
-  }
 }

packages/api/src/client/types.gen.ts

@@ -20202,28 +20202,41 @@ export type GetApi1EnergySitesByIdCalendarHistoryResponses = {
      * Default Response
      */
     200: {
-        response?: {
+        response?: null | {
+            serial_number: string;
+            period: 'day' | 'week' | 'month' | 'year' | 'lifetime';
+            installation_time_zone?: string;
+            time_series?: Array<{
+                timestamp: string;
+                solar_energy_exported: number;
+                generator_energy_exported: number;
+                grid_energy_imported: number;
+                grid_services_energy_imported: number;
+                grid_services_energy_exported: number;
+                grid_energy_exported_from_solar: number;
+                grid_energy_exported_from_generator: number;
+                grid_energy_exported_from_battery: number;
+                battery_energy_exported: number;
+                battery_energy_imported_from_grid: number;
+                battery_energy_imported_from_solar: number;
+                battery_energy_imported_from_generator: number;
+                consumer_energy_imported_from_grid: number;
+                consumer_energy_imported_from_solar: number;
+                consumer_energy_imported_from_battery: number;
+                consumer_energy_imported_from_generator: number;
+                raw_timestamp?: string;
+                total_home_usage?: number;
+                total_battery_discharge?: number;
+                total_grid_energy_exported?: number;
+                total_battery_charge?: number;
+                total_solar_generation?: number;
+            }>;
+            SmartBreakerEnergyLogs?: null;
+            time_zone_offset?: number;
+        } | {
             events?: Array<{
-                timestamp?: string;
-                duration?: number;
-            } | {
-                timestamp?: string;
-                solar_energy_exported?: number;
-                generator_energy_exported?: number;
-                grid_energy_imported?: number;
-                grid_services_energy_imported?: number;
-                grid_services_energy_exported?: number;
-                grid_energy_exported_from_solar?: number;
-                grid_energy_exported_from_generator?: number;
-                grid_energy_exported_from_battery?: number;
-                battery_energy_exported?: number;
-                battery_energy_imported_from_grid?: number;
-                battery_energy_imported_from_solar?: number;
-                battery_energy_imported_from_generator?: number;
-                consumer_energy_imported_from_grid?: number;
-                consumer_energy_imported_from_solar?: number;
-                consumer_energy_imported_from_battery?: number;
-                consumer_energy_imported_from_generator?: number;
+                timestamp: string;
+                duration: number;
             }>;
             total_events?: number;
         };