Merge branch 'master' into feature/GSYE-810

gridsingularity · Dec 17, 2024 · 234ac1e · 234ac1e
2 parents 74fbf3d + 9510fa7
commit 234ac1e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/gsy_framework/enums.py b/gsy_framework/enums.py
@@ -16,6 +16,7 @@ class BidOfferMatchAlgoEnum(Enum):
 class SpotMarketTypeEnum(Enum):
     """Types of markets supported by the GSY exchange."""
 
+    NO_MARKET = 0
     ONE_SIDED = 1
     TWO_SIDED = 2
     COEFFICIENTS = 3

diff --git a/gsy_framework/schema/avro_schemas/launch_simulation_scenario.json b/gsy_framework/schema/avro_schemas/launch_simulation_scenario.json
@@ -70,7 +70,7 @@
                 ]},
                 {"name": "buying_rate_profile_uuid", "type": ["null", "string"]},
                 {"name": "energy_rate_profile_uuid", "type": ["null", "string"]},
-                {"name": "allow_external_connection", "type": "boolean"},
+                {"name": "allow_external_connection", "type": ["null", "boolean"]},
                 {"name": "display_type", "type": "string"},
                 {"name": "energy_sell_rate", "type": "float"},
                 {"name": "energy_buy_rate", "type": "float"}
@@ -91,7 +91,7 @@
                     "items":  "float"
                   }
                 ]},
-                {"name": "allow_external_connection", "type": "boolean"},
+                {"name": "allow_external_connection", "type": ["null", "boolean"]},
                 {"name": "display_type", "type": "string"},
                 {"name": "energy_rate", "type": "float"}
               ]
@@ -111,7 +111,7 @@
                     "items":  "float"
                   }
                 ]},
-                {"name": "allow_external_connection", "type": "boolean"},
+                {"name": "allow_external_connection", "type": ["null", "boolean"]},
                 {"name": "display_type", "type": "string"},
                 {"name": "energy_rate", "type": "float"},
                 {"name": "max_available_power_kW", "type": "float"}
@@ -132,7 +132,7 @@
                     "items":  "float"
                   }
                 ]},
-                {"name": "allow_external_connection", "type": "boolean"},
+                {"name": "allow_external_connection", "type": ["null", "boolean"]},
                 {"name": "display_type", "type": "string"},
                 {"name": "energy_rate", "type": "float"},
                 {"name": "energy_rate_profile", "type": [