lint: remove cyclic imports

app/lists/mirror_mapping.py

@@ -1,6 +1,7 @@
 import builtins
 from typing import Dict, List, Union
 
+from flask import current_app
 from pydantic import BaseModel, Field
 from tldextract import extract
 
@@ -30,7 +31,6 @@ class MirrorMapping(BaseModel):
 
 
 def mirror_mapping() -> Dict[str, Union[str, Dict[str, str]]]:
-    from app import app
     return MirrorMapping(
         version="1.1",
         mappings={
@@ -45,7 +45,7 @@ def mirror_mapping() -> Dict[str, Union[str, Dict[str, str]]]:
             ) for d in Proxy.query.all() if d.url is not None
         },
         s3_buckets=[
-            f"{app.config['GLOBAL_NAMESPACE']}-{g.group_name.lower()}-logs-cloudfront"
+            f"{current_app.config['GLOBAL_NAMESPACE']}-{g.group_name.lower()}-logs-cloudfront"
             for g in Group.query.filter(Group.destroyed.is_(None)).all()
         ]
     ).dict()

app/models/alarms.py

@@ -2,7 +2,7 @@ import enum
 from datetime import datetime
 from typing import List, Any
 
-from app import db
+from app.extensions import db
 
 
 class AlarmState(enum.Enum):

app/models/base.py

@@ -1,7 +1,7 @@
 from datetime import datetime
 from typing import List
 
-from app import db
+from app.extensions import db
 from app.models import AbstractConfiguration
 
 

app/models/bridges.py

@@ -1,7 +1,7 @@
 from datetime import datetime
 from typing import List
 
-from app import db
+from app.extensions import db
 from app.models import AbstractConfiguration, AbstractResource
 
 

app/models/mirrors.py

@@ -2,7 +2,7 @@ from typing import Optional, List
 
 from tldextract import extract
 
-from app import db
+from app.extensions import db
 from app.models import AbstractConfiguration, AbstractResource
 from app.models.onions import Onion
 

app/portal/eotk.py

@@ -1,4 +1,4 @@
-from flask import render_template, Blueprint, Response
+from flask import current_app, render_template, Blueprint, Response
 from flask.typing import ResponseReturnValue
 from sqlalchemy import desc
 
@@ -20,8 +20,7 @@ def eotk_list() -> ResponseReturnValue:
 
 @bp.route("/conf/<group_id>")
 def eotk_conf(group_id: int) -> ResponseReturnValue:
-    from app import app
     group = Group.query.filter(Group.id == group_id).first()
     return Response(render_template("sites.conf.j2",
-                                    bypass_token=app.config["BYPASS_TOKEN"],
+                                    bypass_token=current_app.config["BYPASS_TOKEN"],
                                     group=group), content_type="text/plain")

app/portal/util.py

@@ -3,7 +3,7 @@ from flask.typing import ResponseReturnValue
 from flask_wtf import FlaskForm
 from wtforms import SubmitField
 
-from app import db
+from app.extensions import db
 from app.models import AbstractResource
 from app.models.activity import Activity