Bump aiohttp from 3.8.6 to 3.10.10 (#1220)

dependabot[bot] · Dreamsorcerer · web-flow · commit ba9d7ebce2e6 · 2024-11-12T19:17:27.000Z
* Bump aiohttp from 3.8.6 to 3.10.10 Bumps [aiohttp](https://github.com/aio-libs/aiohttp) from 3.8.6 to 3.10.10. - [Release notes](https://github.com/aio-libs/aiohttp/releases) - [Changelog](https://github.com/aio-libs/aiohttp/blob/master/CHANGES.rst) - [Commits](aio-libs/aiohttp@v3.8.6...v3.10.10) --- updated-dependencies: - dependency-name: aiohttp dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Update keys * Fix * Upgrade aiohttp-jnja2 * Fix * Upgrade aiohttp-security * fix * Chat * imagetagger * get_config * moderator * polls * missing file --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sam Bull <git@sambull.org>
diff --git a/demos/blog/aiohttpdemo_blog/db.py b/demos/blog/aiohttpdemo_blog/db.py
@@ -11,6 +11,8 @@
 )
 from sqlalchemy.sql import select
 
+from aiohttpdemo_blog.typedefs import config_key, db_key
+
 
 class Base(DeclarativeBase):
     pass
@@ -41,9 +43,9 @@ class Posts(Base):
 
 
 async def init_db(app):
-    dsn = construct_db_url(app["config"]["database"])
+    dsn = construct_db_url(app[config_key]["database"])
     engine = create_async_engine(dsn)
-    app["db_pool"] = async_sessionmaker(engine)
+    app[db_key] = async_sessionmaker(engine)
 
     yield
 
diff --git a/demos/blog/aiohttpdemo_blog/db_auth.py b/demos/blog/aiohttpdemo_blog/db_auth.py
@@ -1,14 +1,15 @@
 from aiohttp_security.abc import AbstractAuthorizationPolicy
 
 from aiohttpdemo_blog import db
+from aiohttpdemo_blog.typedefs import db_key
 
 
 class DBAuthorizationPolicy(AbstractAuthorizationPolicy):
     def __init__(self, app):
         self.app = app
 
     async def authorized_userid(self, identity):
-        async with self.app["db_pool"]() as sess:
+        async with self.app[db_key]() as sess:
             user = await db.get_user_by_name(sess, identity)
             if user:
                 return identity
diff --git a/demos/blog/aiohttpdemo_blog/main.py b/demos/blog/aiohttpdemo_blog/main.py
@@ -9,23 +9,22 @@
 from aiohttp_session import setup as setup_session
 from aiohttp_session.redis_storage import RedisStorage
 from redis import asyncio as aioredis
+
 from aiohttpdemo_blog.db_auth import DBAuthorizationPolicy
 from aiohttpdemo_blog.db import init_db
 from aiohttpdemo_blog.routes import setup_routes
 from aiohttpdemo_blog.settings import load_config, PACKAGE_NAME
+from aiohttpdemo_blog.typedefs import config_key
 
 
 log = logging.getLogger(__name__)
 
 
-async def setup_redis(app):
-
-    redis_host = app["config"]["redis"]["REDIS_HOST"]
-    redis_port = app["config"]["redis"]["REDIS_PORT"]
+async def setup_redis(app: web.Application):
+    redis_host = app[config_key]["redis"]["REDIS_HOST"]
+    redis_port = app[config_key]["redis"]["REDIS_PORT"]
 
-    redis = await aioredis.from_url(f"redis://{redis_host}:{redis_port}")
-    app["redis"] = redis
-    return redis
+    return await aioredis.from_url(f"redis://{redis_host}:{redis_port}")
 
 
 async def current_user_ctx_processor(request):
@@ -38,7 +37,7 @@ async def init_app(config):
 
     app = web.Application()
 
-    app['config'] = config
+    app[config_key] = config
 
     setup_routes(app)
 
@@ -61,7 +60,7 @@ async def init_app(config):
         DBAuthorizationPolicy(app)
     )
 
-    log.debug(app['config'])
+    log.debug(app[config_key])
 
     return app
 
