suggested changes

Author: PavanRaghavendraKulkarni

solar_consumer/data/locations.csv

@@ -1,18 +1,18 @@
 name,latitude,longitude,region_id,region,country_code,location_type
 nl_national,52.13,5.29,0,,nl,NATION
-nl_groningen,53.22,6.74,1,,nl,COUNTY
-nl_region_2_friesland,53.11,5.85,2,,nl,COUNTY
-nl_region_3_drenthe,52.86,6.62,3,,nl,COUNTY
-nl_region_4_overijssel,52.45,6.45,4,,nl,COUNTY
-nl_region_5_flevoland,52.53,5.60,5,,nl,COUNTY
-nl_region_6_gelderland,52.06,5.95,6,,nl,COUNTY
-nl_region_7_utrecht,52.08,5.17,7,,nl,COUNTY
-nl_region_8_noord_holland,52.58,4.87,8,,nl,COUNTY
-nl_region_9_zuid_holland,51.94,4.47,9,,nl,COUNTY
-nl_region_10_zeeland,51.45,3.84,10,,nl,COUNTY
-nl_region_11_noord_brabant,51.56,5.20,11,,nl,COUNTY
-nl_region_12_limburg,51.21,5.94,12,,nl,COUNTY
+nl_groningen,53.22,6.74,1,,nl,STATE
+nl_region_2_friesland,53.11,5.85,2,,nl,STATE
+nl_region_3_drenthe,52.86,6.62,3,,nl,STATE
+nl_region_4_overijssel,52.45,6.45,4,,nl,STATE
+nl_region_5_flevoland,52.53,5.60,5,,nl,STATE
+nl_region_6_gelderland,52.06,5.95,6,,nl,STATE
+nl_region_7_utrecht,52.08,5.17,7,,nl,STATE
+nl_region_8_noord_holland,52.58,4.87,8,,nl,STATE
+nl_region_9_zuid_holland,51.94,4.47,9,,nl,STATE
+nl_region_10_zeeland,51.45,3.84,10,,nl,STATE
+nl_region_11_noord_brabant,51.56,5.20,11,,nl,STATE
+nl_region_12_limburg,51.21,5.94,12,,nl,STATE
 be_belgium,50.85,4.35,,Belgium,be,NATION
-be_flanders,51.00,4.46,,Flanders,be,COUNTY
-be_wallonia,50.50,4.70,,Wallonia,be,COUNTY
-be_brussels,50.85,4.35,,Brussels,be,COUNTY
+be_flanders,51.00,4.46,,Flanders,be,STATE
+be_wallonia,50.50,4.70,,Wallonia,be,STATE
+be_brussels,50.85,4.35,,Brussels,be,STATE

solar_consumer/save/save_data_platform.py

@@ -26,13 +26,13 @@ def _get_country_config(country: str) -> dict:
     configs = {
         "nl": {
             "id_key": "region_id",
-            "location_type": [dp.LocationType.NATION, dp.LocationType.COUNTY],
+            "location_type": [dp.LocationType.NATION, dp.LocationType.STATE],
             "metadata_type": "number",  
             "observer_name": "nednl",
         },
         "be": {
             "id_key": "region",
-            "location_type": [dp.LocationType.NATION, dp.LocationType.COUNTY],
+            "location_type": [dp.LocationType.NATION, dp.LocationType.STATE],
             "metadata_type": "string",  
             "observer_name": "elia_be",
         },
@@ -171,8 +171,8 @@ async def _create_locations_from_csv(
 
         if location_type_str == "NATION":
              location_type = dp.LocationType.NATION
-        elif location_type_str == "COUNTY":
-             location_type = dp.LocationType.COUNTY
+        elif location_type_str == "STATE":
+             location_type = dp.LocationType.STATE
         else:
              location_type = dp.LocationType.NATION
 
@@ -382,9 +382,6 @@ async def save_generation_to_data_platform(
             new_effective_capacity_watts=new_cap,
             valid_from_utc=t,
         )
-        # TODO if we run the next line, the tests seem to pass
-        # _ = await client.update_location(req)
-        ######## code that doesnt work (maybe)
         tasks.append(asyncio.create_task(client.update_location(req)))
 
     if len(tasks) > 0:

tests/integration/test_save_nl_and_be_to_data_platform.py

@@ -140,7 +140,7 @@ async def test_save_generation_to_data_platform(client, config):
 
         location_type = dp.LocationType.NATION
         if loc_config.get("metadata_key") in ["region_id", "region"] and loc_config["name"] not in ["nl_national", "be_belgium"]:
-            location_type = dp.LocationType.COUNTY
+            location_type = dp.LocationType.STATE
 
         create_location_request = dp.CreateLocationRequest(
             location_name=loc_config["name"],
@@ -178,15 +178,11 @@ async def test_save_generation_to_data_platform(client, config):
                 end_timestamp_utc=datetime.datetime(2025, 1, 2, tzinfo=datetime.timezone.utc),
             ),
         )
-        import asyncio
-        for _ in range(15):
-            get_observations_response = await client.get_observations_as_timeseries(
-                get_observations_request
-            )
-            if len(get_observations_response.values) > 0:
-                break
-            await asyncio.sleep(1)
-        
+       
+        get_observations_response = await client.get_observations_as_timeseries(
+            get_observations_request
+        )
+            
         # Check that observations exist
         assert len(get_observations_response.values) > 0, f"No observations found for {location_name}"
 
@@ -200,12 +196,7 @@ async def test_save_generation_to_data_platform(client, config):
             energy_source=dp.EnergySource.SOLAR,
             pivot_timestamp_utc=pivot_time
         )
-        import asyncio
-        for _ in range(15):
-            get_location_response = await client.get_location(get_location_request)    
-            if get_location_response.effective_capacity_watts == expected_capacity:
-                break
-            await asyncio.sleep(1)
+        get_location_response = await client.get_location(get_location_request)     
         assert get_location_response.effective_capacity_watts == expected_capacity, \
             f"Capacity not updated correctly for {location_name}"