From cd39c36448fe9bd1ec64070d312abae3acbe17dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Lafr=C3=A9choux?= Date: Tue, 16 Apr 2024 11:27:17 +0200 Subject: [PATCH] Fix pyproject.toml isort config --- pyproject.toml | 10 +++++----- src/bemserver_api/__init__.py | 3 ++- src/bemserver_api/extensions/authentication.py | 6 ++++-- src/bemserver_api/extensions/smorest.py | 5 ++--- .../resources/analysis/completeness/routes.py | 3 ++- .../resources/analysis/energy_consumption/routes.py | 3 ++- .../resources/building_properties/routes.py | 4 +++- .../resources/building_properties/schemas.py | 2 +- .../resources/building_property_data/routes.py | 6 ++++-- .../resources/building_property_data/schemas.py | 2 +- src/bemserver_api/resources/buildings/routes.py | 4 +++- src/bemserver_api/resources/buildings/schemas.py | 2 +- src/bemserver_api/resources/campaign_scopes/routes.py | 4 +++- src/bemserver_api/resources/campaign_scopes/schemas.py | 2 +- src/bemserver_api/resources/campaigns/routes.py | 4 +++- src/bemserver_api/resources/campaigns/schemas.py | 2 +- src/bemserver_api/resources/energies/routes.py | 3 ++- src/bemserver_api/resources/energies/schemas.py | 1 + .../routes.py | 4 +++- .../schemas.py | 2 +- .../energy_consumption_timeseries_by_sites/routes.py | 4 +++- .../energy_consumption_timeseries_by_sites/schemas.py | 2 +- src/bemserver_api/resources/energy_end_uses/routes.py | 3 ++- src/bemserver_api/resources/energy_end_uses/schemas.py | 1 + .../resources/energy_production_technologies/routes.py | 3 ++- .../energy_production_technologies/schemas.py | 1 + .../routes.py | 4 +++- .../schemas.py | 2 +- .../energy_production_timeseries_by_sites/routes.py | 4 +++- .../energy_production_timeseries_by_sites/schemas.py | 2 +- src/bemserver_api/resources/event_categories/routes.py | 4 +++- .../resources/event_categories/schemas.py | 1 + .../resources/event_categories_by_users/routes.py | 4 +++- .../resources/event_categories_by_users/schemas.py | 2 +- src/bemserver_api/resources/events/routes.py | 4 +++- src/bemserver_api/resources/events/schemas.py | 2 +- .../resources/events_by_buildings/routes.py | 6 ++++-- .../resources/events_by_buildings/schemas.py | 2 +- src/bemserver_api/resources/events_by_sites/routes.py | 6 ++++-- src/bemserver_api/resources/events_by_sites/schemas.py | 2 +- src/bemserver_api/resources/events_by_spaces/routes.py | 6 ++++-- .../resources/events_by_spaces/schemas.py | 2 +- .../resources/events_by_storeys/routes.py | 6 ++++-- .../resources/events_by_storeys/schemas.py | 2 +- src/bemserver_api/resources/events_by_zones/routes.py | 6 ++++-- src/bemserver_api/resources/events_by_zones/schemas.py | 2 +- src/bemserver_api/resources/input_output/routes.py | 3 ++- src/bemserver_api/resources/input_output/schemas.py | 1 - src/bemserver_api/resources/notifications/routes.py | 4 +++- src/bemserver_api/resources/notifications/schemas.py | 2 +- src/bemserver_api/resources/site_properties/routes.py | 4 +++- src/bemserver_api/resources/site_properties/schemas.py | 2 +- .../resources/site_property_data/routes.py | 6 ++++-- .../resources/site_property_data/schemas.py | 2 +- src/bemserver_api/resources/sites/routes.py | 6 ++++-- src/bemserver_api/resources/sites/schemas.py | 2 +- src/bemserver_api/resources/space_properties/routes.py | 4 +++- .../resources/space_properties/schemas.py | 2 +- .../resources/space_property_data/routes.py | 6 ++++-- .../resources/space_property_data/schemas.py | 2 +- src/bemserver_api/resources/spaces/routes.py | 4 +++- src/bemserver_api/resources/spaces/schemas.py | 2 +- .../resources/st_check_missings_by_campaigns/routes.py | 4 +++- .../st_check_missings_by_campaigns/schemas.py | 2 +- .../resources/st_check_outliers_by_campaigns/routes.py | 4 +++- .../st_check_outliers_by_campaigns/schemas.py | 2 +- .../resources/st_cleanups_by_campaigns/routes.py | 4 +++- .../resources/st_cleanups_by_campaigns/schemas.py | 2 +- .../resources/st_cleanups_by_timeseries/routes.py | 4 +++- .../resources/st_cleanups_by_timeseries/schemas.py | 2 +- .../st_download_weather_data_by_sites/routes.py | 4 +++- .../st_download_weather_data_by_sites/schemas.py | 2 +- .../routes.py | 4 +++- .../schemas.py | 2 +- .../resources/storey_properties/routes.py | 4 +++- .../resources/storey_properties/schemas.py | 2 +- .../resources/storey_property_data/routes.py | 6 ++++-- .../resources/storey_property_data/schemas.py | 2 +- src/bemserver_api/resources/storeys/routes.py | 4 +++- src/bemserver_api/resources/storeys/schemas.py | 2 +- .../resources/structural_element_properties/routes.py | 4 +++- .../resources/structural_element_properties/schemas.py | 2 +- src/bemserver_api/resources/timeseries/routes.py | 4 +++- src/bemserver_api/resources/timeseries/schemas.py | 2 +- .../resources/timeseries_by_buildings/routes.py | 4 +++- .../resources/timeseries_by_buildings/schemas.py | 2 +- .../resources/timeseries_by_events/routes.py | 6 ++++-- .../resources/timeseries_by_events/schemas.py | 2 +- .../resources/timeseries_by_sites/routes.py | 4 +++- .../resources/timeseries_by_sites/schemas.py | 2 +- .../resources/timeseries_by_spaces/routes.py | 4 +++- .../resources/timeseries_by_spaces/schemas.py | 2 +- .../resources/timeseries_by_storeys/routes.py | 4 +++- .../resources/timeseries_by_storeys/schemas.py | 2 +- .../resources/timeseries_by_zones/routes.py | 4 +++- .../resources/timeseries_by_zones/schemas.py | 2 +- src/bemserver_api/resources/timeseries_data/routes.py | 4 +++- .../resources/timeseries_data_states/routes.py | 4 +++- .../resources/timeseries_data_states/schemas.py | 2 +- .../resources/timeseries_properties/routes.py | 4 +++- .../resources/timeseries_properties/schemas.py | 2 +- .../resources/timeseries_property_data/routes.py | 6 ++++-- .../resources/timeseries_property_data/schemas.py | 2 +- src/bemserver_api/resources/user_groups/routes.py | 4 +++- src/bemserver_api/resources/user_groups/schemas.py | 2 +- .../resources/user_groups_by_campaign_scopes/routes.py | 4 +++- .../user_groups_by_campaign_scopes/schemas.py | 2 +- .../resources/user_groups_by_campaigns/routes.py | 4 +++- .../resources/user_groups_by_campaigns/schemas.py | 2 +- src/bemserver_api/resources/users/routes.py | 4 +++- src/bemserver_api/resources/users/schemas.py | 2 +- .../resources/users_by_user_groups/routes.py | 4 +++- .../resources/users_by_user_groups/schemas.py | 2 +- .../resources/weather_timeseries_by_sites/routes.py | 4 +++- .../resources/weather_timeseries_by_sites/schemas.py | 2 +- src/bemserver_api/resources/zone_properties/routes.py | 4 +++- src/bemserver_api/resources/zone_properties/schemas.py | 2 +- .../resources/zone_property_data/routes.py | 6 ++++-- .../resources/zone_property_data/schemas.py | 2 +- src/bemserver_api/resources/zones/routes.py | 4 +++- src/bemserver_api/resources/zones/schemas.py | 2 +- tests/conftest.py | 5 +++-- tests/extensions/test_authentication.py | 6 ++++-- tests/extensions/test_integrity_error.py | 1 + tests/resources/analysis/test_energy_consumption.py | 5 +++-- tests/resources/test_sites.py | 6 ++++-- tests/resources/test_timeseries_data.py | 6 ++++-- 127 files changed, 275 insertions(+), 147 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index a17fcd4e..69e634f7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -72,15 +72,15 @@ select = [ ] [tool.ruff.lint.isort] -section-order = ["future", "standard-library", "testing", "db", "marshmallow", "science", "third-party", "core", "first-party", "local-folder"] +section-order = ["future", "standard-library", "testing", "db", "pallets", "marshmallow", "science", "third-party", "core", "first-party", "local-folder"] [tool.ruff.lint.isort.sections] -testing = ["pytest", "pytest-postgresql"] +testing = ["pytest", "pytest_postgresql"] db = ["psycopg", "sqlalchemy", "alembic"] -pallets = ["werkzeug", "flask", "flask-httpauth"] -marshmallow = ["marshmallow", "marshmallow-sqlalchemy", "webargs", "apispec", "flask-smorest"] +pallets = ["werkzeug", "flask", "flask_httpauth"] +marshmallow = ["marshmallow", "marshmallow_sqlalchemy", "webargs", "apispec", "flask_smorest"] science = ["numpy", "pandas"] -core = ["bemserver-core"] +core = ["bemserver_core"] [tool.pytest.ini_options] norecursedirs = ".git .tox docs env venv" diff --git a/src/bemserver_api/__init__.py b/src/bemserver_api/__init__.py index a3f2620f..a3a904b5 100644 --- a/src/bemserver_api/__init__.py +++ b/src/bemserver_api/__init__.py @@ -3,9 +3,10 @@ import importlib import flask -from bemserver_core import BEMServerCore from werkzeug.middleware.profiler import ProfilerMiddleware +from bemserver_core import BEMServerCore + from . import database from .extensions import ( # noqa Api, diff --git a/src/bemserver_api/extensions/authentication.py b/src/bemserver_api/extensions/authentication.py index 1a1e2ecc..bd59eea6 100644 --- a/src/bemserver_api/extensions/authentication.py +++ b/src/bemserver_api/extensions/authentication.py @@ -4,11 +4,13 @@ import sqlalchemy as sqla -from bemserver_core.authorization import BEMServerAuthorizationError, CurrentUser -from bemserver_core.model.users import User from flask_httpauth import HTTPBasicAuth + from flask_smorest import abort +from bemserver_core.authorization import BEMServerAuthorizationError, CurrentUser +from bemserver_core.model.users import User + from bemserver_api.database import db diff --git a/src/bemserver_api/extensions/smorest.py b/src/bemserver_api/extensions/smorest.py index 6861397b..d21e5638 100644 --- a/src/bemserver_api/extensions/smorest.py +++ b/src/bemserver_api/extensions/smorest.py @@ -4,13 +4,12 @@ from copy import deepcopy from functools import wraps +import flask_smorest import marshmallow as ma +import marshmallow_sqlalchemy as msa from apispec.ext.marshmallow import MarshmallowPlugin from apispec.ext.marshmallow.common import resolve_schema_cls -import flask_smorest -import marshmallow_sqlalchemy as msa - from . import integrity_error from .authentication import auth from .ma_fields import Timezone diff --git a/src/bemserver_api/resources/analysis/completeness/routes.py b/src/bemserver_api/resources/analysis/completeness/routes.py index 309b41b7..7c2a69cb 100644 --- a/src/bemserver_api/resources/analysis/completeness/routes.py +++ b/src/bemserver_api/resources/analysis/completeness/routes.py @@ -1,9 +1,10 @@ """Completeness resources""" +from flask_smorest import abort + from bemserver_core.exceptions import TimeseriesNotFoundError from bemserver_core.model import Timeseries, TimeseriesDataState from bemserver_core.process.completeness import compute_completeness -from flask_smorest import abort from bemserver_api import Blueprint diff --git a/src/bemserver_api/resources/analysis/energy_consumption/routes.py b/src/bemserver_api/resources/analysis/energy_consumption/routes.py index 5b27f2c9..9fef9e5b 100644 --- a/src/bemserver_api/resources/analysis/energy_consumption/routes.py +++ b/src/bemserver_api/resources/analysis/energy_consumption/routes.py @@ -1,12 +1,13 @@ """Energy consumption resources""" +from flask_smorest import abort + from bemserver_core.exceptions import BEMServerCoreDimensionalityError from bemserver_core.model import Building, Site from bemserver_core.process.energy_consumption import ( compute_energy_consumption_breakdown_for_building, compute_energy_consumption_breakdown_for_site, ) -from flask_smorest import abort from bemserver_api import Blueprint diff --git a/src/bemserver_api/resources/building_properties/routes.py b/src/bemserver_api/resources/building_properties/routes.py index 343cf4c1..69067029 100644 --- a/src/bemserver_api/resources/building_properties/routes.py +++ b/src/bemserver_api/resources/building_properties/routes.py @@ -1,9 +1,11 @@ """Building properties resources""" -from bemserver_core.model import BuildingProperty from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.model import BuildingProperty + from bemserver_api import Blueprint from bemserver_api.database import db diff --git a/src/bemserver_api/resources/building_properties/schemas.py b/src/bemserver_api/resources/building_properties/schemas.py index d980c690..d8dcb378 100644 --- a/src/bemserver_api/resources/building_properties/schemas.py +++ b/src/bemserver_api/resources/building_properties/schemas.py @@ -1,8 +1,8 @@ """Building properties API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import BuildingProperty from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/building_property_data/routes.py b/src/bemserver_api/resources/building_property_data/routes.py index 01d84aea..5914b92f 100644 --- a/src/bemserver_api/resources/building_property_data/routes.py +++ b/src/bemserver_api/resources/building_property_data/routes.py @@ -1,10 +1,12 @@ """Building property data resources""" -from bemserver_core.exceptions import PropertyTypeInvalidError -from bemserver_core.model import BuildingPropertyData from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.exceptions import PropertyTypeInvalidError +from bemserver_core.model import BuildingPropertyData + from bemserver_api import Blueprint from bemserver_api.database import db diff --git a/src/bemserver_api/resources/building_property_data/schemas.py b/src/bemserver_api/resources/building_property_data/schemas.py index f35a1062..15b22dea 100644 --- a/src/bemserver_api/resources/building_property_data/schemas.py +++ b/src/bemserver_api/resources/building_property_data/schemas.py @@ -1,8 +1,8 @@ """Building property data API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import BuildingPropertyData from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/buildings/routes.py b/src/bemserver_api/resources/buildings/routes.py index 35650de6..09ec6f75 100644 --- a/src/bemserver_api/resources/buildings/routes.py +++ b/src/bemserver_api/resources/buildings/routes.py @@ -1,9 +1,11 @@ """Building resources""" -from bemserver_core.model import Building from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.model import Building + from bemserver_api import Blueprint from bemserver_api.database import db diff --git a/src/bemserver_api/resources/buildings/schemas.py b/src/bemserver_api/resources/buildings/schemas.py index 9d713804..b5a85a19 100644 --- a/src/bemserver_api/resources/buildings/schemas.py +++ b/src/bemserver_api/resources/buildings/schemas.py @@ -1,8 +1,8 @@ """Buildings API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import Building from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/campaign_scopes/routes.py b/src/bemserver_api/resources/campaign_scopes/routes.py index 408375e8..6935eda5 100644 --- a/src/bemserver_api/resources/campaign_scopes/routes.py +++ b/src/bemserver_api/resources/campaign_scopes/routes.py @@ -1,9 +1,11 @@ """Campaign scopes resources""" -from bemserver_core.model import CampaignScope from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.model import CampaignScope + from bemserver_api import Blueprint from bemserver_api.database import db diff --git a/src/bemserver_api/resources/campaign_scopes/schemas.py b/src/bemserver_api/resources/campaign_scopes/schemas.py index 07575713..6990cd48 100644 --- a/src/bemserver_api/resources/campaign_scopes/schemas.py +++ b/src/bemserver_api/resources/campaign_scopes/schemas.py @@ -1,8 +1,8 @@ """Campaign scopes API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import CampaignScope from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/campaigns/routes.py b/src/bemserver_api/resources/campaigns/routes.py index 1d6f6b98..a43b8aaa 100644 --- a/src/bemserver_api/resources/campaigns/routes.py +++ b/src/bemserver_api/resources/campaigns/routes.py @@ -1,9 +1,11 @@ """Campaign resources""" -from bemserver_core.model import Campaign from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.model import Campaign + from bemserver_api import Blueprint from bemserver_api.database import db diff --git a/src/bemserver_api/resources/campaigns/schemas.py b/src/bemserver_api/resources/campaigns/schemas.py index f2bf1c50..4dc0e4b4 100644 --- a/src/bemserver_api/resources/campaigns/schemas.py +++ b/src/bemserver_api/resources/campaigns/schemas.py @@ -1,8 +1,8 @@ """Campaigns API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import Campaign from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/energies/routes.py b/src/bemserver_api/resources/energies/routes.py index 7b407e11..73f58945 100644 --- a/src/bemserver_api/resources/energies/routes.py +++ b/src/bemserver_api/resources/energies/routes.py @@ -1,8 +1,9 @@ """Energies resources""" -from bemserver_core.model import Energy from flask.views import MethodView +from bemserver_core.model import Energy + from bemserver_api import Blueprint from .schemas import EnergySchema diff --git a/src/bemserver_api/resources/energies/schemas.py b/src/bemserver_api/resources/energies/schemas.py index f34742aa..aeef3b0a 100644 --- a/src/bemserver_api/resources/energies/schemas.py +++ b/src/bemserver_api/resources/energies/schemas.py @@ -1,6 +1,7 @@ """Energies API schemas""" import marshmallow_sqlalchemy as msa + from bemserver_core.model import Energy from bemserver_api import AutoSchema diff --git a/src/bemserver_api/resources/energy_consumption_timeseries_by_buildings/routes.py b/src/bemserver_api/resources/energy_consumption_timeseries_by_buildings/routes.py index d1abda48..baffe6de 100644 --- a/src/bemserver_api/resources/energy_consumption_timeseries_by_buildings/routes.py +++ b/src/bemserver_api/resources/energy_consumption_timeseries_by_buildings/routes.py @@ -1,9 +1,11 @@ """Energy consumption timeseries by buildings resources""" -from bemserver_core.model import EnergyConsumptionTimeseriesByBuilding from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.model import EnergyConsumptionTimeseriesByBuilding + from bemserver_api import Blueprint from bemserver_api.database import db diff --git a/src/bemserver_api/resources/energy_consumption_timeseries_by_buildings/schemas.py b/src/bemserver_api/resources/energy_consumption_timeseries_by_buildings/schemas.py index 9f33b843..550c4b89 100644 --- a/src/bemserver_api/resources/energy_consumption_timeseries_by_buildings/schemas.py +++ b/src/bemserver_api/resources/energy_consumption_timeseries_by_buildings/schemas.py @@ -1,8 +1,8 @@ """Energy consumption timeseries by buildings API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import EnergyConsumptionTimeseriesByBuilding from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/energy_consumption_timeseries_by_sites/routes.py b/src/bemserver_api/resources/energy_consumption_timeseries_by_sites/routes.py index 11322237..69a651ee 100644 --- a/src/bemserver_api/resources/energy_consumption_timeseries_by_sites/routes.py +++ b/src/bemserver_api/resources/energy_consumption_timeseries_by_sites/routes.py @@ -1,9 +1,11 @@ """Energy consumption timeseries by sites resources""" -from bemserver_core.model import EnergyConsumptionTimeseriesBySite from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.model import EnergyConsumptionTimeseriesBySite + from bemserver_api import Blueprint from bemserver_api.database import db diff --git a/src/bemserver_api/resources/energy_consumption_timeseries_by_sites/schemas.py b/src/bemserver_api/resources/energy_consumption_timeseries_by_sites/schemas.py index 871fd82f..f0820bbb 100644 --- a/src/bemserver_api/resources/energy_consumption_timeseries_by_sites/schemas.py +++ b/src/bemserver_api/resources/energy_consumption_timeseries_by_sites/schemas.py @@ -1,8 +1,8 @@ """Energy consumption timeseries by sites API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import EnergyConsumptionTimeseriesBySite from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/energy_end_uses/routes.py b/src/bemserver_api/resources/energy_end_uses/routes.py index 09253633..5005d038 100644 --- a/src/bemserver_api/resources/energy_end_uses/routes.py +++ b/src/bemserver_api/resources/energy_end_uses/routes.py @@ -1,8 +1,9 @@ """Energy end uses resources""" -from bemserver_core.model import EnergyEndUse from flask.views import MethodView +from bemserver_core.model import EnergyEndUse + from bemserver_api import Blueprint from .schemas import EnergyEndUseSchema diff --git a/src/bemserver_api/resources/energy_end_uses/schemas.py b/src/bemserver_api/resources/energy_end_uses/schemas.py index 7a3f7c37..9c52c8ef 100644 --- a/src/bemserver_api/resources/energy_end_uses/schemas.py +++ b/src/bemserver_api/resources/energy_end_uses/schemas.py @@ -1,6 +1,7 @@ """Energy end uses API schemas""" import marshmallow_sqlalchemy as msa + from bemserver_core.model import EnergyEndUse from bemserver_api import AutoSchema diff --git a/src/bemserver_api/resources/energy_production_technologies/routes.py b/src/bemserver_api/resources/energy_production_technologies/routes.py index cfd0219d..15dd0491 100644 --- a/src/bemserver_api/resources/energy_production_technologies/routes.py +++ b/src/bemserver_api/resources/energy_production_technologies/routes.py @@ -1,8 +1,9 @@ """Energy end uses resources""" -from bemserver_core.model import EnergyProductionTechnology from flask.views import MethodView +from bemserver_core.model import EnergyProductionTechnology + from bemserver_api import Blueprint from .schemas import EnergyProductionTechnologySchema diff --git a/src/bemserver_api/resources/energy_production_technologies/schemas.py b/src/bemserver_api/resources/energy_production_technologies/schemas.py index d66de26e..a45b5b4c 100644 --- a/src/bemserver_api/resources/energy_production_technologies/schemas.py +++ b/src/bemserver_api/resources/energy_production_technologies/schemas.py @@ -1,6 +1,7 @@ """Energy production technologies API schemas""" import marshmallow_sqlalchemy as msa + from bemserver_core.model import EnergyProductionTechnology from bemserver_api import AutoSchema diff --git a/src/bemserver_api/resources/energy_production_timeseries_by_buildings/routes.py b/src/bemserver_api/resources/energy_production_timeseries_by_buildings/routes.py index 1f8ca899..583ebd4f 100644 --- a/src/bemserver_api/resources/energy_production_timeseries_by_buildings/routes.py +++ b/src/bemserver_api/resources/energy_production_timeseries_by_buildings/routes.py @@ -1,9 +1,11 @@ """Energy production timeseries by buildings resources""" -from bemserver_core.model import EnergyProductionTimeseriesByBuilding from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.model import EnergyProductionTimeseriesByBuilding + from bemserver_api import Blueprint from bemserver_api.database import db diff --git a/src/bemserver_api/resources/energy_production_timeseries_by_buildings/schemas.py b/src/bemserver_api/resources/energy_production_timeseries_by_buildings/schemas.py index 0e742492..864659ee 100644 --- a/src/bemserver_api/resources/energy_production_timeseries_by_buildings/schemas.py +++ b/src/bemserver_api/resources/energy_production_timeseries_by_buildings/schemas.py @@ -1,8 +1,8 @@ """Energy production timeseries by buildings API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import EnergyProductionTimeseriesByBuilding from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/energy_production_timeseries_by_sites/routes.py b/src/bemserver_api/resources/energy_production_timeseries_by_sites/routes.py index 71a2bcb9..4086b16d 100644 --- a/src/bemserver_api/resources/energy_production_timeseries_by_sites/routes.py +++ b/src/bemserver_api/resources/energy_production_timeseries_by_sites/routes.py @@ -1,9 +1,11 @@ """Energy production timeseries by sites resources""" -from bemserver_core.model import EnergyProductionTimeseriesBySite from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.model import EnergyProductionTimeseriesBySite + from bemserver_api import Blueprint from bemserver_api.database import db diff --git a/src/bemserver_api/resources/energy_production_timeseries_by_sites/schemas.py b/src/bemserver_api/resources/energy_production_timeseries_by_sites/schemas.py index 8c805e27..356b9c09 100644 --- a/src/bemserver_api/resources/energy_production_timeseries_by_sites/schemas.py +++ b/src/bemserver_api/resources/energy_production_timeseries_by_sites/schemas.py @@ -1,8 +1,8 @@ """Energy production timeseries by sites API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import EnergyProductionTimeseriesBySite from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/event_categories/routes.py b/src/bemserver_api/resources/event_categories/routes.py index f1f06948..ec1d9313 100644 --- a/src/bemserver_api/resources/event_categories/routes.py +++ b/src/bemserver_api/resources/event_categories/routes.py @@ -1,9 +1,11 @@ """Event categories resources""" -from bemserver_core.model import EventCategory from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.model import EventCategory + from bemserver_api import Blueprint from bemserver_api.database import db diff --git a/src/bemserver_api/resources/event_categories/schemas.py b/src/bemserver_api/resources/event_categories/schemas.py index 1d4426a4..fa65c46c 100644 --- a/src/bemserver_api/resources/event_categories/schemas.py +++ b/src/bemserver_api/resources/event_categories/schemas.py @@ -1,6 +1,7 @@ """Event categories API schemas""" import marshmallow_sqlalchemy as msa + from bemserver_core.model import EventCategory from bemserver_api import AutoSchema diff --git a/src/bemserver_api/resources/event_categories_by_users/routes.py b/src/bemserver_api/resources/event_categories_by_users/routes.py index c1369c2b..07188cdb 100644 --- a/src/bemserver_api/resources/event_categories_by_users/routes.py +++ b/src/bemserver_api/resources/event_categories_by_users/routes.py @@ -1,9 +1,11 @@ """Even categories by users resources""" -from bemserver_core.model import EventCategoryByUser from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.model import EventCategoryByUser + from bemserver_api import Blueprint from bemserver_api.database import db diff --git a/src/bemserver_api/resources/event_categories_by_users/schemas.py b/src/bemserver_api/resources/event_categories_by_users/schemas.py index 74b61c9e..4cc4d99c 100644 --- a/src/bemserver_api/resources/event_categories_by_users/schemas.py +++ b/src/bemserver_api/resources/event_categories_by_users/schemas.py @@ -1,8 +1,8 @@ """Even categories by users API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import EventCategoryByUser, EventLevelEnum from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/events/routes.py b/src/bemserver_api/resources/events/routes.py index a60d2c60..45fd4454 100644 --- a/src/bemserver_api/resources/events/routes.py +++ b/src/bemserver_api/resources/events/routes.py @@ -1,9 +1,11 @@ """Events resources""" -from bemserver_core.model import Event from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.model import Event + from bemserver_api import Blueprint, SQLCursorPage from bemserver_api.database import db diff --git a/src/bemserver_api/resources/events/schemas.py b/src/bemserver_api/resources/events/schemas.py index ce104b9d..dce971c0 100644 --- a/src/bemserver_api/resources/events/schemas.py +++ b/src/bemserver_api/resources/events/schemas.py @@ -1,8 +1,8 @@ """Events API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import Event, EventLevelEnum from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/events_by_buildings/routes.py b/src/bemserver_api/resources/events_by_buildings/routes.py index e7dba2e4..c9975789 100644 --- a/src/bemserver_api/resources/events_by_buildings/routes.py +++ b/src/bemserver_api/resources/events_by_buildings/routes.py @@ -1,10 +1,12 @@ """Events by buildings resources""" -from bemserver_core.exceptions import BEMServerCoreCampaignError -from bemserver_core.model import EventByBuilding from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.exceptions import BEMServerCoreCampaignError +from bemserver_core.model import EventByBuilding + from bemserver_api import Blueprint, SQLCursorPage from bemserver_api.database import db diff --git a/src/bemserver_api/resources/events_by_buildings/schemas.py b/src/bemserver_api/resources/events_by_buildings/schemas.py index cefb640a..7e0372a2 100644 --- a/src/bemserver_api/resources/events_by_buildings/schemas.py +++ b/src/bemserver_api/resources/events_by_buildings/schemas.py @@ -1,8 +1,8 @@ """Events by buildings API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import EventByBuilding from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/events_by_sites/routes.py b/src/bemserver_api/resources/events_by_sites/routes.py index c376c189..b323582c 100644 --- a/src/bemserver_api/resources/events_by_sites/routes.py +++ b/src/bemserver_api/resources/events_by_sites/routes.py @@ -1,10 +1,12 @@ """Events by sites resources""" -from bemserver_core.exceptions import BEMServerCoreCampaignError -from bemserver_core.model import EventBySite from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.exceptions import BEMServerCoreCampaignError +from bemserver_core.model import EventBySite + from bemserver_api import Blueprint, SQLCursorPage from bemserver_api.database import db diff --git a/src/bemserver_api/resources/events_by_sites/schemas.py b/src/bemserver_api/resources/events_by_sites/schemas.py index 5e88025a..986cc157 100644 --- a/src/bemserver_api/resources/events_by_sites/schemas.py +++ b/src/bemserver_api/resources/events_by_sites/schemas.py @@ -1,8 +1,8 @@ """Events by sites API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import EventBySite from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/events_by_spaces/routes.py b/src/bemserver_api/resources/events_by_spaces/routes.py index 9a00158e..b1e5e11d 100644 --- a/src/bemserver_api/resources/events_by_spaces/routes.py +++ b/src/bemserver_api/resources/events_by_spaces/routes.py @@ -1,10 +1,12 @@ """Events by spaces resources""" -from bemserver_core.exceptions import BEMServerCoreCampaignError -from bemserver_core.model import EventBySpace from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.exceptions import BEMServerCoreCampaignError +from bemserver_core.model import EventBySpace + from bemserver_api import Blueprint, SQLCursorPage from bemserver_api.database import db diff --git a/src/bemserver_api/resources/events_by_spaces/schemas.py b/src/bemserver_api/resources/events_by_spaces/schemas.py index 31924bca..0f2f91d3 100644 --- a/src/bemserver_api/resources/events_by_spaces/schemas.py +++ b/src/bemserver_api/resources/events_by_spaces/schemas.py @@ -1,8 +1,8 @@ """Events by spaces API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import EventBySpace from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/events_by_storeys/routes.py b/src/bemserver_api/resources/events_by_storeys/routes.py index c31d5165..ae3968a2 100644 --- a/src/bemserver_api/resources/events_by_storeys/routes.py +++ b/src/bemserver_api/resources/events_by_storeys/routes.py @@ -1,10 +1,12 @@ """Events by storeys resources""" -from bemserver_core.exceptions import BEMServerCoreCampaignError -from bemserver_core.model import EventByStorey from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.exceptions import BEMServerCoreCampaignError +from bemserver_core.model import EventByStorey + from bemserver_api import Blueprint, SQLCursorPage from bemserver_api.database import db diff --git a/src/bemserver_api/resources/events_by_storeys/schemas.py b/src/bemserver_api/resources/events_by_storeys/schemas.py index 9a6eb51e..baf0533f 100644 --- a/src/bemserver_api/resources/events_by_storeys/schemas.py +++ b/src/bemserver_api/resources/events_by_storeys/schemas.py @@ -1,8 +1,8 @@ """Events by storeys API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import EventByStorey from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/events_by_zones/routes.py b/src/bemserver_api/resources/events_by_zones/routes.py index 5d9cd57d..e3f0c7fb 100644 --- a/src/bemserver_api/resources/events_by_zones/routes.py +++ b/src/bemserver_api/resources/events_by_zones/routes.py @@ -1,10 +1,12 @@ """Events by zones resources""" -from bemserver_core.exceptions import BEMServerCoreCampaignError -from bemserver_core.model import EventByZone from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.exceptions import BEMServerCoreCampaignError +from bemserver_core.model import EventByZone + from bemserver_api import Blueprint, SQLCursorPage from bemserver_api.database import db diff --git a/src/bemserver_api/resources/events_by_zones/schemas.py b/src/bemserver_api/resources/events_by_zones/schemas.py index c522e9c0..44fc2166 100644 --- a/src/bemserver_api/resources/events_by_zones/schemas.py +++ b/src/bemserver_api/resources/events_by_zones/schemas.py @@ -1,8 +1,8 @@ """Events by zones API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import EventByZone from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/input_output/routes.py b/src/bemserver_api/resources/input_output/routes.py index 6afcb93f..a0cee392 100644 --- a/src/bemserver_api/resources/input_output/routes.py +++ b/src/bemserver_api/resources/input_output/routes.py @@ -2,11 +2,12 @@ import io +from flask_smorest import abort + from bemserver_core.database import db from bemserver_core.exceptions import BEMServerCoreIOError from bemserver_core.input_output import sites_csv_io, timeseries_csv_io from bemserver_core.model import Campaign -from flask_smorest import abort from bemserver_api import Blueprint diff --git a/src/bemserver_api/resources/input_output/schemas.py b/src/bemserver_api/resources/input_output/schemas.py index 39179ca5..bfb7372c 100644 --- a/src/bemserver_api/resources/input_output/schemas.py +++ b/src/bemserver_api/resources/input_output/schemas.py @@ -1,7 +1,6 @@ """Input/Output API schemas""" import marshmallow as ma - from flask_smorest.fields import Upload from bemserver_api import Schema diff --git a/src/bemserver_api/resources/notifications/routes.py b/src/bemserver_api/resources/notifications/routes.py index efe1f9e3..d83322b6 100644 --- a/src/bemserver_api/resources/notifications/routes.py +++ b/src/bemserver_api/resources/notifications/routes.py @@ -1,9 +1,11 @@ """Notifications resources""" -from bemserver_core.model import Notification from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.model import Notification + from bemserver_api import Blueprint, SQLCursorPage from bemserver_api.database import db diff --git a/src/bemserver_api/resources/notifications/schemas.py b/src/bemserver_api/resources/notifications/schemas.py index 3854644f..fc603321 100644 --- a/src/bemserver_api/resources/notifications/schemas.py +++ b/src/bemserver_api/resources/notifications/schemas.py @@ -1,8 +1,8 @@ """Event categories API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import Notification from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/site_properties/routes.py b/src/bemserver_api/resources/site_properties/routes.py index dc818f3c..1feeaea6 100644 --- a/src/bemserver_api/resources/site_properties/routes.py +++ b/src/bemserver_api/resources/site_properties/routes.py @@ -1,9 +1,11 @@ """Site properties resources""" -from bemserver_core.model import SiteProperty from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.model import SiteProperty + from bemserver_api import Blueprint from bemserver_api.database import db diff --git a/src/bemserver_api/resources/site_properties/schemas.py b/src/bemserver_api/resources/site_properties/schemas.py index c683921d..ee916e0f 100644 --- a/src/bemserver_api/resources/site_properties/schemas.py +++ b/src/bemserver_api/resources/site_properties/schemas.py @@ -1,8 +1,8 @@ """Site properties API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import SiteProperty from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/site_property_data/routes.py b/src/bemserver_api/resources/site_property_data/routes.py index 56fcf3f7..b27cf513 100644 --- a/src/bemserver_api/resources/site_property_data/routes.py +++ b/src/bemserver_api/resources/site_property_data/routes.py @@ -1,10 +1,12 @@ """Site property data resources""" -from bemserver_core.exceptions import PropertyTypeInvalidError -from bemserver_core.model import SitePropertyData from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.exceptions import PropertyTypeInvalidError +from bemserver_core.model import SitePropertyData + from bemserver_api import Blueprint from bemserver_api.database import db diff --git a/src/bemserver_api/resources/site_property_data/schemas.py b/src/bemserver_api/resources/site_property_data/schemas.py index 43a23674..7ee70523 100644 --- a/src/bemserver_api/resources/site_property_data/schemas.py +++ b/src/bemserver_api/resources/site_property_data/schemas.py @@ -1,8 +1,8 @@ """Site property data API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import SitePropertyData from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/sites/routes.py b/src/bemserver_api/resources/sites/routes.py index 2828ac63..5677a7af 100644 --- a/src/bemserver_api/resources/sites/routes.py +++ b/src/bemserver_api/resources/sites/routes.py @@ -3,6 +3,10 @@ import http from textwrap import dedent +from flask.views import MethodView + +from flask_smorest import abort + from bemserver_core.exceptions import ( BEMServerCoreDegreeDayProcessMissingTemperatureError, BEMServerCoreDimensionalityError, @@ -13,8 +17,6 @@ from bemserver_core.model import Site from bemserver_core.process.degree_days import compute_dd_for_site from bemserver_core.process.weather import wdp -from flask.views import MethodView -from flask_smorest import abort from bemserver_api import Blueprint from bemserver_api.database import db diff --git a/src/bemserver_api/resources/sites/schemas.py b/src/bemserver_api/resources/sites/schemas.py index ff675029..81f52909 100644 --- a/src/bemserver_api/resources/sites/schemas.py +++ b/src/bemserver_api/resources/sites/schemas.py @@ -1,8 +1,8 @@ """Sites API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import Site from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/space_properties/routes.py b/src/bemserver_api/resources/space_properties/routes.py index d0019ee5..4d9568f5 100644 --- a/src/bemserver_api/resources/space_properties/routes.py +++ b/src/bemserver_api/resources/space_properties/routes.py @@ -1,9 +1,11 @@ """Space properties resources""" -from bemserver_core.model import SpaceProperty from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.model import SpaceProperty + from bemserver_api import Blueprint from bemserver_api.database import db diff --git a/src/bemserver_api/resources/space_properties/schemas.py b/src/bemserver_api/resources/space_properties/schemas.py index f08cbf8b..b898a965 100644 --- a/src/bemserver_api/resources/space_properties/schemas.py +++ b/src/bemserver_api/resources/space_properties/schemas.py @@ -1,8 +1,8 @@ """Space properties API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import SpaceProperty from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/space_property_data/routes.py b/src/bemserver_api/resources/space_property_data/routes.py index 89863b14..dc42adc4 100644 --- a/src/bemserver_api/resources/space_property_data/routes.py +++ b/src/bemserver_api/resources/space_property_data/routes.py @@ -1,10 +1,12 @@ """Space property data resources""" -from bemserver_core.exceptions import PropertyTypeInvalidError -from bemserver_core.model import SpacePropertyData from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.exceptions import PropertyTypeInvalidError +from bemserver_core.model import SpacePropertyData + from bemserver_api import Blueprint from bemserver_api.database import db diff --git a/src/bemserver_api/resources/space_property_data/schemas.py b/src/bemserver_api/resources/space_property_data/schemas.py index cc8468dc..ff49b31d 100644 --- a/src/bemserver_api/resources/space_property_data/schemas.py +++ b/src/bemserver_api/resources/space_property_data/schemas.py @@ -1,8 +1,8 @@ """Space property data API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import SpacePropertyData from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/spaces/routes.py b/src/bemserver_api/resources/spaces/routes.py index 2c5d413a..e4695260 100644 --- a/src/bemserver_api/resources/spaces/routes.py +++ b/src/bemserver_api/resources/spaces/routes.py @@ -1,9 +1,11 @@ """Space resources""" -from bemserver_core.model import Space from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.model import Space + from bemserver_api import Blueprint from bemserver_api.database import db diff --git a/src/bemserver_api/resources/spaces/schemas.py b/src/bemserver_api/resources/spaces/schemas.py index 5bd7ee32..53187a11 100644 --- a/src/bemserver_api/resources/spaces/schemas.py +++ b/src/bemserver_api/resources/spaces/schemas.py @@ -1,8 +1,8 @@ """Spaces API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import Space from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/st_check_missings_by_campaigns/routes.py b/src/bemserver_api/resources/st_check_missings_by_campaigns/routes.py index a02520b2..963aa445 100644 --- a/src/bemserver_api/resources/st_check_missings_by_campaigns/routes.py +++ b/src/bemserver_api/resources/st_check_missings_by_campaigns/routes.py @@ -1,9 +1,11 @@ """ST_CheckMissingByCampaign resources""" -from bemserver_core.scheduled_tasks import ST_CheckMissingByCampaign from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.scheduled_tasks import ST_CheckMissingByCampaign + from bemserver_api import Blueprint from bemserver_api.database import db diff --git a/src/bemserver_api/resources/st_check_missings_by_campaigns/schemas.py b/src/bemserver_api/resources/st_check_missings_by_campaigns/schemas.py index 8eb433c9..a4b7a3cb 100644 --- a/src/bemserver_api/resources/st_check_missings_by_campaigns/schemas.py +++ b/src/bemserver_api/resources/st_check_missings_by_campaigns/schemas.py @@ -1,8 +1,8 @@ """ST_CheckMissingByCampaign API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.scheduled_tasks import ST_CheckMissingByCampaign from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/st_check_outliers_by_campaigns/routes.py b/src/bemserver_api/resources/st_check_outliers_by_campaigns/routes.py index 11e79457..b9782339 100644 --- a/src/bemserver_api/resources/st_check_outliers_by_campaigns/routes.py +++ b/src/bemserver_api/resources/st_check_outliers_by_campaigns/routes.py @@ -1,9 +1,11 @@ """ST_CheckOutliersByCampaign resources""" -from bemserver_core.scheduled_tasks import ST_CheckOutliersByCampaign from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.scheduled_tasks import ST_CheckOutliersByCampaign + from bemserver_api import Blueprint from bemserver_api.database import db diff --git a/src/bemserver_api/resources/st_check_outliers_by_campaigns/schemas.py b/src/bemserver_api/resources/st_check_outliers_by_campaigns/schemas.py index c268c9da..be1e3699 100644 --- a/src/bemserver_api/resources/st_check_outliers_by_campaigns/schemas.py +++ b/src/bemserver_api/resources/st_check_outliers_by_campaigns/schemas.py @@ -1,8 +1,8 @@ """ST_CheckOutliersByCampaign API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.scheduled_tasks import ST_CheckOutliersByCampaign from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/st_cleanups_by_campaigns/routes.py b/src/bemserver_api/resources/st_cleanups_by_campaigns/routes.py index cf1b4a0a..fa241a9e 100644 --- a/src/bemserver_api/resources/st_cleanups_by_campaigns/routes.py +++ b/src/bemserver_api/resources/st_cleanups_by_campaigns/routes.py @@ -1,9 +1,11 @@ """ST_CleanupByCampaign resources""" -from bemserver_core.scheduled_tasks import ST_CleanupByCampaign from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.scheduled_tasks import ST_CleanupByCampaign + from bemserver_api import Blueprint from bemserver_api.database import db diff --git a/src/bemserver_api/resources/st_cleanups_by_campaigns/schemas.py b/src/bemserver_api/resources/st_cleanups_by_campaigns/schemas.py index e3aafc5a..985aaf95 100644 --- a/src/bemserver_api/resources/st_cleanups_by_campaigns/schemas.py +++ b/src/bemserver_api/resources/st_cleanups_by_campaigns/schemas.py @@ -1,8 +1,8 @@ """ST_CleanupByCampaign API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.scheduled_tasks import ST_CleanupByCampaign from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/st_cleanups_by_timeseries/routes.py b/src/bemserver_api/resources/st_cleanups_by_timeseries/routes.py index 91594697..f8e3e4cd 100644 --- a/src/bemserver_api/resources/st_cleanups_by_timeseries/routes.py +++ b/src/bemserver_api/resources/st_cleanups_by_timeseries/routes.py @@ -1,9 +1,11 @@ """ST_CleanupByTimeseries resources""" -from bemserver_core.scheduled_tasks import ST_CleanupByTimeseries from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.scheduled_tasks import ST_CleanupByTimeseries + from bemserver_api import Blueprint from .schemas import ( diff --git a/src/bemserver_api/resources/st_cleanups_by_timeseries/schemas.py b/src/bemserver_api/resources/st_cleanups_by_timeseries/schemas.py index d5b55e10..7570f1fd 100644 --- a/src/bemserver_api/resources/st_cleanups_by_timeseries/schemas.py +++ b/src/bemserver_api/resources/st_cleanups_by_timeseries/schemas.py @@ -1,8 +1,8 @@ """ST_CleanupByTimeseries API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.scheduled_tasks import ST_CleanupByTimeseries from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/st_download_weather_data_by_sites/routes.py b/src/bemserver_api/resources/st_download_weather_data_by_sites/routes.py index 59cf40fb..6bb76776 100644 --- a/src/bemserver_api/resources/st_download_weather_data_by_sites/routes.py +++ b/src/bemserver_api/resources/st_download_weather_data_by_sites/routes.py @@ -1,9 +1,11 @@ """ST_DownloadWeatherDataBySite resources""" -from bemserver_core.scheduled_tasks import ST_DownloadWeatherDataBySite from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.scheduled_tasks import ST_DownloadWeatherDataBySite + from bemserver_api import Blueprint from bemserver_api.database import db diff --git a/src/bemserver_api/resources/st_download_weather_data_by_sites/schemas.py b/src/bemserver_api/resources/st_download_weather_data_by_sites/schemas.py index d1cfe3b0..f4ab2b63 100644 --- a/src/bemserver_api/resources/st_download_weather_data_by_sites/schemas.py +++ b/src/bemserver_api/resources/st_download_weather_data_by_sites/schemas.py @@ -1,8 +1,8 @@ """ST_DownloadWeatherDataBySite API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.scheduled_tasks import ST_DownloadWeatherDataBySite from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/st_download_weather_forecast_data_by_sites/routes.py b/src/bemserver_api/resources/st_download_weather_forecast_data_by_sites/routes.py index 6339e53c..12fa4789 100644 --- a/src/bemserver_api/resources/st_download_weather_forecast_data_by_sites/routes.py +++ b/src/bemserver_api/resources/st_download_weather_forecast_data_by_sites/routes.py @@ -1,9 +1,11 @@ """ST_DownloadWeatherForecastDataBySite resources""" -from bemserver_core.scheduled_tasks import ST_DownloadWeatherForecastDataBySite from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.scheduled_tasks import ST_DownloadWeatherForecastDataBySite + from bemserver_api import Blueprint from bemserver_api.database import db diff --git a/src/bemserver_api/resources/st_download_weather_forecast_data_by_sites/schemas.py b/src/bemserver_api/resources/st_download_weather_forecast_data_by_sites/schemas.py index 459f7849..8aa8f810 100644 --- a/src/bemserver_api/resources/st_download_weather_forecast_data_by_sites/schemas.py +++ b/src/bemserver_api/resources/st_download_weather_forecast_data_by_sites/schemas.py @@ -1,8 +1,8 @@ """ST_DownloadWeatherForecastDataBySite API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.scheduled_tasks import ST_DownloadWeatherForecastDataBySite from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/storey_properties/routes.py b/src/bemserver_api/resources/storey_properties/routes.py index d82d8f5e..1bd2fa88 100644 --- a/src/bemserver_api/resources/storey_properties/routes.py +++ b/src/bemserver_api/resources/storey_properties/routes.py @@ -1,9 +1,11 @@ """Storey properties resources""" -from bemserver_core.model import StoreyProperty from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.model import StoreyProperty + from bemserver_api import Blueprint from bemserver_api.database import db diff --git a/src/bemserver_api/resources/storey_properties/schemas.py b/src/bemserver_api/resources/storey_properties/schemas.py index 9a8a50c8..ae66a3d4 100644 --- a/src/bemserver_api/resources/storey_properties/schemas.py +++ b/src/bemserver_api/resources/storey_properties/schemas.py @@ -1,8 +1,8 @@ """Storey properties API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import StoreyProperty from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/storey_property_data/routes.py b/src/bemserver_api/resources/storey_property_data/routes.py index 75187247..06c5a602 100644 --- a/src/bemserver_api/resources/storey_property_data/routes.py +++ b/src/bemserver_api/resources/storey_property_data/routes.py @@ -1,10 +1,12 @@ """Storey property data resources""" -from bemserver_core.exceptions import PropertyTypeInvalidError -from bemserver_core.model import StoreyPropertyData from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.exceptions import PropertyTypeInvalidError +from bemserver_core.model import StoreyPropertyData + from bemserver_api import Blueprint from bemserver_api.database import db diff --git a/src/bemserver_api/resources/storey_property_data/schemas.py b/src/bemserver_api/resources/storey_property_data/schemas.py index ff96e1a6..12a24499 100644 --- a/src/bemserver_api/resources/storey_property_data/schemas.py +++ b/src/bemserver_api/resources/storey_property_data/schemas.py @@ -1,8 +1,8 @@ """Storey property data API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import StoreyPropertyData from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/storeys/routes.py b/src/bemserver_api/resources/storeys/routes.py index 0741608f..b0ae8fc9 100644 --- a/src/bemserver_api/resources/storeys/routes.py +++ b/src/bemserver_api/resources/storeys/routes.py @@ -1,9 +1,11 @@ """Storey resources""" -from bemserver_core.model import Storey from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.model import Storey + from bemserver_api import Blueprint from bemserver_api.database import db diff --git a/src/bemserver_api/resources/storeys/schemas.py b/src/bemserver_api/resources/storeys/schemas.py index 3be25db4..7ec8028a 100644 --- a/src/bemserver_api/resources/storeys/schemas.py +++ b/src/bemserver_api/resources/storeys/schemas.py @@ -1,8 +1,8 @@ """Storeys API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import Storey from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/structural_element_properties/routes.py b/src/bemserver_api/resources/structural_element_properties/routes.py index 6b96ae25..5752044e 100644 --- a/src/bemserver_api/resources/structural_element_properties/routes.py +++ b/src/bemserver_api/resources/structural_element_properties/routes.py @@ -1,9 +1,11 @@ """Structural element properties resources""" -from bemserver_core.model import StructuralElementProperty from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.model import StructuralElementProperty + from bemserver_api import Blueprint from bemserver_api.database import db diff --git a/src/bemserver_api/resources/structural_element_properties/schemas.py b/src/bemserver_api/resources/structural_element_properties/schemas.py index 160af72f..78f15e75 100644 --- a/src/bemserver_api/resources/structural_element_properties/schemas.py +++ b/src/bemserver_api/resources/structural_element_properties/schemas.py @@ -1,8 +1,8 @@ """Structural element properties API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.common import PropertyType from bemserver_core.model import StructuralElementProperty diff --git a/src/bemserver_api/resources/timeseries/routes.py b/src/bemserver_api/resources/timeseries/routes.py index c66ba83f..7d2848a4 100644 --- a/src/bemserver_api/resources/timeseries/routes.py +++ b/src/bemserver_api/resources/timeseries/routes.py @@ -1,9 +1,11 @@ """Timeseries resources""" -from bemserver_core.model import Timeseries from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.model import Timeseries + from bemserver_api import Blueprint, SQLCursorPage from bemserver_api.database import db diff --git a/src/bemserver_api/resources/timeseries/schemas.py b/src/bemserver_api/resources/timeseries/schemas.py index 3e4ec309..4e0cf7ce 100644 --- a/src/bemserver_api/resources/timeseries/schemas.py +++ b/src/bemserver_api/resources/timeseries/schemas.py @@ -1,8 +1,8 @@ """Timeseries API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import Timeseries from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/timeseries_by_buildings/routes.py b/src/bemserver_api/resources/timeseries_by_buildings/routes.py index b4a136ea..3d998da2 100644 --- a/src/bemserver_api/resources/timeseries_by_buildings/routes.py +++ b/src/bemserver_api/resources/timeseries_by_buildings/routes.py @@ -1,9 +1,11 @@ """Timeseries by buildings resources""" -from bemserver_core.model import TimeseriesByBuilding from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.model import TimeseriesByBuilding + from bemserver_api import Blueprint, SQLCursorPage from bemserver_api.database import db diff --git a/src/bemserver_api/resources/timeseries_by_buildings/schemas.py b/src/bemserver_api/resources/timeseries_by_buildings/schemas.py index 7f748c57..3b0a66b7 100644 --- a/src/bemserver_api/resources/timeseries_by_buildings/schemas.py +++ b/src/bemserver_api/resources/timeseries_by_buildings/schemas.py @@ -1,8 +1,8 @@ """Timeseries by buildings API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import TimeseriesByBuilding from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/timeseries_by_events/routes.py b/src/bemserver_api/resources/timeseries_by_events/routes.py index e4b8d490..a7e22fe3 100644 --- a/src/bemserver_api/resources/timeseries_by_events/routes.py +++ b/src/bemserver_api/resources/timeseries_by_events/routes.py @@ -1,10 +1,12 @@ """Timeseries by events resources""" -from bemserver_core.exceptions import BEMServerCoreCampaignScopeError -from bemserver_core.model import TimeseriesByEvent from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.exceptions import BEMServerCoreCampaignScopeError +from bemserver_core.model import TimeseriesByEvent + from bemserver_api import Blueprint, SQLCursorPage from bemserver_api.database import db diff --git a/src/bemserver_api/resources/timeseries_by_events/schemas.py b/src/bemserver_api/resources/timeseries_by_events/schemas.py index 857e6249..8084d754 100644 --- a/src/bemserver_api/resources/timeseries_by_events/schemas.py +++ b/src/bemserver_api/resources/timeseries_by_events/schemas.py @@ -1,8 +1,8 @@ """Timeseries by events API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import TimeseriesByEvent from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/timeseries_by_sites/routes.py b/src/bemserver_api/resources/timeseries_by_sites/routes.py index 5b2e6fa1..0229124c 100644 --- a/src/bemserver_api/resources/timeseries_by_sites/routes.py +++ b/src/bemserver_api/resources/timeseries_by_sites/routes.py @@ -1,9 +1,11 @@ """Timeseries by sites resources""" -from bemserver_core.model import TimeseriesBySite from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.model import TimeseriesBySite + from bemserver_api import Blueprint, SQLCursorPage from bemserver_api.database import db diff --git a/src/bemserver_api/resources/timeseries_by_sites/schemas.py b/src/bemserver_api/resources/timeseries_by_sites/schemas.py index f2070507..1837522f 100644 --- a/src/bemserver_api/resources/timeseries_by_sites/schemas.py +++ b/src/bemserver_api/resources/timeseries_by_sites/schemas.py @@ -1,8 +1,8 @@ """Timeseries by sites API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import TimeseriesBySite from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/timeseries_by_spaces/routes.py b/src/bemserver_api/resources/timeseries_by_spaces/routes.py index 7ef7d91d..1b74ef83 100644 --- a/src/bemserver_api/resources/timeseries_by_spaces/routes.py +++ b/src/bemserver_api/resources/timeseries_by_spaces/routes.py @@ -1,9 +1,11 @@ """Timeseries by spaces resources""" -from bemserver_core.model import TimeseriesBySpace from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.model import TimeseriesBySpace + from bemserver_api import Blueprint, SQLCursorPage from bemserver_api.database import db diff --git a/src/bemserver_api/resources/timeseries_by_spaces/schemas.py b/src/bemserver_api/resources/timeseries_by_spaces/schemas.py index f3b6050d..d7b9698a 100644 --- a/src/bemserver_api/resources/timeseries_by_spaces/schemas.py +++ b/src/bemserver_api/resources/timeseries_by_spaces/schemas.py @@ -1,8 +1,8 @@ """Timeseries by spaces API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import TimeseriesBySpace from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/timeseries_by_storeys/routes.py b/src/bemserver_api/resources/timeseries_by_storeys/routes.py index df8d9908..ec9c93e2 100644 --- a/src/bemserver_api/resources/timeseries_by_storeys/routes.py +++ b/src/bemserver_api/resources/timeseries_by_storeys/routes.py @@ -1,9 +1,11 @@ """Timeseries by storeys resources""" -from bemserver_core.model import TimeseriesByStorey from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.model import TimeseriesByStorey + from bemserver_api import Blueprint, SQLCursorPage from bemserver_api.database import db diff --git a/src/bemserver_api/resources/timeseries_by_storeys/schemas.py b/src/bemserver_api/resources/timeseries_by_storeys/schemas.py index 9a746c6b..ea42e0c2 100644 --- a/src/bemserver_api/resources/timeseries_by_storeys/schemas.py +++ b/src/bemserver_api/resources/timeseries_by_storeys/schemas.py @@ -1,8 +1,8 @@ """Timeseries by storeys API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import TimeseriesByStorey from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/timeseries_by_zones/routes.py b/src/bemserver_api/resources/timeseries_by_zones/routes.py index 0b400bcf..1113956c 100644 --- a/src/bemserver_api/resources/timeseries_by_zones/routes.py +++ b/src/bemserver_api/resources/timeseries_by_zones/routes.py @@ -1,9 +1,11 @@ """Timeseries by zones resources""" -from bemserver_core.model import TimeseriesByZone from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.model import TimeseriesByZone + from bemserver_api import Blueprint, SQLCursorPage from bemserver_api.database import db diff --git a/src/bemserver_api/resources/timeseries_by_zones/schemas.py b/src/bemserver_api/resources/timeseries_by_zones/schemas.py index d10f95e0..b394945c 100644 --- a/src/bemserver_api/resources/timeseries_by_zones/schemas.py +++ b/src/bemserver_api/resources/timeseries_by_zones/schemas.py @@ -1,8 +1,8 @@ """Timeseries by zones API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import TimeseriesByZone from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/timeseries_data/routes.py b/src/bemserver_api/resources/timeseries_data/routes.py index 15a76cf5..2342381a 100644 --- a/src/bemserver_api/resources/timeseries_data/routes.py +++ b/src/bemserver_api/resources/timeseries_data/routes.py @@ -3,6 +3,9 @@ from textwrap import dedent import flask + +from flask_smorest import abort + from bemserver_core.database import db from bemserver_core.exceptions import ( BEMServerCoreDimensionalityError, @@ -11,7 +14,6 @@ ) from bemserver_core.input_output import tsdcsvio, tsdio, tsdjsonio from bemserver_core.model import Campaign, Timeseries, TimeseriesDataState -from flask_smorest import abort from bemserver_api import Blueprint diff --git a/src/bemserver_api/resources/timeseries_data_states/routes.py b/src/bemserver_api/resources/timeseries_data_states/routes.py index df8ff7d9..b146183f 100644 --- a/src/bemserver_api/resources/timeseries_data_states/routes.py +++ b/src/bemserver_api/resources/timeseries_data_states/routes.py @@ -1,9 +1,11 @@ """Timeseries data states resources""" -from bemserver_core.model import TimeseriesDataState from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.model import TimeseriesDataState + from bemserver_api import Blueprint from bemserver_api.database import db diff --git a/src/bemserver_api/resources/timeseries_data_states/schemas.py b/src/bemserver_api/resources/timeseries_data_states/schemas.py index 2cfce842..0b85ad12 100644 --- a/src/bemserver_api/resources/timeseries_data_states/schemas.py +++ b/src/bemserver_api/resources/timeseries_data_states/schemas.py @@ -1,8 +1,8 @@ """Timeseries data states API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import TimeseriesDataState from bemserver_api import AutoSchema diff --git a/src/bemserver_api/resources/timeseries_properties/routes.py b/src/bemserver_api/resources/timeseries_properties/routes.py index 808aa92d..5c1906d7 100644 --- a/src/bemserver_api/resources/timeseries_properties/routes.py +++ b/src/bemserver_api/resources/timeseries_properties/routes.py @@ -1,9 +1,11 @@ """Timeseries properties resources""" -from bemserver_core.model import TimeseriesProperty from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.model import TimeseriesProperty + from bemserver_api import Blueprint from bemserver_api.database import db diff --git a/src/bemserver_api/resources/timeseries_properties/schemas.py b/src/bemserver_api/resources/timeseries_properties/schemas.py index 77004261..f60d0526 100644 --- a/src/bemserver_api/resources/timeseries_properties/schemas.py +++ b/src/bemserver_api/resources/timeseries_properties/schemas.py @@ -1,8 +1,8 @@ """Timeseries properties API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.common import PropertyType from bemserver_core.model import TimeseriesProperty diff --git a/src/bemserver_api/resources/timeseries_property_data/routes.py b/src/bemserver_api/resources/timeseries_property_data/routes.py index ed4ae040..acf175d3 100644 --- a/src/bemserver_api/resources/timeseries_property_data/routes.py +++ b/src/bemserver_api/resources/timeseries_property_data/routes.py @@ -1,10 +1,12 @@ """Timeseries property data resources""" -from bemserver_core.exceptions import PropertyTypeInvalidError -from bemserver_core.model import TimeseriesPropertyData from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.exceptions import PropertyTypeInvalidError +from bemserver_core.model import TimeseriesPropertyData + from bemserver_api import Blueprint from bemserver_api.database import db diff --git a/src/bemserver_api/resources/timeseries_property_data/schemas.py b/src/bemserver_api/resources/timeseries_property_data/schemas.py index 450038a1..4d07c61b 100644 --- a/src/bemserver_api/resources/timeseries_property_data/schemas.py +++ b/src/bemserver_api/resources/timeseries_property_data/schemas.py @@ -1,8 +1,8 @@ """Timeseries property data""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import TimeseriesPropertyData from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/user_groups/routes.py b/src/bemserver_api/resources/user_groups/routes.py index 86b06733..09f70039 100644 --- a/src/bemserver_api/resources/user_groups/routes.py +++ b/src/bemserver_api/resources/user_groups/routes.py @@ -1,9 +1,11 @@ """User groups resources""" -from bemserver_core.model import UserGroup from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.model import UserGroup + from bemserver_api import Blueprint from bemserver_api.database import db diff --git a/src/bemserver_api/resources/user_groups/schemas.py b/src/bemserver_api/resources/user_groups/schemas.py index a4156572..dadd3b89 100644 --- a/src/bemserver_api/resources/user_groups/schemas.py +++ b/src/bemserver_api/resources/user_groups/schemas.py @@ -1,8 +1,8 @@ """User groups API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import UserGroup from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/user_groups_by_campaign_scopes/routes.py b/src/bemserver_api/resources/user_groups_by_campaign_scopes/routes.py index 2b82f869..5c6494d2 100644 --- a/src/bemserver_api/resources/user_groups_by_campaign_scopes/routes.py +++ b/src/bemserver_api/resources/user_groups_by_campaign_scopes/routes.py @@ -1,9 +1,11 @@ """User groups by campaign scopes resources""" -from bemserver_core.model import UserGroupByCampaignScope from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.model import UserGroupByCampaignScope + from bemserver_api import Blueprint from bemserver_api.database import db diff --git a/src/bemserver_api/resources/user_groups_by_campaign_scopes/schemas.py b/src/bemserver_api/resources/user_groups_by_campaign_scopes/schemas.py index 4b6c3e95..5b1a1f5b 100644 --- a/src/bemserver_api/resources/user_groups_by_campaign_scopes/schemas.py +++ b/src/bemserver_api/resources/user_groups_by_campaign_scopes/schemas.py @@ -1,8 +1,8 @@ """User groups by campaign scopes API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import UserGroupByCampaignScope from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/user_groups_by_campaigns/routes.py b/src/bemserver_api/resources/user_groups_by_campaigns/routes.py index 30cb6434..f5c76004 100644 --- a/src/bemserver_api/resources/user_groups_by_campaigns/routes.py +++ b/src/bemserver_api/resources/user_groups_by_campaigns/routes.py @@ -1,9 +1,11 @@ """User groups by campaigns resources""" -from bemserver_core.model import UserGroupByCampaign from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.model import UserGroupByCampaign + from bemserver_api import Blueprint from bemserver_api.database import db diff --git a/src/bemserver_api/resources/user_groups_by_campaigns/schemas.py b/src/bemserver_api/resources/user_groups_by_campaigns/schemas.py index b6baa6f8..349d2951 100644 --- a/src/bemserver_api/resources/user_groups_by_campaigns/schemas.py +++ b/src/bemserver_api/resources/user_groups_by_campaigns/schemas.py @@ -1,8 +1,8 @@ """User groups by campaigns API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import UserGroupByCampaign from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/users/routes.py b/src/bemserver_api/resources/users/routes.py index 86a936d4..0cb2052b 100644 --- a/src/bemserver_api/resources/users/routes.py +++ b/src/bemserver_api/resources/users/routes.py @@ -1,9 +1,11 @@ """Users resources""" -from bemserver_core.model import User from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.model import User + from bemserver_api import Blueprint from bemserver_api.database import db diff --git a/src/bemserver_api/resources/users/schemas.py b/src/bemserver_api/resources/users/schemas.py index 45884daf..906e3dd0 100644 --- a/src/bemserver_api/resources/users/schemas.py +++ b/src/bemserver_api/resources/users/schemas.py @@ -1,8 +1,8 @@ """Users API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import User from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/users_by_user_groups/routes.py b/src/bemserver_api/resources/users_by_user_groups/routes.py index 09dabdb5..ed40d29f 100644 --- a/src/bemserver_api/resources/users_by_user_groups/routes.py +++ b/src/bemserver_api/resources/users_by_user_groups/routes.py @@ -1,9 +1,11 @@ """Users by user groups resources""" -from bemserver_core.model import UserByUserGroup from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.model import UserByUserGroup + from bemserver_api import Blueprint from bemserver_api.database import db diff --git a/src/bemserver_api/resources/users_by_user_groups/schemas.py b/src/bemserver_api/resources/users_by_user_groups/schemas.py index a87e738c..37fd5790 100644 --- a/src/bemserver_api/resources/users_by_user_groups/schemas.py +++ b/src/bemserver_api/resources/users_by_user_groups/schemas.py @@ -1,8 +1,8 @@ """Users by user groups API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import UserByUserGroup from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/weather_timeseries_by_sites/routes.py b/src/bemserver_api/resources/weather_timeseries_by_sites/routes.py index 7130c28c..f1f42259 100644 --- a/src/bemserver_api/resources/weather_timeseries_by_sites/routes.py +++ b/src/bemserver_api/resources/weather_timeseries_by_sites/routes.py @@ -1,9 +1,11 @@ """Weather timeseries by sites resources""" -from bemserver_core.model import WeatherTimeseriesBySite from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.model import WeatherTimeseriesBySite + from bemserver_api import Blueprint from bemserver_api.database import db diff --git a/src/bemserver_api/resources/weather_timeseries_by_sites/schemas.py b/src/bemserver_api/resources/weather_timeseries_by_sites/schemas.py index ecc405c5..c575c7f8 100644 --- a/src/bemserver_api/resources/weather_timeseries_by_sites/schemas.py +++ b/src/bemserver_api/resources/weather_timeseries_by_sites/schemas.py @@ -1,8 +1,8 @@ """Weather timeseries by sites API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import WeatherParameterEnum, WeatherTimeseriesBySite from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/zone_properties/routes.py b/src/bemserver_api/resources/zone_properties/routes.py index 174db8cb..4f9e1cae 100644 --- a/src/bemserver_api/resources/zone_properties/routes.py +++ b/src/bemserver_api/resources/zone_properties/routes.py @@ -1,9 +1,11 @@ """Zone properties resources""" -from bemserver_core.model import ZoneProperty from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.model import ZoneProperty + from bemserver_api import Blueprint from bemserver_api.database import db diff --git a/src/bemserver_api/resources/zone_properties/schemas.py b/src/bemserver_api/resources/zone_properties/schemas.py index b81e16ff..9ce57b2a 100644 --- a/src/bemserver_api/resources/zone_properties/schemas.py +++ b/src/bemserver_api/resources/zone_properties/schemas.py @@ -1,8 +1,8 @@ """Zone properties API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import ZoneProperty from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/zone_property_data/routes.py b/src/bemserver_api/resources/zone_property_data/routes.py index f0450ee4..76843b00 100644 --- a/src/bemserver_api/resources/zone_property_data/routes.py +++ b/src/bemserver_api/resources/zone_property_data/routes.py @@ -1,10 +1,12 @@ """Zone property data resources""" -from bemserver_core.exceptions import PropertyTypeInvalidError -from bemserver_core.model import ZonePropertyData from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.exceptions import PropertyTypeInvalidError +from bemserver_core.model import ZonePropertyData + from bemserver_api import Blueprint from bemserver_api.database import db diff --git a/src/bemserver_api/resources/zone_property_data/schemas.py b/src/bemserver_api/resources/zone_property_data/schemas.py index 3a116668..60d262a1 100644 --- a/src/bemserver_api/resources/zone_property_data/schemas.py +++ b/src/bemserver_api/resources/zone_property_data/schemas.py @@ -1,8 +1,8 @@ """Zone property data API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import ZonePropertyData from bemserver_api import AutoSchema, Schema diff --git a/src/bemserver_api/resources/zones/routes.py b/src/bemserver_api/resources/zones/routes.py index 166f8793..c6187cd9 100644 --- a/src/bemserver_api/resources/zones/routes.py +++ b/src/bemserver_api/resources/zones/routes.py @@ -1,9 +1,11 @@ """Zone resources""" -from bemserver_core.model import Zone from flask.views import MethodView + from flask_smorest import abort +from bemserver_core.model import Zone + from bemserver_api import Blueprint from bemserver_api.database import db diff --git a/src/bemserver_api/resources/zones/schemas.py b/src/bemserver_api/resources/zones/schemas.py index 4c6731d5..3519fd45 100644 --- a/src/bemserver_api/resources/zones/schemas.py +++ b/src/bemserver_api/resources/zones/schemas.py @@ -1,8 +1,8 @@ """Zones API schemas""" import marshmallow as ma - import marshmallow_sqlalchemy as msa + from bemserver_core.model import Zone from bemserver_api import AutoSchema, Schema diff --git a/tests/conftest.py b/tests/conftest.py index dd128495..930d464b 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -5,15 +5,16 @@ from unittest import mock import pytest +from pytest_postgresql import factories as ppf import flask.testing -from bemserver_api import create_app + from bemserver_core import common, model, scheduled_tasks from bemserver_core.authorization import OpenBar from bemserver_core.commands import setup_db from bemserver_core.database import db -from pytest_postgresql import factories as ppf +from bemserver_api import create_app from tests.common import AUTH_HEADER, TestConfig diff --git a/tests/extensions/test_authentication.py b/tests/extensions/test_authentication.py index 1c3d118e..2c2700c7 100644 --- a/tests/extensions/test_authentication.py +++ b/tests/extensions/test_authentication.py @@ -1,9 +1,11 @@ """Test authentication extension""" -from bemserver_api import Blueprint -from bemserver_core.authorization import get_current_user from flask import jsonify +from bemserver_core.authorization import get_current_user + +from bemserver_api import Blueprint + class TestAuthentication: def test_auth_login_required(self, app, users): diff --git a/tests/extensions/test_integrity_error.py b/tests/extensions/test_integrity_error.py index 1b727af3..bc014723 100644 --- a/tests/extensions/test_integrity_error.py +++ b/tests/extensions/test_integrity_error.py @@ -6,6 +6,7 @@ import sqlalchemy as sqla import flask + from bemserver_api import Api, Blueprint diff --git a/tests/resources/analysis/test_energy_consumption.py b/tests/resources/analysis/test_energy_consumption.py index de99558f..200f5dd5 100644 --- a/tests/resources/analysis/test_energy_consumption.py +++ b/tests/resources/analysis/test_energy_consumption.py @@ -8,6 +8,9 @@ import pandas as pd +from tests.common import AuthHeader +from tests.utils import create_timeseries_data + from bemserver_core.authorization import OpenBar from bemserver_core.database import db from bemserver_core.model import ( @@ -19,8 +22,6 @@ TimeseriesDataState, UserGroupByCampaignScope, ) -from tests.common import AuthHeader -from tests.utils import create_timeseries_data ENERGY_CONSUMPTION_URL = "/analysis/energy_consumption/" diff --git a/tests/resources/test_sites.py b/tests/resources/test_sites.py index e836af50..1c551449 100644 --- a/tests/resources/test_sites.py +++ b/tests/resources/test_sites.py @@ -10,11 +10,13 @@ import pandas as pd from pandas.testing import assert_frame_equal, assert_series_equal -from bemserver_api.database import db +from tests.common import AuthHeader + from bemserver_core.authorization import OpenBar from bemserver_core.input_output import tsdio from bemserver_core.model import Timeseries, TimeseriesDataState -from tests.common import AuthHeader + +from bemserver_api.database import db DUMMY_ID = "69" diff --git a/tests/resources/test_timeseries_data.py b/tests/resources/test_timeseries_data.py index 8f58fcff..a864173e 100644 --- a/tests/resources/test_timeseries_data.py +++ b/tests/resources/test_timeseries_data.py @@ -5,10 +5,12 @@ import pytest -from bemserver_api.database import db +from tests.common import AuthHeader + from bemserver_core.authorization import OpenBar from bemserver_core.model import Timeseries -from tests.common import AuthHeader + +from bemserver_api.database import db TIMESERIES_DATA_URL = "/timeseries_data/" DUMMY_ID = "69"