Simplify application structure

Author: rmk135

src/newsfeed/__main__.py

@@ -1,41 +1,15 @@
 """Main module."""
 
-from aiohttp import web
-
-from .containers import Container
-from . import webapi
-
-
-def main() -> None:
-    container = Container()
-
-    container.config.from_yaml('config/newsfeed.yml')
-    container.config.from_yaml('config/newsfeed.local.yml')
-    container.config.logging.from_yaml('config/logging.yml')
-    container.config.logging.from_yaml('config/logging.local.yml')
-
-    container.configure_logging()
-    container.configure_event_loop()
+import os
 
-    container.wire(packages=[webapi])
-
-    web_app = webapi.app.create_app()
-    event_processor = container.event_processor_service()
+from aiohttp import web
 
-    @web_app.on_startup.append
-    async def _on_startup(_: web.Application) -> None:
-        event_processor.start_processing()
+from .app import create_app
 
-    @web_app.on_cleanup.append
-    async def _on_cleanup(_: web.Application) -> None:
-        event_processor.stop_processing()
 
+if __name__ == '__main__':
+    app = create_app()
     web.run_app(
-        web_app,
-        port=int(container.config.webapi.port()),
-        print=lambda *_: None,
+        app,
+        port=int(os.getenv('PORT', 8000)),
     )
-
-
-if __name__ == '__main__':
-    main()

src/newsfeed/app.py

@@ -0,0 +1,37 @@
+"""Application module."""
+
+from aiohttp import web
+
+from .containers import Container
+from .routes import setup_routes
+from . import handlers
+
+
+def create_app() -> web.Application:
+    container = Container()
+
+    container.config.from_yaml('config/newsfeed.yml')
+    container.config.from_yaml('config/newsfeed.local.yml')
+    container.config.logging.from_yaml('config/logging.yml')
+    container.config.logging.from_yaml('config/logging.local.yml')
+
+    container.configure_logging()
+    container.configure_event_loop()
+
+    container.wire(packages=[handlers])
+
+    app = web.Application()
+    app.container = container
+    setup_routes(app)
+
+    event_processor = container.event_processor_service()
+
+    @app.on_startup.append
+    async def _on_startup(_: web.Application) -> None:
+        event_processor.start_processing()
+
+    @app.on_cleanup.append
+    async def _on_cleanup(_: web.Application) -> None:
+        event_processor.stop_processing()
+
+    return app

src/newsfeed/containers.py

@@ -4,7 +4,8 @@
 
 from dependency_injector import containers, providers
 
-from newsfeed import core, infrastructure, domain
+from newsfeed import infrastructure, domain
+from .loop import configure_event_loop
 
 
 class Container(containers.DeclarativeContainer):
@@ -17,7 +18,7 @@ class Container(containers.DeclarativeContainer):
     )
 
     configure_event_loop = providers.Callable(
-        core.loop.configure_event_loop,
+        configure_event_loop,
         enable_uvloop=config.enable_uvloop,
     )
 

src/newsfeed/core/__init__.py

@@ -0,0 +1 @@
+"""API handlers package."""

src/newsfeed/handlers/__init__.py

@@ -1,4 +1,4 @@
-"""Event handlers."""
+"""Event API handlers."""
 
 from typing import Dict, List, Tuple, Union, Any
 

src/newsfeed/webapi/handlers/events.py src/newsfeed/handlers/events.py

@@ -1,4 +1,4 @@
-"""Miscellaneous handlers."""
+"""Miscellaneous API handlers."""
 
 import copy
 from typing import Dict, Any, AnyStr

src/newsfeed/webapi/handlers/misc.py src/newsfeed/handlers/misc.py

@@ -1,4 +1,4 @@
-"""Subscription handlers."""
+"""Subscription API handlers."""
 
 from typing import Dict, Union
 

src/newsfeed/webapi/handlers/subscriptions.py src/newsfeed/handlers/subscriptions.py

@@ -0,0 +1 @@
+"""API tests."""

src/newsfeed/core/loop.py src/newsfeed/loop.py

@@ -2,49 +2,21 @@
 
 from pytest import fixture
 
-from newsfeed.containers import Container
-from newsfeed import webapi
+from newsfeed.app import create_app
 
 
 @fixture
-def config():
-    return {
-        'infrastructure': {
-            'event_queue': {
-                'max_size': 1,
-            },
-            'event_storage': {
-                'max_newsfeeds': 3,
-                'max_events_per_newsfeed': 5,
-            },
-            'subscription_storage': {
-                'max_newsfeeds': 3,
-                'max_subscriptions_per_newsfeed': 5,
-            },
-        },
-        'domain': {
-            'newsfeed_id_length': 16,
-            'processor_concurrency': 1,
-        },
-        'webapi': {
-            'base_path': '/',
-        },
-    }
+def app():
+    app = create_app()
+    yield app
+    app.container.unwire()
 
 
 @fixture
-def container(config):
-    container = Container(config=config)
-    container.wire(packages=[webapi])
-    yield container
-    container.unwire()
+def container(app):
+    return app.container
 
 
 @fixture
-def web_app(container):
-    return webapi.app.create_app()
-
-
-@fixture
-async def web_client(aiohttp_client, web_app):
-    return await aiohttp_client(web_app)
+async def web_client(aiohttp_client, app):
+    return await aiohttp_client(app)

src/newsfeed/webapi/routes.py src/newsfeed/routes.py

@@ -0,0 +1 @@
+"""Domain tests."""