[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Author: pre-commit-ci[bot]

ymir/agents/baseline_tests.py

@@ -109,7 +109,9 @@ def _request_outcome(request: TestingFarmRequest) -> str:
             return request.result
         return request.state
 
-    async def format_issue_comment(self, *, include_attachments: bool = False, tools: list | None = None) -> str:
+    async def format_issue_comment(
+        self, *, include_attachments: bool = False, tools: list | None = None
+    ) -> str:
         if tools:
             is_complete = await self.complete(tools)
             is_settled = await self.settled(tools)
@@ -161,7 +163,9 @@ async def format_issue_comment(self, *, include_attachments: bool = False, tools
             )
         )
 
-    async def create_attachments(self, issue_key: str, dry_run: bool = False, tools: list | None = None) -> None:
+    async def create_attachments(
+        self, issue_key: str, dry_run: bool = False, tools: list | None = None
+    ) -> None:
         attachments: list[tuple[str, bytes, str]] = []
         for comparison in self.comparisons:
             failed_request = comparison.failed.request

ymir/agents/issue_verification_agent.py

@@ -14,12 +14,8 @@
 from ymir.agents.observability import setup_observability
 from ymir.agents.testing_analyst import analyze_issue
 from ymir.agents.utils import mcp_tools, run_tool
