rats-apps 0.1.3.dev20240723085916__py3-none-any.whl → 0.1.3.dev20240731210159__py3-none-any.whl

rats/apps/__init__.py

@@ -8,8 +8,6 @@ domain.
 from ._annotations import (
     autoid,
     autoid_service,
-    config,
-    fallback_config,
     fallback_group,
     fallback_service,
     group,
@@ -18,7 +16,6 @@ from ._annotations import (
 from ._composite_container import CompositeContainer
 from ._container import (
     AnnotatedContainer,  # type: ignore[reportDeprecated]
-    ConfigProvider,
     Container,
     DuplicateServiceError,
     ServiceNotFoundError,
@@ -26,34 +23,30 @@ from ._container import (
     container,
 )
 from ._executables import App, Executable
-from ._ids import ConfigId, ServiceId
+from ._ids import ServiceId, T_ExecutableType
 from ._namespaces import ProviderNamespaces
 from ._plugin_container import PluginContainers
 from ._plugins import PluginRunner
-from ._runtimes import Runtime, T_ExecutableType
+from ._runtimes import NullRuntime, Runtime
 from ._scoping import autoscope
-from ._simple_apps import AppServices, SimpleApplication, SimpleRuntime
+from ._simple_apps import AppServices, SimpleApplication, StandardRuntime
 
 __all__ = [
     "AnnotatedContainer",
     "App",
     "CompositeContainer",
-    "ConfigId",
     "Container",
     "DuplicateServiceError",
     "Executable",
     "PluginContainers",
     "ProviderNamespaces",
-    "ConfigProvider",
     "ServiceProvider",
     "ServiceId",
     "ServiceNotFoundError",
     "autoid_service",
     "autoscope",
-    "config",
     "container",
     "PluginRunner",
-    "fallback_config",
     "fallback_group",
     "fallback_service",
     "group",
@@ -61,8 +54,9 @@ __all__ = [
     "service",
     "T_ExecutableType",
     "Runtime",
+    "NullRuntime",
     "AppServices",
-    "SimpleRuntime",
-    "SimpleRuntime",
+    "StandardRuntime",
+    "StandardRuntime",
     "SimpleApplication",
 ]

rats/apps/_annotations.py

@@ -3,7 +3,7 @@ from typing import Any, ParamSpec
 
 from rats import annotations
 
-from ._ids import ConfigId, ServiceId, T_ConfigType, T_ServiceType
+from ._ids import ServiceId, T_ServiceType
 from ._namespaces import ProviderNamespaces
 from ._scoping import scope_service_name
 
@@ -29,16 +29,6 @@ def group(
     return annotations.annotation(ProviderNamespaces.GROUPS, group_id)
 
 
-def config(
-    config_id: ConfigId[T_ConfigType],
-) -> Callable[[Callable[P, T_ConfigType]], Callable[P, T_ConfigType]]:
-    """A service that provides simple data-structures."""
-    return annotations.annotation(
-        ProviderNamespaces.SERVICES,
-        config_id,
-    )
-
-
 def fallback_service(
     service_id: ServiceId[T_ServiceType],
 ) -> Callable[[Callable[P, T_ServiceType]], Callable[P, T_ServiceType]]:
@@ -59,16 +49,6 @@ def fallback_group(
     )
 
 
-def fallback_config(
-    config_id: ConfigId[T_ConfigType],
-) -> Callable[[Callable[P, T_ConfigType]], Callable[P, T_ConfigType]]:
-    """A fallback config gets used if no config is defined."""
-    return annotations.annotation(
-        ProviderNamespaces.FALLBACK_SERVICES,
-        config_id,
-    )
-
-
 def autoid(method: Callable[..., T_ServiceType]) -> ServiceId[T_ServiceType]:
     """
     Get a service id for a method.

rats/apps/_composite_container.py

@@ -1,11 +1,13 @@
 from collections.abc import Iterator
+from typing import final
 
 from ._container import Container
 from ._ids import ServiceId, T_ServiceType
 
 
+@final
 class CompositeContainer(Container):
-    _contailers: tuple[Container, ...]
+    _containers: tuple[Container, ...]
 
     def __init__(self, *containers: Container) -> None:
         self._containers = containers

rats/apps/_container.py

@@ -8,7 +8,7 @@ from typing_extensions import deprecated
 
 from rats import annotations
 
-from ._ids import ServiceId, T_ServiceType, Tco_ConfigType, Tco_ServiceType
+from ._ids import ServiceId, T_ServiceType, Tco_ServiceType
 from ._namespaces import ProviderNamespaces
 
 logger = logging.getLogger(__name__)
@@ -20,10 +20,10 @@ class ServiceProvider(Protocol[Tco_ServiceType]):
         """Return the service instance."""
 
 
-class ConfigProvider(ServiceProvider[Tco_ConfigType], Protocol[Tco_ConfigType]):
+class GroupProvider(Protocol[Tco_ServiceType]):
     @abstractmethod
-    def __call__(self) -> Tco_ConfigType:
-        """Return the config instance."""
+    def __call__(self) -> Iterator[Tco_ServiceType]:
+        """Return the group instances."""
 
 
 class Container(Protocol):

rats/apps/_executables.py

@@ -32,21 +32,3 @@ class App(Executable):
 
     def execute(self) -> None:
         self._callback()
-
-
-# class AppContainer(Container):
-#     _container: Callable[[Container], Container]
-#
-#     def __init__(self, container: Callable[[Container], Container]) -> None:
-#         self._container = container
-#
-#     def get_namespaced_group(
-#         self,
-#         namespace: str,
-#         group_id: ServiceId[T_ServiceType],
-#     ) -> Iterator[T_ServiceType]:
-#         yield from self._load_container().get_namespaced_group(namespace, group_id)
-#
-#     @cache
-#     def _load_container(self) -> Container:
-#         return self._container(self)

rats/apps/_ids.py

@@ -1,17 +1,13 @@
-import typing
 from typing import Generic, TypeVar
 
 from typing_extensions import NamedTuple
 
+from ._executables import Executable
+
 T_ServiceType = TypeVar("T_ServiceType")
-T_ConfigType = TypeVar("T_ConfigType", bound=typing.NamedTuple)
+T_ExecutableType = TypeVar("T_ExecutableType", bound=Executable)
 Tco_ServiceType = TypeVar("Tco_ServiceType", covariant=True)
-Tco_ConfigType = TypeVar("Tco_ConfigType", bound=NamedTuple, covariant=True)
 
 
 class ServiceId(NamedTuple, Generic[T_ServiceType]):
     name: str
-
-
-class ConfigId(ServiceId[T_ConfigType]):
-    pass

rats/apps/_plugin_container.py

@@ -7,6 +7,16 @@ from ._ids import ServiceId, T_ServiceType
 
 
 class PluginContainers(Container):
+    """
+    A container that loads plugins using importlib.metadata.entry_points.
+
+    When looking for groups, the container loads the specified entry_points and defers the lookups
+    to the plugins. Plugin containers are expected to be Callable[[Container], Container] objects,
+    where the input container is typically the root application container.
+
+    TODO: How do we better specify the API for plugins without relying on documentation?
+    """
+
     _app: Container
     _group: str
     _names: tuple[str, ...]

rats/apps/_runtimes.py

@@ -1,11 +1,8 @@
 from abc import abstractmethod
 from collections.abc import Callable
-from typing import Protocol, TypeVar
+from typing import Protocol, final
 
-from ._executables import Executable
-from ._ids import ServiceId
-
-T_ExecutableType = TypeVar("T_ExecutableType", bound=Executable)
+from ._ids import ServiceId, T_ExecutableType
 
 
 class Runtime(Protocol):
@@ -30,3 +27,15 @@ class Runtime(Protocol):
 
         The used ServiceId is determined by the Runtime implementation.
         """
+
+
+@final
+class NullRuntime(Runtime):
+    def execute(self, *exe_ids: ServiceId[T_ExecutableType]) -> None:
+        raise NotImplementedError("NullRuntime does not support execution.")
+
+    def execute_group(self, *exe_group_ids: ServiceId[T_ExecutableType]) -> None:
+        raise NotImplementedError("NullRuntime does not support execution.")
+
+    def execute_callable(self, *callables: Callable[[], None]) -> None:
+        raise NotImplementedError("NullRuntime does not support execution.")

rats/apps/_simple_apps.py

@@ -2,7 +2,7 @@ from collections.abc import Callable, Iterable, Iterator
 from contextlib import contextmanager
 from typing import final
 
-from ._annotations import fallback_service
+from ._annotations import fallback_service, service
 from ._composite_container import CompositeContainer
 from ._container import Container, container
 from ._executables import App, Executable
@@ -56,13 +56,14 @@ class AppServices:
     """
 
     RUNTIME = ServiceId[Runtime]("app-runtime")
+    STANDARD_RUNTIME = ServiceId[Runtime]("standard-runtime")
     CONTAINER = ServiceId[Container]("app-container")
     CALLABLE_EXE_CTX = ServiceId[ExecutableCallableContext]("callable-exe-ctx")
     CALLABLE_EXE = ServiceId[Executable]("callable-exe")
 
 
 @final
-class SimpleRuntime(Runtime):
+class StandardRuntime(Runtime):
     """A simple runtime that executes sequentially and in a single thread."""
 
     _app: Container
@@ -91,9 +92,15 @@ class SimpleApplication(Runtime, Container):
     """An application without anything fancy."""
 
     _plugin_groups: Iterable[str]
+    _runtime_plugin: Callable[[Container], Container] | None
 
-    def __init__(self, *plugin_groups: str) -> None:
+    def __init__(
+        self,
+        *plugin_groups: str,
+        runtime_plugin: Callable[[Container], Container] | None = None,
+    ) -> None:
         self._plugin_groups = plugin_groups
+        self._runtime_plugin = runtime_plugin
 
     def execute(self, *exe_ids: ServiceId[T_ExecutableType]) -> None:
         self._runtime().execute(*exe_ids)
@@ -108,11 +115,21 @@ class SimpleApplication(Runtime, Container):
     @fallback_service(AppServices.RUNTIME)
     def _runtime(self) -> Runtime:
         """
-        The default runtime is an instance of SimpleRuntime.
+        The default runtime defers to AppServices.STANDARD_RUNTIME.
 
         Define a non-fallback service to override this default implementation.
         """
-        return SimpleRuntime(self)
+        return self.get(AppServices.STANDARD_RUNTIME)
+
+    @service(AppServices.STANDARD_RUNTIME)
+    def _std_runtime(self) -> Runtime:
+        """
+        The standard locally executed runtime.
+
+        Regardless of the configured AppServices.RUNTIME provider, everyone has access to this
+        class for plugin development.
+        """
+        return StandardRuntime(self)
 
     @fallback_service(AppServices.CALLABLE_EXE)
     def _callable_exe(self) -> Executable:
@@ -139,6 +156,8 @@ class SimpleApplication(Runtime, Container):
 
     @container()
     def _plugins(self) -> Container:
-        return CompositeContainer(
-            *[PluginContainers(self, group) for group in self._plugin_groups],
-        )
+        plugins: list[Container] = [PluginContainers(self, group) for group in self._plugin_groups]
+        if self._runtime_plugin:
+            plugins.append(self._runtime_plugin(self))
+
+        return CompositeContainer(*plugins)

rats/cli/_plugin.py

@@ -36,7 +36,6 @@ class PluginServices:
 
     @staticmethod
     def click_command(cmd_id: apps.ServiceId[apps.Executable]) -> apps.ServiceId[click.Group]:
-        # autowrapped!
         return cast(apps.ServiceId[click.Group], cmd_id)
 
 

rats/logs/_plugin.py

@@ -54,7 +54,10 @@ class PluginContainer(apps.Container):
                             "stream": "ext://sys.stderr",
                         }
                     },
-                    "root": {"level": "INFO", "handlers": ["console"]},
+                    "loggers": {
+                        "": {"level": "INFO", "handlers": ["console"]},
+                        "azure": {"level": "WARNING", "handlers": ["console"]},
+                    },
                 }
             )
         )

{rats_apps-0.1.3.dev20240723085916.dist-info → rats_apps-0.1.3.dev20240731210159.dist-info}/METADATA

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

{rats_apps-0.1.3.dev20240723085916.dist-info → rats_apps-0.1.3.dev20240731210159.dist-info}/RECORD

@@ -1,29 +1,29 @@
 rats/annotations/__init__.py,sha256=wsGhRQzZrV2oJTnBAX0aGgpyT1kYT235jkP3Wb8BTRY,498
 rats/annotations/_functions.py,sha256=ziAZOqS1lojfjDjZW7qPYNJUAFuLBWtVAoPsmJqxqpE,4356
 rats/annotations/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rats/apps/__init__.py,sha256=yvwCwhSZrPre0_SNESf0asSrabZrru9P_JteKcljemU,1611
-rats/apps/_annotations.py,sha256=2dvq0ZXDUMC9LK4athRzHrVlx23rGYtw4Gn0aNA9aSk,3063
-rats/apps/_composite_container.py,sha256=wSWVQWPin2xxIlEoSgk_D1rlc3N2gpTxQ2y9UFdqXy0,553
-rats/apps/_container.py,sha256=tIpU4o1nK5tQaOKZHh35qGBw6TV4uuU0k5vDY6NwS3Y,6280
-rats/apps/_executables.py,sha256=acwOXlWpGmLuSFr30dPzg2LU6-ae1yfOtbDRTIXLEjc,1520
-rats/apps/_ids.py,sha256=dxWCPMpMA_vpaTDJEKNByIBJaX97Db203XqWLhaOezo,457
+rats/apps/__init__.py,sha256=z_6eujGnU6pW12xTRR1caTJzv5v8VEbt8yLmwnMBiik,1511
+rats/apps/_annotations.py,sha256=6qBqjxfBBZyVMLT3COGgQ-flQL6Wkuzp_TtndD4TwmE,2458
+rats/apps/_composite_container.py,sha256=s_of6NyyrjFVYWGVehyEHe9WJIPRCnbB-tyWyNF8zyc,585
+rats/apps/_container.py,sha256=GTPu6qmVCy69w87kMsQcL5BJavgW9O9RxH0z0zQu3fY,6242
+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
-rats/apps/_plugin_container.py,sha256=Vhh1IdCzpUVwRdh301sALX7DQKny7Hru-yF_GwdxVqc,1075
+rats/apps/_plugin_container.py,sha256=wmaBgxmvKo82ue9CrKHRXafgik5wIXh8XkEYMfhcTjs,1530
 rats/apps/_plugins.py,sha256=mvSYQPi11wTGZpM4umoyD37Rc8CQX8nt5eAJbmLrBFM,688
-rats/apps/_runtimes.py,sha256=r6aRoI4rAkUh0uv3IKn-rNuwEu2MmB724rHsJpHDO74,1138
+rats/apps/_runtimes.py,sha256=nQWwC-O-j0bKCEkGpBSXhdtE0-X2ACeP7zXZfqaPGqg,1545
 rats/apps/_scoping.py,sha256=EIUopw3b38CEV57kCmSKQTAnQQMcXHZ_vwtk9t0K__g,1453
-rats/apps/_simple_apps.py,sha256=wjrPUt2_GLnp065gKSfIgG_3aLAU9ixi9rRt2d9mIJw,4742
+rats/apps/_simple_apps.py,sha256=n-3zeHY3iintZ9LN597c7zDHv3DiIdl7c8NTk0gUk1Y,5477
 rats/apps/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rats/cli/__init__.py,sha256=dMrubxMJocbl8QoI_3fKI0Dt0QHYAM5Mxh5Vj8OaX-w,664
 rats/cli/_annotations.py,sha256=0dI8hu_y754Y53Pka1-mGEgHjjVcnIOGd8l1SFx8OBY,1190
 rats/cli/_click.py,sha256=7-ClnYSW4poFr_B-Q6NT45DnMF1XL7ntUgwQqQ7q_eo,1036
 rats/cli/_executable.py,sha256=kAQ9hImv3hBaScu6e19o_BMvl7tdYJql38E76S3FjSk,580
-rats/cli/_plugin.py,sha256=iUf2-ScR8o5p3g-0M1qNTAb3l9Q-FIBVjT_HEskISJY,2301
+rats/cli/_plugin.py,sha256=j9exzjL4sTCrGvine0rxumdfl0RPGpOFk7Ysk73aKWk,2278
 rats/cli/_plugins.py,sha256=H3-QdaICPJhCC5FkLHdXpwqe7Z0mpvsenakhNiPllC8,2739
 rats/cli/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rats/logs/__init__.py,sha256=fCn4pfpYiAcTtt5CsnUZX68CjOB3KJHxMSiYxsma4qE,183
-rats/logs/_plugin.py,sha256=j3hLJDcdF4DvxeZ84zdMGP4EHgfMEzZc0wBGQjvrzGc,2039
-rats_apps-0.1.3.dev20240723085916.dist-info/METADATA,sha256=t1LSuoY6LhzUV3xK-Vf6n00c-Es_pLZUwQ_X_nwZ9Ss,774
-rats_apps-0.1.3.dev20240723085916.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-rats_apps-0.1.3.dev20240723085916.dist-info/entry_points.txt,sha256=9oOvf2loQr5ACWQgvuu9Q3KZIVIxKE5Aa-rLuUII5WQ,91
-rats_apps-0.1.3.dev20240723085916.dist-info/RECORD,,
+rats/logs/_plugin.py,sha256=eAAG4ci-XS9A9ituXj9PrcI6zH-xlCqhJlUbSGC-MYM,2175
+rats_apps-0.1.3.dev20240731210159.dist-info/METADATA,sha256=W1GSJ7ViMy4OiPBHH1EAMFwWJhch4vF4GBNkVO20EiM,774
+rats_apps-0.1.3.dev20240731210159.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+rats_apps-0.1.3.dev20240731210159.dist-info/entry_points.txt,sha256=9oOvf2loQr5ACWQgvuu9Q3KZIVIxKE5Aa-rLuUII5WQ,91
+rats_apps-0.1.3.dev20240731210159.dist-info/RECORD,,