Merge pull request #605 from remittor-pr/fastpysgi-0.6

[python] FastPySGI: update version to v0.6 and enable JSON-TLS

Author: MDA2AV

frameworks/fastpysgi-asgi/Dockerfile

@@ -1,7 +1,11 @@
-FROM python:3.13-slim
+FROM python:3.11-slim
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends git build-essential \
+    && rm -rf /var/lib/apt/lists/*
+ENV PATH="/usr/local/bin:$PATH"
 WORKDIR /app
 COPY requirements.txt .
 RUN pip install --no-cache-dir -r requirements.txt
 COPY . .
-EXPOSE 8080
-CMD [ "python", "./app.py" ]
+EXPOSE 8080 8081
+CMD [ "python", "app.py" ]

frameworks/fastpysgi-asgi/app.py

@@ -127,7 +127,7 @@ def get_header(scope: dict, name: str, def_value: str):
 
 def check_accept_encoding(scope, substr):
     aenc = get_header(scope, 'Accept-Encoding', '')
-    if aenc and substr == "*":
+    if aenc and substr == "":
         return True
     if aenc and substr in aenc:
         return True
@@ -159,35 +159,11 @@ async def baseline11(scope, receive, send):
     req_method = scope.get('method', '')
     query_params = parse_qs(scope.get('query_string', b'').decode())
     total = 0
-    for v in query_params.values():
-        try:
-            total += int(v[0])
-        except ValueError:
-            pass
+    for val in query_params.values():
+        total += int(val[0])
     if req_method == "POST":
-        body = b''
-        while True:
-            message = await receive()
-            body += message.get('body', b'')
-            if not message.get('more_body', False):
-                break
-        if body:
-            try:
-                total += int(body.decode().strip())
-            except UnicodeDecodeError:
-                pass
-            except ValueError:
-                pass
-    return text_resp(str(total))
-
-async def baseline2(scope, receive, send):
-    query_params = parse_qs(scope.get('query_string', b'').decode())
-    total = 0
-    for v in query_params.values():
-        try:
-            total += int(v[0])
-        except ValueError:
-            pass
+        message = await receive()
+        total += int(message.get('body', b''))
     return text_resp(str(total))
 
 async def json_endpoint(scope, receive, send):
@@ -270,7 +246,6 @@ async def upload_endpoint(scope, receive, send):
 ROUTES = {
     '/pipeline': pipeline,
     '/baseline11': baseline11,
-    '/baseline2': baseline2,
     '/json/': json_endpoint,
     '/json-comp/': json_endpoint,
     '/upload': upload_endpoint,
@@ -320,10 +295,15 @@ async def app(scope, receive, send):
 if __name__ == "__main__":
     import fastpysgi
 
-    host = '0.0.0.0'
-    port = 8080
+    certfile = os.environ.get("TLS_CERT", "/certs/server.crt")
+    keyfile  = os.environ.get("TLS_KEY" , "/certs/server.key")
+
+    fastpysgi.server.delete_all_binds()
+    fastpysgi.server.add_bind('0.0.0.0', 8080)
+    fastpysgi.server.add_bind('0.0.0.0', 8081, (certfile, keyfile, None))
 
     fastpysgi.server.read_buffer_size = 256*1024
+    fastpysgi.server.max_content_length = 31_000_000
     fastpysgi.server.backlog = 16*1024
     fastpysgi.server.loop_timeout = 1
-    fastpysgi.run(app, host, port, workers = WRK_COUNT, loglevel = 0)
+    fastpysgi.run(app, workers = WRK_COUNT, loglevel = 0)

frameworks/fastpysgi-asgi/meta.json

@@ -8,10 +8,10 @@
   "enabled": true,
   "tests": [
     "baseline",
-    "pipelined",
     "limited-conn",
     "json",
     "json-comp",
+    "json-tls",
     "upload",
     "api-4",
     "api-16",

frameworks/fastpysgi-asgi/requirements.txt

@@ -1,3 +1,4 @@
-fastpysgi==0.5
-orjson==3.10.15
-asyncpg==0.30.0
+#fastpysgi==0.6  # v0.6 is bugged
+git+https://github.com/remittor/fastpysgi.git@21095fe037fabb0d324814ccacfff3f4b164128d#egg=fastpysgi
+orjson==3.11.8
+asyncpg==0.31.0

frameworks/fastpysgi-wsgi/Dockerfile

@@ -1,7 +1,11 @@
-FROM python:3.13-slim
+FROM python:3.13-slim-bookworm
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends git build-essential \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
 WORKDIR /app
 COPY requirements.txt .
 RUN pip install --no-cache-dir -r requirements.txt
 COPY . .
-EXPOSE 8080
-CMD [ "python", "./app.py" ]
+EXPOSE 8080 8081
+CMD [ "python", "app.py" ]

frameworks/fastpysgi-wsgi/app.py

@@ -112,7 +112,7 @@ def get_path_tail(env):
 
 def check_accept_encoding(env, substr):
     aenc = env.get('HTTP_ACCEPT_ENCODING', '')
-    if aenc and substr == "*":
+    if aenc and substr == "":
         return True
     if aenc and substr in aenc:
         return True
@@ -144,31 +144,10 @@ def baseline11(env):
     req_method = env.get('REQUEST_METHOD', '')
     query_params = parse_qs(env.get('QUERY_STRING', ''))
     total = 0
-    for v in query_params.values():
-        try:
-            total += int(v[0])
-        except ValueError:
-            pass
+    for val in query_params.values():
+        total += int(val[0])
     if req_method == "POST":
-        wsgi_input = env['wsgi.input']
-        body = wsgi_input.read(16000)
-        if body:
-            try:
-                total += int(body.decode().strip())
-            except UnicodeDecodeError:
-                pass
-            except ValueError:
-                pass
-    return text_resp(str(total))
-
-def baseline2(env):
-    query_params = parse_qs(env.get('QUERY_STRING', ''))
-    total = 0
-    for v in query_params.values():
-        try:
-            total += int(v[0])
-        except ValueError:
-            pass
+        total += int(env['wsgi.input'].read(100))
     return text_resp(str(total))
 
 def json_endpoint(env):
@@ -238,28 +217,14 @@ def static_file_endpoint(env):
     return make_resp(200, [ ('Content-Type', entry['type']) ], entry['data'], contenc = entry['enc'])
 
 
-READ_BUF_SIZE = 256*1024
-
 def upload_endpoint(env):
-    wsgi_input = env["wsgi.input"]
-    content_length = int(env.get("CONTENT_LENGTH", -1))
-    size = 0
-    if content_length != 0:
-        while True:
-            to_read = min(READ_BUF_SIZE, content_length - size) if content_length > 0 else READ_BUF_SIZE
-            chunk = wsgi_input.read(to_read)
-            if not chunk:
-                break
-            size += len(chunk)
-            if content_length > 0 and size >= content_length:
-                break
+    size = env["wsgi.input"].getbuffer().nbytes
     return text_resp(str(size))
 
 
 ROUTES = {
     '/pipeline': pipeline,
     '/baseline11': baseline11,
-    '/baseline2': baseline2,
     '/json/': json_endpoint,
     '/json-comp/': json_endpoint,
     '/upload': upload_endpoint,
@@ -301,9 +266,14 @@ def app(env, start_response):
 if __name__ == "__main__":
     import fastpysgi
 
-    host = '0.0.0.0'
-    port = 8080
+    certfile = os.environ.get("TLS_CERT", "/certs/server.crt")
+    keyfile  = os.environ.get("TLS_KEY" , "/certs/server.key")
+
+    fastpysgi.server.delete_all_binds()
+    fastpysgi.server.add_bind('0.0.0.0', 8080)
+    fastpysgi.server.add_bind('0.0.0.0', 8081, (certfile, keyfile, None))
 
-    fastpysgi.server.read_buffer_size = READ_BUF_SIZE
+    fastpysgi.server.read_buffer_size = 256*1024
+    fastpysgi.server.max_content_length = 31_000_000
     fastpysgi.server.backlog = 16*1024
-    fastpysgi.run(app, host, port, workers = WRK_COUNT, loglevel = 0)
+    fastpysgi.run(app, workers = WRK_COUNT, loglevel = 0)

frameworks/fastpysgi-wsgi/meta.json

@@ -12,6 +12,7 @@
     "limited-conn",
     "json",
     "json-comp",
+    "json-tls",
     "upload",
     "api-4",
     "api-16",

frameworks/fastpysgi-wsgi/requirements.txt

@@ -1,4 +1,5 @@
-fastpysgi==0.5
+#fastpysgi==0.6  # v0.6 is bugged
+git+https://github.com/remittor/fastpysgi.git@fd71875920d55c03b347ff5b19dc9d93b5983a83#egg=fastpysgi
 orjson==3.10.15
 psycopg[binary]==3.2.4
 psycopg_pool==3.2.6