Fix unit tests

Author: dgarros

infrahub_sdk/client.py

@@ -50,7 +50,7 @@
 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 .schema import InfrahubSchema, InfrahubSchemaSync, NodeSchemaAPI
 from .store import NodeStore, NodeStoreSync
 from .timestamp import Timestamp
 from .types import AsyncRequester, HTTPMethod, SyncRequester
@@ -448,12 +448,12 @@ async def get(
         filters: MutableMapping[str, Any] = {}
 
         if id:
-            if not is_valid_uuid(id) and isinstance(schema, NodeSchema) and schema.default_filter:
+            if not is_valid_uuid(id) and isinstance(schema, NodeSchemaAPI) and schema.default_filter:
                 filters[schema.default_filter] = id
             else:
                 filters["ids"] = [id]
         if hfid:
-            if isinstance(schema, NodeSchema) and schema.human_friendly_id:
+            if isinstance(schema, NodeSchemaAPI) and schema.human_friendly_id:
                 filters["hfid"] = hfid
             else:
                 raise ValueError("Cannot filter by HFID if the node doesn't have an HFID defined")
@@ -1916,12 +1916,12 @@ def get(
         filters: MutableMapping[str, Any] = {}
 
         if id:
-            if not is_valid_uuid(id) and isinstance(schema, NodeSchema) and schema.default_filter:
+            if not is_valid_uuid(id) and isinstance(schema, NodeSchemaAPI) and schema.default_filter:
                 filters[schema.default_filter] = id
             else:
                 filters["ids"] = [id]
         if hfid:
-            if isinstance(schema, NodeSchema) and schema.human_friendly_id:
+            if isinstance(schema, NodeSchemaAPI) and schema.human_friendly_id:
                 filters["hfid"] = hfid
             else:
                 raise ValueError("Cannot filter by HFID if the node doesn't have an HFID defined")

infrahub_sdk/ctl/generator.py

@@ -10,7 +10,7 @@
 from ..ctl.utils import execute_graphql_query, parse_cli_vars
 from ..exceptions import ModuleImportError
 from ..node import InfrahubNode
-from ..schema import InfrahubRepositoryConfig
+from ..schema.repository import InfrahubRepositoryConfig
 
 
 async def run(

infrahub_sdk/ctl/render.py

@@ -1,6 +1,6 @@
 from rich.console import Console
 
-from ..schema import InfrahubRepositoryConfig
+from ..schema.repository import InfrahubRepositoryConfig
 
 
 def list_jinja2_transforms(config: InfrahubRepositoryConfig) -> None:

infrahub_sdk/ctl/repository.py

@@ -12,7 +12,7 @@
 from ..ctl.exceptions import FileNotValidError
 from ..ctl.utils import init_logging
 from ..graphql import Mutation
-from ..schema import InfrahubRepositoryConfig
+from ..schema.repository import InfrahubRepositoryConfig
 from ._file import read_file
 from .parameters import CONFIG_PARAM
 

infrahub_sdk/ctl/transform.py

@@ -1,6 +1,6 @@
 from rich.console import Console
 
-from ..schema import InfrahubRepositoryConfig
+from ..schema.repository import InfrahubRepositoryConfig
 
 
 def list_transforms(config: InfrahubRepositoryConfig) -> None:

infrahub_sdk/ctl/utils.py

@@ -26,7 +26,7 @@
     ServerNotReachableError,
     ServerNotResponsiveError,
 )
-from ..schema import InfrahubRepositoryConfig
+from ..schema.repository import InfrahubRepositoryConfig
 from ..yaml import YamlFile
 from .client import initialize_client_sync
 

infrahub_sdk/pytest_plugin/utils.py

@@ -2,7 +2,7 @@
 
 import yaml
 
-from ..schema import InfrahubRepositoryConfig
+from ..schema.repository import InfrahubRepositoryConfig
 from .exceptions import FileNotValidError
 
 

infrahub_sdk/schema/__init__.py

@@ -22,6 +22,7 @@
 from .main import (
     AttributeSchema,
     AttributeSchemaAPI,
+    BranchSupportType,
     GenericSchema,
     GenericSchemaAPI,
     NodeSchema,
@@ -34,7 +35,6 @@
     SchemaRoot,
     SchemaRootAPI,
 )
-from .repository import InfrahubRepositoryConfig
 
 if TYPE_CHECKING:
     from ..client import InfrahubClient, InfrahubClientSync, SchemaType, SchemaTypeSync
@@ -46,9 +46,9 @@
 __all__ = [
     "AttributeSchema",
     "AttributeSchemaAPI",
+    "BranchSupportType",
     "GenericSchema",
     "GenericSchemaAPI",
-    "InfrahubRepositoryConfig",
     "NodeSchema",
     "NodeSchemaAPI",
     "ProfileSchemaAPI",

infrahub_sdk/schema/main.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import warnings
 from enum import Enum
 from typing import TYPE_CHECKING, Any, Optional, Union
 
@@ -41,6 +42,7 @@ class RelationshipDirection(str, Enum):
 class AttributeKind(str, Enum):
     ID = "ID"
     TEXT = "Text"
+    STRING = "String"  # deprecated
     TEXTAREA = "TextArea"
     DATETIME = "DateTime"
     NUMBER = "Number"
@@ -61,6 +63,15 @@ class AttributeKind(str, Enum):
     JSON = "JSON"
     ANY = "Any"
 
+    def __getattr__(self, name: str) -> Any:
+        if name == "STRING":
+            warnings.warn(
+                f"{name} is deprecated and will be removed in future versions.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
+        return super().__getattribute__(name)
+
 
 class SchemaState(str, Enum):
     PRESENT = "present"
@@ -252,7 +263,8 @@ def kind(self) -> str:
 
 
 class GenericSchema(BaseSchema, BaseSchemaAttrRel):
-    pass
+    def convert_api(self) -> GenericSchemaAPI:
+        return GenericSchemaAPI(**self.model_dump())
 
 
 class GenericSchemaAPI(BaseSchema, BaseSchemaAttrRelAPI):
@@ -273,7 +285,8 @@ class BaseNodeSchema(BaseSchema):
 
 
 class NodeSchema(BaseNodeSchema, BaseSchemaAttrRel):
-    pass
+    def convert_api(self) -> NodeSchemaAPI:
+        return NodeSchemaAPI(**self.model_dump())
 
 
 class NodeSchemaAPI(BaseNodeSchema, BaseSchemaAttrRelAPI):

infrahub_sdk/transfer/exporter/json.py

@@ -9,7 +9,7 @@
 
 from ...client import InfrahubClient
 from ...queries import QUERY_RELATIONSHIPS
-from ...schema import MainSchemaTypesAPI, NodeSchema
+from ...schema import MainSchemaTypesAPI, NodeSchemaAPI
 from ..constants import ILLEGAL_NAMESPACES
 from ..exceptions import FileAlreadyExistsError, InvalidNamespaceError
 from .interface import ExporterInterface
@@ -113,7 +113,7 @@ async def export(  # pylint: disable=too-many-branches
             node_schema_map = {
                 kind: schema
                 for kind, schema in node_schema_map.items()
-                if isinstance(schema, NodeSchema)
+                if isinstance(schema, NodeSchemaAPI)
                 and schema.namespace not in illegal_namespaces
                 and (not exclude or kind not in exclude)
             }