infrahub-server 1.5.5__py3-none-any.whl → 1.6.0b0__py3-none-any.whl

infrahub/api/artifact.py

@@ -17,7 +17,7 @@ from infrahub.core import registry
 from infrahub.core.account import ObjectPermission
 from infrahub.core.branch.needs_rebase_status import check_need_rebase_status
 from infrahub.core.constants import GLOBAL_BRANCH_NAME, InfrahubKind, PermissionAction
-from infrahub.core.protocols import CoreArtifactDefinition
+from infrahub.core.protocols import CoreArtifact, CoreArtifactDefinition
 from infrahub.database import InfrahubDatabase  # noqa: TC001
 from infrahub.exceptions import NodeNotFoundError
 from infrahub.git.models import RequestArtifactDefinitionGenerate
@@ -50,14 +50,16 @@ async def get_artifact(
     branch_params: BranchParams = Depends(get_branch_params),
     _: AccountSession = Depends(get_current_user),
 ) -> Response:
-    artifact = await registry.manager.get_one(db=db, id=artifact_id, branch=branch_params.branch, at=branch_params.at)
+    artifact = await registry.manager.get_one(
+        db=db, id=artifact_id, branch=branch_params.branch, at=branch_params.at, kind=CoreArtifact
+    )
     if not artifact:
         raise NodeNotFoundError(
             branch_name=branch_params.branch.name, node_type=InfrahubKind.ARTIFACT, identifier=artifact_id
         )
 
     return Response(
-        content=registry.storage.retrieve(identifier=artifact.storage_id.value),
+        content=registry.storage.retrieve(identifier=str(artifact.storage_id.value)),
         headers={"Content-Type": artifact.content_type.value.value},
     )
 

infrahub/auth.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import uuid
 from datetime import UTC, datetime, timedelta
-from enum import Enum
+from enum import StrEnum
 from typing import TYPE_CHECKING, Any
 
 import bcrypt
@@ -20,7 +20,7 @@ from infrahub.core.account import validate_token
 from infrahub.core.constants import AccountStatus, InfrahubKind
 from infrahub.core.manager import NodeManager
 from infrahub.core.node import Node
-from infrahub.core.protocols import CoreAccount, CoreAccountGroup
+from infrahub.core.protocols import CoreAccount, CoreAccountGroup, CoreGenericAccount
 from infrahub.core.registry import registry
 from infrahub.exceptions import AuthorizationError, GatewayError, NodeNotFoundError
 from infrahub.log import get_logger
@@ -28,14 +28,13 @@ from infrahub.log import get_logger
 if TYPE_CHECKING:
     import httpx
 
-    from infrahub.core.protocols import CoreGenericAccount
     from infrahub.database import InfrahubDatabase
     from infrahub.services import InfrahubServices
 
 log = get_logger()
 
 
-class AuthType(str, Enum):
+class AuthType(StrEnum):
     NONE = "none"
     JWT = "jwt"
     API = "api"
@@ -53,7 +52,7 @@ class AccountSession(BaseModel):
 
 
 async def validate_active_account(db: InfrahubDatabase, account_id: str) -> None:
-    account: CoreGenericAccount = await NodeManager.get_one(db=db, id=account_id, raise_on_error=True)
+    account = await NodeManager.get_one(db=db, kind=CoreGenericAccount, id=account_id, raise_on_error=True)
     if account.status.value != AccountStatus.ACTIVE.value:
         raise AuthorizationError("This account has been deactivated")
 
