From 6020ce5acbd7586b2bd6c18cf5354cf4b8dcd435 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Omar=20S=C3=A1nchez=20Pizarro?= Date: Mon, 9 Oct 2023 14:55:54 +0200 Subject: [PATCH] send message async --- .../google_calendar.cpython-311.pyc | Bin 8011 -> 7913 bytes app/__pycache__/telegram_bot.cpython-311.pyc | Bin 1362 -> 1514 bytes .../timenet_manager.cpython-311.pyc | Bin 8298 -> 8529 bytes app/telegram_bot.py | 11 +++++------ app/timenet_manager.py | 6 ++++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/__pycache__/google_calendar.cpython-311.pyc b/app/__pycache__/google_calendar.cpython-311.pyc index b0a922884514b59b8043f0c1bb6f407394344371..eff54d6e67b89dce4d1e4eda239afd47800e00f7 100644 GIT binary patch delta 195 zcmX?Y_tKVkIWI340}vQ1zfC#1kynq8(QdL0pY7z;e6j+}MQlKsB3=-|2P7tc%Z%N=+kPAtjH&x=paNX*Mi&6&K6&z#X@@;yFTsRtZ9Jv`Sr3@&jP zT;wpi!eMj)hBp7_o5CpW3^YrVrHBJ$t_z6Z1QD*AR|&YYv$=uTUX#CzM=_>M4wCQ? ziUSJVVofbe%_}Ji1xZG1UL(=VtOZdB637G+D;bK^L2P*t!3`t$fsEpXlapnlc$ry^ kKQO?E&1Yp~8KrVT%HXdW|4ae09<%W5dZ)H diff --git a/app/__pycache__/telegram_bot.cpython-311.pyc b/app/__pycache__/telegram_bot.cpython-311.pyc index b3f71bb2eb7fa94b5c2883e312d6f11ad82456ef..5d88a3baf4fb67599657fb35f7a330da4d508926 100644 GIT binary patch literal 1514 zcmb7E%}X0W6o0e3`Pdj!h@ch`0-`jB8Y_jiG!%@79@+*WU~vy!x7qcpiJQ)@pY;%k z6rnu|UcJ;(Y{7F+#lIktErx|cp_lfiM5uV`n_V{=iDGAV-oE$def;*l+4xCSv!!O zQcQVTjdN5)khWlIi)P$US?z5eTVng&9^3p&6j}^zR(+-!hBB$yykXKfXA6dwo3I0U zS8K2i#$qQA5>t9!OXzupCPtPp3(b#EeMZZgMnai0^@-{1ltvRup^)$}$(W(PutXym zVY$Q8B8L8RS=paqq_L5|aTei6Ti1H>gMV|`iVg1Evtkb`ZAq&wxhA|1R@*w(?;ijW z6>@!Ajkd4f+K=|_Mf<+Y@61?

