muffin 1.0.2__tar.gz → 1.1.1__tar.gz

{muffin-1.0.2 → muffin-1.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: muffin
-Version: 1.0.2
+Version: 1.1.1
 Summary: Muffin is a fast, simple and asyncronous web-framework for Python 3 (asyncio, trio, curio)
 License: MIT
 Keywords: asgi,web,web framework,asyncio,trio,curio

{muffin-1.0.2 → muffin-1.1.1}/muffin/manage.py

@@ -57,9 +57,7 @@ class Manager:
     def __init__(self, app: "Application"):
         """Initialize the manager."""
         self.app = app
-        self.parser = argparse.ArgumentParser(
-            description="Manage %s" % app.cfg.name.capitalize(),
-        )
+        self.parser = argparse.ArgumentParser(description="Manage %s" % app.cfg.name.capitalize())
 
         if len(AIOLIBS) > 1:
             self.parser.add_argument(
@@ -88,7 +86,7 @@ class Manager:
 
         # We have to use sync mode here because of eventloop conflict with ipython/promt-toolkit
         def shell(*, ipython: bool = True):
-            """Start the application's shell.
+            """Start an interactive shell with the application context.
 
             :param ipython: Use IPython as a shell
             """
@@ -110,7 +108,7 @@ class Manager:
         self(shell)
 
         def run(host: str = "localhost", port: int = 5000):
-            """Start the application's server."""
+            """Run the application with the given host and port."""
             from uvicorn.main import run as urun
 
             cfg = self.app.cfg
@@ -141,7 +139,7 @@ class Manager:
     def __call__(self, fn=None, *, lifespan=False):  # noqa: C901
         """Register a command."""
 
-        def wrapper(fn):  # noqa: PLR0912, C901
+        def wrapper(fn):  # noqa: C901, PLR0912
             if not inspect.iscoroutinefunction(fn) and lifespan:
                 raise AsyncRequiredError(fn)
 
@@ -155,7 +153,9 @@ class Manager:
                 self.app.logger.warning("Command %s already registered", command_name)
                 return fn
 
-            parser = self.subparsers.add_parser(command_name, description=description)
+            parser = self.subparsers.add_parser(
+                command_name, description=description, help=description
+            )
             sig = inspect.signature(fn)
             docs = dict(PARAM_RE.findall(fn.__doc__ or ""))
 
@@ -235,6 +235,14 @@ class Manager:
         if prog:
             self.parser.prog = prog
 
+        # Sort subparsers by name
+        choices_actions = getattr(self.subparsers, "_choices_actions", None)
+        if choices_actions:
+            sorted_actions = sorted(choices_actions, key=lambda a: a.dest)
+            choices_actions.clear()
+            choices_actions.extend(sorted_actions)
+            self.subparsers.metavar = "{" + ",".join(a.dest for a in sorted_actions) + "}"
+
         ns, _ = self.parser.parse_known_args(args or sys.argv[1:])
         kwargs = dict(ns._get_kwargs())
         fn = self.commands.get(kwargs.pop("subparser"))
@@ -281,8 +289,13 @@ def cli():
     try:
         app = import_app(args_.app)
         app.logger.info("Application is loaded: %s", app.cfg.name)
-        app.manage.run(*subargs_, prog="muffin %s" % args_.app)
 
+    except ImportError:
+        logging.exception("Failed to import application")
+        return sys.exit(1)
+
+    try:
+        app.manage.run(*subargs_, prog="muffin %s" % args_.app)
     except Exception:
         logging.exception("Command failed")
         return sys.exit(1)
@@ -290,4 +303,4 @@ def cli():
     sys.exit(0)
 
 
-# ruff: noqa: T100
+# ruff: noqa: T100, LOG015

{muffin-1.0.2 → muffin-1.1.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "muffin"
-version = "1.0.2"
+version = "1.1.1"
 description = "Muffin is a fast, simple and asyncronous web-framework for Python 3 (asyncio, trio, curio)"
 readme = "README.rst"
 license = "MIT"