Aiohttp: Add pypy3 and minor optimisation

frameworks/Python/aiohttp/aiohttp-gunicorn.dockerfile

@@ -1,14 +1,14 @@
-FROM python:3.13
+FROM python:latest
 
 ADD ./ /aiohttp
 
 WORKDIR aiohttp
 
 RUN pip3 install cython==3.0.11 gunicorn==23.0.0 && \
-    pip3 install -r /aiohttp/requirements.txt
+    pip3 install -r /aiohttp/requirements-cpython.txt
 
 ENV CONNECTION=RAW
 
 EXPOSE 8080
 
-CMD python3 -O -m gunicorn app.gunicorn:app -c gunicorn_conf.py
+CMD python3 -O -m gunicorn app.gunicorn:app -c gunicorn_conf.py

frameworks/Python/aiohttp/aiohttp-nginx.dockerfile

@@ -1,20 +1,18 @@
-FROM python:3.13
-
-ADD ./requirements.txt /aiohttp/requirements.txt
-
-RUN pip3 install cython==3.0.11 && \
-    pip3 install -r /aiohttp/requirements.txt
+FROM python:latest
 
 RUN apt-get update && apt-get install -y nginx
 
 ADD ./ /aiohttp
 
 WORKDIR /aiohttp
 
+RUN pip3 install cython==3.0.11 && \
+    pip3 install -r /aiohttp/requirements-cpython.txt
+
 ENV CONNECTION=RAW
 
 EXPOSE 8080
 
 RUN chmod +x /aiohttp/nginx-entrypoint.sh
 
-ENTRYPOINT ["/aiohttp/nginx-entrypoint.sh"]
+ENTRYPOINT ["/aiohttp/nginx-entrypoint.sh"]

frameworks/Python/aiohttp/aiohttp-orm.dockerfile

@@ -1,16 +1,14 @@
-FROM python:3.13
-
-ADD ./requirements.txt /aiohttp/requirements.txt
-
-RUN pip3 install cython==3.0.11 && \
-    pip3 install -r /aiohttp/requirements.txt
+FROM python:latest
 
 ADD ./ /aiohttp
 
 WORKDIR /aiohttp
 
+RUN pip3 install cython==3.0.11 && \
+    pip3 install -r /aiohttp/requirements-cpython.txt
+
 ENV CONNECTION=ORM
 
 EXPOSE 8080
 
-CMD python3 -O -m app.server
+CMD python3 -O -m app.server

frameworks/Python/aiohttp/aiohttp-pypy.dockerfile

@@ -0,0 +1,14 @@
+FROM pypy:3.11
+
+ADD ./ /aiohttp
+
+WORKDIR /aiohttp
+
+RUN pip3 install cython==3.0.11 && \
+    pip3 install -r /aiohttp/requirements.txt
+
+ENV CONNECTION=RAW
+
+EXPOSE 8080
+
+CMD python3 -O -m app.server

frameworks/Python/aiohttp/aiohttp.dockerfile

@@ -1,16 +1,14 @@
-FROM python:3.13
-
-ADD ./requirements.txt /aiohttp/requirements.txt
-
-RUN pip3 install cython==3.0.11 && \
-    pip3 install -r /aiohttp/requirements.txt
+FROM python:latest
 
 ADD ./ /aiohttp
 
 WORKDIR /aiohttp
 
+RUN pip3 install cython==3.0.11 && \
+    pip3 install -r /aiohttp/requirements-cpython.txt
+
 ENV CONNECTION=RAW
 
 EXPOSE 8080
 
-CMD python3 -O -m app.server
+CMD python3 -O -m app.server

frameworks/Python/aiohttp/app/views.py

@@ -1,15 +1,26 @@
+import platform
 from operator import attrgetter, itemgetter
 from pathlib import Path
 from random import randint, sample
 
 import jinja2
 from aiohttp.web import Response
-from orjson import dumps
 from sqlalchemy import bindparam, select
 from sqlalchemy.orm.attributes import flag_modified
 
 from .models import Fortune, World
 
+if platform.python_implementation() == "PyPy":
+    from aiohttp.web import json_response
+else:
+    from orjson import dumps
+
+    def json_response(payload):
+        return Response(
+            body=dumps(payload),
+            content_type="application/json",
+        )
+
 ADDITIONAL_FORTUNE_ORM = Fortune(id=0, message='Additional fortune added at request time.')
 ADDITIONAL_FORTUNE_ROW = {'id': 0, 'message': 'Additional fortune added at request time.'}
 READ_ROW_SQL = 'SELECT "randomnumber", "id" FROM "world" WHERE id = $1'
@@ -25,8 +36,8 @@
 
 def get_num_queries(request):
     try:
-        num_queries = int(request.match_info.get('queries', 1))
-    except ValueError:
+        num_queries = int(request.match_info['queries'])
+    except (KeyError, ValueError):
         return 1
     if num_queries < 1:
         return 1
@@ -35,13 +46,6 @@ def get_num_queries(request):
     return num_queries
 
 
-def json_response(payload):
-    return Response(
-        body=dumps(payload),
-        content_type="application/json",
-    )
-
-
 async def json(request):
     """
     Test 1

frameworks/Python/aiohttp/benchmark_config.json

@@ -23,6 +23,29 @@
       "display_name": "aiohttp",
       "notes": "uses asyncpg for database access"
     },
+    "pypy": {
+      "json_url": "/json",
+      "db_url": "/db",
+      "query_url": "/queries/",
+      "fortune_url": "/fortunes",
+      "update_url": "/updates/",
+      "plaintext_url": "/plaintext",
+      "port": 8080,
+      "approach": "Realistic",
+      "classification": "Micro",
+      "database": "Postgres",
+      "framework": "aiohttp",
+      "language": "Python",
+      "flavor": "Pypy3",
+      "orm": "Raw",
+      "platform": "asyncio",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "aiohttp-pypy",
+      "notes": "uses Pypy instead of CPython",
+      "versus": "default"
+    },
     "nginx": {
       "json_url": "/json",
       "db_url": "/db",
@@ -43,7 +66,8 @@
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "aiohttp-nginx",
-      "notes": "uses nginx as proxy"
+      "notes": "uses nginx as proxy",
+      "versus": "default"
     },
     "gunicorn": {
       "json_url": "/json",

frameworks/Python/aiohttp/config.toml

@@ -18,6 +18,23 @@ platform = "asyncio"
 webserver = "None"
 versus = "None"
 
+[pypy]
+urls.plaintext = "/plaintext"
+urls.json = "/json"
+urls.db = "/db"
+urls.query = "/queries/"
+urls.update = "/updates/"
+urls.fortune = "/fortunes"
+approach = "Realistic"
+classification = "Micro"
+database = "Postgres"
+database_os = "Linux"
+os = "Linux"
+orm = "Raw"
+platform = "asyncio"
+webserver = "None"
+versus = "default"
+
 [nginx]
 urls.plaintext = "/plaintext"
 urls.json = "/json"

frameworks/Python/aiohttp/requirements-cpython.txt

@@ -0,0 +1,4 @@
+-r requirements.txt
+
+orjson==3.10.16
+uvloop==0.21.0

frameworks/Python/aiohttp/requirements.txt

@@ -2,5 +2,3 @@ aiohttp==3.11.18
 asyncpg==0.30.0
 jinja2==3.1.6
 SQLAlchemy==2.0.40
-orjson==3.10.16
-uvloop==0.21.0