asp-chef-cli 0.5.1__tar.gz → 0.5.3__tar.gz

{asp_chef_cli-0.5.1 → asp_chef_cli-0.5.3}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.3
 Name: asp-chef-cli
-Version: 0.5.1
+Version: 0.5.3
 Summary: A simple CLI to run ASP Chef recipes
 Author: Mario Alviano
 Author-email: mario.alviano@gmail.com
 Requires-Python: >=3.13,<4.0
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: dumbo-asp (>=0.4.0,<0.5.0)
+Requires-Dist: dumbo-asp (>=0.4.2,<0.5.0)
 Requires-Dist: fastapi (>=0.129.0,<0.130.0)
 Requires-Dist: httpx (>=0.28.1,<0.29.0)
 Requires-Dist: opa-python (>=0.0.9,<0.0.10)

{asp_chef_cli-0.5.1 → asp_chef_cli-0.5.3}/asp_chef_cli/server/routers/dumbo.py

@@ -1,15 +1,17 @@
-import httpx
 import json as json_module
 import os
 import shutil
 import subprocess
 from collections import defaultdict
+from typing import Optional, Dict, Final
+
+import httpx
 from dumbo_asp.primitives.models import Model
 from dumbo_asp.primitives.rules import SymbolicRule
 from dumbo_asp.primitives.templates import Template
 from dumbo_asp.queries import explanation_graph, pack_xasp_navigator_url
-from fastapi import APIRouter, Request, Response
-from typing import Optional, Dict, Final
+from fastapi import APIRouter, Response
+from fastapi.responses import StreamingResponse
 
 from ..dependencies import *
 
@@ -274,33 +276,31 @@ OLLAMA_URL = os.getenv("ASP_CHEF_CLI__OLLAMA_URL", "http://127.0.0.1:11434")
 
 @router.api_route("/ollama/{path:path}", methods=["GET", "POST", "PUT", "DELETE", "OPTIONS"])
 async def ollama_proxy(path: str, request: Request):
-
-    async with httpx.AsyncClient() as client:
-        # 1. Prepare the forwarded request
-        url = f"{OLLAMA_URL}/{path}"
-
-        # 2. Get body and headers (excluding Host)
-        body = await request.body()
-        headers = dict(request.headers)
-        headers.pop("host", None)
-
-        # 3. Forward the request to Ollama
-        try:
-            rp_resp = await client.request(
-                method=request.method,
-                url=url,
-                params=request.query_params,
-                headers=headers,
-                content=body,
-                timeout=None  # Important for long LLM generations
-            )
-        except httpx.ConnectError:
-            return Response(content="Ollama not running", status_code=503)
-
-        # 4. Return the response with proper headers
-        # Your FastAPI CORS middleware will handle the "Access-Control" headers automatically
-        return Response(
-            content=rp_resp.content,
-            status_code=rp_resp.status_code,
-            headers=dict(rp_resp.headers)
-        )
+    url = f"{OLLAMA_URL}/{path.lstrip('/')}"
+    method = request.method
+    params = request.query_params
+
+    body = await request.body()
+    headers = dict(request.headers)
+    headers.pop("host", None)
+    headers.pop("content-length", None)  # Let httpx recalculate it
+
+    async def generate_stream():
+        async with httpx.AsyncClient(timeout=None) as client:
+            async with client.stream(
+                    method=method,
+                    url=url,
+                    params=params,
+                    headers=headers,
+                    content=body,
+            ) as rp_resp:
+                async for chunk in rp_resp.aiter_bytes():
+                    yield chunk
+
+    try:
+        return StreamingResponse(
+            generate_stream(),
+            media_type="application/octet-stream"
+        )
+    except httpx.ConnectError:
+        return Response(content="Ollama not running", status_code=503)

{asp_chef_cli-0.5.1 → asp_chef_cli-0.5.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "asp-chef-cli"
-version = "0.5.1"
+version = "0.5.3"
 description = "A simple CLI to run ASP Chef recipes"
 authors = ["Mario Alviano <mario.alviano@gmail.com>"]
 readme = "README.md"
@@ -8,7 +8,7 @@ readme = "README.md"
 [tool.poetry.dependencies]
 python = ">=3.13,<4.0"
 pytest-playwright = "^0.7.2"
-dumbo-asp = "^0.4.0"
+dumbo-asp = "^0.4.2"
 uvicorn = "^0.40.0"
 fastapi = "^0.129.0"
 opa-python = "^0.0.9"