Avoid circular imports (#32)

resultsdb/__init__.py

@@ -23,7 +23,10 @@
 import logging.config as logging_config
 import os
 
-from resultsdb import proxy
+from resultsdb.proxy import ReverseProxied
+from resultsdb.controllers.main import main
+from resultsdb.controllers.api_v2 import api as api_v2
+from resultsdb.controllers.api_v3 import api as api_v3, oidc
 from resultsdb.models import db
 from . import config
 
@@ -44,7 +47,7 @@ def create_app(config_obj=None):
     app.secret_key = "replace-me-with-something-random"
 
     # make sure app behaves when behind a proxy
-    app.wsgi_app = proxy.ReverseProxied(app.wsgi_app)
+    app.wsgi_app = ReverseProxied(app.wsgi_app)
 
     # Expose the __version__ variable in templates
     app.jinja_env.globals["app_version"] = __version__
@@ -161,16 +164,8 @@ def not_found(error):
 
 
 def register_blueprints(app):
-    from resultsdb.controllers.main import main  # noqa: E402
-
     app.register_blueprint(main)
-
-    from resultsdb.controllers.api_v2 import api as api_v2  # noqa: E402
-
     app.register_blueprint(api_v2, url_prefix="/api/v2.0")
-
-    from resultsdb.controllers.api_v3 import api as api_v3, oidc  # noqa: E402
-
     app.register_blueprint(api_v3, url_prefix="/api/v3")
 
     if app.config["AUTH_MODULE"] == "oidc":

resultsdb/__main__.py

@@ -23,7 +23,8 @@
 from alembic.migration import MigrationContext
 from flask.cli import FlaskGroup
 
-from resultsdb import create_app, db
+from resultsdb import create_app
+from resultsdb.models import db
 from resultsdb.models.results import Group, Testcase, Result, ResultData
 
 from sqlalchemy.engine import reflection

resultsdb/alembic/env.py

@@ -2,7 +2,7 @@
 from flask import current_app as app
 from sqlalchemy import engine_from_config, pool
 
-from resultsdb import db
+from resultsdb.models import db
 
 # add '.' to the pythonpath to support migration inside development env
 import sys

resultsdb/controllers/api_v2.py

@@ -27,7 +27,7 @@
 
 from sqlalchemy.orm import exc as orm_exc
 
-from resultsdb import db
+from resultsdb.models import db
 from resultsdb.controllers.common import commit_result, SERIALIZE
 from resultsdb.parsers.api_v2 import (
     CreateGroupParams,

resultsdb/controllers/api_v3.py

@@ -4,7 +4,7 @@
 from flask_oidc import OpenIDConnect
 from flask_pydantic import validate
 
-from resultsdb import db
+from resultsdb.models import db
 from resultsdb.authorization import match_testcase_permissions, verify_authorization
 from resultsdb.controllers.common import commit_result
 from resultsdb.models.results import (

resultsdb/controllers/common.py

@@ -2,7 +2,7 @@
 from flask import jsonify
 from flask import current_app as app
 
-from resultsdb import db
+from resultsdb.models import db
 from resultsdb.messaging import (
     load_messaging_plugin,
     create_message,

resultsdb/messaging.py

@@ -23,7 +23,7 @@
 import pkg_resources
 import stomp
 
-from resultsdb import db
+from resultsdb.models import db
 from resultsdb.models.results import Result, ResultData
 from resultsdb.serializers.api_v2 import Serializer
 

runapp.py

@@ -23,10 +23,10 @@
 #   Ralph Bean <rbean@redhat.com>
 
 
-import resultsdb
+from resultsdb import create_app
 
 if __name__ == '__main__':
-    app = resultsdb.create_app()
+    app = create_app()
     app.run(
         host=app.config['HOST'],
         port=app.config['PORT'],

testing/functest_api_v20.py

@@ -25,7 +25,6 @@
 
 from flask import current_app as app
 
-import resultsdb
 import resultsdb.messaging
 from resultsdb.models import db
 

testing/functest_create_fedmsg.py

@@ -23,7 +23,6 @@
 
 from flask import current_app as app
 
-import resultsdb
 import resultsdb.messaging
 from resultsdb.models import db