infrahub-server 1.3.8__py3-none-any.whl → 1.4.0__py3-none-any.whl

infrahub/config.py

@@ -48,6 +48,11 @@ def default_append_git_suffix_domains() -> list[str]:
     return ["github.com", "gitlab.com"]
 
 
+class EnterpriseFeatures(str, Enum):
+    PROPOSED_CHANGE_REQUIRE_APPROVAL = "proposed_change_require_approval"
+    REVOKE_PROPOSED_CHANGE_APPROVALS = "revoke_proposed_change_approvals"
+
+
 class UserInfoMethod(str, Enum):
     POST = "post"
     GET = "get"
@@ -316,9 +321,15 @@ class DevelopmentSettings(BaseSettings):
         default=False,
         description="Indicates of the frontend should be responsible for the SSO redirection",
     )
+    allow_enterprise_configuration: bool = Field(
+        default=False,
+        description="Allow enterprise configuration in development mode, this will not enable the features just allow the configuration.",
+    )
 
 
 class BrokerSettings(BaseSettings):
+    """Configuration settings for the message bus."""
+
     model_config = SettingsConfigDict(env_prefix="INFRAHUB_BROKER_")
     enable: bool = True
     tls_enabled: bool = Field(default=False, description="Indicates if TLS is enabled for the connection")
@@ -432,9 +443,7 @@ class GitSettings(BaseSettings):
 
 
 class HTTPSettings(BaseSettings):
-    """The HTTP settings control how Infrahub interacts with external HTTP servers
-
-    This can be things like webhooks and OAuth2 providers"""
+    """The HTTP settings control how Infrahub interacts with external HTTP servers. This can be things like webhooks and OAuth2 providers."""
 
     model_config = SettingsConfigDict(env_prefix="INFRAHUB_HTTP_")
     timeout: int = Field(default=10, description="Default connection timeout in seconds")
@@ -638,7 +647,10 @@ class AnalyticsSettings(BaseSettings):
 class ExperimentalFeaturesSettings(BaseSettings):
     model_config = SettingsConfigDict(env_prefix="INFRAHUB_EXPERIMENTAL_")
     graphql_enums: bool = False
-    value_db_index: bool = False
+    value_db_index: bool = Field(
+        default=False,
+        deprecated="This setting has no effect and will be removed in a future version.",
+    )
 
 
 class SecuritySettings(BaseSettings):
@@ -655,7 +667,7 @@ class SecuritySettings(BaseSettings):
     oidc_providers: list[OIDCProvider] = Field(default_factory=list, description="The selected OIDC providers")
     oidc_provider_settings: SecurityOIDCProviderSettings = Field(default_factory=SecurityOIDCProviderSettings)
     restrict_untrusted_jinja2_filters: bool = Field(
-        default=True, description="Indicates if untrusted Jinja2 filters should be disallowd for computed attributes"
+        default=True, description="Indicates if untrusted Jinja2 filters should be disallowed for computed attributes"
     )
     _oauth2_settings: dict[str, SecurityOAuth2Settings] = PrivateAttr(default_factory=dict)
     _oidc_settings: dict[str, SecurityOIDCSettings] = PrivateAttr(default_factory=dict)
@@ -766,6 +778,30 @@ class TraceSettings(BaseSettings):
     exporter_endpoint: str | None = Field(default=None, description="OTLP endpoint for exporting traces")
 
 
+class PolicySettings(BaseSettings):
+    model_config = SettingsConfigDict(env_prefix="INFRAHUB_POLICY_")
+    required_proposed_change_approvals: int = Field(
+        default=0,
+        ge=0,
+        description="Number of approvals required for proposed changes. (Enterprise only: not available in the community version.)",
+    )
+    revoke_proposed_change_approvals: bool = Field(
+        default=False,
+        description="Boolean indicating whether performing changes on a proposed change branch should revoke existing approvals."
+        " (Enterprise only: not available in the community version.)",
+    )
+
+    @property
+    def enterprise_features(self) -> list[EnterpriseFeatures]:
+        """Returns a list of enterprise features that are enabled based on the settings."""
+        features = []
+        if self.required_proposed_change_approvals > 0:
+            features.append(EnterpriseFeatures.PROPOSED_CHANGE_REQUIRE_APPROVAL)
+        if self.revoke_proposed_change_approvals:
+            features.append(EnterpriseFeatures.REVOKE_PROPOSED_CHANGE_APPROVALS)
+        return features
+
+
 @dataclass
 class Override:
     message_bus: InfrahubMessageBus | None = None
