Skip to content

Commit

Permalink
fix: less alarming message in case a time window was passed
Browse files Browse the repository at this point in the history
Signed-off-by: F.N. Claessen <felix@seita.nl>
  • Loading branch information
Flix6x committed Mar 7, 2024
1 parent 5b95e03 commit 489e2bb
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions flexmeasures/cli/data_delete.py
Original file line number Diff line number Diff line change
Expand Up @@ -298,9 +298,7 @@ def delete_beliefs( # noqa: C901

entity_filters += [
TimedBelief.sensor_id == Sensor.id,
Sensor.generic_asset_id.in_(
[asset.id for asset in generic_assets]
),
Sensor.generic_asset_id.in_([asset.id for asset in generic_assets]),
]

# Create query
Expand All @@ -326,14 +324,17 @@ def delete_beliefs( # noqa: C901
db.session.commit()
num_beliefs_after = db.session.scalar(select(func.count()).select_from(q))
# only show the entity names for the final confirmation
message = f"{num_beliefs_after} beliefs left on sensors "
if sensors:
done(
f"{num_beliefs_after} beliefs left on sensors {join_words_into_a_list([sensor.name for sensor in sensors])}."
)
message += f"{join_words_into_a_list([sensor.name for sensor in sensors])}"
elif generic_assets:
done(
f"{num_beliefs_after} beliefs left on sensors of {join_words_into_a_list([asset.name for asset in generic_assets])}."
message = (
f"of {join_words_into_a_list([asset.name for asset in generic_assets])}"
)
if start is not None or end is not None:
message += " within the specified time window"
message += "."
done(message)


@fm_delete_data.command("unchanged-beliefs", cls=DeprecatedOptionsCommand)
Expand Down

0 comments on commit 489e2bb

Please sign in to comment.