rats-apps 0.3.0.dev20240928043035__py3-none-any.whl → 0.3.0.dev20241002165828__py3-none-any.whl

rats/cli/__init__.py

@@ -2,17 +2,20 @@
 
 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 ._container import CompositeContainer, Container
+from ._plugin import PluginContainer, PluginServices, attach, create_group
 
 __all__ = [
     "PluginContainer",
     "command",
     "get_class_commands",
     "get_class_groups",
+    "create_group",
+    "attach",
     "group",
     "ClickApp",
     "PluginServices",
     "CommandId",
-    "CommandContainer",
+    "Container",
+    "CompositeContainer",
 ]

rats/cli/__main__.py

@@ -9,7 +9,7 @@ from rats import apps, cli
 logger = logging.getLogger(__name__)
 
 
-class ExampleCommands(cli.CommandContainer):
+class ExampleCommands(cli.Container):
     """An example collection of cli commands."""
 
     @cli.command()

rats/cli/_app.py

@@ -4,7 +4,7 @@ import click
 
 from rats import apps
 
-from ._container import CommandContainer
+from ._container import Container
 
 
 @final
@@ -12,12 +12,12 @@ class ClickApp(apps.Executable):
     """..."""
 
     _group: click.Group
-    _commands: CommandContainer
+    _commands: Container
 
     def __init__(
         self,
         group: click.Group,
-        commands: CommandContainer,
+        commands: Container,
     ) -> None:
         """Not sure this is the right interface."""
         self._group = group

rats/cli/_container.py

@@ -1,18 +1,16 @@
 import logging
 from collections.abc import Callable
 from functools import partial
-from typing import Any, Protocol
+from typing import Any, Protocol, final
 
 import click
 
-from rats import apps
-
 from ._annotations import get_class_commands
 
 logger = logging.getLogger(__name__)
 
 
-class CommandContainer(apps.Container, Protocol):
+class Container(Protocol):
     """A container that can attach click commands to a click group."""
 
     def attach(self, group: click.Group) -> None:
@@ -48,3 +46,15 @@ class CommandContainer(apps.Container, Protocol):
                             params=params,
                         )
                     )
+
+
+@final
+class CompositeContainer(Container):
+    _containers: tuple[Container, ...]
+
+    def __init__(self, *containers: Container) -> None:
+        self._containers = containers
+
+    def attach(self, group: click.Group) -> None:
+        for container in self._containers:
+            container.attach(group)

rats/cli/_plugin.py

@@ -4,6 +4,23 @@ import click
 
 from rats import apps
 
+from ._container import Container
+
+
+def create_group(group: click.Group, container: Container) -> 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_apps-0.3.0.dev20240928043035.dist-info → rats_apps-0.3.0.dev20241002165828.dist-info}/METADATA

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

{rats_apps-0.3.0.dev20240928043035.dist-info → rats_apps-0.3.0.dev20241002165828.dist-info}/RECORD

@@ -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/__main__.py,sha256=3JZ7mrTTrrODQHutefm2zJp1-cQQB7I5-1xhYw7SMBU,1656
+rats/cli/__init__.py,sha256=GR_pZr0OtqkH2js73OPZlK4Pgj0C30bhSKPGfU32Zxk,580
+rats/cli/__main__.py,sha256=5OidbkRA4aglOAcvV6xQY9k7Ls9vd_EwNvI2aOrcPIQ,1649
 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/_app.py,sha256=EmLIJe1LTLob5u5gP8gpgxk3kFlALTvrpYlwxlILu0k,620
+rats/cli/_container.py,sha256=q3L6On6RS3PfUFZ67t6eUvKUQIK4Qxomz5ob86aNcR4,2143
+rats/cli/_plugin.py,sha256=jkpqSCW0ELnMjK8fz-BVE50qgBIxbd5j4hILOnlla6U,1086
 rats/cli/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rats/logs/__init__.py,sha256=fCn4pfpYiAcTtt5CsnUZX68CjOB3KJHxMSiYxsma4qE,183
 rats/logs/_plugin.py,sha256=OQ5fXToBm60YJRrMUVJ9_HVytUs3c69vaHY57jpivb0,2221
 rats/logs/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rats_apps-0.3.0.dev20240928043035.dist-info/METADATA,sha256=k0UESmQA1tr66nQVFUMKtsfhQicSC75kzJS6hFTcyBQ,774
-rats_apps-0.3.0.dev20240928043035.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-rats_apps-0.3.0.dev20240928043035.dist-info/entry_points.txt,sha256=9oOvf2loQr5ACWQgvuu9Q3KZIVIxKE5Aa-rLuUII5WQ,91
-rats_apps-0.3.0.dev20240928043035.dist-info/RECORD,,
+rats_apps-0.3.0.dev20241002165828.dist-info/METADATA,sha256=qT79vCLfGHgQYabnr89wlHudg835snVZyKEGya9ebZg,774
+rats_apps-0.3.0.dev20241002165828.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+rats_apps-0.3.0.dev20241002165828.dist-info/entry_points.txt,sha256=9oOvf2loQr5ACWQgvuu9Q3KZIVIxKE5Aa-rLuUII5WQ,91
+rats_apps-0.3.0.dev20241002165828.dist-info/RECORD,,