From 860d305c44f4916570c4b96df29638c0cdaee13c Mon Sep 17 00:00:00 2001
From: Jiaqing Liang <l.j.q.light@gmail.com>
Date: Tue, 24 Feb 2026 11:13:05 +0800
Subject: [PATCH] friendlier exit messages for tgapp; scheduler sleep-first and
 dir check

---
 .gitignore   | Bin 963 -> 1099 bytes
 agentmain.py |   3 ++-
 tgapp.py     |  18 +++++++++++++-----
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index b929f0ff3483cb86a472c37bf7663107617c03d6..c8ca6bf0ddc91216d30aa6dad364fcdd6a32d8f8 100644
GIT binary patch
literal 1099
zcmZ`&OK;Oa5cb)U|ASFEMXLK73gOTLqEZSR5L!9*CfU~Z8t=LxoPa)fDMhIC0aR2)
zE$X37D*;t$97RG1_0(UHwcAt0i7T_V`-l*S^~}zE^UY(&1A1@&YrM1<FFxzF_r&^l
zP3742hd`uXO&!oj8@xt6J&6{Nciv>c-u_%Nw<A7HX(~c~!!oTJMhKz`hTphnQTslq
zSN(=zIVNM8YD{8p65P4SF6EFoHW+Qfcp8eU)j{G_C|qRT5)ZKHI)v*dGtH#al1Za^
zvAqm@?97*AM~XLcluX8;0t_C5*w{>|S>2b#u{zDT<N0Q<vyyyiC+*d&B|sNTsKjZ2
zHFc~Ox@BhA<s7}TC02Ihr47+tf-1zb?YP;Jd=9Nb9JHgUX2@&CIHR5{U35Fi!bZHg
zCO*Cr^G$K^_PDhxIt!ZWLS+sLF!QO$Ff;f=p5^GZ+v4Tg@$Qs3_?&!brC@Hd36^$P
zFdh-;Am!d(7Ed?hh1c=)YOlK%KiNs%PfPml?D;F6M$b>)t@jRQ#mtt79s@ux-5NcO
zUO)lZr9oq;ps81KH514+J+q2k>~X}XZ@6}rZrE{XUFU&mO%SiD(~8b~Y>^7FBqhA<
z8BHCR5yL$6&%@6=FdFJnmxc^c9|tBU)cXg-V1?|^!8VdzpSxwp&iI4tJaF^?J0{1r
z&M9>+CC=Tjc^Adxwmur@6EVy5JRJOw>Jp@n?vlNaa_r_^TrLJ=5-4FB7x}ph<FHdl
zUqC4=!;n4Rk7l{G4?0}Drr#b(o4w#Q?J^2UTAQ5A9l}D>fj=d*32ZiOK5Pptm)v4x
zQP(9r+c3aJzuK+Cqod#7{_Gw8?EZ*UIq`JZGRRe^Vk=m26r=<onc{=R11WU_P6KY1
TG6+Z7D}W@RbFdT?O;MG<cEO~y

delta 599
zcmX|;L2DC16vs(&P~S;VsM6YQY`p}X{R&#+p@LRO)q~11yE`URcX!sE+0+OkB2rKy
z$XJ6|l!6rx8UjkG4WS2*9{duS-S#thaV9OfJcj@O|9<cB=FidJN6ySz!|k70XDfTR
zI_z($&%Z#BFt$OM@}@j<9ULcadDv?Z$FZS;;?^CH`S+kQ7q^fXV9o(GNz}CAppKqy
zN(0{ppK@V(NWFf6M)#Q}zMpyuh>L{aFreCmS!<zs#oB+-&Iesh;u=nDK-4GLwDOgB
zRGCR;vOOHE=Rf*+|I@+3fT}g8CRjpXsgZ^*N4`5su76YOy{xmTc00rE*J|~9*6wOh
z!0Hu1dPl&iXrN`zBF$C1gM4i>`?{e%zEZNScHZuFdup&I<HE^v1~=^Y)ys{&-gC9{
zCI8UX76{BAaJ_#8J*F|pUg6>~2uaA2mR*tm3grUGnc~^gP(Bn_i0g17(%9iFMxih7
z7U$%%;`DjL50)QZ7D-?wB*23BmS8O4<JLo0pI-hgPH6CcacW}hYQDog97QBCiRseh
z34>g^cAL1>gf>ZH)fR8a#nR+)qt{Xw*GVKs;*-*;t46$3owsf-jK+?+*ms?jYNQF=
hqCCZcRTHUCnfWFg62i^h9gl?}6-Yc1GA~&L_zx6J<GKI<

diff --git a/agentmain.py b/agentmain.py
index 9e961d0..47e8e07 100644
--- a/agentmain.py
+++ b/agentmain.py
@@ -145,7 +145,9 @@ if __name__ == '__main__':
             while 'done' not in (item := dq.get()): pass
             open('./temp/scheduler.log', 'a', encoding='utf-8').write(f'[{datetime.now():%m-%d %H:%M}] {tag}\n{item["done"]}\n\n')
         while True:
+            time.sleep(55 + random.random() * 10)
             now = datetime.now()
+            if not os.path.isdir('./sche_tasks/pending'): continue
             for f in os.listdir('./sche_tasks/pending'):
                 m = re.match(r'(\d{4}-\d{2}-\d{2})_(\d{4})_', f)
                 if m and now >= datetime.strptime(f'{m[1]} {m[2]}', '%Y-%m-%d %H%M'):
@@ -153,7 +155,6 @@ if __name__ == '__main__':
                     dq = agent.put_task(f'按scheduled_task_sop执行任务文件 ../sche_tasks/pending/{f}（立刻移到running）\n内容：\n{raw}', source='scheduler')
                     threading.Thread(target=drain, args=(dq, f), daemon=True).start()
                     break
-            time.sleep(55 + random.random() * 10)
     else:
         agent.inc_out = True
         while True:
diff --git a/tgapp.py b/tgapp.py
index 51483af..803ea39 100644
--- a/tgapp.py
+++ b/tgapp.py
@@ -1,9 +1,13 @@
 import os, sys, re, threading, asyncio, queue as Q, socket, time
 sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
 from agentmain import GeneraticAgent
-from telegram import Update
-from telegram.ext import ApplicationBuilder, MessageHandler, CommandHandler, filters, ContextTypes
-from telegram.request import HTTPXRequest
+try:
+    from telegram import Update
+    from telegram.ext import ApplicationBuilder, MessageHandler, CommandHandler, filters, ContextTypes
+    from telegram.request import HTTPXRequest
+except:
+    print("Please ask the agent install python-telegram-bot to use telegram module.")
+    sys.exit(1)
 import mykey
 
 agent = GeneraticAgent()
@@ -89,8 +93,12 @@ if __name__ == '__main__':
     # Single instance lock using socket
     try:
         _lock_sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM); _lock_sock.bind(('127.0.0.1', 19527))
-    except OSError: sys.exit('Another instance is already running.')
-    if not ALLOWED: sys.exit('ERROR: tg_allowed_users in mykey.py is empty or missing. Set it to avoid unauthorized access.')
+    except OSError: 
+        print('[Telegram] Another instance is already running, skiping...')
+        sys.exit(1)
+    if not ALLOWED: 
+        print('[Telegram] ERROR: tg_allowed_users in mykey.py is empty or missing. Set it to avoid unauthorized access.')
+        sys.exit(1)
     _logf = open(os.path.join(os.path.dirname(__file__), 'temp', 'tgapp.log'), 'a', encoding='utf-8', buffering=1)
     sys.stdout = sys.stderr = _logf
     print('[NEW] New process starting, the above are history infos ...')