Use absolute paths for SDK imports

backend/infrahub/api/storage.py

@@ -1,7 +1,7 @@
 import hashlib
 
 from fastapi import APIRouter, Depends, File, Response, UploadFile
-from infrahub_sdk import UUIDT
+from infrahub_sdk.uuidt import UUIDT
 from pydantic import BaseModel
 
 from infrahub.api.dependencies import get_current_user

backend/infrahub/config.py

@@ -10,7 +10,7 @@
 from typing import TYPE_CHECKING, Any, Optional
 
 import toml
-from infrahub_sdk import generate_uuid
+from infrahub_sdk.utils import generate_uuid
 from pydantic import AliasChoices, BaseModel, Field, PrivateAttr, ValidationError, computed_field, model_validator
 from pydantic_settings import BaseSettings, SettingsConfigDict
 from typing_extensions import Self

backend/infrahub/core/attribute.py

@@ -7,9 +7,9 @@
 
 import netaddr
 import ujson
-from infrahub_sdk import UUIDT
 from infrahub_sdk.timestamp import TimestampFormatError
 from infrahub_sdk.utils import is_valid_url
+from infrahub_sdk.uuidt import UUIDT
 from pydantic import BaseModel, Field
 
 from infrahub import config

backend/infrahub/core/node/__init__.py

@@ -3,8 +3,8 @@
 from enum import Enum
 from typing import TYPE_CHECKING, Any, Optional, TypeVar, Union, overload
 
-from infrahub_sdk import UUIDT
 from infrahub_sdk.utils import is_valid_uuid
+from infrahub_sdk.uuidt import UUIDT
 
 from infrahub.core import registry
 from infrahub.core.constants import BranchSupportType, InfrahubKind, RelationshipCardinality

backend/infrahub/core/node/standard.py

@@ -5,7 +5,7 @@
 from uuid import UUID
 
 import ujson
-from infrahub_sdk import UUIDT
+from infrahub_sdk.uuidt import UUIDT
 from pydantic import BaseModel
 
 from infrahub.core.constants import NULL_VALUE

backend/infrahub/core/query/relationship.py

@@ -5,7 +5,7 @@
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, Generator, Optional, Union
 
-from infrahub_sdk import UUIDT
+from infrahub_sdk.uuidt import UUIDT
 
 from infrahub.core.constants import RelationshipDirection, RelationshipStatus
 from infrahub.core.query import Query, QueryType

backend/infrahub/core/relationship/model.py

@@ -17,8 +17,8 @@
     overload,
 )
 
-from infrahub_sdk import UUIDT
 from infrahub_sdk.utils import intersection, is_valid_uuid
+from infrahub_sdk.uuidt import UUIDT
 from pydantic import BaseModel, Field
 
 from infrahub.core import registry

backend/infrahub/core/timestamp.py

@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING, Any
 
-from infrahub_sdk import Timestamp as BaseTimestamp
+from infrahub_sdk.timestamp import Timestamp as BaseTimestamp
 
 if TYPE_CHECKING:
     from pendulum.datetime import DateTime

backend/infrahub/git/integrator.py

@@ -10,12 +10,8 @@
 import jinja2
 import ujson
 import yaml
-from infrahub_sdk import (
-    InfrahubClient,
-    InfrahubNode,
-    InfrahubRepositoryConfig,
-    ValidationError,
-)
+from infrahub_sdk import InfrahubClient  # noqa: TCH002
+from infrahub_sdk.exceptions import ValidationError
 from infrahub_sdk.protocols import (
     CoreArtifact,
     CoreArtifactDefinition,
@@ -31,6 +27,7 @@
     InfrahubGeneratorDefinitionConfig,
     InfrahubJinja2TransformConfig,
     InfrahubPythonTransformConfig,
+    InfrahubRepositoryConfig,
 )
 from infrahub_sdk.utils import compare_lists
 from infrahub_sdk.yaml import SchemaFile
@@ -46,6 +43,7 @@
     import types
 
     from infrahub_sdk.checks import InfrahubCheck
