jvserve 2.0.3__tar.gz → 2.0.4__tar.gz

{jvserve-2.0.3 → jvserve-2.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: jvserve
-Version: 2.0.3
+Version: 2.0.4
 Summary: FastAPI webserver for loading and interaction with JIVAS agents.
 Home-page: https://github.com/TrueSelph/jvserve
 Author: TrueSelph Inc.
@@ -14,6 +14,7 @@ Requires-Dist: pyaml>=25.1.0
 Requires-Dist: requests>=2.32.3
 Requires-Dist: aiohttp>=3.10.10
 Requires-Dist: schedule>=1.2.2
+Requires-Dist: boto3>=1.37.10
 Provides-Extra: dev
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
@@ -26,6 +27,7 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: keywords
+Dynamic: license-file
 Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: requires-python

{jvserve-2.0.3 → jvserve-2.0.4}/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.3"
+__version__ = "2.0.4"
 __supported__jivas__versions__ = ["2.0.0"]

{jvserve-2.0.3 → jvserve-2.0.4}/jvserve/cli.py

@@ -116,6 +116,7 @@ class JacCmd:
             """Launch the file server."""
             # load FastAPI
             from fastapi import FastAPI
+            from fastapi.middleware.cors import CORSMiddleware
             from fastapi.staticfiles import StaticFiles
 
             if directory:
@@ -126,6 +127,24 @@ class JacCmd:
 
             # Setup custom routes
             app = FastAPI()
+
+            # Add CORS middleware
+            app.add_middleware(
+                CORSMiddleware,
+                allow_origins=["*"],
+                allow_credentials=True,
+                allow_methods=["*"],
+                allow_headers=["*"],
+            )
+
+            app.mount(
+                "/files",
+                StaticFiles(
+                    directory=os.environ.get("JIVAS_FILES_ROOT_PATH", ".files")
+                ),
+                name="files",
+            )
+
             app.mount(
                 "/files",
                 StaticFiles(

jvserve-2.0.4/jvserve/lib/file_interface.py

@@ -0,0 +1,170 @@
+"""
+File interface module with base class for making file handling configurable
+for different storage backends.
+"""
+
+import logging
+import os
+from abc import ABC, abstractmethod
+
+# Interface type determined by environment variable, defaults to local
+FILE_INTERFACE = os.environ.get("JIVAS_FILE_INTERFACE", "local")
+
+
+class FileInterface(ABC):
+    """Abstract base class defining the interface for file storage operations."""
+
+    __root_dir: str = ""
+    LOGGER: logging.Logger = logging.getLogger(__name__)
+
+    @abstractmethod
+    def get_file(self, filename: str) -> bytes | None:
+        """Retrieve a file from storage and return its contents as bytes."""
+        pass
+
+    @abstractmethod
+    def save_file(self, filename: str, content: bytes) -> bool:
+        """Save content to a file in storage."""
+        pass
+
+    @abstractmethod
+    def delete_file(self, filename: str) -> bool:
+        """Delete a file from storage."""
+        pass
+
+    @abstractmethod
+    def get_file_url(self, filename: str) -> str | None:
+        """Get a URL to access the file."""
+        pass
+
+
+class LocalFileInterface(FileInterface):
+    """Implementation of FileInterface for local filesystem storage."""
+
+    def __init__(self, files_root: str = "") -> None:
+        """Initialize local file interface with root directory."""
+        self.__root_dir = files_root
+
+    def get_file(self, filename: str) -> bytes | None:
+        """Read and return contents of local file."""
+        file_path = os.path.join(self.__root_dir, filename)
+        if os.path.exists(file_path):
+            with open(file_path, "rb") as f:
+                return f.read()
+        return None
+
+    def save_file(self, filename: str, content: bytes) -> bool:
+        """Write content to a local file."""
+        file_path = os.path.join(self.__root_dir, filename)
+        os.makedirs(os.path.dirname(file_path), exist_ok=True)
+        with open(file_path, "wb") as f:
+            f.write(content)
+        return True
+
+    def delete_file(self, filename: str) -> bool:
+        """Delete local file."""
+        file_path = os.path.join(self.__root_dir, filename)
+        if os.path.exists(file_path):
+            os.remove(file_path)
+            return True
+        return False
+
+    def get_file_url(self, filename: str) -> str | None:
+        """Get URL for accessing local file via HTTP."""
+        file_path = os.path.join(self.__root_dir, filename)
+        if os.path.exists(file_path):
+            return f"{os.environ.get('JIVAS_FILES_URL', 'http://localhost:9000/files')}/{filename}"
+        return None
+
+
+class S3FileInterface(FileInterface):
+    """Implementation of FileInterface for AWS S3 storage."""
+
+    def __init__(
+        self,
+        bucket_name: str,
+        aws_access_key_id: str,
+        aws_secret_access_key: str,
+        region_name: str,
+        endpoint_url: str | None = None,
+        files_root: str = ".files",
+    ) -> None:
+        """Initialize S3 file interface."""
+        import boto3
+        from botocore.config import Config
+
+        self.s3_client = boto3.client(
+            "s3",
+            aws_access_key_id=aws_access_key_id,
+            aws_secret_access_key=aws_secret_access_key,
+            region_name=region_name,
+            endpoint_url=endpoint_url,
+            config=Config(signature_version="v4"),
+        )
+        self.bucket_name = bucket_name
+        self.__root_dir = files_root
+
+        # Check for missing AWS credentials
+        if not aws_access_key_id or not aws_secret_access_key or not region_name:
+            FileInterface.LOGGER.warn(
+                "Missing AWS credentials - S3 operations may fail"
+            )
+
+    def get_file(self, filename: str) -> bytes | None:
+        """Get file contents from S3."""
+        try:
+            file_key = os.path.join(self.__root_dir, filename)
+            response = self.s3_client.get_object(Bucket=self.bucket_name, Key=file_key)
+            return response["Body"].read()
+        except Exception:
+            return None
+
+    def save_file(self, filename: str, content: bytes) -> bool:
+        """Save file to S3 bucket."""
+        try:
+            file_key = os.path.join(self.__root_dir, filename)
+            self.s3_client.put_object(
+                Bucket=self.bucket_name, Key=file_key, Body=content
+            )
+            return True
+        except Exception:
+            return False
+
+    def delete_file(self, filename: str) -> bool:
+        """Delete file from S3 bucket."""
+        try:
+            file_key = os.path.join(self.__root_dir, filename)
+            self.s3_client.delete_object(Bucket=self.bucket_name, Key=file_key)
+            return True
+        except Exception:
+            return False
+
+    def get_file_url(self, filename: str) -> str | None:
+        """Get pre-signed URL for S3 file access."""
+        try:
+            file_key = os.path.join(self.__root_dir, filename)
+            url = self.s3_client.generate_presigned_url(
+                "get_object",
+                Params={"Bucket": self.bucket_name, "Key": file_key},
+                ExpiresIn=3600,
+            )
+            return url
+        except Exception:
+            return None
+
+
+file_interface: FileInterface
+
+if FILE_INTERFACE == "s3":
+    file_interface = S3FileInterface(
+        bucket_name=os.environ.get("JIVAS_S3_BUCKET_NAME", ""),
+        region_name=os.environ.get("JIVAS_S3_REGION_NAME", "us-east-1"),
+        aws_access_key_id=os.environ.get("JIVAS_S3_ACCESS_KEY_ID", ""),
+        aws_secret_access_key=os.environ.get("JIVAS_S3_SECRET_ACCESS_KEY", ""),
+        endpoint_url=os.environ.get("JIVAS_S3_ENDPOINT_URL"),
+        files_root=os.environ.get("JIVAS_FILES_ROOT_PATH", ".files"),
+    )
+else:
+    file_interface = LocalFileInterface(
+        files_root=os.environ.get("JIVAS_FILES_ROOT_PATH", ".files")
+    )

{jvserve-2.0.3 → jvserve-2.0.4}/jvserve.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: jvserve
-Version: 2.0.3
+Version: 2.0.4
 Summary: FastAPI webserver for loading and interaction with JIVAS agents.
 Home-page: https://github.com/TrueSelph/jvserve
 Author: TrueSelph Inc.
@@ -14,6 +14,7 @@ Requires-Dist: pyaml>=25.1.0
 Requires-Dist: requests>=2.32.3
 Requires-Dist: aiohttp>=3.10.10
 Requires-Dist: schedule>=1.2.2
+Requires-Dist: boto3>=1.37.10
 Provides-Extra: dev
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
@@ -26,6 +27,7 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: keywords
+Dynamic: license-file
 Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: requires-python

{jvserve-2.0.3 → jvserve-2.0.4}/jvserve.egg-info/SOURCES.txt

@@ -12,6 +12,8 @@ jvserve.egg-info/top_level.txt
 jvserve/lib/__init__.py
 jvserve/lib/agent_interface.py
 jvserve/lib/agent_pulse.py
+jvserve/lib/file_interface.py
 jvserve/lib/jvlogger.py
+tests/test_file_interface.py
 tests/test_jvlogger.py
 tests/test_jvserve.py

{jvserve-2.0.3 → jvserve-2.0.4}/jvserve.egg-info/requires.txt

@@ -3,6 +3,7 @@ pyaml>=25.1.0
 requests>=2.32.3
 aiohttp>=3.10.10
 schedule>=1.2.2
+boto3>=1.37.10
 
 [dev]
 pre-commit

{jvserve-2.0.3 → jvserve-2.0.4}/setup.py

@@ -44,6 +44,7 @@ setup(
         "requests>=2.32.3",
         "aiohttp>=3.10.10",
         "schedule>=1.2.2",
+        "boto3>=1.37.10",
     ],
     extras_require={
         "dev": [

jvserve-2.0.4/tests/test_file_interface.py

@@ -0,0 +1,117 @@
+"""Tests for FileInterface classes"""
+
+import os
+import unittest
+from unittest.mock import MagicMock, patch
+
+from jvserve.lib.file_interface import (
+    FileInterface,
+    LocalFileInterface,
+    S3FileInterface,
+)
+
+
+class TestFileInterface(unittest.TestCase):
+    """Test cases for FileInterface implementations"""
+
+    def setUp(self) -> None:
+        """Set up test environment"""
+        self.test_filename = "test_file.txt"
+        self.test_content = b"test content"
+        self.test_root = ".test_files"
+
+    def tearDown(self) -> None:
+        """Clean up test environment"""
+        if os.path.exists(self.test_root):
+            for file in os.listdir(self.test_root):
+                os.remove(os.path.join(self.test_root, file))
+            os.rmdir(self.test_root)
+
+    def test_local_file_interface(self) -> None:
+        """Test LocalFileInterface implementation"""
+        interface = LocalFileInterface(self.test_root)
+
+        # Test save_file
+        self.assertTrue(interface.save_file(self.test_filename, self.test_content))
+
+        # Test get_file
+        self.assertEqual(interface.get_file(self.test_filename), self.test_content)
+        self.assertIsNone(interface.get_file("nonexistent.txt"))
+
+        # Test get_file_url
+        expected_url = f"http://localhost:9000/files/{self.test_filename}"
+        self.assertEqual(interface.get_file_url(self.test_filename), expected_url)
+        self.assertIsNone(interface.get_file_url("nonexistent.txt"))
+
+        # Test delete_file
+        self.assertTrue(interface.delete_file(self.test_filename))
+        self.assertFalse(interface.delete_file("nonexistent.txt"))
+
+    @patch("boto3.client")
+    def test_s3_file_interface(self, mock_boto3_client: MagicMock) -> None:
+        """Test S3FileInterface implementation"""
+        mock_s3 = MagicMock()
+        mock_boto3_client.return_value = mock_s3
+
+        interface = S3FileInterface(
+            bucket_name="test-bucket",
+            aws_access_key_id="test-key",
+            aws_secret_access_key="test-secret",  # pragma: allowlist secret
+            region_name="test-region",
+        )
+
+        # Test get_file
+        mock_s3.get_object.return_value = {
+            "Body": MagicMock(read=lambda: self.test_content)
+        }
+        self.assertEqual(interface.get_file(self.test_filename), self.test_content)
+
+        mock_s3.get_object.side_effect = Exception()
+        self.assertIsNone(interface.get_file(self.test_filename))
+
+        # Test save_file
+        mock_s3.put_object.return_value = True
+        self.assertTrue(interface.save_file(self.test_filename, self.test_content))
+
+        mock_s3.put_object.side_effect = Exception()
+        self.assertFalse(interface.save_file(self.test_filename, self.test_content))
+
+        # Test delete_file
+        mock_s3.delete_object.return_value = True
+        self.assertTrue(interface.delete_file(self.test_filename))
+
+        mock_s3.delete_object.side_effect = Exception()
+        self.assertFalse(interface.delete_file(self.test_filename))
+
+        # Test get_file_url
+        mock_s3.generate_presigned_url.return_value = "https://test-url.com"
+        self.assertEqual(
+            interface.get_file_url(self.test_filename), "https://test-url.com"
+        )
+
+        mock_s3.generate_presigned_url.side_effect = Exception()
+        self.assertIsNone(interface.get_file_url(self.test_filename))
+
+    @patch("boto3.client")
+    def test_s3_file_interface_missing_credentials(
+        self, mock_boto3_client: MagicMock
+    ) -> None:
+        """Test S3FileInterface with missing credentials"""
+        # Mock logger before creating interface
+        mock_logger = MagicMock()
+        FileInterface.LOGGER = mock_logger
+
+        S3FileInterface(
+            bucket_name="test-bucket",
+            aws_access_key_id="",
+            aws_secret_access_key="",
+            region_name="",
+        )
+
+        mock_logger.warn.assert_called_once_with(
+            "Missing AWS credentials - S3 operations may fail"
+        )
+
+
+if __name__ == "__main__":
+    unittest.main()