codex-lb 0.5.0__py3-none-any.whl → 0.5.1__py3-none-any.whl

app/core/middleware/request_decompression.py

@@ -1,6 +1,8 @@
 from __future__ import annotations
 
+import gzip
 import io
+import zlib
 from collections.abc import Awaitable, Callable
 from typing import Protocol
 
@@ -37,6 +39,67 @@ def _read_limited(reader: _Readable, max_size: int) -> bytes:
     return bytes(buffer)
 
 
+def _decompress_gzip(data: bytes, max_size: int) -> bytes:
+    with gzip.GzipFile(fileobj=io.BytesIO(data)) as reader:
+        return _read_limited(reader, max_size)
+
+
+def _decompress_deflate(data: bytes, max_size: int) -> bytes:
+    decompressor = zlib.decompressobj()
+    buffer = bytearray()
+    chunk_size = 64 * 1024
+    for start in range(0, len(data), chunk_size):
+        chunk = data[start : start + chunk_size]
+        # Bound output growth to avoid oversized allocations.
+        while chunk:
+            remaining = max_size - len(buffer)
+            if remaining == 0:
+                raise _DecompressedBodyTooLarge(max_size)
+            buffer.extend(decompressor.decompress(chunk, max_length=remaining))
+            chunk = decompressor.unconsumed_tail
+    while True:
+        remaining = max_size - len(buffer)
+        if remaining == 0:
+            raise _DecompressedBodyTooLarge(max_size)
+        drained = decompressor.decompress(b"", max_length=remaining)
+        if not drained:
+            break
+        buffer.extend(drained)
+    if not decompressor.eof:
+        raise zlib.error("Incomplete deflate stream")
+    return bytes(buffer)
+
+
+def _decompress_zstd(data: bytes, max_size: int) -> bytes:
+    try:
+        decompressed = zstd.ZstdDecompressor().decompress(data, max_output_size=max_size)
+        if len(decompressed) > max_size:
+            raise _DecompressedBodyTooLarge(max_size)
+        return decompressed
+    except _DecompressedBodyTooLarge:
+        raise
+    except Exception:
+        with zstd.ZstdDecompressor().stream_reader(io.BytesIO(data)) as reader:
+            return _read_limited(reader, max_size)
+
+
+def _decompress_body(data: bytes, encodings: list[str], max_size: int) -> bytes:
+    supported = {"zstd", "gzip", "deflate", "identity"}
+    if any(encoding not in supported for encoding in encodings):
+        raise ValueError("Unsupported content-encoding")
+    result = data
+    for encoding in reversed(encodings):
+        if encoding == "zstd":
+            result = _decompress_zstd(result, max_size)
+        elif encoding == "gzip":
+            result = _decompress_gzip(result, max_size)
+        elif encoding == "deflate":
+            result = _decompress_deflate(result, max_size)
+        elif encoding == "identity":
+            continue
+    return result
+
+
 def _replace_request_body(request: Request, body: bytes) -> None:
     request._body = body
     headers: list[tuple[bytes, bytes]] = []
@@ -60,15 +123,13 @@ def add_request_decompression_middleware(app: FastAPI) -> None:
         if not content_encoding:
             return await call_next(request)
         encodings = [enc.strip().lower() for enc in content_encoding.split(",") if enc.strip()]
-        if encodings != ["zstd"]:
+        if not encodings:
             return await call_next(request)
         body = await request.body()
         settings = get_settings()
         max_size = settings.max_decompressed_body_bytes
         try:
-            decompressed = zstd.ZstdDecompressor().decompress(body, max_output_size=max_size)
-            if len(decompressed) > max_size:
-                raise _DecompressedBodyTooLarge(max_size)
+            decompressed = _decompress_body(body, encodings, max_size)
         except _DecompressedBodyTooLarge:
             return JSONResponse(
                 status_code=413,
@@ -77,25 +138,21 @@ def add_request_decompression_middleware(app: FastAPI) -> None:
                     "Request body exceeds the maximum allowed size",
                 ),
             )
+        except ValueError:
+            return JSONResponse(
+                status_code=400,
+                content=dashboard_error(
+                    "invalid_request",
+                    "Unsupported Content-Encoding",
+                ),
+            )
         except Exception:
-            try:
-                with zstd.ZstdDecompressor().stream_reader(io.BytesIO(body)) as reader:
-                    decompressed = _read_limited(reader, max_size)
-            except _DecompressedBodyTooLarge:
-                return JSONResponse(
-                    status_code=413,
-                    content=dashboard_error(
-                        "payload_too_large",
-                        "Request body exceeds the maximum allowed size",
-                    ),
-                )
-            except Exception:
-                return JSONResponse(
-                    status_code=400,
-                    content=dashboard_error(
-                        "invalid_request",
-                        "Request body is zstd-compressed but could not be decompressed",
-                    ),
-                )
+            return JSONResponse(
+                status_code=400,
+                content=dashboard_error(
+                    "invalid_request",
+                    "Request body is compressed but could not be decompressed",
+                ),
+            )
         _replace_request_body(request, decompressed)
         return await call_next(request)

