jvserve 2.1.17__tar.gz → 2.1.19__tar.gz

{jvserve-2.1.17 → jvserve-2.1.19}/PKG-INFO

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

{jvserve-2.1.17 → jvserve-2.1.19}/jvserve/cli.py

@@ -1,6 +1,7 @@
 """Module for registering CLI plugins for jaseci."""
 
 import asyncio
+import json
 import logging
 import mimetypes
 import os
@@ -9,6 +10,7 @@ import threading
 import time
 from concurrent.futures import ThreadPoolExecutor
 from contextlib import asynccontextmanager
+from datetime import datetime
 from pickle import load
 from typing import AsyncIterator, Optional
 
@@ -18,10 +20,11 @@ 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.datasources.redis import Redis
 from jac_cloud.jaseci.main import FastAPI as JaseciFastAPI  # type: ignore
 from jac_cloud.jaseci.utils import logger
 from jac_cloud.jaseci.utils.logger import Level
@@ -41,6 +44,8 @@ from jvserve.lib.file_interface import (
 )
 from jvserve.lib.jvlogger import JVLogger
 
+redis = Redis().get_rd()
+
 load_dotenv(".env")
 # quiet the jac_cloud logger down to errors only
 logger.setLevel(Level.ERROR.value)
@@ -56,6 +61,10 @@ collection_init_lock = asyncio.Lock()
 watcher_enabled = True
 
 
+# taken from kubernetes HOSTNAME for replicated deployment
+SERVER_ID = os.environ.get("HOSTNAME", "unknown_server")
+
+
 async def get_url_proxy_collection() -> pymongo.collection.Collection:
     """Thread-safe initialization of MongoDB collection"""
     global url_proxy_collection
@@ -244,6 +253,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)
@@ -299,6 +344,8 @@ def run_jivas(filename: str, host: str = "localhost", port: int = 8000) -> None:
         jvlogger.info("Development mode: Starting file watcher")
         start_file_watcher(watchdir, filename, host, port)
 
+    threading.Thread(target=redis_listener, daemon=True).start()
+
     # Run the app
     JaseciFastAPI.start(host=host, port=port)
 
@@ -386,3 +433,63 @@ class JacCmd:
         def jvserve(filename: str, host: str = "localhost", port: int = 8000) -> None:
             """Launch unified JIVAS server with file services"""
             run_jivas(filename, host, port)
+
+
+def handle_message(msg: str) -> None:
+    """
+    Handles incoming messages from the Redis channel 'jivas_actions'.
+    Expects the message to be a JSON string with 'action' and 'initiator' fields.
+    Only acts on 'reload_jivas' messages not sent by this pod.
+    """
+    try:
+        data = json.loads(msg)
+    except json.JSONDecodeError:
+        print(f"Received invalid message: {msg}")
+        return
+
+    action = data.get("action")
+    initiator = data.get("initiator")
+
+    # Ignore messages sent by this pod
+    if initiator == SERVER_ID:
+        jvlogger.info("Skipping message from self")
+        return
+
+    if action == "reload_jivas":
+        print(f"Received reload_jivas action from {initiator}, executing reload.")
+        reload_jivas()
+    else:
+        print(f"Ignored action: {action} from {initiator}")
+
+
+def redis_listener() -> None:
+    """Listens to the Redis channel 'walker_install_action' and handles incoming messages."""
+    pubsub = redis.pubsub()
+    pubsub.subscribe("jivas_actions")
+    jvlogger.info("Subscribed to channel: jivas_actions")
+
+    for message in pubsub.listen():
+        if message["type"] == "message":
+            handle_message(message["data"])
+
+
+def send_action_notification(action: str, extra_data: dict | None = None) -> None:
+    """
+    Sends a message to the Redis channel 'jivas_actions'.
+
+    Args:
+        action (str): the action name, e.g., 'reload_jivas'
+        extra_data (dict): optional additional data to include in the message
+    """
+    payload = {
+        "action": action,
+        "timestamp": datetime.utcnow().isoformat(),
+        "initiator": SERVER_ID,
+    }
+
+    if extra_data:
+        payload.update(extra_data)
+
+    # Publish the message
+    redis.publish("jivas_actions", json.dumps(payload))
+    jvlogger.info(f"Sent message: {payload}")

{jvserve-2.1.17 → jvserve-2.1.19}/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
 
@@ -47,6 +49,61 @@ 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():

{jvserve-2.1.17 → jvserve-2.1.19}/jvserve/lib/jac_interface.py

@@ -124,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

{jvserve-2.1.17 → jvserve-2.1.19}/jvserve.egg-info/PKG-INFO

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