Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix 588: CLI command add schedule for-storage not working without --as-job #589

Merged
merged 3 commits into from Feb 4, 2023
Merged

Fix 588: CLI command add schedule for-storage not working without --as-job #589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b1d8625
when deleting prognoses, only delete forecasting and scheduling jobs …
nhoening Feb 4, 2023
0bfb0f7
Fix parameters for make_schedule in add schedule for-storage CLI command
nhoening Feb 4, 2023
5f9231a
add a docstring
nhoening Feb 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions flexmeasures/cli/data_add.py
View file
Open in desktop
Expand Up @@ -1000,7 +1000,6 @@ def add_schedule_for_storage(
roundtrip_efficiency = roundtrip_efficiency.magnitude / 100.0

scheduling_kwargs = dict(
sensor=power_sensor,
start=start,
end=end,
belief_time=server_now(),
Expand All @@ -1019,11 +1018,11 @@ def add_schedule_for_storage(
},
)
if as_job:
job = create_scheduling_job(**scheduling_kwargs)
job = create_scheduling_job(sensor=power_sensor, **scheduling_kwargs)
if job:
print(f"New scheduling job {job.id} has been added to the queue.")
else:
success = make_schedule(**scheduling_kwargs)
success = make_schedule(sensor_id=power_sensor.id, **scheduling_kwargs)
if success:
print("New schedule is stored.")

Expand Down
20 changes: 15 additions & 5 deletions flexmeasures/data/scripts/data_gen.py
View file
Open in desktop
Expand Up @@ -298,14 +298,23 @@ def depopulate_prognoses(
db: SQLAlchemy,
sensor_id: Optional[id] = None,
):
"""
Delete all prognosis data (with an horizon > 0).
This affects forecasts as well as schedules.

Pass a sensor ID to restrict to data on one sensor only.

If no sensor is specified, this function also deletes forecasting and scheduling jobs.
(Doing this only for jobs which forecast/schedule one sensor is not implemented and also tricky.)
"""
click.echo(
"Deleting (time series) forecasts and schedules data from the database %s ..."
% db.engine
)

# Clear all jobs
num_forecasting_jobs_deleted = app.queues["forecasting"].empty()
num_scheduling_jobs_deleted = app.queues["scheduling"].empty()
if not sensor_id:
nhoening marked this conversation as resolved.
Show resolved Hide resolved
num_forecasting_jobs_deleted = app.queues["forecasting"].empty()
num_scheduling_jobs_deleted = app.queues["scheduling"].empty()

# Clear all forecasts (data with positive horizon)
query = db.session.query(TimedBelief).filter(
Expand All @@ -315,8 +324,9 @@ def depopulate_prognoses(
query = query.filter(TimedBelief.sensor_id == sensor_id)
num_forecasts_deleted = query.delete()

click.echo("Deleted %d Forecast Jobs" % num_forecasting_jobs_deleted)
click.echo("Deleted %d Schedule Jobs" % num_scheduling_jobs_deleted)
if not sensor_id:
click.echo("Deleted %d Forecast Jobs" % num_forecasting_jobs_deleted)
click.echo("Deleted %d Schedule Jobs" % num_scheduling_jobs_deleted)
click.echo("Deleted %d forecasts (ex-ante beliefs)" % num_forecasts_deleted)


Expand Down