From dfc0a554952152e703c2b9f326829f2001efd203 Mon Sep 17 00:00:00 2001 From: Patrick Ogenstad Date: Thu, 17 Oct 2024 20:22:52 +0200 Subject: [PATCH] Use absolute paths for SDK imports --- backend/infrahub/api/storage.py | 2 +- backend/infrahub/config.py | 2 +- backend/infrahub/core/attribute.py | 2 +- backend/infrahub/core/node/__init__.py | 2 +- backend/infrahub/core/node/standard.py | 2 +- backend/infrahub/core/query/relationship.py | 2 +- backend/infrahub/core/relationship/model.py | 2 +- backend/infrahub/core/timestamp.py | 2 +- backend/infrahub/git/integrator.py | 10 ++++------ backend/infrahub/git/repository.py | 2 +- backend/infrahub/graphql/mutations/account.py | 2 +- .../infrahub/message_bus/operations/check/generator.py | 2 +- .../message_bus/operations/check/repository.py | 2 +- .../operations/requests/artifact_definition.py | 2 +- .../message_bus/operations/requests/generator.py | 2 +- .../operations/requests/generator_definition.py | 2 +- .../operations/requests/graphql_query_group.py | 3 ++- .../message_bus/operations/requests/repository.py | 2 +- .../infrahub/services/adapters/message_bus/local.py | 2 +- backend/infrahub/services/adapters/message_bus/nats.py | 2 +- .../infrahub/services/adapters/message_bus/rabbitmq.py | 2 +- backend/infrahub/tasks/artifact.py | 2 +- backend/tests/adapters/message_bus.py | 2 +- backend/tests/helpers/test_app.py | 3 ++- backend/tests/integration/conftest.py | 2 +- backend/tests/integration/git/test_git_repository.py | 3 ++- backend/tests/test_data/dataset03.py | 2 +- backend/tests/unit/conftest.py | 3 ++- backend/tests/unit/core/migrations/graph/test_001.py | 2 +- .../core/migrations/schema/test_node_attribute_add.py | 3 ++- .../unit/core/migrations/schema/test_node_remove.py | 3 ++- backend/tests/unit/core/test_attribute.py | 2 +- backend/tests/unit/core/test_manager_node.py | 2 +- backend/tests/unit/core/test_node.py | 2 +- backend/tests/unit/git/conftest.py | 6 ++++-- .../tests/unit/git/test_git_read_only_repository.py | 2 +- backend/tests/unit/git/test_git_repository.py | 4 +++- backend/tests/unit/git/test_git_rpc.py | 3 ++- backend/tests/unit/git/test_git_transform.py | 2 +- .../tests/unit/graphql/test_mutation_relationship.py | 2 +- backend/tests/unit/storage/test_local_storage.py | 2 +- models/examples/security/infrastructure_security.py | 4 +++- models/infrastructure_edge.py | 4 +++- python_sdk | 2 +- 44 files changed, 63 insertions(+), 50 deletions(-) diff --git a/backend/infrahub/api/storage.py b/backend/infrahub/api/storage.py index 8d7a935fec..77b903abc7 100644 --- a/backend/infrahub/api/storage.py +++ b/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 diff --git a/backend/infrahub/config.py b/backend/infrahub/config.py index 64b67802ef..7d86f89b7b 100644 --- a/backend/infrahub/config.py +++ b/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 diff --git a/backend/infrahub/core/attribute.py b/backend/infrahub/core/attribute.py index 637b3cb35e..008ff1af82 100644 --- a/backend/infrahub/core/attribute.py +++ b/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 diff --git a/backend/infrahub/core/node/__init__.py b/backend/infrahub/core/node/__init__.py index 109ebbdc2f..679a4ec240 100644 --- a/backend/infrahub/core/node/__init__.py +++ b/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 diff --git a/backend/infrahub/core/node/standard.py b/backend/infrahub/core/node/standard.py index cb0160b8c9..27a5ad4a01 100644 --- a/backend/infrahub/core/node/standard.py +++ b/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 diff --git a/backend/infrahub/core/query/relationship.py b/backend/infrahub/core/query/relationship.py index daad6eeeeb..81180d96b2 100644 --- a/backend/infrahub/core/query/relationship.py +++ b/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 diff --git a/backend/infrahub/core/relationship/model.py b/backend/infrahub/core/relationship/model.py index b6d63df66c..4c1a083347 100644 --- a/backend/infrahub/core/relationship/model.py +++ b/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 diff --git a/backend/infrahub/core/timestamp.py b/backend/infrahub/core/timestamp.py index 1eb5047a4e..43fc151f15 100644 --- a/backend/infrahub/core/timestamp.py +++ b/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 diff --git a/backend/infrahub/git/integrator.py b/backend/infrahub/git/integrator.py index c7b199af6d..4870dd49f4 100644 --- a/backend/infrahub/git/integrator.py +++ b/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 diff --git a/backend/infrahub/git/repository.py b/backend/infrahub/git/repository.py index 5566cedfcb..58841e885d 100644 --- a/backend/infrahub/git/repository.py +++ b/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 diff --git a/backend/infrahub/graphql/mutations/account.py b/backend/infrahub/graphql/mutations/account.py index 1ecb40b303..ff97853eb1 100644 --- a/backend/infrahub/graphql/mutations/account.py +++ b/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 diff --git a/backend/infrahub/message_bus/operations/check/generator.py b/backend/infrahub/message_bus/operations/check/generator.py index 5ffcffa05f..27e9efa2a4 100644 --- a/backend/infrahub/message_bus/operations/check/generator.py +++ b/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 diff --git a/backend/infrahub/message_bus/operations/check/repository.py b/backend/infrahub/message_bus/operations/check/repository.py index 9809c6326f..f8666139ff 100644 --- a/backend/infrahub/message_bus/operations/check/repository.py +++ b/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 diff --git a/backend/infrahub/message_bus/operations/requests/artifact_definition.py b/backend/infrahub/message_bus/operations/requests/artifact_definition.py index 33d1552855..416759b8ce 100644 --- a/backend/infrahub/message_bus/operations/requests/artifact_definition.py +++ b/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 diff --git a/backend/infrahub/message_bus/operations/requests/generator.py b/backend/infrahub/message_bus/operations/requests/generator.py index 130412f3ce..3466e37910 100644 --- a/backend/infrahub/message_bus/operations/requests/generator.py +++ b/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 diff --git a/backend/infrahub/message_bus/operations/requests/generator_definition.py b/backend/infrahub/message_bus/operations/requests/generator_definition.py index 7792bcaa48..613897030d 100644 --- a/backend/infrahub/message_bus/operations/requests/generator_definition.py +++ b/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 diff --git a/backend/infrahub/message_bus/operations/requests/graphql_query_group.py b/backend/infrahub/message_bus/operations/requests/graphql_query_group.py index da8a906572..678231b4cc 100644 --- a/backend/infrahub/message_bus/operations/requests/graphql_query_group.py +++ b/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 diff --git a/backend/infrahub/message_bus/operations/requests/repository.py b/backend/infrahub/message_bus/operations/requests/repository.py index 1646edf0e0..5438247789 100644 --- a/backend/infrahub/message_bus/operations/requests/repository.py +++ b/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 diff --git a/backend/infrahub/services/adapters/message_bus/local.py b/backend/infrahub/services/adapters/message_bus/local.py index 09967080aa..d2e3927acb 100644 --- a/backend/infrahub/services/adapters/message_bus/local.py +++ b/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 diff --git a/backend/infrahub/services/adapters/message_bus/nats.py b/backend/infrahub/services/adapters/message_bus/nats.py index f8604e725f..485ae74976 100644 --- a/backend/infrahub/services/adapters/message_bus/nats.py +++ b/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 diff --git a/backend/infrahub/services/adapters/message_bus/rabbitmq.py b/backend/infrahub/services/adapters/message_bus/rabbitmq.py index 053e31b3a2..37806c6c7d 100644 --- a/backend/infrahub/services/adapters/message_bus/rabbitmq.py +++ b/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 diff --git a/backend/infrahub/tasks/artifact.py b/backend/infrahub/tasks/artifact.py index 1850dc0ffa..71b6041af2 100644 --- a/backend/infrahub/tasks/artifact.py +++ b/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 diff --git a/backend/tests/adapters/message_bus.py b/backend/tests/adapters/message_bus.py index c05d73a268..d806572173 100644 --- a/backend/tests/adapters/message_bus.py +++ b/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 diff --git a/backend/tests/helpers/test_app.py b/backend/tests/helpers/test_app.py index 1c4115ae45..24027e5934 100644 --- a/backend/tests/helpers/test_app.py +++ b/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 diff --git a/backend/tests/integration/conftest.py b/backend/tests/integration/conftest.py index e1d836450a..c7e363b0ae 100644 --- a/backend/tests/integration/conftest.py +++ b/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 diff --git a/backend/tests/integration/git/test_git_repository.py b/backend/tests/integration/git/test_git_repository.py index 1379107049..71188c1cd6 100644 --- a/backend/tests/integration/git/test_git_repository.py +++ b/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 diff --git a/backend/tests/test_data/dataset03.py b/backend/tests/test_data/dataset03.py index 842f731a8f..e1a9f8ccac 100644 --- a/backend/tests/test_data/dataset03.py +++ b/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 diff --git a/backend/tests/unit/conftest.py b/backend/tests/unit/conftest.py index 1b807f2322..9b84684649 100644 --- a/backend/tests/unit/conftest.py +++ b/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 diff --git a/backend/tests/unit/core/migrations/graph/test_001.py b/backend/tests/unit/core/migrations/graph/test_001.py index a12a1fa42c..8c907de4f5 100644 --- a/backend/tests/unit/core/migrations/graph/test_001.py +++ b/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 diff --git a/backend/tests/unit/core/migrations/schema/test_node_attribute_add.py b/backend/tests/unit/core/migrations/schema/test_node_attribute_add.py index 2ad9c01ae7..34ef2a0964 100644 --- a/backend/tests/unit/core/migrations/schema/test_node_attribute_add.py +++ b/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 ( diff --git a/backend/tests/unit/core/migrations/schema/test_node_remove.py b/backend/tests/unit/core/migrations/schema/test_node_remove.py index 9262e17c08..361a503ef7 100644 --- a/backend/tests/unit/core/migrations/schema/test_node_remove.py +++ b/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 diff --git a/backend/tests/unit/core/test_attribute.py b/backend/tests/unit/core/test_attribute.py index 71bed2dfb3..fcb5ae8bf0 100644 --- a/backend/tests/unit/core/test_attribute.py +++ b/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 ( diff --git a/backend/tests/unit/core/test_manager_node.py b/backend/tests/unit/core/test_manager_node.py index 1bf684cbb9..f0b5c476de 100644 --- a/backend/tests/unit/core/test_manager_node.py +++ b/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 diff --git a/backend/tests/unit/core/test_node.py b/backend/tests/unit/core/test_node.py index ccc01c2df1..0707311247 100644 --- a/backend/tests/unit/core/test_node.py +++ b/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 diff --git a/backend/tests/unit/git/conftest.py b/backend/tests/unit/git/conftest.py index 2267f1c7a5..c1702aaf24 100644 --- a/backend/tests/unit/git/conftest.py +++ b/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 diff --git a/backend/tests/unit/git/test_git_read_only_repository.py b/backend/tests/unit/git/test_git_read_only_repository.py index edbf63f2bb..e57076e2ab 100644 --- a/backend/tests/unit/git/test_git_read_only_repository.py +++ b/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 diff --git a/backend/tests/unit/git/test_git_repository.py b/backend/tests/unit/git/test_git_repository.py index 9b1115c9f6..561e8f8d58 100644 --- a/backend/tests/unit/git/test_git_repository.py +++ b/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 diff --git a/backend/tests/unit/git/test_git_rpc.py b/backend/tests/unit/git/test_git_rpc.py index a9e8438ae7..0dc1e9c3d9 100644 --- a/backend/tests/unit/git/test_git_rpc.py +++ b/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 diff --git a/backend/tests/unit/git/test_git_transform.py b/backend/tests/unit/git/test_git_transform.py index 8909f82671..7c0803f58c 100644 --- a/backend/tests/unit/git/test_git_transform.py +++ b/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 diff --git a/backend/tests/unit/graphql/test_mutation_relationship.py b/backend/tests/unit/graphql/test_mutation_relationship.py index eed5daa260..39f5321237 100644 --- a/backend/tests/unit/graphql/test_mutation_relationship.py +++ b/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 diff --git a/backend/tests/unit/storage/test_local_storage.py b/backend/tests/unit/storage/test_local_storage.py index 4a860392cc..f0468136e8 100644 --- a/backend/tests/unit/storage/test_local_storage.py +++ b/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 diff --git a/models/examples/security/infrastructure_security.py b/models/examples/security/infrastructure_security.py index 36ca232076..a4941c5c02 100644 --- a/models/examples/security/infrastructure_security.py +++ b/models/examples/security/infrastructure_security.py @@ -2,7 +2,9 @@ import random from ipaddress import IPv4Interface, IPv4Network -from infrahub_sdk import InfrahubClient, InfrahubNode, NodeStore +from infrahub_sdk import InfrahubClient +from infrahub_sdk.node import InfrahubNode +from infrahub_sdk.store import NodeStore from infrahub_sdk.protocols import CoreAccount diff --git a/models/infrastructure_edge.py b/models/infrastructure_edge.py index 2637836795..d6949d8709 100644 --- a/models/infrastructure_edge.py +++ b/models/infrastructure_edge.py @@ -7,7 +7,7 @@ from ipaddress import IPv4Network, IPv6Network from typing import Optional, cast -from infrahub_sdk import UUIDT, InfrahubClient, NodeStore +from infrahub_sdk import InfrahubClient from infrahub_sdk.batch import InfrahubBatch from infrahub_sdk.protocols import ( CoreAccount, @@ -18,6 +18,8 @@ IpamNamespace, ) from infrahub_sdk.protocols_base import CoreNode +from infrahub_sdk.store import NodeStore +from infrahub_sdk.uuidt import UUIDT from protocols import ( InfraAutonomousSystem, InfraBGPSession, diff --git a/python_sdk b/python_sdk index 2bb8bec649..ed48858f4c 160000 --- a/python_sdk +++ b/python_sdk @@ -1 +1 @@ -Subproject commit 2bb8bec6492ea2e1a1b6775b00aae4ef6a3be88f +Subproject commit ed48858f4cf579f85cdd2679f48025a907f6b800