@@ -114,7 +113,7 @@ async def create_fresh_access_token(
     if not refresh_token:
         raise AuthorizationError("The provided refresh token has been invalidated in the database")
 
-    account: CoreGenericAccount | None = await NodeManager.get_one(id=refresh_data.account_id, db=db)
+    account = await NodeManager.get_one(id=refresh_data.account_id, kind=CoreGenericAccount, db=db)
     if not account:
         raise NodeNotFoundError(
             branch_name=selected_branch.name,

infrahub/cli/db.py

@@ -5,7 +5,7 @@ import os
 from collections import defaultdict
 from csv import DictReader, DictWriter
 from datetime import UTC, datetime
-from enum import Enum
+from enum import StrEnum
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Sequence
 
@@ -74,13 +74,13 @@ app.add_typer(patch_app, name="patch")
 PERMISSIONS_AVAILABLE = ["read", "write", "admin"]
 
 
-class ConstraintAction(str, Enum):
+class ConstraintAction(StrEnum):
     SHOW = "show"
     ADD = "add"
     DROP = "drop"
 
 
-class IndexAction(str, Enum):
+class IndexAction(StrEnum):
     SHOW = "show"
     ADD = "add"
     DROP = "drop"

infrahub/cli/db_commands/clean_duplicate_schema_fields.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from enum import Enum
+from enum import StrEnum
 from typing import Any
 
 from rich import print as rprint
@@ -11,7 +11,7 @@ from infrahub.core.query import Query, QueryType
 from infrahub.database import InfrahubDatabase
 
 
-class SchemaFieldType(str, Enum):
+class SchemaFieldType(StrEnum):
     ATTRIBUTE = "attribute"
     RELATIONSHIP = "relationship"
 

infrahub/cli/dev.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import importlib
+import json
 import logging
 from pathlib import Path  # noqa: TC003
 from typing import TYPE_CHECKING
@@ -11,6 +12,7 @@ from infrahub_sdk.async_typer import AsyncTyper
 from rich.logging import RichHandler
 
 from infrahub import config
+from infrahub.api.schema import SchemaLoadAPI
 from infrahub.core.initialization import (
     first_time_initialization,
     initialization,
@@ -21,6 +23,7 @@ from infrahub.core.utils import delete_all_nodes
 from infrahub.graphql.manager import GraphQLSchemaManager
 from infrahub.graphql.schema_sort import sort_schema_ast
 from infrahub.log import get_logger
+from infrahub.server import app as server_app
 
 if TYPE_CHECKING:
     from infrahub.cli.context import CliContext
@@ -57,6 +60,33 @@ async def export_graphql_schema(
     out.write_text(sorted_schema_str)
 
 
+@app.command(name="export-json-schema")
+async def export_json_schema(
+    ctx: typer.Context,  # noqa: ARG001
+    out: Path = typer.Option("openapi.json"),  # noqa: B008
+) -> None:
+    """Export the REST API OpenAPI schema to a file."""
+    openapi_dict = server_app.openapi()
+    openapi_dict["info"]["version"] = "latest"
+    content = json.dumps(openapi_dict, indent=4)
+    out.write_text(content)
+
+
+@app.command(name="export-node-schema")
+async def export_node_schema(
+    ctx: typer.Context,  # noqa: ARG001
+    config_file: str = typer.Option("infrahub.toml", envvar="INFRAHUB_CONFIG"),
+    out: Path = typer.Option("develop.json"),  # noqa: B008
+) -> None:
+    """Export the repository configuration to a file."""
+    config.load_and_exit(config_file_name=config_file)
+    schema = SchemaLoadAPI.model_json_schema()
+    schema["title"] = "InfrahubSchema"
+    content = json.dumps(schema, indent=4)
+    out.parent.mkdir(parents=True, exist_ok=True)
+    out.write_text(content)
+
+
 @app.command(name="db-init")
 async def database_init(
     ctx: typer.Context,

infrahub/config.py

@@ -1,18 +1,20 @@
 from __future__ import annotations
 
 import os
+import re
 import ssl
 import sys
+import tomllib
 from dataclasses import dataclass
-from enum import Enum
+from enum import StrEnum
 from pathlib import Path
 from typing import TYPE_CHECKING, Any
 
-import tomllib
 from infrahub_sdk.utils import generate_uuid
 from pydantic import (
     AliasChoices,
     BaseModel,
+    EmailStr,
     Field,
     PrivateAttr,
     ValidationError,
@@ -48,28 +50,28 @@ def default_append_git_suffix_domains() -> list[str]:
     return ["github.com", "gitlab.com"]
 
 
-class EnterpriseFeatures(str, Enum):
+class EnterpriseFeatures(StrEnum):
     PROPOSED_CHANGE_REQUIRE_APPROVAL = "proposed_change_require_approval"
     REVOKE_PROPOSED_CHANGE_APPROVALS = "revoke_proposed_change_approvals"
 
 
-class UserInfoMethod(str, Enum):
+class UserInfoMethod(StrEnum):
     POST = "post"
     GET = "get"
 
 
-class SSOProtocol(str, Enum):
+class SSOProtocol(StrEnum):
     OAUTH2 = "oauth2"
     OIDC = "oidc"
 
 
-class Oauth2Provider(str, Enum):
+class Oauth2Provider(StrEnum):
     GOOGLE = "google"
     PROVIDER1 = "provider1"
     PROVIDER2 = "provider2"
 
 
-class OIDCProvider(str, Enum):
+class OIDCProvider(StrEnum):
     GOOGLE = "google"
     PROVIDER1 = "provider1"
     PROVIDER2 = "provider2"
@@ -98,25 +100,25 @@ class SSOProviderInfo(BaseModel):
         return f"/api/{self.protocol.value}/{self.name}/token"
 
 
-class StorageDriver(str, Enum):
+class StorageDriver(StrEnum):
     FileSystemStorage = "local"
     InfrahubS3ObjectStorage = "s3"
 
 
-class TraceExporterType(str, Enum):
+class TraceExporterType(StrEnum):
     CONSOLE = "console"
     OTLP = "otlp"
     # JAEGER = "jaeger"
     # ZIPKIN = "zipkin"
 
 
-class TraceTransportProtocol(str, Enum):
+class TraceTransportProtocol(StrEnum):
     GRPC = "grpc"
     HTTP_PROTOBUF = "http/protobuf"
     # HTTP_JSON = "http/json"
 
 
-class BrokerDriver(str, Enum):
+class BrokerDriver(StrEnum):
     RabbitMQ = "rabbitmq"
     NATS = "nats"
 
@@ -137,7 +139,7 @@ class BrokerDriver(str, Enum):
                 return "RabbitMQMessageBus"
 
 
-class CacheDriver(str, Enum):
+class CacheDriver(StrEnum):
     Redis = "redis"
     NATS = "nats"
 
@@ -158,12 +160,12 @@ class CacheDriver(str, Enum):
                 return "RedisCache"
 
 
-class WorkflowDriver(str, Enum):
+class WorkflowDriver(StrEnum):
     LOCAL = "local"
     WORKER = "worker"
 
 
-class ExtraLogLevel(str, Enum):
+class ExtraLogLevel(StrEnum):
     CRITICAL = "CRITICAL"
     ERROR = "ERROR"
     WARNING = "WARNING"
@@ -324,6 +326,10 @@ class DevelopmentSettings(BaseSettings):
         default=False,
         description="Allow enterprise configuration in development mode, this will not enable the features just allow the configuration.",
     )
+    git_credential_helper: str = Field(
+        default="/usr/local/bin/infrahub-git-credential",
+        description="Location of git credential helper",
+    )
 
 
 class BrokerSettings(BaseSettings):
@@ -449,6 +455,48 @@ class GitSettings(BaseSettings):
         default_factory=default_append_git_suffix_domains,
         description="Automatically append '.git' to HTTP URLs if for these domains.",
     )
+    import_sync_branch_names: list[str] = Field(
+        default_factory=list,
+        description=(
+            "Names or regex of branches to be created in infrahub during import "
+            "e.g. 'infrahub/.*', 'release/.*', '^branch-'. "
+            "Note: other branches created with sync with git will be imported also"
+        ),
+    )
+    user_name: str = Field(
+        default="Infrahub",
+        description=(
+            "User name of the git user. This will be used as the user name when Infrahub commits code to a repository"
+        ),
+    )
+    user_email: EmailStr = Field(
+        default="infrahub@opsmill.com",
+        description=(
+            "Email of the git user. This will be used as the user email when Infrahub commits code to a repository"
+        ),
+    )
+    global_config_file: str = Field(
+        default="/opt/infrahub/.gitconfig",
+        description=(
+            "The location of the git config file. "
+            "This will be set as the system `GIT_CONFIG_GLOBAL` environment variable "
+            "if the environment variable is not initially set"
+        ),
+    )
+    use_explicit_merge_commit: bool = Field(
+        default=False, description="Whether to allow explicit merge commits when infrahub merges branches"
+    )
+
+    @model_validator(mode="after")
+    def validate_sync_branch_names(self) -> Self:
+        for branch_filter in self.import_sync_branch_names:
+            try:
+                re.compile(branch_filter)
+            except re.error as exc:
+                raise ValueError(
+                    f"Invalid regex pattern for import_sync_branch_names: '{branch_filter}' — {exc}"
+                ) from exc
+        return self
 
 
 class HTTPSettings(BaseSettings):

infrahub/constants/database.py

@@ -1,12 +1,12 @@
-from enum import Enum
+from enum import StrEnum
 
 
-class DatabaseType(str, Enum):
+class DatabaseType(StrEnum):
     NEO4J = "neo4j"
     MEMGRAPH = "memgraph"
 
 
-class Neo4jRuntime(str, Enum):
+class Neo4jRuntime(StrEnum):
     DEFAULT = "default"
     INTERPRETED = "interpreted"
     SLOTTED = "slotted"
@@ -15,13 +15,13 @@ class Neo4jRuntime(str, Enum):
     UNDEFINED = "undefined"
 
 
-class IndexType(str, Enum):
+class IndexType(StrEnum):
     TEXT = "text"
     RANGE = "range"
     LOOKUP = "lookup"
     NOT_APPLICABLE = "not_applicable"
 
 
-class EntityType(str, Enum):
+class EntityType(StrEnum):
     NODE = "node"
     RELATIONSHIP = "relationship"

infrahub/core/branch/models.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
 import re
-from typing import TYPE_CHECKING, Any, Optional, Self, Union
+from typing import TYPE_CHECKING, Any, Optional, Self, Union, cast
 
+from neo4j.graph import Node as Neo4jNode
 from pydantic import Field, field_validator
 
 from infrahub.core.branch.enums import BranchStatus
@@ -10,8 +11,9 @@ from infrahub.core.constants import GLOBAL_BRANCH_NAME
 from infrahub.core.graph import GRAPH_VERSION
 from infrahub.core.models import SchemaBranchHash  # noqa: TC001
 from infrahub.core.node.standard import StandardNode
-from infrahub.core.query import QueryType
+from infrahub.core.query import Query, QueryType
 from infrahub.core.query.branch import (
+    BranchNodeGetListQuery,
     DeleteBranchRelationshipsQuery,
     GetAllBranchInternalRelationshipQuery,
     RebaseBranchDeleteRelationshipQuery,
@@ -159,12 +161,28 @@ class Branch(StandardNode):
         limit: int = 1000,
         ids: list[str] | None = None,
         name: str | None = None,
-        **kwargs: dict[str, Any],
+        **kwargs: Any,
     ) -> list[Self]:
-        branches = await super().get_list(db=db, limit=limit, ids=ids, name=name, **kwargs)
-        branches = [branch for branch in branches if branch.status != BranchStatus.DELETING]
+        query: Query = await BranchNodeGetListQuery.init(
+            db=db, node_class=cls, ids=ids, node_name=name, limit=limit, **kwargs
+        )
+        await query.execute(db=db)
+
+        return [cls.from_db(node=cast(Neo4jNode, result.get("n"))) for result in query.get_results()]
 
-        return branches
+    @classmethod
+    async def get_list_count(
+        cls,
+        db: InfrahubDatabase,
+        limit: int = 1000,
+        ids: list[str] | None = None,
+        name: str | None = None,
+        **kwargs: Any,
+    ) -> int:
+        query: Query = await BranchNodeGetListQuery.init(
+            db=db, node_class=cls, ids=ids, node_name=name, limit=limit, exclude_global=True, **kwargs
+        )
+        return await query.count(db=db)
 
     @classmethod
     def isinstance(cls, obj: Any) -> bool:

infrahub/core/diff/model/diff.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from enum import Enum
+from enum import Enum, StrEnum
 from typing import Any
 
 from pydantic import BaseModel, ConfigDict, Field
@@ -271,7 +271,7 @@ class SchemaConflict(ObjectConflict):
         return self.value
 
 
-class DiffElementType(str, Enum):
+class DiffElementType(StrEnum):
     ATTRIBUTE = "Attribute"
     RELATIONSHIP_ONE = "RelationshipOne"
     RELATIONSHIP_MANY = "RelationshipMany"

infrahub/core/graph/constraints.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from enum import Enum
+from enum import StrEnum
 from typing import TYPE_CHECKING, ForwardRef, Optional, Union, get_origin
 
 from pydantic import BaseModel
@@ -12,7 +12,7 @@ if TYPE_CHECKING:
     from infrahub.database import InfrahubDatabase
 
 
-class GraphPropertyType(str, Enum):
+class GraphPropertyType(StrEnum):
     BOOLEAN = "BOOLEAN"
     STRING = "STRING"
     INTEGER = "INTEGER"