diff --git a/cara/apps/calculator/__init__.py b/cara/apps/calculator/__init__.py index 09023af4..e64278ea 100644 --- a/cara/apps/calculator/__init__.py +++ b/cara/apps/calculator/__init__.py @@ -1,19 +1,13 @@ import json from pathlib import Path -import jinja2 from tornado.web import Application, RequestHandler, StaticFileHandler -import cara.models - -from datetime import datetime - -def build_model(request: dict) -> cara.models.Model: - return None +from . import model_generator +from .report_generator import build_report -def build_response(model: cara.models.Model): - return {'items': 'foobar'} +DEBUG = True class ConcentrationModel(RequestHandler): @@ -21,47 +15,41 @@ class ConcentrationModel(RequestHandler): requested_model_config = { name: self.get_argument(name) for name in self.request.arguments } + if DEBUG: + from pprint import pprint + pprint(requested_model_config) + try: - model = build_model(requested_model_config) + form = model_generator.FormData.from_dict(requested_model_config) + model = form.build_model( + # TODO: This argument to be removed. + tmp_raw_form_data=requested_model_config, + ) except (KeyboardInterrupt, SystemExit): raise except Exception as err: + if DEBUG: + import traceback + traceback.print_last() response_json = {'code': 400, 'error': f'Your request was invalid {err}'} self.set_status(400) self.finish(json.dumps(response_json)) return - response_json = build_response(model) - response_json['room_name'] = requested_model_config.get('room_name', 'unknown') - self.write(response_json) + report = build_report(model, form) + self.finish(report) class StaticModel(RequestHandler): def get(self): - - import cara.apps.expert - model = cara.apps.expert.baseline_model - - now = datetime.now() - time = now.strftime("%d/%m/%Y %H:%M:%S") - request = {'the': 'form', 'request': 'data'} - context = {'model': model, 'request': request, 'creation_date': time, 'model_version': 'Beta v1.0.0', - 'simulation_name': 'SAMPLE', 'room_number': '40/1-02A', 'room_volume': 30, 'mechanical_ventilation': 'Yes', - 'air_supply': 1, 'air_changes': 2, 'windows_number': 5, 'window_height': 2, 'window_width': 1, - 'opening_distance': 0.05, 'windows_open': '20 minutes every 2 hours', 'hepa_filtration': 'No', 'total_people': 8, - 'infected_people': 7, 'activity_type': 'Office work – typical scenario with all persons seated, talking', - 'activity_start': '00:00', 'activity_finish': '01:15', 'exposure_start': '00:00', 'exposure_finish': '01:15', - 'single_event_date': '5th November', 'lunch_option': 'Yes', 'lunch_start': '00:00', 'lunch_finish': '01:15', - 'coffee_option': 'Yes', 'coffee_number': 4,'coffee_duration': 15, 'coffee_start1': '00:00', 'coffee_finish1': '00:00', - 'coffee_start2': '00:00','coffee_finish2': '00:00', 'coffee_start3': '00:00', 'coffee_finish3': '00:00', - 'coffee_start4': '00:00', 'coffee_finish4': '00:00', 'mask_wearing': 'Yes', - 'infection_probability': round(model.infection_probability(), 2), 'reproduction_rate': 2} - - p = Path(__file__).parent / 'templates' - env = jinja2.Environment( - loader=jinja2.FileSystemLoader(Path(p))) - template = env.get_template('report.html.j2') - self.write(template.render(**context)) + requested_model_config = model_generator.baseline_raw_form_data() + form = model_generator.FormData.from_dict(model_generator.baseline_raw_form_data()) + model = form.build_model( + # TODO: This argument to be removed. + tmp_raw_form_data=requested_model_config, + ) + report = build_report(model, form) + self.finish(report) def make_app(debug=False, prefix='/calculator'): @@ -71,7 +59,7 @@ def make_app(debug=False, prefix='/calculator'): prefix + r'()', StaticFileHandler, {'path': static_dir / 'form.html'} ), ( - prefix + r'/api/calculator', ConcentrationModel + prefix + r'/report', ConcentrationModel ), ( prefix + r'/baseline-model/result', StaticModel diff --git a/cara/apps/calculator/model_generator.py b/cara/apps/calculator/model_generator.py index e661771d..23744597 100644 --- a/cara/apps/calculator/model_generator.py +++ b/cara/apps/calculator/model_generator.py @@ -1,18 +1,50 @@ -from typing import Dict, Any +from cara.models import Model +from dataclasses import dataclass +import typing + from cara import models -from numpy import linspace -def dict_from_json(file: str) -> Dict[str, str]: - raise NotImplementedError +@dataclass +class FormData: + ceiling_height: float + + @classmethod + def from_dict(cls, form_data: typing.Dict) -> "FormData": + # TODO: This fixup is a problem with the form.html. + form_data['ceiling_height'] = 1 + + return cls( + ceiling_height=float(form_data['ceiling_height']), + ) + + # TODO: Remove the tmp_raw_form_data usage. + def build_model(self, tmp_raw_form_data) -> Model: + return model_from_form(self, tmp_raw_form_data) + + def ventilation(self) -> models.Ventilation: + # TODO + pass + + def present_interval(self) -> models.Interval: + # TODO + pass -def model_from_dict(d: Dict[str, str]) -> models.Model: +def model_from_form(form: FormData, tmp_raw_form_data) -> models.Model: + d = tmp_raw_form_data + + # TODO: This fixup is a problem with the form.html. + d['coffee_breaks'] = 1 + d['activity_type'] = 'Training' + d['lunch_start'] = '12:00' + d['lunch_finish'] = '13:00' + # Initializes room with volume either given directly or as product of area and height if d['volume_type'] == 'room_volume': volume = int(d['room_volume']) else: - volume = int(float(d['floor_area']) * float(d['ceiling_height'])) + volume = int(float(d['floor_area']) * form.ceiling_height) room = models.Room(volume=volume) # Initializes a ventilation instance as a window if 'natural' is selected, or as a HEPA-filter otherwise @@ -94,13 +126,13 @@ def model_from_dict(d: Dict[str, str]) -> models.Model: # I.e. (infected_activity, infected_expiration), (exposed_activity, exposed_expiration) activity_dict = {'Office/Meeting': (('Seated', 'Talking'), ('Seated', 'Talking')), - 'Training': (('Standing', 'Talking'), ('Seated', 'Whispering')), + 'Training': (('Light exercise', 'Talking'), ('Seated', 'Whispering')), 'Workshop': (('Light exercise', 'Talking'), ('Light exercise', 'Talking'))} (infected_activity, infected_expiration), (exposed_activity, exposed_expiration) = activity_dict[d['activity_type']] # Converts these strings to Activity and Expiration instances infected_activity, exposed_activity = models.Activity.types[infected_activity], models.Activity.types[exposed_activity] - infected_expiration, exposed_expiration = models.Expiration.types[infected_expiration], models.Activity.types[exposed_expiration] + infected_expiration, exposed_expiration = models.Expiration.types[infected_expiration], models.Expiration.types[exposed_expiration] infected_occupants = int(d['infected_people']) # Defines the number of exposed occupants as the total number of occupants minus the number of infected occupants @@ -123,41 +155,36 @@ def model_from_dict(d: Dict[str, str]) -> models.Model: ) -def generate_data_from_model(model: models.Model) -> Dict[str, Any]: - resolution = 600 - times = list(linspace(0, 10, resolution)) - concentrations = [model.concentration(time) for time in times] - highest_const = max(concentrations) - prob = model.infection_probability() - er = model.infected.emission_rate(0) - exposed_occupants = model.exposed_occupants - r0 = prob * exposed_occupants / 100 - return {'times': times, - 'concentrations': concentrations, - 'highest_const': highest_const, - 'prob_inf': prob, - 'emission_rate': er, - 'exposed_occupants': exposed_occupants, - 'R0': r0} - - -def create_test_model(d: Dict[str, str]) -> models.Model: - assert 'room_volume' in d - return models.Model( - room=models.Room(volume=int(d['room_volume'])), - ventilation=models.WindowOpening( - active=models.PeriodicInterval(period=120, duration=120), - inside_temp=293, outside_temp=283, cd_b=0.6, - window_height=1.6, opening_length=0.6, - ), - infected=models.InfectedPerson( - virus=models.Virus.types['SARS_CoV_2'], - presence=models.SpecificInterval(((0, 4), (5, 8))), - mask=models.Mask.types['No mask'], - activity=models.Activity.types['Light exercise'], - expiration=models.Expiration.types['Unmodulated Vocalization'], - ), - infected_occupants=1, - exposed_occupants=10, - exposed_activity=models.Activity.types['Light exercise'], - ) +def baseline_raw_form_data(): + # Note: This isn't a special "baseline". It can be updated as required. + return { + 'activity_finish': '17:00', + 'activity_start': '09:00', + 'activity_type': 'training', + 'air_changes': '', + 'air_supply': '', + 'ceiling_height': '', + 'coffee_breaks': '', + 'coffee_duration': '1', + 'coffee_option': '0', + 'event_type': 'single_event', + 'floor_area': '', + 'infected_people': '1', + 'lunch_finish': '13:30', + 'lunch_option': '1', + 'lunch_start': '12:30', + 'mask_wearing': 'removed', + 'opening_distance': '15', + 'recurrent_event_month': 'January', + 'room_number': 'baseline room', + 'room_volume': '75', + 'simulation_name': 'Baseline simulation', + 'single_event_date': '11/02/2020', + 'total_people': '10', + 'ventilation_type': 'natural', + 'volume_type': 'room_volume', + 'window_height': '2', + 'window_width': '2', + 'windows_number': '1', + 'windows_open': 'interval' + } diff --git a/cara/apps/calculator/report_generator.py b/cara/apps/calculator/report_generator.py new file mode 100644 index 00000000..94ece764 --- /dev/null +++ b/cara/apps/calculator/report_generator.py @@ -0,0 +1,30 @@ +from datetime import datetime +from pathlib import Path + +import jinja2 + +from cara import models +from .model_generator import FormData + + +def build_report(model: models.Model, form: FormData): + now = datetime.now() + time = now.strftime("%d/%m/%Y %H:%M:%S") + request = {'the': 'form', 'request': 'data'} + context = {'model': model, 'request': request, 'creation_date': time, 'model_version': 'Beta v1.0.0', + 'simulation_name': 'SAMPLE', 'room_number': '40/1-02A', 'room_volume': 30, 'mechanical_ventilation': 'Yes', + 'air_supply': 1, 'air_changes': 2, 'windows_number': 5, 'window_height': 2, 'window_width': 1, + 'opening_distance': 0.05, 'windows_open': '20 minutes every 2 hours', 'hepa_filtration': 'No', 'total_people': 8, + 'infected_people': 7, 'activity_type': 'Office work – typical scenario with all persons seated, talking', + 'activity_start': '00:00', 'activity_finish': '01:15', 'exposure_start': '00:00', 'exposure_finish': '01:15', + 'single_event_date': '5th November', 'lunch_option': 'Yes', 'lunch_start': '00:00', 'lunch_finish': '01:15', + 'coffee_option': 'Yes', 'coffee_number': 4,'coffee_duration': 15, 'coffee_start1': '00:00', 'coffee_finish1': '00:00', + 'coffee_start2': '00:00','coffee_finish2': '00:00', 'coffee_start3': '00:00', 'coffee_finish3': '00:00', + 'coffee_start4': '00:00', 'coffee_finish4': '00:00', 'mask_wearing': 'Yes', + 'infection_probability': round(model.infection_probability(), 2), 'reproduction_rate': 2} + + p = Path(__file__).parent / 'templates' + env = jinja2.Environment( + loader=jinja2.FileSystemLoader(Path(p))) + template = env.get_template('report.html.j2') + return template.render(**context) \ No newline at end of file diff --git a/cara/apps/calculator/static/form.html b/cara/apps/calculator/static/form.html index 5ceb664f..7b1f9501 100644 --- a/cara/apps/calculator/static/form.html +++ b/cara/apps/calculator/static/form.html @@ -12,11 +12,11 @@ - +

CARA Covid Calculator

-
+
@@ -190,7 +190,7 @@ var request; function on_submit(form){ // Prevent default posting of form - put here to work in case of errors - event.preventDefault(); + // event.preventDefault(); // Abort any pending request if (request) @@ -199,32 +199,32 @@ function on_submit(form){ // Let's select and cache all the fields var $inputs = $(form).find("input, select, button, textarea"); - // Serialize the data in the form - var serializedData = objectifyForm($(form).serializeArray()); + // // Serialize the data in the form + // var serializedData = objectifyForm($(form).serializeArray()); - console.log(['Sending over', JSON.stringify(serializedData)]) + // console.log(['Sending over', JSON.stringify(serializedData)]) - // Fire off the request to the calculator. - request = $.ajax({ - url: "/calculator/api/calculator", - type: "post", - data: serializedData, - dataType: "json", - }); + // // Fire off the request to the calculator. + // request = $.ajax({ + // url: "/calculator/report", + // type: "post", + // data: serializedData, + // dataType: "json", + // }); - // Callback handler that will be called on success - request.done(function (response, textStatus, jqXHR){ - build_report(response); - }); + // // Callback handler that will be called on success + // request.done(function (response, textStatus, jqXHR){ + // build_report(response); + // }); - // Callback handler that will be called on failure - request.fail(function (jqXHR, textStatus, errorThrown){ - // Log the error to the console - console.error( - "The following error occurred: "+ - textStatus, errorThrown - ); - }); + // // Callback handler that will be called on failure + // request.fail(function (jqXHR, textStatus, errorThrown){ + // // Log the error to the console + // console.error( + // "The following error occurred: "+ + // textStatus, errorThrown + // ); + // }); } // Convert all type int in form diff --git a/cara/tests/apps/__init__.py b/cara/tests/apps/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/cara/tests/apps/calculator/__init__.py b/cara/tests/apps/calculator/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/cara/tests/apps/calculator/test_model_generator.py b/cara/tests/apps/calculator/test_model_generator.py new file mode 100644 index 00000000..05203273 --- /dev/null +++ b/cara/tests/apps/calculator/test_model_generator.py @@ -0,0 +1,25 @@ +import pytest + +from cara.apps.calculator import model_generator + + +@pytest.fixture +def baseline_form_data(): + return model_generator.baseline_raw_form_data() + + +@pytest.fixture +def baseline_form(baseline_form_data): + return model_generator.FormData.from_dict(baseline_form_data) + + +def test_model_from_dict(baseline_form_data): + model = model_generator.FormData.from_dict(baseline_form_data) + # TODO: + # assert model.ventilation == cara.models.Ventilation() + + +def test_ventilation(baseline_form): + ventilation = baseline_form.ventilation() + # TODO: + # assert ventilation == cara.models.Ventilation() diff --git a/cara/tests/test_apps.py b/cara/tests/apps/test_expert_app.py similarity index 100% rename from cara/tests/test_apps.py rename to cara/tests/apps/test_expert_app.py