jvserve 2.1.16__py3-none-any.whl → 2.1.18__py3-none-any.whl

jvserve/cli.py

@@ -18,9 +18,9 @@ import pymongo
 import requests
 from bson import ObjectId
 from dotenv import load_dotenv
-from fastapi import FastAPI, HTTPException, Response
+from fastapi import FastAPI, HTTPException, Request, Response
 from fastapi.middleware.cors import CORSMiddleware
-from fastapi.responses import FileResponse, StreamingResponse
+from fastapi.responses import FileResponse, JSONResponse, StreamingResponse
 from jac_cloud.core.context import JaseciContext
 from jac_cloud.jaseci.main import FastAPI as JaseciFastAPI  # type: ignore
 from jac_cloud.jaseci.utils import logger
@@ -244,6 +244,42 @@ def run_jivas(filename: str, host: str = "localhost", port: int = 8000) -> None:
         allow_headers=["*"],
     )
 
+    @app.get("/action/webhook/{namespace}/{action}/{walker}/{agent_id}/{key}")
+    async def webhook_exec_get(
+        namespace: str,
+        action: str,
+        walker: str,
+        agent_id: str,
+        key: str,
+        request: Request,
+    ) -> JSONResponse:
+        return await agent_interface.webhook_exec(
+            namespace=namespace,
+            action=action,
+            walker=walker,
+            agent_id=agent_id,
+            key=key,
+            request=request,
+        )
+
+    @app.post("/action/webhook/{namespace}/{action}/{walker}/{agent_id}/{key}")
+    async def webhook_exec_post(
+        namespace: str,
+        action: str,
+        walker: str,
+        agent_id: str,
+        key: str,
+        request: Request,
+    ) -> JSONResponse:
+        return await agent_interface.webhook_exec(
+            namespace=namespace,
+            action=action,
+            walker=walker,
+            agent_id=agent_id,
+            key=key,
+            request=request,
+        )
+
     # Ensure the local file directory exists if that's the interface
     if FILE_INTERFACE == "local":
         directory = os.environ.get("JIVAS_FILES_ROOT_PATH", DEFAULT_FILES_ROOT)

jvserve/lib/agent_interface.py

@@ -6,6 +6,8 @@ import traceback
 from typing import Any
 
 import requests
+from fastapi import Request
+from fastapi.responses import JSONResponse
 
 from jvserve.lib.jac_interface import JacInterface
 
@@ -15,6 +17,7 @@ class AgentInterface:
 
     _instance = None
     logger = logging.getLogger(__name__)
+    timeout = int(os.environ.get("JIVAS_REQUEST_TIMEOUT", 30))
 
     def __init__(self, host: str = "localhost", port: int = 8000) -> None:
         """Initialize the AgentInterface with JacInterface."""
@@ -46,11 +49,68 @@ class AgentInterface:
             self._jac.reset()
             self.logger.error(f"Init error: {e}\n{traceback.format_exc()}")
 
+    async def webhook_exec(
+        self,
+        agent_id: str,
+        key: str,
+        namespace: str,
+        action: str,
+        walker: str,
+        request: Request,
+    ) -> JSONResponse:
+        """Trigger webhook execution - async compatible"""
+        try:
+
+            if not self._jac.is_valid():
+                self.logger.warning(
+                    "Invalid API state for webhook, attempting to reinstate it..."
+                )
+                self._jac._authenticate()
+
+            header = dict(request.headers)
+            try:
+                payload = await request.json()
+                if not payload:
+                    payload = {}
+            except Exception:
+                payload = {}
+
+            walker_obj = await self._jac.spawn_walker_async(
+                walker_name=walker,
+                module_name=f"actions.{namespace}.{action}.{walker}",
+                attributes={
+                    "agent_id": agent_id,
+                    "key": key,
+                    "header": header,
+                    "payload": payload,
+                },
+            )
+            if not walker_obj:
+                self.logger.error("Webhook execution failed")
+                return JSONResponse(
+                    content={"error": "Webhook execution failed"}, status_code=500
+                )
+
+            result = walker_obj.response
+            return JSONResponse(
+                status_code=result.get("status", 200),
+                content=result.get("message", "200 OK"),
+            )
+
+        except Exception as e:
+            self._jac.reset()
+            self.logger.error(f"Webhook callback error: {e}\n{traceback.format_exc()}")
+            return JSONResponse(
+                content={"error": "Internal server error"}, status_code=500
+            )
+
     def api_pulse(self, action_label: str, agent_id: str) -> dict:
         """Synchronous pulse API call"""
         if not self._jac.is_valid():
-            self.logger.warning("Invalid API state for pulse")
-            return {}
+            self.logger.warning(
+                "Invalid API state for pulse, attempting to reinstate it..."
+            )
+            self._jac._authenticate()
 
         # Clean parameters
         action_label = action_label.replace("action_label=", "")
@@ -62,7 +122,7 @@ class AgentInterface:
 
         try:
             response = requests.post(
-                endpoint, json=payload, headers=headers, timeout=10
+                endpoint, json=payload, headers=headers, timeout=self.timeout
             )
             if response.status_code == 200:
                 return response.json().get("reports", {})

jvserve/lib/jac_interface.py

@@ -25,6 +25,8 @@ from jaclang.runtimelib.machine import JacMachine
 class JacInterface:
     """Thread-safe connection and context state provider for Jac Runtime with auto-authentication."""
 
+    timeout = int(os.environ.get("JIVAS_REQUEST_TIMEOUT", 30))
+
     def __init__(self, host: str = "localhost", port: int = 8000) -> None:
         """Initialize JacInterface with host and port."""
         self.host = host
