yee88 0.7.1__py3-none-any.whl → 0.9.0__py3-none-any.whl

yee88/cron/manager.py

@@ -19,37 +19,32 @@ class CronManager:
     def _validate_project(self, project: str) -> None:
         if not project:
             return
-        
+
         path = Path(project).expanduser().resolve()
         if path.exists() and path.is_dir():
             return
-        
+
         from ..settings import load_settings_if_exists
         from ..engines import list_backend_ids
-        
+
         result = load_settings_if_exists()
         if result is None:
             return
-        
+
         settings, config_path = result
         engine_ids = list_backend_ids()
         projects_config = settings.to_projects_config(
-            config_path=config_path,
-            engine_ids=engine_ids
+            config_path=config_path, engine_ids=engine_ids
         )
-        
+
         if project.lower() in projects_config.projects:
             return
-        
+
         available = list(projects_config.projects.keys())
         if available:
-            raise ValueError(
-                f"未知项目: {project}。可用项目: {', '.join(available)}"
-            )
+            raise ValueError(f"未知项目: {project}。可用项目: {', '.join(available)}")
         else:
-            raise ValueError(
-                f"未知项目: {project}。请先使用 'yee88 init' 注册项目"
-            )
+            raise ValueError(f"未知项目: {project}。请先使用 'yee88 init' 注册项目")
 
     def load(self):
         if not self.file.exists():
@@ -59,10 +54,7 @@ class CronManager:
         with open(self.file, "rb") as f:
             data = tomllib.load(f)
 
-        self.jobs = [
-            CronJob(**job)
-            for job in data.get("jobs", [])
-        ]
+        self.jobs = [CronJob(**job) for job in data.get("jobs", [])]
 
     def save(self):
         data = {
@@ -76,6 +68,8 @@ class CronManager:
                     "last_run": job.last_run,
                     "next_run": job.next_run,
                     "one_time": job.one_time,
+                    "engine": job.engine or "",
+                    "model": job.model or "",
                 }
                 for job in self.jobs
             ]

yee88/cron/models.py

@@ -1,4 +1,5 @@
 from dataclasses import dataclass
+from typing import Optional
 
 
 @dataclass
@@ -11,3 +12,5 @@ class CronJob:
     last_run: str = ""
     next_run: str = ""
     one_time: bool = False
+    engine: Optional[str] = None
+    model: Optional[str] = None

yee88/cron/scheduler.py

@@ -1,6 +1,8 @@
 import asyncio
-from typing import Callable, Awaitable
+from datetime import datetime
+from typing import Callable, Awaitable, Set, Dict
 from anyio.abc import TaskGroup
+from anyio import Lock, move_on_after
 from .manager import CronManager
 from .models import CronJob
 from ..logging import get_logger
@@ -19,6 +21,52 @@ class CronScheduler:
         self.callback = callback
         self.task_group = task_group
         self.running = False
+        self._running_jobs: Set[str] = set()
+        self._job_locks: Dict[str, Lock] = {}
+
+    def _calculate_next_check(self) -> float:
+        now = datetime.now(self.manager.timezone)
+        min_sleep = 1.0
+        max_sleep = 60.0
+
+        earliest_next_run = None
+
+        for job in self.manager.jobs:
+            if not job.enabled:
+                continue
+
+            try:
+                if job.one_time:
+                    exec_time = datetime.fromisoformat(job.schedule)
+                    if exec_time.tzinfo is None:
+                        exec_time = exec_time.replace(tzinfo=self.manager.timezone)
+                    if exec_time > now:
+                        if earliest_next_run is None or exec_time < earliest_next_run:
+                            earliest_next_run = exec_time
+                else:
+                    if job.next_run:
+                        next_run = datetime.fromisoformat(job.next_run)
+                        if next_run.tzinfo is None:
+                            next_run = next_run.replace(tzinfo=self.manager.timezone)
+                    else:
+                        from croniter import croniter
+
+                        itr = croniter(job.schedule, now)
+                        next_run = itr.get_next(datetime)
+                        if next_run.tzinfo is None:
+                            next_run = next_run.replace(tzinfo=self.manager.timezone)
+
+                    if next_run > now:
+                        if earliest_next_run is None or next_run < earliest_next_run:
+                            earliest_next_run = next_run
+            except Exception:
+                continue
+
+        if earliest_next_run is None:
+            return max_sleep
+
+        seconds_until = (earliest_next_run - now).total_seconds()
+        return max(min_sleep, min(seconds_until, max_sleep))
 
     async def start(self):
         self.running = True
