From b79cb8779d3167808bd7afba109f5c324667a82e Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Tue, 6 Jun 2023 11:49:42 +0200 Subject: [PATCH] fixed mypy errors --- caimira/apps/calculator/__init__.py | 2 +- caimira/apps/calculator/co2_model_generator.py | 6 +++--- caimira/models.py | 7 +++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/caimira/apps/calculator/__init__.py b/caimira/apps/calculator/__init__.py index 03def087..427cd867 100644 --- a/caimira/apps/calculator/__init__.py +++ b/caimira/apps/calculator/__init__.py @@ -371,7 +371,7 @@ class CO2Data(BaseRequestHandler): report_task = executor.submit( co2_model_generator.CO2FormData.build_model, form, ) - report: str = await asyncio.wrap_future(report_task) + report = await asyncio.wrap_future(report_task) self.finish(dict(report.CO2_fit_params())) diff --git a/caimira/apps/calculator/co2_model_generator.py b/caimira/apps/calculator/co2_model_generator.py index afad52c4..5f3393a9 100644 --- a/caimira/apps/calculator/co2_model_generator.py +++ b/caimira/apps/calculator/co2_model_generator.py @@ -178,12 +178,12 @@ class CO2FormData: break_times = [] for n in population_breaks: # Parse break times. - begin = time_string_to_minutes(n["start_time"]) - end = time_string_to_minutes(n["finish_time"]) + begin = model_generator.time_string_to_minutes(n["start_time"]) + end = model_generator.time_string_to_minutes(n["finish_time"]) for time in [begin, end]: # For a specific break, the infected and exposed presence is the same. if not getattr(self, 'infected_start') < time < getattr(self, 'infected_finish'): - raise ValueError(f'All breaks should be within the simulation time. Got {time_minutes_to_string(time)}.') + raise ValueError(f'All breaks should be within the simulation time. Got {model_generator.time_minutes_to_string(time)}.') break_times.append((begin, end)) return tuple(break_times) diff --git a/caimira/models.py b/caimira/models.py index 2077d953..1d068088 100644 --- a/caimira/models.py +++ b/caimira/models.py @@ -447,7 +447,7 @@ class CustomVentilation(_VentilationBase): ventilation_value: PiecewiseConstant def transition_times(self, room: Room) -> typing.Set[float]: - return self.ventilation_value.transition_times + return set(self.ventilation_value.transition_times) def air_exchange(self, room: Room, time: float) -> _VectorisedFloat: return self.ventilation_value.value(time) @@ -1496,7 +1496,7 @@ class CO2Data: def CO2_concentrations_from_params(self, exhalation_rate: float, - ventilation_values: typing.Tuple[float, ...]) -> typing.List[float]: + ventilation_values: typing.Tuple[float, ...]) -> typing.List[_VectorisedFloat]: CO2_concentrations = CO2ConcentrationModel( room=Room(volume=self.room_volume), ventilation=CustomVentilation(PiecewiseConstant( @@ -1510,10 +1510,9 @@ class CO2Data: host_immunity=0. ) ) - return [CO2_concentrations.concentration(time) for time in self.times] - def CO2_fit_params(self) -> typing.Dict[_VectorisedFloat, _VectorisedFloat]: + def CO2_fit_params(self): if len(self.times) != len(self.CO2_concentrations): raise ValueError('times and CO2_concentrations must have same length.')