Move database constants to constants folder (#6372)

backend/infrahub/config.py

@@ -23,7 +23,7 @@
 from pydantic_settings import BaseSettings, SettingsConfigDict
 from typing_extensions import Self
 
-from infrahub.database.constants import DatabaseType
+from infrahub.constants.database import DatabaseType
 from infrahub.exceptions import InitializationError, ProcessingError
 
 if TYPE_CHECKING:

backend/infrahub/core/graph/index.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from infrahub.database.constants import IndexType
+from infrahub.constants.database import IndexType
 from infrahub.database.index import IndexItem
 
 node_indexes: list[IndexItem] = [

backend/infrahub/core/migrations/graph/m014_remove_index_attr_value.py

@@ -2,10 +2,10 @@
 
 from typing import TYPE_CHECKING, Sequence
 
+from infrahub.constants.database import IndexType
 from infrahub.core.migrations.shared import MigrationResult
 from infrahub.core.query import Query  # noqa: TC001
 from infrahub.database import DatabaseType
-from infrahub.database.constants import IndexType
 from infrahub.database.index import IndexItem
 
 from ..shared import GraphMigration

backend/infrahub/database/__init__.py

@@ -26,13 +26,13 @@
 from typing_extensions import Self
 
 from infrahub import config, lock
+from infrahub.constants.database import DatabaseType, Neo4jRuntime
 from infrahub.core import registry
 from infrahub.core.query import QueryType
 from infrahub.exceptions import DatabaseError
 from infrahub.log import get_logger
 from infrahub.utils import InfrahubStringEnum
 
-from .constants import DatabaseType, Neo4jRuntime
 from .memgraph import DatabaseManagerMemgraph
 from .metrics import CONNECTION_POOL_USAGE, QUERY_EXECUTION_METRICS, TRANSACTION_RETRIES
 from .neo4j import DatabaseManagerNeo4j

backend/infrahub/database/index.py

@@ -5,7 +5,7 @@
 
 from pydantic import BaseModel
 
-from .constants import EntityType, IndexType  # noqa: TC001
+from infrahub.constants.database import EntityType, IndexType  # noqa: TC001
 
 if TYPE_CHECKING:
     from infrahub.database import InfrahubDatabase

backend/infrahub/database/memgraph.py

@@ -2,7 +2,8 @@
 
 from typing import TYPE_CHECKING
 
-from .constants import EntityType, IndexType
+from infrahub.constants.database import EntityType, IndexType
+
 from .index import IndexInfo, IndexItem, IndexManagerBase
 from .manager import DatabaseManager
 

backend/infrahub/database/neo4j.py

@@ -2,9 +2,9 @@
 
 from typing import TYPE_CHECKING
 
+from infrahub.constants.database import EntityType, IndexType
 from infrahub.core.query import QueryType
 
-from .constants import EntityType, IndexType
 from .index import IndexInfo, IndexItem, IndexManagerBase
 from .manager import DatabaseManager
 

backend/infrahub/git_credential/helper.py

@@ -3,9 +3,9 @@
 
 import typer
 from infrahub_sdk import Config, InfrahubClientSync
+from infrahub_sdk.protocols import CoreGenericRepository
 
 from infrahub import config
-from infrahub.core.constants import InfrahubKind
 
 logging.getLogger("httpx").setLevel(logging.ERROR)
 app = typer.Typer()
@@ -51,7 +51,7 @@ def get(
         raise typer.Exit(1) from exc
 
     client = InfrahubClientSync(config=Config(address=config.SETTINGS.main.internal_address, insert_tracker=True))
-    repo = client.get(kind=InfrahubKind.GENERICREPOSITORY, location__value=location)
+    repo = client.get(kind=CoreGenericRepository.__name__, location__value=location)
 
     if not repo:
         print("Repository not found in the database.")

backend/tests/helpers/query_benchmark/benchmark_config.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass
 
-from infrahub.database import Neo4jRuntime
+from infrahub.constants.database import Neo4jRuntime
 from tests.helpers.constants import NEO4J_ENTERPRISE_IMAGE
 
 

backend/tests/helpers/query_benchmark/db_query_profiler.py

@@ -9,9 +9,9 @@
 from neo4j import Record
 
 from infrahub.config import SETTINGS
+from infrahub.constants.database import Neo4jRuntime
 from infrahub.core.query import QueryType
 from infrahub.database import InfrahubDatabase
-from infrahub.database.constants import Neo4jRuntime
 from infrahub.log import get_logger
 from tests.helpers.constants import NEO4J_ENTERPRISE_IMAGE
 

backend/tests/query_benchmark/test_diff_query.py

@@ -3,11 +3,11 @@
 
 import pytest
 
+from infrahub.constants.database import Neo4jRuntime
 from infrahub.core import registry
 from infrahub.core.diff.calculator import DiffCalculator
 from infrahub.core.initialization import create_branch
 from infrahub.core.timestamp import Timestamp
-from infrahub.database.constants import Neo4jRuntime
 from infrahub.log import get_logger
 from tests.helpers.constants import NEO4J_COMMUNITY_IMAGE, NEO4J_ENTERPRISE_IMAGE
 from tests.helpers.query_benchmark.benchmark_config import BenchmarkConfig

backend/tests/query_benchmark/test_node_get_list.py

@@ -3,9 +3,9 @@
 
 import pytest
 
+from infrahub.constants.database import Neo4jRuntime
 from infrahub.core import registry
 from infrahub.core.query.node import NodeGetListQuery
-from infrahub.database.constants import Neo4jRuntime
 from infrahub.log import get_logger
 from tests.helpers.constants import NEO4J_ENTERPRISE_IMAGE
 from tests.helpers.query_benchmark.benchmark_config import BenchmarkConfig

backend/tests/query_benchmark/test_node_unique_attribute_constraint.py

@@ -3,6 +3,7 @@
 
 import pytest
 
+from infrahub.constants.database import Neo4jRuntime
 from infrahub.core import registry
 from infrahub.core.validators.uniqueness.model import (
     NodeUniquenessQueryRequest,
@@ -11,7 +12,6 @@
 )
 from infrahub.core.validators.uniqueness.query import NodeUniqueAttributeConstraintQuery
 from infrahub.database import QueryConfig
-from infrahub.database.constants import Neo4jRuntime
 from infrahub.log import get_logger
 from tests.helpers.constants import NEO4J_COMMUNITY_IMAGE, NEO4J_ENTERPRISE_IMAGE
 from tests.helpers.query_benchmark.benchmark_config import BenchmarkConfig

backend/tests/unit/core/migrations/graph/test_014.py

@@ -1,8 +1,8 @@
+from infrahub.constants.database import IndexType
 from infrahub.core.migrations.graph.m014_remove_index_attr_value import (
     Migration014,
 )
 from infrahub.database import DatabaseType, InfrahubDatabase
-from infrahub.database.constants import IndexType
 from infrahub.database.index import IndexItem
 
 

tasks/release.py

@@ -262,7 +262,7 @@ def get_enum_mappings() -> dict:
         TraceTransportProtocol,
         WorkflowDriver,
     )
-    from infrahub.database.constants import DatabaseType
+    from infrahub.constants.database import DatabaseType
 
     enum_mappings = {}