stata-cli 0.4.1__tar.gz → 0.5.0__tar.gz

{stata_cli-0.4.1 → stata_cli-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: stata-cli
-Version: 0.4.1
+Version: 0.5.0
 Summary: Command-line interface for running Stata commands via PyStata
 License: MIT
 Keywords: stata,cli,statistics,data-science

{stata_cli-0.4.1 → stata_cli-0.5.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "stata-cli"
-version = "0.4.1"
+version = "0.5.0"
 description = "Command-line interface for running Stata commands via PyStata"
 readme = "README.md"
 requires-python = ">=3.9"

stata_cli-0.5.0/src/stata_cli/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.5.0"

{stata_cli-0.4.1 → stata_cli-0.5.0}/src/stata_cli/daemon.py

@@ -18,13 +18,19 @@ from pathlib import Path
 from typing import Any, Dict, Optional
 
 _STATE_DIR = os.path.join(os.path.expanduser("~"), ".stata-cli")
-_PID_FILE = os.path.join(_STATE_DIR, "daemon.pid")
-_SOCK_FILE = os.path.join(_STATE_DIR, "daemon.sock")
 _IS_WINDOWS = platform.system() == "Windows"
 _DEFAULT_PORT = 4718
 _IDLE_TIMEOUT = 3600  # 1 hour
 
 
+def _pid_file(session: str = "default") -> str:
+    return os.path.join(_STATE_DIR, f"daemon-{session}.pid")
+
+
+def _sock_file(session: str = "default") -> str:
+    return os.path.join(_STATE_DIR, f"daemon-{session}.sock")
+
+
 # ── wire protocol: 4-byte big-endian length prefix + JSON ────────────────
 
 def _send_msg(sock: socket.socket, obj: Any) -> None:
@@ -57,11 +63,13 @@ class DaemonServer:
     """Single-threaded daemon that wraps a StataEngine."""
 
     def __init__(self, stata_path: str, edition: str = "mp",
-                 graphs_dir: Optional[str] = None, idle_timeout: float = _IDLE_TIMEOUT):
+                 graphs_dir: Optional[str] = None, idle_timeout: float = _IDLE_TIMEOUT,
+                 session: str = "default"):
         self.stata_path = stata_path
         self.edition = edition
         self.graphs_dir = graphs_dir
         self.idle_timeout = idle_timeout
+        self.session = session
         self._engine = None
         self._running = False
         self._start_time = time.time()
@@ -77,6 +85,7 @@ class DaemonServer:
         os.makedirs(_STATE_DIR, exist_ok=True)
 
         sock = self._create_listener()
+        self._port = sock.getsockname()[1] if _IS_WINDOWS else 0
         self._write_pid()
         self._running = True
 
@@ -113,16 +122,30 @@ class DaemonServer:
         if _IS_WINDOWS:
             sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
             sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-            sock.bind(("127.0.0.1", _DEFAULT_PORT))
+            port = self._find_free_port()
+            sock.bind(("127.0.0.1", port))
         else:
-            if os.path.exists(_SOCK_FILE):
-                os.unlink(_SOCK_FILE)
+            sock_path = _sock_file(self.session)
+            if os.path.exists(sock_path):
+                os.unlink(sock_path)
             sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-            sock.bind(_SOCK_FILE)
+            sock.bind(sock_path)
         sock.listen(4)
         sock.setblocking(False)
         return sock
 
+    @staticmethod
+    def _find_free_port() -> int:
+        for port in range(_DEFAULT_PORT, _DEFAULT_PORT + 200):
+            try:
+                s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+                s.bind(("127.0.0.1", port))
+                s.close()
+                return port
+            except OSError:
+                continue
+        raise RuntimeError("No free port found")
+
     def _handle_connection(self, conn: socket.socket) -> None:
         conn.settimeout(600.0)
         msg = _recv_msg(conn)
@@ -216,18 +239,19 @@ class DaemonServer:
         return asdict(result)
 
     def _write_pid(self) -> None:
-        addr = f"127.0.0.1:{_DEFAULT_PORT}" if _IS_WINDOWS else _SOCK_FILE
-        with open(_PID_FILE, "w") as fh:
-            json.dump({"pid": os.getpid(), "address": addr, "started": time.time()}, fh)
+        sock_path = _sock_file(self.session)
+        addr = f"127.0.0.1:{self._port}" if _IS_WINDOWS else sock_path
+        with open(_pid_file(self.session), "w") as fh:
+            json.dump({"pid": os.getpid(), "address": addr, "started": time.time(), "session": self.session}, fh)
 
     def _cleanup(self) -> None:
         try:
-            os.unlink(_PID_FILE)
+            os.unlink(_pid_file(self.session))
         except OSError:
             pass
         if not _IS_WINDOWS:
             try:
-                os.unlink(_SOCK_FILE)
+                os.unlink(_sock_file(self.session))
             except OSError:
                 pass
 
@@ -236,9 +260,10 @@ class DaemonServer:
 
 
 def run_daemon_server(stata_path: str, edition: str = "mp",
-                      graphs_dir: Optional[str] = None, idle_timeout: float = _IDLE_TIMEOUT) -> None:
+                      graphs_dir: Optional[str] = None, idle_timeout: float = _IDLE_TIMEOUT,
+                      session: str = "default") -> None:
     """Entry point called in the daemon subprocess."""
