Use absolute paths for SDK imports

Author: ogenstad

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