-
Notifications
You must be signed in to change notification settings - Fork 4
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.
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
WIP Issue #29 - Add batch capability for running analytics over historical results (e.g. after uploading data from SD cards) #30
Open
JSegrave-IBM
wants to merge
5
commits into
Pyrrha-Platform:main
Choose a base branch
from
JSegrave-IBM:issue_29
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
7bb26f5
Issue #29 - Add batch capability for running analytics over historica…
JSegrave-IBM 158a3f0
Issue #29 - Add batch capability for running analytics over historica…
JSegrave-IBM c7b01dc
Issue #29 - Fixed review comments - date parameter type-checking and …
JSegrave-IBM 9a9131d
Issue #29 - documented local test command in readme
JSegrave-IBM 104264e
Issue #29 - batch can now overwrite existing analytics records in the…
JSegrave-IBM File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -45,6 +45,7 @@ | |
FIREFIGHTER_ID_COL = 'firefighter_id' | ||
TIMESTAMP_COL = 'timestamp_mins' | ||
STATUS_LED_COL = 'analytics_status_LED' | ||
DATE_PARAMETER = 'date' | ||
|
||
# We initialize the prometeo Analytics engine. | ||
perMinuteAnalytics = GasExposureAnalytics() | ||
|
@@ -167,6 +168,38 @@ def getStatusDetails(): | |
logger.error(f'Internal Server Error: {e}') | ||
abort(500) | ||
|
||
|
||
@app.route('/batch_run_analytics_by_date', methods=['GET']) | ||
def batch_run_analytics_by_date(): | ||
|
||
try: | ||
date = request.args.get(DATE_PARAMETER) | ||
|
||
# Return 404 (Not Found) if the record IDs are invalid | ||
if (date is None) : | ||
logger.error('Missing parameters : '+DATE_PARAMETER+' : '+str(date)) | ||
abort(404) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Comment - @Gaurav-Ramakrishna @upkarlidder Should this error be
FYI @JSegrave-IBM |
||
|
||
# Calculate exposure for every minute in the selected day | ||
batchAnalytics = GasExposureAnalytics() | ||
batch_results_df = batchAnalytics.batch_run_analytics_by_date(date) | ||
|
||
# Return 404 (Not Found) if no record is found | ||
if (batch_results_df is None) or (batch_results_df.empty): | ||
logger.error('No analytic results were produced for : ' + DATE_PARAMETER + ' : ' + str(date)) | ||
abort(404) | ||
else: | ||
return | ||
|
||
except HTTPException as e: | ||
logger.error(f'{e}') | ||
raise e | ||
except Exception as e: | ||
# Return 500 (Internal Server Error) if there's any unexpected errors. | ||
logger.error(f'Internal Server Error: {e}') | ||
abort(500) | ||
|
||
|
||
@app.route('/get_configuration', methods=['GET']) | ||
def getConfiguration(): | ||
|
||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@JSegrave-IBM should we validate the date here? We just check for None.