jvserve 2.0.10__py3-none-any.whl → 2.0.11__py3-none-any.whl

jvserve/__init__.py

@@ -4,5 +4,5 @@ jvserve package initialization.
 This package provides the webserver for loading and interacting with JIVAS agents.
 """
 
-__version__ = "2.0.10"
+__version__ = "2.0.11"
 __supported__jivas__versions__ = ["2.0.0"]

jvserve/cli.py

@@ -7,20 +7,80 @@ from contextlib import asynccontextmanager
 from typing import AsyncIterator, Optional
 
 from dotenv import load_dotenv
+from fastapi.responses import FileResponse, StreamingResponse
 from jac_cloud.jaseci.security import authenticator
+from jac_cloud.plugin.jaseci import NodeAnchor
 from jaclang.cli.cmdreg import cmd_registry
 from jaclang.plugin.default import hookimpl
 from jaclang.runtimelib.context import ExecutionContext
 from jaclang.runtimelib.machine import JacMachine
+from requests import Response
 from uvicorn import run as _run
 
 from jvserve.lib.agent_interface import AgentInterface
 from jvserve.lib.agent_pulse import AgentPulse
+from jvserve.lib.file_interface import (
+    DEFAULT_FILES_ROOT,
+    FILE_INTERFACE,
+    file_interface,
+)
 from jvserve.lib.jvlogger import JVLogger
 
 load_dotenv(".env")
 
 
+def serve_proxied_file(file_path: str) -> FileResponse | StreamingResponse:
+    """Serve a proxied file from a remote or local URL."""
+    import mimetypes
+
+    import requests
+    from fastapi import HTTPException
+
+    if FILE_INTERFACE == "local":
+        return FileResponse(path=os.path.join(DEFAULT_FILES_ROOT, file_path))
+
+    file_url = file_interface.get_file_url(file_path)
+
+    if file_url and ("localhost" in file_url or "127.0.0.1" in file_url):
+        # prevent recusive 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")
+
+    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:
+        file_response = 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)
+
+    file_response = requests.get(file_url, stream=True)
+    file_response.raise_for_status()
+
+    return StreamingResponse(
+        file_response.iter_content(chunk_size=1024),
+        media_type="application/octet-stream",
+    )
+
+
 class JacCmd:
     """Jac CLI."""
 
@@ -122,12 +182,6 @@ class JacCmd:
             from fastapi.middleware.cors import CORSMiddleware
             from fastapi.staticfiles import StaticFiles
 
-            if directory:
-                os.environ["JIVAS_FILES_ROOT_PATH"] = directory
-
-            if not os.path.exists(directory):
-                os.makedirs(directory)
-
             # Setup custom routes
             app = FastAPI()
 
@@ -140,21 +194,47 @@ class JacCmd:
                 allow_headers=["*"],
             )
 
-            app.mount(
-                "/files",
-                StaticFiles(
-                    directory=os.environ.get("JIVAS_FILES_ROOT_PATH", ".files")
-                ),
-                name="files",
-            )
+            if FILE_INTERFACE == "local":
+                if directory:
+                    os.environ["JIVAS_FILES_ROOT_PATH"] = directory
 
-            app.mount(
-                "/files",
-                StaticFiles(
-                    directory=os.environ.get("JIVAS_FILES_ROOT_PATH", ".files")
-                ),
-                name="files",
-            )
+                if not os.path.exists(directory):
+                    os.makedirs(directory)
+
+                app.mount(
+                    "/files",
+                    StaticFiles(
+                        directory=os.environ.get("JIVAS_FILES_ROOT_PATH", ".files")
+                    ),
+                    name="files",
+                )
+
+            if FILE_INTERFACE == "s3":
+
+                @app.get("/files/{file_path:path}", response_model=None)
+                async def serve_file(
+                    file_path: str,
+                ) -> Response:
+                    return serve_proxied_file(file_path)
+
+            @app.get("/f/{file_id:path}", response_model=None)
+            async def get_proxied_file(
+                file_id: str,
+            ) -> Response:
+                from bson import ObjectId
+                from fastapi import HTTPException
+
+                params = file_id.split("/")
+                object_id = params[0]
+
+                # mongo db collection
+                collection = NodeAnchor.Collection.get_collection("url_proxies")
+                file_details = collection.find_one({"_id": ObjectId(object_id)})
+
+                if file_details:
+                    return serve_proxied_file(file_details["path"])
+
+                raise HTTPException(status_code=404, detail="File not found")
 
             # run the app
             _run(app, host=host, port=port)

jvserve/lib/file_interface.py

@@ -7,6 +7,10 @@ import logging
 import os
 from abc import ABC, abstractmethod
 
+from dotenv import load_dotenv
+
+load_dotenv(".env")
+
 # Interface type determined by environment variable, defaults to local
 FILE_INTERFACE = os.environ.get("JIVAS_FILE_INTERFACE", "local")
 DEFAULT_FILES_ROOT = os.environ.get("JIVAS_FILES_ROOT_PATH", ".files")

{jvserve-2.0.10.dist-info → jvserve-2.0.11.dist-info}/METADATA

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

jvserve-2.0.11.dist-info/RECORD

@@ -0,0 +1,13 @@
+jvserve/__init__.py,sha256=sJ_mBKN30rjktWYox9bigWcSsNjhSIbEq-EWFvhYAAc,191
+jvserve/cli.py,sha256=ptbu2_u6fZHXyIPPYRt5xKJL_l0OVhq8hETGkAGuvqk,7699
+jvserve/lib/__init__.py,sha256=cnzfSHLoTWG9Ygut2nOpDys5aPlQz-m0BSkB-nd7OMs,31
+jvserve/lib/agent_interface.py,sha256=vGJQ9A_9kWfa6YoW7BiidZO6Huf-0XSlunMLMNGqgws,31053
+jvserve/lib/agent_pulse.py,sha256=6hBF6KQYr6Z9Mi_yoWKGfdnW7gg84kK20Slu-bLR_m8,2067
+jvserve/lib/file_interface.py,sha256=sqwTmBnZsVFQUGt7mE1EWA-jHnZlRtBAFeb4Rb_QgQ8,6079
+jvserve/lib/jvlogger.py,sha256=RNiB9PHuBzTvNIQWhxoDgrDlNYA0PYm1SVpvzlqu8mE,4180
+jvserve-2.0.11.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+jvserve-2.0.11.dist-info/METADATA,sha256=avBB2xIYh266s2UxgR9MF3hVK4dUzWBxgYPJr0Fn2qc,4791
+jvserve-2.0.11.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+jvserve-2.0.11.dist-info/entry_points.txt,sha256=HYyg1QXoLs0JRb004L300VeLOZyDLY27ynD1tnTnEN4,35
+jvserve-2.0.11.dist-info/top_level.txt,sha256=afoCXZv-zXNBuhVIvfJGjafXKEiJl_ooy4BtgQwAG4Q,8
+jvserve-2.0.11.dist-info/RECORD,,

jvserve-2.0.10.dist-info/RECORD

@@ -1,13 +0,0 @@
-jvserve/__init__.py,sha256=G5RMqYLR93brkiHRY7SgXqOtzchdd-v6TicDAX7ec6I,191
-jvserve/cli.py,sha256=ltg-n-ZFsvitAGIhxY8xgwPI2CETLanZ_0bqrvsqqg8,4994
-jvserve/lib/__init__.py,sha256=cnzfSHLoTWG9Ygut2nOpDys5aPlQz-m0BSkB-nd7OMs,31
-jvserve/lib/agent_interface.py,sha256=vGJQ9A_9kWfa6YoW7BiidZO6Huf-0XSlunMLMNGqgws,31053
-jvserve/lib/agent_pulse.py,sha256=6hBF6KQYr6Z9Mi_yoWKGfdnW7gg84kK20Slu-bLR_m8,2067
-jvserve/lib/file_interface.py,sha256=ccnMw5k1NtfK5ylNcvlCJE-Ene3tZigh6Q1gHRy7Sow,6026
-jvserve/lib/jvlogger.py,sha256=RNiB9PHuBzTvNIQWhxoDgrDlNYA0PYm1SVpvzlqu8mE,4180
-jvserve-2.0.10.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-jvserve-2.0.10.dist-info/METADATA,sha256=7Ptq6E2I9CPquslz_lrKi7rFAzqRIY2Qso6zmhbE1PM,4791
-jvserve-2.0.10.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-jvserve-2.0.10.dist-info/entry_points.txt,sha256=HYyg1QXoLs0JRb004L300VeLOZyDLY27ynD1tnTnEN4,35
-jvserve-2.0.10.dist-info/top_level.txt,sha256=afoCXZv-zXNBuhVIvfJGjafXKEiJl_ooy4BtgQwAG4Q,8
-jvserve-2.0.10.dist-info/RECORD,,