diff --git a/demos/blog/aiohttpdemo_blog/typedefs.py b/demos/blog/aiohttpdemo_blog/typedefs.py
@@ -0,0 +1,7 @@
+from typing import Any
+
+from aiohttp import web
+from sqlalchemy.ext.asyncio import async_sessionmaker
+
+config_key = web.AppKey("config_key", dict[str, Any])
+db_key = web.AppKey("db_key", async_sessionmaker)
diff --git a/demos/blog/aiohttpdemo_blog/views.py b/demos/blog/aiohttpdemo_blog/views.py
@@ -4,6 +4,7 @@
 
 from aiohttpdemo_blog import db
 from aiohttpdemo_blog.forms import validate_login_form
+from aiohttpdemo_blog.typedefs import db_key
 
 
 def redirect(router, route_name):
@@ -17,7 +18,7 @@ async def index(request):
     if not username:
         raise redirect(request.app.router, 'login')
 
-    async with request.app['db_pool']() as sess:
+    async with request.app[db_key]() as sess:
         current_user = await db.get_user_by_name(sess, username)
         posts = await db.get_posts_with_joined_users(sess)
 
@@ -33,7 +34,7 @@ async def login(request):
     if request.method == 'POST':
         form = await request.post()
 
-        async with request.app['db_pool']() as sess:
+        async with request.app[db_key]() as sess:
             error = await validate_login_form(sess, form)
 
             if error:
@@ -64,7 +65,7 @@ async def create_post(request):
     if request.method == 'POST':
         form = await request.post()
 
-        async with request.app['db_pool'].begin() as sess:
+        async with request.app[db_key].begin() as sess:
             current_user = await db.get_user_by_name(sess, username)
             sess.add(db.Posts(body=form["body"], user_id=current_user.id))
             raise redirect(request.app.router, 'index')
diff --git a/demos/blog/requirements.txt b/demos/blog/requirements.txt
@@ -1,6 +1,6 @@
-aiohttp==3.8.5
-aiohttp-jinja2==1.5.1
-aiohttp_security[session]==0.4.0
+aiohttp==3.10.10
+aiohttp-jinja2==1.6
+aiohttp-security[session]==0.5.0
 asyncpg==0.30.0
 bcrypt==4.1.3
 pytoml==0.1.21
diff --git a/demos/blog/tests/test_stuff.py b/demos/blog/tests/test_stuff.py
@@ -3,6 +3,7 @@
     generate_password_hash,
     check_password_hash
 )
+from aiohttpdemo_blog.typedefs import db_key
 
 
 def test_security():
@@ -25,7 +26,7 @@ async def test_login_form(tables_and_data, client):
         'username': 'Adam',
         'password': 'adam'
     }
-    async with client.server.app["db_pool"]() as sess:
+    async with client.server.app[db_key]() as sess:
         error = await validate_login_form(sess, invalid_form)
         assert error
 
diff --git a/demos/chat/aiohttpdemo_chat/main.py b/demos/chat/aiohttpdemo_chat/main.py
@@ -4,14 +4,14 @@
 
 import aiohttp_jinja2
 from aiohttp import web
-from aiohttpdemo_chat.views import index
+from aiohttpdemo_chat.views import index, ws_key
 
 
 async def init_app():
 
     app = web.Application()
 
-    app['websockets'] = {}
+    app[ws_key] = {}
 
     app.on_shutdown.append(shutdown)
 
@@ -24,9 +24,9 @@ async def init_app():
 
 
 async def shutdown(app):
-    for ws in app['websockets'].values():
+    for ws in app[ws_key].values():
         await ws.close()
-    app['websockets'].clear()
+    app[ws_key].clear()
 
 
 async def get_app():
diff --git a/demos/chat/aiohttpdemo_chat/views.py b/demos/chat/aiohttpdemo_chat/views.py
@@ -7,6 +7,8 @@
 
 log = logging.getLogger(__name__)
 
+ws_key = web.AppKey("ws_key", dict[str, web.WebSocketResponse])
+
 
 def get_random_name():
     fake = Faker()
@@ -26,24 +28,24 @@ async def index(request):
 
     await ws_current.send_json({'action': 'connect', 'name': name})
 
-    for ws in request.app['websockets'].values():
+    for ws in request.app[ws_key].values():
         await ws.send_json({'action': 'join', 'name': name})
-    request.app['websockets'][name] = ws_current
+    request.app[ws_key][name] = ws_current
 
     while True:
         msg = await ws_current.receive()
 
         if msg.type == aiohttp.WSMsgType.text:
-            for ws in request.app['websockets'].values():
+            for ws in request.app[ws_key].values():
                 if ws is not ws_current:
                     await ws.send_json(
                         {'action': 'sent', 'name': name, 'text': msg.data})
         else:
             break
 
