From 0a240c845af8f8e27b71189636977860b001df7e Mon Sep 17 00:00:00 2001 From: hannesdiedrich Date: Thu, 6 Apr 2023 16:06:10 +0200 Subject: [PATCH] GSYE-555: Remove target_market_kpi and target_device_kpi --- .../avro_schemas/launch_simulation_scenario.json | 6 ------ gsy_framework/schemas.py | 1 - tests/schema/test_scenario_validator.py | 13 ------------- 3 files changed, 20 deletions(-) diff --git a/gsy_framework/schema/avro_schemas/launch_simulation_scenario.json b/gsy_framework/schema/avro_schemas/launch_simulation_scenario.json index 095ba94e..6b3ff428 100644 --- a/gsy_framework/schema/avro_schemas/launch_simulation_scenario.json +++ b/gsy_framework/schema/avro_schemas/launch_simulation_scenario.json @@ -27,7 +27,6 @@ "items": "float" } ]}, - {"name": "target_market_kpi", "type": ["null", "int"]}, {"name": "export_capacity_kVA", "type": ["null", "float"]}, {"name": "import_capacity_kVA", "type": ["null", "float"]}, {"name": "grid_fee_percentage", "type": ["null", "float"]}, @@ -164,7 +163,6 @@ {"name": "fit_to_limit", "type": ["null","boolean"]}, {"name": "cloud_coverage", "type": "int"}, {"name": "update_interval", "type": ["null", "int"]}, - {"name": "target_device_kpi", "type": ["null", "int"]}, {"name": "final_selling_rate", "type": ["null", "float"]}, {"name": "initial_selling_rate", "type": ["null", "float"]}, {"name": "use_market_maker_rate", "type": ["null", "boolean"]}, @@ -222,7 +220,6 @@ ]}, {"name": "final_buying_rate", "type": ["null", "float"]}, {"name": "initial_buying_rate", "type": ["null", "float"]}, - {"name": "target_device_kpi", "type": ["null", "int"]}, {"name": "daily_load_profile", "type": ["null", "string"]}, {"name": "daily_load_profile_uuid", "type": ["null", "string"]}, {"name": "use_market_maker_rate", "type": ["null", "boolean"]}, @@ -260,7 +257,6 @@ {"name": "hrs_per_day", "type": ["null", "int"]}, {"name": "final_buying_rate", "type": ["null", "float"]}, {"name": "initial_buying_rate", "type": ["null", "float"]}, - {"name": "target_device_kpi", "type": ["null", "int"]}, {"name": "use_market_maker_rate", "type": ["null", "boolean"]}, {"name": "forecast_stream_enabled", "type": ["null", "boolean"]}, {"name": "allow_external_connection", "type": ["null", "boolean"]}, @@ -295,7 +291,6 @@ {"name": "initial_selling_rate", "type": ["null", "float"]}, {"name": "energy_rate_increase_per_update", "type": ["null", "float"]}, {"name": "energy_rate_decrease_per_update", "type": ["null", "float"]}, - {"name": "target_device_kpi", "type": ["null", "int"]}, {"name": "use_market_maker_rate", "type": ["null", "boolean"]}, {"name": "allow_external_connection", "type": ["null", "boolean"]}, {"name": "display_type", "type": "string"}, @@ -327,7 +322,6 @@ {"name": "initial_selling_rate", "type": ["null", "float"]}, {"name": "energy_rate_increase_per_update", "type": ["null", "float"]}, {"name": "energy_rate_decrease_per_update", "type": ["null", "float"]}, - {"name": "target_device_kpi", "type": ["null", "int"]}, {"name": "use_market_maker_rate", "type": ["null", "boolean"]}, {"name": "allow_external_connection", "type": ["null", "boolean"]}, {"name": "display_type", "type": "string"} diff --git a/gsy_framework/schemas.py b/gsy_framework/schemas.py index 5cbf31c0..b3a158c8 100644 --- a/gsy_framework/schemas.py +++ b/gsy_framework/schemas.py @@ -37,7 +37,6 @@ class ScenarioSchemas: "fixed_monthly_fee": {"type": ["number", "null"]}, "marketplace_monthly_fee": {"type": ["number", "null"]}, "market_maker_rate": {"type": ["number", "null"]}, - "target_market_kpi": {"type": ["number", "null"]}, "grid_fee_constant": {"anyOf": [{"type": "number"}, {"type": "null"}]}, "grid_fee_percentage": {"anyOf": [{"type": "number"}, {"type": "null"}]}, "baseline_peak_energy_import_kWh": diff --git a/tests/schema/test_scenario_validator.py b/tests/schema/test_scenario_validator.py index 838780ca..80cab016 100644 --- a/tests/schema/test_scenario_validator.py +++ b/tests/schema/test_scenario_validator.py @@ -53,7 +53,6 @@ def setup_method(self): 21.817164413489536, 38.398776189002916 ], - "target_device_kpi": 0, "final_selling_rate": 0.0, "power_profile_uuid": "d8f9f372-d636-45da-a7f5-9ef02bbc8650", "initial_selling_rate": 30.0, @@ -75,7 +74,6 @@ def setup_method(self): 38.398776189002916 ], "final_buying_rate": 30.0, - "target_device_kpi": 0, "daily_load_profile": "{\"filename\": \"CHR27 Family both at work, 2 children HH1.csv\"}", "initial_buying_rate": 0.0, @@ -94,7 +92,6 @@ def setup_method(self): ], "fit_area_boundary": True, "grid_fee_constant": None, - "target_market_kpi": 0, "export_capacity_kVA": None, "grid_fee_percentage": None, "import_capacity_kVA": None, @@ -125,7 +122,6 @@ def setup_method(self): 21.819383035040943, 38.40110442451805 ], - "target_device_kpi": 0, "final_selling_rate": 0.0, "power_profile_uuid": "65517989-031d-465b-94f7-5889b1e6bcfa", "initial_selling_rate": 30.0, @@ -147,7 +143,6 @@ def setup_method(self): 38.40110442451805 ], "final_buying_rate": 30.0, - "target_device_kpi": 0, "daily_load_profile": "{\"filename\": \"CHR41 Family with 3 children, both at work HH1.csv\"}", "initial_buying_rate": 0.0, @@ -166,7 +161,6 @@ def setup_method(self): ], "fit_area_boundary": True, "grid_fee_constant": None, - "target_market_kpi": 0, "export_capacity_kVA": None, "grid_fee_percentage": None, "import_capacity_kVA": None, @@ -202,7 +196,6 @@ def setup_method(self): 38.40017818882174 ], "final_buying_rate": None, - "target_device_kpi": 0, "initial_buying_rate": 0.0, "use_market_maker_rate": True, "forecast_stream_enabled": None, @@ -244,7 +237,6 @@ def setup_method(self): 38.40119487732349 ], "final_buying_rate": None, - "target_device_kpi": 0, "initial_buying_rate": 0.0, "use_market_maker_rate": True, "forecast_stream_enabled": None, @@ -267,7 +259,6 @@ def setup_method(self): 38.40119487732349 ], "final_buying_rate": 22.0, - "target_device_kpi": 0, "cap_price_strategy": False, "final_selling_rate": 25.0, "initial_buying_rate": 12.0, @@ -291,7 +282,6 @@ def setup_method(self): "fixed_monthly_fee": 0.0, "grid_fee_constant": 1.0, "market_maker_rate": 0.0, - "target_market_kpi": 0, "export_capacity_kVA": 23.0, "grid_fee_percentage": None, "import_capacity_kVA": 1.0, @@ -316,7 +306,6 @@ def setup_method(self): 38.39855216791665 ], "final_buying_rate": 22.0, - "target_device_kpi": 0, "cap_price_strategy": False, "final_selling_rate": 25.0, "initial_buying_rate": 12.0, @@ -333,7 +322,6 @@ def setup_method(self): "geo_tag_location": None, "fit_area_boundary": True, "grid_fee_constant": None, - "target_market_kpi": 0, "export_capacity_kVA": None, "grid_fee_percentage": None, "import_capacity_kVA": None, @@ -346,7 +334,6 @@ def setup_method(self): "geo_tag_location": None, "fit_area_boundary": True, "grid_fee_constant": None, - "target_market_kpi": 0, "export_capacity_kVA": None, "grid_fee_percentage": None, "import_capacity_kVA": None,