-from ymir.common.constants import DATETIME_MIN_UTC, GITLAB_GROUPS
-from ymir.common.constants import JiraLabels
+from ymir.common.constants import DATETIME_MIN_UTC, GITLAB_GROUPS, JiraLabels
 from ymir.common.models import (
-    ErrataComment,
-    ErrataStatus,
-    Erratum,
     FullErratum,
     FullIssue,
     GitlabMergeRequest,
@@ -277,9 +273,7 @@ async def _label_merge_if_needed(issue: FullIssue, tools: list, dry_run: bool) -
     if (
         JiraLabels.BACKPORTED.value in issue.labels or JiraLabels.REBASED.value in issue.labels
     ) and JiraLabels.MERGED.value not in issue.labels:
-        merged_mrs = await _search_merged_mrs(
-            component, issue.key, GitlabMergeRequestState.MERGED, tools
-        )
+        merged_mrs = await _search_merged_mrs(component, issue.key, GitlabMergeRequestState.MERGED, tools)
         if merged_mrs:
             merged_mr = merged_mrs[0]
             await _add_label(
@@ -299,9 +293,7 @@ async def _label_merge_if_needed(issue: FullIssue, tools: list, dry_run: bool) -
 async def _get_latest_merged_timestamp(issue: FullIssue, tools: list) -> datetime:
     """Get the latest merged timestamp from all merged MRs."""
     component = issue.components[0]
-    merged_mrs = await _search_merged_mrs(
-        component, issue.key, GitlabMergeRequestState.MERGED, tools
-    )
+    merged_mrs = await _search_merged_mrs(component, issue.key, GitlabMergeRequestState.MERGED, tools)
     if not merged_mrs:
         return DATETIME_MIN_UTC
     return max(
@@ -540,7 +532,9 @@ async def analyze_testing(state: IssueVerificationWorkflowState):
                                     dry_run=state.dry_run,
                                     tools=gateway_tools,
                                 )
-                                issue_comment = await new_baseline_tests.format_issue_comment(tools=gateway_tools)
+                                issue_comment = await new_baseline_tests.format_issue_comment(
+                                    tools=gateway_tools
+                                )
                                 await _add_label(
                                     issue.key,
                                     "ymir_reproducing_tests",

ymir/common/constants.py

@@ -1,6 +1,5 @@
-from enum import Enum
-
 from datetime import UTC, datetime, timedelta
+from enum import Enum
 
 JIRA_SEARCH_PATH = "rest/api/3/search/jql"
 

ymir/common/qe_data.py

@@ -70,10 +70,9 @@ def wrapper() -> Awaitable[R]:
 
 @cache_async(max_age=10 * 60)  # cache for 10 minutes
 async def get_qe_data_map() -> dict[str, dict[str, dict[str, str]]]:
-    async with aiohttp.ClientSession() as session:
-        async with session.get(QE_DATA_URL) as response:
-            response.raise_for_status()
-            return await response.json(content_type=None)
+    async with aiohttp.ClientSession() as session, session.get(QE_DATA_URL) as response:
+        response.raise_for_status()
+        return await response.json(content_type=None)
 
 
 async def get_qe_data(component: str) -> TestLocationInfo:

ymir/tools/privileged/errata.py

@@ -110,9 +110,7 @@ class GetErratumToolInput(BaseModel):
     full: bool = Field(default=False, description="If true, include comments in the response")
 
 
-class GetErratumTool(
-    Tool[GetErratumToolInput, ToolRunOptions, JSONToolOutput[dict[str, Any]]]
-):
+class GetErratumTool(Tool[GetErratumToolInput, ToolRunOptions, JSONToolOutput[dict[str, Any]]]):
     name = "get_erratum"
     description = """
     Get erratum details (basic or full with comments) by ID or link.
@@ -150,9 +148,7 @@ class GetErratumBuildNvrToolInput(BaseModel):
     package_name: str = Field(description="Package name to look up the build NVR for")
 
 
-class GetErratumBuildNvrTool(
-    Tool[GetErratumBuildNvrToolInput, ToolRunOptions, JSONToolOutput[str | None]]
-):
+class GetErratumBuildNvrTool(Tool[GetErratumBuildNvrToolInput, ToolRunOptions, JSONToolOutput[str | None]]):
     name = "get_erratum_build_nvr"
     description = """
     Get the build NVR for a package in an erratum.

ymir/tools/privileged/gitlab.py

@@ -15,7 +15,6 @@
     ToolError,
     ToolRunOptions,
 )
-from ymir.tools.base import CloneableTool as Tool
 from ogr.exceptions import GitlabAPIException, OgrException
 from ogr.factory import get_project
 from ogr.services.gitlab.project import GitlabProject
@@ -30,6 +29,7 @@
     OpenMergeRequestResult,
 )
 from ymir.common.validators import AbsolutePath
+from ymir.tools.base import CloneableTool as Tool
 from ymir.tools.constants import AIOHTTP_TIMEOUT
 from ymir.tools.privileged.utils import clean_stale_repositories
 
@@ -990,12 +990,8 @@ async def _run(
 
 
 class SearchGitlabProjectMrsToolInput(BaseModel):
-    project: str = Field(
-        description="GitLab project path (e.g. 'redhat/rhel/rpms/podman')"
-    )
-    search: str = Field(
-        description="Search string to match against merge requests (e.g. a JIRA issue key)"
-    )
+    project: str = Field(description="GitLab project path (e.g. 'redhat/rhel/rpms/podman')")
+    search: str = Field(description="Search string to match against merge requests (e.g. a JIRA issue key)")
     state: str | None = Field(
         default=None,
         description="Filter MRs by state: 'opened', 'closed', 'merged', or null for all",

ymir/tools/privileged/jira.py

@@ -15,13 +15,13 @@
     ToolError,
     ToolRunOptions,
 )
-from ymir.tools.base import CloneableTool as Tool
 from pydantic import BaseModel, Field
 
 from ymir.common import CVEEligibilityResult, TriageEligibility, load_rhel_config
 from ymir.common.base_utils import get_jira_auth_headers
 from ymir.common.constants import JIRA_SEARCH_PATH
 from ymir.common.version_utils import get_fix_version_variants, normalize_fix_version, parse_rhel_version
+from ymir.tools.base import CloneableTool as Tool
 from ymir.tools.constants import AIOHTTP_TIMEOUT
 
 if os.getenv("MOCK_JIRA", "False").lower() == "true":
@@ -1200,9 +1200,7 @@ async def _run(
                 f"on {issue_key} (this is expected, not an error)"
             )
 
-        jira_url = urljoin(
-            os.getenv("JIRA_URL"), f"rest/api/2/issue/{issue_key}/comment/{comment_id}"
-        )
+        jira_url = urljoin(os.getenv("JIRA_URL"), f"rest/api/2/issue/{issue_key}/comment/{comment_id}")
         logger.info("Updating comment %s on %s", comment_id, issue_key)
 
         async with aiohttpClientSession(timeout=AIOHTTP_TIMEOUT) as session:
@@ -1214,13 +1212,9 @@ async def _run(
                 ) as response:
                     response.raise_for_status()
             except aiohttp.ClientError as e:
-                raise ToolError(
-                    f"Failed to update comment {comment_id} on {issue_key}: {e}"
-                ) from e
+                raise ToolError(f"Failed to update comment {comment_id} on {issue_key}: {e}") from e
 
-        return StringToolOutput(
-            result=f"Successfully updated comment {comment_id} on {issue_key}"
-        )
+        return StringToolOutput(result=f"Successfully updated comment {comment_id} on {issue_key}")
 
 
 class AddJiraAttachmentsToolInput(BaseModel):
@@ -1267,9 +1261,7 @@ async def _run(
                 f"to {issue_key} (this is expected, not an error)"
             )
 
-        jira_url = urljoin(
-            os.getenv("JIRA_URL"), f"rest/api/2/issue/{issue_key}/attachments"
-        )
+        jira_url = urljoin(os.getenv("JIRA_URL"), f"rest/api/2/issue/{issue_key}/attachments")
         headers = dict(get_jira_auth_headers())
         # Remove Content-Type so aiohttp sets multipart correctly
         headers.pop("Content-Type", None)
@@ -1301,9 +1293,7 @@ async def _run(
                 raise ToolError(f"Failed to add attachments to {issue_key}: {e}") from e
 
         filenames = ", ".join(a["filename"] for a in attachments)
-        return StringToolOutput(
-            result=f"Successfully added attachments ({filenames}) to {issue_key}"
-        )
+        return StringToolOutput(result=f"Successfully added attachments ({filenames}) to {issue_key}")
 
 
 class GetJiraAttachmentToolInput(BaseModel):
@@ -1366,8 +1356,6 @@ async def _run(
         try:
             text = content.decode("utf-8")
         except UnicodeDecodeError:
-            return StringToolOutput(
-                result=f"Failed to decode attachment {filename} as UTF-8"
-            )
+            return StringToolOutput(result=f"Failed to decode attachment {filename} as UTF-8")
 
         return StringToolOutput(result=text)

ymir/tools/privileged/testing_farm.py

@@ -1,6 +1,6 @@
 import logging
 import os
-from datetime import UTC, datetime
+from datetime import datetime
 from functools import cache
 from json import dumps as json_dumps
 from typing import Any
@@ -14,7 +14,6 @@
 from ymir.common.models import (
     TestingFarmRequest,
     TestingFarmRequestResult,
-    TestingFarmRequestState,
 )
 
 logger = logging.getLogger(__name__)
@@ -35,7 +34,9 @@ def _testing_farm_api_get(path: str, *, params: dict | None = None) -> Any:
     url = f"{TESTING_FARM_URL}/{path}"
     response = requests.get(url, headers=_testing_farm_headers(), params=params)
     if not response.ok:
-        logger.error("GET %s%s failed.\nerror:\n%s", url, f" (params={params})" if params else "", response.text)
+        logger.error(
+            "GET %s%s failed.\nerror:\n%s", url, f" (params={params})" if params else "", response.text
+        )
     response.raise_for_status()
     return response.json()
 
@@ -44,7 +45,9 @@ def _testing_farm_api_post(path: str, json: dict[str, Any]) -> Any:
     url = f"{TESTING_FARM_URL}/{path}"
     response = requests.post(url, headers=_testing_farm_headers(), json=json)
     if not response.ok:
-        logger.error("POST to %s failed\nbody:\n%s\nerror:\n%s", url, json_dumps(json, indent=2), response.text)
+        logger.error(
+            "POST to %s failed\nbody:\n%s\nerror:\n%s", url, json_dumps(json, indent=2), response.text
+        )
     response.raise_for_status()
     return response.json()
 
@@ -170,9 +173,7 @@ def create_new_environment(env: dict) -> dict:
 
                 artifacts = env.get("artifacts")
                 if artifacts and len(artifacts) == 1:
-                    new_env["artifacts"] = [
-                        {"id": build_nvr, "type": "redhat-brew-build", "order": 40}
-                    ]
+                    new_env["artifacts"] = [{"id": build_nvr, "type": "redhat-brew-build", "order": 40}]
                     return new_env
 
                 raise ValueError(

ymir/tools/unprivileged/read_logfile.py

@@ -67,11 +67,10 @@ async def _run(
             return StringToolOutput(result=f"URL does not match allowed patterns: {input.logfile_url}")
 
         logger.info("Reading logfile from URL: %s", url)
-        async with aiohttp.ClientSession() as session:
-            async with session.get(url) as response:
-                if response.status == 200:
-                    return StringToolOutput(
-                        result=await response.text(),
-                    )
+        async with aiohttp.ClientSession() as session, session.get(url) as response:
+            if response.status == 200:
+                return StringToolOutput(
+                    result=await response.text(),
+                )
 
         return StringToolOutput(result=f"Failed to read logfile from {input.logfile_url}")

ymir/tools/unprivileged/search_resultsdb.py

@@ -52,49 +52,48 @@ async def search_resultsdb(package_nvr: str, name_pattern: str) -> list[ResultsD
         f"&limit={MAX_RESULTS}"
     )
     logger.info("Fetching resultsdb data from %s", url)
-    async with aiohttp.ClientSession() as session:
-        async with session.get(url) as response:
-            if response.status == 200:
-                response_json = await response.json()
-
-                if response_json.get("next") is not None:
-                    raise ValueError(f"ResultsDB returned more than {MAX_RESULTS} results")
-
-                results: list[ResultsDbResult] = [
-                    ResultsDbResult(
-                        testcase_name=r["testcase"]["name"],
-                        outcome=ResultsdbOutput(r["outcome"]),
-                        ref_url=r["ref_url"],
-                        last_updated=datetime.fromisoformat(r["submit_time"]),
-                    )
-                    for r in response_json.get("data", [])
-                ]
-
-                # Now only keep the latest result for each testcase
-                latest_results: dict[str, ResultsDbResult] = {}
-                for r in results:
-                    if (
-                        r.testcase_name not in latest_results
-                        or r.last_updated > latest_results[r.testcase_name].last_updated
-                    ):
-                        latest_results[r.testcase_name] = r
-
-                logger.info(
-                    "Found %d results in resultsdb (%d after filtering for latest submissions)",
-                    len(results),
-                    len(latest_results),
+    async with aiohttp.ClientSession() as session, session.get(url) as response:
+        if response.status == 200:
+            response_json = await response.json()
+
+            if response_json.get("next") is not None:
+                raise ValueError(f"ResultsDB returned more than {MAX_RESULTS} results")
+
+            results: list[ResultsDbResult] = [
+                ResultsDbResult(
+                    testcase_name=r["testcase"]["name"],
+                    outcome=ResultsdbOutput(r["outcome"]),
+                    ref_url=r["ref_url"],
+                    last_updated=datetime.fromisoformat(r["submit_time"]),
                 )
-
-                return list(latest_results.values())
-            text = await response.text()
-            raise aiohttp.ClientResponseError(
-                response.request_info,
-                response.history,
-                status=response.status,
-                message=text,
-                headers=response.headers,
+                for r in response_json.get("data", [])
+            ]
+
+            # Now only keep the latest result for each testcase
+            latest_results: dict[str, ResultsDbResult] = {}
+            for r in results:
+                if (
+                    r.testcase_name not in latest_results
+                    or r.last_updated > latest_results[r.testcase_name].last_updated
+                ):
+                    latest_results[r.testcase_name] = r
+
+            logger.info(
+                "Found %d results in resultsdb (%d after filtering for latest submissions)",
+                len(results),
+                len(latest_results),
             )
 
+            return list(latest_results.values())
+        text = await response.text()
+        raise aiohttp.ClientResponseError(
+            response.request_info,
+            response.history,
+            status=response.status,
+            message=text,
+            headers=response.headers,
+        )
+
 
 class SearchResultsdbInput(BaseModel):
     package_nvr: str = Field(description="NVR of the package to search in the results database")