jvserve 2.1.9__tar.gz → 2.1.11__tar.gz

{jvserve-2.1.9 → jvserve-2.1.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jvserve
-Version: 2.1.9
+Version: 2.1.11
 Summary: FastAPI webserver for loading and interaction with JIVAS agents.
 Home-page: https://github.com/TrueSelph/jvserve
 Author: TrueSelph Inc.

{jvserve-2.1.9 → jvserve-2.1.11}/jvserve/cli.py

@@ -2,6 +2,7 @@
 
 import asyncio
 import logging
+import mimetypes
 import os
 import sys
 import threading
@@ -14,6 +15,7 @@ from typing import AsyncIterator, Optional
 import aiohttp
 import psutil
 import pymongo
+import requests
 from bson import ObjectId
 from dotenv import load_dotenv
 from fastapi import FastAPI, HTTPException, Response
@@ -27,6 +29,7 @@ from jac_cloud.plugin.jaseci import NodeAnchor
 from jaclang import JacMachine as Jac
 from jaclang.cli.cmdreg import cmd_registry
 from jaclang.runtimelib.machine import hookimpl
+from typing_extensions import Any
 from watchfiles import Change, watch
 
 from jvserve.lib.agent_interface import AgentInterface
@@ -67,10 +70,9 @@ async def get_url_proxy_collection() -> pymongo.collection.Collection:
     return url_proxy_collection
 
 
-async def serve_proxied_file(
-    file_path: str,
-) -> FileResponse | StreamingResponse | Response:
-    """Serve a proxied file from a remote or local URL (async version)"""
+async def serve_proxied_file(file_path: str) -> FileResponse | StreamingResponse:
+    """Serve a proxied file from a remote or local URL (non-blocking)"""
+
     if FILE_INTERFACE == "local":
         root_path = os.environ.get("JIVAS_FILES_ROOT_PATH", DEFAULT_FILES_ROOT)
         full_path = os.path.join(root_path, file_path)
@@ -79,29 +81,57 @@ async def serve_proxied_file(
         return FileResponse(full_path)
 
     file_url = file_interface.get_file_url(file_path)
-
-    # Security check to prevent recursive calls
     if file_url and ("localhost" in file_url or "127.0.0.1" in file_url):
-        raise HTTPException(
-            status_code=500, detail="Environment misconfiguration detected"
-        )
+        # prevent recursive calls when env vars are not detected
+        raise HTTPException(status_code=500, detail="Environment not set up correctly")
 
     if not file_url:
         raise HTTPException(status_code=404, detail="File not found")
 
-    try:
-        async with aiohttp.ClientSession() as session:
-            async with session.get(file_url) as response:
-                response.raise_for_status()
-
-                return StreamingResponse(
-                    response.content.iter_chunked(8192),
-                    media_type=response.headers.get(
-                        "Content-Type", "application/octet-stream"
-                    ),
-                )
-    except aiohttp.ClientError as e:
-        raise HTTPException(status_code=502, detail=f"File fetch error: {str(e)}")
+    file_extension = os.path.splitext(file_path)[1].lower()
+
+    # List of extensions to serve directly
+    direct_serve_extensions = [
+        ".pdf",
+        ".html",
+        ".txt",
+        ".js",
+        ".css",
+        ".json",
+        ".xml",
+        ".svg",
+        ".csv",
+        ".ico",
+    ]
+
+    if file_extension in direct_serve_extensions:
+        # Run the blocking request in a thread pool
+        file_response = await asyncio.to_thread(requests.get, file_url)
+        file_response.raise_for_status()  # Raise HTTPError for bad responses (4XX or 5XX)
+
+        mime_type = mimetypes.guess_type(file_path)[0] or "application/octet-stream"
+        return StreamingResponse(iter([file_response.content]), media_type=mime_type)
+
+    # For streaming responses, we need to handle it differently
+    # Get the response headers first to check if request is valid
+    file_response = await asyncio.to_thread(requests.get, file_url, stream=True)
+    file_response.raise_for_status()
+
+    # Create an async generator that reads chunks in thread pool
+    async def generate_chunks() -> Any:
+        try:
+            # Read chunks in thread pool to avoid blocking
+            for chunk in file_response.iter_content(chunk_size=1024):
+                if chunk:  # filter out keep-alive chunks
+                    yield chunk
+        finally:
+            # Ensure the response is closed
+            file_response.close()
+
+    return StreamingResponse(
+        generate_chunks(),
+        media_type="application/octet-stream",
+    )
 
 
 def start_file_watcher(
@@ -122,7 +152,6 @@ def start_file_watcher(
                     # Kill the current server process and restart
                     reload_jivas()
                 else:
-                    jvlogger.info("Watcher disabled, ignoring changes")
                     time.sleep(1)  # Prevent busy loop when disabled
         except KeyboardInterrupt:
             jvlogger.info("File watcher stopped")

{jvserve-2.1.9 → jvserve-2.1.11}/jvserve.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jvserve
-Version: 2.1.9
+Version: 2.1.11
 Summary: FastAPI webserver for loading and interaction with JIVAS agents.
 Home-page: https://github.com/TrueSelph/jvserve
 Author: TrueSelph Inc.