@@ -122,7 +124,7 @@ class JacInterface:
 
         try:
             if module_name not in JacMachine.list_modules():
-                self.logger.error(f"Module {module_name} not loaded")
+                self.logger.error(f"Module {module_name} not found")
                 return None
 
             entry_node = ctx.entry_node.archetype
@@ -155,7 +157,9 @@ class JacInterface:
             try:
                 # Try login first
                 response = requests.post(
-                    login_url, json={"email": user, "password": password}, timeout=15
+                    login_url,
+                    json={"email": user, "password": password},
+                    timeout=self.timeout,
                 )
                 self.logger.info(f"Login response status: {response.status_code}")
                 if response.status_code == 200:
@@ -164,7 +168,9 @@ class JacInterface:
 
                 # Register if login fails
                 reg_response = requests.post(
-                    register_url, json={"email": user, "password": password}, timeout=15
+                    register_url,
+                    json={"email": user, "password": password},
+                    timeout=self.timeout,
                 )
                 self.logger.info(
                     f"Register response status: {reg_response.status_code}"
@@ -174,7 +180,7 @@ class JacInterface:
                     login_response = requests.post(
                         login_url,
                         json={"email": user, "password": password},
-                        timeout=15,
+                        timeout=self.timeout,
                     )
                     self.logger.info(
                         f"Retry login response status: {login_response.status_code}"

{jvserve-2.1.16.dist-info → jvserve-2.1.18.dist-info}/METADATA

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

jvserve-2.1.18.dist-info/RECORD

@@ -0,0 +1,14 @@
+jvserve/__init__.py,sha256=Jd0pamSDn2wGTZkNk8I9qNYTFBHp7rasdYO0_Dvad_k,245
+jvserve/cli.py,sha256=FdZ5Zht7d5lDr2rOtAqgB_lw7o9TfyyhfDIC2noc46s,14929
+jvserve/lib/__init__.py,sha256=cnzfSHLoTWG9Ygut2nOpDys5aPlQz-m0BSkB-nd7OMs,31
+jvserve/lib/agent_interface.py,sha256=cO2ZgII33YU6m2zU_qTThAPoHcfg8V3dAMPFGaZAun4,5511
+jvserve/lib/agent_pulse.py,sha256=6hBF6KQYr6Z9Mi_yoWKGfdnW7gg84kK20Slu-bLR_m8,2067
+jvserve/lib/file_interface.py,sha256=VO9RBCtJwaBxu5eZjc57-uRbsVXXZt86wVRVq9R3KXY,6079
+jvserve/lib/jac_interface.py,sha256=hugcHF6by6_fIFfmvW7fgRMVpKe471oEWEZEA53MtEQ,8148
+jvserve/lib/jvlogger.py,sha256=RNiB9PHuBzTvNIQWhxoDgrDlNYA0PYm1SVpvzlqu8mE,4180
+jvserve-2.1.18.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+jvserve-2.1.18.dist-info/METADATA,sha256=qFDC-jP9juZ9-j49j536aQYIErjgssTRLm3N1nZHH94,4821
+jvserve-2.1.18.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jvserve-2.1.18.dist-info/entry_points.txt,sha256=HYyg1QXoLs0JRb004L300VeLOZyDLY27ynD1tnTnEN4,35
+jvserve-2.1.18.dist-info/top_level.txt,sha256=afoCXZv-zXNBuhVIvfJGjafXKEiJl_ooy4BtgQwAG4Q,8
+jvserve-2.1.18.dist-info/RECORD,,

jvserve-2.1.16.dist-info/RECORD

@@ -1,14 +0,0 @@
-jvserve/__init__.py,sha256=Jd0pamSDn2wGTZkNk8I9qNYTFBHp7rasdYO0_Dvad_k,245
-jvserve/cli.py,sha256=b1AHsiJUsMVHZ7ZOKhrOJSvISPh5O5O020aoDJQJ0Rk,13910
-jvserve/lib/__init__.py,sha256=cnzfSHLoTWG9Ygut2nOpDys5aPlQz-m0BSkB-nd7OMs,31
-jvserve/lib/agent_interface.py,sha256=Igv5Jb7i9Aq_7IbLDZ6jnldGKssAWKeb6iXoolX8u4k,3478
-jvserve/lib/agent_pulse.py,sha256=6hBF6KQYr6Z9Mi_yoWKGfdnW7gg84kK20Slu-bLR_m8,2067
-jvserve/lib/file_interface.py,sha256=VO9RBCtJwaBxu5eZjc57-uRbsVXXZt86wVRVq9R3KXY,6079
-jvserve/lib/jac_interface.py,sha256=ydhXfYTsrhdvMXBTAd_vnAXJSSVBydQ3qavPU1-oodU,7973
-jvserve/lib/jvlogger.py,sha256=RNiB9PHuBzTvNIQWhxoDgrDlNYA0PYm1SVpvzlqu8mE,4180
-jvserve-2.1.16.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-jvserve-2.1.16.dist-info/METADATA,sha256=NY8quNVWCkDnV-zbXAfRunwL4WQ7PDxvs9JBQziSgW8,4821
-jvserve-2.1.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jvserve-2.1.16.dist-info/entry_points.txt,sha256=HYyg1QXoLs0JRb004L300VeLOZyDLY27ynD1tnTnEN4,35
-jvserve-2.1.16.dist-info/top_level.txt,sha256=afoCXZv-zXNBuhVIvfJGjafXKEiJl_ooy4BtgQwAG4Q,8
-jvserve-2.1.16.dist-info/RECORD,,