From af55e303babc7820229e3256732dd86ab244ea0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ch=C3=A9rifBALDE?= Date: Sun, 5 Jun 2022 14:56:06 +0200 Subject: [PATCH] 05/06/22 - 14h30 --- class_mgt.py | 2 +- data_indexees.csv | 97 ++++++++++++++++++++----------- ela_index_bdd_classes.py | 12 ++-- ela_output_test_file_pandas_2.txt | 26 ++++----- ela_user_account.py | 2 +- email_mgt.py | 5 +- prj_common.py | 4 +- wrapper.py | 8 +-- 8 files changed, 93 insertions(+), 63 deletions(-) diff --git a/class_mgt.py b/class_mgt.py index c13b16d..6525a92 100644 --- a/class_mgt.py +++ b/class_mgt.py @@ -878,7 +878,7 @@ def get_class(diction): filt_title = {'title': {'$regex': str(diction['title'])}} - print(" #### avant requete get partner_owner_recid ="+str(user_recid)+ + print(" #### avant requete get partner_owner_recid laa ="+str(user_recid)+ " internal_url = "+str(my_internal_url)+ " filt_title = "+str(filt_title)) diff --git a/data_indexees.csv b/data_indexees.csv index 7a99374..ea23ee8 100644 --- a/data_indexees.csv +++ b/data_indexees.csv @@ -1,34 +1,65 @@ ,index,mots,occurence,moyenne,id_formation,source_field -0,0,ressource,1,0.06," -concevoir-une-infrastructure-de-reseau-dans-azure --4",default -1,1,locau,1,0.06," -concevoir-une-infrastructure-de-reseau-dans-azure --4",default -2,2,azure,3,0.18," -concevoir-une-infrastructure-de-reseau-dans-azure --4",default -3,3,comment,1,0.06," -concevoir-une-infrastructure-de-reseau-dans-azure --4",default -4,4,decouvrez,1,0.06," -concevoir-une-infrastructure-de-reseau-dans-azure --4",default -5,5,securisee,1,0.06," -concevoir-une-infrastructure-de-reseau-dans-azure --4",default -6,6,connecter,1,0.06," -concevoir-une-infrastructure-de-reseau-dans-azure --4",default -7,7,concevoir,2,0.12," -concevoir-une-infrastructure-de-reseau-dans-azure --4",default -8,8,flexible,1,0.06," -concevoir-une-infrastructure-de-reseau-dans-azure --4",default -9,9,reseau,3,0.18," -concevoir-une-infrastructure-de-reseau-dans-azure --4",default -10,10,infrastructure,2,0.12," -concevoir-une-infrastructure-de-reseau-dans-azure --4",default +0,0,optimiser,1,0.01,9065,default +1,1,objectif,1,0.01,9065,default +2,2,reassurance,1,0.01,9065,default +3,3,mobile,1,0.01,9065,default +4,4,moteur,1,0.01,9065,default +5,5,fidelisation,1,0.01,9065,default +6,6,accueil,1,0.01,9065,default +7,7,commerciale,1,0.01,9065,default +8,8,tunnel,1,0.01,9065,default +9,9,produit,1,0.01,9065,default +10,10,marchand,1,0.01,9065,default +11,11,denouer,1,0.01,9065,default +12,12,commande,1,0.01,9065,default +13,13,ligne,3,0.04,9065,default +14,14,e,4,0.05,9065,default +15,15,moyen,1,0.01,9065,default +16,16,different,1,0.01,9065,default +17,17,sell,2,0.03,9065,default +18,18,vitrine,1,0.01,9065,default +19,19,personnalisation,1,0.01,9065,default +20,20,renforcement,1,0.01,9065,default +21,21,site,2,0.03,9065,default +22,22,suivre,1,0.01,9065,default +23,23,semaine,2,0.03,9065,default +24,24,friction,1,0.01,9065,default +25,25,autodiagnostic,1,0.01,9065,default +26,26,pratique,1,0.01,9065,default +27,27,page,1,0.01,9065,default +28,28,cros,1,0.01,9065,default +29,29,navigation,2,0.03,9065,default +30,30,parcour,1,0.01,9065,default +31,31,panier,1,0.01,9065,default +32,32,marketing,1,0.01,9065,default +33,33,moment,1,0.01,9065,default +34,34,etape,1,0.01,9065,default +35,35,bonne,1,0.01,9065,default +36,36,merchandising,4,0.05,9065,default +37,37,kpi,1,0.01,9065,default +38,38,analyser,1,0.01,9065,default +39,39,vente,1,0.01,9065,default +40,40,liste,1,0.01,9065,default +41,41,offre,1,0.01,9065,default +42,42,strategie,1,0.01,9065,default +43,43,package,1,0.01,9065,default +44,44,defi,1,0.01,9065,default +45,45,calendrier,1,0.01,9065,default +46,46,mesurer,1,0.01,9065,default +47,47,programme,1,0.01,9065,default +48,48,off,1,0.01,9065,default +49,49,element,1,0.01,9065,default +50,50,version,1,0.01,9065,default +51,51,boutique,1,0.01,9065,default +52,52,developper,1,0.01,9065,default +53,53,promotion,1,0.01,9065,default +54,54,achat,1,0.01,9065,default +55,55,plan,1,0.01,9065,default +56,56,interne,1,0.01,9065,default +57,57,animation,1,0.01,9065,default +58,58,gerer,1,0.01,9065,default +59,59,type,1,0.01,9065,default +60,60,barre,1,0.01,9065,default +61,61,espace,1,0.01,9065,default +62,62,fiche,1,0.01,9065,default +63,63,recherche,1,0.01,9065,default diff --git a/ela_index_bdd_classes.py b/ela_index_bdd_classes.py index a295717..ae5880a 100644 --- a/ela_index_bdd_classes.py +++ b/ela_index_bdd_classes.py @@ -519,7 +519,7 @@ def ela_recherche_tokens(sentence): if( status is False): return False - #print(" VERIF APRES STEMISATION : " + str(tab_tokens4)) + print(" VERIF APRES STEMISATION : " + str(tab_tokens4)) tab_tokens4.sort() @@ -532,14 +532,14 @@ def ela_recherche_tokens(sentence): # collection collection = MYSY_GV.dbname["elaindex"] - #print(" mot recherché tab_tokens4 (initialement) = "+str(tab_tokens4)) + print(" mot recherché tab_tokens4 (initialement) = "+str(tab_tokens4)) status, new_tab_tokens4 = mysy_recherche_levenshtein(tab_tokens4) if( status is False): mycommon.myprint(str(inspect.stack()[0][3]) + " Recherche : mysy_recherche_levenshtein return FALSE ") return [] - #print(" ### les nouveaux mots recherchés new_tab_tokens4 = " + str(new_tab_tokens4)) + print(" ### les nouveaux mots recherchés new_tab_tokens4 = " + str(new_tab_tokens4)) pipe2 = [{ '$match': { 'mots': { '$in': new_tab_tokens4 } } }, { '$group': { @@ -617,15 +617,15 @@ def mysy_recherche_levenshtein(tab_mot): cmp_levenshtein = int(mycommon.levenshtein(mot, str(x['mots']))) #print(" check ### ="+str(x['mots'])) - if( len(mot) <= 5 and cmp_levenshtein <= 1): + if( len(mot) <= 5 and cmp_levenshtein <= 0): if( str(x['mots']) not in training_mots): training_mots.append( str(x['mots']) ) - elif( len(mot) <= 10 and cmp_levenshtein <= 2): + elif( len(mot) <= 10 and cmp_levenshtein <= 0): if( str(x['mots']) not in training_mots): training_mots.append( str(x['mots']) ) - elif ( cmp_levenshtein <= 3): + elif ( cmp_levenshtein <= 0): if (str(x['mots']) not in training_mots): training_mots.append(str(x['mots'])) diff --git a/ela_output_test_file_pandas_2.txt b/ela_output_test_file_pandas_2.txt index d27641a..8b72110 100644 --- a/ela_output_test_file_pandas_2.txt +++ b/ela_output_test_file_pandas_2.txt @@ -1,14 +1,14 @@ - mots ... source_field -0 ressource ... default -1 locau ... default -2 azure ... default -3 comment ... default -4 decouvrez ... default -5 securisee ... default -6 connecter ... default -7 concevoir ... default -8 flexible ... default -9 reseau ... default -10 infrastructure ... default + mots occurence moyenne id_formation source_field +0 optimiser 1 0.01 9065 default +1 objectif 1 0.01 9065 default +2 reassurance 1 0.01 9065 default +3 mobile 1 0.01 9065 default +4 moteur 1 0.01 9065 default +.. ... ... ... ... ... +59 type 1 0.01 9065 default +60 barre 1 0.01 9065 default +61 espace 1 0.01 9065 default +62 fiche 1 0.01 9065 default +63 recherche 1 0.01 9065 default -[11 rows x 5 columns] \ No newline at end of file +[64 rows x 5 columns] \ No newline at end of file diff --git a/ela_user_account.py b/ela_user_account.py index dc5b6fe..54df367 100644 --- a/ela_user_account.py +++ b/ela_user_account.py @@ -427,7 +427,7 @@ def valide_user_account(value): if( ret_val and ret_val['_id']): mycommon.myprint("La modif a bien ete faite ="+str(ret_val['_id'])) - return True," Le compte a bien été validé >" + return True," Le compte a bien été validé " else: mycommon.myprint(" Impossible de valider le compte") return False, " Impossible de valider le compte utilisateur" diff --git a/email_mgt.py b/email_mgt.py index 558003f..ded37cd 100644 --- a/email_mgt.py +++ b/email_mgt.py @@ -70,10 +70,7 @@ def send_user_account_mail(message, account_mail):
- - CLIQUEZ ICI ==> LOCALHOST - - +

Cordialement
L'equipe informatique de MySy diff --git a/prj_common.py b/prj_common.py index 1377932..15a555e 100644 --- a/prj_common.py +++ b/prj_common.py @@ -806,7 +806,9 @@ def FormationAlaUne(): try: coll_name = MYSY_GV.dbname['myclass'] - df = pd.DataFrame(list(coll_name.find({'valide':'1', "price": {"$gte": 0} },{'_id':1, 'external_code':1 }))) + df = pd.DataFrame(list(coll_name.find({'valide':'1', "price": {"$gte": 0}, "duration": {"$gte": 0}, + "support" : { "$exists" : "true" }, + "type" : { "$exists" : "true" } },{'_id':1, 'external_code':1 }))) df['isalaune'] = '0' diff --git a/wrapper.py b/wrapper.py index c4f6c4d..58aea2a 100644 --- a/wrapper.py +++ b/wrapper.py @@ -320,8 +320,8 @@ def recherche_text_simple(diction): cleaned_search_text = mycommon.Parse_Clean_Search_Text(search_text) - #print(" NOT CLEANED search_text = " + str(search_text)) - #print(" CLEANED search_text = "+str(cleaned_search_text)) + print(" NOT CLEANED search_text = " + str(search_text)) + print(" CLEANED search_text = "+str(cleaned_search_text)) @@ -461,8 +461,8 @@ def recherche_text_simple(diction): ''' pour analyser la recherche, decommenter les 2 lignes ci-dessous ''' - #mycommon.myprint(" pour phrase : #" + search_text + "#, voici la liste des formations") - #mycommon.myprint(tab_training) + mycommon.myprint(" pour phrase : #" + search_text + "#, voici la liste des formations") + mycommon.myprint(tab_training) coll_name = MYSY_GV.dbname['myclass']