J_3@$`FUwEX-?!ta~!U!_LJs;@mrSD5oo`tD#}fiMBJ&iNVmE1d}fKN3;t?b`uzjNU&doRH3`v y_*CIW(V0KRp0#dE?5T*ome{*54(y2o6>-oK2aEm#zn?Jt&FP_|Ke}YsLG}-&*h@D6 literal 1362 zcma)5Uu)A)6u&n~+oWqZq=O-LQkWg&WgUA_VJLPFinuXQ6oL@aCS6;brru<-)jbs1 z!yfi16nxst=45_=eFPPSc0^VJg5Z-6LS;Vf$#ZX-tb+-jo1Am*J%4h}@1DF(CgTX` zSNW6v3M2G`ZUPbp%E=2*+DJz_t|5g=u7*uc;V|Nm!BzPnU=NgoV1sso`0#`(=Y5n2 zhwdVs-$c5w$3Zl_J}FThKSXlmC*3Z|*h?0zda1IaHZ)=zq&RS60t#nzauq}y8A!o8 zQaBweyv}VRMW7#0A}pccjW|ZlSRtC3x16P75K9x#f@w1+Pl2_OGi0lVx--<4jxU3! zPday|zvuVB{~(OnKxzn*j-V}J$rFPzyoh5xGwL!XB4m;U5(DA!P@Na`d-nK(}$YU=v(T_>-pW%zT!^bIGk{&?{rf6ZYuAl@>{~TxCQG3 z{7^BxHP}SqWgxx*rHwXF6{Jr)At1pCmHz{%Lopf920jn2Ltz_GH4}$Otuz*hXDnG;CX2F$e|8<86od zNu*^um5bo*3HKf?K9D(*pdK;P_qQoRnG8vSAmhNA6T{FCWu_kXJg^q(iHU9TSWF*@ z>D|Zs_ucIEL&?qNzob4q`I!Ek{#vNI1;;I{cf@p8Y`S8z6Fg)L639_{({;@>RMm^C zw3pQy)f1}vd{wLY7StND z?BpWu=cX9}RDaB2KncAXFR{S>Zw4gs;x$Xt{S$^YD}$uL@vOd6ao+Fg7Ri8t4wt;#Km`GckdWvLLLeb{NKizhLq+hwLy3e^wNg=45HsgE#Z~Fr z_ucHw&dl!2&fFh67k7K!_jp_cM&hp){pa(Z5WROk7TrTLLQ>F(X3L0KF)304w2-l9 z9Z82p(~OjqfG1|;tTXA%x{|J}JL%3UNre&{(Vb}z_xkH-6(3Pl{+3!LC#!+&O4nFy zZ<#%i^x4QhqS;?3n&YyKkSp+%M$)g*LnJQU!0Aw&nzEKE=!J=_4z%6K=z4xWOxr1y z_%pUQsCRzJ_C4M0g~g^&WEoZu6l=h#I0kdW4rCMu^PwaRFy%vYIlVBL%B9A2)-|pd z>iKWtu&9ERUlnFMSshSufiH&EYHoC5(iB)R$Ety8x(z+24VJtzbi`@^3<`km??{O)ab&au%#h#Z>a*^1 zPhA+irgr|Qc7C8Obv?bP?p;#%F3S6s`c&3KI_4)ELCg3s)qZkw8pg^WzeAHCApSdtk`2wE4vK-b%_-TI-Zg?w=@UMJvD9;t&0DZ)|)<~tzQ%M<9`EhV+AkHd)1ymqS7klh|ERT+F*dT^Y_#h z$8Oj+>){szVe00e2lDnC*fDr(?OwQLnc6wH)tFO=e9A-=NL#lCpk; z!~D}=PxoeAB@_#z>0MHK7nI)Xiudid3te;Gxm}CCwk2QNq7qwD zVhc)azOLb@%@q$F5Xg5z+ktjI)3ot0wxv=h!on$4v{l>I);A&#_g0F{08-l!_8`0h z@F8JXwx#a@)+nV6>}g+2r>$syV&?}ia{GP?Ro1B8Gn(O%AU#G z*hE?6%1oxT5~q}F>u4v@%KCBd%Kh0%t(eibv)4d?t;4tjuqseWmr2!(_4}2-8>#1? tM4bG~h+1E}Kq~&r#4}_4mib~N%KwZE>^My+gyP|N)8gO$AE~vqe*r;f#6kc7 delta 1968 zcma(SU2Icj^!x7Zy}kY2x^B1Y*4=e;e;o@jWWsQa1r0wEm_bdTk&v=mx0SW4-@T1w z)CD6kKrp(T2OcC^O~e>@AlZ|NF;QQP24sqXG||YLe=#*0BRqM|Eh`o=@uc^B=l`7V z=bWx=|7jxdULfFQ2(M&5H}@GMCuilP%$dnddCrwpl1f%hs#$l^oz;>W zXA(;*8P8Hhmr7n(35MZKUxSwPp;*oMQ4CjuI=tlzZcGLxwv(Bzlgv~uNQ_;?uL{Wq zlRw20>W{?kOYpL0rtGvmn@ul2#@BGJ!n|~v2bOP3U+}?3v?5vbqYlI&acp^bu%04TdGxt_g zi9VEw21FLsNI4B{aEPQ<7orpFrsh8zxS@4@rFE5hu6K{FXj`spTduACM0j~o3-b_N zQ+=FwJcB#|S3G;2GT-IR@Ub@%bL@K2xa>+Fo3-m*{`9WrL(uP=K$k@=3NQI)`diT! zD<7fw9fbasiG-V>(Qoi!Smz%`-<1D&2icZgDKTx8T?H#G>NDN;_wW%g0)6fDYNl%U zgADbEjNk9}^5K9>RyGt_Npl|l@y0MOF5QYqW)u9a>CASq;;|O#Q)*F%Pp7tB#CiT2^Tah13N2#5xqs)GI z)dDk7|2bfGz(;`?#KRG8z~*p*cfyhIR{lSII*s~VFM7~B3}7}cjbPM$P3$};wNS((k{3$}2>mDbU| z^`zTK$eB=do@K>MA1O==YIZS7=m2bw4)36I$6;tsiD9BN8dMAOxwN2xknjm-ZfH}f zIc({a5PQhTH8WojWqD@zJ|rifd0Ir_gXlO9!C%oqbu(I6H*=;ihty~f8?5fWckzf!;;q>-POfD>+0L>fgxkySsEPGS&xV%!5Kas4E&!Oi4oz#B= D;){x$ diff --git a/app/telegram_bot.py b/app/telegram_bot.py index 1848138..fc3d9e3 100644 --- a/app/telegram_bot.py +++ b/app/telegram_bot.py @@ -1,5 +1,5 @@ -import telegram from app import config_parser +import telegram config = config_parser.ConfigParser().loadConfig() @@ -7,8 +7,7 @@ config = config_parser.ConfigParser().loadConfig() class telegramBot: bot = None - def __init__(self): - self.bot = telegram.Bot(token=config['telegram']['token']) - - def sendMessage(self, message): - self.bot.sendMessage(chat_id=config['telegram']['chat_id'], text=str(message), parse_mode=telegram.ParseMode.HTML) + async def sendMessage(self, message): + self.bot = telegram.Bot(config['telegram']['token']) + async with self.bot: + await self.bot.sendMessage(chat_id=config['telegram']['chat_id'], text=str(message)) diff --git a/app/timenet_manager.py b/app/timenet_manager.py index e9923b3..5df0386 100644 --- a/app/timenet_manager.py +++ b/app/timenet_manager.py @@ -1,3 +1,5 @@ +import asyncio + import requests, json, pytz from datetime import datetime from time import sleep @@ -34,11 +36,11 @@ class timenetManager: return requests.post(furl, data=data, headers=headers) def addMessage(self, message): - print(message) self.message_acumulator += message + "\n" def sendReport(self): - self.telegram.sendMessage(self.message_acumulator) + # self.telegram.sendMessage(self.message_acumulator) + asyncio.run(self.telegram.sendMessage(self.message_acumulator)) def updateTime(self): self.headers["tn-d"] = "\"" + datetime.now().astimezone(pytz.UTC).strftime("%Y-%m-%dT%H:%M:%SZ") + "\""