jvserve 2.0.11__tar.gz → 2.0.12__tar.gz

{jvserve-2.0.11 → jvserve-2.0.12}/PKG-INFO

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

{jvserve-2.0.11 → jvserve-2.0.12}/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.12"
 __supported__jivas__versions__ = ["2.0.0"]

{jvserve-2.0.11 → jvserve-2.0.12}/jvserve/cli.py

@@ -176,7 +176,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,21 +194,45 @@ 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 bson import ObjectId
+            from fastapi import FastAPI, HTTPException
+            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)
@@ -221,9 +245,6 @@ class JacCmd:
             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]
 

{jvserve-2.0.11 → jvserve-2.0.12}/jvserve.egg-info/PKG-INFO

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

{jvserve-2.0.11 → jvserve-2.0.12}/tests/test_jvserve.py

@@ -118,6 +118,26 @@ class JVServeCliTest(unittest.TestCase):
             os.remove(f"{directory}/test.txt")
             os.rmdir(directory)
 
+    def test_jvproxyserve_runs(self) -> None:
+        """Ensure `jac jvproxyserve` runs successfully."""
+        try:
+            directory = "test_files"
+            server_process = subprocess.Popen(
+                ["jac", "jvproxyserve", directory, "--port", "9100"],
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+                text=True,
+            )
+
+            # Wait for the proxy server to be ready
+            self.wait_for_server("http://127.0.0.1:9100/docs")
+
+            res = httpx.get("http://127.0.0.1:9100/docs")
+            self.assertEqual(res.status_code, 200)
+
+        finally:
+            server_process.kill()
+
     def tearDown(self) -> None:
         """Cleanup after each test."""
         self.stop_server()