@@ -28,29 +76,74 @@ class CronScheduler:
         cycle = 0
         while self.running:
             cycle += 1
-            self.manager.load()
-            logger.info("cron.scheduler.check_cycle", cycle=cycle, job_count=len(self.manager.jobs))
+            sleep_seconds = self._calculate_next_check()
+
+            if sleep_seconds > 5:
+                logger.info(
+                    "cron.scheduler.check_cycle",
+                    cycle=cycle,
+                    job_count=len(self.manager.jobs),
+                    next_check_in=sleep_seconds,
+                )
+
             due_jobs = self.manager.get_due_jobs()
 
             if due_jobs:
-                logger.info("cron.scheduler.due_jobs_found", cycle=cycle, count=len(due_jobs), job_ids=[j.id for j in due_jobs])
-            else:
-                logger.info("cron.scheduler.no_due_jobs", cycle=cycle)
+                logger.info(
+                    "cron.scheduler.due_jobs_found",
+                    cycle=cycle,
+                    count=len(due_jobs),
+                    job_ids=[j.id for j in due_jobs],
+                )
+            elif sleep_seconds <= 5:
+                logger.debug("cron.scheduler.no_due_jobs", cycle=cycle)
 
             for job in due_jobs:
-                logger.info("cron.scheduler.dispatching_job", job_id=job.id, message=job.message[:50])
+                logger.info(
+                    "cron.scheduler.dispatching_job",
+                    job_id=job.id,
+                    message=job.message[:50],
+                )
                 self.task_group.start_soon(self._run_job_safe, job)
 
-            logger.info("cron.scheduler.sleeping", cycle=cycle, seconds=60)
-            await asyncio.sleep(60)
+            logger.info("cron.scheduler.sleeping", cycle=cycle, seconds=sleep_seconds)
+            await asyncio.sleep(sleep_seconds)
+
+    def _acquire_job_lock(self, job_id: str) -> bool:
+        if job_id in self._running_jobs:
+            return False
+
+        if job_id not in self._job_locks:
+            self._job_locks[job_id] = Lock()
+
+        job_lock = self._job_locks[job_id]
+
+        if job_lock.locked():
+            return False
+
+        self._running_jobs.add(job_id)
+        return True
+
+    def _release_job_lock(self, job_id: str) -> None:
+        self._running_jobs.discard(job_id)
 
     async def _run_job_safe(self, job: CronJob) -> None:
-        logger.info("cron.job.executing", job_id=job.id)
+        if not self._acquire_job_lock(job.id):
+            logger.warning("cron.job.already_running", job_id=job.id)
+            return
+
         try:
-            await self.callback(job)
-            logger.info("cron.job.completed", job_id=job.id)
+            logger.info("cron.job.executing", job_id=job.id)
+            with move_on_after(180):
+                await self.callback(job)
+                logger.info("cron.job.completed", job_id=job.id)
+                return
+
+            logger.warning("cron.job.timeout", job_id=job.id, timeout_s=180)
         except Exception as exc:
             logger.error("cron.job.failed", job_id=job.id, error=str(exc))
+        finally:
+            self._release_job_lock(job.id)
 
     def stop(self):
         self.running = False

yee88/cron/watch.py

