Merge pull request #5936 from opsmill/pog-upgrade-prefect

Upgrade Prefect 3.2.11 and install prefect redis

Author: ogenstad

backend/infrahub/computed_attribute/tasks.py

@@ -115,7 +115,7 @@ async def process_transform(
             service=service,
             repository_kind=str(transform.repository.peer.typename),
             commit=repo_node.commit.value,
-        )
+        )  # type: ignore[misc]
 
         data = await service.client.query_gql_query(
             name=transform.query.peer.name.value,
@@ -131,7 +131,7 @@ async def process_transform(
             location=f"{transform.file_path.value}::{transform.class_name.value}",
             data=data,
             client=service.client,
-        )
+        )  # type: ignore[misc]
 
         await service.client.execute_graphql(
             query=UPDATE_ATTRIBUTE,

backend/infrahub/git/integrator.py

@@ -171,27 +171,27 @@ async def import_objects_from_files(
         self.create_commit_worktree(commit)
         await self._update_sync_status(branch_name=infrahub_branch_name, status=RepositorySyncStatus.SYNCING)
 
-        config_file = await self.get_repository_config(branch_name=infrahub_branch_name, commit=commit)
+        config_file = await self.get_repository_config(branch_name=infrahub_branch_name, commit=commit)  # type: ignore[misc]
         sync_status = RepositorySyncStatus.IN_SYNC if config_file else RepositorySyncStatus.ERROR_IMPORT
         error: Exception | None = None
 
         try:
             if config_file:
-                await self.import_schema_files(branch_name=infrahub_branch_name, commit=commit, config_file=config_file)
+                await self.import_schema_files(branch_name=infrahub_branch_name, commit=commit, config_file=config_file)  # type: ignore[misc]
 
                 await self.import_all_graphql_query(
                     branch_name=infrahub_branch_name, commit=commit, config_file=config_file
-                )
+                )  # type: ignore[misc]
 
                 await self.import_all_python_files(  # type: ignore[call-overload]
                     branch_name=infrahub_branch_name, commit=commit, config_file=config_file
-                )
+                )  # type: ignore[misc]
                 await self.import_jinja2_transforms(
                     branch_name=infrahub_branch_name, commit=commit, config_file=config_file
-                )
+                )  # type: ignore[misc]
                 await self.import_artifact_definitions(
                     branch_name=infrahub_branch_name, commit=commit, config_file=config_file
-                )
+                )  # type: ignore[misc]
 
         except Exception as exc:
             sync_status = RepositorySyncStatus.ERROR_IMPORT
@@ -636,7 +636,7 @@ async def import_python_check_definitions(
                     module=module,
                     file_path=file_info.relative_path_file,
                     check_definition=check,
-                )
+                )  # type: ignore[misc]
             )
 
         local_check_definitions = {check.name: check for check in checks}
@@ -797,7 +797,7 @@ async def import_python_transforms(
                     module=module,
                     file_path=file_info.relative_path_file,
                     transform=transform,
-                )
+                )  # type: ignore[misc]
             )
 
         local_transform_definitions = {transform.name: transform for transform in transforms}
@@ -1070,9 +1070,9 @@ async def import_all_python_files(
     ) -> None:
         await add_tags(branches=[branch_name], nodes=[str(self.id)])
 
-        await self.import_python_check_definitions(branch_name=branch_name, commit=commit, config_file=config_file)
-        await self.import_python_transforms(branch_name=branch_name, commit=commit, config_file=config_file)
-        await self.import_generator_definitions(branch_name=branch_name, commit=commit, config_file=config_file)
+        await self.import_python_check_definitions(branch_name=branch_name, commit=commit, config_file=config_file)  # type: ignore[misc]
+        await self.import_python_transforms(branch_name=branch_name, commit=commit, config_file=config_file)  # type: ignore[misc]
+        await self.import_generator_definitions(branch_name=branch_name, commit=commit, config_file=config_file)  # type: ignore[misc]
 
     @task(name="jinja2-template-render", task_run_name="Render Jinja2 template", cache_policy=NONE)  # type: ignore[arg-type]
     async def render_jinja2_template(self, commit: str, location: str, data: dict) -> str:
@@ -1227,7 +1227,7 @@ async def artifact_generate(
         if transformation.typename == InfrahubKind.TRANSFORMJINJA2:
             artifact_content = await self.render_jinja2_template.with_options(
                 timeout_seconds=transformation.timeout.value
-            )(commit=commit, location=transformation.template_path.value, data=response)
+            )(commit=commit, location=transformation.template_path.value, data=response)  # type: ignore[misc]
         elif transformation.typename == InfrahubKind.TRANSFORMPYTHON:
             transformation_location = f"{transformation.file_path.value}::{transformation.class_name.value}"
             artifact_content = await self.execute_python_transform.with_options(
@@ -1238,7 +1238,7 @@ async def artifact_generate(
                 location=transformation_location,
                 data=response,
                 client=self.sdk,
-            )
+            )  # type: ignore[misc]
 
         if definition.content_type.value == ContentType.APPLICATION_JSON.value and isinstance(artifact_content, dict):
             artifact_content_str = ujson.dumps(artifact_content, indent=2)
