Remove RepositoryNameTransformer and rename FullRepositoryTransformer to RepositoryTransformer

Author: object-Object

bot/src/ghutils/cogs/app_commands/config/admin.py

@@ -7,7 +7,8 @@
 
 from ghutils.core.cog import GHUtilsCog, SubGroup
 from ghutils.db.config import get_guild_config
-from ghutils.utils.discord.transformers import RepositoryNameOption
+from ghutils.utils.discord.transformers import RepositoryOption
+from ghutils.utils.github import RepositoryName
 
 type ServerConfigOption = Literal[
     "default_repo",
@@ -77,12 +78,13 @@ class Set(SubGroup):
         async def default_repo(
             self,
             interaction: Interaction,
-            value: RepositoryNameOption,
+            value: RepositoryOption,
         ):
+            new_value = RepositoryName.parse(value.full_name)
             with self._update_config(interaction) as config:
                 old_value = config.default_repo
-                config.default_repo = value
-            await _send_updated(interaction, "default_repo", old_value, value)
+                config.default_repo = new_value
+            await _send_updated(interaction, "default_repo", old_value, new_value)
 
         @contextmanager
         def _update_config(self, interaction: Interaction):

bot/src/ghutils/cogs/app_commands/config/user.py

@@ -8,7 +8,8 @@
 
 from ghutils.core.cog import GHUtilsCog, SubGroup
 from ghutils.db.config import get_user_config, get_user_guild_config
-from ghutils.utils.discord.transformers import RepositoryNameOption
+from ghutils.utils.discord.transformers import RepositoryOption
+from ghutils.utils.github import RepositoryName
 
 type UserConfigOption = Literal[
     "default_repo",
@@ -90,12 +91,13 @@ class Set(SubGroup):
         async def default_repo(
             self,
             interaction: Interaction,
-            value: RepositoryNameOption,
+            value: RepositoryOption,
         ):
+            new_value = RepositoryName.parse(value.full_name)
             with self._update_config(interaction) as config:
                 old_value = config.default_repo
-                config.default_repo = value
-            await _send_updated(interaction, "default_repo", old_value, value)
+                config.default_repo = new_value
+            await _send_updated(interaction, "default_repo", old_value, new_value)
 
         @contextmanager
         def _update_config(self, interaction: Interaction):

bot/src/ghutils/cogs/app_commands/github.py

@@ -32,7 +32,7 @@
     IssueReference,
     PRReference,
 )
-from ghutils.utils.discord.transformers import FullRepositoryOption, UserOption
+from ghutils.utils.discord.transformers import RepositoryOption, UserOption
 from ghutils.utils.discord.visibility import MessageVisibility, respond_with_visibility
 from ghutils.utils.github import (
     CommitCheckState,
@@ -126,7 +126,7 @@ async def commit(
     async def repo(
         self,
         interaction: Interaction,
-        repo: FullRepositoryOption,
+        repo: RepositoryOption,
         visibility: MessageVisibility = "private",
     ):
         async with self.bot.github_app(interaction) as (github, _):
@@ -307,7 +307,7 @@ class Search(SubGroup):
         async def files(
             self,
             interaction: Interaction,
-            repo: FullRepositoryOption,
+            repo: RepositoryOption,
             query: Range[str, 1, 128],
             ref: Range[str, 1, 255] | None = None,
             exact: bool = False,

bot/src/ghutils/utils/discord/transformers.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import logging
-from typing import Any
 
 from discord import Interaction
 from discord.app_commands import Transform, Transformer
@@ -19,9 +18,21 @@
 logger = logging.getLogger(__name__)
 
 
-class RepositoryNameTransformer(Transformer):
-    async def transform(self, interaction: Interaction, value: str) -> Any:
-        return RepositoryName.parse(value)
+class RepositoryTransformer(Transformer):
+    async def transform(self, interaction: Interaction, value: str) -> FullRepository:
+        repo = RepositoryName.parse(value)
+        async with GHUtilsBot.github_app_of(interaction) as (github, _):
+            try:
+                return await gh_request(
+                    github.rest.repos.async_get(repo.owner, repo.repo)
+                )
+            except GitHubException as e:
+                match e:
+                    case RequestFailed(response=Response(status_code=404)):
+                        raise ValueError("Repository not found")
+                    case _:
+                        logger.warning(e)
+                        raise ValueError(f"Failed to get repository: {e}")
 
     async def autocomplete(  # pyright: ignore[reportIncompatibleMethodOverride]
         self,
@@ -64,25 +75,12 @@ async def autocomplete(  # pyright: ignore[reportIncompatibleMethodOverride]
             ]
 
 
-class FullRepositoryTransformer(RepositoryNameTransformer):
-    async def transform(self, interaction: Interaction, value: str):
-        repo = RepositoryName.parse(value)
-        async with GHUtilsBot.github_app_of(interaction) as (github, _):
-            try:
-                return await gh_request(
-                    github.rest.repos.async_get(repo.owner, repo.repo)
-                )
-            except GitHubException as e:
-                match e:
-                    case RequestFailed(response=Response(status_code=404)):
-                        raise ValueError("Repository not found")
-                    case _:
-                        logger.warning(e)
-                        raise ValueError(f"Failed to get repository: {e}")
-
-
 class UserTransformer(Transformer):
-    async def transform(self, interaction: Interaction, value: str):
+    async def transform(
+        self,
+        interaction: Interaction,
+        value: str,
+    ) -> PrivateUser | PublicUser:
         async with GHUtilsBot.github_app_of(interaction) as (github, _):
             try:
                 return await gh_request(github.rest.users.async_get_by_username(value))
@@ -95,7 +93,9 @@ async def transform(self, interaction: Interaction, value: str):
                         raise ValueError(f"Failed to get user: {e}")
 
     async def autocomplete(  # pyright: ignore[reportIncompatibleMethodOverride]
-        self, interaction: Interaction, value: str
+        self,
+        interaction: Interaction,
+        value: str,
     ) -> list[Choice[str]]:
         async with GHUtilsBot.github_app_of(interaction) as (github, state):
             if state != LoginState.LOGGED_IN:
@@ -122,8 +122,6 @@ async def autocomplete(  # pyright: ignore[reportIncompatibleMethodOverride]
             return [Choice(name=user.login, value=user.login) for user in result.items]
 
 
-UserOption = Transform[PrivateUser | PublicUser, UserTransformer]
-
-RepositoryNameOption = Transform[RepositoryName, RepositoryNameTransformer]
+RepositoryOption = Transform[FullRepository, RepositoryTransformer]
 
-FullRepositoryOption = Transform[FullRepository, FullRepositoryTransformer]
+UserOption = Transform[PrivateUser | PublicUser, UserTransformer]