Skip to content

Add graph to home.html #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akutuzov merged 3 commits into from
Nov 20, 2019
Merged

Add graph to home.html #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
62f6a90
Add graph to home.html
ananastii Nov 20, 2019
8bf870e
Form pairs to graph from neighbours list
ananastii Nov 20, 2019
90ce085
Fix problem with difference between q and qf
ananastii Nov 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
112 changes: 65 additions & 47 deletions templates/home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,54 +19,72 @@ <h1 style="text-align:center">{{strings['home1']}}</h1>
</div>
<!-- Featuring results -->
{%- if list_value -%}
<h3><strong>{{strings['home4']}}
<i><a href="{{ url }}{{lang}}/{{ model }}/{{ word }}/"
title="{{strings['synraw15']}} {{ word.split('_')[-1] }}, {{strings['synraw14']}} {{ frequencies[model][word][0]}}"
class="frequency-{{frequencies[model][word][1]}}">
{{ word.split("_")[0].replace('::', ' ') }}</a></i> ({{strings['home5']}}
<a href="{{ url }}{{lang}}/models#{{model}}">{{ strings[models[model]] }}</a>)</strong>
</h3>
<!-- Checkbox for frequency selection -->
<div class="checkbox" id="frequencyCheck">
<p><em>{{strings['frequency1']}}</em></p>
<label class="frequency-high" title="{{strings['frequency5']}}">
<input id="high" type="checkbox" checked>{{ strings['frequency2']}}
</label>
<label class="frequency-mid" title="{{strings['frequency6']}}">
<input id="mid" type="checkbox" checked>{{ strings['frequency3'] }}</label>
<label class="frequency-low" title="{{strings['frequency7']}}">
<input id="low" type="checkbox">{{ strings['frequency4'] }}</label>
</div>
<!-- If the word is not present in the model but its embedding is inferred from its characters -->
{%- if model in inferred %}
<i>{{strings['similar32']}}</i>
{%- endif %}
<!-- Iteration over the results -->
<div style="max-width:300px;" id="result" data-result='{{ frequencies|tojson }}' data-visible="{{ visible_neighbors }}">
<ol id="{{ model }}" style="font-size: larger;">
{%- for res in list_value[model] if not "unknown to the model" in list_value[model] and res[0] != "No results" %}
<li class="frequency-item-{{frequencies[model][res[0]][1]}}" data-word="{{res[0]}}">
<a href="{{ url }}{{lang}}/{{ model }}/{{res[0]}}/" title="{{strings['synraw15']}} {{ res[0].split('_')[-1] }}, {{strings['synraw14']}} {{ frequencies[model][res[0]][0]}}"
class="frequency-{{frequencies[model][res[0]][1]}}">
{{res[0].split('_')[0].replace('::', ' ')}}</a> {{ "{:.3f} ".format(res[1]) }}
{% if wordimages[res[0].split('_')[0]] -%}
<div class="avataricon" style="clear:both;">
<a href="https://en.wikipedia.org/wiki/{{ res[0].split('_')[0] }}" target="_blank">
<img src = "{{ wordimages[res[0].split('_')[0]] }}" alt = "{{res[0].split('_')[0]|capitalize }} {{strings['synraw11']}}"
title = "{{ res[0].split('_')[0]|capitalize }} {{strings['synraw11']}}" width="30">
</a>
<h3><strong>{{strings['home4']}}
<i><a href="{{ url }}{{lang}}/{{ model }}/{{ word }}/"
title="{{strings['synraw15']}} {{ word.split('_')[-1] }}, {{strings['synraw14']}} {{ frequencies[model][word][0]}}"
class="frequency-{{frequencies[model][word][1]}}">
{{ word.split("_")[0].replace('::', ' ') }}</a></i> ({{strings['home5']}}
<a href="{{ url }}{{lang}}/models#{{model}}">{{ strings[models[model]] }}</a>)</strong>
</h3>
<div class="row" id="result" data-query="{{ word }}" data-visible="{{ visible_neighbors }}" data-result ='{{ frequencies|tojson }}' data-graph='{{ edges|tojson }}'>
<div class="col-md-6">
<!-- If the word is not present in the model but its embedding is inferred from its characters -->
{%- if model in inferred %}
<i>{{strings['similar32']}}</i>
{%- endif %}
<!-- Checkbox for frequency selection -->
<div class="checkbox" id="frequencyCheck">
<p><em>{{strings['frequency1']}}</em></p>
<label class="frequency-high" title="{{strings['frequency5']}}">
<input id="high" type="checkbox" checked>{{ strings['frequency2']}}
</label>
<label class="frequency-mid" title="{{strings['frequency6']}}">
<input id="mid" type="checkbox" checked>{{ strings['frequency3'] }}</label>
<label class="frequency-low" title="{{strings['frequency7']}}">
<input id="low" type="checkbox">{{ strings['frequency4'] }}</label>
</div>
<!-- Iteration over the results -->
<div style="max-width:300px;">
<ol id="{{ model }}" style="font-size: larger;">
{%- for res in list_value[model] if not "unknown to the model" in list_value[model] and res[0] != "No results" %}
<li class="frequency-item-{{frequencies[model][res[0]][1]}}" data-word="{{res[0]}}">
<a href="{{ url }}{{lang}}/{{ model }}/{{res[0]}}/" title="{{strings['synraw15']}} {{ res[0].split('_')[-1] }}, {{strings['synraw14']}} {{ frequencies[model][res[0]][0]}}"
class="frequency-{{frequencies[model][res[0]][1]}}">
{{res[0].split('_')[0].replace('::', ' ')}}</a> {{ "{:.3f} ".format(res[1]) }}
{% if wordimages[res[0].split('_')[0]] -%}
<div class="avataricon" style="clear:both;">
<a href="https://en.wikipedia.org/wiki/{{ res[0].split('_')[0] }}" target="_blank">
<img src = "{{ wordimages[res[0].split('_')[0]] }}" alt = "{{res[0].split('_')[0]|capitalize }} {{strings['synraw11']}}"
title = "{{ res[0].split('_')[0]|capitalize }} {{strings['synraw11']}}" width="30">
</a>
</div>
{%- endif -%}
</li>
{%- endfor %}
</ol>
</div>
<hr>
<ul>
<li>
<p><i>{{strings['base19']}}</i></p>
</li>
</ul>
</div>
<div class="col-md-6" id="graph">
<svg></svg>
<fieldset class="form-inline" style="text-align: center;">
<input class="form-control" style="max-width:75px; display: inline-block;" type="number" id="threshold" min="0" max="1" step="0.1" value="0.6">
<label for="threshold" title="{{ strings['graph3'] }}">{{ strings['graph2']}}</label>
<!-- number of neighbours
<input class="form-control" style="max-width:75px;" type="number" id="topn" min="0" max="10" step="1" value="10">
<label for="topn" title="{{ strings['graph5'] }}">{{ strings['graph4']}}</label>
-->
<label>
<input type="checkbox" id="separator"> {{ strings['graph6'] }}
</label>
</fieldset>
</div>
</div>
{%- endif -%}
</li>
{%- endfor %}
</ol>
</div>
<hr>
<ul>
<li>
<p><i>{{strings['base19']}}</i></p>
</li>
</ul>
{%- elif error -%}
<!-- In case of incorrect tag or query-->
<p> <span style = "font-size:larger;"><strong>
Expand Down
4 changes: 3 additions & 1 deletion webvectors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@ def home(lang):
images = {query.split('_')[0]: None}
models_row = {}
frequencies = {}
edges = {}
if model_props[model]['tags'] == 'False':
query = query.split('_')[0]
pos = 'ALL'
Expand All @@ -278,12 +279,13 @@ def home(lang):
pass
if 'inferred' in result:
inferred.add(model)
edges[model] = result['edges']

return render_template('home.html', list_value=models_row, word=query,
wordimages=images, models=our_models, model=model, tags=tags,
other_lang=other_lang, languages=languages, url=url,
inferred=inferred, frequencies=frequencies,
visible_neighbors=10)
visible_neighbors=10, edges=edges)
else:
error_value = "Incorrect query!"
return render_template("home.html", error=error_value, tags=tags, other_lang=other_lang,
Expand Down
6 changes: 2 additions & 4 deletions word2vec_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,10 @@ def clientthread(connect, addres):

# Get pairs of words to create graph

def get_edges(word, model, n):
def get_edges(word, model, mostsim):
edges = [{"source": word, "target": word, "value": 1}]
neighbors_list = []

mostsim = getattr(model, "similar_by_word")(word, topn=n)

for item in mostsim:
edges.append({"source": word, "target": item[0], "value": item[1]})
neighbors_list.append(item[0])
Expand Down Expand Up @@ -187,7 +185,7 @@ def find_synonyms(query):
results['frequencies'][res[0]] = (freq, tier)
raw_vector = model[qf]
results['vector'] = raw_vector.tolist()
results['edges'] = get_edges(qf, model, nr_neighbors)
results['edges'] = get_edges(q, model, results['neighbors'])
return results


Expand Down