-    del request.app['websockets'][name]
+    del request.app[ws_key][name]
     log.info('%s disconnected.', name)
-    for ws in request.app['websockets'].values():
+    for ws in request.app[ws_key].values():
         await ws.send_json({'action': 'disconnect', 'name': name})
 
     return ws_current
diff --git a/demos/chat/requirements.txt b/demos/chat/requirements.txt
@@ -1,3 +1,3 @@
-aiohttp==3.8.5
-aiohttp-jinja2==1.5.1
+aiohttp==3.10.10
+aiohttp-jinja2==1.6
 faker==26.0.0
diff --git a/demos/graphql-demo/requirements-dev.txt b/demos/graphql-demo/requirements-dev.txt
@@ -1,6 +1,6 @@
-aiohttp==3.8.5
-aiohttp_jinja2==1.5.1
-aiohttp_graphql==1.1.0
+aiohttp==3.10.10
+aiohttp-jinja2==1.6
+aiohttp-graphql==1.1.0
 aiodataloader==0.4.0
 faker==26.0.0
 trafaret_config==2.0.2
diff --git a/demos/imagetagger/imagetagger/app.py b/demos/imagetagger/imagetagger/app.py
@@ -7,7 +7,7 @@
 from aiohttp import web
 
 from .routes import init_routes
-from .utils import init_config, Config, get_config, init_workers
+from .utils import Config, get_config, init_workers
 from .views import SiteHandler
 
 
@@ -24,7 +24,6 @@ def init_jinja2(app: web.Application) -> None:
 async def init_app(conf: Config) -> web.Application:
     app = web.Application()
     executor = await init_workers(app, conf.workers)
-    init_config(app, conf)
     init_jinja2(app)
     handler = SiteHandler(conf, executor)
     init_routes(app, handler)
diff --git a/demos/imagetagger/imagetagger/utils.py b/demos/imagetagger/imagetagger/utils.py
@@ -12,6 +12,7 @@
 from trafaret_config import commandline
 from .worker import warm, clean
 
+executor_key = web.AppKey("executor_key", ProcessPoolExecutor)
 
 PATH = pathlib.Path(__file__).parent.parent
 settings_file = os.environ.get('SETTINGS_FILE', 'api.dev.yml')
@@ -69,10 +70,6 @@ def get_config(argv: Any = None) -> Config:
     return config_from_dict(d)
 
 
-def init_config(app: web.Application, config: Config) -> None:
-    app['config'] = config
-
-
 async def init_workers(
     app: web.Application, conf: WorkersConfig
 ) -> ProcessPoolExecutor:
@@ -90,5 +87,5 @@ async def close_executor(app: web.Application) -> None:
         executor.shutdown(wait=True)
 
     app.on_cleanup.append(close_executor)
-    app['executor'] = executor
+    app[executor_key] = executor
     return executor
diff --git a/demos/imagetagger/imagetagger/views.py b/demos/imagetagger/imagetagger/views.py
@@ -6,7 +6,7 @@
 from aiohttp import web
 
 from .worker import predict
-from .utils import Config
+from .utils import Config, executor_key
 
 
 class SiteHandler:
@@ -23,7 +23,7 @@ async def predict(self, request: web.Request) -> web.Response:
         form = await request.post()
         raw_data = form['file'].file.read()
         form["file"].file.close()  # Not needed in aiohttp 4+.
-        executor = request.app['executor']
+        executor = request.app[executor_key]
         r = self._loop.run_in_executor
         raw_data = await r(executor, predict, raw_data)
         # raw_data = predict(raw_data)
diff --git a/demos/imagetagger/requirements.txt b/demos/imagetagger/requirements.txt
@@ -1,5 +1,5 @@
-aiohttp==3.8.5
-aiohttp-jinja2==1.5.1
+aiohttp==3.10.10
+aiohttp-jinja2==1.6
 keras==3.6.0
 Pillow==11.0.0
 tensorflow==2.16.1
diff --git a/demos/moderator/moderator/utils.py b/demos/moderator/moderator/utils.py
@@ -63,5 +63,4 @@ async def close_executor(app):
         executor.shutdown(wait=True)
 
     app.on_cleanup.append(close_executor)
-    app['executor'] = executor
     return executor