+    from infrahub_sdk.node import InfrahubNode
     from infrahub_sdk.schema import InfrahubRepositoryArtifactDefinitionConfig
     from infrahub_sdk.transforms import InfrahubTransform
 

backend/infrahub/git/repository.py

@@ -3,7 +3,7 @@
 from typing import Any, Optional, Union
 
 from git.exc import BadName, GitCommandError
-from infrahub_sdk import GraphQLError
+from infrahub_sdk.exceptions import GraphQLError
 from pydantic import Field
 
 from infrahub.core.constants import InfrahubKind, RepositoryInternalStatus

backend/infrahub/graphql/mutations/account.py

@@ -2,8 +2,8 @@
 
 from graphene import Boolean, Field, InputField, InputObjectType, Mutation, String
 from graphql import GraphQLResolveInfo
-from infrahub_sdk import UUIDT
 from infrahub_sdk.utils import extract_fields
+from infrahub_sdk.uuidt import UUIDT
 from typing_extensions import Self
 
 from infrahub.auth import AuthType

backend/infrahub/message_bus/operations/check/generator.py

@@ -1,7 +1,7 @@
 import os
 
-from infrahub_sdk import InfrahubNode
 from infrahub_sdk.exceptions import ModuleImportError
+from infrahub_sdk.node import InfrahubNode
 from infrahub_sdk.schema import InfrahubGeneratorDefinitionConfig
 from prefect import flow
 

backend/infrahub/message_bus/operations/check/repository.py

@@ -1,6 +1,6 @@
 from typing import List
 
-from infrahub_sdk import UUIDT
+from infrahub_sdk.uuidt import UUIDT
 from prefect import flow
 
 from infrahub import lock

backend/infrahub/message_bus/operations/requests/artifact_definition.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-from infrahub_sdk import UUIDT
+from infrahub_sdk.uuidt import UUIDT
 from prefect import flow
 
 from infrahub.core.constants import InfrahubKind, ValidatorConclusion, ValidatorState

backend/infrahub/message_bus/operations/requests/generator.py

@@ -1,7 +1,7 @@
 import os
 
-from infrahub_sdk import InfrahubNode
 from infrahub_sdk.exceptions import ModuleImportError
+from infrahub_sdk.node import InfrahubNode
 from infrahub_sdk.protocols import CoreGeneratorInstance
 from infrahub_sdk.schema import InfrahubGeneratorDefinitionConfig
 from prefect import flow

backend/infrahub/message_bus/operations/requests/generator_definition.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-from infrahub_sdk import UUIDT
+from infrahub_sdk.uuidt import UUIDT
 from prefect import flow
 
 from infrahub.core.constants import InfrahubKind, ValidatorConclusion, ValidatorState

backend/infrahub/message_bus/operations/requests/graphql_query_group.py

@@ -1,6 +1,7 @@
 from typing import List
 
-from infrahub_sdk import InfrahubClient, InfrahubNode
+from infrahub_sdk import InfrahubClient
+from infrahub_sdk.node import InfrahubNode
 from infrahub_sdk.utils import dict_hash
 from prefect import flow
 

backend/infrahub/message_bus/operations/requests/repository.py

@@ -1,6 +1,6 @@
 from typing import List
 
-from infrahub_sdk import UUIDT
+from infrahub_sdk.uuidt import UUIDT
 from prefect import flow
 
 from infrahub.core.constants import InfrahubKind

backend/infrahub/services/adapters/message_bus/local.py

@@ -4,7 +4,7 @@
 from typing import TYPE_CHECKING, Optional, TypeVar
 
 import ujson
-from infrahub_sdk import UUIDT
+from infrahub_sdk.uuidt import UUIDT
 
 from infrahub.dependencies.registry import build_component_registry
 from infrahub.message_bus import InfrahubMessage, Meta

backend/infrahub/services/adapters/message_bus/nats.py

@@ -6,7 +6,7 @@
 
 import nats
 import ujson