{codex_lb-0.5.0.dist-info → codex_lb-0.5.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codex-lb
-Version: 0.5.0
+Version: 0.5.1
 Summary: Codex load balancer and proxy for ChatGPT accounts with usage dashboard
 Author-email: Soju06 <qlskssk@gmail.com>
 Maintainer-email: Soju06 <qlskssk@gmail.com>
@@ -161,6 +161,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Quack6765"><img src="https://avatars.githubusercontent.com/u/5446230?v=4?s=100" width="100px;" alt="Quack"/><br /><sub><b>Quack</b></sub></a><br /><a href="https://github.com/Soju06/codex-lb/commits?author=Quack6765" title="Code">💻</a> <a href="https://github.com/Soju06/codex-lb/issues?q=author%3AQuack6765" title="Bug reports">🐛</a> <a href="#maintenance-Quack6765" title="Maintenance">🚧</a> <a href="#design-Quack6765" title="Design">🎨</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/hhsw2015"><img src="https://avatars.githubusercontent.com/u/103614420?v=4?s=100" width="100px;" alt="Jill Kok, San Mou"/><br /><sub><b>Jill Kok, San Mou</b></sub></a><br /><a href="https://github.com/Soju06/codex-lb/commits?author=hhsw2015" title="Code">💻</a> <a href="https://github.com/Soju06/codex-lb/commits?author=hhsw2015" title="Tests">⚠️</a> <a href="#maintenance-hhsw2015" title="Maintenance">🚧</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/pcy06"><img src="https://avatars.githubusercontent.com/u/44970486?v=4?s=100" width="100px;" alt="PARK CHANYOUNG"/><br /><sub><b>PARK CHANYOUNG</b></sub></a><br /><a href="https://github.com/Soju06/codex-lb/commits?author=pcy06" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/choi138"><img src="https://avatars.githubusercontent.com/u/84369321?v=4?s=100" width="100px;" alt="Choi138"/><br /><sub><b>Choi138</b></sub></a><br /><a href="https://github.com/Soju06/codex-lb/commits?author=choi138" title="Code">💻</a> <a href="https://github.com/Soju06/codex-lb/issues?q=author%3Achoi138" title="Bug reports">🐛</a> <a href="https://github.com/Soju06/codex-lb/commits?author=choi138" title="Tests">⚠️</a></td>
     </tr>
   </tbody>
 </table>

{codex_lb-0.5.0.dist-info → codex_lb-0.5.1.dist-info}/RECORD

@@ -24,7 +24,7 @@ app/core/handlers/__init__.py,sha256=iyLUtPdBMYjK0mGpyRZ8hII8hiLF5jLR2jHiSI0C2zU
 app/core/handlers/exceptions.py,sha256=edNaaPSPweBUSIpBUjV3GWKVTQkARngQV4Oe32p32tI,1453
 app/core/middleware/__init__.py,sha256=3u3ibH0TTkvMjpN7tDu2phDBdTsssSFsyDJPAhq0Um0,372
 app/core/middleware/api_errors.py,sha256=W5FpmbWiQ2rGfNCOHUums_Es7Qz7ktzCNONdj27k2Ps,1046
-app/core/middleware/request_decompression.py,sha256=PwqibE0pwyZW6o2KrpNWcZhyVs07rYEQTY8xEwFoGYo,3667
+app/core/middleware/request_decompression.py,sha256=8qwpXVWlLGijhtLMBWfcq9sRrKwEHI3wxqah0BghNFY,5572
 app/core/middleware/request_id.py,sha256=f2CMCTy9HbHM_QfWs-EvqIAOHxLhuuC5Sd13ecUKrpc,924
 app/core/openai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 app/core/openai/chat_requests.py,sha256=M1Mfu4_WNb5f5PXg4-SMjMWGtI1gkhweIfa1ENANz3k,6787
@@ -101,8 +101,8 @@ app/modules/usage/updater.py,sha256=TUFLIjIe8c0m06bnO6iumzAyFuMED3B1ry3Ty5o8JRo,
 app/static/index.css,sha256=4EcLWTHAkhbqldi9fE1Y_bQCtmJuXUgEs0JHV-KmV9w,31757
 app/static/index.html,sha256=g1U2AlbvGChev5KIyPoVI5TJ3dnvEOqoAot1tENvQOs,39799
 app/static/index.js,sha256=q-IXWQURYksd-i68yXwyqBazs-AYiz3Tvk5t_B6NbSY,69750
-codex_lb-0.5.0.dist-info/METADATA,sha256=ym9TYcpUCgJ66jUQX9uorIxzYr-BFSHwOhXfAW6Vyzc,7338
-codex_lb-0.5.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-codex_lb-0.5.0.dist-info/entry_points.txt,sha256=SEa5T6Uz2Fhy574No6Y0XyGmYi3PXLrhu2xStJTqyI8,42
-codex_lb-0.5.0.dist-info/licenses/LICENSE,sha256=cHPibxiL0TXwrUX_kNY6ym544EX1UCzKhxdaca5cFuk,1062
-codex_lb-0.5.0.dist-info/RECORD,,
+codex_lb-0.5.1.dist-info/METADATA,sha256=XuzL3i-rYS2lIxLr9XJ_XzHN7mcQSyF2qFBBoofJSew,7857
+codex_lb-0.5.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+codex_lb-0.5.1.dist-info/entry_points.txt,sha256=SEa5T6Uz2Fhy574No6Y0XyGmYi3PXLrhu2xStJTqyI8,42
+codex_lb-0.5.1.dist-info/licenses/LICENSE,sha256=cHPibxiL0TXwrUX_kNY6ym544EX1UCzKhxdaca5cFuk,1062
+codex_lb-0.5.1.dist-info/RECORD,,