diff --git a/demos/moderator/requirements-dev.txt b/demos/moderator/requirements-dev.txt
@@ -1,4 +1,4 @@
-aiohttp==3.8.5
+aiohttp==3.10.10
 trafaret==2.1.1
 pyyaml==6.0.2
 numpy==1.26.4
diff --git a/demos/moderator_bot/requirements-dev.txt b/demos/moderator_bot/requirements-dev.txt
@@ -1,5 +1,5 @@
 -i https://pypi.org/simple/
-aiohttp==3.8.5
+aiohttp==3.10.10
 aioslacker==0.0.11
 async-timeout==4.0.3
 atomicwrites==1.4.1
diff --git a/demos/motortwit/requirements.txt b/demos/motortwit/requirements.txt
@@ -1,6 +1,6 @@
-aiohttp==3.8.5
-aiohttp_jinja2==1.5.1
-aiohttp_security==0.4.0
+aiohttp==3.10.10
+aiohttp-jinja2==1.6
+aiohttp-security==0.5.0
 bcrypt==4.1.3
 faker==26.0.0
 motor==3.6.0
diff --git a/demos/polls/aiohttpdemo_polls/db.py b/demos/polls/aiohttpdemo_polls/db.py
@@ -4,6 +4,8 @@
 from sqlalchemy.ext.asyncio import async_sessionmaker, create_async_engine
 from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
 
+from aiohttpdemo_polls.typedefs import config_key, db_key
+
 
 class Base(DeclarativeBase):
     pass
@@ -37,8 +39,8 @@ class RecordNotFound(Exception):
 
 
 async def pg_context(app):
-    engine = create_async_engine(DSN.format(**app["config"]["postgres"]))
-    app["db"] = async_sessionmaker(engine)
+    engine = create_async_engine(DSN.format(**app[config_key]["postgres"]))
+    app[db_key] = async_sessionmaker(engine)
 
     yield
 
@@ -59,7 +61,7 @@ async def get_question(sess, question_id):
 
 
 async def vote(app, question_id, choice_id):
-    async with app["db"].begin() as sess:
+    async with app[db_key].begin() as sess:
         result = await sess.get(Choice, choice_id)
         result.votes += 1
         if not result:
diff --git a/demos/polls/aiohttpdemo_polls/main.py b/demos/polls/aiohttpdemo_polls/main.py
@@ -9,13 +9,14 @@
 from aiohttpdemo_polls.middlewares import setup_middlewares
 from aiohttpdemo_polls.routes import setup_routes, setup_static_routes
 from aiohttpdemo_polls.settings import get_config
+from aiohttpdemo_polls.typedefs import config_key
 
 
 async def init_app(argv=None):
 
     app = web.Application()
 
-    app['config'] = get_config(argv)
+    app[config_key] = get_config(argv)
 
     # setup Jinja2 template renderer
     aiohttp_jinja2.setup(
diff --git a/demos/polls/aiohttpdemo_polls/typedefs.py b/demos/polls/aiohttpdemo_polls/typedefs.py
@@ -0,0 +1,7 @@
+from typing import Any
+
+from aiohttp import web
+from sqlalchemy.ext.asyncio import async_sessionmaker
+
+config_key = web.AppKey("config_key", dict[str, Any])
+db_key = web.AppKey("db_key", async_sessionmaker)
diff --git a/demos/polls/aiohttpdemo_polls/views.py b/demos/polls/aiohttpdemo_polls/views.py
diff --git a/demos/polls/requirements-dev.txt b/demos/polls/requirements-dev.txt
diff --git a/demos/polls/tests/test_integration.py b/demos/polls/tests/test_integration.py
diff --git a/demos/shortify/requirements.txt b/demos/shortify/requirements.txt

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`generate_password_hash,`
`4`	`4`	`check_password_hash`
`5`	`5`	`)`
	`6`	`+from aiohttpdemo_blog.typedefs import db_key`
`6`	`7`
`7`	`8`
`8`	`9`	`def test_security():`
`@@ -25,7 +26,7 @@ async def test_login_form(tables_and_data, client):`
`25`	`26`	`'username': 'Adam',`
`26`	`27`	`'password': 'adam'`
`27`	`28`	`}`
`28`		`- async with client.server.app["db_pool"]() as sess:`
	`29`	`+ async with client.server.app[db_key]() as sess:`
`29`	`30`	`error = await validate_login_form(sess, invalid_form)`
`30`	`31`	`assert error`
`31`	`32`