Skip to content

gargantext
gargantext
Commit 650c8fea authored by delanoe's avatar delanoe
Browse files
Options

Merge branch 'samuel' into unstable

parents 2a11a46c 156363ba
Hide whitespace changes
Inline Side-by-side
Showing with 148 additions and 74 deletions
annotations/views.py
View file @ 650c8fea
......@@ -15,6 +15,7 @@ from rest_framework.authentication import SessionAuthentication, BasicAuthentica
from node.models import Node
from gargantext_web.db import session, cache, Node, NodeNgram
from ngram.lists import listIds, listNgramIds
from gargantext_web.db import get_or_create_node
@login_required
......@@ -93,7 +94,7 @@ class NgramEdit(APIView):
"""
Delete a ngram from a list
"""
print(ngram_ids)
print("to del",ngram_ids)
for ngram_id in ngram_ids.split('+'):
print('ngram_id', ngram_id)
ngram_id = int(ngram_id)
......@@ -101,7 +102,21 @@ class NgramEdit(APIView):
.filter(NodeNgram.node_id==list_id)
.filter(NodeNgram.ngram_id==ngram_id).delete()
)
session.commit()
# [ = = = = del from map-list = = = = ]
list_id = session.query(Node).filter(Node.id==list_id).first()
corpus = session.query(Node).filter(Node.id==list_id.parent_id , Node.type_id==cache.NodeType['Corpus'].id).first()
node_mapList = get_or_create_node(nodetype='MapList', corpus=corpus )
results = session.query(NodeNgram).filter(NodeNgram.node_id==node_mapList.id ).all()
ngram_2del = [int(i) for i in ngram_ids.split('+')]
ngram_2del = session.query(NodeNgram).filter(NodeNgram.node_id==node_mapList.id , NodeNgram.ngram_id.in_(ngram_2del) ).all()
for map_node in ngram_2del:
session.delete(map_node)
session.commit()
# [ = = = = / del from map-list = = = = ]
return Response(None, 204)
class NgramCreate(APIView):
......
rest_v1_0/ngrams.py
View file @ 650c8fea
......@@ -346,75 +346,120 @@ class Group(APIView):
for subform in group_new[mainform]:
gdict.append(subform)
GDict.append( gdict )
import pprint
pprint.pprint( GDict )
# existing_group_id = self.get_group_id(corpus_id)
# grouped_ngrams = (session
# .query(NodeNgramNgram)
# .filter(NodeNgramNgram.node_id==existing_group_id)
# )
# # [ - - - new group = old clique + new clique - - - ] #
# NewGroups = {}
# Rels_2_delete = {}
existing_group_id = self.get_group_id(corpus_id)
grouped_ngrams = (session
.query(NodeNgramNgram)
.filter(NodeNgramNgram.node_id==existing_group_id)
)
# [ - - - new group = old clique + new clique - - - ] #
NewGroups = {}
Rels_2_delete = {}
for ng in grouped_ngrams:
print(ng)
for i in range(len(GDict)):
clique_i = GDict[i]
neighbours = {}
for node in clique_i:
if node==ng.ngramx_id:
neighbours[ng.ngramy_id] = True
if node==ng.ngramy_id:
neighbours[ng.ngramx_id] = True
if len(list(neighbours.keys()))>0:
voisinage = {}
for node_ in clique_i:
voisinage[node_] = True
for node_ in neighbours:
voisinage[node_] = True
clique_i = list(voisinage.keys())
Rels_2_delete[ng.id] = True
if i not in NewGroups:
NewGroups[i] = {}
for node in clique_i:
NewGroups[i][node] = True
for i in NewGroups:
NewGroups[i] = list(NewGroups[i].keys())
# [ - - - / new group = old clique + new clique - - - ] #
# [ - - - considering main form of the query - - - ] #
for i in range(len(GDict)):
ordered = []
for j in range(len(NewGroups[i])):
if NewGroups[i][j]!=GDict[i][0]:
ordered.append( NewGroups[i][j] )
NewGroups[i] = [ GDict[i][0] ] + ordered
# [ - - - / considering main form of the query - - - ] #
# [ - - - deleting old clique - - - ] #
for rel_id in Rels_2_delete:
session.query(NodeNgramNgram).filter(NodeNgramNgram.id==rel_id ).delete()
session.commit()
# [ - - - / deleting old clique - - - ] #
# [ - - - doing links of new clique and adding to DB - - - ] #
from itertools import combinations
for i in NewGroups:
edges = combinations(NewGroups[i], 2)
for n in edges:
n1=n[0]
n2=n[1]
nodengramngram = NodeNgramNgram(node_id=existing_group_id, ngramx_id=n1 , ngramy_id=n2, score=1.0)
session.add(nodengramngram)
session.commit()
# [ - - - / doing links of new clique and adding to DB - - - ] #
# import networkx as nx
# G = nx.Graph()
# DG = nx.DiGraph()
# for ng in grouped_ngrams:
# print(ng)
# for i in range(len(GDict)):
# clique_i = GDict[i]
# neighbours = {}
# for node in clique_i:
# if node==ng.ngramx_id:
# neighbours[ng.ngramy_id] = True
# if node==ng.ngramy_id:
# neighbours[ng.ngramx_id] = True
# if len(list(neighbours.keys()))>0:
# voisinage = {}
# for node_ in clique_i:
# voisinage[node_] = True
# for node_ in neighbours:
# voisinage[node_] = True
# clique_i = list(voisinage.keys())
# Rels_2_delete[ng.id] = True
# if i not in NewGroups:
# NewGroups[i] = {}
# for node in clique_i:
# NewGroups[i][node] = True
# for i in NewGroups:
# NewGroups[i] = list(NewGroups[i].keys())
# # [ - - - / new group = old clique + new clique - - - ] #
# # [ - - - considering main form of the query - - - ] #
# for i in range(len(GDict)):
# ordered = []
# for j in range(len(NewGroups[i])):
# if NewGroups[i][j]!=GDict[i][0]:
# ordered.append( NewGroups[i][j] )
# NewGroups[i] = [ GDict[i][0] ] + ordered
# # [ - - - / considering main form of the query - - - ] #
# # [ - - - deleting old clique - - - ] #
# for rel_id in Rels_2_delete:
# session.query(NodeNgramNgram).filter(NodeNgramNgram.id==rel_id ).delete()
# session.commit()
# # [ - - - / deleting old clique - - - ] #
# # [ - - - doing links of new clique and adding to DB - - - ] #
# from itertools import combinations
# for i in NewGroups:
# edges = combinations(NewGroups[i], 2)
# for n in edges:
# n1=n[0]
# n2=n[1]
# nodengramngram = NodeNgramNgram(node_id=existing_group_id, ngramx_id=n1 , ngramy_id=n2, score=1.0)
# session.add(nodengramngram)
# session.commit()
# # [ - - - / doing links of new clique and adding to DB - - - ] #
# n_x = ( session.query(Ngram).filter(Ngram.id==ng.ngramx_id) ).first()
# n_y = ( session.query(Ngram).filter(Ngram.id==ng.ngramy_id) ).first()
# G.add_edge( str(ng.ngramx_id)+" "+n_x.terms , str(ng.ngramy_id)+" "+n_y.terms )
# DG.add_edge( str(ng.ngramx_id)+" "+n_x.terms , str(ng.ngramy_id)+" "+n_y.terms )
# # group = dict(list())
# sinonims_cliques = nx.find_cliques( G )
# # for nn in ngrams_ngrams.all():
# # group[nn.ngramx_id] = group.get(nn.ngramx_id, []) + [nn.ngramy_id]
# groups = { "nodes": {} , "links": {} }
# for clique in sinonims_cliques:
# max_deg = -1
# mainNode = -1
# mainNode_sinonims = []
# for node in clique:
# groups["nodes"][node] = False
# node_outdeg = DG.out_degree(node)
# if node_outdeg>max_deg:
# max_deg = node_outdeg
# mainNode = node
# for node in clique:
# if mainNode!=node:
# mainNode_sinonims.append( node )
# groups["links"][ mainNode ] = mainNode_sinonims
# import pprint
# print("GDict:")
# pprint.pprint( GDict )
# print("")
# print("NewGroups:")
# pprint.pprint( NewGroups )
# print("")
# print("Ids to delete:")
# pprint.pprint( Rels_2_delete )
# print("")
# print('groups["links"]:')
# pprint.pprint( groups["links"] )
# print("")
return JsonHttpResponse(True, 201)
......
static/js/NGrams_dyna_chart_and_table.js
View file @ 650c8fea
......@@ -514,15 +514,26 @@ $("#Save_All").click(function(){
var list_id = $("#list_id").val()
var corpus_id = getIDFromURL( "corpus" ) // not used
CRUD( list_id , "" , nodes_2del , [] , "DELETE" )
CRUD( list_id , "/keep" , nodes_2keep , [] , "PUT" )
CRUD( corpus_id , "/group" , [] , nodes_2group , "PUT" )
window.location.reload()
// $.when(
// ).then(function() {
// // window.location.reload()
// });
CRUD( list_id , "" , nodes_2del , [] , "DELETE" ),
$.doTimeout( 1000, function(){
CRUD( list_id , "/keep" , nodes_2keep , [] , "PUT" )
$.doTimeout( 1000, function(){
CRUD( corpus_id , "/group" , [] , nodes_2group , "PUT" )
$.doTimeout( 1000, function(){
window.location.reload()
});
});
});
});
function CRUD( parent_id , action , nodes , args , http_method ) {
console.log( http_method + " : " + action )
var the_url = window.location.origin+"/api/node/"+parent_id+"/ngrams"+action+"/"+nodes.join("+");
the_url = the_url.replace(/\/$/, ""); //remove trailing slash
if(nodes.length>0 || Object.keys(args).length>0) {
......@@ -537,10 +548,12 @@ function CRUD( parent_id , action , nodes , args , http_method ) {
console.log(http_method + " ok!!")
console.log(nodes)
console.log(data)
return true;
},
error: function(result) {
console.log("Data not found in #Save_All");
console.log(result)
return false;
}
});
......
templates/corpus/terms.html
View file @ 650c8fea
......@@ -220,6 +220,7 @@ input[type=radio]:checked + label {
<script type="text/javascript" src="{% static "js/jquery/jquery.min.js" %}"></script>
<script src="{% static "js/charts/bootstrap.min.js" %}"></script>
<script src="{% static "js/libs/jquery/jquery.ba-dotimeout.min.js" %}" type="text/javascript"></script>
<script type="text/javascript" src="{% static "js/jquery/jquery.dynatable.js" %}"></script>
<!-- custom-lib for dynatable.js and dc.js -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment