Minor changes

Author: LucasG0

backend/infrahub/generators/models.py

@@ -1,9 +1,9 @@
+from __future__ import annotations
+
 from typing import Optional
 
 from pydantic import BaseModel, ConfigDict, Field
 
-from infrahub.message_bus.types import ProposedChangeGeneratorDefinition
-
 
 class RequestGeneratorRun(BaseModel):
     """Runs a generator."""
@@ -30,3 +30,16 @@ class RequestGeneratorDefinitionRun(BaseModel):
 
     generator_definition: ProposedChangeGeneratorDefinition = Field(..., description="The Generator Definition")
     branch: str = Field(..., description="The branch to target")
+
+
+class ProposedChangeGeneratorDefinition(BaseModel):
+    definition_id: str
+    definition_name: str
+    query_name: str
+    convert_query_response: bool
+    query_models: list[str]
+    repository_id: str
+    class_name: str
+    file_path: str
+    parameters: dict
+    group_id: str

backend/infrahub/generators/tasks.py

@@ -8,10 +8,13 @@
 
 from infrahub import lock
 from infrahub.core.constants import GeneratorInstanceStatus, InfrahubKind
-from infrahub.generators.models import RequestGeneratorDefinitionRun, RequestGeneratorRun
+from infrahub.generators.models import (
+    ProposedChangeGeneratorDefinition,
+    RequestGeneratorDefinitionRun,
+    RequestGeneratorRun,
+)
 from infrahub.git.base import extract_repo_file_information
 from infrahub.git.repository import get_initialized_repo
-from infrahub.message_bus.types import ProposedChangeGeneratorDefinition
 from infrahub.services import InfrahubServices, services
 from infrahub.workflows.catalogue import REQUEST_GENERATOR_DEFINITION_RUN, REQUEST_GENERATOR_RUN
 
@@ -136,17 +139,12 @@ async def run_generator_definition(branch: str) -> None:
 
 
 @flow(name="request_generator_definition_run")
-async def request_generator_definition_run(model: RequestGeneratorDefinitionRun, service: InfrahubServices) -> None:
+async def request_generator_definition_run(model: RequestGeneratorDefinitionRun) -> None:
+    service = services.service
     async with service.task_report(
         title="Executing Generator",
         related_node=model.generator_definition.definition_id,
     ) as task_report:
-        service.log.info(
-            "Received request to run generator",
-            branch=model.branch,
-            generator_definition=model.generator_definition.definition_id,
-        )
-
         group = await service.client.get(
             kind=InfrahubKind.GENERICGROUP,
             prefetch_relationships=True,

backend/infrahub/message_bus/messages/check_generator_run.py

@@ -2,8 +2,8 @@
 
 from pydantic import Field
 
+from infrahub.generators.models import ProposedChangeGeneratorDefinition
 from infrahub.message_bus import InfrahubMessage
-from infrahub.message_bus.types import ProposedChangeGeneratorDefinition
 
 
 class CheckGeneratorRun(InfrahubMessage):

backend/infrahub/message_bus/messages/request_generatordefinition_check.py

@@ -1,7 +1,8 @@
 from pydantic import ConfigDict, Field
 
+from infrahub.generators.models import ProposedChangeGeneratorDefinition
 from infrahub.message_bus import InfrahubMessage
-from infrahub.message_bus.types import ProposedChangeBranchDiff, ProposedChangeGeneratorDefinition
+from infrahub.message_bus.types import ProposedChangeBranchDiff
 
 
 class RequestGeneratorDefinitionCheck(InfrahubMessage):

backend/infrahub/message_bus/operations/requests/proposed_change.py

@@ -22,13 +22,13 @@
 from infrahub.core.validators.checker import schema_validators_checker
 from infrahub.core.validators.determiner import ConstraintValidatorDeterminer
 from infrahub.dependencies.registry import get_component_registry
+from infrahub.generators.models import ProposedChangeGeneratorDefinition
 from infrahub.git.repository import InfrahubRepository, get_initialized_repo
 from infrahub.log import get_logger
 from infrahub.message_bus import InfrahubMessage, messages
 from infrahub.message_bus.types import (
     ProposedChangeArtifactDefinition,
     ProposedChangeBranchDiff,
-    ProposedChangeGeneratorDefinition,
     ProposedChangeRepository,
     ProposedChangeSubscriber,
 )

backend/infrahub/message_bus/types.py

@@ -107,19 +107,6 @@ def transform_location(self) -> str:
         raise ValueError("Invalid kind for Transform")
 
 
-class ProposedChangeGeneratorDefinition(BaseModel):
-    definition_id: str
-    definition_name: str
-    query_name: str
-    convert_query_response: bool
-    query_models: list[str]
-    repository_id: str
-    class_name: str
-    file_path: str
-    parameters: dict
-    group_id: str
-
-
 class ProposedChangeBranchDiff(BaseModel):
     diff_summary: list[NodeDiff] = Field(default_factory=list, description="The DiffSummary between two branches")
     repositories: list[ProposedChangeRepository] = Field(default_factory=list)