muffin 0.97.2__py3-none-any.whl → 0.98.1__py3-none-any.whl

muffin/app.py

@@ -12,7 +12,7 @@ from asgi_tools._compat import aio_wait
 from modconfig import Config
 
 from muffin.constants import CONFIG_ENV_VARIABLE
-from muffin.utils import import_submodules
+from muffin.utils import import_submodules, logger
 
 if TYPE_CHECKING:
     from collections.abc import Awaitable
@@ -75,7 +75,7 @@ class Application(BaseApp):
         self.manage = Manager(self)
 
         # Setup logging
-        self.logger = logging.getLogger("muffin")
+        self.logger = logger
         self.logger.setLevel(self.cfg.LOG_LEVEL)
         self.logger.propagate = False
         if not self.logger.handlers:
@@ -114,7 +114,7 @@ class Application(BaseApp):
             await aio_wait(*bgtasks)
             BACKGROUND_TASK.set(None)
 
-    def import_submodules(self, *submodules: str):
+    def import_submodules(self, *submodules: str, silent: bool = False):
         """Automatically import submodules.
 
         .. code-block:: python
@@ -127,10 +127,13 @@ class Application(BaseApp):
             # import only specific submodules (in specified order)
             app.import_submodules('submodule1', 'submodule2')
 
+            # ignore import errors
+            app.import_submodules(silent=True)
+
         """
         parent_frame = stack()[1][0]
         package_name = parent_frame.f_locals["__name__"]
-        return import_submodules(package_name, *submodules)
+        return import_submodules(package_name, *submodules, silent=silent)
 
     def run_after_response(self, *tasks: Awaitable):
         """Await the given awaitable after the response is completed.

muffin/utils.py

@@ -13,6 +13,7 @@ from contextlib import suppress
 from typing import TYPE_CHECKING, Callable, Coroutine, Dict, TypeVar
 
 from asgi_tools.utils import is_awaitable, to_awaitable
+from curio.task import logging
 from sniffio import current_async_library
 
 from muffin.errors import InvalidAppError
@@ -49,6 +50,8 @@ AIOLIBS["asyncio"] = asyncio
 
 TV = TypeVar("TV")
 
+logger = logging.getLogger("muffin")
+
 
 def aio_lib() -> str:
     """Return first available async library."""
@@ -72,15 +75,24 @@ def aio_run(corofn: Callable[..., Coroutine[None, None, TV]], *args, **kwargs) -
     return AIOLIBS[aiolib].run(lambda: corofn(*args, **kwargs))
 
 
-def import_submodules(package_name: str, *module_names: str) -> Dict[str, ModuleType]:
-    """Import all submodules by package name."""
+def import_submodules(
+    package_name: str, *module_names: str, silent: bool = False
+) -> Dict[str, ModuleType]:
+    """Import all submodules by the given package name."""
     package = sys.modules[package_name]
-    return {
-        module_name: importlib.import_module(f"{package_name}.{module_name}")
-        for module_name in (
-            module_names or (name for _, name, _ in pkgutil.walk_packages(package.__path__))
-        )
-    }
+    res = {}
+    for module_name in module_names or (
+        name for _, name, _ in pkgutil.walk_packages(package.__path__)
+    ):
+        try:
+            res[module_name] = importlib.import_module(f"{package_name}.{module_name}")
+        except ImportError:
+            if not silent:
+                raise
+
+            logger.debug("Failed to import module: %s", f"{package_name}.{module_name}")
+
+    return res
 
 
 def import_app(app_uri: str, *, reload: bool = False) -> Application:

{muffin-0.97.2.dist-info → muffin-0.98.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: muffin
-Version: 0.97.2
+Version: 0.98.1
 Summary: Muffin is a fast, simple and asyncronous web-framework for Python 3 (asyncio, trio, curio)
 Home-page: https://github.com/klen/muffin
 License: MIT
@@ -19,18 +19,13 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Internet :: WWW/HTTP
 Provides-Extra: standard
-Requires-Dist: asgi-tools (>=0.73.2,<0.74.0)
+Requires-Dist: asgi-tools (>=0,<1)
 Requires-Dist: gunicorn (>=20.1.0,<21.0.0) ; extra == "standard"
-Requires-Dist: modconfig (>=1.2.1,<2.0.0)
-Requires-Dist: ujson (>=5.7.0,<6.0.0)
+Requires-Dist: modconfig (>=1,<2)
+Requires-Dist: ujson
 Requires-Dist: uvicorn[standard] (>=0.21.1,<0.22.0) ; extra == "standard"
 Project-URL: Documentation, https://klen.github.io/muffin
 Project-URL: Repository, https://github.com/klen/muffin

{muffin-0.97.2.dist-info → muffin-0.98.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 muffin/__init__.py,sha256=F8Qp4ETX5FqI1832dj2moRAQ5hEb0TO9u4aRjSKXNjI,982
-muffin/app.py,sha256=HxTuFjokxw5_cDeWeOzLXYvw0HZB6ifIcOXAd1GMfTA,5130
+muffin/app.py,sha256=E0lYNlye-9vHvPaW7YOE01bUzQG7ficRy3wISxC5ZFg,5237
 muffin/constants.py,sha256=Ga1UJiEdXUk6dIEH_IEVYkFSZxQFPhxie7fCJwQY8V0,71
 muffin/errors.py,sha256=I-vKbMMBiMU07zPdKvoJKqA7s4xYAUA-4oZXrRMRzcM,701
 muffin/handler.py,sha256=YGodKswFv-dNf8ABODp_JQx0M36nCGmcKewAolrsq9k,3754
@@ -8,8 +8,8 @@ muffin/plugins.py,sha256=rIBO7Y3i3UUGyjPzjkS8XrEcOeoDTRg6sZiMfKtBuhY,2857
 muffin/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 muffin/pytest.py,sha256=Fzersdp2WoO9xCKx5Cezp3yU-We2AU6etiQcT360p3E,2705
 muffin/types.py,sha256=wsUj5oAfqSZMoEf-wyFJLBlWa8Mc-eJGqKLr02HxuXE,153
-muffin/utils.py,sha256=xWhd79f1qEw7CH4BjB6OqVHEOukWckIEc9ap7EHh_hs,2449
-muffin-0.97.2.dist-info/METADATA,sha256=X8ZuoRTAypV9_BB_p7F1QWs0CA1QxZlT-zbGEW4kuh8,11614
-muffin-0.97.2.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-muffin-0.97.2.dist-info/entry_points.txt,sha256=GvPS3M-tNVPzhUS5jnUpOmWw2NAqedY34VRCYgPYzlM,84
-muffin-0.97.2.dist-info/RECORD,,
+muffin/utils.py,sha256=SgTKGgpYq73VFabZIU0yf_rM5szJ4QD-gF9HQbspiJc,2743
+muffin-0.98.1.dist-info/METADATA,sha256=GhHbT0vbbljkPKsOubTtLNQLf1hsIcdoqicyvwKD8Zo,11329
+muffin-0.98.1.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
+muffin-0.98.1.dist-info/entry_points.txt,sha256=GvPS3M-tNVPzhUS5jnUpOmWw2NAqedY34VRCYgPYzlM,84
+muffin-0.98.1.dist-info/RECORD,,

{muffin-0.97.2.dist-info → muffin-0.98.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.5.2
+Generator: poetry-core 1.6.0
 Root-Is-Purelib: true
 Tag: py3-none-any