@@ -0,0 +1,54 @@
+from pathlib import Path
+from typing import Callable, Awaitable, List
+
+import anyio
+from watchfiles import watch
+
+from ..logging import get_logger
+from .manager import CronManager
+
+logger = get_logger()
+
+
+async def watch_cron_config(
+    cron_file: Path,
+    manager: CronManager,
+    on_reload: Callable[[List[str]], Awaitable[None]] | None = None,
+) -> None:
+    if not cron_file.exists():
+        logger.warning("cron.watch.file_not_found", path=str(cron_file))
+        return
+
+    logger.info("cron.watch.started", path=str(cron_file))
+
+    try:
+        for changes in watch(str(cron_file)):
+            for change_type, path in changes:
+                if Path(path).name == "cron.toml":
+                    logger.info(
+                        "cron.watch.file_changed",
+                        path=path,
+                        change_type=change_type.name,
+                    )
+
+                    changed_jobs = manager.reload_jobs()
+
+                    if changed_jobs:
+                        logger.info(
+                            "cron.watch.reloaded",
+                            changed_count=len(changed_jobs),
+                            changed_jobs=changed_jobs,
+                        )
+
+                        if on_reload:
+                            await on_reload(changed_jobs)
+                    else:
+                        logger.debug("cron.watch.no_changes_detected")
+
+                    break
+    except anyio.get_cancelled_exc_class():
+        logger.info("cron.watch.cancelled")
+        raise
+    except Exception as exc:
+        logger.error("cron.watch.error", error=str(exc))
+        raise

yee88/telegram/loop.py

