rats-apps 0.2.0.dev20240906121056__py3-none-any.whl → 0.3.0.dev20241001092342__py3-none-any.whl

rats/apps/_annotations.py

@@ -1,4 +1,4 @@
-from collections.abc import Callable
+from collections.abc import Callable, Iterator
 from typing import Any, Concatenate, Generic, NamedTuple, ParamSpec, TypeVar, cast
 
 from rats import annotations
@@ -26,7 +26,7 @@ def autoid_service(fn: Callable[P, T_ServiceType]) -> Callable[P, T_ServiceType]
 
 def group(
     group_id: ServiceId[T_ServiceType],
-) -> Callable[[Callable[P, T_ServiceType]], Callable[P, T_ServiceType]]:
+) -> Callable[[Callable[P, Iterator[T_ServiceType]]], Callable[P, Iterator[T_ServiceType]]]:
     """A group is a collection of services."""
     return annotations.annotation(ProviderNamespaces.GROUPS, cast(NamedTuple, group_id))
 
@@ -43,7 +43,7 @@ def fallback_service(
 
 def fallback_group(
     group_id: ServiceId[T_ServiceType],
-) -> Callable[[Callable[P, T_ServiceType]], Callable[P, T_ServiceType]]:
+) -> Callable[[Callable[P, Iterator[T_ServiceType]]], Callable[P, Iterator[T_ServiceType]]]:
     """A fallback group gets used if no group is defined."""
     return annotations.annotation(
         ProviderNamespaces.FALLBACK_GROUPS,
@@ -69,7 +69,7 @@ def _factory_to_factory_provider(
     return new_method
 
 
-class factory_service(Generic[P, R]):
+class _FactoryService(Generic[P, R]):
     """
     A decorator to create a factory service.
 
@@ -89,6 +89,10 @@ class factory_service(Generic[P, R]):
         return service(self._service_id)(new_method)
 
 
+# alias so we can think of it as a function
+factory_service = _FactoryService
+
+
 def autoid_factory_service(
     method: Callable[Concatenate[T_Container, P], R],
 ) -> Callable[[T_Container], Callable[P, R]]:

rats/apps/_container.py

@@ -1,7 +1,9 @@
 import logging
 from abc import abstractmethod
 from collections.abc import Callable, Iterator
-from typing import Generic, NamedTuple, ParamSpec, Protocol, cast
+from typing import Any, Generic, NamedTuple, ParamSpec, Protocol, cast
+
+from typing_extensions import NamedTuple as ExtNamedTuple
 
 from rats import annotations
 
@@ -109,9 +111,13 @@ class Container(Protocol):
     ) -> Iterator[T_ServiceType]:
         """Retrieve a service group by its id."""
         if not self.has_namespace(ProviderNamespaces.GROUPS, group_id):
-            yield from self.get_namespaced_group(ProviderNamespaces.FALLBACK_GROUPS, group_id)
+            # groups are expected to return iterable services
+            # TODO: we need to clean up the meaning of groups and services somehow
+            for i in self.get_namespaced_group(ProviderNamespaces.FALLBACK_GROUPS, group_id):
+                yield from cast(Iterator[T_ServiceType], i)
 
-        yield from self.get_namespaced_group(ProviderNamespaces.GROUPS, group_id)
+        for i in self.get_namespaced_group(ProviderNamespaces.GROUPS, group_id):
+            yield from cast(Iterator[T_ServiceType], i)
 
     def get_namespaced_group(
         self,
@@ -119,31 +125,67 @@ class Container(Protocol):
         group_id: ServiceId[T_ServiceType],
     ) -> Iterator[T_ServiceType]:
         """Retrieve a service group by its id, within a given service namespace."""
-        tates = annotations.get_class_annotations(type(self))
-        # containers are a special service namespace that we look through recursively
-        containers = tates.with_namespace(ProviderNamespaces.CONTAINERS)
-        groups = tates.with_group(namespace, cast(NamedTuple, group_id))
-
-        for annotation in groups.annotations:
-            if not hasattr(self, f"__rats_cache_{annotation.name}_{group_id.name}"):
-                setattr(
-                    self,
-                    f"__rats_cache_{annotation.name}_{group_id.name}",
-                    getattr(self, annotation.name)(),
-                )
-
-            yield getattr(self, f"__rats_cache_{annotation.name}_{group_id.name}")
-
-        for annotation in containers.annotations:
-            if not hasattr(self, f"__rats_container_cache_{annotation.name}"):
-                setattr(
-                    self,
-                    f"__rats_container_cache_{annotation.name}",
-                    getattr(self, annotation.name)(),
-                )
-
-            c: Container = getattr(self, f"__rats_container_cache_{annotation.name}")
-            yield from c.get_namespaced_group(namespace, group_id)
+        yield from _get_cached_services_for_group(self, namespace, group_id)
+
+        for subcontainer in _get_subcontainers(self):
+            yield from subcontainer.get_namespaced_group(namespace, group_id)
+
+
+def _get_subcontainers(c: Container) -> Iterator[Container]:
+    yield from _get_cached_services_for_group(
+        c, ProviderNamespaces.CONTAINERS, DEFAULT_CONTAINER_GROUP
+    )
+
+
+class _ProviderInfo(ExtNamedTuple, Generic[T_ServiceType]):
+    attr: str
+    group_id: ServiceId[T_ServiceType]
+
+
+def _get_cached_services_for_group(
+    c: Container,
+    namespace: str,
+    group_id: ServiceId[T_ServiceType],
+) -> Iterator[T_ServiceType]:
+    provider_cache = _get_provider_cache(c)
+    info_cache = _get_provider_info_cache(c)
+
+    if (namespace, group_id) not in info_cache:
+        info_cache[(namespace, group_id)] = list(_get_providers_for_group(c, namespace, group_id))
+
+    for provider in info_cache[(namespace, group_id)]:
+        if provider not in provider_cache:
+            provider_cache[provider] = getattr(c, provider.attr)()
+
+        yield provider_cache[provider]
+
+
+def _get_provider_cache(obj: object) -> dict[_ProviderInfo[Any], Any]:
+    if not hasattr(obj, "__rats_apps_provider_cache__"):
+        obj.__rats_apps_provider_cache__ = {}  # type: ignore[reportAttributeAccessIssue]
+
+    return obj.__rats_apps_provider_cache__  # type: ignore[reportAttributeAccessIssue]
+
+
+def _get_provider_info_cache(
+    obj: object,
+) -> dict[tuple[str, ServiceId[Any]], list[_ProviderInfo[Any]]]:
+    if not hasattr(obj, "__rats_apps_provider_info_cache__"):
+        obj.__rats_apps_provider_info_cache__ = {}  # type: ignore[reportAttributeAccessIssue]
+
+    return obj.__rats_apps_provider_info_cache__  # type: ignore[reportAttributeAccessIssue]
+
+
+def _get_providers_for_group(
+    c: Container,
+    namespace: str,
+    group_id: ServiceId[T_ServiceType],
+) -> Iterator[_ProviderInfo[T_ServiceType]]:
+    tates = annotations.get_class_annotations(type(c))
+    groups = tates.with_group(namespace, cast(NamedTuple, group_id))
+
+    for annotation in groups.annotations:
+        yield _ProviderInfo(annotation.name, group_id)
 
 
 DEFAULT_CONTAINER_GROUP = ServiceId[Container](f"{__name__}:__default__")

rats/cli/__init__.py

@@ -3,13 +3,15 @@
 from ._annotations import CommandId, command, get_class_commands, get_class_groups, group
 from ._app import ClickApp
 from ._container import CommandContainer
-from ._plugin import PluginContainer, PluginServices
+from ._plugin import PluginContainer, PluginServices, attach, create_group
 
 __all__ = [
     "PluginContainer",
     "command",
     "get_class_commands",
     "get_class_groups",
+    "create_group",
+    "attach",
     "group",
     "ClickApp",
     "PluginServices",

rats/cli/_container.py

@@ -5,14 +5,12 @@ from typing import Any, Protocol
 
 import click
 
-from rats import apps
-
 from ._annotations import get_class_commands
 
 logger = logging.getLogger(__name__)
 
 
-class CommandContainer(apps.Container, Protocol):
+class CommandContainer(Protocol):
     """A container that can attach click commands to a click group."""
 
     def attach(self, group: click.Group) -> None:

rats/cli/_plugin.py

@@ -4,6 +4,23 @@ import click
 
 from rats import apps
 
+from ._container import CommandContainer
+
+
+def create_group(group: click.Group, container: CommandContainer) -> click.Group:
+    container.attach(group)
+    return group
+
+
+def attach(
+    group: click.Group,
+    command: click.Command | click.Group,
+    *commands: click.Command | click.Group,
+) -> None:
+    group.add_command(command)
+    for c in commands:
+        group.add_command(c)
+
 
 @apps.autoscope
 class _PluginEvents:

rats/logs/_plugin.py

@@ -1,4 +1,5 @@
 import logging.config
+from collections.abc import Iterator
 
 from rats import apps
 
@@ -22,9 +23,9 @@ class PluginContainer(apps.Container):
         self._app = app
 
     @apps.group(PluginServices.EVENTS.CONFIGURE_LOGGING)
-    def _configure_logging(self) -> apps.Executable:
+    def _configure_logging(self) -> Iterator[apps.Executable]:
         # in the future, we can use this plugin to make logging easily configurable
-        return apps.App(
+        yield apps.App(
             lambda: logging.config.dictConfig(
                 {
                     "version": 1,

{rats_apps-0.2.0.dev20240906121056.dist-info → rats_apps-0.3.0.dev20241001092342.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rats-apps
-Version: 0.2.0.dev20240906121056
+Version: 0.3.0.dev20241001092342
 Summary: research analysis tools for building applications
 Home-page: https://github.com/microsoft/rats/
 License: MIT

{rats_apps-0.2.0.dev20240906121056.dist-info → rats_apps-0.3.0.dev20241001092342.dist-info}/RECORD

@@ -4,9 +4,9 @@ rats/annotations/_functions.py,sha256=UkHh3zdBivluE7dBeGQ17zoIfGdyIokMAkFmpWaIlD
 rats/annotations/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rats/apps/__init__.py,sha256=SlqFKChSf661J6nlcuSGNQO-fLceqZrwOGn1YoyYDzs,1703
 rats/apps/__main__.py,sha256=KjdadN4rdP0xhWiLzdmtCsXejWx_gxOK-ah-L1r1dTI,1818
-rats/apps/_annotations.py,sha256=tCa7_IzGBBbR827O3UpYBI-lCAnhj6yM9wxUeSYcXG4,4487
+rats/apps/_annotations.py,sha256=6M_M7K8haNVda0Tx02EpFf3s9EjnWYacNMjTIkNEdRU,4617
 rats/apps/_composite_container.py,sha256=s_of6NyyrjFVYWGVehyEHe9WJIPRCnbB-tyWyNF8zyc,585
-rats/apps/_container.py,sha256=rLUPnsDfLR26YjFUGGu3YYpqIta1l0q8p077Hzfflwo,5989
+rats/apps/_container.py,sha256=Gb7jJmGyKGDZFjoe0s0C_gC7ymSpXaqordfQaJZGJf4,7283
 rats/apps/_executables.py,sha256=QJ5_UPdZPmDQ1a3cLRJDUoeUMzNMwa3ZHYhYeS3AVq4,971
 rats/apps/_ids.py,sha256=T8Onrj79t8NPfBMQBk0xI6fIWDKF0m2JfFNrdtXAbWg,353
 rats/apps/_namespaces.py,sha256=THUV_Xj5PtweC23Ob-zsSpk8exC4fT-qRwjpQ6IDm0U,188
@@ -17,17 +17,17 @@ rats/apps/_scoping.py,sha256=6C2-ID22cCPR9Cbexf3CvCF3o9F_7ieURbwqkf6DI68,1360
 rats/apps/_simple_apps.py,sha256=n-3zeHY3iintZ9LN597c7zDHv3DiIdl7c8NTk0gUk1Y,5477
 rats/apps/_static_container.py,sha256=5lzLh1CUoQVwhxfDhK6ZOQaBrPpudbRHWJkaDppphZo,881
 rats/apps/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rats/cli/__init__.py,sha256=VNigux01ldwSv8Mo6zvvpz0FT9VC4TK0WfUp9FoVmGo,492
+rats/cli/__init__.py,sha256=bBYDOs697TLCf86maID-JZkHeB7rvBfiwk97qDUmMCk,548
 rats/cli/__main__.py,sha256=3JZ7mrTTrrODQHutefm2zJp1-cQQB7I5-1xhYw7SMBU,1656
 rats/cli/_annotations.py,sha256=5voM1pNm7iybZpgQTSVpaq3rMIMz33jr4eUyoEmxWJ4,1359
 rats/cli/_app.py,sha256=NjJfXKZYBdd1CZuLbrXyUFB_wRJQah1Rvtxe_zj4y_M,641
-rats/cli/_container.py,sha256=VddjrsH1lqiarJ6rXf4KUbuNtNXEduCr38UH_TwGgFE,1872
-rats/cli/_plugin.py,sha256=o5emP-E0LLOGvD14ZBYNY6h407pngrJf8ODMB5Wdd8U,711
+rats/cli/_container.py,sha256=PsvUIqQgQVXRTUh7BXhpzm42gxXU100-0EaYGwcmAAg,1833
+rats/cli/_plugin.py,sha256=gOLTR0qZ4TAYJ9ORoeOeFiiiN9JBTakEACtPORlYSTE,1100
 rats/cli/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rats/logs/__init__.py,sha256=fCn4pfpYiAcTtt5CsnUZX68CjOB3KJHxMSiYxsma4qE,183
-rats/logs/_plugin.py,sha256=eAAG4ci-XS9A9ituXj9PrcI6zH-xlCqhJlUbSGC-MYM,2175
+rats/logs/_plugin.py,sha256=OQ5fXToBm60YJRrMUVJ9_HVytUs3c69vaHY57jpivb0,2221
 rats/logs/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rats_apps-0.2.0.dev20240906121056.dist-info/METADATA,sha256=urdUHZ3l3yfAf5zCFP8iTFUeLO4Gyi-f9YbcOiPFwyQ,774
-rats_apps-0.2.0.dev20240906121056.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-rats_apps-0.2.0.dev20240906121056.dist-info/entry_points.txt,sha256=9oOvf2loQr5ACWQgvuu9Q3KZIVIxKE5Aa-rLuUII5WQ,91
-rats_apps-0.2.0.dev20240906121056.dist-info/RECORD,,
+rats_apps-0.3.0.dev20241001092342.dist-info/METADATA,sha256=_hr4P32onK68GdbiEjuIR3AmMAOLIaR5t3bKtcy1_6A,774
+rats_apps-0.3.0.dev20241001092342.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+rats_apps-0.3.0.dev20241001092342.dist-info/entry_points.txt,sha256=9oOvf2loQr5ACWQgvuu9Q3KZIVIxKE5Aa-rLuUII5WQ,91
+rats_apps-0.3.0.dev20241001092342.dist-info/RECORD,,