From 164e72d1d3e8a8d4acd3ca161c754c17499b5a23 Mon Sep 17 00:00:00 2001 From: Yam ZhengLim Date: Thu, 23 Feb 2023 22:31:41 +0800 Subject: [PATCH] Crisp Extract Load --- __pycache__/general_function.cpython-39.pyc | Bin 1449 -> 1449 bytes .../crisp_extract_function.cpython-39.pyc | Bin 3738 -> 4909 bytes crisp/extract/crisp_extract_function.py | 109 ++++++++++++++---- .../crisp_load_function.cpython-39.pyc | Bin 973 -> 973 bytes .../exchange_extract_function.cpython-39.pyc | Bin 1785 -> 1785 bytes .../exchange_load_function.cpython-39.pyc | Bin 985 -> 985 bytes main.py | 21 ++-- .../shipping_extract_function.cpython-39.pyc | Bin 1785 -> 1785 bytes .../shipping_load_function.cpython-39.pyc | Bin 985 -> 985 bytes 9 files changed, 102 insertions(+), 28 deletions(-) diff --git a/__pycache__/general_function.cpython-39.pyc b/__pycache__/general_function.cpython-39.pyc index a0d8b9156e6bbd3034dd71de92512128b1cd2c6a..d681405a147985f1ac11516895eda9e7f251e094 100644 GIT binary patch delta 27 hcmZ3B8Uy5%anTvaYt{ht5x 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 literal 3738 zcmb`K&u`qu6~{^L^2c(2$&xBtPHV)D+f+%Ex+&@yuA8QnEFg!-fbGC2vo1^Tj3lnP zBt4u>ybG=`?$tohQ;(~ouKf%8cktRva_OmuLWiQ?H%qV9^2%v}QqUW6_&6NS`+VP< z4Vq0?!x8=AsOzn1+TZD7{xERyDgLt#4AYn%X?@+(bvid9!!uM{@v3Mmk=eIAt8aUD z-}FrQRGIlF&2yN=Y_v7zuo_yIxvY-1&Kj(Vw!w^h+D7X;yg}R03v)|^S-QJXDXJ`x zyr{{r&l!(oP&m{9oVJxv67KYdh_t8cn91EQvX`+cyjvse#cD~5C z$U4KIKRW2#iTSn&zv7*3o;{XH+S&T-_Kv?D$l&uJ4)%E;k9V+^!Dj#DT1~9OpGpyQ zWk+54<(0oTh`ThI57S}MeC10lTJ&WYO*eE)clA}+mhRwBw9(tG(!KI<(9Rcl+Mq{S+%`a-{;MaW;!>Yxh{+JkpCw z#?$WzHk<>;VOBJQH1xYc6mjMU@>tK0YXiBrd1Es}XsS{S__2Ov=g1VaD22o0Zo8BBw{Nd>R*8qybO!{B*M_DMj zpQKy_G7*{I&A!@j3%k7Gtu1ydmiBp!N1|CMi`8D1#D1KJeh`Ht?#skydxFGNm@>h) z3JP6ep&#!MHCzY^;D%GUFQ*YQQ75Nr8pwmf*$X2c2Yp_&lYvYJ(vK3*3~s!)7EjBk zIe6=5+{APm^j2bgYFhNNi)XlFmgjIkLmpE!I(kEIRo09(@K_T09`3wCB+Y(C3GAUMRa0;zBPv!!dbut&pyhY}1n9;^! z;iNo)viwve1nE>Z?ZQY|QKP)LBY>^Ai~+n=h1V&6afM#+4vb2}pt`7&V9I)=WFxMU z4~a(nm<%bVu$UaCJew+~E`CBc2s-gDnV*u`fbq^RdMgC!)uJRx{k zG?ktTTk?KNVqT=43kzQa?a;?(AHh&2NB%addev}B?JVoK(k;V<6`u;QdefFD+}ZsAQV|%sRw(7btodYx3!1Y#|~6hnN*=N2P&&c za{@h~Hn_QyyQRYH+|4a03^jo2#FGzD6P#Xc;!;I8G;+&#WDmV;Qph;(h8RITgBJ=pRnyb)o>`erJyPtFJM?k8MRc9@TkO zCC-VT(XiKOSO@B3Dz7W%+o$|ba2G!(ce|TJgMOT$9!gQzf~Qf?LNVPAKU#k%C zF6?S$Szn$OkC%}D7Jg?#{tw(8{q=u<{O0SBQ_(1KUIaR@o`OD0`LyksZi!F`0CBz7 zm^4|FSqk?0e}Oe^l9qwO^|Qgg@;w89bNW$~Q3ZRIbJ`TGg7Iaf^p;U>k$wlSjiy(d{s2H7S3gwL zf)!R8#4O0Bd4$sabm3IVqs_jc{gt3%AV@5N#+uu`sePQ delta 20 acmX@hewLj(k(ZZ?0SLDH^>5@p#0&s6zy(eK diff --git a/exchange/extract/__pycache__/exchange_extract_function.cpython-39.pyc b/exchange/extract/__pycache__/exchange_extract_function.cpython-39.pyc index c06031b5388fefe7f8a9336ff0aae0d8174244d8..f22ae4ad9474101df9ce2708f0bea8159408695a 100644 GIT binary patch delta 307 zcmey#`;(VDk(ZZ?0SKPY{;-ido{{m^K0f3pkIZboTdpcYN0TTFTex0sXjbBaKG2*Ed5iltQi7H3LoPG)XqNovt8&cf3C zlGNmk#G+f1m$Ag^fb6@)3Y5w%zQvwek(yjul6s3HEwu!wBqyhc4J6H$mS2>cSaNH! zKC7|GE#AOT{}9)BUr#?zUq_!?oaIFzgY(OaZ?PulNG>R=bKQApaJ&Gl_G9~F2W9mwVBJRm^ z7?(5hZgyeX%_z+c)S}6Bi%HKQia9wyrwGJ{5ImEmSW3mCI8#z{GIKLaQj4NE3rq7$ zQj;?hi=rkkV~N$_1ggEo3Y5w%j$%)(NKGy+NsZ!2ODzE^$;l~V14*-`}RDO(7KDo7tkk;3GOY?|`oAQikI0wj#27VJ5m$v4>) E0I&s64*&oF diff --git a/exchange/load/__pycache__/exchange_load_function.cpython-39.pyc b/exchange/load/__pycache__/exchange_load_function.cpython-39.pyc index 5aebbb1bdb19b47013547e82dfcc7985b74403bc..359d67671c30e4c276e7e4673304fb24f02e1289 100644 GIT binary patch delta 20 acmcb~ev_R$k(ZZ?0SKPY{;-kz95VnsqXtj_ delta 20 acmcb~ev_R$k(ZZ?0SHd*HQ&g6ju`+s2L+q} diff --git a/main.py b/main.py index 9f2fff4..b977aaa 100644 --- a/main.py +++ b/main.py @@ -1,5 +1,6 @@ import os from os import walk +import pandas as pd import general_function import exchange.extract.exchange_extract_function as exchange_extract_func import exchange.load.exchange_load_function as exchange_load_func @@ -92,16 +93,22 @@ def crisp_extract(CRISP_CSV_TEMP_STORAGE_PATH): CLIENT = crisp_extract_func.connect_crisp(CRISP_API_CONFIG) #Get operators csv - crisp_extract_func.list_website_operators_csv(CRISP_WEBSITE_ID, CLIENT, CRISP_CSV_TEMP_STORAGE_PATH, 'crisp_list_website_operators.csv') + crisp_extract_func.list_website_operators_json(CRISP_WEBSITE_ID, CLIENT, CRISP_CSV_TEMP_STORAGE_PATH, 'crisp_list_website_operators.json') #Get users(people) csv - crisp_extract_func.list_people_profiles_csv(CRISP_WEBSITE_ID, CLIENT, CRISP_CSV_TEMP_STORAGE_PATH, 'crisp_list_people_profiles.csv') + crisp_extract_func.list_people_profiles_json(CRISP_WEBSITE_ID, CLIENT, CRISP_CSV_TEMP_STORAGE_PATH, 'crisp_list_people_profiles.json') - # Get peoples manually marking by operator - crisp_extract_func.get_people_data_csv(CRISP_WEBSITE_ID, CLIENT, CRISP_CSV_TEMP_STORAGE_PATH, 'crisp_get_people_data.csv', './crisp/extract/crisp_temp_extract_csv/crisp_list_people_profiles.csv') + #Get peoples manually marking by operator + crisp_extract_func.get_people_data_json(CRISP_WEBSITE_ID, CLIENT, CRISP_CSV_TEMP_STORAGE_PATH, 'crisp_get_people_data.json', './crisp/extract/crisp_temp_extract_csv/crisp_list_people_profiles.json') - # Get peoples subscription status - crisp_extract_func.get_people_subscription_status_csv(CRISP_WEBSITE_ID, CLIENT, CRISP_CSV_TEMP_STORAGE_PATH, 'crisp_get_people_subscription_status.csv', './crisp/extract/crisp_temp_extract_csv/crisp_list_people_profiles.csv') + #Get peoples subscription status + crisp_extract_func.get_people_subscription_status_json(CRISP_WEBSITE_ID, CLIENT, CRISP_CSV_TEMP_STORAGE_PATH, 'crisp_get_people_subscription_status.json', './crisp/extract/crisp_temp_extract_csv/crisp_list_people_profiles.json') + + #Get current converstation list + crisp_extract_func.list_conversations_json(CRISP_WEBSITE_ID, CLIENT, CRISP_CSV_TEMP_STORAGE_PATH, 'crisp_list_conversations.json') + + #Get message in conversations + crisp_extract_func.get_message_in_conversations_json(CRISP_WEBSITE_ID, CLIENT, CRISP_CSV_TEMP_STORAGE_PATH, 'crisp_get_message_in_conversations.json', './crisp/extract/crisp_temp_extract_csv/crisp_list_conversations.json') def crisp_load_to_cloudstorage(CRISP_CSV_TEMP_STORAGE_PATH): #Config file name @@ -168,4 +175,4 @@ def main(): print("------------------------------------------------------------------------------------------------") if True: - main() + main() \ No newline at end of file diff --git a/shipping/extract/__pycache__/shipping_extract_function.cpython-39.pyc b/shipping/extract/__pycache__/shipping_extract_function.cpython-39.pyc index bb268101033c3bcf00d9372a520b17d62096bb14..b2d8853c432b68c921c2e4d9d326da2a934c2940 100644 GIT binary patch delta 20 acmey#`;(VDk(ZZ?0SKPY{;-kz9UA~beg?k) delta 20 acmey#`;(VDk(ZZ?0SJ6w7i{Ey#|8jBs0H-^ diff --git a/shipping/load/__pycache__/shipping_load_function.cpython-39.pyc b/shipping/load/__pycache__/shipping_load_function.cpython-39.pyc index b895fda1135b4bfcb139f227f69fd34150e8725a..01aa2be379b46392b5eba73b294e14e61e426a5f 100644 GIT binary patch delta 20 acmcb~ev_R$k(ZZ?0SKPY{;-kz95VnsqXtj_ delta 20 acmcb~ev_R$k(ZZ?0SF3T7i{D{#|!{C$pxwa