Get forecasts for an asset-id instead of passing location

flexmeasures_openweathermap/cli/commands.py

@@ -11,7 +11,7 @@
 from .schemas.weather_sensor import WeatherSensorSchema
 from ..utils.modeling import (
     get_or_create_weather_station,
-    get_asset_id_weather_station,
+    get_weather_station_by_asset_id,
 )
 from ..utils.locating import get_locations, get_location_by_asset_id
 from ..utils.filing import make_file_path
@@ -22,7 +22,6 @@
 )
 from ..sensor_specs import mapping
 
-
 """
 TODO: allow to also pass an asset ID or name for the weather station (instead of location) to both commands?
       See https://github.com/SeitaBV/flexmeasures-openweathermap/issues/2
@@ -76,7 +75,7 @@ def add_weather_sensor(**args):
         )
         raise click.Abort
     if args["asset_id"] is not None:
-        weather_station = get_asset_id_weather_station(args["asset_id"])
+        weather_station = get_weather_station_by_asset_id(args["asset_id"])
     elif args["latitude"] is not None and args["longitude"] is not None:
         weather_station = get_or_create_weather_station(
             args["latitude"], args["longitude"]
@@ -86,22 +85,31 @@ def add_weather_sensor(**args):
             "Arguments are missing to register a weather sensor. Provide either '--asset-id' or ('--latitude' and '--longitude')."
         )
 
-    fm_sensor_specs = get_supported_sensor_spec(args["name"])
-    fm_sensor_specs["generic_asset"] = weather_station
-    fm_sensor_specs["timezone"] = args["timezone"]
-    fm_sensor_specs["name"] = fm_sensor_specs.pop("fm_sensor_name")
-    fm_sensor_specs.pop("owm_sensor_name")
-    sensor = Sensor(**fm_sensor_specs)
-    sensor.attributes = fm_sensor_specs["attributes"]
-
-    db.session.add(sensor)
-    db.session.commit()
-    click.echo(
-        f"[FLEXMEASURES-OWM] Successfully created weather sensor with ID {sensor.id}, at weather station with ID {weather_station.id}"
-    )
-    click.echo(
-        f"[FLEXMEASURES-OWM] You can access this sensor at its entity address {sensor.entity_address}"
-    )
+    sensor = Sensor.query.filter(
+        Sensor.name == args["name"].lower(),
+        Sensor.generic_asset == weather_station,
+    ).one_or_none()
+    if sensor:
+        click.echo(
+            f"[FLEXMEASURES-OWM] A '{args['name']}' weather sensor already exists at this weather station (the station's ID is {weather_station.id})."
+        )
+    else:
+        fm_sensor_specs = get_supported_sensor_spec(args["name"])
+        fm_sensor_specs["generic_asset"] = weather_station
+        fm_sensor_specs["timezone"] = args["timezone"]
+        fm_sensor_specs["name"] = fm_sensor_specs.pop("fm_sensor_name")
+        fm_sensor_specs.pop("owm_sensor_name")
+        sensor = Sensor(**fm_sensor_specs)
+        sensor.attributes = fm_sensor_specs["attributes"]
+
+        db.session.add(sensor)
+        db.session.commit()
+        click.echo(
+            f"[FLEXMEASURES-OWM] Successfully created weather sensor with ID {sensor.id}, at weather station with ID {weather_station.id}"
+        )
+        click.echo(
+            f"[FLEXMEASURES-OWM] You can access this sensor at its entity address {sensor.entity_address}"
+        )
 
 
 @flexmeasures_openweathermap_bp.cli.command("get-weather-forecasts")

flexmeasures_openweathermap/cli/schemas/weather_sensor.py

@@ -8,12 +8,7 @@
 )
 
 import pytz
-from flexmeasures import Sensor
 
-from ...utils.modeling import (
-    get_or_create_weather_station,
-    get_asset_id_weather_station,
-)
 from ...utils.owm import get_supported_sensor_spec, get_supported_sensors_str
 
 
@@ -42,31 +37,9 @@ def validate_name_is_supported(self, name: str):
         )
 
     @validates_schema(skip_on_field_errors=False)
-    def validate_name_is_unique_in_weather_station(self, data, **kwargs):
-        if (
-            "name" not in data
-            or "latitude" not in data
-            or "longitude" not in data
-            or "asset_id" not in data
-        ):
+    def validate_name_is_given(self, data, **kwargs):
+        if "name" not in data:
             return  # That's a different validation problem
-        if data["latitude"] is not None and data["longitude"] is not None:
-            weather_station = get_or_create_weather_station(
-                data["latitude"], data["longitude"]
-            )
-        elif data["asset_id"] is not None:
-            weather_station = get_asset_id_weather_station(data["asset_id"])
-        else:
-            return
-
-        sensor = Sensor.query.filter(
-            Sensor.name == data["name"].lower(),
-            Sensor.generic_asset == weather_station,
-        ).one_or_none()
-        if sensor:
-            raise ValidationError(
-                f"A '{data['name']}' weather sensor already exists at this weather station (the station's ID is {weather_station.id})."
-            )
 
     @validates("timezone")
     def validate_timezone(self, timezone: str):

flexmeasures_openweathermap/conftest.py

@@ -5,7 +5,8 @@
 from flask_sqlalchemy import SQLAlchemy
 from flexmeasures.app import create as create_flexmeasures_app
 from flexmeasures.conftest import db, fresh_db  # noqa: F401
-from flexmeasures import Asset, AssetType, Sensor
+from flexmeasures.data.models.generic_assets import GenericAsset, GenericAssetType
+from flexmeasures.data.models.time_series import Sensor
 
 from flexmeasures_openweathermap import WEATHER_STATION_TYPE_NAME
 
@@ -42,10 +43,10 @@ def add_weather_sensors_fresh_db(fresh_db) -> Dict[str, Sensor]:  # noqa: F811
 
 def create_weather_sensors(db: SQLAlchemy):  # noqa: F811
     """Add a weather station asset with two weather sensors."""
-    weather_station_type = AssetType(name=WEATHER_STATION_TYPE_NAME)
+    weather_station_type = GenericAssetType(name=WEATHER_STATION_TYPE_NAME)
     db.session.add(weather_station_type)
 
-    weather_station = Asset(
+    weather_station = GenericAsset(
         name="Test weather station",
         generic_asset_type=weather_station_type,
         latitude=33.4843866,

flexmeasures_openweathermap/utils/locating.py

@@ -3,6 +3,7 @@
 from typing import Tuple, List, Optional
 
 import click
+from flask import current_app
 
 from flexmeasures.utils.grid_cells import LatLngGrid, get_cell_nums
 from flexmeasures import Sensor
@@ -103,7 +104,7 @@ def find_weather_sensor_by_location(
                 f"[FLEXMEASURES-OWM] No sufficiently close weather sensor found (within {max_degree_difference_for_nearest_weather_sensor} {flexmeasures_inflection.pluralize('degree', max_degree_difference_for_nearest_weather_sensor)} distance) for measuring {sensor_name}! We're looking for: {location}, closest available: ({weather_station.location})"
             )
     else:
-        raise Warning(
+        current_app.logger.warning(
             "[FLEXMEASURES-OWM] No weather sensor set up yet for measuring %s. Try the register-weather-sensor CLI task."
             % sensor_name
         )

flexmeasures_openweathermap/utils/modeling.py

@@ -73,7 +73,7 @@ def get_or_create_weather_station(latitude: float, longitude: float) -> GenericA
     return weather_station
 
 
-def get_asset_id_weather_station(asset_id: int) -> GenericAsset:
+def get_weather_station_by_asset_id(asset_id: int) -> GenericAsset:
     weather_station = GenericAsset.query.filter(
         GenericAsset.generic_asset_type_id == asset_id
     ).one_or_none()