Add PluginManager to simplify and centralize plugin type and plugin handling (#3736)

Author: bartfeenstra

betty/ancestry/event.py

@@ -195,7 +195,8 @@ async def linked_data_schema(cls, project: Project, /) -> JsonLdObject:
         schema.add_property(
             "type",
             PluginIdSchema(
-                EventTypeDefinition.type(), await project.plugins(EventTypeDefinition)
+                EventTypeDefinition.type(),
+                await project.plugins.plugins(EventTypeDefinition),
             ),
         )
         schema.add_property("eventStatus", String(title="Event status"))

betty/ancestry/file.py

@@ -134,14 +134,15 @@ async def linked_data_schema(cls, project: Project, /) -> JsonLdObject:
             "copyrightNotice",
             PluginIdSchema(
                 CopyrightNoticeDefinition.type(),
-                await project.plugins(CopyrightNoticeDefinition),
+                await project.plugins.plugins(CopyrightNoticeDefinition),
             ),
             False,
         )
         schema.add_property(
             "license",
             PluginIdSchema(
-                LicenseDefinition.type(), await project.plugins(LicenseDefinition)
+                LicenseDefinition.type(),
+                await project.plugins.plugins(LicenseDefinition),
             ),
             False,
         )

betty/ancestry/person.py

@@ -202,7 +202,7 @@ async def linked_data_schema(cls, project: Project, /) -> JsonLdObject:
         schema.add_property(
             "gender",
             PluginIdSchema(
-                GenderDefinition.type(), await project.plugins(GenderDefinition)
+                GenderDefinition.type(), await project.plugins.plugins(GenderDefinition)
             ),
             False,
         )

betty/ancestry/presence.py

@@ -99,7 +99,7 @@ async def linked_data_schema(cls, project: Project, /) -> JsonLdObject:
             "role",
             PluginIdSchema(
                 PresenceRoleDefinition.type(),
-                await project.plugins(PresenceRoleDefinition),
+                await project.plugins.plugins(PresenceRoleDefinition),
             ),
             False,
         )

betty/app/__init__.py

@@ -33,9 +33,6 @@
 from betty.multiprocessing import ProcessPoolExecutor
 from betty.plugin import Plugin, PluginDefinition
 from betty.plugin.ordered import sort_ordered_plugin_graph
-from betty.plugin.repository.provider.service import (
-    ServiceLevelPluginRepositoryProvider,
-)
 from betty.portable.file import assert_load_file
 from betty.service.container import (
     ServiceFactory,
@@ -53,8 +50,6 @@
     import aiohttp
 
     from betty.cache import Cache
-    from betty.machine_name import MachineName
-    from betty.plugin.repository import PluginRepository
     from betty.user import User
 
 _PluginT = TypeVar("_PluginT", bound=Plugin, default=Plugin)
@@ -101,19 +96,12 @@ def __init__(
             self,
             cache_factory,  # ty:ignore[invalid-argument-type]
         )
-        self._plugin_repository_provider = ServiceLevelPluginRepositoryProvider(self)
 
     @override
     @classmethod
     def configuration_cls(cls) -> type[AppConfiguration]:
         return AppConfiguration
 
-    @override
-    async def plugins(
-        self, plugin_type: type[_PluginDefinitionT] | MachineName, /
-    ) -> PluginRepository[_PluginDefinitionT]:
-        return await self._plugin_repository_provider.plugins(plugin_type)  # ty:ignore[invalid-return-type]
-
     @classmethod
     @asynccontextmanager
     async def new_from_environment(cls) -> AsyncIterator[Self]:
@@ -220,7 +208,7 @@ async def http_client(self) -> aiohttp.ClientSession:
         """
         The HTTP client.
         """
-        http_rate_limits = await self.plugins(RateLimitDefinition)
+        http_rate_limits = await self.plugins.plugins(RateLimitDefinition)
         rate_limit_sorter = sort_ordered_plugin_graph(
             http_rate_limits, http_rate_limits
         )

betty/console/__init__.py

@@ -160,7 +160,7 @@ async def _create_list_commands_action_class(
     app: App, *, localizer: Localizer
 ) -> type[argparse.Action]:
     command_definitions = sorted(
-        await app.plugins(CommandDefinition),
+        await app.plugins.plugins(CommandDefinition),
         key=lambda command_definition: command_definition.id,
     )
 
@@ -228,7 +228,7 @@ async def _create_parser(app: App) -> argparse.ArgumentParser:
         help=localizer._("Show all available commands"),
     )
     subparsers = parser.add_subparsers(title=localizer._("Subcommands"))