-from infrahub_sdk import UUIDT
+from infrahub_sdk.uuidt import UUIDT
 from opentelemetry import context, propagate, trace
 from opentelemetry.instrumentation.utils import is_instrumentation_enabled
 

backend/infrahub/services/adapters/message_bus/rabbitmq.py

@@ -6,7 +6,7 @@
 import aio_pika
 import opentelemetry.instrumentation.aio_pika.span_builder
 import ujson
-from infrahub_sdk import UUIDT
+from infrahub_sdk.uuidt import UUIDT
 from opentelemetry.instrumentation.aio_pika import AioPikaInstrumentor
 from opentelemetry.semconv.trace import SpanAttributes
 

backend/infrahub/tasks/artifact.py

@@ -1,6 +1,6 @@
 from typing import Union
 
-from infrahub_sdk import InfrahubNode
+from infrahub_sdk.node import InfrahubNode
 
 from infrahub import lock
 from infrahub.core.constants import InfrahubKind

backend/tests/adapters/message_bus.py

@@ -2,7 +2,7 @@
 from typing import Optional, TypeVar
 
 import ujson
-from infrahub_sdk import UUIDT
+from infrahub_sdk.uuidt import UUIDT
 
 from infrahub.components import ComponentType
 from infrahub.database import InfrahubDatabase

backend/tests/helpers/test_app.py

@@ -2,7 +2,8 @@
 from typing import Generator
 
 import pytest
-from infrahub_sdk import UUIDT, Config, InfrahubClient
+from infrahub_sdk import Config, InfrahubClient
+from infrahub_sdk.uuidt import UUIDT
 
 from infrahub import config
 from infrahub.core import registry

backend/tests/integration/conftest.py

@@ -5,7 +5,7 @@
 
 import pytest
 import yaml
-from infrahub_sdk import UUIDT
+from infrahub_sdk.uuidt import UUIDT
 from prefect.testing.utilities import prefect_test_harness
 
 from infrahub import config

backend/tests/integration/git/test_git_repository.py

@@ -3,7 +3,8 @@
 
 import pytest
 import yaml
-from infrahub_sdk import Config, InfrahubClient, NodeNotFoundError
+from infrahub_sdk import Config, InfrahubClient
+from infrahub_sdk.exceptions import NodeNotFoundError
 
 from infrahub import config
 from infrahub.core import registry

backend/tests/test_data/dataset03.py

@@ -2,7 +2,7 @@
 from collections import defaultdict
 from ipaddress import IPv4Network
 
-from infrahub_sdk import UUIDT
+from infrahub_sdk.uuidt import UUIDT
 
 from infrahub.core.manager import NodeManager
 from infrahub.core.node import Node

backend/tests/unit/conftest.py

@@ -6,7 +6,8 @@
 
 import pendulum
 import pytest
-from infrahub_sdk import UUIDT, Config, InfrahubClient
+from infrahub_sdk import Config, InfrahubClient
+from infrahub_sdk.uuidt import UUIDT
 from neo4j._codec.hydration.v1 import HydrationHandler
 from pytest_httpx import HTTPXMock
 

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

@@ -1,4 +1,4 @@
-from infrahub_sdk import UUIDT
+from infrahub_sdk.uuidt import UUIDT
 
 from infrahub.core.migrations.graph import Migration001
 from infrahub.database import InfrahubDatabase

backend/tests/unit/core/migrations/schema/test_node_attribute_add.py

@@ -1,7 +1,8 @@
 import uuid
 
 import pytest
