Use relative imports to break circular import errors

4 files changed, 33 insertions, 31 deletions

diff --git a/gn_auth/auth/authorisation/data/genotypes.py b/gn_auth/auth/authorisation/data/genotypes.py
index f5cf11c..818f72d 100644
--- a/gn_auth/auth/authorisation/data/genotypes.py
+++ b/gn_auth/auth/authorisation/data/genotypes.py
@@ -4,11 +4,12 @@ from typing import Iterable
 
 from MySQLdb.cursors import DictCursor
 
-import gn_auth.auth.db.sqlite3 as authdb
-import gn_auth.auth.db.mariadb as gn3db
-from gn_auth.auth.dictify import dictify
-from gn_auth.auth.authorisation.checks import authorised_p
-from gn_auth.auth.authorisation.groups.models import Group
+from ..checks import authorised_p
+from ..groups.models import Group
+
+from ...dictify import dictify
+from ...db import mariadb as gn3db
+from ...db import sqlite3 as authdb
 
 def linked_genotype_data(conn: authdb.DbConnection) -> Iterable[dict]:
     """Retrive genotype data that is linked to user groups."""
diff --git a/gn_auth/auth/authorisation/data/mrna.py b/gn_auth/auth/authorisation/data/mrna.py
index b80ffe5..53f9bf9 100644
--- a/gn_auth/auth/authorisation/data/mrna.py
+++ b/gn_auth/auth/authorisation/data/mrna.py
@@ -3,11 +3,12 @@ import uuid
 from typing import Iterable
 from MySQLdb.cursors import DictCursor
 
-import gn_auth.auth.db.sqlite3 as authdb
-import gn_auth.auth.db.mariadb as gn3db
-from gn_auth.auth.dictify import dictify
-from gn_auth.auth.authorisation.checks import authorised_p
-from gn_auth.auth.authorisation.groups.models import Group
+from ..checks import authorised_p
+from ..groups.models import Group
+
+from ...dictify import dictify
+from ...db import sqlite3 as authdb
+from ...db import mariadb as gn3db
 
 def linked_mrna_data(conn: authdb.DbConnection) -> Iterable[dict]:
     """Retrieve mRNA Assay data that is linked to user groups."""
diff --git a/gn_auth/auth/authorisation/data/phenotypes.py b/gn_auth/auth/authorisation/data/phenotypes.py
index 0220201..84fc089 100644
--- a/gn_auth/auth/authorisation/data/phenotypes.py
+++ b/gn_auth/auth/authorisation/data/phenotypes.py
@@ -4,11 +4,13 @@ from typing import Any, Iterable
 
 from MySQLdb.cursors import DictCursor
 
-import gn_auth.auth.db.sqlite3 as authdb
-import gn_auth.auth.db.mariadb as gn3db
-from gn_auth.auth.dictify import dictify
-from gn_auth.auth.authorisation.checks import authorised_p
-from gn_auth.auth.authorisation.groups.models import Group
+
+from ..checks import authorised_p
+from ..groups.models import Group
+
+from ...dictify import dictify
+from ...db import sqlite3 as authdb
+from ...db import mariadb as gn3db
 
 def linked_phenotype_data(
         authconn: authdb.DbConnection, gn3conn: gn3db.DbConnection,
diff --git a/gn_auth/auth/authorisation/data/views.py b/gn_auth/auth/authorisation/data/views.py
index 03b416f..3c49ae5 100644
--- a/gn_auth/auth/authorisation/data/views.py
+++ b/gn_auth/auth/authorisation/data/views.py
@@ -10,32 +10,30 @@ from MySQLdb.cursors import DictCursor
 from authlib.integrations.flask_oauth2.errors import _HTTPException
 from flask import request, jsonify, Response, Blueprint, current_app as app
 
-import gn_auth.auth.db.mariadb as gn3db
-
 from gn_auth import jobs
 from gn_auth.commands import run_async_cmd
 
-from gn_auth.auth.db import sqlite3 as db
-from gn_auth.auth.db.sqlite3 import with_db_connection
+from ...db import sqlite3 as db
+from ...db import mariadb as gn3db
+from ...db.sqlite3 import with_db_connection
 
-from gn_auth.auth.authorisation.checks import require_json
-from gn_auth.auth.authorisation.errors import InvalidData, NotFoundError
+from ..checks import require_json
+from ..errors import InvalidData, NotFoundError
 
-from gn_auth.auth.authorisation.groups.models import group_by_id
+from ..groups.models import group_by_id
 
-from gn_auth.auth.authorisation.users.models import user_resource_roles
+from ..users.models import user_resource_roles
 
-from gn_auth.auth.authorisation.resources.checks import authorised_for
-from gn_auth.auth.authorisation.resources.models import (
+from ..resources.checks import authorised_for
+from ..resources.models import (
     user_resources, public_resources, attach_resources_data)
 
-from gn_auth.auth.authentication.users import User
-from gn_auth.auth.authentication.oauth2.resource_server import require_oauth
+from ...authentication.users import User
+from ...authentication.oauth2.resource_server import require_oauth
 
-from gn_auth.auth.authorisation.data.phenotypes import link_phenotype_data
-from gn_auth.auth.authorisation.data.mrna import link_mrna_data, ungrouped_mrna_data
-from gn_auth.auth.authorisation.data.genotypes import (
-    link_genotype_data, ungrouped_genotype_data)
+from ..data.phenotypes import link_phenotype_data
+from ..data.mrna import link_mrna_data, ungrouped_mrna_data
+from ..data.genotypes import link_genotype_data, ungrouped_genotype_data
 
 data = Blueprint("data", __name__)