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

infrahub/proposed_change/tasks.py

@@ -7,7 +7,7 @@ from pathlib import Path
 from typing import TYPE_CHECKING
 
 import pytest
-from infrahub_sdk.protocols import CoreGeneratorDefinition, CoreProposedChange
+from infrahub_sdk.protocols import CoreArtifactValidator, CoreGeneratorDefinition, CoreProposedChange
 from prefect import flow, task
 from prefect.cache_policies import NONE
 from prefect.client.schemas.objects import (
@@ -22,7 +22,7 @@ from infrahub.context import InfrahubContext  # noqa: TC001  needed for prefect
 from infrahub.core import registry
 from infrahub.core.branch import Branch
 from infrahub.core.branch.tasks import merge_branch
-from infrahub.core.constants import InfrahubKind, RepositoryInternalStatus, ValidatorConclusion, ValidatorState
+from infrahub.core.constants import InfrahubKind, RepositoryInternalStatus, ValidatorConclusion
 from infrahub.core.diff.coordinator import DiffCoordinator
 from infrahub.core.diff.model.diff import DiffElementType, SchemaConflict
 from infrahub.core.diff.model.path import NodeDiffFieldSummary
@@ -36,6 +36,7 @@ from infrahub.core.validators.tasks import schema_validate_migrations
 from infrahub.dependencies.registry import get_component_registry
 from infrahub.exceptions import MergeFailedError
 from infrahub.generators.models import ProposedChangeGeneratorDefinition
+from infrahub.git.models import TriggerRepositoryInternalChecks, TriggerRepositoryUserChecks
 from infrahub.git.repository import get_initialized_repo
 from infrahub.log import get_logger
 from infrahub.message_bus import InfrahubMessage, messages
@@ -51,9 +52,11 @@ from infrahub.proposed_change.models import (
 )
 from infrahub.pytest_plugin import InfrahubBackendPlugin
 from infrahub.services import InfrahubServices  # noqa: TC001  needed for prefect flow
+from infrahub.validators.tasks import start_validator
 from infrahub.workflows.catalogue import (
-    COMPUTED_ATTRIBUTE_SETUP_PYTHON,
     GIT_REPOSITORIES_CHECK_ARTIFACT_CREATE,
+    GIT_REPOSITORY_INTERNAL_CHECKS_TRIGGER,
+    GIT_REPOSITORY_USER_CHECKS_TRIGGER,
     REQUEST_PROPOSED_CHANGE_REPOSITORY_CHECKS,
 )
 from infrahub.workflows.utils import add_tags
@@ -147,7 +150,9 @@ async def merge_proposed_change(
 
         log.info("Proposed change is eligible to be merged")
         try:
-            await merge_branch(branch=source_branch.name, context=context, service=service)
+            await merge_branch(
+                branch=source_branch.name, context=context, service=service, proposed_change_id=proposed_change_id
+            )
         except MergeFailedError as exc:
             await _proposed_change_transition_state(
                 proposed_change=proposed_change, state=ProposedChangeState.OPEN, service=service
@@ -159,7 +164,6 @@ async def merge_proposed_change(
         await _proposed_change_transition_state(
             proposed_change=proposed_change, state=ProposedChangeState.MERGED, service=service
         )
-        await service.workflow.submit_workflow(workflow=COMPUTED_ATTRIBUTE_SETUP_PYTHON, context=context)
         return Completed(message="proposed change merged successfully")
 
 
@@ -272,6 +276,7 @@ async def run_generators(
 
         if select:
             msg = messages.RequestGeneratorDefinitionCheck(
+                context=context,
                 generator_definition=generator_definition,
                 branch_diff=model.branch_diff,
                 proposed_change=model.proposed_change,
@@ -286,6 +291,7 @@ async def run_generators(
     if model.refresh_artifacts:
         next_messages.append(
             messages.RequestProposedChangeRefreshArtifacts(
+                context=context,
                 proposed_change=model.proposed_change,
                 source_branch=model.source_branch,
                 source_branch_sync_with_git=model.source_branch_sync_with_git,
@@ -411,39 +417,43 @@ async def _get_proposed_change_schema_integrity_constraints(
     name="proposed-changed-repository-checks",
     flow_run_name="Process user defined checks",
 )
-async def repository_checks(model: RequestProposedChangeRepositoryChecks, service: InfrahubServices) -> None:
+async def repository_checks(
+    model: RequestProposedChangeRepositoryChecks, service: InfrahubServices, context: InfrahubContext
+) -> None:
     await add_tags(branches=[model.source_branch], nodes=[model.proposed_change])
 
-    events: list[InfrahubMessage] = []
     for repository in model.branch_diff.repositories:
         if (
             model.source_branch_sync_with_git
             and not repository.read_only
             and repository.internal_status == RepositoryInternalStatus.ACTIVE.value
         ):
-            events.append(
-                messages.RequestRepositoryChecks(
-                    proposed_change=model.proposed_change,
-                    repository=repository.repository_id,
-                    source_branch=model.source_branch,
-                    target_branch=model.destination_branch,
-                )
-            )
-
-        events.append(
-            messages.RequestRepositoryUserChecks(
+            trigger_internal_checks_model = TriggerRepositoryInternalChecks(
                 proposed_change=model.proposed_change,
-                repository_id=repository.repository_id,
-                repository_name=repository.repository_name,
+                repository=repository.repository_id,
                 source_branch=model.source_branch,
-                source_branch_sync_with_git=model.source_branch_sync_with_git,
                 target_branch=model.destination_branch,
-                branch_diff=model.branch_diff,
             )
+            await service.workflow.submit_workflow(
+                workflow=GIT_REPOSITORY_INTERNAL_CHECKS_TRIGGER,
+                context=context,
+                parameters={"model": trigger_internal_checks_model},
+            )
+
+        trigger_user_checks_model = TriggerRepositoryUserChecks(
+            proposed_change=model.proposed_change,
+            repository_id=repository.repository_id,
+            repository_name=repository.repository_name,
+            source_branch=model.source_branch,
+            source_branch_sync_with_git=model.source_branch_sync_with_git,
+            target_branch=model.destination_branch,
+            branch_diff=model.branch_diff,
+        )
+        await service.workflow.submit_workflow(
+            workflow=GIT_REPOSITORY_USER_CHECKS_TRIGGER,
+            context=context,
+            parameters={"model": trigger_user_checks_model},
         )
-    for event in events:
-        event.assign_meta(parent=model)
-        await service.message_bus.send(message=event)
 
 
 @flow(
@@ -530,31 +540,26 @@ async def validate_artifacts_generation(model: RequestArtifactDefinitionCheck, s
 
     await proposed_change.validations.fetch()
 
-    validator = None
+    previous_validator: CoreArtifactValidator | None = None
     for relationship in proposed_change.validations.peers:
         existing_validator = relationship.peer
         if (
             existing_validator.typename == InfrahubKind.ARTIFACTVALIDATOR
             and existing_validator.definition.id == model.artifact_definition.definition_id
         ):
-            validator = existing_validator
-
-    if validator:
-        validator.conclusion.value = ValidatorConclusion.UNKNOWN.value
-        validator.state.value = ValidatorState.QUEUED.value
-        validator.started_at.value = ""
-        validator.completed_at.value = ""
-        await validator.save()
-    else:
-        validator = await service.client.create(
-            kind=InfrahubKind.ARTIFACTVALIDATOR,
-            data={
-                "label": validator_name,
-                "proposed_change": model.proposed_change,
-                "definition": model.artifact_definition.definition_id,
-            },
-        )
-        await validator.save()
+            previous_validator = existing_validator
+
+    validator = await start_validator(
+        service=service,
+        validator=previous_validator,
+        validator_type=CoreArtifactValidator,
+        proposed_change=model.proposed_change,
+        data={
+            "label": validator_name,
+            "definition": model.artifact_definition.definition_id,
+        },
+        context=model.context,
+    )
 
     await artifact_definition.targets.fetch()
     group = artifact_definition.targets.peer
@@ -586,6 +591,7 @@ async def validate_artifacts_generation(model: RequestArtifactDefinitionCheck, s
             log.info(f"Trigger Artifact processing for {member.display_label}")
 
             check_model = CheckArtifactCreate(
+                context=model.context,
                 artifact_name=model.artifact_definition.artifact_name,
                 artifact_id=artifact_id,
                 artifact_definition=model.artifact_definition.definition_id,
@@ -600,6 +606,7 @@ async def validate_artifacts_generation(model: RequestArtifactDefinitionCheck, s
                 query=model.artifact_definition.query_name,
                 variables=member.extract(params=artifact_definition.parameters.value),
                 target_id=member.id,
+                target_kind=member.get_kind(),
                 target_name=member.display_label,
                 timeout=model.artifact_definition.timeout,
                 validator_id=validator.id,
@@ -613,7 +620,13 @@ async def validate_artifacts_generation(model: RequestArtifactDefinitionCheck, s
                 )
             )
 
-    await run_checks_and_update_validator(checks, validator)
+    await run_checks_and_update_validator(
+        checks=checks,
+        validator=validator,
+        proposed_change_id=model.proposed_change,
+        context=model.context,
+        service=service,
+    )
 
 
 def _should_render_artifact(artifact_id: str | None, managed_branch: bool, impacted_artifacts: list[str]) -> bool:  # noqa: ARG001

infrahub/pytest_plugin.py

@@ -1,9 +1,7 @@
-from typing import Optional
-
+import pytest
 from infrahub_sdk.client import Config as InfrahubClientConfig
 from infrahub_sdk.client import InfrahubClientSync
 from infrahub_sdk.node import InfrahubNodeSync
-from pytest import Config, Item, Session, TestReport
 
 from infrahub.core.constants import InfrahubKind
 from infrahub.core.timestamp import Timestamp
@@ -52,7 +50,12 @@ class InfrahubBackendPlugin:
 
         return validator, True
 
-    def pytest_collection_modifyitems(self, session: Session, config: Config, items: list[Item]) -> None:  # noqa: ARG002
+    def pytest_collection_modifyitems(
+        self,
+        session: pytest.Session,  # noqa: ARG002
+        config: pytest.Config,  # noqa: ARG002
+        items: list[pytest.Item],
+    ) -> None:
         """This function is called after item collection and gives the opportunity to work on the collection before sending the items for testing.
 
         All items without an "infrahub" marker will be discarded. Items will also be re-ordered to be run in a specific order:
@@ -64,7 +67,7 @@ class InfrahubBackendPlugin:
         """
         filtered_items = [i for i in items if i.get_closest_marker("infrahub")]
 
-        def sort_key(item: Item) -> tuple[int, int]:
+        def sort_key(item: pytest.Item) -> tuple[int, int]:
             type_cost = 99
             for marker_name, priority in ORDER_TYPE_MAP.items():
                 if item.get_closest_marker(marker_name):
@@ -82,7 +85,7 @@ class InfrahubBackendPlugin:
         filtered_items.sort(key=sort_key)
         items[:] = filtered_items
 
-    def pytest_collection_finish(self, session: Session) -> None:  # noqa: ARG002
+    def pytest_collection_finish(self, session: pytest.Session) -> None:  # noqa: ARG002
         """This function is called when tests have been collected and modified, meaning they are ready to be run."""
         self.proposed_change = self.client.get(kind=InfrahubKind.PROPOSEDCHANGE, id=self.proposed_change_id)
         self.proposed_change.validations.fetch()
@@ -95,7 +98,7 @@ class InfrahubBackendPlugin:
                 check = relationship.peer
                 self.checks[check.origin.value] = check
 
-    def pytest_runtestloop(self, session: Session) -> Optional[object]:  # noqa: ARG002
+    def pytest_runtestloop(self, session: pytest.Session) -> object | None:  # noqa: ARG002
         """This function is called when the test loop is being run."""
         self.validator.conclusion.value = "unknown"
         self.validator.state.value = "in_progress"
@@ -104,7 +107,7 @@ class InfrahubBackendPlugin:
 
         return None
 
-    def pytest_runtest_setup(self, item: Item) -> None:
+    def pytest_runtest_setup(self, item: pytest.Item) -> None:
         """Create a StandardCheck for each test item to later record its details.
 
         If a check already exists, reset it to its default values.
@@ -132,7 +135,7 @@ class InfrahubBackendPlugin:
 
         check.save()
 
-    def pytest_runtest_logreport(self, report: TestReport) -> None:
+    def pytest_runtest_logreport(self, report: pytest.TestReport) -> None:
         """This function is called 3 times per test: setup, call, teardown."""
         if report.when != "call":
             return
@@ -144,7 +147,7 @@ class InfrahubBackendPlugin:
         # Workaround for https://github.com/opsmill/infrahub/issues/2184
         check.update(do_full_update=True)
 
-    def pytest_sessionfinish(self, session: Session) -> None:  # noqa: ARG002
+    def pytest_sessionfinish(self, session: pytest.Session) -> None:  # noqa: ARG002
         """Set the final RepositoryValidator details after completing the test session."""
         conclusion = "success"
 

infrahub/server.py

@@ -14,10 +14,9 @@ from fastapi.middleware.gzip import GZipMiddleware
 from fastapi.responses import RedirectResponse
 from fastapi.staticfiles import StaticFiles
 from fastapi.templating import Jinja2Templates
-from infrahub_sdk.timestamp import TimestampFormatError
+from infrahub_sdk.exceptions import TimestampFormatError
 from opentelemetry.instrumentation.fastapi import FastAPIInstrumentor
 from opentelemetry.trace import Span
-from pydantic import ValidationError
 from starlette_exporter import PrometheusMiddleware, handle_metrics
 
 from infrahub import __version__, config
@@ -28,7 +27,7 @@ from infrahub.core.graph.index import node_indexes, rel_indexes
 from infrahub.core.initialization import initialization
 from infrahub.database import InfrahubDatabase, InfrahubDatabaseMode, get_db
 from infrahub.dependencies.registry import build_component_registry
-from infrahub.exceptions import Error
+from infrahub.exceptions import Error, ValidationError
 from infrahub.graphql.api.endpoints import router as graphql_router
 from infrahub.lock import initialize_lock
 from infrahub.log import clear_log_context, get_logger, set_log_data

infrahub/services/__init__.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Awaitable, Callable, Optional
+from typing import TYPE_CHECKING, Awaitable, Callable
 
 from infrahub.components import ComponentType
 from infrahub.exceptions import InitializationError
@@ -182,7 +182,7 @@ class InfrahubServices:
         await self.scheduler.shutdown()
         await self.message_bus.shutdown()
 
-    async def send(self, message: InfrahubMessage, delay: Optional[MessageTTL] = None, is_retry: bool = False) -> None:
+    async def send(self, message: InfrahubMessage, delay: MessageTTL | None = None, is_retry: bool = False) -> None:
         routing_key = ROUTING_KEY_MAP.get(type(message))
         if not routing_key:
             raise ValueError("Unable to determine routing key")

infrahub/services/adapters/cache/__init__.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from infrahub.message_bus.types import KVTTL
@@ -16,12 +16,12 @@ class InfrahubCache(ABC):
         raise NotImplementedError()
 
     @abstractmethod
-    async def get(self, key: str) -> Optional[str]:
+    async def get(self, key: str) -> str | None:
         """Retrieve a value from the cache."""
         raise NotImplementedError()
 
     @abstractmethod
-    async def get_values(self, keys: list[str]) -> list[Optional[str]]:
+    async def get_values(self, keys: list[str]) -> list[str | None]:
         """Return a list the values for requested keys."""
         raise NotImplementedError()
 
@@ -31,8 +31,6 @@ class InfrahubCache(ABC):
         raise NotImplementedError()
 
     @abstractmethod
-    async def set(
-        self, key: str, value: str, expires: Optional[KVTTL] = None, not_exists: bool = False
-    ) -> Optional[bool]:
+    async def set(self, key: str, value: str, expires: KVTTL | None = None, not_exists: bool = False) -> bool | None:
         """Set a value in the cache."""
         raise NotImplementedError()

infrahub/services/adapters/cache/nats.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import ssl
-from typing import Optional
 
 import nats
 
@@ -84,7 +83,7 @@ class NATSCache(InfrahubCache):
         key = self._tokenize_key_name(key)
         await self._get_kv(key).delete(key)
 
-    async def get(self, key: str) -> Optional[str]:
+    async def get(self, key: str) -> str | None:
         key = self._tokenize_key_name(key)
         try:
             entry = await self._get_kv(key).get(key=key)
@@ -94,7 +93,7 @@ class NATSCache(InfrahubCache):
             pass
         return None
 
-    async def get_values(self, keys: list[str]) -> list[Optional[str]]:
+    async def get_values(self, keys: list[str]) -> list[str | None]:
         return [await self.get(key) for key in keys]
 
     async def _keys(self, kv: nats.js.kv.KeyValue, filter_pattern: str) -> list[str]:
@@ -138,9 +137,9 @@ class NATSCache(InfrahubCache):
         self,
         key: str,
         value: str,
-        expires: Optional[KVTTL] = None,  # noqa: ARG002
+        expires: KVTTL | None = None,  # noqa: ARG002
         not_exists: bool = False,
-    ) -> Optional[bool]:
+    ) -> bool | None:
         key = self._tokenize_key_name(key)
         if not_exists:
             try:

infrahub/services/adapters/cache/redis.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 import redis.asyncio as redis
 
 from infrahub import config
@@ -22,13 +20,13 @@ class RedisCache(InfrahubCache):
     async def delete(self, key: str) -> None:
         await self.connection.delete(key)
 
-    async def get(self, key: str) -> Optional[str]:
+    async def get(self, key: str) -> str | None:
         value = await self.connection.get(name=key)
         if value is not None:
             return value.decode()
         return None
 
-    async def get_values(self, keys: list[str]) -> list[Optional[str]]:
+    async def get_values(self, keys: list[str]) -> list[str | None]:
         values = await self.connection.mget(keys=keys)
         return [value.decode() if value is not None else value for value in values]
 
@@ -44,7 +42,5 @@ class RedisCache(InfrahubCache):
 
         return [key.decode() for key in keys]
 
-    async def set(
-        self, key: str, value: str, expires: Optional[KVTTL] = None, not_exists: bool = False
-    ) -> Optional[bool]:
+    async def set(self, key: str, value: str, expires: KVTTL | None = None, not_exists: bool = False) -> bool | None:
         return await self.connection.set(name=key, value=value, ex=expires.value if expires else None, nx=not_exists)

infrahub/services/adapters/event/__init__.py

@@ -31,7 +31,7 @@ class InfrahubEventService:
     async def _send_prefect(self, event: InfrahubEvent) -> None:
         emit_event(
             id=event.meta.id,
-            event=event.get_name(),
+            event=event.event_name,
             resource=event.get_resource(),
             related=event.get_related(),
             payload=event.get_event_payload(),

infrahub/services/adapters/message_bus/__init__.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
-from typing import TYPE_CHECKING, Optional, TypeVar
+from typing import TYPE_CHECKING, TypeVar
 
 from infrahub.message_bus.messages import ROUTING_KEY_MAP
 
@@ -36,7 +36,7 @@ class InfrahubMessageBus(ABC):
 
     @abstractmethod
     async def publish(
-        self, message: InfrahubMessage, routing_key: str, delay: Optional[MessageTTL] = None, is_retry: bool = False
+        self, message: InfrahubMessage, routing_key: str, delay: MessageTTL | None = None, is_retry: bool = False
     ) -> None:
         raise NotImplementedError()
 
@@ -48,7 +48,7 @@ class InfrahubMessageBus(ABC):
     async def rpc(self, message: InfrahubMessage, response_class: type[ResponseClass]) -> ResponseClass:
         raise NotImplementedError()
 
-    async def send(self, message: InfrahubMessage, delay: Optional[MessageTTL] = None, is_retry: bool = False) -> None:
+    async def send(self, message: InfrahubMessage, delay: MessageTTL | None = None, is_retry: bool = False) -> None:
         routing_key = ROUTING_KEY_MAP.get(type(message))
         if not routing_key:
             raise ValueError("Unable to determine routing key")

infrahub/services/adapters/message_bus/local.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from collections import defaultdict
-from typing import TYPE_CHECKING, Optional, TypeVar
+from typing import TYPE_CHECKING, TypeVar
 
 import ujson
 from infrahub_sdk.uuidt import UUIDT
@@ -29,7 +29,7 @@ class BusSimulator(InfrahubMessageBus):
         self,
         message: InfrahubMessage,
         routing_key: str,
-        delay: Optional[MessageTTL] = None,  # noqa: ARG002
+        delay: MessageTTL | None = None,  # noqa: ARG002
         is_retry: bool = False,  # noqa: ARG002
     ) -> None:
         self.messages.append(message)

infrahub/services/adapters/message_bus/nats.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import asyncio
 import ssl
-from typing import TYPE_CHECKING, Awaitable, Callable, MutableMapping, Optional, TypeVar
+from typing import TYPE_CHECKING, Awaitable, Callable, MutableMapping, TypeVar
 
 import nats
 import ujson
@@ -33,7 +33,7 @@ async def _add_request_id(message: InfrahubMessage) -> None:
 
 
 class NATSMessageBus(InfrahubMessageBus):
-    def __init__(self, component_type: ComponentType, settings: Optional[BrokerSettings] = None) -> None:
+    def __init__(self, component_type: ComponentType, settings: BrokerSettings | None = None) -> None:
         self.settings = settings or config.SETTINGS.broker
 
         self.service: InfrahubServices
@@ -49,7 +49,7 @@ class NATSMessageBus(InfrahubMessageBus):
         self.component_type: ComponentType = component_type
 
     @classmethod
-    async def new(cls, component_type: ComponentType, settings: Optional[BrokerSettings] = None) -> NATSMessageBus:
+    async def new(cls, component_type: ComponentType, settings: BrokerSettings | None = None) -> NATSMessageBus:
         message_bus = cls(component_type=component_type, settings=settings)
         await message_bus._initialize()
         return message_bus
@@ -213,7 +213,7 @@ class NATSMessageBus(InfrahubMessageBus):
         await self.publish(message, routing_key)
 
     async def publish(
-        self, message: InfrahubMessage, routing_key: str, delay: Optional[MessageTTL] = None, is_retry: bool = False
+        self, message: InfrahubMessage, routing_key: str, delay: MessageTTL | None = None, is_retry: bool = False
     ) -> None:
         with trace.get_tracer(__name__).start_as_current_span("publish_message") as span:
             span.set_attribute("routing_key", routing_key)

infrahub/services/adapters/message_bus/rabbitmq.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import asyncio
-from typing import TYPE_CHECKING, Awaitable, Callable, MutableMapping, Optional, TypeVar
+from typing import TYPE_CHECKING, Awaitable, Callable, MutableMapping, TypeVar
 
 import aio_pika
 import opentelemetry.instrumentation.aio_pika.span_builder
@@ -66,7 +66,7 @@ async def _add_request_id(message: InfrahubMessage) -> None:
 
 class RabbitMQMessageBus(InfrahubMessageBus):
     def __init__(
-        self, component_type: ComponentType = ComponentType.NONE, settings: Optional[BrokerSettings] = None
+        self, component_type: ComponentType = ComponentType.NONE, settings: BrokerSettings | None = None
     ) -> None:
         self.settings = settings or config.SETTINGS.broker
         self.channel: AbstractChannel
@@ -85,7 +85,7 @@ class RabbitMQMessageBus(InfrahubMessageBus):
         self.component_type: ComponentType = component_type
 
     @classmethod
-    async def new(cls, component_type: ComponentType, settings: Optional[BrokerSettings] = None) -> RabbitMQMessageBus:
+    async def new(cls, component_type: ComponentType, settings: BrokerSettings | None = None) -> RabbitMQMessageBus:
         message_bus = cls(component_type=component_type, settings=settings)
         await message_bus._initialize()
         return message_bus
@@ -221,7 +221,7 @@ class RabbitMQMessageBus(InfrahubMessageBus):
         self,
         message: InfrahubMessage,
         routing_key: str,
-        delay: Optional[MessageTTL] = None,
+        delay: MessageTTL | None = None,
         is_retry: bool = False,  # noqa: ARG002
     ) -> None:
         for enricher in self.message_enrichers:

infrahub/services/adapters/workflow/local.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import uuid
-from typing import Any, Optional
+from typing import Any
 
 from typing_extensions import TYPE_CHECKING
 
@@ -16,7 +16,7 @@ if TYPE_CHECKING:
 
 
 class WorkflowLocalExecution(InfrahubWorkflow):
-    service: Optional[InfrahubServices] = None  # needed for local injections
+    service: InfrahubServices | None = None  # needed for local injections
 
     async def execute_workflow(
         self,

infrahub/services/component.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import re
-from typing import TYPE_CHECKING, Any, Optional
+from typing import TYPE_CHECKING, Any
 
 from attr import dataclass
 
@@ -84,7 +84,7 @@ class InfrahubComponent:
             hash_value = schema_branch.get_hash()
 
             # Use branch name if we cannot find branch id in cache
-            branch_id: Optional[str] = None
+            branch_id: str | None = None
             if branch_obj := await registry.get_branch(branch=branch, db=self.db):
                 branch_id = str(branch_obj.uuid)
 
@@ -129,10 +129,10 @@ class WorkerInfo:
     def __init__(self, identity: str) -> None:
         self.id = identity
         self.active = False
-        self._schema_hash: Optional[str] = None
+        self._schema_hash: str | None = None
 
     @property
-    def schema_hash(self) -> Optional[str]:
+    def schema_hash(self) -> str | None:
         """Return schema hash provided that the worker is active."""
         if self.active:
             return self._schema_hash
@@ -143,7 +143,7 @@ class WorkerInfo:
         if "workers:active:" in key:
             self.active = True
 
-    def add_value(self, key: str, value: Optional[str] = None) -> None:
+    def add_value(self, key: str, value: str | None = None) -> None:
         if ":schema_hash:" in key:
             self._schema_hash = value
 

infrahub/services/protocols.py

@@ -1,21 +1,21 @@
-from typing import Any, Optional, Protocol
+from typing import Any, Protocol
 
 
 class InfrahubLogger(Protocol):
-    def debug(self, event: Optional[str] = None, *args: Any, **kw: Any) -> Any:
+    def debug(self, event: str | None = None, *args: Any, **kw: Any) -> Any:
         """Send a debug event"""
 
-    def info(self, event: Optional[str] = None, *args: Any, **kw: Any) -> Any:
+    def info(self, event: str | None = None, *args: Any, **kw: Any) -> Any:
         """Send an info event"""
 
-    def warning(self, event: Optional[str] = None, *args: Any, **kw: Any) -> Any:
+    def warning(self, event: str | None = None, *args: Any, **kw: Any) -> Any:
         """Send a warning event"""
 
-    def error(self, event: Optional[str] = None, *args: Any, **kw: Any) -> Any:
+    def error(self, event: str | None = None, *args: Any, **kw: Any) -> Any:
         """Send an error event."""
 
-    def critical(self, event: Optional[str] = None, *args: Any, **kw: Any) -> Any:
+    def critical(self, event: str | None = None, *args: Any, **kw: Any) -> Any:
         """Send a critical event."""
 
-    def exception(self, event: Optional[str] = None, *args: Any, **kw: Any) -> Any:
+    def exception(self, event: str | None = None, *args: Any, **kw: Any) -> Any:
         """Send an exception event."""

infrahub/services/scheduler.py

@@ -5,8 +5,6 @@ import random
 from dataclasses import dataclass
 from typing import TYPE_CHECKING
 
-from typing_extensions import Optional
-
 from infrahub import config
 from infrahub.components import ComponentType
 from infrahub.log import get_logger
@@ -29,7 +27,7 @@ class Schedule:
 
 class InfrahubScheduler:
     # TODO we could remove service dependency by adding kwargs to Schedule instead of passing services
-    service: Optional[InfrahubServices]
+    service: InfrahubServices | None
 
     def __init__(self, component_type: ComponentType) -> None:
         self.running: bool = False