vibego 1.0.2__py3-none-any.whl → 1.0.5__py3-none-any.whl

master.py

@@ -2198,7 +2198,8 @@ async def _process_restart_request(
 
     lock = _ensure_restart_lock()
     async with lock:
-        global_restart_in_progress
+        # Use global so the restart flag is shared across concurrent handlers
+        global _restart_in_progress
         if _restart_in_progress:
             await message.answer("A restart request is already being executed, please try again later. ")
             return
@@ -2258,7 +2259,8 @@ async def cmd_start(message: Message) -> None:
 
 async def _perform_restart(message: Message, start_script: Path) -> None:
     """Asynchronous execution ./start.sh,If it fails, roll back the mark and notify the administrator """
-    global_restart_in_progress
+    # Use global so restart flag resets affect the module-level state
+    global _restart_in_progress
     lock = _ensure_restart_lock()
     bot = message.bot
     chat_id = message.chat.id

scripts/master_healthcheck.py

@@ -1,137 +1,65 @@
 #!/usr/bin/env python3
-"""Master Post-startup health check script.
+"""Master post-startup health check.
 
-Process:
-1. Wait for a startup flag to appear in the master log.
-2. Call MasterManager to start the specified worker (default hyphavibebotbackend).
-3. Automatically discover the worker's chat_id(Prioritize the state file, then read the latest log).
-4. Send a probe message to the chat through the Telegram Bot API to confirm that the sending is successful.
-5. If any step fails, an exception is thrown and an attempt is made to notify the administrator.
-
-Note: This script will not automatically retry the restart and will only return a non-zero exit code for processing by the outer script.
+This lightweight variant only verifies that the master process has emitted the
+readiness marker in its log file. Worker bootstrap and Telegram probes are no
+longer executed because master restart confirmation is now limited to the
+controller process itself.
 """
 from __future__ import annotations
 
 import argparse
-import asyncio
 import json
 import os
-import re
 import sys
 import time
 from pathlib import Path
-from typing import Optional
-from urllib.error import URLError, HTTPError
 from urllib.request import Request, urlopen
 
-# Import the configuration and tools in master and reuse the project parsing logic
+# Make sure the master module can be imported from the repository root
 ROOT_DIR = Path(__file__).resolve().parent.parent
 ROOT_DIR_STR = str(ROOT_DIR)
 if ROOT_DIR_STR not in sys.path:
-    # Make sure the master module can be imported from the repository root
     sys.path.insert(0, ROOT_DIR_STR)
 
 import master  # type: ignore
-from project_repository import ProjectRepository
+
 DEFAULT_MASTER_LOG = master.LOG_ROOT_PATH / "vibe.log"
 DEFAULT_TIMEOUT_MASTER = 60.0
-DEFAULT_TIMEOUT_PROBE = 15.0
-PROBE_TEXT = "hello"
-REPOSITORY = ProjectRepository(master.CONFIG_DB_PATH, master.CONFIG_PATH)
-
-
-def _load_project(project_id: str) -> master.ProjectConfig:
-    """Get the project configuration based on the slug or bot name, and list the options on failure."""
-
-    record = REPOSITORY.get_by_slug(project_id)
-    if record is None:
-        record = REPOSITORY.get_by_bot_name(project_id)
-    if record is None:
-        available = [r.project_slug for r in REPOSITORY.list_projects()]
-        raise RuntimeError(f"No items found {project_id}, Optional items: {available}")
-    return master.ProjectConfig.from_dict(record.to_dict())
+MASTER_READY_MARKER = "Master Started, listening for administrator commands."
 
 
 def _wait_for_log_flag(path: Path, pattern: str, timeout: float) -> None:
-    """Waits for a specific mark in the log within the timeout period."""
+    """Poll the master log until the readiness marker is detected or timeout."""
 
     deadline = time.monotonic() + timeout
-    position = 0
+    if path.exists():
+        position = path.stat().st_size
+        initialized = True
+    else:
+        position = 0
+        initialized = False
     while time.monotonic() < deadline:
         if path.exists():
-            if position == 0:
-                position = path.stat().st_size
+            if not initialized:
+                position = 0
+                initialized = True
             with path.open("r", encoding="utf-8", errors="ignore") as fh:
                 fh.seek(position)
                 while time.monotonic() < deadline:
                     line = fh.readline()
                     if not line:
                         time.sleep(0.5)
-                        continue
+                        break
                     position = fh.tell()
                     if pattern in line:
                         return
         time.sleep(0.5)
-    raise TimeoutError(f"exist {timeout:.0f} No log markers detected in seconds: {pattern}")
-
-
-def _extract_chat_id_from_logs(log_path: Path) -> Optional[int]:
-    """Find the most recent chat from the log file in reverse order_id."""
-
-    if not log_path.exists():
-        return None
-    pattern = re.compile(r"chat=(-?\d+)")
-    try:
-        lines = log_path.read_text(encoding="utf-8", errors="ignore").splitlines()
-    except Exception:
-        return None
-    for line in reversed(lines[-200:]):  # Reverse search for recent records
-        match = pattern.search(line)
-        if match:
-            try:
-                return int(match.group(1))
-            except ValueError:
-                continue
-    return None
-
-
-def _ensure_chat_id(cfg: master.ProjectConfig, manager: master.MasterManager) -> int:
-    """Make sure the task is assigned chat_id, Backfill from log and write back to state if necessary."""
-
-    state = manager.state_store.data.get(cfg.project_slug)
-    if state and state.chat_id:
-        return int(state.chat_id)
-    # Fall back to log search
-    log_dir = master.LOG_ROOT_PATH / (cfg.default_model.lower()) / cfg.project_slug
-    chat_id = _extract_chat_id_from_logs(log_dir / "run_bot.log")
-    if chat_id is None:
-        raise RuntimeError(
-            "Unable to get chat automatically_id, Please manually have a conversation with the bot to write the state/log"
-        )
-    # will discover chat_id Write back the state for easy reuse next time
-    manager.state_store.update(cfg.project_slug, chat_id=chat_id)
-    return chat_id
-
-
-def _send_probe(bot_token: str, chat_id: int, text: str, timeout: float) -> None:
-    """Send a probe message to the specified chat to verify that the Telegram API is available."""
-
-    url = f"https://api.telegram.org/bot{bot_token}/sendMessage"
-    payload = json.dumps({"chat_id": chat_id, "text": text, "disable_notification": True}).encode("utf-8")
-    request = Request(url, data=payload, headers={"Content-Type": "application/json"}, method="POST")
-    try:
-        with urlopen(request, timeout=timeout) as resp:
-            data = json.loads(resp.read().decode("utf-8"))
-    except HTTPError as exc:  # pragma: no cover - Thrown when network exception occurs
-        raise RuntimeError(f"Failed to send probe message, HTTP {exc.code}: {exc.reason}") from exc
-    except URLError as exc:  # pragma: no cover - Thrown when network exception occurs
-        raise RuntimeError(f"Failed to send probe message: {exc}") from exc
-    if not data.get("ok"):
-        raise RuntimeError(f"Failed to send probe message: {data}")
+    raise TimeoutError(f"No log markers detected within {timeout:.0f}s: {pattern}")
 
 
 def _format_admin_notice(reason: str) -> str:
-    """Generate alarm text to notify the administrator."""
+    """Compose the notification text for administrator alerts."""
 
     return (
         "Master Restart health check failed\n"
@@ -141,7 +69,7 @@ def _format_admin_notice(reason: str) -> str:
 
 
 def _notify_admins(reason: str) -> None:
-    """If the master token is available, the failure reason is broadcast to the administrator list."""
+    """Broadcast the failure reason to administrators if the master token exists."""
 
     master_token = os.environ.get("MASTER_BOT_TOKEN")
     if not master_token:
@@ -163,58 +91,30 @@ def _notify_admins(reason: str) -> None:
             continue
 
 
-def _ensure_worker(cfg: master.ProjectConfig) -> master.MasterManager:
-    """Starts the specified project worker and returns the temporarily constructed MasterManager."""
-
-    records = REPOSITORY.list_projects()
-    configs = [master.ProjectConfig.from_dict(record.to_dict()) for record in records]
-    state_store = master.StateStore(
-        master.STATE_PATH, {item.project_slug: item for item in configs}
-    )
-    manager = master.MasterManager(configs, state_store=state_store)
-
-    async def _run() -> None:
-        """The coroutine performs the actual stop/start process."""
-        # Make sure to stop the old instance first(If it existsexist)
-        try:
-            await manager.stop_worker(cfg)
-        except Exception:
-            pass
-        await manager.run_worker(cfg)
-
-    asyncio.run(_run())
-    return manager
-
-
 def main() -> int:
-    """Command line entry, performs master health check and returns exit code."""
-
-    parser = argparse.ArgumentParser(description="Master Post-launch health check")
-    parser.add_argument("--project", default="hyphavibebotbackend", help="Project slug or bot name")
-    parser.add_argument("--master-log", default=str(DEFAULT_MASTER_LOG), help="master Log path")
-    parser.add_argument("--master-timeout", type=float, default=DEFAULT_TIMEOUT_MASTER, help="master Log wait timeout (Second)")
-    parser.add_argument("--probe-timeout", type=float, default=DEFAULT_TIMEOUT_PROBE, help="Telegram Probe timeout (Second)")
+    """Command line entry point, only validates master readiness."""
+
+    parser = argparse.ArgumentParser(description="Master post-launch health check (master only)")
+    parser.add_argument("--master-log", default=str(DEFAULT_MASTER_LOG), help="Master log path")
+    parser.add_argument(
+        "--master-timeout",
+        type=float,
+        default=DEFAULT_TIMEOUT_MASTER,
+        help="Master log wait timeout (seconds)",
+    )
     args = parser.parse_args()
 
-    project_id = master._sanitize_slug(args.project)
     master_log = Path(args.master_log)
 
     try:
-        _wait_for_log_flag(master_log, "Master Started, listening for administrator commands.", args.master_timeout)
-        cfg = _load_project(project_id)
-        manager = _ensure_worker(cfg)
-        chat_id = _ensure_chat_id(cfg, manager)
-        _send_probe(cfg.bot_token, chat_id, PROBE_TEXT, args.probe_timeout)
+        _wait_for_log_flag(master_log, MASTER_READY_MARKER, args.master_timeout)
     except Exception as exc:
         reason = str(exc)
         _notify_admins(reason)
         print(f"[healthcheck] fail: {reason}", file=sys.stderr)
         return 1
     else:
-        print(
-            "[healthcheck] success: master ready,"
-            f"worker={cfg.display_name} Startup completed, chat_id={chat_id}, Probe message sent"
-        )
+        print("[healthcheck] success: master ready, worker checks skipped by configuration")
         return 0
 
 

scripts/start.sh

@@ -118,8 +118,9 @@ ensure_codex_installed() {
 ensure_codex_installed
 
 select_python_binary() {
-  # Choose to meet CPython <=3.12 interpreter, disabled by default 3.13(pydantic-core There is no compatible wheel in the pipx base environment)
+  # Select a compatible CPython version; defaults accept 3.9-3.14 and can be overridden via env variables.
   local allow_py313="${VIBEGO_ALLOW_PY313:-}"
+  local supported_max_minor="${VIBEGO_MAX_MINOR:-14}"
   local candidates=()
   local chosen=""
   local name
@@ -152,18 +153,24 @@ select_python_binary() {
     if [[ -n "${VIBEGO_PYTHON:-}" && "$name" == "$VIBEGO_PYTHON" ]]; then
       explicit_override=1
     fi
-    if [[ "$minor" =~ ^[0-9]+$ ]] && (( minor == 13 )) && [[ "$allow_py313" != "1" ]] && (( explicit_override == 0 )); then
-      log_line "jump over ${name} (Version ${version_raw}): Python 3 is disabled by default.13, Configurable VIBEGO_ALLOW_PY313=1 cover" >&2
-      continue
+    if [[ "$minor" =~ ^[0-9]+$ ]] && (( minor == 13 )) && (( explicit_override == 0 )); then
+      if [[ "$allow_py313" == "0" ]]; then
+        log_line "Skip ${name} (version ${version_raw}): disabled explicitly by VIBEGO_ALLOW_PY313=0" >&2
+        continue
+      fi
+      log_line "Detected ${name} (version ${version_raw}): Python 3.13 accepted by default; use VIBEGO_ALLOW_PY313=1 to prefer or 0 to disable" >&2
     fi
-    if [[ "$minor" =~ ^[0-9]+$ ]] && (( minor > 13 )); then
-      log_line "jump over ${name} (Version ${version_raw}): higher than 3.13" >&2
+    if [[ "$minor" =~ ^[0-9]+$ ]] && (( minor > supported_max_minor )) && (( explicit_override == 0 )); then
+      log_line "Skip ${name} (version ${version_raw}): above supported ceiling 3.${supported_max_minor}; override with VIBEGO_MAX_MINOR if needed" >&2
       continue
     fi
     if [[ "$minor" =~ ^[0-9]+$ ]] && (( minor < 9 )); then
       log_line "jump over ${name} (Version ${version_raw}): less than 3.9, May be missing official wheels" >&2
       continue
     fi
+    if [[ "$minor" =~ ^[0-9]+$ ]] && (( minor >= 14 )); then
+      log_line "Detected ${name} (version ${version_raw}): ensure dependencies support this Python version" >&2
+    fi
     chosen="$name"
     log_line "Using the Python interpreter:${chosen} (Version ${version_raw})" >&2
     break
@@ -438,13 +445,13 @@ fi
 log_info "master Started in background, PID=$MASTER_PID, Log writing ${LOG_FILE}"
 
 # Health check: wait for master to come online and verify key workers
-log_info "Start health check..."
+log_info "Start master readiness check..."
 HEALTHCHECK_START=$(date +%s)
 
-if python scripts/master_healthcheck.py --project hyphavibebotbackend; then
+if python scripts/master_healthcheck.py --master-log "$LOG_FILE"; then
   HEALTHCHECK_END=$(date +%s)
   HEALTHCHECK_DURATION=$((HEALTHCHECK_END - HEALTHCHECK_START))
-  log_info "OK: Master health check passed (elapsed ${HEALTHCHECK_DURATION}s)"
+  log_info "OK: Master readiness confirmed (elapsed ${HEALTHCHECK_DURATION}s)"
 else
   HEALTHCHECK_END=$(date +%s)
   HEALTHCHECK_DURATION=$((HEALTHCHECK_END - HEALTHCHECK_START))

{vibego-1.0.2.dist-info → vibego-1.0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vibego
-Version: 1.0.2
+Version: 1.0.5
 Summary: vibego CLI: tools for bootstrapping and managing the Telegram Master Bot
 Author: DavidChan
 License-Expression: LicenseRef-Proprietary

{vibego-1.0.2.dist-info → vibego-1.0.5.dist-info}/RECORD

@@ -1,15 +1,15 @@
 bot.py,sha256=OQj1KgrDie-8ucUdFafOxmFw2LFEElluWW6KKRy9qng,293940
 logging_setup.py,sha256=ViXK11TNVakIbA8QMLKXa6ywpAV_j1ydcws0Hx2QqNo,5084
-master.py,sha256=Tpw8LR3MUM1CEitUib75ckgstaJeBwq1M_wXtajumiE,131994
+master.py,sha256=7HBIVt3eTT_MDqD03nfsJZ2IkQfDpaPVL4zOTWdCKkE,132144
 project_repository.py,sha256=fdO3xzvt7eBLvek_3mXjXkFpALwllrNWDWeSjtscW2I,17675
 scripts/__init__.py,sha256=Sg-nUv9JfbojPpjpHlxImt6tA0p5-z1AqDA6csaFNZI,74
 scripts/bump_version.sh,sha256=bAV-NHTSmqnjrsHjvrNTF3wS2rxhF-lZ5h5kpK2-Zyc,4462
 scripts/log_writer.py,sha256=65HGLPREiBL1b4QRiMdxGmHfT21WBEUvg9RuCjP73Kc,3957
-scripts/master_healthcheck.py,sha256=QEWOCz4di_qPXxC0axtBdrsoaBXg2tpGpRObci1ITQ8,8935
+scripts/master_healthcheck.py,sha256=7uCCuKeyE70SjzWbT_ILxng3OUY1As2A0AeyGSOcaUg,4009
 scripts/publish.sh,sha256=e3tzRFtweJnLpJin0i43xpCWseX4jzeO2sAd2eGcTKk,3686
 scripts/requirements.txt,sha256=ukJbFLJyzqnQYMz6j07O-IOrG87IwXg0oikmn1nfJ9M,91
 scripts/run_bot.sh,sha256=I_b9zyIU1DicVHM8XJ-knAhJnj2pEHYOYpHjeHgZth8,5188
-scripts/start.sh,sha256=_6O9oSj-xhouXwGtho3z2oCpQ0nw5Iai8Ln13D9xmyE,15895
+scripts/start.sh,sha256=nqJHO9iJ-OHbLMaLxAyycRT0o1rprrzSVNwQV4QEphA,16350
 scripts/start_tmux_codex.sh,sha256=zyrLV2vzY8NTua9_d-QLq0cVMZVbMiFCZ-UM5Lwj-FU,4502
 scripts/stop_all.sh,sha256=bvl3--jNnXLt9xUrzPqXt8SWUNLAKTELwlMArU5-8gU,4400
 scripts/stop_bot.sh,sha256=1pI8hxQRIWJTOCLXddWMOmsnk3XIkuAlQwF9mPqRW_k,6163
@@ -426,15 +426,15 @@ tasks/constants.py,sha256=BNMxSnswF-PTij-p7paMK0G5Tj6wKN-6qpUlMwo1JQA,318
 tasks/fsm.py,sha256=6n0hdFNF3j6ZUcpdJ_TwZBgkrE8aMYHNLHppdGbXGO4,1494
 tasks/models.py,sha256=3OJL3F3nVZIQIejL6LplZkPQxYJXgOhCNA9Rikg8ihk,2461
 tasks/service.py,sha256=rzWFcwDh58Xeek0fOABXt7oFmaOC0ubunAeGeaK1_uA,42130
-vibego-1.0.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-vibego_cli/__init__.py,sha256=lvIyyWNVgNs4uzn5hhILunwdhlqcs4ePCSvZWtP9mQA,349
+vibego-1.0.5.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+vibego_cli/__init__.py,sha256=_ZU634Qo6uVGiUlIrzAnCqpBCHB5lHIiD8XjjxnV0aY,349
 vibego_cli/__main__.py,sha256=lM_m-i1x3yVNQhzRt8wqvuIYeeo1OlLNAEVoJVD7tmw,155
 vibego_cli/config.py,sha256=W-n5y4CTrRpencadWlmhpdrhUHX6tdXQEGXJG1pRM0U,3149
 vibego_cli/deps.py,sha256=nFT-DMsfAiD1lLFnDotxe6aYfeeD9V5TrIPbIbAMTF4,1478
 vibego_cli/main.py,sha256=CZAUHWr45GzzEfALoLuSrnvG2VUuCexiFuCpIvyH8Jc,12506
 vibego_cli/data/worker_requirements.txt,sha256=QSt30DSSSHtfucTFPpc7twk9kLS5rVLNTcvDiagxrZg,62
-vibego-1.0.2.dist-info/METADATA,sha256=FDMpU4rgKvX7HNtaOxsQv1me9dV_M9c2w88Sc9PyetU,12584
-vibego-1.0.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-vibego-1.0.2.dist-info/entry_points.txt,sha256=Lsy_zm-dlyxt8-9DL9blBReIwU2k22c8-kifr46ND1M,48
-vibego-1.0.2.dist-info/top_level.txt,sha256=R56CT3nW5H5v3ce0l3QDN4-C4qxTrNWzRTwrxnkDX4U,69
-vibego-1.0.2.dist-info/RECORD,,
+vibego-1.0.5.dist-info/METADATA,sha256=C2ZQFURSlr3I99EstFokPG8quQTlKkQ7SucqugcZRs8,12584
+vibego-1.0.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+vibego-1.0.5.dist-info/entry_points.txt,sha256=Lsy_zm-dlyxt8-9DL9blBReIwU2k22c8-kifr46ND1M,48
+vibego-1.0.5.dist-info/top_level.txt,sha256=R56CT3nW5H5v3ce0l3QDN4-C4qxTrNWzRTwrxnkDX4U,69
+vibego-1.0.5.dist-info/RECORD,,

vibego_cli/__init__.py

@@ -8,6 +8,6 @@ from __future__ import annotations
 
 __all__ = ["main", "__version__"]
 
-__version__ = "1.0.2"
+__version__ = "1.0.5"
 
 from .main import main  # noqa: E402