refactor: unify Gitea build target with existing Repos type

Motivation:
Maintaining multiple identical structures for repository coordinates (project,
arch, product) leads to technical debt and structural duplication.

Design Choices:
- Replaced the short-lived BuildTarget dataclass with the established Repos
  NamedTuple.
- Mapped project to Repos.product and product_name to Repos.version to align
  with existing SLFO patterns in the codebase.
- Simplified add_channel_for_build_result return logic to satisfy PLR0911
  while maintaining functional correctness.
- Updated all call sites and tests to utilize the Repos type.

User Benefits:
- Reduced code duplication and structural complexity.
- Improved architectural consistency across the project.

Author: okurz

openqabot/loader/gitea.py

@@ -30,15 +30,16 @@
 
 from openqabot import config
 from openqabot.errors import NoRepoFoundError
-from openqabot.types.gitea import BuildTarget, RepoConfig
+from openqabot.types.gitea import RepoConfig
+from openqabot.types.types import Repos
 from openqabot.utils import get_repo_url
 from openqabot.utils import retry10 as retried_requests
 
 if TYPE_CHECKING:
     from collections.abc import Iterator
 
     from openqabot.types.pullrequest import PullRequest
-    from openqabot.types.types import Repos
+
 
 ARCHS = {"x86_64", "aarch64", "ppc64le", "s390x"}
 
