Merge pull request #80 from opsmill/dga-20241015

Convert import paths to use relative Package name

Author: dgarros

infrahub_sdk/__init__.py

@@ -2,12 +2,12 @@
 
 import importlib.metadata
 
-from infrahub_sdk.analyzer import GraphQLOperation, GraphQLQueryAnalyzer, GraphQLQueryVariable
-from infrahub_sdk.batch import InfrahubBatch
-from infrahub_sdk.branch import InfrahubBranchManager, InfrahubBranchManagerSync
-from infrahub_sdk.client import InfrahubClient, InfrahubClientSync
-from infrahub_sdk.config import Config
-from infrahub_sdk.exceptions import (
+from .analyzer import GraphQLOperation, GraphQLQueryAnalyzer, GraphQLQueryVariable
+from .batch import InfrahubBatch
+from .branch import InfrahubBranchManager, InfrahubBranchManagerSync
+from .client import InfrahubClient, InfrahubClientSync
+from .config import Config
+from .exceptions import (
     AuthenticationError,
     Error,
     GraphQLError,
@@ -16,9 +16,9 @@
     ServerNotResponsiveError,
     ValidationError,
 )
-from infrahub_sdk.graphql import Mutation, Query
-from infrahub_sdk.node import InfrahubNode, InfrahubNodeSync
-from infrahub_sdk.schema import (
+from .graphql import Mutation, Query
+from .node import InfrahubNode, InfrahubNodeSync
+from .schema import (
     AttributeSchema,
     GenericSchema,
     InfrahubRepositoryConfig,
@@ -31,9 +31,9 @@
     RelationshipSchema,
     SchemaRoot,
 )
-from infrahub_sdk.store import NodeStore, NodeStoreSync
-from infrahub_sdk.timestamp import Timestamp
-from infrahub_sdk.uuidt import UUIDT, generate_uuid
+from .store import NodeStore, NodeStoreSync
+from .timestamp import Timestamp
+from .uuidt import UUIDT, generate_uuid
 
 __all__ = [
     "AttributeSchema",

infrahub_sdk/_importer.py

@@ -4,7 +4,7 @@
 import sys
 from typing import TYPE_CHECKING, Optional
 
-from infrahub_sdk.exceptions import ModuleImportError
+from .exceptions import ModuleImportError
 
 if TYPE_CHECKING:
     from pathlib import Path

infrahub_sdk/analyzer.py

@@ -12,7 +12,7 @@
 )
 from pydantic import BaseModel
 
-from infrahub_sdk.utils import calculate_dict_depth, calculate_dict_height, extract_fields
+from .utils import calculate_dict_depth, calculate_dict_height, extract_fields
 
 
 class GraphQLQueryVariable(BaseModel):

infrahub_sdk/batch.py

@@ -2,7 +2,7 @@
 from dataclasses import dataclass
 from typing import Any, AsyncGenerator, Awaitable, Callable, Optional
 
-from infrahub_sdk.node import InfrahubNode
+from .node import InfrahubNode
 
 
 @dataclass

infrahub_sdk/branch.py

@@ -4,12 +4,12 @@
 
 from pydantic import BaseModel
 
-from infrahub_sdk.exceptions import BranchNotFoundError
-from infrahub_sdk.graphql import Mutation, Query
-from infrahub_sdk.utils import decode_json
+from .exceptions import BranchNotFoundError
+from .graphql import Mutation, Query
+from .utils import decode_json
 
 if TYPE_CHECKING:
-    from infrahub_sdk.client import InfrahubClient, InfrahubClientSync
+    from .client import InfrahubClient, InfrahubClientSync
 
 
 class BranchData(BaseModel):

infrahub_sdk/checks.py

@@ -10,13 +10,13 @@
 from git.repo import Repo
 from pydantic import BaseModel, Field
 
-from infrahub_sdk import InfrahubClient
-from infrahub_sdk.exceptions import InfrahubCheckNotFoundError
+from . import InfrahubClient
+from .exceptions import InfrahubCheckNotFoundError
 
 if TYPE_CHECKING:
     from pathlib import Path
 
-    from infrahub_sdk.schema import InfrahubCheckDefinitionConfig
+    from .schema import InfrahubCheckDefinitionConfig
 
 INFRAHUB_CHECK_VARIABLE_TO_IMPORT = "INFRAHUB_CHECKS"
 

infrahub_sdk/client.py

@@ -23,38 +23,38 @@
 import ujson
 from typing_extensions import Self
 
-from infrahub_sdk.batch import InfrahubBatch
-from infrahub_sdk.branch import (
+from .batch import InfrahubBatch
+from .branch import (
     BranchData,
     InfrahubBranchManager,
     InfrahubBranchManagerSync,
 )
-from infrahub_sdk.config import Config
-from infrahub_sdk.constants import InfrahubClientMode
-from infrahub_sdk.data import RepositoryBranchInfo, RepositoryData
-from infrahub_sdk.diff import NodeDiff, diff_tree_node_to_node_diff, get_diff_summary_query
-from infrahub_sdk.exceptions import (
+from .config import Config
+from .constants import InfrahubClientMode
+from .data import RepositoryBranchInfo, RepositoryData
+from .diff import NodeDiff, diff_tree_node_to_node_diff, get_diff_summary_query
+from .exceptions import (
     AuthenticationError,
     Error,
     GraphQLError,
     NodeNotFoundError,
     ServerNotReachableError,
     ServerNotResponsiveError,
 )
-from infrahub_sdk.graphql import Mutation, Query
-from infrahub_sdk.node import (
+from .graphql import Mutation, Query
+from .node import (
     InfrahubNode,
     InfrahubNodeSync,
 )
-from infrahub_sdk.object_store import ObjectStore, ObjectStoreSync
-from infrahub_sdk.protocols_base import CoreNode, CoreNodeSync
-from infrahub_sdk.queries import get_commit_update_mutation
-from infrahub_sdk.query_groups import InfrahubGroupContext, InfrahubGroupContextSync
-from infrahub_sdk.schema import InfrahubSchema, InfrahubSchemaSync, NodeSchema
-from infrahub_sdk.store import NodeStore, NodeStoreSync
-from infrahub_sdk.timestamp import Timestamp
-from infrahub_sdk.types import AsyncRequester, HTTPMethod, SyncRequester
-from infrahub_sdk.utils import decode_json, is_valid_uuid
+from .object_store import ObjectStore, ObjectStoreSync
+from .protocols_base import CoreNode, CoreNodeSync
+from .queries import get_commit_update_mutation
+from .query_groups import InfrahubGroupContext, InfrahubGroupContextSync
+from .schema import InfrahubSchema, InfrahubSchemaSync, NodeSchema
+from .store import NodeStore, NodeStoreSync
+from .timestamp import Timestamp
+from .types import AsyncRequester, HTTPMethod, SyncRequester
+from .utils import decode_json, is_valid_uuid
 
 if TYPE_CHECKING:
     from types import TracebackType

infrahub_sdk/code_generator.py

@@ -2,9 +2,9 @@
 
 import jinja2
 
-from infrahub_sdk import protocols as sdk_protocols
-from infrahub_sdk.ctl.constants import PROTOCOLS_TEMPLATE
-from infrahub_sdk.schema import (
+from . import protocols as sdk_protocols
+from .ctl.constants import PROTOCOLS_TEMPLATE
+from .schema import (
     AttributeSchema,
     GenericSchema,
     MainSchemaTypes,

infrahub_sdk/config.py

@@ -4,11 +4,11 @@
 from pydantic_settings import BaseSettings, SettingsConfigDict
 from typing_extensions import Self
 
-from infrahub_sdk.constants import InfrahubClientMode
-from infrahub_sdk.playback import JSONPlayback
-from infrahub_sdk.recorder import JSONRecorder, NoRecorder, Recorder, RecorderType
-from infrahub_sdk.types import AsyncRequester, InfrahubLoggers, RequesterTransport, SyncRequester
-from infrahub_sdk.utils import get_branch, is_valid_url
+from .constants import InfrahubClientMode
+from .playback import JSONPlayback
+from .recorder import JSONRecorder, NoRecorder, Recorder, RecorderType
+from .types import AsyncRequester, InfrahubLoggers, RequesterTransport, SyncRequester
+from .utils import get_branch, is_valid_url
 
 
 class ProxyMountsConfig(BaseSettings):

infrahub_sdk/ctl/branch.py

@@ -4,10 +4,9 @@
 from rich.console import Console
 from rich.table import Table
 
-from infrahub_sdk.async_typer import AsyncTyper
-from infrahub_sdk.ctl.client import initialize_client
-from infrahub_sdk.ctl.utils import calculate_time_diff, catch_exception
-
+from ..async_typer import AsyncTyper
+from ..ctl.client import initialize_client
+from ..ctl.utils import calculate_time_diff, catch_exception
 from .parameters import CONFIG_PARAM
 
 app = AsyncTyper()