infrahub-server 1.2.0rc0__py3-none-any.whl → 1.2.1__py3-none-any.whl

infrahub/computed_attribute/triggers.py

@@ -1,58 +1,22 @@
+from infrahub.events.branch_action import BranchDeletedEvent
+from infrahub.events.repository_action import CommitUpdatedEvent
+from infrahub.events.schema_action import SchemaUpdatedEvent
 from infrahub.trigger.models import BuiltinTriggerDefinition, EventTrigger, ExecuteWorkflow
 from infrahub.workflows.catalogue import (
-    COMPUTED_ATTRIBUTE_REMOVE_PYTHON,
-    COMPUTED_ATTRIBUTE_SETUP,
+    COMPUTED_ATTRIBUTE_SETUP_JINJA2,
     COMPUTED_ATTRIBUTE_SETUP_PYTHON,
 )
 
-TRIGGER_COMPUTED_ATTRIBUTE_PYTHON_SETUP_BRANCH = BuiltinTriggerDefinition(
-    name="computed-attribute-python-setup-on-branch-creation",
-    previous_names={"Trigger-schema-update-event"},
-    description="Trigger actions on branch create event",
-    trigger=EventTrigger(events={"infrahub.branch.created"}),
-    actions=[
-        ExecuteWorkflow(
-            name=COMPUTED_ATTRIBUTE_SETUP_PYTHON.name,
-            parameters={
-                "branch_name": "{{ event.resource['infrahub.branch.name'] }}",
-                "trigger_updates": False,
-                "context": {
-                    "__prefect_kind": "json",
-                    "value": {"__prefect_kind": "jinja", "template": "{{ event.payload['context'] | tojson }}"},
-                },
-            },
-        )
-    ],
-)
-
 TRIGGER_COMPUTED_ATTRIBUTE_PYTHON_SETUP_COMMIT = BuiltinTriggerDefinition(
     name="computed-attribute-python-setup-on-commit",
-    description="Trigger actions on branch create event",
-    trigger=EventTrigger(events={"infrahub.repository.update_commit"}),
+    trigger=EventTrigger(events={CommitUpdatedEvent.event_name}),
     actions=[
         ExecuteWorkflow(
-            name=COMPUTED_ATTRIBUTE_SETUP_PYTHON.name,
+            workflow=COMPUTED_ATTRIBUTE_SETUP_PYTHON,
             parameters={
                 "branch_name": "{{ event.resource['infrahub.branch.name'] }}",
                 "commit": "{{ event.payload['commit'] }}",
-                "context": {
-                    "__prefect_kind": "json",
-                    "value": {"__prefect_kind": "jinja", "template": "{{ event.payload['context'] | tojson }}"},
-                },
-            },
-        )
-    ],
-)
-
-TRIGGER_COMPUTED_ATTRIBUTE_PYTHON_CLEAN_BRANCH = BuiltinTriggerDefinition(
-    name="computed-attribute-python-cleanup-on-branch-deletion",
-    description="Trigger actions on branch delete event",
-    trigger=EventTrigger(events={"infrahub.branch.deleted"}),
-    actions=[
-        ExecuteWorkflow(
-            name=COMPUTED_ATTRIBUTE_REMOVE_PYTHON.name,
-            parameters={
-                "branch_name": "{{ event.resource['infrahub.branch.name'] }}",
+                "event_name": "{{ event.event }}",
                 "context": {
                     "__prefect_kind": "json",
                     "value": {"__prefect_kind": "jinja", "template": "{{ event.payload['context'] | tojson }}"},
@@ -63,13 +27,14 @@ TRIGGER_COMPUTED_ATTRIBUTE_PYTHON_CLEAN_BRANCH = BuiltinTriggerDefinition(
 )
 
 TRIGGER_COMPUTED_ATTRIBUTE_ALL_SCHEMA = BuiltinTriggerDefinition(
-    name="computed-attribute-all-setup-on-schema-update",
-    trigger=EventTrigger(events={"infrahub.schema.update"}),
+    name="computed-attribute-setup-all",
+    trigger=EventTrigger(events={SchemaUpdatedEvent.event_name, BranchDeletedEvent.event_name}),
     actions=[
         ExecuteWorkflow(
-            name=COMPUTED_ATTRIBUTE_SETUP.name,
+            workflow=COMPUTED_ATTRIBUTE_SETUP_JINJA2,
             parameters={
                 "branch_name": "{{ event.resource['infrahub.branch.name'] }}",
+                "event_name": "{{ event.event }}",
                 "context": {
                     "__prefect_kind": "json",
                     "value": {"__prefect_kind": "jinja", "template": "{{ event.payload['context'] | tojson }}"},
@@ -77,9 +42,10 @@ TRIGGER_COMPUTED_ATTRIBUTE_ALL_SCHEMA = BuiltinTriggerDefinition(
             },
         ),
         ExecuteWorkflow(
-            name=COMPUTED_ATTRIBUTE_SETUP_PYTHON.name,
+            workflow=COMPUTED_ATTRIBUTE_SETUP_PYTHON,
             parameters={
                 "branch_name": "{{ event.resource['infrahub.branch.name'] }}",
+                "event_name": "{{ event.event }}",
                 "context": {
                     "__prefect_kind": "json",
                     "value": {"__prefect_kind": "jinja", "template": "{{ event.payload['context'] | tojson }}"},

infrahub/config.py

@@ -6,7 +6,7 @@ import sys
 from dataclasses import dataclass
 from enum import Enum
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Optional
+from typing import TYPE_CHECKING, Any
 
 import toml
 from infrahub_sdk.utils import generate_uuid
@@ -140,7 +140,7 @@ class MainSettings(BaseSettings):
         default=Path("/opt/infrahub/docs/build/search-index.json"),
         description="Full path of saved json containing pre-indexed documentation",
     )
-    internal_address: Optional[str] = Field(default=None)
+    internal_address: str | None = Field(default=None)
     allow_anonymous_access: bool = Field(
         default=True, description="Indicates if the system allows anonymous read access"
     )
@@ -153,10 +153,15 @@ class MainSettings(BaseSettings):
         default=["infrahub.permissions.LocalPermissionBackend"],
         description="List of modules to handle permissions, they will be run in the given order",
     )
-    public_url: Optional[str] = Field(
+    public_url: str | None = Field(
         default=None,
         description="Define the public URL of the Infrahub, might be required for OAuth2 and OIDC depending on your infrastructure.",
     )
+    schema_strict_mode: bool = Field(
+        default=True,
+        description="Enable strict schema validation. When set to `False`, "
+        "`human_friendly_id` schema fields should not necessarily target a unique combination of peer attributes.",
+    )
 
     @field_validator("docs_index_path", mode="before")
     @classmethod
@@ -231,10 +236,10 @@ class DatabaseSettings(BaseSettings):
     password: str = "admin"
     address: str = "localhost"
     port: int = 7687
-    database: Optional[str] = Field(default=None, pattern=VALID_DATABASE_NAME_REGEX, description="Name of the database")
+    database: str | None = Field(default=None, pattern=VALID_DATABASE_NAME_REGEX, description="Name of the database")
     tls_enabled: bool = Field(default=False, description="Indicates if TLS is enabled for the connection")
     tls_insecure: bool = Field(default=False, description="Indicates if TLS certificates are verified")
-    tls_ca_file: Optional[str] = Field(default=None, description="File path to CA cert or bundle in PEM format")
+    tls_ca_file: str | None = Field(default=None, description="File path to CA cert or bundle in PEM format")
     query_size_limit: int = Field(
         default=5_000,
         ge=1,
@@ -249,6 +254,12 @@ class DatabaseSettings(BaseSettings):
     retry_limit: int = Field(
         default=3, description="Maximum number of times a transient issue in a transaction should be retried."
     )
+    max_concurrent_queries: int = Field(
+        default=0, ge=0, description="Maximum number of concurrent queries that can run (0 means unlimited)."
+    )
+    max_concurrent_queries_delay: float = Field(
+        default=0.01, ge=0, description="Delay to add when max_concurrent_queries is reached."
+    )
 
     @property
     def database_name(self) -> str:
@@ -271,12 +282,12 @@ class BrokerSettings(BaseSettings):
     enable: bool = True
     tls_enabled: bool = Field(default=False, description="Indicates if TLS is enabled for the connection")
     tls_insecure: bool = Field(default=False, description="Indicates if TLS certificates are verified")
-    tls_ca_file: Optional[str] = Field(default=None, description="File path to CA cert or bundle in PEM format")
+    tls_ca_file: str | None = Field(default=None, description="File path to CA cert or bundle in PEM format")
     username: str = "infrahub"
     password: str = "infrahub"
     address: str = "localhost"
-    port: Optional[int] = Field(default=None, ge=1, le=65535, description="Specified if running on a non default port.")
-    rabbitmq_http_port: Optional[int] = Field(default=None, ge=1, le=65535)
+    port: int | None = Field(default=None, ge=1, le=65535, description="Specified if running on a non default port.")
+    rabbitmq_http_port: int | None = Field(default=None, ge=1, le=65535)
     namespace: str = "infrahub"
     maximum_message_retries: int = Field(
         default=10, description="The maximum number of retries that are attempted for failed messages"
@@ -299,7 +310,7 @@ class CacheSettings(BaseSettings):
     model_config = SettingsConfigDict(env_prefix="INFRAHUB_CACHE_")
     enable: bool = True
     address: str = "localhost"
-    port: Optional[int] = Field(
+    port: int | None = Field(
         default=None, ge=1, le=65535, description="Specified if running on a non default port (6379)"
     )
     database: int = Field(default=0, ge=0, le=15, description="Id of the database to use")
@@ -308,7 +319,7 @@ class CacheSettings(BaseSettings):
     password: str = ""
     tls_enabled: bool = Field(default=False, description="Indicates if TLS is enabled for the connection")
     tls_insecure: bool = Field(default=False, description="Indicates if TLS certificates are verified")
-    tls_ca_file: Optional[str] = Field(default=None, description="File path to CA cert or bundle in PEM format")
+    tls_ca_file: str | None = Field(default=None, description="File path to CA cert or bundle in PEM format")
 
     @property
     def service_port(self) -> int:
@@ -322,7 +333,7 @@ class WorkflowSettings(BaseSettings):
     model_config = SettingsConfigDict(env_prefix="INFRAHUB_WORKFLOW_")
     enable: bool = True
     address: str = "localhost"
-    port: Optional[int] = Field(default=None, ge=1, le=65535, description="Specified if running on a non default port.")
+    port: int | None = Field(default=None, ge=1, le=65535, description="Specified if running on a non default port.")
     tls_enabled: bool = Field(default=False, description="Indicates if TLS is enabled for the connection")
     driver: WorkflowDriver = WorkflowDriver.WORKER
     default_worker_type: str = "infrahubasync"
@@ -437,10 +448,10 @@ class InitialSettings(BaseSettings):
         default="main",
         description="Defines the name of the default branch within Infrahub, can only be set once during initialization of the system.",
     )
-    admin_token: Optional[str] = Field(default=None, description="An optional initial token for the admin account.")
+    admin_token: str | None = Field(default=None, description="An optional initial token for the admin account.")
     admin_password: str = Field(default="infrahub", description="The initial password for the admin user")
-    agent_token: Optional[str] = Field(default=None, description="An optional initial token for a git-agent account.")
-    agent_password: Optional[str] = Field(
+    agent_token: str | None = Field(default=None, description="An optional initial token for a git-agent account.")
+    agent_password: str | None = Field(
         default=None, description="An optional initial password for a git-agent account."
     )
 
@@ -501,9 +512,9 @@ class SecurityOIDCProvider2(SecurityOIDCSettings):
 class SecurityOIDCProviderSettings(BaseModel):
     """This class is meant to facilitate configuration of OIDC providers when loading configuration from a infrahub.toml file."""
 
-    google: Optional[SecurityOIDCGoogle] = Field(default=None)
-    provider1: Optional[SecurityOIDCProvider1] = Field(default=None)
-    provider2: Optional[SecurityOIDCProvider2] = Field(default=None)
+    google: SecurityOIDCGoogle | None = Field(default=None)
+    provider1: SecurityOIDCProvider1 | None = Field(default=None)
+    provider2: SecurityOIDCProvider2 | None = Field(default=None)
 
 
 class SecurityOAuth2BaseSettings(BaseSettings):
@@ -549,9 +560,9 @@ class SecurityOAuth2Google(SecurityOAuth2Settings):
 class SecurityOAuth2ProviderSettings(BaseModel):
     """This class is meant to facilitate configuration of OAuth2 providers when loading configuration from a infrahub.toml file."""
 
-    google: Optional[SecurityOAuth2Google] = Field(default=None)
-    provider1: Optional[SecurityOAuth2Provider1] = Field(default=None)
-    provider2: Optional[SecurityOAuth2Provider2] = Field(default=None)
+    google: SecurityOAuth2Google | None = Field(default=None)
+    provider1: SecurityOAuth2Provider1 | None = Field(default=None)
+    provider2: SecurityOAuth2Provider2 | None = Field(default=None)
 
 
 class MiscellaneousSettings(BaseSettings):
@@ -567,9 +578,9 @@ class MiscellaneousSettings(BaseSettings):
 class RemoteLoggingSettings(BaseSettings):
     model_config = SettingsConfigDict(env_prefix="INFRAHUB_LOGGING_REMOTE_")
     enable: bool = False
-    frontend_dsn: Optional[str] = None
-    api_server_dsn: Optional[str] = None
-    git_agent_dsn: Optional[str] = None
+    frontend_dsn: str | None = None
+    api_server_dsn: str | None = None
+    git_agent_dsn: str | None = None
 
 
 class LoggingSettings(BaseSettings):
@@ -579,8 +590,8 @@ class LoggingSettings(BaseSettings):
 class AnalyticsSettings(BaseSettings):
     model_config = SettingsConfigDict(env_prefix="INFRAHUB_ANALYTICS_")
     enable: bool = True
-    address: Optional[str] = None
-    api_key: Optional[str] = None
+    address: str | None = None
+    api_key: str | None = None
 
 
 class ExperimentalFeaturesSettings(BaseSettings):
@@ -707,19 +718,19 @@ class TraceSettings(BaseSettings):
     exporter_protocol: TraceTransportProtocol = Field(
         default=TraceTransportProtocol.GRPC, description="Protocol to be used for exporting traces"
     )
-    exporter_endpoint: Optional[str] = Field(default=None, description="OTLP endpoint for exporting traces")
+    exporter_endpoint: str | None = Field(default=None, description="OTLP endpoint for exporting traces")
 
 
 @dataclass
 class Override:
-    message_bus: Optional[InfrahubMessageBus] = None
-    cache: Optional[InfrahubCache] = None
-    workflow: Optional[InfrahubWorkflow] = None
+    message_bus: InfrahubMessageBus | None = None
+    cache: InfrahubCache | None = None
+    workflow: InfrahubWorkflow | None = None
 
 
 @dataclass
 class ConfiguredSettings:
-    settings: Optional[Settings] = None
+    settings: Settings | None = None
 
     def initialize(self, config_file: Path | str | None = None) -> None:
         """Initialize the settings if they have not been initialized."""
@@ -840,7 +851,7 @@ class Settings(BaseSettings):
     experimental_features: ExperimentalFeaturesSettings = ExperimentalFeaturesSettings()
 
 
-def load(config_file_name: Path | str = "infrahub.toml", config_data: Optional[dict[str, Any]] = None) -> Settings:
+def load(config_file_name: Path | str = "infrahub.toml", config_data: dict[str, Any] | None = None) -> Settings:
     """Load configuration.
 
     Configuration is loaded from a config file in toml format that contains the settings,
@@ -860,7 +871,7 @@ def load(config_file_name: Path | str = "infrahub.toml", config_data: Optional[d
     return Settings()
 
 
-def load_and_exit(config_file_name: Path | str = "infrahub.toml", config_data: Optional[dict[str, Any]] = None) -> None:
+def load_and_exit(config_file_name: Path | str = "infrahub.toml", config_data: dict[str, Any] | None = None) -> None:
     """Calls load, but wraps it in a try except block.
 
     This is done to handle a ValidationError which is raised when settings are specified but invalid.

infrahub/context.py

@@ -1,8 +1,12 @@
+from typing import Any
+
+from infrahub_sdk.context import ContextAccount, RequestContext
 from pydantic import BaseModel, Field
 from typing_extensions import Self
 
 from infrahub.auth import AccountSession
 from infrahub.core.branch import Branch
+from infrahub.core.constants import GLOBAL_BRANCH_NAME
 
 
 class ParentEvent(BaseModel):
@@ -21,6 +25,10 @@ class BranchContext(BaseModel):
     name: str
     id: str | None = None
 
+    @property
+    def is_global(self) -> bool:
+        return self.name == GLOBAL_BRANCH_NAME
+
 
 class InfrahubContext(BaseModel):
     branch: BranchContext
@@ -37,3 +45,9 @@ class InfrahubContext(BaseModel):
             self.event.id = id
         else:
             self.event = EventContext(name=name, id=id)
+
+    def to_event(self) -> dict[str, Any]:
+        return self.model_dump(mode="json")
+
+    def to_request_context(self) -> RequestContext:
+        return RequestContext(account=ContextAccount(id=self.account.account_id))

infrahub/core/account.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, Optional, Union
+from typing import TYPE_CHECKING, Any
 
 from typing_extensions import Self
 
@@ -570,14 +570,14 @@ class AccountTokenValidateQuery(Query):
 
         self.return_labels = ["at", "av", "acc"]
 
-    def get_account_name(self) -> Optional[str]:
+    def get_account_name(self) -> str | None:
         """Return the account name that matched the query or None."""
         if result := self.get_result():
             return result.get("av").get("value")
 
         return None
 
-    def get_account_id(self) -> Optional[str]:
+    def get_account_id(self) -> str | None:
         """Return the account id that matched the query or a None."""
         if result := self.get_result():
             return result.get("acc").get("uuid")
@@ -585,7 +585,7 @@ class AccountTokenValidateQuery(Query):
         return None
 
 
-async def validate_token(token: str, db: InfrahubDatabase, branch: Optional[Union[Branch, str]] = None) -> str | None:
+async def validate_token(token: str, db: InfrahubDatabase, branch: Branch | str | None = None) -> str | None:
     branch = await registry.get_branch(db=db, branch=branch)
     query = await AccountTokenValidateQuery.init(db=db, branch=branch, token=token)
     await query.execute(db=db)