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

jvserve/cli.py

@@ -6,6 +6,7 @@ import time
 from contextlib import asynccontextmanager
 from typing import AsyncIterator, Optional
 
+from dotenv import load_dotenv
 from jac_cloud.jaseci.security import authenticator
 from jaclang.cli.cmdreg import cmd_registry
 from jaclang.plugin.default import hookimpl
@@ -17,6 +18,8 @@ from jvserve.lib.agent_interface import AgentInterface
 from jvserve.lib.agent_pulse import AgentPulse
 from jvserve.lib.jvlogger import JVLogger
 
+load_dotenv(".env")
+
 
 class JacCmd:
     """Jac CLI."""

jvserve/lib/agent_interface.py

@@ -11,7 +11,7 @@ from urllib.parse import quote, unquote
 
 import aiohttp
 import requests
-from fastapi import Form, Request, UploadFile
+from fastapi import File, Form, Request, UploadFile
 from fastapi.responses import JSONResponse
 from jac_cloud.core.architype import AnchorState, Permission, Root
 from jac_cloud.core.context import (
@@ -158,12 +158,11 @@ class AgentInterface:
 
     @staticmethod
     async def action_walker_exec(
-        request: Request,
         agent_id: str = Form(...),  # noqa: B008
         module_root: str = Form(...),  # noqa: B008
         walker: str = Form(...),  # noqa: B008
         args: Optional[str] = Form(None),  # noqa: B008
-        attachments: List[UploadFile] = Form(default_factory=list),  # noqa: B008
+        attachments: List[UploadFile] = File(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"""
 
@@ -233,10 +232,13 @@ class AgentInterface:
         """Payload for interacting with the agent."""
 
         agent_id: str
-        utterance: str
-        session_id: str
-        tts: bool
-        verbose: bool
+        utterance: Optional[str] = None
+        channel: Optional[str] = None
+        session_id: Optional[str] = None
+        tts: Optional[bool] = None
+        verbose: Optional[bool] = None
+        data: Optional[dict] = None
+        streaming: Optional[bool] = None
 
     @staticmethod
     def interact(payload: InteractPayload) -> dict:
@@ -260,10 +262,13 @@ class AgentInterface:
                     walker_name="interact",
                     attributes={
                         "agent_id": payload.agent_id,
-                        "utterance": payload.utterance,
-                        "session_id": session_id,
-                        "tts": payload.tts,
-                        "verbose": payload.verbose,
+                        "utterance": payload.utterance or "",
+                        "channel": payload.channel or "",
+                        "session_id": session_id or "",
+                        "tts": payload.tts or False,
+                        "verbose": payload.verbose or False,
+                        "data": payload.data or {},
+                        "streaming": payload.streaming or False,
                         "reporting": False,
                     },
                     module_name="jivas.agent.action.interact",
@@ -384,8 +389,14 @@ class AgentInterface:
                 headers = {}
                 json = {
                     "agent_id": payload.agent_id,
-                    "utterance": payload.utterance,
-                    "session_id": session_id,
+                    "utterance": payload.utterance or "",
+                    "channel": payload.channel or "",
+                    "session_id": session_id or "",
+                    "tts": payload.tts or False,
+                    "verbose": payload.verbose or False,
+                    "data": payload.data or {},
+                    "streaming": payload.streaming or False,
+                    "reporting": False,
                 }
                 headers["Authorization"] = "Bearer " + AgentInterface.TOKEN
 

jvserve/lib/file_interface.py

@@ -9,6 +9,7 @@ from abc import ABC, abstractmethod
 
 # 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")
 
 
 class FileInterface(ABC):
@@ -155,16 +156,21 @@ class S3FileInterface(FileInterface):
 
 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")
-    )
+
+def get_file_interface(files_root: str = DEFAULT_FILES_ROOT) -> FileInterface:
+    """Returns a FileInterface instance based on the configured FILE_INTERFACE."""
+
+    if FILE_INTERFACE == "s3":
+        return 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=files_root,
+        )
+    else:
+        return LocalFileInterface(files_root=files_root)
+
+
+file_interface = get_file_interface()

{jvserve-2.0.5.dist-info → jvserve-2.0.7.dist-info}/METADATA

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

jvserve-2.0.7.dist-info/RECORD

@@ -0,0 +1,13 @@
+jvserve/__init__.py,sha256=g9pUUveC4GidUm97oFNE89_aCnO73a7IIT_6DP7nBP0,190
+jvserve/cli.py,sha256=ltg-n-ZFsvitAGIhxY8xgwPI2CETLanZ_0bqrvsqqg8,4994
+jvserve/lib/__init__.py,sha256=cnzfSHLoTWG9Ygut2nOpDys5aPlQz-m0BSkB-nd7OMs,31
+jvserve/lib/agent_interface.py,sha256=qSMHOonLrwokyeIjk9DdNbgt0uSPfrTWWNDqR3qAsT4,26490
+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.7.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+jvserve-2.0.7.dist-info/METADATA,sha256=kHsqQ2Eh3fYun93xztnhIQhCi3P-JssXDqr8tMeUGvw,4790
+jvserve-2.0.7.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+jvserve-2.0.7.dist-info/entry_points.txt,sha256=HYyg1QXoLs0JRb004L300VeLOZyDLY27ynD1tnTnEN4,35
+jvserve-2.0.7.dist-info/top_level.txt,sha256=afoCXZv-zXNBuhVIvfJGjafXKEiJl_ooy4BtgQwAG4Q,8
+jvserve-2.0.7.dist-info/RECORD,,

{jvserve-2.0.5.dist-info → jvserve-2.0.7.dist-info}/WHEEL

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

jvserve-2.0.5.dist-info/RECORD

@@ -1,13 +0,0 @@
-jvserve/__init__.py,sha256=9CL-E2CABm-lVgkBs0NVCUalG30ORIqxfwa7ie9IWys,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.5.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-jvserve-2.0.5.dist-info/METADATA,sha256=kP5VLkXdZ95-0MN4QOfBClaWiCP9Y97piik7YVO8Jhc,4790
-jvserve-2.0.5.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-jvserve-2.0.5.dist-info/entry_points.txt,sha256=HYyg1QXoLs0JRb004L300VeLOZyDLY27ynD1tnTnEN4,35
-jvserve-2.0.5.dist-info/top_level.txt,sha256=afoCXZv-zXNBuhVIvfJGjafXKEiJl_ooy4BtgQwAG4Q,8
-jvserve-2.0.5.dist-info/RECORD,,