@@ -857,6 +893,10 @@ class ConfiguredSettings:
     def analytics(self) -> AnalyticsSettings:
         return self.active_settings.analytics
 
+    @property
+    def policy(self) -> PolicySettings:
+        return self.active_settings.policy
+
     @property
     def security(self) -> SecuritySettings:
         return self.active_settings.security
@@ -873,6 +913,11 @@ class ConfiguredSettings:
     def experimental_features(self) -> ExperimentalFeaturesSettings:
         return self.active_settings.experimental_features
 
+    @property
+    def enterprise_features(self) -> list[EnterpriseFeatures]:
+        """Returns a list of enterprise features that are enabled based on the settings."""
+        return self.active_settings.enterprise_features
+
 
 class Settings(BaseSettings):
     """Main Settings Class for the project."""
@@ -890,16 +935,22 @@ class Settings(BaseSettings):
     logging: LoggingSettings = LoggingSettings()
     analytics: AnalyticsSettings = AnalyticsSettings()
     initial: InitialSettings = InitialSettings()
+    policy: PolicySettings = PolicySettings()
     security: SecuritySettings = SecuritySettings()
     storage: StorageSettings = StorageSettings()
     trace: TraceSettings = TraceSettings()
     experimental_features: ExperimentalFeaturesSettings = ExperimentalFeaturesSettings()
 
+    @property
+    def enterprise_features(self) -> list[EnterpriseFeatures]:
+        """Returns a list of enterprise features that are enabled based on the settings."""
+        return self.policy.enterprise_features
+
 
 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,
