Moved defaults to SiteControlGroup (#58)

* Moved defaults to SiteControlGroup

* Removed experimental test

Author: joshvote

src/envoy_schema/admin/schema/config.py

@@ -1,49 +1,9 @@
 from datetime import datetime
-from decimal import Decimal
 from typing import Optional
 
 from pydantic import BaseModel
 
 
-class UpdateDefaultValue(BaseModel):
-    """Used to allow the setting of None or a specific value"""
-
-    value: Optional[Decimal]  # The decimal value to update (or None to update the value to None)
-
-
-class ControlDefaultRequest(BaseModel):
-    """Used for updating the "failover" SiteControl defaults that are used if no specific control is active"""
-
-    import_limit_watts: Optional[
-        UpdateDefaultValue
-    ]  # If set - update The default "import limit watts" used in absence of an active control
-    export_limit_watts: Optional[
-        UpdateDefaultValue
-    ]  # If set - update The default "export limit watts" used in absence of an active control
-    generation_limit_watts: Optional[
-        UpdateDefaultValue
-    ]  # If set - update The default "generation limit watts" used in absence of an active control
-    load_limit_watts: Optional[
-        UpdateDefaultValue
-    ]  # If set - update The default "export limit watts" used in absence of an active control
-    ramp_rate_percent_per_second: Optional[
-        UpdateDefaultValue
-    ]  # If set - update The default ramp rate expressed in a percent of max W per second
-
-
-class ControlDefaultResponse(BaseModel):
-    """Snapshot of the current "failover" SiteControl defaults that are used if no specific control is active"""
-
-    server_default_import_limit_watts: Optional[Decimal]  # None means NO default
-    server_default_export_limit_watts: Optional[Decimal]
-    server_default_generation_limit_watts: Optional[Decimal]
-    server_default_load_limit_watts: Optional[Decimal]
-    ramp_rate_percent_per_second: Optional[Decimal]
-
-    created_time: datetime
-    changed_time: datetime
-
-
 class RuntimeServerConfigRequest(BaseModel):
     """Used for updating the server configuration associated with runtime behavior"""
 

src/envoy_schema/admin/schema/site_control.py

@@ -78,3 +78,43 @@ class SiteControlGroupPageResponse(BaseModel):
     start: int  # The number of groups that have been skipped as part of this query (the start set by the query)
     after: Optional[datetime]  # The "after" filter set by the query
     site_control_groups: list[SiteControlGroupResponse]  # The control group models in this paged response
+
+
+class UpdateDefaultValue(BaseModel):
+    """Used to allow the setting of None or a specific value"""
+
+    value: Optional[Decimal]  # The decimal value to update (or None to update the value to None)
+
+
+class SiteControlGroupDefaultRequest(BaseModel):
+    """Used for updating fields associated with the SiteControlGroupDefault values - used when there is no active
+    control"""
+
+    import_limit_watts: Optional[
+        UpdateDefaultValue
+    ]  # If set - update The default "import limit watts" used in absence of an active control
+    export_limit_watts: Optional[
+        UpdateDefaultValue
+    ]  # If set - update The default "export limit watts" used in absence of an active control
+    generation_limit_watts: Optional[
+        UpdateDefaultValue
+    ]  # If set - update The default "generation limit watts" used in absence of an active control
+    load_limit_watts: Optional[
+        UpdateDefaultValue
+    ]  # If set - update The default "export limit watts" used in absence of an active control
+    ramp_rate_percent_per_second: Optional[
+        UpdateDefaultValue
+    ]  # If set - update The default ramp rate expressed in a percent of max W per second
+
+
+class SiteControlGroupDefaultResponse(BaseModel):
+    """Snapshot of the current SiteControlGroupDefault values that are used if no specific control is active"""
+
+    server_default_import_limit_watts: Optional[Decimal]  # None means NO default
+    server_default_export_limit_watts: Optional[Decimal]
+    server_default_generation_limit_watts: Optional[Decimal]
+    server_default_load_limit_watts: Optional[Decimal]
+    ramp_rate_percent_per_second: Optional[Decimal]
+
+    created_time: datetime
+    changed_time: datetime

src/envoy_schema/admin/schema/uri.py

@@ -22,7 +22,6 @@
 DoeUri = "/doe"
 SiteListUri = "/site"
 SiteUri = "/site/{site_id}"  # Supports updating/deleting single sites
-SiteControlDefaultConfigUri = "/site/{site_id}/control_default"  # For managing ControlDefaultConfig per site
 SiteGroupUri = "/site_group/{group_name}"
 SiteGroupListUri = "/site_group"
 CSIPAusSiteReadingUri = "/site_readings/{site_id}/csip_aus_unit/{unit_enum}/period/{period_start}/{period_end}"
@@ -35,6 +34,7 @@
 
 SiteControlGroupListUri = "/site_control_group"  # Fetching / Adding site control groups
 SiteControlGroupUri = "/site_control_group/{group_id}"  # Fetching / Changing site control groups
+SiteControlGroupDefaultUri = "/site_control_group/{group_id}/default"  # Changing defaults for a site control group
 SiteControlUri = "/site_control_group/{group_id}/controls"  # Fetching / Adding site controls (under a group)
 SiteControlRangeUri = "/site_control_group/{group_id}/controls/{period_start}/{period_end}"  # Fetching/deleting controls that start in range # noqa: E501