jvserve 2.0.11__py3-none-any.whl → 2.0.13__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.11"
+__version__ = "2.0.13"
 __supported__jivas__versions__ = ["2.0.0"]

jvserve/cli.py

@@ -7,14 +7,13 @@ from contextlib import asynccontextmanager
 from typing import AsyncIterator, Optional
 
 from dotenv import load_dotenv
-from fastapi.responses import FileResponse, StreamingResponse
+from fastapi.responses import FileResponse, Response, 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
@@ -176,7 +175,7 @@ class JacCmd:
         def jvfileserve(
             directory: str, host: str = "0.0.0.0", port: int = 9000
         ) -> None:
-            """Launch the file server."""
+            """Launch the file server for local files."""
             # load FastAPI
             from fastapi import FastAPI
             from fastapi.middleware.cors import CORSMiddleware
@@ -194,33 +193,60 @@ class JacCmd:
                 allow_headers=["*"],
             )
 
-            if FILE_INTERFACE == "local":
-                if directory:
-                    os.environ["JIVAS_FILES_ROOT_PATH"] = directory
+            if not os.path.exists(directory):
+                os.makedirs(directory)
 
-                if not os.path.exists(directory):
-                    os.makedirs(directory)
+            # Set the environment variable for the file root path
+            os.environ["JIVAS_FILES_ROOT_PATH"] = directory
 
-                app.mount(
-                    "/files",
-                    StaticFiles(
-                        directory=os.environ.get("JIVAS_FILES_ROOT_PATH", ".files")
-                    ),
-                    name="files",
-                )
+            # Mount the static files directory
+            app.mount(
+                "/files",
+                StaticFiles(directory=directory),
+                name="files",
+            )
+
+            # run the app
+            _run(app, host=host, port=port)
+
+        @cmd_registry.register
+        def jvproxyserve(
+            directory: str, host: str = "0.0.0.0", port: int = 9000
+        ) -> None:
+            """Launch the file proxy server for remote files."""
+            # load FastAPI
+            from fastapi import FastAPI
+            from fastapi.middleware.cors import CORSMiddleware
+
+            # Setup custom routes
+            app = FastAPI()
 
+            # Add CORS middleware
+            app.add_middleware(
+                CORSMiddleware,
+                allow_origins=["*"],
+                allow_credentials=True,
+                allow_methods=["*"],
+                allow_headers=["*"],
+            )
+
+            # Add proxy routes only if using S3
             if FILE_INTERFACE == "s3":
 
                 @app.get("/files/{file_path:path}", response_model=None)
                 async def serve_file(
                     file_path: str,
-                ) -> Response:
+                ) -> FileResponse | StreamingResponse | Response:
+                    descriptor_path = os.environ["JIVAS_DESCRIPTOR_ROOT_PATH"]
+                    if descriptor_path and descriptor_path in file_path:
+                        return Response(status_code=403)
+
                     return serve_proxied_file(file_path)
 
             @app.get("/f/{file_id:path}", response_model=None)
             async def get_proxied_file(
                 file_id: str,
-            ) -> Response:
+            ) -> FileResponse | StreamingResponse | Response:
                 from bson import ObjectId
                 from fastapi import HTTPException
 
@@ -230,8 +256,12 @@ class JacCmd:
                 # mongo db collection
                 collection = NodeAnchor.Collection.get_collection("url_proxies")
                 file_details = collection.find_one({"_id": ObjectId(object_id)})
+                descriptor_path = os.environ["JIVAS_DESCRIPTOR_ROOT_PATH"]
 
                 if file_details:
+                    if descriptor_path and descriptor_path in file_details["path"]:
+                        return Response(status_code=403)
+
                     return serve_proxied_file(file_details["path"])
 
                 raise HTTPException(status_code=404, detail="File not found")

jvserve/lib/agent_interface.py

@@ -1,5 +1,6 @@
 """Agent Interface class and methods for interaction with Jivas."""
 
+import asyncio
 import json
 import logging
 import os
@@ -243,7 +244,7 @@ class AgentInterface:
         streaming: Optional[bool] = None
 
     @staticmethod