-    for command_plugin in await app.plugins(CommandDefinition):
+    for command_plugin in await app.plugins.plugins(CommandDefinition):
         await _create_command_parser(app, subparsers, command_plugin, formatter_class)
     return parser
 

betty/console/command/commands/about.py

@@ -13,8 +13,8 @@
 from betty.console.project import add_project_argument
 from betty.definition.human_facing import HumanFacingDefinition
 from betty.locale.localizable.gettext import _
-from betty.plugin import plugin_types
 from betty.rich.user import RichUser
+from betty.service.level import universe
 from betty.service.level.factory import ServiceLevelDependentSelfFactory
 from betty.service.requirement.app import require_app
 
@@ -96,10 +96,10 @@ async def _about_plugins(self, user: RichUser, project: Project | None) -> None:
         about_plugins.add_column(user.localizer._("ID"))
         about_plugins.add_column(user.localizer._("Label"))
         for plugin_type in sorted(
-            plugin_types,
+            universe.plugins.types,
             key=lambda plugin_type: plugin_type.type().label.localize(user.localizer),
         ):
-            repository = await services.plugins(plugin_type)
+            repository = await services.plugins.plugins(plugin_type)
             for index, plugin in enumerate(
                 sorted(repository, key=lambda plugin: plugin.id)
             ):

betty/console/command/commands/extension_new_translation.py

@@ -42,7 +42,7 @@ async def new_for_services(cls, *, app: App) -> Self:
 
     @override
     async def configure(self, parser: argparse.ArgumentParser) -> CommandFunction:
-        extensions = await self._app.plugins(ExtensionDefinition)
+        extensions = await self._app.plugins.plugins(ExtensionDefinition)
         localizer = await self._app.localizer
         parser.add_argument(
             "extension",

betty/console/command/commands/extension_update_translations.py

@@ -44,7 +44,7 @@ async def new_for_services(cls, *, app: App) -> Self:
 
     @override
     async def configure(self, parser: argparse.ArgumentParser) -> CommandFunction:
-        extensions = await self._app.plugins(ExtensionDefinition)
+        extensions = await self._app.plugins.plugins(ExtensionDefinition)
         localizer = await self._app.localizer
 
         parser.add_argument(

betty/console/project.py

@@ -18,7 +18,7 @@
 from betty.project import Project
 from betty.project.config import ProjectConfiguration
 from betty.serde import SerializerDefinition
-from betty.service.level.universal import universe
+from betty.service.level import universe
 from betty.user import User
 
 
@@ -46,7 +46,7 @@ async def add_project_argument(
         help=localizer._(
             "The path to a Betty project directory or configuration file. Defaults to {default} in the current working directory."
         ).format(
-            default=f"betty.{'|'.join(extension[1:] for serializer in await app.plugins(SerializerDefinition) for extension in serializer.cls.media_type().extensions)}"
+            default=f"betty.{'|'.join(extension[1:] for serializer in await app.plugins.plugins(SerializerDefinition) for extension in serializer.cls.media_type().extensions)}"
         ),
         type=assertion_to_argument_type(assert_path(), localizer=localizer),
     )
@@ -82,7 +82,7 @@ async def _read_project_configuration(
     if provided_configuration_file_path_str is None:
         try_configuration_file_paths = [
             project_directory_path / f"betty{extension}"
-            for serializer in await universe.plugins(SerializerDefinition)
+            for serializer in await universe.plugins.plugins(SerializerDefinition)
             for extension in serializer.cls.media_type().extensions
         ]
         for try_configuration_file_path in try_configuration_file_paths: