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

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/lib/agent_interface.py

@@ -6,7 +6,7 @@ import os
 import string
 import time
 import traceback
-from typing import Any, Dict, Optional
+from typing import Any, Dict, List, Optional
 from urllib.parse import quote, unquote
 
 import aiohttp
@@ -163,7 +163,7 @@ class AgentInterface:
         module_root: str = Form(...),  # noqa: B008
         walker: str = Form(...),  # noqa: B008
         args: Optional[str] = Form(None),  # noqa: B008
-        attachments: Optional[list[UploadFile]] = None,
+        attachments: List[UploadFile] = Form(default_factory=list),  # noqa: B008
     ) -> JSONResponse:
         """Execute a named walker exposed by an action within context; capable of handling JSON or file data depending on request"""
 
@@ -564,11 +564,7 @@ class AgentInterface:
 
         # if user context still active, return it
         now = int(time.time())
-        if (
-            AgentInterface.EXPIRATION
-            and AgentInterface.EXPIRATION.isdigit()
-            and int(AgentInterface.EXPIRATION) > now
-        ):
+        if AgentInterface.EXPIRATION and AgentInterface.EXPIRATION > now:
             return {
                 "root_id": AgentInterface.ROOT_ID,
                 "token": AgentInterface.TOKEN,

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.2.dist-info → jvserve-2.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: jvserve
-Version: 2.0.2
+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.4.dist-info/RECORD

@@ -0,0 +1,13 @@
+jvserve/__init__.py,sha256=7UFcPqavIGuuk32gYeDVWCgMuafw020dneTSbvQ4JQI,190
+jvserve/cli.py,sha256=oeWCqA9MAqMYST506f8Nv22qs91OSy555V-NoP-pNOM,4942
+jvserve/lib/__init__.py,sha256=cnzfSHLoTWG9Ygut2nOpDys5aPlQz-m0BSkB-nd7OMs,31
+jvserve/lib/agent_interface.py,sha256=WFHAxCNbkRhqrOsycRnMtPNOQxHvKbQ4oOifz30WhxE,25801
+jvserve/lib/agent_pulse.py,sha256=6hBF6KQYr6Z9Mi_yoWKGfdnW7gg84kK20Slu-bLR_m8,2067
+jvserve/lib/file_interface.py,sha256=lnNOhV9GEmet3-uDQw2hBbvdpnB3-U7amFuR80nv04g,5819
+jvserve/lib/jvlogger.py,sha256=RNiB9PHuBzTvNIQWhxoDgrDlNYA0PYm1SVpvzlqu8mE,4180
+jvserve-2.0.4.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+jvserve-2.0.4.dist-info/METADATA,sha256=3ADQS-pw8H6v2WCuKWWAb1jz3r3FlAWiY1lWzVwi9Ks,4790
+jvserve-2.0.4.dist-info/WHEEL,sha256=tTnHoFhvKQHCh4jz3yCn0WPTYIy7wXx3CJtJ7SJGV7c,91
+jvserve-2.0.4.dist-info/entry_points.txt,sha256=HYyg1QXoLs0JRb004L300VeLOZyDLY27ynD1tnTnEN4,35
+jvserve-2.0.4.dist-info/top_level.txt,sha256=afoCXZv-zXNBuhVIvfJGjafXKEiJl_ooy4BtgQwAG4Q,8
+jvserve-2.0.4.dist-info/RECORD,,

{jvserve-2.0.2.dist-info → jvserve-2.0.4.dist-info}/WHEEL

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

jvserve-2.0.2.dist-info/RECORD

@@ -1,12 +0,0 @@
-jvserve/__init__.py,sha256=zlHBOIzb_NwAkzEGHhTKYSrlQdnlIxyyLFcAj5nEJ6Q,190
-jvserve/cli.py,sha256=KVWuGPlAt6Vzti-J8CbB4YsgTCc6gS3HaC2OElGqMD0,4392
-jvserve/lib/__init__.py,sha256=cnzfSHLoTWG9Ygut2nOpDys5aPlQz-m0BSkB-nd7OMs,31
-jvserve/lib/agent_interface.py,sha256=Ob8E2z8kJYIoJ5X1ijInC00yBmv6ri7zLJKQJ5oyp_8,25862
-jvserve/lib/agent_pulse.py,sha256=6hBF6KQYr6Z9Mi_yoWKGfdnW7gg84kK20Slu-bLR_m8,2067
-jvserve/lib/jvlogger.py,sha256=RNiB9PHuBzTvNIQWhxoDgrDlNYA0PYm1SVpvzlqu8mE,4180
-jvserve-2.0.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-jvserve-2.0.2.dist-info/METADATA,sha256=_8FBj6wu6ym2ByxcMVsNM8iHAFsGLW5Fo29xWlKtQpI,4738
-jvserve-2.0.2.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-jvserve-2.0.2.dist-info/entry_points.txt,sha256=HYyg1QXoLs0JRb004L300VeLOZyDLY27ynD1tnTnEN4,35
-jvserve-2.0.2.dist-info/top_level.txt,sha256=afoCXZv-zXNBuhVIvfJGjafXKEiJl_ooy4BtgQwAG4Q,8
-jvserve-2.0.2.dist-info/RECORD,,