jvserve 2.1.15__py3-none-any.whl → 2.1.17__py3-none-any.whl

jvserve/cli.py

@@ -33,6 +33,7 @@ from typing_extensions import Any
 from watchfiles import Change, watch
 
 from jvserve.lib.agent_interface import AgentInterface
+from jvserve.lib.agent_pulse import AgentPulse
 from jvserve.lib.file_interface import (
     DEFAULT_FILES_ROOT,
     FILE_INTERFACE,
@@ -220,6 +221,7 @@ def run_jivas(filename: str, host: str = "localhost", port: int = 8000) -> None:
 
     async def on_shutdown() -> None:
         jvlogger.info("JIVAS is shutting down...")
+        AgentPulse.stop()
 
     app = JaseciFastAPI.get()
     app_lifespan = app.router.lifespan_context

jvserve/lib/agent_interface.py

@@ -15,6 +15,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."""
@@ -49,8 +50,10 @@ class AgentInterface:
     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 +65,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/agent_pulse.py

@@ -0,0 +1,63 @@
+"""Agent Pulse class for scheduling and running agent jobs."""
+
+import logging
+import threading
+import time
+
+import schedule
+
+
+class AgentPulse:
+    """Agent Pulse class for scheduling and running agent jobs."""
+
+    EVENT = None
+    THREAD = None
+    LOGGER = logging.getLogger(__name__)
+
+    @staticmethod
+    def start(interval: int = 1) -> threading.Event:
+        """Starts the agent pulse in a separate thread that executes
+        pending jobs at each elapsed time interval.
+
+        This method ensures that only one thread is running at a time
+        to prevent duplication. If a thread is already running, it logs
+        a message and returns without starting a new thread.
+
+        @param interval: Time in seconds between each execution cycle of
+        scheduled jobs.
+        @return: threading.Event which can be set to stop the running
+        thread.
+
+        Note: It is intended behavior that run_continuously() does not
+        run missed jobs. For instance, a job scheduled to run every
+        minute with a run interval of one hour will only run once per
+        hour, not 60 times at once.
+        """
+
+        if AgentPulse.THREAD and AgentPulse.THREAD.is_alive():
+            AgentPulse.LOGGER.info("agent pulse is already running.")
+            return AgentPulse.EVENT
+
+        AgentPulse.EVENT = threading.Event()
+
+        class ScheduleThread(threading.Thread):
+            def run(self) -> None:
+                while AgentPulse.EVENT and not AgentPulse.EVENT.is_set():
+                    schedule.run_pending()
+                    time.sleep(interval)
+
+        AgentPulse.THREAD = ScheduleThread()
+        AgentPulse.THREAD.start()
+
+        AgentPulse.LOGGER.info("agent pulse started.")
+
+        return AgentPulse.EVENT
+
+    @staticmethod
+    def stop() -> None:
+        """Stops the agent pulse."""
+        if AgentPulse.EVENT and not AgentPulse.EVENT.is_set():
+            AgentPulse.LOGGER.info("agent pulse stopped.")
+            AgentPulse.EVENT.set()
+            if AgentPulse.THREAD:
+                AgentPulse.THREAD.join()

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
@@ -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.15.dist-info → jvserve-2.1.17.dist-info}/METADATA

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

jvserve-2.1.17.dist-info/RECORD

@@ -0,0 +1,14 @@
+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=p7Fofd5q6Fk-Q900qbvPu2gB4TemPJFkOPgSq1w-oyk,3628
+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=7LuY_ddG9qANgRWk7i7Oum6cX_EzB_mYAH7YYRH7ytQ,8149
+jvserve/lib/jvlogger.py,sha256=RNiB9PHuBzTvNIQWhxoDgrDlNYA0PYm1SVpvzlqu8mE,4180
+jvserve-2.1.17.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+jvserve-2.1.17.dist-info/METADATA,sha256=03dypxwccncxgYacVU4cPQ53ncrkMd4Gc9g425UmTNs,4821
+jvserve-2.1.17.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jvserve-2.1.17.dist-info/entry_points.txt,sha256=HYyg1QXoLs0JRb004L300VeLOZyDLY27ynD1tnTnEN4,35
+jvserve-2.1.17.dist-info/top_level.txt,sha256=afoCXZv-zXNBuhVIvfJGjafXKEiJl_ooy4BtgQwAG4Q,8
+jvserve-2.1.17.dist-info/RECORD,,

jvserve-2.1.15.dist-info/RECORD

@@ -1,13 +0,0 @@
-jvserve/__init__.py,sha256=Jd0pamSDn2wGTZkNk8I9qNYTFBHp7rasdYO0_Dvad_k,245
-jvserve/cli.py,sha256=LR6PbEWStL3eSErplA_K7U8ZY_5pDYGYJbZLV1oTlkw,13837
-jvserve/lib/__init__.py,sha256=cnzfSHLoTWG9Ygut2nOpDys5aPlQz-m0BSkB-nd7OMs,31
-jvserve/lib/agent_interface.py,sha256=Igv5Jb7i9Aq_7IbLDZ6jnldGKssAWKeb6iXoolX8u4k,3478
-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.15.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-jvserve-2.1.15.dist-info/METADATA,sha256=IxIo1aY9pcqIiLIPd3UQbZZN58fNVTtyX1bHOZEiQAc,4821
-jvserve-2.1.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jvserve-2.1.15.dist-info/entry_points.txt,sha256=HYyg1QXoLs0JRb004L300VeLOZyDLY27ynD1tnTnEN4,35
-jvserve-2.1.15.dist-info/top_level.txt,sha256=afoCXZv-zXNBuhVIvfJGjafXKEiJl_ooy4BtgQwAG4Q,8
-jvserve-2.1.15.dist-info/RECORD,,