From d5f72de57eee0d16f84f09ef2cb1344f6714d109 Mon Sep 17 00:00:00 2001 From: Noretsa Date: Thu, 18 Jun 2020 19:48:35 +0300 Subject: [PATCH] =?UTF-8?q?=D0=92=D1=81=D0=B5=20=D0=B4=D0=BE=D0=BB=D0=B6?= =?UTF-8?q?=D0=BD=D0=BE=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D1=82=D1=8C?= =?UTF-8?q?,=20=D0=BE=D1=81=D1=82=D0=B0=D0=BB=D0=BE=D1=81=D1=8C=20=D0=BE?= =?UTF-8?q?=D1=82=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D1=82=D1=8C=20=D0=B7=D0=B0?= =?UTF-8?q?=D0=BF=D1=80=D0=BE=D1=81=20=D0=BD=D0=B0=20=D0=B7=D0=B0=D0=BA?= =?UTF-8?q?=D1=80=D1=8B=D1=82=D0=B8=D0=B5=20=D0=B7=D0=B0=D0=B4=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/.DS_Store | Bin 0 -> 10244 bytes data/domreshetnikovo@gmail.com/.DS_Store | Bin 0 -> 8196 bytes data/domreshetnikovo@gmail.com/6/.DS_Store | Bin 0 -> 10244 bytes data/osa212@mail.ru/.DS_Store | Bin 0 -> 8196 bytes data/osa212@mail.ru/6/.DS_Store | Bin 0 -> 8196 bytes knd_bot.py | 47 ++++++--------------- 6 files changed, 12 insertions(+), 35 deletions(-) create mode 100644 data/.DS_Store create mode 100644 data/domreshetnikovo@gmail.com/.DS_Store create mode 100644 data/domreshetnikovo@gmail.com/6/.DS_Store create mode 100644 data/osa212@mail.ru/.DS_Store create mode 100644 data/osa212@mail.ru/6/.DS_Store diff --git a/data/.DS_Store b/data/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..6a3f1a3960ed48fde374b603cff20b092e0e0041 GIT binary patch literal 10244 zcmeHMS&S4#82zXyu_##G)#)yfD;SG@|jq>7)M?B&YgHd95&=((#MiZZme^vD$4D6B+jX_1jPFxMODabEQghpuMTSD7Jy^}sb!&S+6Ty( zR4lWx99B|>(r>EW1ID2kZ!u7XlRYKeNoHd?tfUGDRN;W}$QbWXP>xPAPAcHDS_F@sHFkLCMM?$Uz?3>P&fFdpURdc+P$XWdLGk@RP)sm8w{F|s%Xv9; zb~~OGxfLg8MNZhur-Xz_XEE@1m7EH#zq=TC<$j+mjYZ2VmdV*^^Sr!!$_aZS=R_o~ z_J=_!>X42-F2xF6FP|#ncMe2u;D>viQb>}qHz!V?GjGAe%_|<+kh?T#@)X`Um9hPV zogcYJT&J|B>e^A?J}WFbzU}%)yDM(!7CfiRxB8t%EHZX!#>`oh%%pjL%~T&^@Ft_D zTyT$<-RPtovFWt&xxiwtE#8rH)m*iTP^ z4^?;;PQ!C>2F}6-cpKh_kKuFp625}3;WGRPKf|x^8~hG`z+X5Xr{N5oiL>xQT!Kq+ z8Lq;0xB;`+hFftbK8m|Bj|Z`UHad6&1FYgnJcWb!6rRTC@dbPlU&C{F9^b+X_%6PO z7x4r95Wm20@CP-+M2*-xRKM2Z6}q~OXPk%~KjVo*HzRg()8;L?|Ap9>Cn`4IH*NX@ zO^cSatX$i6^{&_5=W7WkS*BFGixzHf$^Mtgr#YytC3_eCVFJl>lsLaPI>vGo0i0r&USy!_)2638?Q`Yq? z%f#czLG|Y+bIjm45>rRy=^JnkF2YCf8S(R5xB@@HFYqSLQI zvvvIJtT9tbJb!!qtmI3+7x+ghS}=by<)x6aR10LNX0ORuB`Dvk`D)Zf>&&Dx)19B0 zZbf08gW}J!`fo3tgZ||lG%6G8vW-ezy448Wy$Fm^Q%{NW|BWO6|9|%`P|sW=pb@ww z0@#qt=i14wc7RYHksw8i>S3y)2)|(^We7FGMd;;mJaxpmqC7_-U3`Kf?b+CGSVAv=dD18^zW5V=;!g}liQz$Cd^8$Od@`Qd*;{E#U)7{L$;_FV zbIzSP-+a5XGZz4`JFh1IY5+i?EF@n`#a)uni@YqA1U+RWk^I5QQ0>#qv}L;9GV8D- zL?A>UL?A>UL?A@q|9}AP*&-<`?E6w1mLUQm0;>`M@qUO>7BU&gc`5x@2NnJifTTDA z_=)OVR7gexnGEE-l%%1A(v_ri#o&m6(w+LFfn73?^HNH8z~JzK!N?e#P|zQpen0A) z116;m%MgJOf#nFuvwLf%;7(_(JJ0X&_;*-RTDGRVLSal{mF&^nV>%4IMza4%M6)DVS;b$acoaBZ6oJ9o4P?Jf0PB}TcbVD< zt(H5}BSR~BMP5zB&Y)6P6u-N%No4~rMZvYeFxJf2z+<$C+@&dqi6>f^I%sJb!{R!VZmn%h z9iEY)@*_cK=N_hxWSyxg3el~?SkRs9Qq@ypS*8@bg+OI z@FLFQQ+NrV#~1KLd=0PSHGB)N^K;ym#ZKt@TaKEp2IUny8V6NTWhj<|V$C?TC=2rtnf}yptsqq9$J> zwYyj=Bl7YxsqJ8$3UQQ|OYJ_EWa9DSAlnU*6jL~^#Jm-G_Xb>r8}Jc)Mtu7gZo^OT z3;cpHL#Q+NP-@enaDjRQD@!#GOJ%lgcl#B-QK z5A(#pd3=)i_cT5eFz_XO8DGaMOZe7TWSW$CP4aCfowF^+KI^v@n}n^^fIz7XvPPW$ z53GFuzZ#$jV+;{kwFqEYDxK=4@QWWPOOX&~?I`8bltmJD^HTaQR4lp(p!UKahE$J| hsqje#a$ZX6q4cj`1kjfT3-^Ee-VFDDpMa~h_#3%g&E)_9 literal 0 HcmV?d00001 diff --git a/data/domreshetnikovo@gmail.com/6/.DS_Store b/data/domreshetnikovo@gmail.com/6/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5cb639d0809df7892da3ee52c8789548b7704de7 GIT binary patch literal 10244 zcmeHMTWl3Y7@of@uoFP0$ZZdoE;I$iQ|YPn!mT}R50_FJkW*-ZO4)OEp&PfmdZF$p0$W-i%mEN+vyo#$IpS*+nkz<8pyYFo5MZKKwt)!yQ* z6bb=_fI>hapb$_9{1*_wZ#GZ*EGbo~5Kssx1a2U}_XiU*m+4rJN-4GuEW{B2rG{#e zu+De|r5Vd~EJvk83nq}EC}k+bM+}hRs5fK3bSy`ul;H&8!w1AYLwrI3(K|lh6z&Al zQmRrRpb)qf0lsXiG*he7c3>WNe%G3asin1Ml0>;&tI(EeD@Zj-VXGPSP3YaAt>;$M zJt}0q)|@MagE=qA;Zr}&4SH@E)zo|kWz)3jGiK_P>U0i$Jlh|XvXK=P!&a+sh`07w zQGYJ3cLjlWqi*H)yH2T(&2J0*$Z~zBAc9@nL6_cc*SCXGYf$vk<`+cNQ{t0!nA579#Ih zDw_`m2FLX>g%jX~Lv3;b%3d3rfbajEfLTWS&W>Guj1@y?uj5&fJLF`n$O-${+z@A? zJslF5tTs!JNV1;?d zw_X2O_mCU9InU|xtpTST@|0d(xM=YlBVjBZGffQ9S*6}n%(=&lZgf)gvAn{dy*7@# zGq8CtHhWj6!ctjb7>Br}t>9p3>$*^{USrU%5Z{7Xv178D(yk|vYAnPd@PVglsj<(q za*oGrD#Pj@&FUeQrYjTbJNPZ^2lHbVhcnlWx`6= zCeYK;*)-|Aj;3^^IGZl5>uEj3MZh#^-9R_#$aOYDTAOH^@@2}1Y*!^RRA(?5gD2(h zTjU(ML_Q*)A#cAW*U3-h7xE_%m;p?1HUUdu8LWcU@DQwpB-BAYvUdY)f(&eh?XUwG zoP{pf58ZG88Jrgk?uX-0fC!4nv)vn vIvyMRUQyg!pf0|%5OHbL^Y~FIv4-iM{~2&kF1*zFU!DIazbU`p=l_2I7Av=dD18^zW5V=;!g}liQz$Cd^8$Od@`Qd*;{E#U)7{L$;_FV zbIzSP-+a5XGZz4`JFh1IY5+i?EF@n`#a)uni@YqA1U+RWk^I5QQ0>#qv}L;9GV8D- zL?A>UL?A>UL?A@q|9}AP*&-<`?E6w1mLUQm0;>`M@qUO>7BU&gc`5x@2NnJifTTDA z_=)OVR7gexnGEE-l%%1A(v_ri#o&m6(w+LFfn73?^HNH8z~JzK!N?e#P|zQpen0A) z116;m%MgJOf#nFuvwLf%;7(_(JJ0X&_;*-RTDGRVLSal{mF&^nV>%4IMza4%M6)DVS;b$acoaBZ6oJ9o4P?Jf0PB}TcbVD< zt(H5}BSR~BMP5zB&Y)6P6u-N%No4~rMZvYeFxJf2z+<$C+@&dqi6>f^I%sJb!{R!VZmn%h z9iEY)@*_cK=N_hxWSyxg3el~?SkRs9Qq@ypS*8@bg+OI z@FLFQQ+NrV#~1KLd=0PSHGB)N^K;ym#ZKt@TaKEp2IUny8V6NTWhj<|V$C?TC=2rtnf}yptsqq9$J> zwYyj=Bl7YxsqJ8$3UQQ|OYJ_EWa9DSAlnU*6jL~^#Jm-G_Xb>r8}Jc)Mtu7gZo^OT z3;cpHL#Q+NP-@enaDjRQD@!#GOJ%lgcl#B-QK z5A(#pd3=)i_cT5eFz_XO8DGaMOZe7TWSW$CP4aCfowF^+KI^v@n}n^^fIz7XvPPW$ z53GFuzZ#$jV+;{kwFqEYDxK=4@QWWPOOX&~?I`8bltmJD^HTaQR4lp(p!UKahE$J| hsqje#a$ZX6q4cj`1kjfT3-^Ee-VFDDpMa~h_#3%g&E)_9 literal 0 HcmV?d00001 diff --git a/data/osa212@mail.ru/6/.DS_Store b/data/osa212@mail.ru/6/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..3d885ca4f12976a93743af22d9b7bd0d8b5bfb49 GIT binary patch literal 8196 zcmeHMTWl0n82H$SfCXi%9s7I zyyNBR8lU9H9NQ04sc*5WTA4L_j>?$I=Cen0BVIWd7(vPJHi`$uXpa$$6|2`ikZOK- zbN2H5dlvATg^UdmgKl6SwXNd5vTX(<2MoVpxu)$N8yL5JJMUQit}$xWV1cpAOP1Eo z*Am+DifMX?%Inm@QrPGS zx_+I;`hB_!ZbXjB2FCgyqestu+Je}4x{+!793yWz++;GWrIl#|IC*={+P?t%` z5f@)8jZQ%)Y=t2xfD2`K2F}2TsHGVI5SXGhtZaJ>Bc$Ip8`@EC9qw`*M_;&J6Y~8j! z`>)9R$~>v*dlxNUS+}mCv2|nDwP!!=Y2PTjP-{|5p~xyC3Lp1P$`$(163f_%nbg0J zG-{nth0ypM>8&SLtE4R+ic3qZNz|)!0C-hsW$P2uO;F_{Rb aB+?9(fBc7l`1^nTuhsbbA8PP!Z2kflc@?Ap literal 0 HcmV?d00001 diff --git a/knd_bot.py b/knd_bot.py index 0a7e37c..2af28b9 100644 --- a/knd_bot.py +++ b/knd_bot.py @@ -14,24 +14,6 @@ from classes.users import Users -# anwer_text = '{"question_chains":[{"id":6145,"questions":[{"id":6559,"question_components":[]}]},{"id":6147,"questions":[{"id":6561,"question_components":[]}]},{"id":6147,"questions":[{"id":6561,"question_components":[]}]},{"id":6147,"questions":[{"id":6561,"question_components":[]}]},{"id":6147,"questions":[{"id":6561,"question_components":[]}]}]}' - -# question_text = '' - - -#def get_enterance_and_coord(session, headers, execution_id): -# photo_id = send_image(session, headers, execution_id) -# pass - - -def send_execution(task, session, headers): - # answers_for_data = [{"id":6145,"questions":[{"id":6559,"question_components":[{"id":18850,"answer":[80634165],"answer_status":null,"end_time":1591866979,"start_time":1591866978},{"id":18851,"answer":{"location":[56.439337,36.557897]},"answer_status":null,"start_time":1591866873,"end_time":1591867165}]}]}] - # print(task) - # print(time.ctime(1592235230)) - string1 = '{"id":6145,"questions":[{"id":6559,"question_components":[{"id":18850,"answer":[80634165],"answer_status":null,"end_time":1591866979,"start_time":1591866978},{"id":18851,"answer":{"location":[56.439337,36.557897]},"answer_status":null,"start_time":1591866873,"end_time":1591867165},{"id":18852,"answer":"1","answer_status":null,"start_time":1591867063,"end_time":1591867063}]}]}' -# get_questions(task.get('id'), session, headers) - print(json.dumps(json.loads(string1), indent=4)) - def get_questions(id_task, session, headers): @@ -47,11 +29,9 @@ def send_image(session, headers, url, photo): files = { 'image': (photo[-5:], open(photo, 'rb')), } + print(photo) img = session.post('https://knd.mosreg.ru//api/v1/executions/'+str(url)+'/images', headers=headers, files=files) return img.json() - # print(img.headers) - # print(img.text) - # print(img.status_code) def complete_task(session, headers, task, address): @@ -79,7 +59,6 @@ def complete_task(session, headers, task, address): answer_chain.update({'questions': comp}) data.append(answer_chain) if len(data) == len(photos): - print('1') for chain in data: for item in chain['questions']: if len(data) == len(photos): @@ -112,8 +91,6 @@ def get_photo(address, email): for images in os.listdir(main_path): photos.append(main_path + '/' + images) return photos - - def get_addresses(email): @@ -162,7 +139,7 @@ def get_task(session, headers): ) for address in addresses: # need split enterance from address - search = 'Майданово п, Радищева ул, 73'#address[:-4] + search = address[:-4] print(search) data = {'search': search} tasks = session_t.post('https://knd.mosreg.ru//api/v1/executions', @@ -213,16 +190,16 @@ def main(): 'uid': response.headers.get('uid'), } if response.status_code == 200: - task = { - 'id': 23607882, - 'address': 'Решетниково рп, ОПМС-1 проезд, 13', - 'enterance': 6, - 'coord': [56.442503, 36.5596493] - } - address = 'Решетниково рп, ОПМС-1 проезд, 13, 6п' - assign_task(session, headers, task, address) - break - # get_task(session, headers) + # task = { + # 'id': 23607882, + # 'address': 'Решетниково рп, ОПМС-1 проезд, 13', + # 'enterance': 6, + # 'coord': [56.442503, 36.5596493] + # } + # address = 'Решетниково рп, ОПМС-1 проезд, 13, 6п' + # assign_task(session, headers, task, address) + # break + get_task(session, headers) else: print(f"Отказ в авторизации для пользователя {user['email']}!") time.sleep(1)