Move files to /src dir

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"

bemserver_api/__init__.py → 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,

bemserver_api/extensions/authentication.py → 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
 
 

bemserver_api/extensions/smorest.py → 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

bemserver_api/resources/analysis/completeness/routes.py → 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
 

bemserver_api/resources/analysis/energy_consumption/routes.py → 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
 

bemserver_api/resources/building_properties/routes.py → 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
 

bemserver_api/resources/building_properties/schemas.py → 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

bemserver_api/resources/building_property_data/routes.py → 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
 

bemserver_api/resources/building_property_data/schemas.py → 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

bemserver_api/resources/buildings/routes.py → 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
 

bemserver_api/resources/buildings/schemas.py → 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

bemserver_api/resources/campaign_scopes/routes.py → 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
 

bemserver_api/resources/campaign_scopes/schemas.py → 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

bemserver_api/resources/campaigns/routes.py → 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
 

bemserver_api/resources/campaigns/schemas.py → 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

bemserver_api/resources/energies/routes.py → 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

bemserver_api/resources/energies/schemas.py → 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

bemserver_api/resources/energy_consumption_timeseries_by_buildings/routes.py → 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
 

bemserver_api/resources/energy_consumption_timeseries_by_buildings/schemas.py → 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

bemserver_api/resources/energy_consumption_timeseries_by_sites/routes.py → 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
 

bemserver_api/resources/energy_consumption_timeseries_by_sites/schemas.py → 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

bemserver_api/resources/energy_end_uses/routes.py → 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

bemserver_api/resources/energy_end_uses/schemas.py → 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

bemserver_api/resources/energy_production_technologies/routes.py → 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

bemserver_api/resources/energy_production_technologies/schemas.py → 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

bemserver_api/resources/energy_production_timeseries_by_buildings/routes.py → 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
 

bemserver_api/resources/energy_production_timeseries_by_buildings/schemas.py → 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

bemserver_api/resources/energy_production_timeseries_by_sites/routes.py → 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
 

bemserver_api/resources/energy_production_timeseries_by_sites/schemas.py → 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

bemserver_api/resources/event_categories/routes.py → 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
 

bemserver_api/resources/event_categories/schemas.py → 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

bemserver_api/resources/event_categories_by_users/routes.py → 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