rats-apps 0.2.0.dev20240903103355__py3-none-any.whl → 0.2.0.dev20240906121056__py3-none-any.whl

rats/apps/__init__.py

@@ -7,7 +7,9 @@ domain.
 
 from ._annotations import (
     autoid,
+    autoid_factory_service,
     autoid_service,
+    factory_service,
     fallback_group,
     fallback_service,
     group,
@@ -63,4 +65,6 @@ __all__ = [
     "StandardRuntime",
     "StandardRuntime",
     "SimpleApplication",
+    "factory_service",
+    "autoid_factory_service",
 ]

rats/apps/_annotations.py

@@ -1,5 +1,5 @@
 from collections.abc import Callable
-from typing import Any, NamedTuple, ParamSpec, cast
+from typing import Any, Concatenate, Generic, NamedTuple, ParamSpec, TypeVar, cast
 
 from rats import annotations
 
@@ -8,6 +8,8 @@ from ._namespaces import ProviderNamespaces
 from ._scoping import scope_service_name
 
 P = ParamSpec("P")
+R = TypeVar("R")
+T_Container = TypeVar("T_Container")
 
 
 def service(
@@ -49,6 +51,57 @@ def fallback_group(
     )
 
 
+def _factory_to_factory_provider(
+    method: Callable[Concatenate[T_Container, P], R],
+) -> Callable[[T_Container], Callable[P, R]]:
+    """Convert a factory method a factory provider method returning the original method."""
+
+    def new_method(self: T_Container) -> Callable[P, R]:
+        def factory(*args: P.args, **kwargs: P.kwargs) -> R:
+            return method(self, *args, **kwargs)
+
+        return factory
+
+    new_method.__name__ = method.__name__
+    new_method.__module__ = method.__module__
+    new_method.__qualname__ = method.__qualname__
+    new_method.__doc__ = method.__doc__
+    return new_method
+
+
+class factory_service(Generic[P, R]):
+    """
+    A decorator to create a factory service.
+
+    Decorate a method that takes any number of arguments and returns an object.  The resulting
+    service will be that factory - taking the same arguments and returning a new object each time.
+    """
+
+    _service_id: ServiceId[Callable[P, R]]
+
+    def __init__(self, service_id: ServiceId[Callable[P, R]]) -> None:
+        self._service_id = service_id
+
+    def __call__(
+        self, method: Callable[Concatenate[T_Container, P], R]
+    ) -> Callable[[T_Container], Callable[P, R]]:
+        new_method = _factory_to_factory_provider(method)
+        return service(self._service_id)(new_method)
+
+
+def autoid_factory_service(
+    method: Callable[Concatenate[T_Container, P], R],
+) -> Callable[[T_Container], Callable[P, R]]:
+    """
+    A decorator to create a factory service, with an automatically generated service id.
+
+    Decorate a method that takes any number of arguments and returns an object.  The resulting
+    service will be that factory - taking the same arguments and returning a new object each time.
+    """
+    new_method = _factory_to_factory_provider(method)
+    return autoid_service(new_method)
+
+
 def autoid(method: Callable[..., T_ServiceType]) -> ServiceId[T_ServiceType]:
     """
     Get a service id for a method.

rats/apps/_container.py

@@ -125,10 +125,14 @@ class Container(Protocol):
         groups = tates.with_group(namespace, cast(NamedTuple, group_id))
 
         for annotation in groups.annotations:
-            if not hasattr(self, f"__rats_cache_{annotation.name}"):
-                setattr(self, f"__rats_cache_{annotation.name}", getattr(self, annotation.name)())
+            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}")
+            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}"):
@@ -138,7 +142,7 @@ class Container(Protocol):
                     getattr(self, annotation.name)(),
                 )
 
-            c = getattr(self, f"__rats_container_cache_{annotation.name}")
+            c: Container = getattr(self, f"__rats_container_cache_{annotation.name}")
             yield from c.get_namespaced_group(namespace, group_id)
 
 

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

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

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

@@ -2,11 +2,11 @@ rats/annotations/__init__.py,sha256=wsGhRQzZrV2oJTnBAX0aGgpyT1kYT235jkP3Wb8BTRY,
 rats/annotations/__main__.py,sha256=vlzQOM9y82P0OL5tYcmSM_4jTg0s8jayAcvEoi9cBvI,1065
 rats/annotations/_functions.py,sha256=UkHh3zdBivluE7dBeGQ17zoIfGdyIokMAkFmpWaIlDc,4284
 rats/annotations/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rats/apps/__init__.py,sha256=KtAsBY62BS5lYom6j5x69BDItfEYeOxu5EY0kbRWC0g,1601
+rats/apps/__init__.py,sha256=SlqFKChSf661J6nlcuSGNQO-fLceqZrwOGn1YoyYDzs,1703
 rats/apps/__main__.py,sha256=KjdadN4rdP0xhWiLzdmtCsXejWx_gxOK-ah-L1r1dTI,1818
-rats/apps/_annotations.py,sha256=yOf4MKFGQz3x4hpaWgMf2y2GlbXtbIh4uED15voXzyY,2566
+rats/apps/_annotations.py,sha256=tCa7_IzGBBbR827O3UpYBI-lCAnhj6yM9wxUeSYcXG4,4487
 rats/apps/_composite_container.py,sha256=s_of6NyyrjFVYWGVehyEHe9WJIPRCnbB-tyWyNF8zyc,585
-rats/apps/_container.py,sha256=sghUmXUFtzm2YwvhW6H1vlxX6-knxAsB6CNBApbJhK0,5851
+rats/apps/_container.py,sha256=rLUPnsDfLR26YjFUGGu3YYpqIta1l0q8p077Hzfflwo,5989
 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
@@ -27,7 +27,7 @@ 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/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rats_apps-0.2.0.dev20240903103355.dist-info/METADATA,sha256=rExoGjdGnmTi3jAfqFUxo7RaUn1awrj5dLp60lEOOww,774
-rats_apps-0.2.0.dev20240903103355.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-rats_apps-0.2.0.dev20240903103355.dist-info/entry_points.txt,sha256=9oOvf2loQr5ACWQgvuu9Q3KZIVIxKE5Aa-rLuUII5WQ,91
-rats_apps-0.2.0.dev20240903103355.dist-info/RECORD,,
+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,,