+    Configuration is loaded from a configuration file in toml format that contains the settings,
     or from a dictionary of those settings passed in as "config_data"
     """
     config_file = Path(config_file_name)

infrahub/constants/environment.py

@@ -0,0 +1 @@
+INSTALLATION_TYPE = "community"

infrahub/core/attribute.py

@@ -29,7 +29,7 @@ from infrahub.core.utils import add_relationship, convert_ip_to_binary_str, upda
 from infrahub.exceptions import ValidationError
 from infrahub.helpers import hash_password
 
-from ..types import ATTRIBUTE_TYPES, LARGE_ATTRIBUTE_TYPES
+from ..types import is_large_attribute_type
 from .constants.relationship_label import RELATIONSHIP_TO_NODE_LABEL, RELATIONSHIP_TO_VALUE_LABEL
 from .schema.attribute_parameters import NumberAttributeParameters
 
@@ -72,7 +72,6 @@ class AttributeCreateData(BaseModel):
     is_visible: bool
     source_prop: list[NodePropertyData] = Field(default_factory=list)
     owner_prop: list[NodePropertyData] = Field(default_factory=list)
-    node_type: AttributeDBNodeType = AttributeDBNodeType.DEFAULT
 
 
 class BaseAttribute(FlagPropertyMixin, NodePropertyMixin):
@@ -278,7 +277,7 @@ class BaseAttribute(FlagPropertyMixin, NodePropertyMixin):
             data["value"] = NULL_VALUE
         else:
             serialized_value = self.serialize_value()
-            if isinstance(serialized_value, str) and ATTRIBUTE_TYPES[self.schema.kind] not in LARGE_ATTRIBUTE_TYPES:
+            if isinstance(serialized_value, str) and not is_large_attribute_type(self.schema.kind):
                 # Perform validation here to avoid an extra serialization during validation step.
                 # Standard non-str attributes (integer, boolean) do not exceed limit size related to neo4j indexing.
                 validate_string_length(serialized_value)
@@ -497,6 +496,8 @@ class BaseAttribute(FlagPropertyMixin, NodePropertyMixin):
         if changelog.has_updates:
             return changelog
 
+        return None
+
     async def to_graphql(
         self,
         db: InfrahubDatabase,
@@ -622,7 +623,9 @@ class BaseAttribute(FlagPropertyMixin, NodePropertyMixin):
         return changed
 
     def get_db_node_type(self) -> AttributeDBNodeType:
-        return AttributeDBNodeType.DEFAULT
+        if is_large_attribute_type(self.get_kind()):
+            return AttributeDBNodeType.DEFAULT
+        return AttributeDBNodeType.INDEXED
 
     def get_create_data(self) -> AttributeCreateData:
         branch = self.branch
@@ -633,7 +636,6 @@ class BaseAttribute(FlagPropertyMixin, NodePropertyMixin):
             branch = registry.get_global_branch()
             hierarchy_level = 0
         data = AttributeCreateData(
-            node_type=self.get_db_node_type(),
             uuid=str(UUIDT()),
             name=self.name,
             type=self.get_kind(),
@@ -678,6 +680,12 @@ class String(BaseAttribute):
     type = str
     value: str
 
+    @classmethod
+    def validate_content(cls, value: Any, name: str, schema: AttributeSchema) -> None:
+        if value is not None and not is_large_attribute_type(schema.kind):
+            validate_string_length(value=str(value))
+        super().validate_content(value=value, name=name, schema=schema)
+
 
 class StringOptional(String):
     value: str | None
@@ -944,7 +952,7 @@ class IPNetwork(BaseAttribute):
     def get_db_node_type(self) -> AttributeDBNodeType:
         if self.value is not None:
             return AttributeDBNodeType.IPNETWORK
-        return AttributeDBNodeType.DEFAULT
+        return super().get_db_node_type()
 
     def to_db(self) -> dict[str, Any]:
         data = super().to_db()
@@ -1080,7 +1088,7 @@ class IPHost(BaseAttribute):
     def get_db_node_type(self) -> AttributeDBNodeType:
         if self.value is not None:
             return AttributeDBNodeType.IPHOST
-        return AttributeDBNodeType.DEFAULT
+        return super().get_db_node_type()
 
     def to_db(self) -> dict[str, Any]:
         data = super().to_db()

infrahub/core/branch/tasks.py

@@ -34,7 +34,7 @@ from infrahub.events.models import EventMeta, InfrahubEvent
 from infrahub.events.node_action import get_node_event
 from infrahub.exceptions import BranchNotFoundError, ValidationError
 from infrahub.graphql.mutations.models import BranchCreateModel  # noqa: TC001
-from infrahub.services import InfrahubServices  # noqa: TC001  needed for prefect flow
+from infrahub.workers.dependencies import get_component, get_database, get_event_service, get_workflow
 from infrahub.workflows.catalogue import (
     BRANCH_CANCEL_PROPOSED_CHANGES,
     BRANCH_MERGE_POST_PROCESS,
@@ -49,8 +49,9 @@ from infrahub.workflows.utils import add_tags
 
 
 @flow(name="branch-rebase", flow_run_name="Rebase branch {branch}")
-async def rebase_branch(branch: str, context: InfrahubContext, service: InfrahubServices) -> None:  # noqa: PLR0915
-    async with service.database.start_session() as db:
+async def rebase_branch(branch: str, context: InfrahubContext) -> None:  # noqa: PLR0915
+    database = await get_database()
+    async with database.start_session() as db:
         log = get_run_logger()
         await add_tags(branches=[branch])
         obj = await Branch.get_by_name(db=db, name=branch)
@@ -67,7 +68,7 @@ async def rebase_branch(branch: str, context: InfrahubContext, service: Infrahub
             diff_repository=diff_repository,
             source_branch=obj,
             diff_locker=DiffLocker(),
-            service=service,
+            workflow=get_workflow(),
         )
 
         enriched_diff_metadata = await diff_coordinator.update_branch_diff(base_branch=base_branch, diff_branch=obj)
@@ -94,10 +95,7 @@ async def rebase_branch(branch: str, context: InfrahubContext, service: Infrahub
             constraints += await merger.calculate_validations(target_schema=candidate_schema)
         if constraints:
             responses = await schema_validate_migrations(
-                message=SchemaValidateMigrationData(
-                    branch=obj, schema_branch=candidate_schema, constraints=constraints
-                ),
-                service=service,
+                message=SchemaValidateMigrationData(branch=obj, schema_branch=candidate_schema, constraints=constraints)
             )
             error_messages = [violation.message for response in responses for violation in response.violations]
             if error_messages:
@@ -135,8 +133,7 @@ async def rebase_branch(branch: str, context: InfrahubContext, service: Infrahub
                         new_schema=candidate_schema,
                         previous_schema=schema_in_main_before,
                         migrations=migrations,
-                    ),
-                    service=service,
+                    )
                 )
                 for error in errors:
                     log.error(error)
@@ -158,13 +155,13 @@ async def rebase_branch(branch: str, context: InfrahubContext, service: Infrahub
             target_branch_name=registry.default_branch,
         )
         if ipam_node_details:
-            await service.workflow.submit_workflow(
+            await get_workflow().submit_workflow(
                 workflow=IPAM_RECONCILIATION,
                 context=context,
                 parameters={"branch": obj.name, "ipam_node_details": ipam_node_details},
             )
 
-    await service.workflow.submit_workflow(
+    await get_workflow().submit_workflow(
         workflow=DIFF_REFRESH_ALL, context=context, parameters={"branch_name": obj.name}
     )
 
@@ -189,15 +186,15 @@ async def rebase_branch(branch: str, context: InfrahubContext, service: Infrahub
         )
         events.append(mutate_event)
 
+    event_service = await get_event_service()
     for event in events:
-        await service.event.send(event)
+        await event_service.send(event)
 
 
 @flow(name="branch-merge", flow_run_name="Merge branch {branch} into main")
-async def merge_branch(
-    branch: str, context: InfrahubContext, service: InfrahubServices, proposed_change_id: str | None = None
-) -> None:
-    async with service.database.start_session() as db:
+async def merge_branch(branch: str, context: InfrahubContext, proposed_change_id: str | None = None) -> None:
+    database = await get_database()
+    async with database.start_session() as db:
         log = get_run_logger()
 
         await add_tags(branches=[branch, registry.default_branch])
@@ -224,7 +221,7 @@ async def merge_branch(
                 diff_repository=diff_repository,
                 source_branch=obj,
                 diff_locker=DiffLocker(),
-                service=service,
+                workflow=get_workflow(),
             )
             branch_diff = await merger.merge()
             await merger.update_schema()
@@ -238,8 +235,7 @@ async def merge_branch(
                     new_schema=merger.destination_schema,
                     previous_schema=merger.initial_source_schema,
                     migrations=merger.migrations,
-                ),
-                service=service,
+                )
             )
             for error in errors:
                 log.error(error)
@@ -253,7 +249,7 @@ async def merge_branch(
             target_branch_name=registry.default_branch,
         )
         if ipam_node_details:
-            await service.workflow.submit_workflow(
+            await get_workflow().submit_workflow(
                 workflow=IPAM_RECONCILIATION,
                 context=context,
                 parameters={"branch": registry.default_branch, "ipam_node_details": ipam_node_details},
@@ -269,7 +265,7 @@ async def merge_branch(
         # NOTE: we still need to convert this event and potentially pull
         #   some tasks currently executed based on the event into this workflow
         # -------------------------------------------------------------
-        await service.workflow.submit_workflow(
+        await get_workflow().submit_workflow(
             workflow=BRANCH_MERGE_POST_PROCESS,
             context=context,
             parameters={"source_branch": obj.name, "target_branch": registry.default_branch},
@@ -289,15 +285,17 @@ async def merge_branch(
             )
             events.append(mutate_event)
 
+        event_service = await get_event_service()
         for event in events:
-            await service.event.send(event=event)
+            await event_service.send(event=event)
 
 
 @flow(name="branch-delete", flow_run_name="Delete branch {branch}")
-async def delete_branch(branch: str, context: InfrahubContext, service: InfrahubServices) -> None:
+async def delete_branch(branch: str, context: InfrahubContext) -> None:
     await add_tags(branches=[branch])
 
-    async with service.database.start_session() as db:
+    database = await get_database()
+    async with database.start_session() as db:
         obj = await Branch.get_by_name(db=db, name=str(branch))
         await obj.delete(db=db)
 
@@ -308,11 +306,12 @@ async def delete_branch(branch: str, context: InfrahubContext, service: Infrahub
             meta=EventMeta.from_context(context=context, branch=registry.get_global_branch()),
         )
 
-        await service.workflow.submit_workflow(
+        await get_workflow().submit_workflow(
             workflow=BRANCH_CANCEL_PROPOSED_CHANGES, context=context, parameters={"branch_name": branch}
         )
 
-        await service.event.send(event=event)
+        event_service = await get_event_service()
+        await event_service.send(event=event)
 
 
 @flow(
@@ -321,10 +320,11 @@ async def delete_branch(branch: str, context: InfrahubContext, service: Infrahub
     description="Validate if the branch has some conflicts",
     persist_result=True,
 )
-async def validate_branch(branch: str, service: InfrahubServices) -> State:
+async def validate_branch(branch: str) -> State:
     await add_tags(branches=[branch])
 
-    async with service.database.start_session() as db:
+    database = await get_database()
+    async with database.start_session() as db:
         obj = await Branch.get_by_name(db=db, name=branch)
 
         component_registry = get_component_registry()
@@ -338,10 +338,11 @@ async def validate_branch(branch: str, service: InfrahubServices) -> State:
 
 
 @flow(name="create-branch", flow_run_name="Create branch {model.name}")
-async def create_branch(model: BranchCreateModel, context: InfrahubContext, service: InfrahubServices) -> None:
+async def create_branch(model: BranchCreateModel, context: InfrahubContext) -> None:
     await add_tags(branches=[model.name])
 
-    async with service.database.start_session() as db:
+    database = await get_database()
+    async with database.start_session() as db:
         try:
             await Branch.get_by_name(db=db, name=model.name)
             raise ValueError(f"The branch {model.name}, already exist")
@@ -367,7 +368,8 @@ async def create_branch(model: BranchCreateModel, context: InfrahubContext, serv
 
             # Add Branch to registry
             registry.branch[obj.name] = obj
-            await service.component.refresh_schema_hash(branches=[obj.name])
+            component = await get_component()
+            await component.refresh_schema_hash(branches=[obj.name])
 
         event = BranchCreatedEvent(
             branch_name=obj.name,
@@ -375,10 +377,11 @@ async def create_branch(model: BranchCreateModel, context: InfrahubContext, serv
             sync_with_git=obj.sync_with_git,
             meta=EventMeta.from_context(context=context, branch=registry.get_global_branch()),
         )
-        await service.event.send(event=event)
+        event_service = await get_event_service()
+        await event_service.send(event=event)
 
         if obj.sync_with_git:
-            await service.workflow.submit_workflow(
+            await get_workflow().submit_workflow(
                 workflow=GIT_REPOSITORIES_CREATE_BRANCH,
                 context=context,
                 parameters={"branch": obj.name, "branch_id": str(obj.uuid)},
@@ -412,10 +415,9 @@ async def _get_diff_root(
     name="branch-merge-post-process",
     flow_run_name="Run additional tasks after merging {source_branch} in {target_branch}",
 )
-async def post_process_branch_merge(
-    source_branch: str, target_branch: str, context: InfrahubContext, service: InfrahubServices
-) -> None:
-    async with service.database.start_session() as db:
+async def post_process_branch_merge(source_branch: str, target_branch: str, context: InfrahubContext) -> None:
+    database = await get_database()
+    async with database.start_session() as db:
         await add_tags(branches=[source_branch])
         log = get_run_logger()
         log.info(f"Running additional tasks after merging {source_branch} within {target_branch}")
@@ -426,13 +428,13 @@ async def post_process_branch_merge(
         # send diff update requests for every branch-tracking diff
         branch_diff_roots = await diff_repository.get_roots_metadata(base_branch_names=[target_branch])
 
-        await service.workflow.submit_workflow(
+        await get_workflow().submit_workflow(
             workflow=TRIGGER_ARTIFACT_DEFINITION_GENERATE,
             context=context,
             parameters={"branch": target_branch},
         )
 
-        await service.workflow.submit_workflow(
+        await get_workflow().submit_workflow(
             workflow=TRIGGER_GENERATOR_DEFINITION_RUN,
             context=context,
             parameters={"branch": target_branch},
@@ -445,6 +447,6 @@ async def post_process_branch_merge(
                 and isinstance(diff_root.tracking_id, BranchTrackingId)
             ):
                 request_diff_update_model = RequestDiffUpdate(branch_name=diff_root.diff_branch_name)
-                await service.workflow.submit_workflow(
+                await get_workflow().submit_workflow(
                     workflow=DIFF_UPDATE, context=context, parameters={"model": request_diff_update_model}
                 )

infrahub/core/constants/__init__.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-import enum
+from enum import Flag, auto
 
 from infrahub.core.constants import infrahubkind as InfrahubKind  # noqa: N812
 from infrahub.exceptions import ValidationError
@@ -61,6 +61,16 @@ class EventType(InfrahubStringEnum):
     GROUP_MEMBER_ADDED = f"{EVENT_NAMESPACE}.group.member_added"
     GROUP_MEMBER_REMOVED = f"{EVENT_NAMESPACE}.group.member_removed"
 
+    PROPOSED_CHANGE_MERGED = f"{EVENT_NAMESPACE}.proposed_change.merged"
+    PROPOSED_CHANGE_REVIEW_REQUESTED = f"{EVENT_NAMESPACE}.proposed_change.review_requested"
+    PROPOSED_CHANGE_APPROVED = f"{EVENT_NAMESPACE}.proposed_change.approved"
+    PROPOSED_CHANGE_REJECTED = f"{EVENT_NAMESPACE}.proposed_change.rejected"
+    PROPOSED_CHANGE_APPROVAL_REVOKED = f"{EVENT_NAMESPACE}.proposed_change.approval_revoked"
+    PROPOSED_CHANGE_APPROVALS_REVOKED = f"{EVENT_NAMESPACE}.proposed_change.approvals_revoked"
+    PROPOSED_CHANGE_REJECTION_REVOKED = f"{EVENT_NAMESPACE}.proposed_change.rejection_revoked"
+    PROPOSED_CHANGE_THREAD_CREATED = f"{EVENT_NAMESPACE}.proposed_change_thread.created"
+    PROPOSED_CHANGE_THREAD_UPDATED = f"{EVENT_NAMESPACE}.proposed_change_thread.updated"
+
     REPOSITORY_UPDATE_COMMIT = f"{EVENT_NAMESPACE}.repository.update_commit"
 
     ARTIFACT_CREATED = f"{EVENT_NAMESPACE}.artifact.created"
@@ -71,7 +81,7 @@ class EventType(InfrahubStringEnum):
     VALIDATOR_FAILED = f"{EVENT_NAMESPACE}.validator.failed"
 
 
-class PermissionLevel(enum.Flag):
+class PermissionLevel(Flag):
     READ = 1
     WRITE = 2
     ADMIN = 3
@@ -83,6 +93,7 @@ class GlobalPermissions(InfrahubStringEnum):
     SUPER_ADMIN = "super_admin"
     MERGE_BRANCH = "merge_branch"
     MERGE_PROPOSED_CHANGE = "merge_proposed_change"
+    REVIEW_PROPOSED_CHANGE = "review_proposed_change"
     MANAGE_SCHEMA = "manage_schema"
     MANAGE_ACCOUNTS = "manage_accounts"
     MANAGE_PERMISSIONS = "manage_permissions"
@@ -335,10 +346,14 @@ class ValidatorState(InfrahubStringEnum):
     COMPLETED = "completed"
 
 
-class AttributeDBNodeType(InfrahubStringEnum):
-    DEFAULT = "default"
-    IPHOST = "iphost"
-    IPNETWORK = "ipnetwork"
+class AttributeDBNodeType(Flag):
+    DEFAULT = auto()
+    INDEX_ONLY = auto()
+    IPHOST_ONLY = auto()
+    IPNETWORK_ONLY = auto()
+    INDEXED = DEFAULT | INDEX_ONLY
+    IPHOST = DEFAULT | INDEX_ONLY | IPHOST_ONLY
+    IPNETWORK = DEFAULT | INDEX_ONLY | IPNETWORK_ONLY
 
 
 RESTRICTED_NAMESPACES: list[str] = [

infrahub/core/constants/infrahubkind.py

@@ -38,7 +38,9 @@ IPNAMESPACE = "BuiltinIPNamespace"
 IPADDRESS = "BuiltinIPAddress"
 IPADDRESSPOOL = "CoreIPAddressPool"
 IPPREFIX = "BuiltinIPPrefix"
+IPPREFIXAVAILABLE = "InternalIPPrefixAvailable"
 IPPREFIXPOOL = "CoreIPPrefixPool"
+IPRANGEAVAILABLE = "InternalIPRangeAvailable"
 MENU = "CoreMenu"
 MENUITEM = "CoreMenuItem"
 NAMESPACE = "IpamNamespace"

infrahub/core/diff/coordinator.py

@@ -11,6 +11,7 @@ from infrahub.core.timestamp import Timestamp
 from infrahub.exceptions import ValidationError
 from infrahub.log import get_logger
 
+from ..query.diff import get_num_changes_in_time_range_by_branch
 from .model.field_specifiers_map import NodeFieldSpecifierMap
 from .model.path import (
     BranchTrackingId,
@@ -419,10 +420,11 @@ class DiffCoordinator:
                 log.info(
                     f"Checking number of changes on branches for {diff_request!r}, from_time={current_time}, to_time={end_time}"
                 )
-                num_changes_by_branch = await self.diff_repo.get_num_changes_in_time_range_by_branch(
+                num_changes_by_branch = await get_num_changes_in_time_range_by_branch(
                     branch_names=[diff_request.base_branch.name, diff_request.diff_branch.name],
                     from_time=current_time,
                     to_time=end_time,
+                    db=self.db,
                 )
                 log.info(f"Number of changes: {num_changes_by_branch}")
                 might_have_changes_in_time_range = any(num_changes_by_branch.values())

infrahub/core/diff/repository/repository.py

@@ -10,7 +10,6 @@ from infrahub.core.diff.query.summary_counts_enricher import (
     DiffFieldsSummaryCountsEnricherQuery,
     DiffNodesSummaryCountsEnricherQuery,
 )
-from infrahub.core.query.diff import DiffCountChanges
 from infrahub.core.timestamp import Timestamp
 from infrahub.database import InfrahubDatabase, retry_db_transaction
 from infrahub.exceptions import ResourceNotFoundError
@@ -513,13 +512,6 @@ class DiffRepository:
         query = await EnrichedDiffMergedTrackingIdQuery.init(db=self.db, tracking_ids=tracking_ids)
         await query.execute(db=self.db)
 
-    async def get_num_changes_in_time_range_by_branch(
-        self, branch_names: list[str], from_time: Timestamp, to_time: Timestamp
-    ) -> dict[str, int]:
-        query = await DiffCountChanges.init(db=self.db, branch_names=branch_names, diff_from=from_time, diff_to=to_time)
-        await query.execute(db=self.db)
-        return query.get_num_changes_by_branch()
-
     async def get_node_field_specifiers(self, diff_id: str) -> NodeFieldSpecifierMap:
         limit = config.SETTINGS.database.query_size_limit
         offset = 0

infrahub/core/diff/tasks.py

@@ -9,7 +9,7 @@ from infrahub.core.diff.models import RequestDiffUpdate  # noqa: TC001  needed f
 from infrahub.core.diff.repository.repository import DiffRepository
 from infrahub.dependencies.registry import get_component_registry
 from infrahub.log import get_logger
-from infrahub.services import InfrahubServices  # noqa: TC001  needed for prefect flow
+from infrahub.workers.dependencies import get_database, get_workflow
 from infrahub.workflows.catalogue import DIFF_REFRESH
 from infrahub.workflows.utils import add_tags
 
@@ -17,10 +17,11 @@ log = get_logger()
 
 
 @flow(name="diff-update", flow_run_name="Update diff for branch {model.branch_name}")
-async def update_diff(model: RequestDiffUpdate, service: InfrahubServices) -> None:
+async def update_diff(model: RequestDiffUpdate) -> None:
     await add_tags(branches=[model.branch_name])
 
-    async with service.database.start_session(read_only=False) as db:
+    database = await get_database()
+    async with database.start_session(read_only=False) as db:
         component_registry = get_component_registry()
         base_branch = await registry.get_branch(db=db, branch=registry.default_branch)
         diff_branch = await registry.get_branch(db=db, branch=model.branch_name)
@@ -37,10 +38,11 @@ async def update_diff(model: RequestDiffUpdate, service: InfrahubServices) -> No
 
 
 @flow(name="diff-refresh", flow_run_name="Recreate diff for branch {branch_name}")
-async def refresh_diff(branch_name: str, diff_id: str, service: InfrahubServices) -> None:
+async def refresh_diff(branch_name: str, diff_id: str) -> None:
     await add_tags(branches=[branch_name])
 
-    async with service.database.start_session(read_only=False) as db:
+    database = await get_database()
+    async with database.start_session(read_only=False) as db:
         component_registry = get_component_registry()
         base_branch = await registry.get_branch(db=db, branch=registry.default_branch)
         diff_branch = await registry.get_branch(db=db, branch=branch_name)
@@ -50,10 +52,11 @@ async def refresh_diff(branch_name: str, diff_id: str, service: InfrahubServices
 
 
 @flow(name="diff-refresh-all", flow_run_name="Recreate all diffs for branch {branch_name}")
-async def refresh_diff_all(branch_name: str, context: InfrahubContext, service: InfrahubServices) -> None:
+async def refresh_diff_all(branch_name: str, context: InfrahubContext) -> None:
     await add_tags(branches=[branch_name])
 
-    async with service.database.start_session(read_only=True) as db:
+    database = await get_database()
+    async with database.start_session(read_only=False) as db:
         component_registry = get_component_registry()
         default_branch = registry.get_branch_from_registry()
         diff_repository = await component_registry.get_component(DiffRepository, db=db, branch=default_branch)
@@ -61,7 +64,7 @@ async def refresh_diff_all(branch_name: str, context: InfrahubContext, service:
 
         for diff_root in diff_roots_to_refresh:
             if diff_root.base_branch_name != diff_root.diff_branch_name:
-                await service.workflow.submit_workflow(
+                await get_workflow().submit_workflow(
                     workflow=DIFF_REFRESH,
                     context=context,
                     parameters={"branch_name": diff_root.diff_branch_name, "diff_id": diff_root.uuid},

infrahub/core/graph/__init__.py

@@ -1 +1 @@
-GRAPH_VERSION = 35
+GRAPH_VERSION = 37

infrahub/core/graph/index.py

@@ -12,13 +12,12 @@ node_indexes: list[IndexItem] = [
     IndexItem(name="attr_iphost_bin", label="AttributeIPHost", properties=["binary_address"], type=IndexType.RANGE),
     IndexItem(name="rel_uuid", label="Relationship", properties=["uuid"], type=IndexType.RANGE),
     IndexItem(name="rel_identifier", label="Relationship", properties=["name"], type=IndexType.RANGE),
+    IndexItem(name="attr_value_indexed", label="AttributeValueIndexed", properties=["value"], type=IndexType.RANGE),
     # diff indices
     IndexItem(name="diff_uuid", label="DiffRoot", properties=["uuid"], type=IndexType.TEXT),
     IndexItem(name="diff_node_uuid", label="DiffNode", properties=["uuid"], type=IndexType.TEXT),
 ]
 
-attr_value_index = IndexItem(name="attr_value", label="AttributeValue", properties=["value"], type=IndexType.RANGE)
-
 rel_indexes: list[IndexItem] = [
     IndexItem(name="attr_from", label="HAS_ATTRIBUTE", properties=["from"], type=IndexType.RANGE),
     IndexItem(name="attr_branch", label="HAS_ATTRIBUTE", properties=["branch"], type=IndexType.RANGE),