-    server = DaemonServer(stata_path, edition, graphs_dir=graphs_dir, idle_timeout=idle_timeout)
+    server = DaemonServer(stata_path, edition, graphs_dir=graphs_dir, idle_timeout=idle_timeout, session=session)
     server.serve()
 
 
@@ -249,14 +274,16 @@ def run_daemon_server(stata_path: str, edition: str = "mp",
 class DaemonClient:
     """Connects to a running daemon over the Unix socket / TCP port."""
 
-    def __init__(self) -> None:
+    def __init__(self, session: str = "default") -> None:
+        self.session = session
         self._sock: Optional[socket.socket] = None
 
     def is_running(self) -> bool:
-        if not os.path.isfile(_PID_FILE):
+        pid_path = _pid_file(self.session)
+        if not os.path.isfile(pid_path):
             return False
         try:
-            with open(_PID_FILE) as fh:
+            with open(pid_path) as fh:
                 info = json.load(fh)
             pid = info["pid"]
             os.kill(pid, 0)
@@ -298,30 +325,33 @@ class DaemonClient:
             self._sock = None
 
     def _read_pid(self) -> Optional[Dict]:
-        if not os.path.isfile(_PID_FILE):
+        pid_path = _pid_file(self.session)
+        if not os.path.isfile(pid_path):
             return None
         try:
-            with open(_PID_FILE) as fh:
+            with open(pid_path) as fh:
                 return json.load(fh)
         except (json.JSONDecodeError, OSError):
             return None
 
 
 def start_daemon(stata_path: str, edition: str = "mp",
-                 graphs_dir: Optional[str] = None, idle_timeout: float = _IDLE_TIMEOUT) -> bool:
+                 graphs_dir: Optional[str] = None, idle_timeout: float = _IDLE_TIMEOUT,
+                 session: str = "default") -> bool:
     """Launch daemon as a detached background process. Returns True on success."""
-    client = DaemonClient()
+    client = DaemonClient(session)
     if client.is_running():
         return True
 
     os.makedirs(_STATE_DIR, exist_ok=True)
-    log_file = os.path.join(_STATE_DIR, "daemon.log")
+    log_file = os.path.join(_STATE_DIR, f"daemon-{session}.log")
 
     args = [
         sys.executable, "-m", "stata_cli.daemon",
         "--stata-path", stata_path,
         "--edition", edition,
         "--idle-timeout", str(int(idle_timeout)),
+        "--session", session,
     ]
     if graphs_dir:
         args += ["--graphs-dir", graphs_dir]
