♻️ REFACTOR: aiida.backends -> aiida.storage

aiidateam · Feb 18, 2022 · e58f51f · e58f51f
1 parent 8dc3d8a
commit e58f51f
Show file tree

Hide file tree

Showing 397 changed files with 287 additions and 289 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -70,10 +70,6 @@ repos:
         pass_filenames: true
         files: >-
             (?x)^(
-                aiida/backends/control.py|
-                aiida/backends/psql_dos/backend.py|
-                aiida/backends/psql_dos/orm/querybuilder/.*py|
-                aiida/backends/psql_dos/utils.py|
                 aiida/common/progress_reporter.py|
                 aiida/engine/.*py|
                 aiida/manage/manager.py|
@@ -103,6 +99,10 @@ repos:
                 aiida/plugins/entry_point.py|
                 aiida/plugins/factories.py|
                 aiida/repository/.*py|
+                aiida/storage/control.py|
+                aiida/storage/psql_dos/backend.py|
+                aiida/storage/psql_dos/orm/querybuilder/.*py|
+                aiida/storage/psql_dos/utils.py|
                 aiida/tools/graph/graph_traversers.py|
                 aiida/tools/groups/paths.py|
                 aiida/tools/archive/.*py|

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -702,7 +702,7 @@ Changes between 1.0 alpha/beta releases are not included - for those see the cha
 - AiiDA now enforces UTF-8 encoding for text output in its files and databases. [[#2107]](https://github.com/aiidateam/aiida-core/pull/2107)
 
 #### Backwards-incompatible changes (only a sub-set)
-- Remove `aiida.tests` and obsolete `aiida.backends.tests.test_parsers` entry point group [[#2778]](https://github.com/aiidateam/aiida-core/pull/2778)
+- Remove `aiida.tests` and obsolete `aiida.storage.tests.test_parsers` entry point group [[#2778]](https://github.com/aiidateam/aiida-core/pull/2778)
 - Implement new link types [[#2220]](https://github.com/aiidateam/aiida-core/pull/2220)
 - Rename the type strings of `Groups` and change the attributes `name` and `type` to `label` and `type_string` [[#2329]](https://github.com/aiidateam/aiida-core/pull/2329)
 - Make various protected `Node` methods public [[#2544]](https://github.com/aiidateam/aiida-core/pull/2544)

diff --git a/aiida/cmdline/commands/cmd_devel.py b/aiida/cmdline/commands/cmd_devel.py
@@ -102,7 +102,7 @@ def devel_run_sql(sql):
     """Run a raw SQL command on the profile database (only available for 'psql_dos' storage)."""
     from sqlalchemy import text
 
-    from aiida.backends.psql_dos.utils import create_sqlalchemy_engine
+    from aiida.storage.psql_dos.utils import create_sqlalchemy_engine
     assert get_profile().storage_backend == 'psql_dos'
     with create_sqlalchemy_engine(get_profile().storage_config).connect() as connection:
         result = connection.execute(text(sql)).fetchall()

diff --git a/aiida/cmdline/commands/cmd_storage.py b/aiida/cmdline/commands/cmd_storage.py
@@ -92,9 +92,9 @@ def storage_integrity():
 @click.option('--statistics', is_flag=True, help='Provides more in-detail statistically relevant data.')
 def storage_info(statistics):
     """Summarise the contents of the storage."""
-    from aiida.backends.control import get_repository_info
     from aiida.cmdline.utils.common import get_database_summary
     from aiida.orm import QueryBuilder
+    from aiida.storage.control import get_repository_info
 
     with spinner():
         data = {
@@ -119,7 +119,7 @@ def storage_info(statistics):
 )
 def storage_maintain(full, dry_run):
     """Performs maintenance tasks on the repository."""
-    from aiida.backends.control import repository_maintain
+    from aiida.storage.control import repository_maintain
 
     if full:
         echo.echo_warning(

diff --git a/aiida/common/utils.py b/aiida/common/utils.py
@@ -24,8 +24,6 @@
 def get_new_uuid():
     """
     Return a new UUID (typically to be used for new nodes).
-    It uses the UUID version specified in
-    aiida.backends.settings.AIIDANODES_UUID_VERSION
     """
     import uuid
     return str(uuid.uuid4())

diff --git a/aiida/manage/configuration/__init__.py b/aiida/manage/configuration/__init__.py
@@ -248,7 +248,7 @@ def load_documentation_profile():
     """
     import tempfile
 
-    from aiida.backends.psql_dos.models.base import get_orm_metadata
+    from aiida.storage.psql_dos.models.base import get_orm_metadata
 
     from .config import Config
 

diff --git a/aiida/manage/configuration/profile.py b/aiida/manage/configuration/profile.py
@@ -124,7 +124,7 @@ def set_storage(self, name: str, config: Dict[str, Any]) -> None:
     def storage_cls(self) -> Type['Backend']:
         """Return the storage backend class for this profile."""
         if self.storage_backend == 'psql_dos':
-            from aiida.backends.psql_dos.backend import PsqlDosBackend
+            from aiida.storage.psql_dos.backend import PsqlDosBackend
             return PsqlDosBackend
         if self.storage_backend == 'archive.sqlite':
             from aiida.tools.archive.implementations.sqlite.backend import ArchiveReadOnlyBackend

diff --git a/aiida/manage/tests/main.py b/aiida/manage/tests/main.py
@@ -147,7 +147,7 @@ def __init__(self, profile_name):
         :param profile_name: Name of the profile to be loaded
         """
         from aiida import load_profile
-        from aiida.backends.testbase import check_if_tests_can_run
+        from aiida.storage.testbase import check_if_tests_can_run
 
         self._profile = None
         try:

diff --git a/aiida/repository/backend/disk_object_store.py b/aiida/repository/backend/disk_object_store.py
@@ -156,7 +156,7 @@ def maintain( # type: ignore[override] # pylint: disable=arguments-differ,too-ma
         :param do_vacuum:flag for forcing the vacuuming of the internal database when cleaning the repository.
         :return:a dictionary with information on the operations performed.
         """
-        from aiida.backends.control import MAINTAIN_LOGGER
+        from aiida.storage.control import MAINTAIN_LOGGER
 
         logger = MAINTAIN_LOGGER.getChild('disk_object_store')
 

diff --git a/aiida/backends/__init__.py → aiida/storage/__init__.py b/aiida/backends/__init__.py → aiida/storage/__init__.py
diff --git a/aiida/backends/control.py → aiida/storage/control.py b/aiida/backends/control.py → aiida/storage/control.py
diff --git a/aiida/backends/psql_dos/__init__.py → aiida/storage/psql_dos/__init__.py b/aiida/backends/psql_dos/__init__.py → aiida/storage/psql_dos/__init__.py
diff --git a/aiida/backends/psql_dos/alembic_cli.py → aiida/storage/psql_dos/alembic_cli.py b/aiida/backends/psql_dos/alembic_cli.py → aiida/storage/psql_dos/alembic_cli.py
@@ -13,9 +13,9 @@
 import click
 from sqlalchemy.util.compat import nullcontext
 
-from aiida.backends.psql_dos.migrator import PsqlDostoreMigrator
 from aiida.cmdline import is_verbose
 from aiida.cmdline.params import options
+from aiida.storage.psql_dos.migrator import PsqlDostoreMigrator
 
 
 class AlembicRunner:

diff --git a/aiida/backends/psql_dos/backend.py → aiida/storage/psql_dos/backend.py b/aiida/backends/psql_dos/backend.py → aiida/storage/psql_dos/backend.py
@@ -17,14 +17,14 @@
 from sqlalchemy import table
 from sqlalchemy.orm import Session, scoped_session, sessionmaker
 
-from aiida.backends.psql_dos.migrator import REPOSITORY_UUID_KEY, PsqlDostoreMigrator
-from aiida.backends.psql_dos.models import base
 from aiida.common.exceptions import ClosedStorage, IntegrityError
 from aiida.manage.configuration.profile import Profile
 from aiida.orm import User
 from aiida.orm.entities import EntityTypes
 from aiida.orm.implementation.backends import Backend
 from aiida.orm.implementation.entities import BackendEntity
+from aiida.storage.psql_dos.migrator import REPOSITORY_UUID_KEY, PsqlDostoreMigrator
+from aiida.storage.psql_dos.models import base
 
 from .orm import authinfos, comments, computers, convert, groups, logs, nodes, querybuilder, users
 
@@ -100,7 +100,7 @@ def _initialise_session(self):
         Multi-thread support is currently required by the REST API.
         Although, in the future, we may want to move the multi-thread handling to higher in the AiiDA stack.
         """
-        from aiida.backends.psql_dos.utils import create_sqlalchemy_engine
+        from aiida.storage.psql_dos.utils import create_sqlalchemy_engine
         engine = create_sqlalchemy_engine(self._profile.storage_config)
         self._session_factory = scoped_session(sessionmaker(bind=engine, future=True, expire_on_commit=True))
 
@@ -125,8 +125,8 @@ def close(self) -> None:
         self._session_factory = None
 
     def _clear(self, recreate_user: bool = True) -> None:
-        from aiida.backends.psql_dos.models.settings import DbSetting
-        from aiida.backends.psql_dos.models.user import DbUser
+        from aiida.storage.psql_dos.models.settings import DbSetting
+        from aiida.storage.psql_dos.models.user import DbUser
 
         super()._clear(recreate_user)
 
@@ -237,13 +237,13 @@ def _get_mapper_from_entity(entity_type: EntityTypes, with_pk: bool):
         """
         from sqlalchemy import inspect
 
-        from aiida.backends.psql_dos.models.authinfo import DbAuthInfo
-        from aiida.backends.psql_dos.models.comment import DbComment
-        from aiida.backends.psql_dos.models.computer import DbComputer
-        from aiida.backends.psql_dos.models.group import DbGroup, DbGroupNode
-        from aiida.backends.psql_dos.models.log import DbLog
-        from aiida.backends.psql_dos.models.node import DbLink, DbNode
-        from aiida.backends.psql_dos.models.user import DbUser
+        from aiida.storage.psql_dos.models.authinfo import DbAuthInfo
+        from aiida.storage.psql_dos.models.comment import DbComment
+        from aiida.storage.psql_dos.models.computer import DbComputer
+        from aiida.storage.psql_dos.models.group import DbGroup, DbGroupNode
+        from aiida.storage.psql_dos.models.log import DbLog
+        from aiida.storage.psql_dos.models.node import DbLink, DbNode
+        from aiida.storage.psql_dos.models.user import DbUser
         model = {
             EntityTypes.AUTHINFO: DbAuthInfo,
             EntityTypes.COMMENT: DbComment,
@@ -297,8 +297,8 @@ def bulk_update(self, entity_type: EntityTypes, rows: List[dict]) -> None:  # py
 
     def delete_nodes_and_connections(self, pks_to_delete: Sequence[int]) -> None:  # pylint: disable=no-self-use
         # pylint: disable=no-value-for-parameter
-        from aiida.backends.psql_dos.models.group import DbGroupNode
-        from aiida.backends.psql_dos.models.node import DbLink, DbNode
+        from aiida.storage.psql_dos.models.group import DbGroupNode
+        from aiida.storage.psql_dos.models.node import DbLink, DbNode
 
         if not self.in_transaction:
             raise AssertionError('Cannot delete nodes and links outside a transaction')
@@ -326,7 +326,7 @@ def get_backend_entity(self, model: base.Base) -> BackendEntity:
     def set_global_variable(
         self, key: str, value: Union[None, str, int, float], description: Optional[str] = None, overwrite=True
     ) -> None:
-        from aiida.backends.psql_dos.models.settings import DbSetting
+        from aiida.storage.psql_dos.models.settings import DbSetting
 
         session = self.get_session()
         with (nullcontext() if self.in_transaction else self.transaction()):
@@ -339,7 +339,7 @@ def set_global_variable(
                 session.add(DbSetting(key=key, val=value, description=description or ''))
 
     def get_global_variable(self, key: str) -> Union[None, str, int, float]:
-        from aiida.backends.psql_dos.models.settings import DbSetting
+        from aiida.storage.psql_dos.models.settings import DbSetting
 
         session = self.get_session()
         with (nullcontext() if self.in_transaction else self.transaction()):

diff --git a/.../backends/psql_dos/migrations/__init__.py → ...a/storage/psql_dos/migrations/__init__.py b/.../backends/psql_dos/migrations/__init__.py → ...a/storage/psql_dos/migrations/__init__.py
diff --git a/aiida/backends/psql_dos/migrations/env.py → aiida/storage/psql_dos/migrations/env.py b/aiida/backends/psql_dos/migrations/env.py → aiida/storage/psql_dos/migrations/env.py
@@ -18,16 +18,16 @@ def run_migrations_online():
     """
 
     # pylint: disable=unused-import
-    from aiida.backends.psql_dos.models.authinfo import DbAuthInfo
-    from aiida.backends.psql_dos.models.base import Base
-    from aiida.backends.psql_dos.models.comment import DbComment
-    from aiida.backends.psql_dos.models.computer import DbComputer
-    from aiida.backends.psql_dos.models.group import DbGroup
-    from aiida.backends.psql_dos.models.log import DbLog
-    from aiida.backends.psql_dos.models.node import DbLink, DbNode
-    from aiida.backends.psql_dos.models.settings import DbSetting
-    from aiida.backends.psql_dos.models.user import DbUser
     from aiida.common.exceptions import DbContentError
+    from aiida.storage.psql_dos.models.authinfo import DbAuthInfo
+    from aiida.storage.psql_dos.models.base import Base
+    from aiida.storage.psql_dos.models.comment import DbComment
+    from aiida.storage.psql_dos.models.computer import DbComputer
+    from aiida.storage.psql_dos.models.group import DbGroup
+    from aiida.storage.psql_dos.models.log import DbLog
+    from aiida.storage.psql_dos.models.node import DbLink, DbNode
+    from aiida.storage.psql_dos.models.settings import DbSetting
+    from aiida.storage.psql_dos.models.user import DbUser
     config = context.config  # pylint: disable=no-member
 
     connection = config.attributes.get('connection', None)

diff --git a/...ckends/psql_dos/migrations/script.py.mako → ...torage/psql_dos/migrations/script.py.mako b/...ckends/psql_dos/migrations/script.py.mako → ...torage/psql_dos/migrations/script.py.mako
diff --git a/...nds/psql_dos/migrations/utils/__init__.py → ...age/psql_dos/migrations/utils/__init__.py b/...nds/psql_dos/migrations/utils/__init__.py → ...age/psql_dos/migrations/utils/__init__.py
diff --git a/...s/psql_dos/migrations/utils/calc_state.py → ...e/psql_dos/migrations/utils/calc_state.py b/...s/psql_dos/migrations/utils/calc_state.py → ...e/psql_dos/migrations/utils/calc_state.py
diff --git a/...os/migrations/utils/create_dbattribute.py → ...os/migrations/utils/create_dbattribute.py b/...os/migrations/utils/create_dbattribute.py → ...os/migrations/utils/create_dbattribute.py
diff --git a/...psql_dos/migrations/utils/dblog_update.py → ...psql_dos/migrations/utils/dblog_update.py b/...psql_dos/migrations/utils/dblog_update.py → ...psql_dos/migrations/utils/dblog_update.py
diff --git a/...l_dos/migrations/utils/duplicate_uuids.py → ...l_dos/migrations/utils/duplicate_uuids.py b/...l_dos/migrations/utils/duplicate_uuids.py → ...l_dos/migrations/utils/duplicate_uuids.py
diff --git a/...ds/psql_dos/migrations/utils/integrity.py → ...ge/psql_dos/migrations/utils/integrity.py b/...ds/psql_dos/migrations/utils/integrity.py → ...ge/psql_dos/migrations/utils/integrity.py
diff --git a/..._dos/migrations/utils/legacy_workflows.py → ..._dos/migrations/utils/legacy_workflows.py b/..._dos/migrations/utils/legacy_workflows.py → ..._dos/migrations/utils/legacy_workflows.py
diff --git a/...os/migrations/utils/migrate_repository.py → ...os/migrations/utils/migrate_repository.py b/...os/migrations/utils/migrate_repository.py → ...os/migrations/utils/migrate_repository.py
@@ -18,11 +18,11 @@
 from sqlalchemy.dialects.postgresql import JSONB, UUID
 from sqlalchemy.sql import column, func, select, table, text
 
-from aiida.backends.psql_dos.backend import CONTAINER_DEFAULTS
-from aiida.backends.psql_dos.migrations.utils import utils
 from aiida.cmdline.utils import echo
 from aiida.common import exceptions
 from aiida.common.progress_reporter import get_progress_reporter, set_progress_bar_tqdm, set_progress_reporter
+from aiida.storage.psql_dos.backend import CONTAINER_DEFAULTS
+from aiida.storage.psql_dos.migrations.utils import utils
 
 
 def migrate_repository(connection, profile):

diff --git a/...kends/psql_dos/migrations/utils/parity.py → ...orage/psql_dos/migrations/utils/parity.py b/...kends/psql_dos/migrations/utils/parity.py → ...orage/psql_dos/migrations/utils/parity.py
@@ -10,7 +10,7 @@
 """Utilities for synchronizing the django and sqlalchemy schema."""
 import alembic
 
-from aiida.backends.psql_dos.migrations.utils import ReflectMigrations
+from aiida.storage.psql_dos.migrations.utils import ReflectMigrations
 
 
 def synchronize_schemas(alembic_op: alembic.op) -> None:
@@ -20,7 +20,7 @@ def synchronize_schemas(alembic_op: alembic.op) -> None:
     2. Remove and recreate all unique constraints, with standard names.
     3. Remove and recreate all foreign key constraints, with standard names and other rules.
 
-    Schema naming conventions are defined ``aiida/backends/sqlalchemy/models/base.py::naming_convention``.
+    Schema naming conventions are defined ``aiida/storage/sqlalchemy/models/base.py::naming_convention``.
 
     Note we assume here that (a) all primary keys are already correct, and (b) there are no check constraints.
     """

diff --git a/...s/migrations/utils/provenance_redesign.py → ...s/migrations/utils/provenance_redesign.py b/...s/migrations/utils/provenance_redesign.py → ...s/migrations/utils/provenance_redesign.py
diff --git a/...ends/psql_dos/migrations/utils/reflect.py → ...rage/psql_dos/migrations/utils/reflect.py b/...ends/psql_dos/migrations/utils/reflect.py → ...rage/psql_dos/migrations/utils/reflect.py
diff --git a/...ckends/psql_dos/migrations/utils/utils.py → ...torage/psql_dos/migrations/utils/utils.py b/...ckends/psql_dos/migrations/utils/utils.py → ...torage/psql_dos/migrations/utils/utils.py
diff --git a/...s/versions/041a79fc615f_dblog_cleaning.py → ...s/versions/041a79fc615f_dblog_cleaning.py b/...s/versions/041a79fc615f_dblog_cleaning.py → ...s/versions/041a79fc615f_dblog_cleaning.py
@@ -23,7 +23,7 @@
 import sqlalchemy as sa
 from sqlalchemy.sql import text
 
-from aiida.backends.psql_dos.migrations.utils.dblog_update import export_and_clean_workflow_logs
+from aiida.storage.psql_dos.migrations.utils.dblog_update import export_and_clean_workflow_logs
 
 # revision identifiers, used by Alembic.
 revision = '041a79fc615f'

diff --git a/...78e6209_drop_computer_transport_params.py → ...78e6209_drop_computer_transport_params.py b/...78e6209_drop_computer_transport_params.py → ...78e6209_drop_computer_transport_params.py
diff --git a/...bbeab274d_base_data_plugin_type_string.py → ...bbeab274d_base_data_plugin_type_string.py b/...bbeab274d_base_data_plugin_type_string.py → ...bbeab274d_base_data_plugin_type_string.py
diff --git a/...s/versions/0edcdd5a30f0_dbgroup_extras.py → ...s/versions/0edcdd5a30f0_dbgroup_extras.py b/...s/versions/0edcdd5a30f0_dbgroup_extras.py → ...s/versions/0edcdd5a30f0_dbgroup_extras.py
diff --git a/...rsions/118349c10896_default_link_label.py → ...rsions/118349c10896_default_link_label.py b/...rsions/118349c10896_default_link_label.py → ...rsions/118349c10896_default_link_label.py
diff --git a/...98d4d3_trajectory_symbols_to_attribute.py → ...98d4d3_trajectory_symbols_to_attribute.py b/...98d4d3_trajectory_symbols_to_attribute.py → ...98d4d3_trajectory_symbols_to_attribute.py
@@ -27,7 +27,7 @@
 from sqlalchemy.dialects.postgresql import JSONB, UUID
 from sqlalchemy.sql import column, func, select, table
 
-from aiida.backends.psql_dos.migrations.utils.utils import load_numpy_array_from_repository
+from aiida.storage.psql_dos.migrations.utils.utils import load_numpy_array_from_repository
 
 # revision identifiers, used by Alembic.
 revision = '12536798d4d3'

diff --git a/...c971ae0a3_migrate_builtin_calculations.py → ...c971ae0a3_migrate_builtin_calculations.py b/...c971ae0a3_migrate_builtin_calculations.py → ...c971ae0a3_migrate_builtin_calculations.py
diff --git a/...versions/162b99bca4a2_drop_dbcalcstate.py → ...versions/162b99bca4a2_drop_dbcalcstate.py b/...versions/162b99bca4a2_drop_dbcalcstate.py → ...versions/162b99bca4a2_drop_dbcalcstate.py
diff --git a/...1_drop_node_columns_nodeversion_public.py → ...1_drop_node_columns_nodeversion_public.py b/...1_drop_node_columns_nodeversion_public.py → ...1_drop_node_columns_nodeversion_public.py
diff --git a/...s/1b8ed3425af9_remove_legacy_workflows.py → ...s/1b8ed3425af9_remove_legacy_workflows.py b/...s/1b8ed3425af9_remove_legacy_workflows.py → ...s/1b8ed3425af9_remove_legacy_workflows.py
@@ -19,7 +19,7 @@
 """
 from alembic import op
 
-from aiida.backends.psql_dos.migrations.utils.legacy_workflows import export_workflow_data
+from aiida.storage.psql_dos.migrations.utils.legacy_workflows import export_workflow_data
 
 # revision identifiers, used by Alembic.
 revision = '1b8ed3425af9'

diff --git a/.../versions/1de112340b16_django_parity_1.py → .../versions/1de112340b16_django_parity_1.py b/.../versions/1de112340b16_django_parity_1.py → .../versions/1de112340b16_django_parity_1.py
diff --git a/.../versions/1de112340b17_django_parity_2.py → .../versions/1de112340b17_django_parity_2.py b/.../versions/1de112340b17_django_parity_2.py → .../versions/1de112340b17_django_parity_2.py
diff --git a/.../versions/1de112340b18_django_parity_3.py → .../versions/1de112340b18_django_parity_3.py b/.../versions/1de112340b18_django_parity_3.py → .../versions/1de112340b18_django_parity_3.py
@@ -18,7 +18,7 @@
 """
 from alembic import op
 
-from aiida.backends.psql_dos.migrations.utils.parity import synchronize_schemas
+from aiida.storage.psql_dos.migrations.utils.parity import synchronize_schemas
 
 revision = '1de112340b18'
 down_revision = '1de112340b17'

diff --git a/...rsions/1feaea71bd5a_migrate_repository.py → ...rsions/1feaea71bd5a_migrate_repository.py b/...rsions/1feaea71bd5a_migrate_repository.py → ...rsions/1feaea71bd5a_migrate_repository.py
@@ -26,7 +26,7 @@
 
 def upgrade():
     """Migrations for the upgrade."""
-    from aiida.backends.psql_dos.migrations.utils.migrate_repository import migrate_repository
+    from aiida.storage.psql_dos.migrations.utils.migrate_repository import migrate_repository
 
     migrate_repository(op.get_bind(), op.get_context().opts['aiida_profile'])
 

diff --git a/...sions/239cea6d2452_provenance_redesign.py → ...sions/239cea6d2452_provenance_redesign.py b/...sions/239cea6d2452_provenance_redesign.py → ...sions/239cea6d2452_provenance_redesign.py
@@ -26,7 +26,7 @@
 
 def upgrade():
     """Migrations for the upgrade."""
-    from aiida.backends.psql_dos.migrations.utils import provenance_redesign
+    from aiida.storage.psql_dos.migrations.utils import provenance_redesign
 
     # Migrate calculation nodes by inferring the process type from the type string
     provenance_redesign.migrate_infer_calculation_entry_point(op)

diff --git a/...data_migration_legacy_job_calculations.py → ...data_migration_legacy_job_calculations.py b/...data_migration_legacy_job_calculations.py → ...data_migration_legacy_job_calculations.py
diff --git a/...s/34a831f4286d_entry_point_core_prefix.py → ...s/34a831f4286d_entry_point_core_prefix.py b/...s/34a831f4286d_entry_point_core_prefix.py → ...s/34a831f4286d_entry_point_core_prefix.py
diff --git a/...35d4ee9a1b0e_code_hidden_attr_to_extra.py → ...35d4ee9a1b0e_code_hidden_attr_to_extra.py b/...35d4ee9a1b0e_code_hidden_attr_to_extra.py → ...35d4ee9a1b0e_code_hidden_attr_to_extra.py
diff --git a/...70663_dblog_uuid_uniqueness_constraint.py → ...70663_dblog_uuid_uniqueness_constraint.py b/...70663_dblog_uuid_uniqueness_constraint.py → ...70663_dblog_uuid_uniqueness_constraint.py
diff --git a/...3d4882837_make_all_uuid_columns_unique.py → ...3d4882837_make_all_uuid_columns_unique.py b/...3d4882837_make_all_uuid_columns_unique.py → ...3d4882837_make_all_uuid_columns_unique.py
@@ -33,7 +33,7 @@
 
 def upgrade():
     """Migrations for the upgrade."""
-    from aiida.backends.psql_dos.migrations.utils.duplicate_uuids import verify_uuid_uniqueness
+    from aiida.storage.psql_dos.migrations.utils.duplicate_uuids import verify_uuid_uniqueness
     for table in tables:
         verify_uuid_uniqueness(table, op.get_bind())
         op.create_unique_constraint(f'{table}_uuid_key', table, ['uuid'])

diff --git a/...3d6190594e19_remove_dbcomputer_enabled.py → ...3d6190594e19_remove_dbcomputer_enabled.py b/...3d6190594e19_remove_dbcomputer_enabled.py → ...3d6190594e19_remove_dbcomputer_enabled.py
diff --git a/...ns/535039300e4a_computer_name_to_label.py → ...ns/535039300e4a_computer_name_to_label.py b/...ns/535039300e4a_computer_name_to_label.py → ...ns/535039300e4a_computer_name_to_label.py
diff --git a/...adding_indexes_and_constraints_to_the_.py → ...adding_indexes_and_constraints_to_the_.py b/...adding_indexes_and_constraints_to_the_.py → ...adding_indexes_and_constraints_to_the_.py
diff --git a/...s/versions/5a49629f0d45_dblink_indices.py → ...s/versions/5a49629f0d45_dblink_indices.py b/...s/versions/5a49629f0d45_dblink_indices.py → ...s/versions/5a49629f0d45_dblink_indices.py
diff --git a/...ns/5d4d844852b6_invalidating_node_hash.py → ...ns/5d4d844852b6_invalidating_node_hash.py b/...ns/5d4d844852b6_invalidating_node_hash.py → ...ns/5d4d844852b6_invalidating_node_hash.py
diff --git a/...e52864_dbnode_type_to_dbnode_node_type.py → ...e52864_dbnode_type_to_dbnode_node_type.py b/...e52864_dbnode_type_to_dbnode_node_type.py → ...e52864_dbnode_type_to_dbnode_node_type.py
diff --git a/...rsions/61fc0913fae9_remove_node_prefix.py → ...rsions/61fc0913fae9_remove_node_prefix.py b/...rsions/61fc0913fae9_remove_node_prefix.py → ...rsions/61fc0913fae9_remove_node_prefix.py
diff --git a/...36de90_add_node_uuid_unique_constraint.py → ...36de90_add_node_uuid_unique_constraint.py b/...36de90_add_node_uuid_unique_constraint.py → ...36de90_add_node_uuid_unique_constraint.py
@@ -26,7 +26,7 @@
 
 def upgrade():
     """Migrations for the upgrade."""
-    from aiida.backends.psql_dos.migrations.utils.duplicate_uuids import verify_uuid_uniqueness
+    from aiida.storage.psql_dos.migrations.utils.duplicate_uuids import verify_uuid_uniqueness
     verify_uuid_uniqueness('db_dbnode', op.get_bind())
     op.create_unique_constraint('db_dbnode_uuid_key', 'db_dbnode', ['uuid'])
 

diff --git a/...c2ea1439d_move_data_within_node_module.py → ...c2ea1439d_move_data_within_node_module.py b/...c2ea1439d_move_data_within_node_module.py → ...c2ea1439d_move_data_within_node_module.py
diff --git a/...ons/versions/6c629c886f84_process_type.py → ...ons/versions/6c629c886f84_process_type.py b/...ons/versions/6c629c886f84_process_type.py → ...ons/versions/6c629c886f84_process_type.py
diff --git a/...ns/versions/70c7d732f1b2_delete_dbpath.py → ...ns/versions/70c7d732f1b2_delete_dbpath.py b/...ns/versions/70c7d732f1b2_delete_dbpath.py → ...ns/versions/70c7d732f1b2_delete_dbpath.py
diff --git a/...6a82b2cc4_add_node_repository_metadata.py → ...6a82b2cc4_add_node_repository_metadata.py b/...6a82b2cc4_add_node_repository_metadata.py → ...6a82b2cc4_add_node_repository_metadata.py
diff --git a/...unique_constraints_for_the_db_dbgroup_.py → ...unique_constraints_for_the_db_dbgroup_.py b/...unique_constraints_for_the_db_dbgroup_.py → ...unique_constraints_for_the_db_dbgroup_.py
diff --git a/...s/7b38a9e783e7_seal_unsealed_processes.py → ...s/7b38a9e783e7_seal_unsealed_processes.py b/...s/7b38a9e783e7_seal_unsealed_processes.py → ...s/7b38a9e783e7_seal_unsealed_processes.py
diff --git a/...c391c49_calc_job_option_attribute_keys.py → ...c391c49_calc_job_option_attribute_keys.py b/...c391c49_calc_job_option_attribute_keys.py → ...c391c49_calc_job_option_attribute_keys.py
diff --git a/...25_add_indexes_to_dbworkflowdata_table.py → ...25_add_indexes_to_dbworkflowdata_table.py b/...25_add_indexes_to_dbworkflowdata_table.py → ...25_add_indexes_to_dbworkflowdata_table.py
diff --git a/...ions/91b573400be5_prepare_schema_reset.py → ...ions/91b573400be5_prepare_schema_reset.py b/...ions/91b573400be5_prepare_schema_reset.py → ...ions/91b573400be5_prepare_schema_reset.py
diff --git a/.../psql_dos/migrations/versions/__init__.py → .../psql_dos/migrations/versions/__init__.py b/.../psql_dos/migrations/versions/__init__.py → .../psql_dos/migrations/versions/__init__.py
diff --git a/...ions/versions/a514d673c163_drop_dblock.py → ...ions/versions/a514d673c163_drop_dblock.py b/...ions/versions/a514d673c163_drop_dblock.py → ...ions/versions/a514d673c163_drop_dblock.py
diff --git a/...ns/a603da2cc809_code_sub_class_of_data.py → ...ns/a603da2cc809_code_sub_class_of_data.py b/...ns/a603da2cc809_code_sub_class_of_data.py → ...ns/a603da2cc809_code_sub_class_of_data.py
diff --git a/...versions/a6048f0ffca8_update_linktypes.py → ...versions/a6048f0ffca8_update_linktypes.py b/...versions/a6048f0ffca8_update_linktypes.py → ...versions/a6048f0ffca8_update_linktypes.py
diff --git a/...roup_name_to_label_type_to_type_string.py → ...roup_name_to_label_type_to_type_string.py b/...roup_name_to_label_type_to_type_string.py → ...roup_name_to_label_type_to_type_string.py
diff --git a/...sions/bf591f31dd12_dbgroup_type_string.py → ...sions/bf591f31dd12_dbgroup_type_string.py b/...sions/bf591f31dd12_dbgroup_type_string.py → ...sions/bf591f31dd12_dbgroup_type_string.py
diff --git a/...4bcc35_delete_trajectory_symbols_array.py → ...4bcc35_delete_trajectory_symbols_array.py b/...4bcc35_delete_trajectory_symbols_array.py → ...4bcc35_delete_trajectory_symbols_array.py
@@ -22,7 +22,7 @@
 from sqlalchemy.dialects.postgresql import JSONB, UUID
 from sqlalchemy.sql import column, select, table, text
 
-from aiida.backends.psql_dos.migrations.utils import utils
+from aiida.storage.psql_dos.migrations.utils import utils
 
 # revision identifiers, used by Alembic.
 revision = 'ce56d84bcc35'

diff --git a/...fdfed416_rename_parameter_data_to_dict.py → ...fdfed416_rename_parameter_data_to_dict.py b/...fdfed416_rename_parameter_data_to_dict.py → ...fdfed416_rename_parameter_data_to_dict.py
diff --git a/...sions/de2eaf6978b4_simplify_user_model.py → ...sions/de2eaf6978b4_simplify_user_model.py b/...sions/de2eaf6978b4_simplify_user_model.py → ...sions/de2eaf6978b4_simplify_user_model.py
diff --git a/...igrations/versions/django_0001_initial.py → ...igrations/versions/django_0001_initial.py b/...igrations/versions/django_0001_initial.py → ...igrations/versions/django_0001_initial.py
diff --git a/...s/versions/django_0002_db_state_change.py → ...s/versions/django_0002_db_state_change.py b/...s/versions/django_0002_db_state_change.py → ...s/versions/django_0002_db_state_change.py
diff --git a/...ons/versions/django_0003_add_link_type.py → ...ons/versions/django_0003_add_link_type.py b/...ons/versions/django_0003_add_link_type.py → ...ons/versions/django_0003_add_link_type.py
@@ -17,7 +17,7 @@
 from alembic import op
 import sqlalchemy as sa
 
-from aiida.backends.psql_dos.migrations.utils import ReflectMigrations
+from aiida.storage.psql_dos.migrations.utils import ReflectMigrations
 
 revision = 'django_0003'
 down_revision = 'django_0002'

diff --git a/...jango_0004_add_daemon_and_uuid_indices.py → ...jango_0004_add_daemon_and_uuid_indices.py b/...jango_0004_add_daemon_and_uuid_indices.py → ...jango_0004_add_daemon_and_uuid_indices.py
diff --git a/...ersions/django_0005_add_cmtime_indices.py → ...ersions/django_0005_add_cmtime_indices.py b/...ersions/django_0005_add_cmtime_indices.py → ...ersions/django_0005_add_cmtime_indices.py
diff --git a/...ons/versions/django_0006_delete_dbpath.py → ...ons/versions/django_0006_delete_dbpath.py b/...ons/versions/django_0006_delete_dbpath.py → ...ons/versions/django_0006_delete_dbpath.py
diff --git a/.../versions/django_0007_update_linktypes.py → .../versions/django_0007_update_linktypes.py b/.../versions/django_0007_update_linktypes.py → .../versions/django_0007_update_linktypes.py
diff --git a/...sions/django_0008_code_hidden_to_extra.py → ...sions/django_0008_code_hidden_to_extra.py b/...sions/django_0008_code_hidden_to_extra.py → ...sions/django_0008_code_hidden_to_extra.py
diff --git a/...ango_0009_base_data_plugin_type_string.py → ...ango_0009_base_data_plugin_type_string.py b/...ango_0009_base_data_plugin_type_string.py → ...ango_0009_base_data_plugin_type_string.py
diff --git a/...ions/versions/django_0010_process_type.py → ...ions/versions/django_0010_process_type.py b/...ions/versions/django_0010_process_type.py → ...ions/versions/django_0010_process_type.py
diff --git a/...rsions/django_0011_delete_kombu_tables.py → ...rsions/django_0011_delete_kombu_tables.py b/...rsions/django_0011_delete_kombu_tables.py → ...rsions/django_0011_delete_kombu_tables.py
diff --git a/...tions/versions/django_0012_drop_dblock.py → ...tions/versions/django_0012_drop_dblock.py b/...tions/versions/django_0012_drop_dblock.py → ...tions/versions/django_0012_drop_dblock.py
diff --git a/...ations/versions/django_0013_django_1_8.py → ...ations/versions/django_0013_django_1_8.py b/...ations/versions/django_0013_django_1_8.py → ...ations/versions/django_0013_django_1_8.py
@@ -17,7 +17,7 @@
 from alembic import op
 import sqlalchemy as sa
 
-from aiida.backends.psql_dos.migrations.utils import ReflectMigrations
+from aiida.storage.psql_dos.migrations.utils import ReflectMigrations
 
 revision = 'django_0013'
 down_revision = 'django_0012'

diff --git a/...o_0014_add_node_uuid_unique_constraint.py → ...o_0014_add_node_uuid_unique_constraint.py b/...o_0014_add_node_uuid_unique_constraint.py → ...o_0014_add_node_uuid_unique_constraint.py
@@ -24,7 +24,7 @@
 
 def upgrade():
     """Migrations for the upgrade."""
-    from aiida.backends.psql_dos.migrations.utils.duplicate_uuids import verify_uuid_uniqueness
+    from aiida.storage.psql_dos.migrations.utils.duplicate_uuids import verify_uuid_uniqueness
     verify_uuid_uniqueness('db_dbnode', op.get_bind())
     op.create_unique_constraint('db_dbnode_uuid_62e0bf98_uniq', 'db_dbnode', ['uuid'])
     op.drop_index('db_dbnode_uuid_62e0bf98', table_name='db_dbnode')

diff --git a/...ons/django_0015_invalidating_node_hash.py → ...ons/django_0015_invalidating_node_hash.py b/...ons/django_0015_invalidating_node_hash.py → ...ons/django_0015_invalidating_node_hash.py
diff --git a/...ons/django_0016_code_sub_class_of_data.py → ...ons/django_0016_code_sub_class_of_data.py b/...ons/django_0016_code_sub_class_of_data.py → ...ons/django_0016_code_sub_class_of_data.py
diff --git a/.../versions/django_0017_drop_dbcalcstate.py → .../versions/django_0017_drop_dbcalcstate.py b/.../versions/django_0017_drop_dbcalcstate.py → .../versions/django_0017_drop_dbcalcstate.py
diff --git a/...tions/versions/django_0018_django_1_11.py → ...tions/versions/django_0018_django_1_11.py b/...tions/versions/django_0018_django_1_11.py → ...tions/versions/django_0018_django_1_11.py
@@ -18,8 +18,8 @@
 import sqlalchemy as sa
 from sqlalchemy.dialects import postgresql
 
-from aiida.backends.psql_dos.migrations.utils import ReflectMigrations
-from aiida.backends.psql_dos.migrations.utils.duplicate_uuids import verify_uuid_uniqueness
+from aiida.storage.psql_dos.migrations.utils import ReflectMigrations
+from aiida.storage.psql_dos.migrations.utils.duplicate_uuids import verify_uuid_uniqueness
 
 revision = 'django_0018'
 down_revision = 'django_0017'

diff --git a/...ango_0019_migrate_builtin_calculations.py → ...ango_0019_migrate_builtin_calculations.py b/...ango_0019_migrate_builtin_calculations.py → ...ango_0019_migrate_builtin_calculations.py
diff --git a/...rsions/django_0020_provenance_redesign.py → ...rsions/django_0020_provenance_redesign.py b/...rsions/django_0020_provenance_redesign.py → ...rsions/django_0020_provenance_redesign.py
@@ -32,7 +32,7 @@
 
 def upgrade():
     """Migrations for the upgrade."""
-    from aiida.backends.psql_dos.migrations.utils import provenance_redesign
+    from aiida.storage.psql_dos.migrations.utils import provenance_redesign
 
     # Migrate calculation nodes by inferring the process type from the type string
     provenance_redesign.migrate_infer_calculation_entry_point(op)

diff --git a/...roup_name_to_label_type_to_type_string.py → ...roup_name_to_label_type_to_type_string.py b/...roup_name_to_label_type_to_type_string.py → ...roup_name_to_label_type_to_type_string.py
@@ -18,7 +18,7 @@
 """
 from alembic import op
 
-from aiida.backends.psql_dos.migrations.utils import ReflectMigrations
+from aiida.storage.psql_dos.migrations.utils import ReflectMigrations
 
 revision = 'django_0021'
 down_revision = 'django_0020'

diff --git a/...022_dbgroup_type_string_change_content.py → ...022_dbgroup_type_string_change_content.py b/...022_dbgroup_type_string_change_content.py → ...022_dbgroup_type_string_change_content.py
diff --git a/...go_0023_calc_job_option_attribute_keys.py → ...go_0023_calc_job_option_attribute_keys.py b/...go_0023_calc_job_option_attribute_keys.py → ...go_0023_calc_job_option_attribute_keys.py