@@ -1092,15 +1092,57 @@ async def run_main_loop(
 
                 async def _execute_cron_job(job: CronJob) -> None:
                     try:
-                        context = RunContext(project=job.project) if job.project else None
+                        from ..model import EngineId
+                        from ..markdown import MarkdownParts
+                        from ..transport import RenderedMessage, SendOptions
+                        from .render import prepare_telegram
+
+                        context = (
+                            RunContext(project=job.project) if job.project else None
+                        )
+                        engine_override: EngineId | None = (
+                            job.engine if job.engine else None
+                        )
+
+                        header_text = f"⏰ 定时任务开始: {job.id}"
+                        if job.project:
+                            header_text += f"\n📁 项目: {job.project}"
+
+                        rendered_text, entities = prepare_telegram(
+                            MarkdownParts(header=header_text)
+                        )
+
+                        initial_ref = await cfg.exec_cfg.transport.send(
+                            channel_id=cfg.chat_id,
+                            message=RenderedMessage(
+                                text=rendered_text, extra={"entities": entities}
+                            ),
+                            options=SendOptions(
+                                notify=True,
+                            ),
+                        )
+
+                        if initial_ref is None:
+                            logger.error(
+                                "cron.initial_message_failed",
+                                job_id=job.id,
+                                error="Failed to send initial message to Telegram",
+                            )
+                            return
+
                         await run_job(
                             chat_id=cfg.chat_id,
-                            user_msg_id=0,
+                            user_msg_id=int(initial_ref.message_id),
                             text=job.message,
                             resume_token=None,
                             context=context,
-                            thread_id=None,
+                            thread_id=int(initial_ref.thread_id)
+                            if initial_ref.thread_id
+                            else None,
                             force_hide_resume_line=True,
+                            force_new_session=True,
+                            run_options_model=job.model,
+                            engine_override=engine_override,
                         )
                     except Exception as exc:
                         logger.error(
@@ -1116,6 +1158,18 @@ async def run_main_loop(
 
                 tg.start_soon(run_cron_scheduler)
 
+                from ..cron.watch import watch_cron_config
+
+                cron_file = config_path.parent / "cron.toml"
+
+                async def run_cron_watch() -> None:
+                    await watch_cron_config(
+                        cron_file=cron_file,
+                        manager=cron_manager,
+                    )
+
+                tg.start_soon(run_cron_watch)
+
             async def run_signal_watcher() -> None:
                 if not hasattr(signal, "SIGHUP"):
                     return
@@ -1168,6 +1222,8 @@ async def run_main_loop(
                 engine_override: EngineId | None = None,
                 progress_ref: MessageRef | None = None,
                 force_hide_resume_line: bool = False,
+                force_new_session: bool = False,
+                run_options_model: str | None = None,
             ) -> None:
                 topic_key = (
                     (chat_id, thread_id)
@@ -1178,15 +1234,22 @@ async def run_main_loop(
                     )
                     else None
                 )
+                if force_new_session:
+                    topic_key = None
+                    chat_session_key = None
                 stateful_mode = topic_key is not None or chat_session_key is not None
-                show_resume_line = False if force_hide_resume_line else should_show_resume_line(
-                    show_resume_line=cfg.show_resume_line,
-                    stateful_mode=stateful_mode,
-                    context=context,
+                show_resume_line = (
+                    False
+                    if force_hide_resume_line
+                    else should_show_resume_line(
+                        show_resume_line=cfg.show_resume_line,
+                        stateful_mode=stateful_mode,
+                        context=context,
+                    )
                 )
                 engine_for_overrides = (
                     resume_token.engine
-                    if resume_token is not None
+                    if resume_token is not None and not force_new_session
                     else engine_override
                     if engine_override is not None
                     else cfg.runtime.resolve_engine(
@@ -1203,6 +1266,15 @@ async def run_main_loop(
                     topic_store=state.topic_store,
                     system_prompt=cfg.runtime.resolve_system_prompt(context),
                 )
+                if run_options_model:
+                    if run_options is None:
+                        run_options = EngineRunOptions(model=run_options_model)
+                    else:
+                        run_options = EngineRunOptions(
+                            model=run_options_model,
+                            reasoning=run_options.reasoning,
+                            system=run_options.system,
+                        )
                 await run_engine(
                     exec_cfg=cfg.exec_cfg,
                     runtime=cfg.runtime,
@@ -1210,7 +1282,7 @@ async def run_main_loop(
                     chat_id=chat_id,
                     user_msg_id=user_msg_id,
                     text=text,
-                    resume_token=resume_token,
+                    resume_token=None if force_new_session else resume_token,
                     context=context,
                     reply_ref=reply_ref,
                     on_thread_known=wrap_on_thread_known(

{yee88-0.7.1.dist-info → yee88-0.9.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yee88
-Version: 0.7.1
+Version: 0.9.0
 Summary: Telegram bridge for Codex, Claude Code, and other agent CLIs.
 Project-URL: Homepage, https://github.com/banteg/yee88
 Project-URL: Documentation, https://yee88.dev/

{yee88-0.7.1.dist-info → yee88-0.9.0.dist-info}/RECORD

@@ -40,9 +40,10 @@ yee88/cli/reload.py,sha256=ays9R2kJ0IQEPGfxb3BY7R2mxbJBmp325dKrqqv1nw8,3552
 yee88/cli/run.py,sha256=qKMJCEwoiNN4Qqt59Gmm1bDQHTboGf8JO73gMeACAck,14197
 yee88/cli/topic.py,sha256=6j_o0wpHMfkyeyj9wcjU5T5PVXw_cOM0qM5fsMDRiIw,11019
 yee88/cron/__init__.py,sha256=WZN2RcqJD4i6ZPZjI6b_sKI1VxhNGzhDu2Pju5u9J0o,152
-yee88/cron/manager.py,sha256=MOKYxGMEDH-rMMdd5nZmltp1kimzrO9L8OuV-HIoKnc,5500
-yee88/cron/models.py,sha256=IZtUvMBr2_wZbgEWR3U9yQW-QEOMzUybDER8B7Ne8Go,224
-yee88/cron/scheduler.py,sha256=ITNqpF4MXUieuuFBvVHgzOVxxR5bnhGAFYvWTJWy-IU,1922
+yee88/cron/manager.py,sha256=VRnhue8AzIWoRyqSs_xe4xiMT01Dp24v_yOVeFXk-T0,5440
+yee88/cron/models.py,sha256=Ue7Q9ZhA34t0y4HttZrJX9aU_v8G0dT4fsotz1iGpXg,317
+yee88/cron/scheduler.py,sha256=bpjLRy0aVUG6lMzkR8Ty_1S5I6PybmOxhBDbk_pTIzI,5071
+yee88/cron/watch.py,sha256=pMIYiQuXcm9gW0G4ns7GRakkBtB_yGM5wwi8cvxJmDM,1637
 yee88/runners/__init__.py,sha256=McKaMqLXT9dJlgiEwKf6biD0Ns66Fk7SrxwtcP0ZgzI,30
 yee88/runners/claude.py,sha256=mj-L_V-cuCUWL9BW90I645EgDsjRHNdmpLQxN7skUL0,15518
 yee88/runners/codex.py,sha256=fUipu9NsRhhHCIt8s5WkZcT03si1CIEbGrXGmcSlFUo,21427
@@ -70,7 +71,7 @@ yee88/telegram/context.py,sha256=Hb8-k-YbAjO0EmZ35hA8yyMvl1kozgYHUL1L-lbCglA,468
 yee88/telegram/engine_defaults.py,sha256=n6ROkTmP_s-H5AhPz_OdT62oZf0QtZJyFEDjp5gfub4,2594
 yee88/telegram/engine_overrides.py,sha256=kv2j102VP-Bqzbutd5ApBkjW3LmVwvCYixsFewVXVeY,3122
 yee88/telegram/files.py,sha256=Cvmw6r_ocSb3jLzJLGVbzr46m8cRU159majJ1-A5lvg,5053
-yee88/telegram/loop.py,sha256=pjSIsvIAg4N-83EjNHkDnoz8LHF0rQkwkdCN8NAcNZY,69778
+yee88/telegram/loop.py,sha256=emRad9j60oQ_T0V8Ku2FsHr6hunT23uzCJ69va4dSAI,72880
 yee88/telegram/onboarding.py,sha256=QWYaJT_s2bujDxzKjsZuLytyxs_XFDRuiBrsZGRjoOw,35633
 yee88/telegram/outbox.py,sha256=OcoRyQ7zmQCXR8ZXEMK2f_7-UMRVRAbBgmJGS1u_lcU,5939
 yee88/telegram/parsing.py,sha256=5PvIPns1NnKryt3XNxPCp4BpWX1gI8kjKi4VxcQ0W-Q,7429
@@ -104,8 +105,8 @@ yee88/utils/json_state.py,sha256=cnSvGbB9zj90GdYSyigId1M0nEx54T3A3CqqhkAm9kQ,524
 yee88/utils/paths.py,sha256=_Tp-LyFLeyGD0P0agRudLuT1NR_XTIpryxk3OYDJAGQ,1318
 yee88/utils/streams.py,sha256=TQezA-A5VCNksLOtwsJplfr8vm1xPTXoGxvik8G2NPI,1121
 yee88/utils/subprocess.py,sha256=2if6IxTZVSB1kDa8SXw3igj3E-zhKB8P4z5MVe-odzY,2169
-yee88-0.7.1.dist-info/METADATA,sha256=CcgQN8xjM0IfbL-tv1FY8HcH4jz-tcPV27VROzOGgOg,4340
-yee88-0.7.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-yee88-0.7.1.dist-info/entry_points.txt,sha256=P4MVZ_sZfrHaARVMImNJjoGamP8VDukARWMKfDh20V8,282
-yee88-0.7.1.dist-info/licenses/LICENSE,sha256=poyQ59wnbmL3Ox3TiiephfHvUpLvJl0DwLFFgqBDdHY,1063
-yee88-0.7.1.dist-info/RECORD,,
+yee88-0.9.0.dist-info/METADATA,sha256=jglWFP-VyXSgi3a0tuGE_A0SPfIpkms5rg3NjY9QQB8,4340
+yee88-0.9.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+yee88-0.9.0.dist-info/entry_points.txt,sha256=P4MVZ_sZfrHaARVMImNJjoGamP8VDukARWMKfDh20V8,282
+yee88-0.9.0.dist-info/licenses/LICENSE,sha256=poyQ59wnbmL3Ox3TiiephfHvUpLvJl0DwLFFgqBDdHY,1063
+yee88-0.9.0.dist-info/RECORD,,