From ad066a84d961b812e12b7762b2829d1b65ec4e84 Mon Sep 17 00:00:00 2001 From: Alex55 Date: Fri, 20 Mar 2026 14:36:25 +0200 Subject: [PATCH] 23123 --- API/TG.py | 2 +- API/__init__.py | 6 +++ API/__pycache__/rok.cpython-313.pyc | Bin 4298 -> 5351 bytes API/__pycache__/rokky.cpython-313.pyc | Bin 6146 -> 6618 bytes API/df.py | 12 ++++++ API/rok.py | 48 +++++++++++++++------ API/ww | 0 app/__pycache__/routes.cpython-313.pyc | Bin 5315 -> 5573 bytes app/routes.py | 9 +++- services/__pycache__/red.cpython-313.pyc | Bin 413 -> 1032 bytes services/__pycache__/rokky.cpython-313.pyc | Bin 136 -> 0 bytes services/__pycache__/tim.cpython-313.pyc | Bin 560 -> 560 bytes services/orders.py | 40 +++++++++++++++++ services/red.py | 15 ++++++- services/tim.py | 2 +- 15 files changed, 117 insertions(+), 17 deletions(-) create mode 100644 API/ww delete mode 100644 services/__pycache__/rokky.cpython-313.pyc create mode 100644 services/orders.py diff --git a/API/TG.py b/API/TG.py index 36422a9..47fb1eb 100644 --- a/API/TG.py +++ b/API/TG.py @@ -15,4 +15,4 @@ def send_telegram(text): -send_telegram("TEST") \ No newline at end of file +# send_telegram("TEST") \ No newline at end of file diff --git a/API/__init__.py b/API/__init__.py index e69de29..26e1cec 100644 --- a/API/__init__.py +++ b/API/__init__.py @@ -0,0 +1,6 @@ +import sys +import os + +# Добавляем папку 'games' (родительскую для API) в пути поиска +project_root = os.path.abspath(os.path.join(os.path.dirname(__file__), '..')) +sys.path.insert(0, project_root) diff --git a/API/__pycache__/rok.cpython-313.pyc b/API/__pycache__/rok.cpython-313.pyc index 7137437b9862b08a027645fda42c6ae0720ec841..e4d55f830b90bae06005e5f1fe2381f7d0364622 100644 GIT binary patch delta 1831 zcmZ`(Z){Ul6u-Bxe_q@7uU*T=y0vfrTNxWL*yyrCh(nS&jP|7_W+9{5-b@L!aQiCz z0O=r_U_=>SR2Cwe#;ANNEX1h@L>7Y@lH1T^*zAK*6XLhR_QA*(@9ikt61mAc=iGCC z_jk^__vHN2@GvATiJ}A0^(6d5;s?J&W?5dPRa2!peKnnz5q74NgP!>(DwHU;4eShDYcn{dCq-P%rbp{@8W zdn4?|Q+AZyP8}m=R>IR|qne}N(zpqLkHApH4qI1nTBX&Wl5mRq;Zx%(SEFDNwU?aGfy5X;w;Q^@Ab40*X5DF~KXo6tieHjSriX zwwMh=tEWb@_uc>?{tf^`as{k8R)SepSS6vl7T}E8qDlq6s-KG&V%F!zM9Sq}<)~N` z?^=`G4=BuwRgYW`G~>WT7hg3<<2{CJ3B z+sfFluB^wdhaO6&k__8e#-5#2$!Cm{roTpV`Ex2w{H)$yH6)`33PfHiid-UT6fI+i zQ*k4USoeIZ)X{JX;e$?FkfkZ#Jz_tO zs>*nsWf>lg8}TC4)9k)goORZ39H7=~^h@uh&ocr361`^zCf_6uKkk$_W))E5yV!-t z7wZBu{H6Vi^^G&V_v`q1qxXR{1`Od>EOjn%j3b zny-5G3}3PW!L#5DX!M=R3kF-UIdsji&P2H0N7ssbhOr5xx zB<{@xp<^-2pxbgixe#&p6@*CnXz$$4Taj-gbDhLJP!L`&SH?hh~5REB`>rTgtp)1>T@UGJ^5ai@cw_6oxtN?0#Nk+rg%ym z)lZhCa7`Rx{JkC?E_;ej*wyjayr zN2uvJBb1AQ7^IVs4q5z@*x+o6nKf&eOIl(Ud{wA3)4^cDid2X12{w2IUzXHfD+OS2$UwF9 delta 644 zcmYL{&ubG=5Xax_k7PGLUUs`_3`r_U+?uS$*l0qiv^5tIq=>Svr;0)nC87zwB3>+b z5TPPUnM->S^j7d9xp?po5b+{jYVak3;WaiT;P*u6{rt8;T?dJ_}6Ga1?y%dbc(u*GkDu9LK8Plk!_IC*5%N{ z6QZcnoxH^>R%%}Nm4I<}R`FF|t1A6a0D%&yzFt*NL!kK~^1}E+Ekv&eVL!a6_Km>6 zH~LY90#|aH%RB=ycBv|2)Ya2Pfr79kY>8tMoZy*aR_aBGb9kN?(1y}M26bP%@FJ(ikQduTGA38nN#%SkQ+4Q+VGvd0D4VUxlom$~8rjFjCut{s`Klh6%^hFOu~bmz|g3;1|b*D*kbbE3T}b&Zz*{8iR>a5eep#CN7Yx$~6oD+$PsT@#ka`6$%JxfEpg7c9t5 Kj&n#(8~p>ngoA(p diff --git a/API/__pycache__/rokky.cpython-313.pyc b/API/__pycache__/rokky.cpython-313.pyc index fcec8c2b37cbce8b2cb525674c9036b4ec185c91..aae78ff09ad0ed9835b989e67b617b9e7f806fb5 100644 GIT binary patch delta 1012 zcmZ`&TWb?R6rSx~vX^9&Y_4ia7x9vapjcDuB`w-Ui=|SMF0EE6+hh$(+il(5fE6KC zDQ*y{ArI*v5Pv{leY0WMd=*S@Np~vhNc0~ z2#LtzBur|gL}WPV?6WM9#9EX_9ikxH3fCbDs;!`<(*Mi2+7d>>GoF22z)+$jmqbg9 zL|$wc6v0Ry01i$nb!5B;_he}aPj<9;5lm9ZYeL3f-3neVt)=iT@DNKdcXV`UdJlpT z2o5tX8_KAz<`gH2+-$K>Pz+PaXB1ObXImK|uNt}eqGpaNdQQQl($l*dZ0Xex8Ewx~})Cc)}4q)Q=a ziix~z$_}AIQR@iF<~R=B{J{1duH`k`bzG`3#W!7akJ0pEbu)C-_XtMs;4(fzSOVXx zd!blqmjb-7GFhH{^WL^$G8(tpy)eqP+pP9sO z13jbHkpVyc!OsqKRju&XI2ud8f#4Q`(-0i`+8n$Rvr3=-6o%-P8H?3&WM25uCt||( MZ46-ivbVY6FVw-_$^ZZW delta 547 zcmca*++@J_nU|M~0SJ_T?atgPFp*D!=^w*Hjena>7*7jLzQe)Es56;Uq}eE(QJ5i& zxtK|xp_oaS!Gni^A>TNdnH8uplsT9MM4K=LF!}N^FmN*{Fyyi1F;5m06q5>O4P`N9 z0-4VM6pm(tuoxJEcqdN~wX9FFWtL}1V=QJ;02-UeoW`KZ=2v72R8(XJByO=56lEr- z7Wo3%RkmCTKoA<>;uzwpP*9YgQkq;+3>FJ^4FL)O6)M;&*n>sFJzRra6^gS<;Ub#s zMIs<$tw4k|h=>FdlOKq&#d4=sq$Zb^q~<2(RTf16MKxKAh4Du?-B??9AASvF`0-$heJlFxnMVUac= 400: + print(f"\n❌ Ошибка {response.status_code}") + print(f"🔍 URL: {response.url}") + print(f"📦 Тело запроса: {payload}") + print(f"📄 Ответ сервера (raw): {response.text}") + + # Пробуем распарсить как JSON, если сервер возвращает структурированную ошибку + try: + error_data = response.json() + print(f"🧩 Ответ сервера (json): {error_data}") + except ValueError: + pass # Ответ не JSON, уже напечатали raw выше + + response.raise_for_status() # Всё равно выбрасываем исключение + + return response.json() + + except requests.exceptions.RequestException as e: + print(f"🌐 Сетевая ошибка: {e}") + raise + # print(response.json()) - return response.json() + # return response.json() -def get_orders(access_token, page=1, page_size=25): +def get_orders(page=1, page_size=25): url = f"{BASE_URL}/orders" headers = { @@ -138,14 +162,14 @@ def get_order_content(order_id): return content -# content = get_order_content(5379484) +# content = get_order_content(5379499) # print(content) -# orders = get_orders(access_token) +# orders = get_orders() # print(orders) -# order = create_order(access_token, 22774, 1, 21.17, "my-test-order-123") +# order = create_order(22774, 1, 21.3, "my-test-order-12w3") # print(order) diff --git a/API/ww b/API/ww new file mode 100644 index 0000000..e69de29 diff --git a/app/__pycache__/routes.cpython-313.pyc b/app/__pycache__/routes.cpython-313.pyc index 37a1e5dd7ae358f02df4ed7c5070b99455fb78e0..b807e078cae125d5e5f01814d70055832cffac0c 100644 GIT binary patch delta 1669 zcmaJ>O>7%Q6rNeH?e(sA9ow5YapJ^D^HV3WTY_Cee%b_)rcI#GET*A}WSMxKMoHFT z)}|C8B}GDTY&%j_frP>h#4#LlK^)rLI3!X}o3?NOByL9K#)Wz7u48dvWqaqS1?uF{G>y*n`a3O_H*`G_x$G^Dxb#W{&cw$07^iGLaQ zAkDKZXE@l25K%NQ2`noM-8AnDw+k6u^J~5+%G69mf({=OHA(ZI;WYVGPE#5pLiLD1 zLqtYu-3oQXPJwg&qZ(n_Hc=lgALU z0-fSjTIB`7@O7fBZy^SKi1-#mi|MR8?RNSUM_FN^i+<45!879&Gh&%OC!glmX=M-VbZXXpIMPH}0#iOPzOu7+GvnlrgBHcEy#E%v^+7jY3yy1Gyi zCj#`Mdn}-A-b$8rvz)YRo}}CEdsw9*&pBRT+3Bq3T`bYBJ<;U|TUzcdvbLgI-j$M3 z){U~|DZCHuumpCmQ9Ppz0?I6`n-aUnPc8zDvOH@>LI3C_a*i#a&}QnM_f}V=^MOe} zIpWowi%w7(h9>v6&HrJzpff?0x zpkQVnsP36IIw4#*>t{)c4Ki2_4;>++%rg!Tb;hNOjm!5!FaC1xP#DEhka6~vMf90# zkPe7x9HqbF2o_ z!B#v@uLq0U?aoH>7PAt50v`^E0dxaEX-O{tOe^UJfQcZd8CXJ5FR$Dv89EsPUxGox zT@wT8NE*N%AQvg!wEJXFP_2*3773LKm6dX?vQ=Pb1zBL>C3-dVY#W-Lh*<98M&4W} zE=XewJCW1Fe3p0m?aL{``saa_2UhRQ66l>3Fm>`F8*npae+?#qZ@})TCFF8OepAoo zh!1@5PL`XLDog>KKx~*<747M=+gy7e(DvU!6ec#A{tf*+d5^JhW}E*osJbx5zo6t1 zN**KS7)igQ_*3|uqEEw@13h@?xeIZVRgPKJH)uv38wuk<@C{WtW>tp~=lMK(JNm_& dyBBvyccO=Q_%BYag(RzBRa5jEwUdW3{R`Z}P%{7k delta 1565 zcmaJ>O>7%g5Pt93`|qE4ZDYsOi5v2R6GGg`N!pMU6~$^xMbu=ms7NHsir1-WyN+gU zm6k(-1ft?Z^Z*GYPCdZ^4&ereN~A}SP&v7X76}P)Gpc|iyjjPoK?*DFxAVR?^Ub`S z*}XgQO*Zr>7}SZlKFEDt`z^Q|O48SM$4+ju3o5AVbck5~b!~>B2O*$a5*X|HYJX?l zidE)@ zc=sLQ9Xa$iJ?~Rqeuy059z8s3tVi73WZ5|XoIV{2y0%j(HSDYQCX}!7zv&9q`3jqf z1%)o&t|VZGJT%f^@Q+!6zQ6a7+<+%sh7-4`J$AUx(&+^5tbHVX)5!JG{&bQ>THIrJ=G1e3@ebM-7Hox&xXlyvNq7& zS4er95JxQ@hA;msTw5FIx)#;0OplsZNqLU8+E5)JB^lK7!F{{7PVbXJTu)30?5iWr((Z; z0z}ayDsDHyca$5dKl0w#5B}7T{EcWo_48@OGGPNE)G4|5175pdpN9s%WUs>_8}+$+ub z3@jkGh=6s%X@n&KF8&fS8Sk~gGsq&W;Eq>|?-#$pKMIdhWA9G*RhGh}H_ex7t~lIg zW~(ed3%g;13v)bgR=4qo(vi6!tZV@MNZ^bEz7)Xs3_}Pwx-g7@V*sN9T58p9Y+SB8 zHe`_-6Off2%RvrVZ)$u{zwR~78=Fp3Lt9|hE6t5Yskv1ti=vi=`zD`={v>1Pvr!(7 zCAPif8L@83XD*(9_T{r6i-p&mmRc$~;yk4iD9B-TEeYyPp@kp2H;vxRcn#|mhDrWA zUh2X%QOH&MG+1I6f2ZzW0@^-GP5OXLeorRvlhA!){2>#1oIi-24-e3ZM?S(9+e}#P zB|aCQ51VuxxrsItR(qW9#A7E8xXA;KF!`O-o2gqb-lK`%S%NN6j7WA&z+?Xdma!T@ diff --git a/app/routes.py b/app/routes.py index 72ce3d0..828bfa2 100644 --- a/app/routes.py +++ b/app/routes.py @@ -2,8 +2,9 @@ from flask import Blueprint, request, jsonify import sqlite3 import json # from services.rokky import ones -# from API.rok import get_order_content +from API.rok import create_order from API.TG import send_telegram +from services.orders import get_sku import logging @@ -30,9 +31,13 @@ def index1(): # всё остальное сохраняем как JSON content = json.dumps(params, ensure_ascii=False) - send_telegram(content) + db_sku, db_price = get_sku(sku) + create_order(db_sku, price, db_price, f"my-test-order-{product_id}") + # send_telegram(content) conn = sqlite3.connect(DB_PATH) cursor = conn.cursor() + + try: cursor.execute(""" diff --git a/services/__pycache__/red.cpython-313.pyc b/services/__pycache__/red.cpython-313.pyc index b0d5d265138f3b9e0097aa2cee051873154f6c03..44c142a4b4076099b092afc3fe74b150bc6ff663 100644 GIT binary patch literal 1032 zcmdT@&2HL25MJAhF{Fg15sB1ZXe}RniB%~eN@=7@^iWXK3NDp6AQxK%0X7<&QaJUH z2dFCL4RYy2^c{jigtSGR$>sV$RJnZ5a%}fkbqK;aZI!YUH*-! zj&+gkSnkN_xu(?|fNKp~zQ@uVrcTTDbcsE%>=uj%e$#ZU=Fl0KtuEU#t#uGf4F{I# z+dK(Iw8BP%CB{+W-|{PmGt%IC_WNNR#mus(}%f5&GEUfJ*TZ6-PH z=o?vL9i|y4Zr?UO^oF)Ea-nOq&A#m!o(&(78v|_XU@&G144tNLdR@5BqcFE;aQI9X zbazHG3%d8^(~M>pbm#Q#f+jAKkIxHp^>C^l&eg(HEnKR_EBYL^dCdPtw-SxoWdC2n zqZvfXaU@oh%c$XB0r;eF46s^#ZeajF$BwbB)R5oFYpK^+!<`R?@rxZPDJH~}mXn!4kS&Tt}vHw;SO?Mx~4 q`ES*;k6@4c;cR=4IQ)?WLHI$^*Cc;U%2QIlp;Ra>x2bRxG;s^=yT^tA delta 290 zcmeC+n9I!fnU|M~0SNA0+nt%pFp*CpO$f-F$`H&D%;?Qf#1PCR#ZbhU&Zx=!5~R#8 z8AQSWE0Dnq#GgZe#8if8Mwmn}V>AL%?SSR~1s;e{kmC6AHgIryT6^c`f z$}*Ev6)rYh*l=Ovg?$&Bfb`ajO;(!Blb163mw;Reva47INHj3qVd1>MrM1T6x{mEd z9oy?Vju&+tFY7p8WpOFu04mUADgrsK2&Ais9Ylaci#UPAEe@O9{FKt1RJ$T>AQ$B3 YVm=`8ftit!@iqhhXBI|AS4OaU0K1$zyZ`_I diff --git a/services/__pycache__/rokky.cpython-313.pyc b/services/__pycache__/rokky.cpython-313.pyc deleted file mode 100644 index a6b467f9f97231eb73092e9eee7631e53c248066..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 zcmey&%ge<81X_Q#XM*U*AOZ#$p^VQgK*m&tbOudEzm*I{OhDdekkl=8{fzwFRQ;r! z(p3HO{Gx3A^u*lMV*TROqO#0nAfqThJG)Y^pz;=nO>TZlX-=wL5i3w1$lPKO<0CU8 KBV!RWkOcs$cpl;a diff --git a/services/__pycache__/tim.cpython-313.pyc b/services/__pycache__/tim.cpython-313.pyc index 63b4df828e649c271d8dbbea8535c08a703f53bb..77c483058795e8f1639df1c48a1357396c8d71b9 100644 GIT binary patch delta 31 lcmdnMvVn#BGcPX}0}xC!-#d}}FI#SAUTI0{W