-from infrahub_sdk import UUIDT, InfrahubClient
+from infrahub_sdk import InfrahubClient
+from infrahub_sdk.uuidt import UUIDT
 
 from infrahub.core.constants import SchemaPathType
 from infrahub.core.migrations.schema.node_attribute_add import (

backend/tests/unit/core/migrations/schema/test_node_remove.py

@@ -1,4 +1,5 @@
-from infrahub_sdk import UUIDT, InfrahubClient
+from infrahub_sdk import InfrahubClient
+from infrahub_sdk.uuidt import UUIDT
 
 from infrahub.core import registry
 from infrahub.core.branch import Branch

backend/tests/unit/core/test_attribute.py

@@ -1,7 +1,7 @@
 from enum import Enum
 
 import pytest
-from infrahub_sdk import UUIDT
+from infrahub_sdk.uuidt import UUIDT
 
 from infrahub import config
 from infrahub.core.attribute import (

backend/tests/unit/core/test_manager_node.py

@@ -1,5 +1,5 @@
 import pytest
-from infrahub_sdk import UUIDT
+from infrahub_sdk.uuidt import UUIDT
 
 from infrahub.core.branch import Branch
 from infrahub.core.initialization import create_branch

backend/tests/unit/core/test_node.py

@@ -1,5 +1,5 @@
 import pytest
-from infrahub_sdk import UUIDT
+from infrahub_sdk.uuidt import UUIDT
 
 from infrahub.core import registry
 from infrahub.core.branch import Branch

backend/tests/unit/git/conftest.py

@@ -8,9 +8,11 @@
 import pytest
 import ujson
 from git import Repo
-from infrahub_sdk import UUIDT, Config, InfrahubClient, InfrahubNode
-from infrahub_sdk import SchemaRoot as ClientSchemaRoot
+from infrahub_sdk import Config, InfrahubClient
 from infrahub_sdk.branch import BranchData
+from infrahub_sdk.node import InfrahubNode
+from infrahub_sdk.schema import SchemaRoot as ClientSchemaRoot
+from infrahub_sdk.uuidt import UUIDT
 from pytest_httpx import HTTPXMock
 
 from infrahub.core.constants import InfrahubKind

backend/tests/unit/git/test_git_read_only_repository.py

@@ -2,8 +2,8 @@
 from typing import Dict
 from unittest.mock import AsyncMock
 
-from infrahub_sdk import UUIDT
 from infrahub_sdk.client import Config, InfrahubClient
+from infrahub_sdk.uuidt import UUIDT
 
 from infrahub.git.repository import InfrahubReadOnlyRepository
 from tests.helpers.test_client import dummy_async_request

backend/tests/unit/git/test_git_repository.py

@@ -3,8 +3,10 @@
 
 import pytest
 from git import Repo
-from infrahub_sdk import UUIDT, Config, InfrahubClient, InfrahubNode
+from infrahub_sdk import Config, InfrahubClient
 from infrahub_sdk.branch import BranchData
+from infrahub_sdk.node import InfrahubNode
+from infrahub_sdk.uuidt import UUIDT
 from pytest_httpx._httpx_mock import HTTPXMock
 
 from infrahub.core.constants import InfrahubKind

backend/tests/unit/git/test_git_rpc.py

@@ -3,7 +3,8 @@
 from typing import TYPE_CHECKING, Any, Optional
 from unittest.mock import AsyncMock, patch
 
-from infrahub_sdk import UUIDT, Config, InfrahubClient
+from infrahub_sdk import Config, InfrahubClient
+from infrahub_sdk.uuidt import UUIDT
 from typing_extensions import Self
 
 from infrahub.core.constants import InfrahubKind, RepositoryInternalStatus

backend/tests/unit/git/test_git_transform.py

@@ -1,4 +1,4 @@
-from infrahub_sdk import UUIDT
+from infrahub_sdk.uuidt import UUIDT
 
 from infrahub.core.constants import InfrahubKind
 from infrahub.git import InfrahubRepository

backend/tests/unit/graphql/test_mutation_relationship.py

@@ -1,5 +1,5 @@
 from graphql import graphql
-from infrahub_sdk import UUIDT
+from infrahub_sdk.uuidt import UUIDT
 
 from infrahub.core.branch import Branch
 from infrahub.core.constants import InfrahubKind

backend/tests/unit/storage/test_local_storage.py

@@ -3,7 +3,7 @@
 
 import fastapi_storages
 import pytest
-from infrahub_sdk import UUIDT
+from infrahub_sdk.uuidt import UUIDT
 
 from infrahub import config
 from infrahub.exceptions import NodeNotFoundError