jvserve 2.1.2__py3-none-any.whl → 2.1.4__py3-none-any.whl

jvserve/cli.py

@@ -3,12 +3,16 @@
 import asyncio
 import logging
 import os
+import sys
+import threading
+import time
 from concurrent.futures import ThreadPoolExecutor
 from contextlib import asynccontextmanager
 from pickle import load
 from typing import AsyncIterator, Optional
 
 import aiohttp
+import psutil
 import pymongo
 from bson import ObjectId
 from dotenv import load_dotenv
@@ -21,7 +25,7 @@ from jac_cloud.plugin.jaseci import NodeAnchor
 from jaclang import JacMachine as Jac
 from jaclang.cli.cmdreg import cmd_registry
 from jaclang.runtimelib.machine import hookimpl
-from watchfiles import Change, run_process
+from watchfiles import Change, watch
 
 from jvserve.lib.agent_interface import AgentInterface
 from jvserve.lib.file_interface import (
@@ -43,6 +47,10 @@ logger = logging.getLogger(__name__)
 url_proxy_collection = None
 collection_init_lock = asyncio.Lock()
 
+# Global state for watcher control
+WATCHER_STATE_FILE = ".jvserve_watcher_state"
+watcher_enabled = True
+
 
 async def get_url_proxy_collection() -> pymongo.collection.Collection:
     """Thread-safe initialization of MongoDB collection"""
@@ -96,6 +104,37 @@ async def serve_proxied_file(
         raise HTTPException(status_code=502, detail=f"File fetch error: {str(e)}")
 
 
+def start_file_watcher(
+    watchdir: str, filename: str, host: str, port: int
+) -> threading.Thread:
+    """Start the file watcher in a separate thread"""
+
+    def watcher_loop() -> None:
+        """File watcher loop that runs in a separate thread"""
+        global watcher_enabled
+
+        logger.info(f"Starting file watcher for directory: {watchdir}")
+
+        try:
+            for changes in watch(watchdir):
+                if watcher_enabled:
+                    log_reload(changes)
+                    # Kill the current server process and restart
+                    reload_server()
+                else:
+                    logger.info("Watcher disabled, ignoring changes")
+                    time.sleep(1)  # Prevent busy loop when disabled
+        except KeyboardInterrupt:
+            logger.info("File watcher stopped")
+        except Exception as e:
+            logger.error(f"File watcher error: {e}")
+
+    # Start watcher in daemon thread so it doesn't prevent program exit
+    watcher_thread = threading.Thread(target=watcher_loop, daemon=True)
+    watcher_thread.start()
+    return watcher_thread
+
+
 def run_jivas(filename: str, host: str = "localhost", port: int = 8000) -> None:
     """Starts JIVAS server with integrated file services"""
 
@@ -219,12 +258,32 @@ def run_jivas(filename: str, host: str = "localhost", port: int = 8000) -> None:
             raise HTTPException(status_code=500, detail="Internal server error")
 
     ctx.close()
+
+    # Start file watcher BEFORE starting the server (in development mode)
+    is_development = os.environ.get("JIVAS_ENVIRONMENT") == "development"
+    if is_development:
+        watchdir = os.path.join(
+            os.path.abspath(os.path.dirname(filename)), "actions", ""
+        )
+        logger.info("Development mode: Starting file watcher")
+        enable_watcher()
+        start_file_watcher(watchdir, filename, host, port)
+
     # Run the app
     JaseciFastAPI.start(host=host, port=port)
 
 
 def log_reload(changes: set[tuple[Change, str]]) -> None:
-    """Log changes."""
+    """Log changes and check watcher state."""
+    global watcher_enabled
+
+    logger.warning(f"Watcher is: {watcher_enabled}")
+
+    # Check if watcher is disabled
+    if not watcher_enabled:
+        logger.warning("Watcher is disabled. Ignoring changes.")
+        return
+
     num_of_changes = len(changes)
     logger.warning(
         f'Detected {num_of_changes} change{"s" if num_of_changes > 1 else ""}'
@@ -245,12 +304,60 @@ class JacCmd:
         @cmd_registry.register
         def jvserve(filename: str, host: str = "localhost", port: int = 8000) -> None:
             """Launch unified JIVAS server with file services"""
-            watchdir = os.path.join(
-                os.path.abspath(os.path.dirname(filename)), "actions", ""
-            )
-            run_process(
-                watchdir,
-                target=run_jivas,
-                args=(filename, host, port),
-                callback=log_reload,
-            )
+            run_jivas(filename, host, port)
+
+
+def disable_watcher() -> dict:
+    """Disable the watcher from auto-reloading"""
+    if os.environ.get("JIVAS_ENVIRONMENT") == "development":
+        global watcher_enabled
+        watcher_enabled = False
+        with open(WATCHER_STATE_FILE, "w") as f:
+            f.write("disabled")
+        return {"message": "Watcher disabled"}
+    else:
+        return {"message": "Watcher already disabled"}
+
+
+def enable_watcher() -> dict:
+    """Enable the watcher for auto-reloading"""
+    if os.environ.get("JIVAS_ENVIRONMENT") == "development":
+        global watcher_enabled
+        watcher_enabled = True
+        with open(WATCHER_STATE_FILE, "w") as f:
+            f.write("enabled")
+        return {"message": "Watcher enabled"}
+    else:
+        return {"message": "Watcher already enabled"}
+
+
+def reload_server() -> None:
+    """Reload the server using the exact command that started it."""
+    try:
+        # Get the command used to start the sever
+        current_process = psutil.Process(os.getpid())
+        cmdline = current_process.cmdline()
+
+        logger.info(f"Restarting with command: {' '.join(cmdline)}")
+
+        # Replace current process with the same command
+        os.execvp(cmdline[0], cmdline)
+
+    except Exception as e:
+        logger.error(f"Failed to get process command line: {e}")
+        # Fallback to sys.argv
+        reload_server_from_argv()
+    finally:
+        is_development = os.environ.get("JIVAS_ENVIRONMENT") == "development"
+
+        if is_development:
+            enable_watcher()
+
+
+def reload_server_from_argv() -> None:
+    """Reload using sys.argv (the original command line arguments)."""
+    logger.info("Reloading server using sys.argv...")
+    logger.info(f"Original command: {' '.join(sys.argv)}")
+
+    # sys.argv[0] is the script name, rest are arguments
+    os.execvp(sys.executable, [sys.executable] + sys.argv)

{jvserve-2.1.2.dist-info → jvserve-2.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jvserve
-Version: 2.1.2
+Version: 2.1.4
 Summary: FastAPI webserver for loading and interaction with JIVAS agents.
 Home-page: https://github.com/TrueSelph/jvserve
 Author: TrueSelph Inc.
@@ -10,6 +10,7 @@ Requires-Python: >=3.12.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: jac-cloud
+Requires-Dist: psutil>=7.0.0
 Requires-Dist: jaclang==0.8.4
 Requires-Dist: pyaml>=25.1.0
 Requires-Dist: requests>=2.32.3

{jvserve-2.1.2.dist-info → jvserve-2.1.4.dist-info}/RECORD

@@ -1,13 +1,13 @@
 jvserve/__init__.py,sha256=Jd0pamSDn2wGTZkNk8I9qNYTFBHp7rasdYO0_Dvad_k,245
-jvserve/cli.py,sha256=WTB_euv8R_cQ9fK_tlFHV_I6Jn-CYJrHKzjHsWSyWPY,9304
+jvserve/cli.py,sha256=BThAXt_0csFd7Z6Hytr8usQ7gh-zfnqmh9kLWvVVKZc,12861
 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.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-jvserve-2.1.2.dist-info/METADATA,sha256=EO9HyWpAhJym2eK2j9ZQVdFDvgVDBxYBL-fbrVVtLUw,4814
-jvserve-2.1.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jvserve-2.1.2.dist-info/entry_points.txt,sha256=HYyg1QXoLs0JRb004L300VeLOZyDLY27ynD1tnTnEN4,35
-jvserve-2.1.2.dist-info/top_level.txt,sha256=afoCXZv-zXNBuhVIvfJGjafXKEiJl_ooy4BtgQwAG4Q,8
-jvserve-2.1.2.dist-info/RECORD,,
+jvserve-2.1.4.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+jvserve-2.1.4.dist-info/METADATA,sha256=Lw8imqzvI0CWx5n7UT0LRjhDD_okwH_Of49IN37W8JI,4843
+jvserve-2.1.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jvserve-2.1.4.dist-info/entry_points.txt,sha256=HYyg1QXoLs0JRb004L300VeLOZyDLY27ynD1tnTnEN4,35
+jvserve-2.1.4.dist-info/top_level.txt,sha256=afoCXZv-zXNBuhVIvfJGjafXKEiJl_ooy4BtgQwAG4Q,8
+jvserve-2.1.4.dist-info/RECORD,,