@@ -328,7 +329,7 @@ def get_product_version_from_repo_listing(
 
 
 def verify_repo_exists(
-    target: BuildTarget,
+    target: Repos,
     product_version: str,
     config: RepoConfig,
 ) -> bool:
@@ -351,7 +352,7 @@ def verify_repo_exists(
 
 def _get_product_version(
     res: etree._Element,
-    target: BuildTarget,
+    target: Repos,
     config: RepoConfig,
 ) -> str:
     """Extract product version from scmsync element or repository listing."""
@@ -368,26 +369,26 @@ def _get_product_version(
     # read product version from directory listing if the project is for a concrete product
     if (
         not product_version
-        and target.product_name
+        and target.version
         and config.obs_products
-        and ("all" in config.obs_products or target.product_name in config.obs_products)
+        and ("all" in config.obs_products or target.version in config.obs_products)
     ):
         product_version = get_product_version_from_repo_listing(
-            target.project, target.product_name, res.get("repository"), config.obs_download_url
+            target.product, target.version, res.get("repository"), config.obs_download_url
         )
 
     return product_version
 
 
 def add_channel_for_build_result(
-    target: BuildTarget,
+    target: Repos,
     res: etree._Element,
     projects: set[str],
     *,
     config: RepoConfig,
 ) -> str:
     """Construct a channel string for a build result and add it to the project set."""
-    channel = f"{target.project}:{target.arch}"
+    channel = f"{target.product}:{target.arch}"
     if target.arch == "local":
         return channel
 
@@ -396,17 +397,16 @@ def add_channel_for_build_result(
     # append product version to channel if known; otherwise skip channel if this is for a concrete product
     if product_version:
         channel += f"#{product_version}"
-    elif len(target.product_name) > 0:
+    elif target.version:
         log.debug(
             "Channel skipped: Product version for build result %s:%s could not be determined",
-            target.project,
+            target.product,
             target.arch,
         )
         return channel
-    if target.product_name and not verify_repo_exists(target, product_version, config):
-        log.debug("Skipping %s:%s: repository not found for architecture %s", target.project, target.arch, target.arch)
-        return channel
-    projects.add(channel)
+
+    if not product_version or verify_repo_exists(target, product_version, config):
+        projects.add(channel)
     return channel
 
 
@@ -445,7 +445,7 @@ def add_build_result(
         obs_download_url=config.settings.obs_download_url,
         obs_products=config.settings.obs_products_set,
     )
-    target = BuildTarget(project, res.get("arch"), product)
+    target = Repos(product=project, version=product, arch=res.get("arch"))
     channel = add_channel_for_build_result(target, res, results.projects, config=repo_config)
     if "all" not in config.settings.obs_products_set and product not in config.settings.obs_products_set:
         return

openqabot/types/gitea.py

@@ -7,15 +7,6 @@
 from dataclasses import dataclass
 
 
-@dataclass
-class BuildTarget:
-    """OBS build target information including project, architecture, and product name."""
-
-    project: str
-    arch: str
-    product_name: str
-
-
 @dataclass
 class RepoConfig:
     """Configuration for OBS repository mirrors and product sets."""

openqabot/utils.py

@@ -18,8 +18,8 @@
 if TYPE_CHECKING:
     from pathlib import Path
 
-    from .types.gitea import BuildTarget, RepoConfig
-    from .types.types import Data
+    from .types.gitea import RepoConfig
+    from .types.types import Data, Repos
 
 ANSI_ESCAPE_RE = re.compile(r"\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])")
 
@@ -111,7 +111,7 @@ def merge_dicts(dict1: dict[Any, Any], dict2: dict[Any, Any]) -> dict[Any, Any]:
 
 
 def get_repo_url(
-    target: BuildTarget,
+    target: Repos,
     product_version: str,
     config: RepoConfig,
 ) -> str:
@@ -120,10 +120,9 @@ def get_repo_url(
     if not host:
         return ""
     base = config.download_base_url.replace("%REPO_MIRROR_HOST%", host)
-    project_path = target.project.replace(":", ":/")
+    project_path = target.product.replace(":", ":/")
     return (
-        f"{base}/{project_path}/{config.repo_type}/repo/"
-        f"{target.product_name}-{product_version}-{target.arch}/{target.arch}/"
+        f"{base}/{project_path}/{config.repo_type}/repo/{target.version}-{product_version}-{target.arch}/{target.arch}/"
     )
 
 

tests/test_loader_gitea_build_results.py

@@ -13,7 +13,8 @@
 
 from openqabot.loader import gitea
 from openqabot.loader.gitea import BuildResults, verify_repo_exists
-from openqabot.types.gitea import BuildTarget, RepoConfig
+from openqabot.types.gitea import RepoConfig
+from openqabot.types.types import Repos
 
 if TYPE_CHECKING:
     from pytest_mock import MockerFixture
@@ -149,7 +150,7 @@ def test_add_build_results_duplicate_channels(mocker: MockerFixture) -> None:
     mocker.patch("openqabot.loader.gitea.get_product_name", return_value="SLES")
 
     def mock_add_channel(
-        _target: BuildTarget,
+        _target: Repos,
         _res: Any,
         projects: set[str],
         *,
@@ -301,7 +302,7 @@ def test_verify_repo_exists_status_codes(
     mock_head.return_value.ok = ok
 
     result = verify_repo_exists(
-        BuildTarget("SUSE:SLFO:1.2:PullRequest:2702:SLES", "x86_64", "SLES"),
+        Repos("SUSE:SLFO:1.2:PullRequest:2702:SLES", "SLES", "x86_64"),
         "16.0",
         config=RepoConfig(
             repo_type="product",
@@ -318,7 +319,7 @@ def test_verify_repo_exists_no_product_version(mocker: MockerFixture) -> None:
     mock_head = mocker.patch("openqabot.loader.gitea.retried_requests.head")
 
     result = verify_repo_exists(
-        BuildTarget("SUSE:SLFO:1.2:PullRequest:2702:SLES", "x86_64", "SLES"),
+        Repos("SUSE:SLFO:1.2:PullRequest:2702:SLES", "SLES", "x86_64"),
         "",
         config=RepoConfig(
             repo_type="product",
@@ -342,7 +343,7 @@ def test_verify_repo_exists_no_product_version(mocker: MockerFixture) -> None:
 def test_verify_repo_exists_missing_urls(download_base: str, obs_download: str) -> None:
     """Verify verify_repo_exists returns True when configuration URLs are missing."""
     result = verify_repo_exists(
-        BuildTarget("SUSE:SLFO:1.2:PullRequest:2702:SLES", "x86_64", "SLES"),
+        Repos("SUSE:SLFO:1.2:PullRequest:2702:SLES", "SLES", "x86_64"),
         "16.0",
         config=RepoConfig(
             repo_type="product",
@@ -357,7 +358,7 @@ def test_verify_repo_exists_missing_urls(download_base: str, obs_download: str)
 def test_verify_repo_exists_invalid_obs_url() -> None:
     """Verify verify_repo_exists returns True when obs_download_url is invalid."""
     result = verify_repo_exists(
-        BuildTarget("SUSE:SLFO:1.2:PullRequest:2702:SLES", "x86_64", "SLES"),
+        Repos("SUSE:SLFO:1.2:PullRequest:2702:SLES", "SLES", "x86_64"),
         "16.0",
         config=RepoConfig(
             repo_type="product",

tests/test_loader_gitea_helpers.py

@@ -13,7 +13,8 @@
 from openqabot.errors import NoRepoFoundError
 from openqabot.loader import gitea
 from openqabot.types.pullrequest import PullRequest
-from openqabot.types.gitea import BuildTarget, RepoConfig
+from openqabot.types.gitea import RepoConfig
+from openqabot.types.types import Repos
 
 
 @pytest.fixture
@@ -149,7 +150,7 @@ def test_get_product_version_from_repo_listing_requests_json_error(
 def test_add_channel_for_build_result_local() -> None:
     projects: set[str] = set()
     res = gitea.add_channel_for_build_result(
-        BuildTarget("myproj", "local", "myprod"),
+        Repos("myproj", "myprod", "local"),
         None,
         projects,
         config=RepoConfig(