asp-chef-cli 0.5.0__tar.gz → 0.5.2__tar.gz

{asp_chef_cli-0.5.0 → asp_chef_cli-0.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: asp-chef-cli
-Version: 0.5.0
+Version: 0.5.2
 Summary: A simple CLI to run ASP Chef recipes
 Author: Mario Alviano
 Author-email: mario.alviano@gmail.com
@@ -9,6 +9,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: dumbo-asp (>=0.4.0,<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)
 Requires-Dist: pytest-playwright (>=0.7.2,<0.8.0)
 Requires-Dist: uvicorn (>=0.40.0,<0.41.0)

{asp_chef_cli-0.5.0 → asp_chef_cli-0.5.2}/asp_chef_cli/cli.py

@@ -1,5 +1,6 @@
 import dataclasses
 import fileinput
+import os
 from enum import Enum
 from typing import Optional
 
@@ -174,9 +175,12 @@ def command_server(
         port: int = typer.Option(8000, "--port", "-p",
                                  help="An available port to listen for incoming requests"),
         reload: bool = typer.Option(False, "--reload",
-                                    help="Reload server if source code changes (for development)")
+                                    help="Reload server if source code changes (for development)"),
+        ollama_port: int = typer.Option(11434, "--ollama-port",
+                                        help="Port where Ollama is listening (for Ollama integration)"),
 ) -> None:
     """
     Run a server for @dumbo/* operations.
     """
+    os.environ["ASP_CHEF_CLI__OLLAMA_URL"] = f"http://127.0.0.1:{ollama_port}"
     uvicorn.run("asp_chef_cli.server.main:app", host=host, port=port, reload=reload)

{asp_chef_cli-0.5.0 → asp_chef_cli-0.5.2}/asp_chef_cli/server/routers/dumbo.py

@@ -1,13 +1,17 @@
 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
-from typing import Optional, Dict, Final
+from fastapi import APIRouter, Response
+from fastapi.responses import StreamingResponse
 
 from ..dependencies import *
 
@@ -265,3 +269,38 @@ async def _(json):
         })
 
     return res
+
+
+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):
+    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.0 → asp_chef_cli-0.5.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "asp-chef-cli"
-version = "0.5.0"
+version = "0.5.2"
 description = "A simple CLI to run ASP Chef recipes"
 authors = ["Mario Alviano <mario.alviano@gmail.com>"]
 readme = "README.md"
@@ -12,6 +12,7 @@ dumbo-asp = "^0.4.0"
 uvicorn = "^0.40.0"
 fastapi = "^0.129.0"
 opa-python = "^0.0.9"
+httpx = "^0.28.1"
 
 
 [build-system]