@@ -345,9 +375,9 @@ def start_daemon(stata_path: str, edition: str = "mp",
     return False
 
 
-def stop_daemon() -> bool:
+def stop_daemon(session: str = "default") -> bool:
     """Ask the daemon to shut down gracefully."""
-    client = DaemonClient()
+    client = DaemonClient(session)
     if not client.is_running():
         return True
     if client.connect():
@@ -362,7 +392,7 @@ def stop_daemon() -> bool:
             return True
     # Force kill
     try:
-        with open(_PID_FILE) as fh:
+        with open(_pid_file(session)) as fh:
             pid = json.load(fh)["pid"]
         os.kill(pid, signal.SIGKILL if not _IS_WINDOWS else signal.SIGTERM)
     except Exception:
@@ -370,9 +400,43 @@ def stop_daemon() -> bool:
     return True
 
 
-def daemon_status() -> Optional[Dict[str, Any]]:
-    """Query the running daemon's status. Returns None if not running."""
-    client = DaemonClient()
+def stop_all_daemons() -> int:
+    """Stop all running daemon sessions. Returns count stopped."""
+    import glob
+    count = 0
+    for pid_path in glob.glob(os.path.join(_STATE_DIR, "daemon-*.pid")):
+        name = os.path.basename(pid_path)
+        session = name[len("daemon-"):-len(".pid")]
+        stop_daemon(session)
+        count += 1
+    return count
+
+
+def list_sessions() -> list:
+    """Return list of running session info dicts."""
+    import glob
+    sessions = []
+    for pid_path in glob.glob(os.path.join(_STATE_DIR, "daemon-*.pid")):
+        name = os.path.basename(pid_path)
+        session = name[len("daemon-"):-len(".pid")]
+        client = DaemonClient(session)
+        if not client.is_running():
+            continue
+        info = {"session": session}
+        if client.connect():
+            try:
+                status = client.send("status")
+                info.update(status)
+            except Exception:
+                pass
+            client.close()
+        sessions.append(info)
+    return sessions
+
+
+def daemon_status(session: str = "default") -> Optional[Dict[str, Any]]:
+    """Query a running daemon's status. Returns None if not running."""
+    client = DaemonClient(session)
     if not client.is_running():
         return None
     if not client.connect():
@@ -394,5 +458,6 @@ if __name__ == "__main__":
     parser.add_argument("--edition", default="mp")
     parser.add_argument("--graphs-dir", default=None)
     parser.add_argument("--idle-timeout", type=float, default=_IDLE_TIMEOUT)
+    parser.add_argument("--session", default="default")
     args = parser.parse_args()
-    run_daemon_server(args.stata_path, args.edition, args.graphs_dir, args.idle_timeout)
+    run_daemon_server(args.stata_path, args.edition, args.graphs_dir, args.idle_timeout, session=args.session)

{stata_cli-0.4.1 → stata_cli-0.5.0}/src/stata_cli/main.py

@@ -36,11 +36,12 @@ def _exit(code: int) -> None:
 @click.option("--timeout", type=float, default=600.0, help="Execution timeout in seconds.")
 @click.option("--max-tokens", type=int, default=0, help="Max output tokens (0=unlimited). Saves full output to file when exceeded.")
 @click.option("--no-daemon", is_flag=True, default=False, help="Force direct execution, skip daemon.")
+@click.option("--session", default="default", help="Daemon session name (for parallel sessions).")
 @click.option("--graphs-dir", envvar="STATA_CLI_GRAPHS_DIR", default=None, help="Graph export directory.")
 @click.option("--graph-format", type=click.Choice(["png", "svg", "pdf"], case_sensitive=False), default="png", help="Graph export format.")
 @click.option("--log", "log_file", default=None, help="Save Stata output to a log file.")
 @click.pass_context
-def cli(ctx, stata_path, edition, compact, use_json, timeout, max_tokens, no_daemon, graphs_dir, graph_format, log_file):
+def cli(ctx, stata_path, edition, compact, use_json, timeout, max_tokens, no_daemon, session, graphs_dir, graph_format, log_file):
     """Command-line interface for Stata."""
     ctx.ensure_object(dict)
     ctx.obj["stata_path"] = stata_path
@@ -50,6 +51,7 @@ def cli(ctx, stata_path, edition, compact, use_json, timeout, max_tokens, no_dae
     ctx.obj["timeout"] = timeout
     ctx.obj["max_tokens"] = max_tokens
     ctx.obj["no_daemon"] = no_daemon
+    ctx.obj["session"] = session
     ctx.obj["graphs_dir"] = graphs_dir
     ctx.obj["graph_format"] = graph_format
     ctx.obj["log_file"] = log_file
@@ -75,7 +77,7 @@ def _try_daemon(ctx, cmd_type: str, payload: dict) -> Result | None:
         return None
     try:
         from .daemon import DaemonClient
-        client = DaemonClient()
+        client = DaemonClient(ctx.obj.get("session", "default"))
         if not client.is_running():
             return None
         if not client.connect():
@@ -100,7 +102,7 @@ def _try_daemon_dict(ctx, cmd_type: str, payload: dict) -> dict | None:
         return None
     try:
         from .daemon import DaemonClient
-        client = DaemonClient()
+        client = DaemonClient(ctx.obj.get("session", "default"))
         if not client.is_running():
             return None
         if not client.connect():
@@ -222,7 +224,7 @@ def data_cmd(ctx, if_condition, rows):
     # Try daemon first
     try:
         from .daemon import DaemonClient
-        client = DaemonClient()
+        client = DaemonClient(ctx.obj.get("session", "default"))
         if not ctx.obj.get("no_daemon") and client.is_running() and client.connect():
             resp = client.send("get_data", {"if_condition": if_condition, "max_rows": rows})
             client.close()
@@ -266,7 +268,7 @@ def stop_cmd(ctx):
     """Interrupt a running Stata command (daemon mode)."""
     try:
         from .daemon import DaemonClient
-        client = DaemonClient()
+        client = DaemonClient(ctx.obj.get("session", "default"))
         if client.is_running() and client.connect():
             resp = client.send("stop")
             client.close()
@@ -408,7 +410,7 @@ def frame_cmd(ctx):
 
 # ── Skill command ────────────────────────────────────────────────────────
 
-@cli.command("skill")
+@cli.command("skill", context_settings=dict(ignore_unknown_options=True, allow_extra_args=True))
 @click.argument("topic", required=False, default=None)
 @click.option("--list", "list_topics", is_flag=True, default=False, help="List all available topics.")
 @click.pass_context
@@ -462,48 +464,68 @@ def daemon_start(ctx, idle_timeout):
         click.echo("Error: Stata installation not found.", err=True)
         _exit(EXIT_INIT_FAILURE)
 
+    session = ctx.obj["session"]
     from .daemon import start_daemon, DaemonClient
-    client = DaemonClient()
+    client = DaemonClient(session)
     if client.is_running():
-        click.echo("Daemon already running.")
+        click.echo(f"Daemon '{session}' already running.")
         return
 
-    click.echo("Starting daemon...")
-    ok = start_daemon(stata_path, ctx.obj["edition"], graphs_dir=ctx.obj.get("graphs_dir"), idle_timeout=idle_timeout)
+    click.echo(f"Starting daemon '{session}'...")
+    ok = start_daemon(stata_path, ctx.obj["edition"], graphs_dir=ctx.obj.get("graphs_dir"), idle_timeout=idle_timeout, session=session)
     if ok:
-        click.echo("Daemon started.")
+        click.echo(f"Daemon '{session}' started.")
     else:
         click.echo("Failed to start daemon.", err=True)
         _exit(EXIT_INIT_FAILURE)
 
 
 @daemon.command("stop")
-def daemon_stop():
+@click.option("--all", "stop_all", is_flag=True, default=False, help="Stop all running sessions.")
+@click.pass_context
+def daemon_stop(ctx, stop_all):
     """Stop the Stata daemon."""
-    from .daemon import stop_daemon, DaemonClient
-    client = DaemonClient()
+    from .daemon import stop_daemon as _stop, stop_all_daemons, DaemonClient
+    if stop_all:
+        count = stop_all_daemons()
+        click.echo(f"Stopped {count} session(s).")
+        return
+    session = ctx.obj["session"]
+    client = DaemonClient(session)
     if not client.is_running():
-        click.echo("Daemon not running.")
+        click.echo(f"Daemon '{session}' not running.")
         return
-    click.echo("Stopping daemon...")
-    stop_daemon()
-    click.echo("Daemon stopped.")
+    click.echo(f"Stopping daemon '{session}'...")
+    _stop(session)
+    click.echo(f"Daemon '{session}' stopped.")
 
 
 @daemon.command("status")
-def daemon_status_cmd():
+@click.pass_context
+def daemon_status_cmd(ctx):
     """Show daemon status."""
-    from .daemon import daemon_status
-    info = daemon_status()
-    if not info:
-        click.echo("Daemon not running.")
-        return
-    uptime = info.get("uptime", 0)
-    idle = info.get("idle", 0)
-    click.echo(f"Daemon running (PID {info.get('pid', '?')})")
-    click.echo(f"  Stata: {info.get('stata_path', '?')} ({info.get('edition', '?')})")
-    click.echo(f"  Uptime: {int(uptime)}s")
-    click.echo(f"  Idle: {int(idle)}s")
+    from .daemon import daemon_status, list_sessions
+    session = ctx.obj["session"]
+    if session == "default":
+        sessions = list_sessions()
+        if not sessions:
+            click.echo("No daemons running.")
+            return
+        for s in sessions:
+            uptime = s.get("uptime", 0)
+            idle = s.get("idle", 0)
+            click.echo(f"[{s['session']}] PID {s.get('pid', '?')} | uptime {int(uptime)}s | idle {int(idle)}s")
+    else:
+        info = daemon_status(session)
+        if not info:
+            click.echo(f"Daemon '{session}' not running.")
+            return
+        uptime = info.get("uptime", 0)
+        idle = info.get("idle", 0)
+        click.echo(f"Daemon '{session}' running (PID {info.get('pid', '?')})")
+        click.echo(f"  Stata: {info.get('stata_path', '?')} ({info.get('edition', '?')})")
+        click.echo(f"  Uptime: {int(uptime)}s")
+        click.echo(f"  Idle: {int(idle)}s")
 
 
 @daemon.command("restart")
@@ -511,21 +533,22 @@ def daemon_status_cmd():
 @click.pass_context
 def daemon_restart(ctx, idle_timeout):
     """Restart the Stata daemon."""
-    from .daemon import stop_daemon, start_daemon, DaemonClient
-    client = DaemonClient()
+    session = ctx.obj["session"]
+    from .daemon import stop_daemon as _stop, start_daemon, DaemonClient
+    client = DaemonClient(session)
     if client.is_running():
-        click.echo("Stopping daemon...")
-        stop_daemon()
+        click.echo(f"Stopping daemon '{session}'...")
+        _stop(session)
 
     stata_path = ctx.obj["stata_path"] or detect_stata_path()
     if not stata_path:
         click.echo("Error: Stata installation not found.", err=True)
         _exit(EXIT_INIT_FAILURE)
 
-    click.echo("Starting daemon...")
-    ok = start_daemon(stata_path, ctx.obj["edition"], graphs_dir=ctx.obj.get("graphs_dir"), idle_timeout=idle_timeout)
+    click.echo(f"Starting daemon '{session}'...")
+    ok = start_daemon(stata_path, ctx.obj["edition"], graphs_dir=ctx.obj.get("graphs_dir"), idle_timeout=idle_timeout, session=session)
     if ok:
-        click.echo("Daemon restarted.")
+        click.echo(f"Daemon '{session}' restarted.")
     else:
         click.echo("Failed to restart daemon.", err=True)
         _exit(EXIT_INIT_FAILURE)

{stata_cli-0.4.1 → stata_cli-0.5.0}/src/stata_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: stata-cli
-Version: 0.4.1
+Version: 0.5.0
 Summary: Command-line interface for running Stata commands via PyStata
 License: MIT
 Keywords: stata,cli,statistics,data-science

stata_cli-0.4.1/src/stata_cli/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.4.1"