Skip to content
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

Jump to bottom

Release v0.7.0 #259

Merged
merged 1 commit into from
Dec 12, 2022
Merged

Release v0.7.0 #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions annotators/kbqa/kbqa_cq_mt_bert_lite.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
{
"class_name": "wiki_parser",
"id": "wiki_p",
"wiki_filename": "{DOWNLOADS_PATH}/wikidata/wikidata_lite.hdt",
"wiki_filename": "{DOWNLOADS_PATH}/wikidata/wikidata2022.hdt",
"file_format": "hdt",
"max_comb_num": 1000,
"lang": "@en"
Expand Down Expand Up @@ -121,11 +121,11 @@
"subdir": "{DOWNLOADS_PATH}/wikidata_eng"
},
{
"url": "http://files.deeppavlov.ai/kbqa/wikidata/wikidata_lite.hdt",
"url": "http://files.deeppavlov.ai/kbqa/wikidata/wikidata2022.hdt",
"subdir": "{DOWNLOADS_PATH}/wikidata"
},
{
"url": "http://files.deeppavlov.ai/kbqa/wikidata/wikidata_lite.hdt.index.v1-1",
"url": "http://files.deeppavlov.ai/kbqa/wikidata/wikidata2022.hdt.index.v1-1",
"subdir": "{DOWNLOADS_PATH}/wikidata"
},
{
Expand Down
49 changes: 31 additions & 18 deletions annotators/wiki_parser/test_wiki_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,23 +38,29 @@ def main():
"occupation": [
["Q15976092", "artificial intelligence researcher"],
["Q1622272", "university teacher"],
["Q1650915", "researcher"],
["Q82594", "computer scientist"],
],
"plain_entity": "Q92735",
"pos": 0,
"token_conf": 1.0,
"types_2hop": [
["Q12737077", "occupation"],
["Q14565186", "cognitive scientist"],
["Q15976092", "artificial intelligence researcher"],
["Q15980158", "non-fiction writer"],
["Q1622272", "university teacher"],
["Q1650915", "researcher"],
["Q28640", "profession"],
["Q3400985", "academic"],
["Q37226", "teacher"],
["Q41835716", "faculty member"],
["Q4164871", "position"],
["Q5", "human"],
["Q5157565", "computer professional"],
["Q5428874", "faculty member"],
["Q66666607", "academic profession"],
["Q66666685", "academic professional"],
["Q82594", "computer scientist"],
["Q901", "scientist"],
],
}
},
Expand All @@ -72,29 +78,36 @@ def main():
"Юрген Шмидхубер": {
"age": 59,
"conf": 1.0,
"country of sitizenship": [["Q183", "Германия"]],
"country of sitizenship": [["Q183", "Germany"]],
"date of birth": [['"+1963-01-17^^T"', "17 January 1963"]],
"entity_label": "Шмидхубер, Юрген",
"instance of": [["Q5", "человек"]],
"entity_label": "Jürgen Schmidhuber",
"instance of": [["Q5", "human"]],
"occupation": [
["Q15976092", "исследователь искусственного интеллекта"],
["Q1622272", "преподаватель университета"],
["Q82594", "специалист в области информатики"],
["Q15976092", "artificial intelligence researcher"],
["Q1622272", "university teacher"],
["Q1650915", "researcher"],
["Q82594", "computer scientist"],
],
"plain_entity": "Q92735",
"pos": 0,
"token_conf": 1.0,
"types_2hop": [
["Q15976092", "исследователь искусственного интеллекта"],
["Q1622272", "преподаватель университета"],
["Q28640", "профессия"],
["Q3400985", "научный работник"],
["Q37226", "учитель"],
["Q41835716", "преподаватель"],
["Q5", "человек"],
["Q66666607", "академическая профессия"],
["Q82594", "специалист в области информатики"],
["Q901", "учёный"],
["Q12737077", "occupation"],
["Q14565186", "cognitive scientist"],
["Q15976092", "artificial intelligence researcher"],
["Q15980158", "non-fiction writer"],
["Q1622272", "university teacher"],
["Q1650915", "researcher"],
["Q28640", "profession"],
["Q3400985", "academic"],
["Q37226", "teacher"],
["Q4164871", "position"],
["Q5", "human"],
["Q5157565", "computer professional"],
["Q5428874", "faculty member"],
["Q66666607", "academic profession"],
["Q66666685", "academic professional"],
["Q82594", "computer scientist"],
],
}
},
Expand Down
6 changes: 3 additions & 3 deletions annotators/wiki_parser/wiki_parser.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"class_name": "wiki_parser",
"in": ["parser_info", "query"],
"out": ["wiki_parser_output"],
"wiki_filename": "{DOWNLOADS_PATH}/wikidata/wikidata_lite.hdt",
"wiki_filename": "{DOWNLOADS_PATH}/wikidata/wikidata2022.hdt",
"file_format": "hdt",
"max_comb_num": 1000,
"lang": "@en"
Expand All @@ -24,11 +24,11 @@
"requirements": ["{DEEPPAVLOV_PATH}/requirements/hdt.txt"],
"download": [
{
"url": "http://files.deeppavlov.ai/kbqa/wikidata/wikidata_lite.hdt",
"url": "http://files.deeppavlov.ai/kbqa/wikidata/wikidata2022.hdt",
"subdir": "{DOWNLOADS_PATH}/wikidata"
},
{
"url": "http://files.deeppavlov.ai/kbqa/wikidata/wikidata_lite.hdt.index.v1-1",
"url": "http://files.deeppavlov.ai/kbqa/wikidata/wikidata2022.hdt.index.v1-1",
"subdir": "{DOWNLOADS_PATH}/wikidata"
},
{
Expand Down
2 changes: 1 addition & 1 deletion annotators/wiki_parser/wiki_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
lang = "@ru"
else:
lang = "@en"
wiki_filename = "/root/.deeppavlov/downloads/wikidata/wikidata_lite.hdt"
wiki_filename = "/root/.deeppavlov/downloads/wikidata/wikidata2022.hdt"
document = HDTDocument(wiki_filename)
USE_CACHE = True

Expand Down
4 changes: 2 additions & 2 deletions assistant_dists/dream/docker-compose.override.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,8 +551,8 @@ services:
env_file: [.env]
build:
args:
WIKI_LITE_DB: http://files.deeppavlov.ai/kbqa/wikidata/wikidata_lite.hdt
WIKI_LITE_INDEX_DB: http://files.deeppavlov.ai/kbqa/wikidata/wikidata_lite.hdt.index.v1-1
WIKI_LITE_DB: http://files.deeppavlov.ai/kbqa/wikidata/wikidata2022.hdt
WIKI_LITE_INDEX_DB: http://files.deeppavlov.ai/kbqa/wikidata/wikidata2022.hdt.index.v1-1
WIKI_CACHE_DB: http://files.deeppavlov.ai/kbqa/wikidata/wikidata_cache.json
CONFIG: wiki_parser.json
PORT: 8077
Expand Down
2 changes: 1 addition & 1 deletion common/insert_scenario.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ def get_page_title(vars, entity_substr):
el = annotations.get("entity_linking", [])
for entity in el:
if isinstance(entity, dict) and entity["entity_substr"] == entity_substr:
found_pages_titles = entity["entity_pages_titles"]
found_pages_titles = entity["pages_titles"]
if found_pages_titles:
found_page = found_pages_titles[0]
logger.info(f"found_page {found_page}")
Expand Down