@@ -1289,15 +1289,15 @@ async def render_artifact(
         if message.transform_type == InfrahubKind.TRANSFORMJINJA2:
             artifact_content = await self.render_jinja2_template.with_options(timeout_seconds=message.timeout)(
                 commit=message.commit, location=message.transform_location, data=response
-            )
+            )  # type: ignore[misc]
         elif message.transform_type == InfrahubKind.TRANSFORMPYTHON:
             artifact_content = await self.execute_python_transform.with_options(timeout_seconds=message.timeout)(
                 branch_name=message.branch_name,
                 commit=message.commit,
                 location=message.transform_location,
                 data=response,
                 client=self.sdk,
-            )
+            )  # type: ignore[misc]
 
         if message.content_type == ContentType.APPLICATION_JSON.value and isinstance(artifact_content, dict):
             artifact_content_str = ujson.dumps(artifact_content, indent=2)

backend/infrahub/git/tasks.py

@@ -822,7 +822,7 @@ async def run_user_check(model: UserCheckData, service: InfrahubServices) -> Val
             client=service.client,
             commit=model.commit,
             params=model.variables,
-        )
+        )  # type: ignore[misc]
         if check_run.passed:
             conclusion = ValidatorConclusion.SUCCESS
             severity = "info"

backend/infrahub/transformations/tasks.py

@@ -30,7 +30,7 @@ async def transform_python(message: TransformPythonData, service: InfrahubServic
         location=message.transform_location,
         data=message.data,
         client=service.client,
-    )
+    )  # type: ignore[misc]
 
     return transformed_data
 
@@ -49,6 +49,6 @@ async def transform_render_jinja2_template(message: TransformJinjaTemplateData,
 
     rendered_template = await repo.render_jinja2_template.with_options(timeout_seconds=message.timeout)(
         commit=message.commit, location=message.template_location, data={"data": message.data}
-    )
+    )  # type: ignore[misc]
 
     return rendered_template

backend/infrahub/webhook/models.py

@@ -214,7 +214,7 @@ async def _prepare_payload(self, data: dict[str, Any], context: EventContext, se
             location=f"{self.transform_file}::{self.transform_class}",
             data={"data": data, **context.model_dump()},
             client=service.client,
-        )
+        )  # type: ignore[misc]
 
     @classmethod
     def from_object(cls, obj: CoreCustomWebhook, transform: CoreTransformPython) -> Self:

backend/infrahub/webhook/tasks.py

@@ -114,7 +114,7 @@ async def configure_webhook_all(service: InfrahubServices) -> None:
             triggers=triggers,
             trigger_type=TriggerType.WEBHOOK,
             deprecated_triggers=[AUTOMATION_NAME_RUN],
-        )
+        )  # type: ignore[misc]
 
     log.info(f"{len(triggers)} Webhooks automation configuration completed")
 

backend/tests/helpers/utils.py

