[Python] Update Granian to 2.5, remove "wrk" variant, add "nogil" variant (TechEmpower#10177)

gi0baro · web-flow · commit 43edfc13fb74 · 2025-10-14T16:24:17.000-07:00
diff --git a/frameworks/Python/granian/app_rsgi_nogil.py b/frameworks/Python/granian/app_rsgi_nogil.py
@@ -0,0 +1,42 @@
+import json
+
+JSON_HEADERS = [('content-type', 'application/json')]
+PLAINTEXT_HEADERS = [('content-type', 'text/plain; charset=utf-8')]
+
+# json_dumps = orjson.dumps
+json_dumps = json.dumps
+
+
+async def route_json(scope, proto):
+    proto.response_str(
+        200,
+        JSON_HEADERS,
+        json_dumps({'message': 'Hello, world!'})
+    )
+
+
+async def route_plaintext(scope, proto):
+    proto.response_bytes(
+        200,
+        PLAINTEXT_HEADERS,
+        b'Hello, world!'
+    )
+
+
+async def handle_404(scope, proto):
+    proto.response_bytes(
+        404,
+        PLAINTEXT_HEADERS,
+        b'Not found'
+    )
+
+
+routes = {
+    '/json': route_json,
+    '/plaintext': route_plaintext
+}
+
+
+def main(scope, proto):
+    handler = routes.get(scope.path, handle_404)
+    return handler(scope, proto)
diff --git a/frameworks/Python/granian/benchmark_config.json b/frameworks/Python/granian/benchmark_config.json
@@ -63,7 +63,7 @@
       "notes": "",
       "versus": "uvicorn"
     },
-    "wrk": {
+    "nogil": {
       "json_url": "/json",
       "plaintext_url": "/plaintext",
       "port": 8080,
@@ -77,7 +77,7 @@
       "webserver": "granian",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "granian [rsgi wrk]",
+      "display_name": "granian [rsgi nogil]",
       "notes": "",
       "versus": "uvicorn"
     }
diff --git a/frameworks/Python/granian/config.toml b/frameworks/Python/granian/config.toml
@@ -48,7 +48,7 @@ platform = "None"
 webserver = "granian"
 versus = "uvicorn"
 
-[wrk]
+[nogil]
 urls.plaintext = "/plaintext"
 urls.json = "/json"
 approach = "Realistic"
diff --git a/frameworks/Python/granian/granian-nogil.dockerfile b/frameworks/Python/granian/granian-nogil.dockerfile
@@ -0,0 +1,16 @@
+FROM ghcr.io/astral-sh/uv:debian-slim
+
+RUN uv python install 3.14t
+
+ENV UV_PYTHON=3.14t
+ENV PYTHON_GIL=0
+
+ADD ./ /granian
+WORKDIR /granian
+
+RUN uv venv
+RUN uv pip install -r requirements-nogil.txt
+
+EXPOSE 8080
+
+CMD uv run python run_nogil.py rsgi st
diff --git a/frameworks/Python/granian/granian-rsgi.dockerfile b/frameworks/Python/granian/granian-rsgi.dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.10-slim
+FROM python:3.13-slim
 
 ADD ./ /granian
 
@@ -8,4 +8,4 @@ RUN pip install -r /granian/requirements.txt
 
 EXPOSE 8080
 
-CMD python run.py rsgi mt
+CMD python run.py rsgi st
diff --git a/frameworks/Python/granian/granian-wrk.dockerfile b/frameworks/Python/granian/granian-wrk.dockerfile
diff --git a/frameworks/Python/granian/granian-wsgi.dockerfile b/frameworks/Python/granian/granian-wsgi.dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.10-slim
+FROM python:3.13-slim
 
 ADD ./ /granian
 
diff --git a/frameworks/Python/granian/granian.dockerfile b/frameworks/Python/granian/granian.dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.10-slim
+FROM python:3.13-slim
 
 ADD ./ /granian
 
@@ -8,4 +8,4 @@ RUN pip install -r /granian/requirements.txt
 
 EXPOSE 8080
 
-CMD python run.py asgi mt
+CMD python run.py asgi st
diff --git a/frameworks/Python/granian/requirements-nogil.txt b/frameworks/Python/granian/requirements-nogil.txt
@@ -0,0 +1 @@
+granian[rloop]>=2.5.0,<2.6.0
diff --git a/frameworks/Python/granian/requirements.txt b/frameworks/Python/granian/requirements.txt
@@ -1,4 +1,4 @@
 asyncpg==0.30.0
-granian[uvloop]>=2.4.0,<2.5.0
+granian[uvloop]>=2.5.0,<2.6.0
 jinja2==3.1.6
-orjson==3.10.16
+orjson==3.11.3
diff --git a/frameworks/Python/granian/run_nogil.py b/frameworks/Python/granian/run_nogil.py
@@ -0,0 +1,32 @@
+import multiprocessing
+import sys
+
+from granian import Granian
+
+
+if __name__ == '__main__':
+    interface = sys.argv[1]
+    runtime_mode = sys.argv[2]
+    workers = multiprocessing.cpu_count()
+
+    if interface == "rsgi":
+        #: leave 25% cpu to the Rust runtime
+        workers = round(workers * 0.75)
+
+    blocking_threads = None
+    if interface == "wsgi":
+        #: we don't run any I/O in WSGI benches
+        blocking_threads = 1
+
+    Granian(
+        f"app_{interface}_nogil:main",
+        address="0.0.0.0",
+        port=8080,
+        workers=workers,
+        runtime_mode=runtime_mode,
+        blocking_threads=blocking_threads,
+        backlog=16384,
+        interface=interface,
+        http="1",
+        websockets=False
+    ).serve()

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM python:3.10-slim`
	`1`	`+FROM python:3.13-slim`
`2`	`2`
`3`	`3`	`ADD ./ /granian`
`4`	`4`