From 810e5177571512354604c3226208926215a27236 Mon Sep 17 00:00:00 2001 From: vylion Date: Tue, 19 Sep 2017 17:58:56 +0200 Subject: [PATCH] Uploading Velasco v1.3 - Now starts a message only on the start of a memorized message - Now does markov chain key lookups with casefold for extra flexibility - Now saves on /freq change too - Now updates chat name in chatlog if it changes --- __pycache__/chatlog.cpython-36.pyc | Bin 1963 -> 2207 bytes __pycache__/markov.cpython-36.pyc | Bin 1723 -> 1833 bytes chatlog.py | 14 +++++++++++--- markov.py | 20 ++++++++++---------- velasco.py | 21 +++++++++++++-------- velasco.zip | Bin 0 -> 3706 bytes 6 files changed, 34 insertions(+), 21 deletions(-) create mode 100644 velasco.zip diff --git a/__pycache__/chatlog.cpython-36.pyc b/__pycache__/chatlog.cpython-36.pyc index 2237ed8fa4dd93abeb497b6e41d9fff8f80299b2..201f5dc36a4b327b6aaf6d518404b913a2e82340 100644 GIT binary patch delta 551 zcmYk2&ubGw6vyXfW;feyV$+xgto^Z(8rh(wqIeMxQoQuw50rw7P}c6)Zo6c0c8m}r zN)_=WgokHy_t=Y|BK{kTcg6p}oA2dNJiO1mc|T^p?|qv4IPYJn*Zud`e?0u^j{WG= zwh%oe!hlGfPVtT&U>Z$vbkz?-$lE@c#VFV+wLw3Mg)olaRGVDGusZIi$2lPR(5#%Q5>%G{f106gu z`e`tTvuAoeoxBB7U;5j8y=6>paH4t_&hXzgf&dSEG6gOS8~=;uSMV>qgAN{%tTwuG z3%YnuK5|#7&n)4wyat!>kIdmRMrs9rtLKeHN|oS;o|)mIHs;Q9>nypUoUX8Rvb3)Y zvy2mGk(U0&`QGKdnFWRTlM89eh9^DGbG)jjFs^R>18`e&c#)*YIk3tv@{D=nGoAvCBJ5+<|acs zG3XED#1!$)E5a5&db3(c&K!Z0gZGCM?V1t|B7#q_0ly5p_~dI?#JOKTD$w}v@d~Lb fVS}(qs1vgP5l~Avgsp@+2`Z36`qGsgPh{g4XO%^d diff --git a/__pycache__/markov.cpython-36.pyc b/__pycache__/markov.cpython-36.pyc index 69fd75edca47bf60a8ff7b0bccff7b3211ef7952..0a7c9aa12ca06790923403c67fda5e453622d31c 100644 GIT binary patch delta 633 zcmZvZ%WG3X6vofF^SC#+B-T_-BlIPqH7;D3RY6PfLB&NB6pBS#V&*3FCgw4@)DY$p zFydCi?7J7-32t18JGY99{09o|#g%8;jSCm^8_vvkzL{_4WA<$>Q^{t-dpABk{x;3L zyR-!WhhX3UnvQ5tK`YRU3R6^`!2(RbuFbLP3`SzDb<_^0zjv@=w{ayrirTe7z5A@2 z*nQl<-22z~8OM*va9A}E!vt=_)0UE%BF|BL!tyFix~)Fe~C3288F zB;4QxDdt|9F+nVhbOFfBZ^^+IBV$RCeaD7Ju09>{Jqgr_>H+kRjh{fAaXbHL$0RPo z1Wym@A5(rm4oxsYdWE2>k@Ea-$@N)>dBTXhzZvCrqE4i1Nu*YjXqf!L)$-g->RLy2 zpU-?ZA9fNQxGv$4cevni-r?jmMbF+B3mDqE*jU&LJLGflqN~+4U2vL3I~8{dS1`mp jUL|tO5tlJQ?ycKjqJ$T1UT$K^zL5o6m&>?hU&_tD<2sTd delta 442 zcmXAjy-QqC5XI-b`|&viK2#@Nn^MwQpD0V(u!u zI)&Uem0%%+G^s+06d_frGz$I&mi_}F&dU~a?mctv%>7+Xe6PeSl}d8^?Z?jZv-opk zorsQz=>v621tX`ho$5=q}^%H(#_l?XBH<>aj=mouB z-&YPUaEigfVc;}t$o)0O}>IIv97KiEC3z+tfs>sq$&r>VKJCC?JflUBqE# z*pw79Y`eC9&W7z_AT+ic=3fS3`agY3y%F01Wl@=o-_)tVcyDhc%r=WTEFk1zD@P)5 z`GZob{=hsz;!n(+zc90i{V%f^<}+nh^Z(4t+9M>GLPJzzLUaZZbkOj7b{=(qYS-}8 P|Ft#$$2RcT-`TZ$RaRk6 diff --git a/chatlog.py b/chatlog.py index f57a380..c1c3186 100644 --- a/chatlog.py +++ b/chatlog.py @@ -19,6 +19,17 @@ class Chatlog(object): freq = 5 self.freq = freq + def set_title(self, title): + self.title = title + + def set_freq(self, freq): + if not freq > 0: + raise ValueError('Tried to set 0 or negative freq value.') + elif freq > 100000: + freq = 100000 + self.freq = freq + return self.freq + def add_msg(self, message): msg = message.split() msg.append("!kvl") @@ -38,9 +49,6 @@ class Chatlog(object): def get_count(self): return len(self.msgs) - def set_freq(self, freq): - self.freq = freq - def to_txt(self): lines = [self.id] lines.append(self.type) diff --git a/markov.py b/markov.py index bc0725f..fe7007a 100644 --- a/markov.py +++ b/markov.py @@ -8,7 +8,7 @@ class Markov(object): self.words = [] if text is None: text = "" - self.words = text.split() + self.words = ("!kvl\n"+text).split() self.word_size = len(self.words) self.database() @@ -26,25 +26,25 @@ class Markov(object): def database(self): for w1, w2, w3 in self.triples(): - key = (w1, w2) + key = (w1.casefold(), w2.casefold()) if key in self.cache: self.cache[key].append(w3) else: self.cache[key] = [w3] def generate_markov_text(self, size=50): - seed = random.randint(0, self.word_size-3) - seed_word, next_word = self.words[seed], self.words[seed+1] - while "!kvl" in seed_word: - seed = random.randint(0, self.word_size-3) - seed_word, next_word = self.words[seed], self.words[seed+1] - w1, w2 = seed_word, next_word + seed = random.randint(0, self.word_size-4) + seed_word, next_word, next_word2 = self.words[seed], self.words[seed+1], self.words[seed+2] + while not "!kvl" in seed_word: + seed = random.randint(0, self.word_size-4) + seed_word, next_word, next_word2 = self.words[seed], self.words[seed+1], self.words[seed+2] + w1, w2 = next_word, next_word2 gen_words = [] for i in range(size): gen_words.append(w1) - if "!kvl" in w2 or not (w1, w2) in self.cache: + if "!kvl" in w2 or not (w1.casefold(), w2.casefold()) in self.cache: print("Generated text") break else: - w1, w2 = w2, random.choice(self.cache[(w1, w2)]) + w1, w2 = w2, random.choice(self.cache[(w1.casefold(), w2.casefold())]) return ' '.join(gen_words) diff --git a/velasco.py b/velasco.py index 641d1a4..803c72c 100755 --- a/velasco.py +++ b/velasco.py @@ -59,7 +59,7 @@ def help(bot, update): /about - What I'm about. /help - I send this message. /count - I tell you how many messages from this chat I remember. -/freq - Change the frequency of both my messages and the times I save my learned vocabulary. +/freq - Change the frequency of both my messages and the times I save my learned vocabulary. (Maximum of 100000) /speak - Forces me to speak. """) @@ -85,9 +85,9 @@ def get_chatname(chat): def read(bot, update): global chatlogs - ident = str(update.message.chat.id) + chat = update.message.chat + ident = str(chat.id) if not ident in chatlogs: - chat = update.message.chat title = get_chatname(chat) chatlog = Chatlog(chat.id, chat.type, title) else: @@ -96,7 +96,12 @@ def read(bot, update): if chatlog.get_count()%chatlog.freq == 0: msg = chatlog.speak() # TO DO: añadir % de que haga reply en vez de send - bot.sendMessage(chatlog.id, msg) + try: + bot.sendMessage(chatlog.id, msg) + except TelegramError: + chatlog.set_freq(chatlog.freq + 20) + if get_chatname(chat) != chatlog.title: + chatlog.set_title(get_chatname(chat)) savechat(chatlog) chatlogs[chatlog.id] = chatlog @@ -110,7 +115,9 @@ def speak(bot, update): chatlog = Chatlog(chat.id, chat.type, title) else: chatlog = chatlogs[ident] - chatlog.add_msg(update.message.text) + text = update.message.text.split() + if len(text) > 1: + chatlog.add_msg(' '.join(text[1:])) msg = chatlog.speak() update.message.reply_text(msg) savechat(chatlog) @@ -148,9 +155,7 @@ def set_freq(bot, update): try: value = update.message.text.split()[1] value = int(value) - if not value > 0: - raise ValueError('Tried to set 0 or negative freq value.') - chatlogs[ident].set_freq(value) + value = chatlogs[ident].set_freq(value) reply = "Frequency of speaking set to " + str(value) except: reply = "Format was confusing; frequency not changed from " + str(chatlogs[ident].freq) diff --git a/velasco.zip b/velasco.zip new file mode 100644 index 0000000000000000000000000000000000000000..a14f1ea62e07e3abc2fe72f82b1376a997ba6ee2 GIT binary patch literal 3706 zcmaKvXEdDc+J=WQ(G%SaqDSw8ArXC)8KT6f(K04_CtCF0f*>MF)L;aI2%?t=(M1m# z6NKm@QD3oT?X|z1_3m%)^{i_>_x=%*$olvQzOFzHb&%sO7)bSI8}Tt z(i6V8b9;rwi5GmwAPR?S9i)y@eD{_ZI#CnCG=iwHaVfl#p7yRG^-YL#`HjOBo=<0K zMk6vfd_Zu_E<&5pHAL_#2>QfyE?@f{iBU7*`VWTdCww{n)18HJDO(Tp2Cor#kH%JA zG~hNP2%Y1M2UZM_$I*jzL{$e)iji^S9zPG&8)aYy3YzJyt||-${=OR<9+C>u9+AME zWkI*-)opi_aX5}}UY@8TTKj-ncc_1p*^b?@M|Plch1=xj-Xs4?0Xp09c*xNn$Y#i$( z);T?9xj(5HW1j4%@QbQ!GkAcggLV1d@Wy#ZOaL#(!=ci)6CO5)lp(q@y?WinL#Mo( z*=K1DOrdV#!&$z;Z$q`jM@^s$k(twk*s=7jk5$Dj5Whypi@EnNh-Ke4E|&KHxTgPq z90qzxAuGM*ePk~=RK4Vo{E|agTQ6t#hyTKGy}84z^|hFSyiQ((XLaIFpv3!b&= zp3xf*9vkxJzaPysy23yotq^2oB~?WbzRMp#y|M%HrdJHI(F+gimlA6ls8dEar*tmq z)t~Tz-q74!iT8fWK`Xm=HacsCL^(L)Uyh6%QB!+R_fFD}J1Vg5ozFP-U*E*8@R6;> z=^R*RsK;}!_waQ_K;EEPM8hj51gtX4a|%>2?Ylk94CT*M7Q=07Rv<}Lhn+P7VaLiA zWpcfHmWBb}i_9q}%RP*2dd`;nsU!qe83%JPO($t^F$%fYjVj8iWTul5s<`DMi+4$) z9tCmb-Tu!yU@m7R;(L%Mo=1$&6X}A7tb~?2LGi0$UDCg3rwPxN`f5dN0Q29aBMA7E z$_m@Ot9*o)PzVTPSmTm4eVDF~pw@&nX|wRRnn6g8!aP>$Tshq}$JP%6rayjeY*?3m zfQl|6+pyD#DGj;xY|@(F(Had~*;){>)F^U0N+fAL`5`?oCL+=kY=J)g(oLc_uKqJc zTaIF&pFSKnIjo12bhydYhvrPYp1fS1(yG44ac5?t16H}pmUZ@c>z75$ut!e0e74%0 zm3>XC3cc;!$ModQ%CNI39j)LX7w)G9TFdH3PrHTSdEZ;sN*(fLm2wFWDdxU$sISed zuuhEdC?WFkCKXfYEX#RoAAEpmCwEBNJ(B9Zu`|klgEtTdMV^5bh9t-U08Yq17vMvT zi>)`>{a@rcN_Cn2p1&=?ZBuLSIptWwygK_nc5CdFsVgi8OFE zZL4=i1>a^Fs573Is)y3Q9CD~Y4ZITQMI1;mz7RPeQJRr&RMnep5JFn5hDKiyyJ+608LwvpU_X4o(ryBte(7_Fy>!`LFUw>P#`n(N|L>fwj z?C{+BCc6iCt7Ga@X*7Z;6;2|TMR&;d)l~&Dys9X^W3n$u->~?;x>+)a(!N7O-;27`Bf?Nl|;cN4Y=fopZyYE!3{#wJiEl9eZuw82{w%N&O|CG1}91t zz`h2Yw#dmxJ0!9Q3f$bCHGf%*Y}cn2JCC@P{q9CF=s3(=&M*$vnGpjTFCNs9$pl73 z+{5KL&6>MH$mT&pJ@>jaG^9RKJv2}7;*ti4G#uaBizHw(Jy?1WKwr%JNxJ1n!ynk0 z_^*f2A+TKMFk*6wE?kV^RyD^|OmLYgXLU?PN(-3kfmC>+HS$> zRyCiiGJnS~g>?E;QUAk!AyhbNLC;>Lw71?$B#!9zN__@

fF?hDOZlt`XqM_~&SU8_$=Ie$MJ2S9F^@ z*5-h5k(gc7ROQRIUQat76Hnl#p%c0Sa`k}pZG;l?p#YXNh$ydM8zedeeHRM0_tDuR zSL-Sj^4j`{Dr9P{93SzJk7AkRMgJ_cKQd?9Vn5pGCv8a)cLQ=-Msn}!khV6(My$Ph zgW$7Djz3~kzvv}OCZ!s$ZOn@^3IYFYf2lCKR%%8a>oq!~g?xMe9MQLCX3EEGf~lzf_kv~-~H__q6hSzoMpybV7d0Ywt`O+R`E!7xWEe2&BK0jI~rcQ)*J z^p|n2^+BOz?Op0O6+vn3IPC?ay2c*L!>Pfm+vUKNQ(50w?y^2Ldvbj10Ncg2{^GFS zxLd}wCR|Yzj_D6;JlJ&w6z8mGr)VFsj!Wixg`g(JLs|oWE{)RZ#jbsfZci?~=sxJe zX&w0he%L4C2)20i@b=v!IvVw!<_F1n?14qJmg?$@H2XgYbGG*Y{djEot(&Ly->tT< z4q7rp5QFW{Q=gq*(O6xXWhskk7iNCF=%I1n0QU(>PB<3J4U6>HnrSYSa|Ci_ z4-3*XUXTk0Qt_Yad;juQ`)hPMjDDiHOzG<(^u`kBs>QA~%zU}8rC5TOv~N8%D9xe2 zMspF!Y0c# zjm)w}p8JwX9uFo!EV`xq!j5ool?nA7 z38jfFUS__Jb#Dw&ACG;5*obIy192{=`?FjI;>+yZ@s}%zQD?gp_o(NmbbH4c;p=UY zrCxG(iB-aaPl_Fw-lCKP^7(8GFiWBKd`4;HKE4IOQPbS2eyWnqw~rs4m0>HY%8_xG zEr{=6D#@nYRRrtYlhd+YOtI}%J#iFg8{__kl~h^D5HLTsNV4f1DXnN8o_1rJxqpND zdv%_)AMb}vSq|TMNfH4R(FZTVa&Xki^#>+OU(_tAjQ1SuY{j|eIzYPIET_fsEwA^h zmY^ci#6ZgP{Jw~h#N2Co=z?hyHrJe+$<*l#uw~@1qmDl{MEykiW-{&FT%EEz3yh4? zE1mfLrZt0S%WcBhI`DPe5-N8_(5w5&&Ar{Z!m;z9?Oto=yYLq@3%KghIzrUkH&!RG zI0dXaN0GDYHO?*9FW1MNjhJ;e1-PW=b6{ubc9bquip!nB3KY2c&7Brj#IY%ZNn(An zbQ)rA^-7uw8D@C#0dlrwm%h1xM zN{neNaMqL)i~1CptGIl^wz>C+y+w5^;rlvXA4x>a4*YMm3w&9r005%PDGC35`m={vUDwDMkN|+YToJ0RVq0(q-QNqeuEk(51%% P0Km&{_ww&c{rmP08L^}A literal 0 HcmV?d00001