@@ -44,7 +44,7 @@ def start_prefect_server_container(
 
     prefect_base = Path(Path(__file__).parent.resolve() / "./../../infrahub/prefect_server")
     container = (
-        DockerContainer(image="prefecthq/prefect:3.1.14-python3.12")
+        DockerContainer(image="prefecthq/prefect:3.2.11-python3.12")
         .with_command("uvicorn --host 0.0.0.0 --port 4200 --factory prefect_server.app:create_infrahub_prefect")
         .with_exposed_ports(PORT_PREFECT)
         .with_volume_mapping(host=str(prefect_base), container="/opt/prefect/prefect_server", mode="ro")

backend/tests/integration/git/test_git_repository.py

@@ -117,39 +117,39 @@ async def repo(
 
     async def test_import_schema_files(self, db: InfrahubDatabase, client: InfrahubClient, repo: InfrahubRepository):
         commit = repo.get_commit_value(branch_name="main")
-        config_file = await repo.get_repository_config(branch_name="main", commit=commit)
+        config_file = await repo.get_repository_config(branch_name="main", commit=commit)  # type: ignore[misc]
         assert config_file
-        await repo.import_schema_files(branch_name="main", commit=commit, config_file=config_file)
+        await repo.import_schema_files(branch_name="main", commit=commit, config_file=config_file)  # type: ignore[misc]
 
         assert await client.schema.get(kind="DemoEdgeFabric", refresh=True)
 
     async def test_import_schema_files_from_directory(
         self, db: InfrahubDatabase, client: InfrahubClient, repo: InfrahubRepository
     ):
         commit = repo.get_commit_value(branch_name="main")
-        config_file = await repo.get_repository_config(branch_name="main", commit=commit)
+        config_file = await repo.get_repository_config(branch_name="main", commit=commit)  # type: ignore[misc]
         assert config_file
 
         config_file.schemas = [Path("schemas")]
-        await repo.import_schema_files(branch_name="main", commit=commit, config_file=config_file)
+        await repo.import_schema_files(branch_name="main", commit=commit, config_file=config_file)  # type: ignore[misc]
 
         assert await client.schema.get(kind="DemoEdgeFabric", refresh=True)
 
     async def test_import_all_graphql_query(
         self, db: InfrahubDatabase, client: InfrahubClient, repo: InfrahubRepository
     ):
         commit = repo.get_commit_value(branch_name="main")
-        config_file = await repo.get_repository_config(branch_name="main", commit=commit)
+        config_file = await repo.get_repository_config(branch_name="main", commit=commit)  # type: ignore[misc]
         assert config_file
 
-        await repo.import_all_graphql_query(branch_name="main", commit=commit, config_file=config_file)
+        await repo.import_all_graphql_query(branch_name="main", commit=commit, config_file=config_file)  # type: ignore[misc]
 
         queries = await client.all(kind=CoreGraphQLQuery)
         assert len(queries) == 5
 
         # Validate if the function is idempotent, another import just after the first one shouldn't change anything
         nbr_relationships_before = await count_relationships(db=db)
-        await repo.import_all_graphql_query(branch_name="main", commit=commit, config_file=config_file)
+        await repo.import_all_graphql_query(branch_name="main", commit=commit, config_file=config_file)  # type: ignore[misc]
         assert await count_relationships(db=db) == nbr_relationships_before
 
         # 1. Modify an object to validate if its being properly updated
@@ -167,7 +167,7 @@ async def test_import_all_graphql_query(
         )
         await obj.save(db=db)
 
-        await repo.import_all_graphql_query(branch_name="main", commit=commit, config_file=config_file)
+        await repo.import_all_graphql_query(branch_name="main", commit=commit, config_file=config_file)  # type: ignore[misc]
 
         modified_query = await client.get(kind=CoreGraphQLQuery, id=queries[0].id)
         assert modified_query.query.value == value_before_change
@@ -179,7 +179,7 @@ async def test_import_all_python_files(
         self, db: InfrahubDatabase, client: InfrahubClient, repo: InfrahubRepository, query_99
     ):
         commit = repo.get_commit_value(branch_name="main")
-        config_file = await repo.get_repository_config(branch_name="main", commit=commit)
+        config_file = await repo.get_repository_config(branch_name="main", commit=commit)  # type: ignore[misc]
         assert config_file
 
         await repo.import_all_python_files(branch_name="main", commit=commit, config_file=config_file)  # type: ignore[call-overload]
@@ -256,16 +256,16 @@ async def test_import_all_yaml_files(
         self, db: InfrahubDatabase, client: InfrahubClient, repo: InfrahubRepository, query_99
     ):
         commit = repo.get_commit_value(branch_name="main")
-        config_file = await repo.get_repository_config(branch_name="main", commit=commit)
+        config_file = await repo.get_repository_config(branch_name="main", commit=commit)  # type: ignore[misc]
         assert config_file
-        await repo.import_jinja2_transforms(branch_name="main", commit=commit, config_file=config_file)
+        await repo.import_jinja2_transforms(branch_name="main", commit=commit, config_file=config_file)  # type: ignore[misc]
 
         rfiles = await client.all(kind=CoreTransformJinja2)
         assert len(rfiles) == 2
 
         # Validate if the function is idempotent, another import just after the first one shouldn't change anything
         nbr_relationships_before = await count_relationships(db=db)
-        await repo.import_jinja2_transforms(branch_name="main", commit=commit, config_file=config_file)
+        await repo.import_jinja2_transforms(branch_name="main", commit=commit, config_file=config_file)  # type: ignore[misc]
         assert await count_relationships(db=db) == nbr_relationships_before
 
         # 1. Modify an object to validate if its being properly updated
@@ -286,7 +286,7 @@ async def test_import_all_yaml_files(
         )
         await obj.save(db=db)
 
-        await repo.import_jinja2_transforms(branch_name="main", commit=commit, config_file=config_file)
+        await repo.import_jinja2_transforms(branch_name="main", commit=commit, config_file=config_file)  # type: ignore[misc]
 
         modified_rfile = await client.get(kind=CoreTransformJinja2, id=rfiles[0].id)
         assert modified_rfile.template_path.value == rfile_template_path_value_before_change