diff --git a/src/covid19/blueprints/admin/admin_views.py b/src/covid19/blueprints/admin/admin_views.py index 53bbd704452c2cd5214bbf291ef4fbed4b2724b2..697616dba380ccc265d19175d6d08beac15612d2 100644 --- a/src/covid19/blueprints/admin/admin_views.py +++ b/src/covid19/blueprints/admin/admin_views.py @@ -1,9 +1,8 @@ from flask import render_template, redirect, url_for, flash, Blueprint from celery import states from celery.utils.log import get_task_logger -from flask_admin.contrib.sqla import ModelView -from database import app, admin, db +from database import app from covid19.blueprints.application.application_services import who_service, ecdc_service, rki_vaccination_service from covid19.blueprints.application.application_services import rki_service_bundeslaender, rki_service_landkreise from covid19.blueprints.application.application_services import admin_service, owid_service diff --git a/src/covid19/blueprints/application/application_model.py b/src/covid19/blueprints/application/application_model.py index 7af9a69eb40f267c29a863971f134d42eb1f2bdd..33fbf81dd9b0d3cc1c8fced40b0e9bb8146f8a96 100644 --- a/src/covid19/blueprints/application/application_model.py +++ b/src/covid19/blueprints/application/application_model.py @@ -1,7 +1,5 @@ -from sqlalchemy import and_, func -from datetime import date, datetime, time +from datetime import date, datetime from database import db, ITEMS_PER_PAGE -from sqlalchemy.orm import joinedload class ApplicationDateReported(db.Model): diff --git a/src/covid19/blueprints/application/application_workers.py b/src/covid19/blueprints/application/application_workers.py index b7b7ceaf21f0a8a423146b739343afb87873411a..51fbe15c1772da2f67973d84e83daef67a0d0a47 100644 --- a/src/covid19/blueprints/application/application_workers.py +++ b/src/covid19/blueprints/application/application_workers.py @@ -1,7 +1,6 @@ import sys -import subprocess from covid19 import app -from database import create_celery, run_run_with_debug, port, db +from database import create_celery, db from covid19.blueprints.application.application_services import user_service from covid19.blueprints.application.application_service import ApplicationService diff --git a/src/covid19/blueprints/ecdc/ecdc_model.py b/src/covid19/blueprints/ecdc/ecdc_model.py index 055aac10dff6b609fd8759f6efa140fd8484e49b..3d82d4fe9de24cb494612105f42584e6f329442d 100644 --- a/src/covid19/blueprints/ecdc/ecdc_model.py +++ b/src/covid19/blueprints/ecdc/ecdc_model.py @@ -1,5 +1,4 @@ from sqlalchemy import and_ -from datetime import date from database import db, ITEMS_PER_PAGE from covid19.blueprints.application.application_model import ApplicationDateReported, ApplicationRegion diff --git a/src/covid19/blueprints/ecdc/ecdc_views.py b/src/covid19/blueprints/ecdc/ecdc_views.py index 41545393339027fb6829b9d4558757d57fd2bf03..a7e011edf9d0beba1cf81fd1f0672e43532ad2d3 100644 --- a/src/covid19/blueprints/ecdc/ecdc_views.py +++ b/src/covid19/blueprints/ecdc/ecdc_views.py @@ -3,7 +3,7 @@ from celery import states from celery.utils.log import get_task_logger from flask_admin.contrib.sqla import ModelView -from database import app, admin, db +from database import admin, db from covid19.blueprints.application.application_services import ecdc_service from covid19.blueprints.application.application_workers import celery diff --git a/src/covid19/blueprints/owid/owid_model.py b/src/covid19/blueprints/owid/owid_model.py index e9b03ad3d34a2d67bd2563ce7d74ec765f6ef3dd..5dcfee1d077fc4390d85d86a8e5eaa9488394562 100644 --- a/src/covid19/blueprints/owid/owid_model.py +++ b/src/covid19/blueprints/owid/owid_model.py @@ -1,7 +1,6 @@ -from sqlalchemy import and_, func +from sqlalchemy import and_ from datetime import date -from sqlalchemy.orm import joinedload, load_only, defaultload, defer, undefer, query_expression, subqueryload -from sqlalchemy.sql import select +from sqlalchemy.orm import joinedload, subqueryload from database import db, ITEMS_PER_PAGE from covid19.blueprints.application.application_model import ApplicationDateReported, ApplicationRegion diff --git a/src/covid19/blueprints/owid/owid_model_import.py b/src/covid19/blueprints/owid/owid_model_import.py index d3b47020e7b3d2fdaabea376cad0f6b4e26f0ba7..059bfa6a1a90160cf1fca5bdee39f9bb0afdf4ee 100644 --- a/src/covid19/blueprints/owid/owid_model_import.py +++ b/src/covid19/blueprints/owid/owid_model_import.py @@ -1,7 +1,4 @@ -from sqlalchemy.orm import Load -from sqlalchemy import func from sqlalchemy.orm import Bundle -from sqlalchemy.orm.strategy_options import load_only from database import db, ITEMS_PER_PAGE diff --git a/src/covid19/blueprints/owid_test/owid_test_service.py b/src/covid19/blueprints/owid_test/owid_test_service.py index 9640cb2c712deda87607b60798a8a9cbeebaaa2f..05d7c2ad5ee3a48b55e45f94c8a1ac206343f13e 100644 --- a/src/covid19/blueprints/owid_test/owid_test_service.py +++ b/src/covid19/blueprints/owid_test/owid_test_service.py @@ -1,12 +1,7 @@ -from flask import flash - from database import app from covid19.blueprints.application.application_service_config import ApplicationServiceConfig -from covid19.blueprints.application.application_service_download import ApplicationServiceDownload -from covid19.blueprints.owid.owid_service_import import OwidServiceImport -from covid19.blueprints.owid.owid_service_update import OwidServiceUpdate -from covid19.blueprints.owid.owid_model import OwidDateReported, OwidContinent, OwidCountry, OwidData +from covid19.blueprints.owid.owid_model import OwidDateReported, OwidData class OwidTestService: diff --git a/src/covid19/blueprints/owid_test/owid_test_views.py b/src/covid19/blueprints/owid_test/owid_test_views.py index 00837ed80fe8378ede9a14e1729c61cd60165533..27dec415c8b952eb2dc309512eb91ea97b0fcf20 100644 --- a/src/covid19/blueprints/owid_test/owid_test_views.py +++ b/src/covid19/blueprints/owid_test/owid_test_views.py @@ -1,14 +1,12 @@ from flask import render_template, redirect, url_for, flash, Blueprint -from sqlalchemy.exc import OperationalError from celery import states from celery.utils.log import get_task_logger -from flask_admin.contrib.sqla import ModelView from flask_login import login_required -from database import app, admin, db +from database import app, db from covid19.blueprints.application.application_services import owid_service from covid19.blueprints.application.application_workers import celery -from covid19.blueprints.owid.owid_model import OwidDateReported, OwidData, OwidContinent, OwidCountry +from covid19.blueprints.owid.owid_model import OwidData from covid19.blueprints.owid.owid_model_import import OwidImport from covid19.blueprints.application.application_model_transient import ApplicationPage diff --git a/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_model.py b/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_model.py index 8c2d1016a65079092a935cd55b7f5afeb6863b2d..b5acfbd58a8ad4c68d683ee06f15c7d8929a285e 100644 --- a/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_model.py +++ b/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_model.py @@ -1,7 +1,3 @@ -from sqlalchemy import and_ -from datetime import date -from sqlalchemy.orm import joinedload - from database import db, ITEMS_PER_PAGE diff --git a/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_service_import.py b/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_service_import.py index c6cbf8765b5e3164a89880dd364c97a22e7f98c7..44e8bdfffd5d4289e9e5c534f4553ef5e751ed6b 100644 --- a/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_service_import.py +++ b/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_service_import.py @@ -1,4 +1,3 @@ -import sys import csv import psycopg2 diff --git a/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_views.py b/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_views.py index dfcf6b68500b2554a20c53cbe213b86820f05ed0..2897819303e0509f374731100c9f1392a7d54b18 100644 --- a/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_views.py +++ b/src/covid19/blueprints/rki/rki_landkreise/rki_landkreise_views.py @@ -7,7 +7,6 @@ from database import app, admin, db from covid19.blueprints.application.application_workers import celery from covid19.blueprints.application.application_services import rki_service_landkreise -from covid19.blueprints.application.application_model import RkiDateReported from covid19.blueprints.rki.rki_landkreise.rki_landkreise_model import RkiLandkreise from covid19.blueprints.rki.rki_landkreise.rki_landkreise_model_import import RkiLandkreiseImport from covid19.blueprints.application.application_model_transient import ApplicationPage diff --git a/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_service_import.py b/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_service_import.py index a4e4bf02ad621074caa385e88b48adbe284c0c8d..06faaed67b4a97e4f6233bd1ada8fe26b7d05d5b 100644 --- a/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_service_import.py +++ b/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_service_import.py @@ -1,4 +1,3 @@ -import os import csv import psycopg2 diff --git a/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_views.py b/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_views.py index 9c89afac0a56a34081126bebed83372fdec7ced7..7b684f587cdd5d73516cedfb25911554861c10f9 100644 --- a/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_views.py +++ b/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_views.py @@ -3,7 +3,7 @@ from celery import states from celery.utils.log import get_task_logger from flask_admin.contrib.sqla import ModelView -from database import app, admin, db +from database import admin, db from covid19.blueprints.application.application_services import rki_vaccination_service from covid19.blueprints.application.application_workers import celery diff --git a/src/covid19/blueprints/user/user_model.py b/src/covid19/blueprints/user/user_model.py index 9fbf6eb71d68872dd299ef20c6ed0847ce7b2735..f15590698e51a62d67244915a392667cad62b9cd 100644 --- a/src/covid19/blueprints/user/user_model.py +++ b/src/covid19/blueprints/user/user_model.py @@ -1,14 +1,9 @@ -from sqlalchemy import and_, func -from datetime import date from database import db, ITEMS_PER_PAGE -from sqlalchemy.orm import joinedload from flask_login import UserMixin, AnonymousUserMixin -from wtforms import Form, BooleanField, StringField, validators +from wtforms import validators from werkzeug.security import generate_password_hash, check_password_hash from flask_wtf import FlaskForm from wtforms import StringField, PasswordField, BooleanField, SubmitField -from wtforms.validators import ValidationError, DataRequired, Email, EqualTo -from covid19.blueprints.application.application_model import ApplicationDateReported, ApplicationRegion class User(UserMixin, db.Model): diff --git a/src/covid19/blueprints/user/user_service.py b/src/covid19/blueprints/user/user_service.py index 61ce87194d99ff6635769579f1ea8e882db7c4b9..240d6acfafc26b01f370996a56acf7edf3ac600a 100644 --- a/src/covid19/blueprints/user/user_service.py +++ b/src/covid19/blueprints/user/user_service.py @@ -1,7 +1,3 @@ -from flask import flash -from flask_login import login_manager -from werkzeug.security import generate_password_hash, check_password_hash - from database import app from covid19.blueprints.user.user_model import User, LoginForm diff --git a/src/covid19/blueprints/user/user_views.py b/src/covid19/blueprints/user/user_views.py index 76eafe67de49456e0a8c024ffcccc767c647f22f..e1b15b42130a68881a3f33e2baf2dd74a45eee2e 100644 --- a/src/covid19/blueprints/user/user_views.py +++ b/src/covid19/blueprints/user/user_views.py @@ -1,16 +1,12 @@ from flask import render_template, redirect, url_for, flash, Blueprint from sqlalchemy.exc import OperationalError -from celery import states -from celery.utils.log import get_task_logger from flask_admin.contrib.sqla import ModelView -from flask_login import AnonymousUserMixin, login_required, login_user, logout_user +from flask_login import login_required, logout_user from flask_login import current_user, login_user import flask -from database import app, admin, db, login_manager -from covid19.blueprints.application.application_services import user_service -from covid19.blueprints.application.application_workers import celery +from database import admin, db, login_manager from covid19.blueprints.user.user_model import User, LoginForm from covid19.blueprints.application.application_model_transient import ApplicationPage diff --git a/src/covid19/blueprints/who/who_model.py b/src/covid19/blueprints/who/who_model.py index dac88da082ee330e8415f148d23f978f46c36d29..39165196fef00ad3fff4ba5e75cd6dcc31ff0847 100644 --- a/src/covid19/blueprints/who/who_model.py +++ b/src/covid19/blueprints/who/who_model.py @@ -1,7 +1,6 @@ -from sqlalchemy import and_, func +from sqlalchemy import and_ from datetime import date -from sqlalchemy.orm import joinedload, load_only, defaultload, defer, undefer, query_expression, subqueryload -from sqlalchemy.sql import select +from sqlalchemy.orm import joinedload, subqueryload from database import db, ITEMS_PER_PAGE from covid19.blueprints.application.application_model import ApplicationDateReported, ApplicationRegion diff --git a/src/covid19/blueprints/who/who_model_import.py b/src/covid19/blueprints/who/who_model_import.py index fb5e3da53079181ba43f0051aa29ccf4f66e7643..e02f126124a98d927742d43301a08152b4d22a7a 100644 --- a/src/covid19/blueprints/who/who_model_import.py +++ b/src/covid19/blueprints/who/who_model_import.py @@ -1,7 +1,4 @@ -from sqlalchemy.orm import Load -from sqlalchemy import func from sqlalchemy.orm import Bundle -from sqlalchemy.orm.strategy_options import load_only from database import db, ITEMS_PER_PAGE diff --git a/src/covid19/blueprints/who_test/who_test_service.py b/src/covid19/blueprints/who_test/who_test_service.py index 26a1be175c6b29235316cf9fc59887aacd5c697e..565d5e8ef3788311980df2f3c9d1328da43c2e33 100644 --- a/src/covid19/blueprints/who_test/who_test_service.py +++ b/src/covid19/blueprints/who_test/who_test_service.py @@ -1,5 +1,3 @@ -from flask import flash - from database import app from covid19.blueprints.application.application_service_config import ApplicationServiceConfig from covid19.blueprints.who.who_model import WhoDateReported, WhoData diff --git a/src/covid19/blueprints/who_test/who_test_views.py b/src/covid19/blueprints/who_test/who_test_views.py index 5445165d693672773f5162795a3e69f17ce4b160..d6126688609c498307d04b51dfafa94c7700a2a6 100644 --- a/src/covid19/blueprints/who_test/who_test_views.py +++ b/src/covid19/blueprints/who_test/who_test_views.py @@ -1,20 +1,16 @@ from flask import render_template, redirect, url_for, flash, Blueprint -from sqlalchemy.exc import OperationalError from celery import states from celery.utils.log import get_task_logger -from flask_admin.contrib.sqla import ModelView from flask_login import login_required -from database import app, admin, db +from database import app, db from covid19.blueprints.application.application_services import who_service from covid19.blueprints.application.application_workers import celery from covid19.blueprints.who.who_model_import import WhoImport -from covid19.blueprints.who.who_model import WhoRegion, WhoCountry, WhoDateReported, WhoData +from covid19.blueprints.who.who_model import WhoData from covid19.blueprints.application.application_model_transient import ApplicationPage -from covid19.blueprints.who.who_views import app_who - from covid19.blueprints.who_test.who_test_service import WhoTestService who_test_service = WhoTestService(db, who_service) diff --git a/src/web/web.py b/src/web/web.py index 657bfe442e03b1c567b4d6e33fb13817604374f3..cd585a01856241f70b281dfaef753b9d651928d7 100644 --- a/src/web/web.py +++ b/src/web/web.py @@ -1,7 +1,3 @@ -from database import app, run_run_with_debug, port -import covid19 -import covid19.blueprints.application.application_views - from covid19 import run_web # ---------------------------------------------------------------------------------