-    def interact(payload: InteractPayload) -> dict:
+    def interact(payload: InteractPayload, request: Request) -> dict:
         """Interact with the agent."""
         response = None
         ctx = AgentInterface.load_context()
@@ -291,7 +292,7 @@ class AgentInterface:
                     interaction_node = response.interaction_node
 
                     async def generate(
-                        generator: Iterator,
+                        generator: Iterator, request: Request
                     ) -> AsyncGenerator[str, None]:
                         """
                         Asynchronously yield data chunks from a response generator in Server-Sent Events (SSE) format.
@@ -304,11 +305,11 @@ class AgentInterface:
                         """
                         full_text = ""
                         total_tokens = 0
+
                         try:
                             for chunk in generator:
                                 full_text += chunk.content
                                 total_tokens += 1  # each chunk is a token, let's tally
-                                await sleep(0.025)
                                 yield (
                                     "data: "
                                     + json.dumps(
@@ -324,6 +325,7 @@ class AgentInterface:
                                     )
                                     + "\n\n"
                                 )
+                                await sleep(0.025)
                             # Update the interaction node with the fully generated text
                             actx = await AgentInterface.load_context_async()
                             try:
@@ -336,7 +338,7 @@ class AgentInterface:
                                         attributes={
                                             "interaction_data": interaction_node.export(),
                                         },
-                                        module_name="jivas.agent.action.update_interaction",
+                                        module_name="jivas.agent.memory.update_interaction",
                                     ),
                                 )
                             finally:
@@ -347,9 +349,30 @@ class AgentInterface:
                             AgentInterface.LOGGER.error(
                                 f"Exception in streaming generator: {e}, {traceback.format_exc()}"
                             )
+                        except asyncio.CancelledError:
+                            AgentInterface.LOGGER.error(
+                                "Client disconnected. Aborting stream."
+                            )
+                            actx = await AgentInterface.load_context_async()
+                            try:
+                                interaction_node.set_text_message(message=full_text)
+                                interaction_node.add_tokens(total_tokens)
+                                _Jac.spawn_call(
+                                    NodeAnchor.ref(interaction_node.id).architype,
+                                    AgentInterface.spawn_walker(
+                                        walker_name="update_interaction",
+                                        attributes={
+                                            "interaction_data": interaction_node.export(),
+                                        },
+                                        module_name="jivas.agent.memory.update_interaction",
+                                    ),
+                                )
+                            finally:
+                                if actx:
+                                    actx.close()
 
                     return StreamingResponse(
-                        generate(response.generator),
+                        generate(response.generator, request),
                         media_type="text/event-stream",
                     )
 

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

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

jvserve-2.0.13.dist-info/RECORD

@@ -0,0 +1,13 @@
+jvserve/__init__.py,sha256=AHR-iejuKB2C8u25HZ1ccXlh6tCaB3MuKVTJz-LZzig,191
+jvserve/cli.py,sha256=NJD4ehtKnhOvsz-vrFh9lz3P4bnxqz-uqTr8QItljZc,8897
+jvserve/lib/__init__.py,sha256=cnzfSHLoTWG9Ygut2nOpDys5aPlQz-m0BSkB-nd7OMs,31
+jvserve/lib/agent_interface.py,sha256=4SHqvySxu08dK2cPoe2TjMKlm11VqM0qDalOKp-tma4,32347
+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.13.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+jvserve-2.0.13.dist-info/METADATA,sha256=8gyJ1EnRbjZDZnOU3F-Y4lq9loXHIGLNCXn3YpPiUzg,4791
+jvserve-2.0.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jvserve-2.0.13.dist-info/entry_points.txt,sha256=HYyg1QXoLs0JRb004L300VeLOZyDLY27ynD1tnTnEN4,35
+jvserve-2.0.13.dist-info/top_level.txt,sha256=afoCXZv-zXNBuhVIvfJGjafXKEiJl_ooy4BtgQwAG4Q,8
+jvserve-2.0.13.dist-info/RECORD,,

{jvserve-2.0.11.dist-info → jvserve-2.0.13.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.7.1)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

jvserve-2.0.11.dist-info/RECORD

@@ -1,13 +0,0 @@
-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,,