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

Finishes scrape, adds restart command #340

Merged
merged 18 commits into from
Jan 30, 2021
Merged

Finishes scrape, adds restart command #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
c9ec3f8
hacked together restart command
lfashby Jan 17, 2021
794c582
fixes to restart command
lfashby Jan 22, 2021
b38c43d
Merge branch 'master' into restart
lfashby Jan 23, 2021
9339f9f
potentially finalized restart command
lfashby Jan 24, 2021
04d7525
cleanup
lfashby Jan 24, 2021
11d5f58
Merge branch 'master' into restart
lfashby Jan 24, 2021
ae11286
logging for restart
lfashby Jan 25, 2021
8565a43
raw 'rus', 'yue' and 'cmn' data
lfashby Jan 29, 2021
094a52d
updates and rescrapes Min Nan
lfashby Jan 29, 2021
517fadc
final restart changes
lfashby Jan 29, 2021
2cc5c48
postprocessing on final data
lfashby Jan 29, 2021
e489e91
Merge branch 'master' into restart
lfashby Jan 29, 2021
5c25214
brings branch up to date, regenerates summary
lfashby Jan 29, 2021
9c9969a
formatting fixes
lfashby Jan 29, 2021
a9240c2
updates CHANGELOG
lfashby Jan 29, 2021
bb3071f
fixes to scrape.py
lfashby Jan 29, 2021
c95b115
excise nan changes
lfashby Jan 30, 2021
7db87eb
removes nan changes from CHANGELOG and languages.json
lfashby Jan 30, 2021
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ Unreleased
- Handled Cantonese for scraping. (\#277)
- Added exclusion for reconstructions. (\#302)
- Added Vietnamese contour tone grouping test in `tests/test_config.py` (\#308)
- Added restart functionality. (\#340)

#### Changed

Expand Down
5 changes: 3 additions & 2 deletions data/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,12 @@
| [TSV](tsv/bul_phonetic.tsv) | bul | Bulgarian | Bulgarian | True | Phonetic | 6,377 |
| [TSV](tsv/bur_phonemic.tsv) | bur | Burmese | Burmese | False | Phonemic | 4,636 |
| [TSV](tsv/bur_phonemic_filtered.tsv) | bur | Burmese | Burmese | False | Phonemic_filtered | 4,631 |
| [TSV](tsv/yue_phonemic.tsv) | yue | Yue Chinese | Cantonese | False | Phonemic | 87,961 |
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm pleasantly surprised to see Cantonese data is finally in. Does this mean "Closes #57" should also be included in the pull request description?

I took a look at the scraped data, and (as a native speaker myself) I can confirm it's what I'd expect, with Chinese characters on the orthographic side. The data was scraped from the Cantonese custom extraction code checked in at #277, i.e., the data actually came from the entries under the Category:Chinese_terms_with_IPA_pronunciation pages (not the Category:Cantonese_terms_with_IPA_pronunciation pages, where orthography is represented by the standardized Jyutping romanization system instead of Chinese characters -- not really useful, and probably too easy for G2P!), but the extraction code pointed to the embedded Cantonese pronunciation instead. I'm bringing all this up because this is in contrast with Min Nan below...

| [TSV](tsv/crx_phonemic.tsv) | crx | Carrier | Carrier | False | Phonemic | 175 |
| [TSV](tsv/cat_phonemic.tsv) | cat | Catalan; Valencian | Catalan | True | Phonemic | 55,829 |
| [TSV](tsv/ceb_phonemic.tsv) | ceb | Cebuano | Cebuano | True | Phonemic | 326 |
| [TSV](tsv/nya_phonemic.tsv) | nya | Nyanja | Chichewa | True | Phonemic | 823 |
| [TSV](tsv/cmn_hani_phonemic.tsv) | cmn | Mandarin Chinese | Chinese (Han) | False | Phonemic | 125,901 |
| [TSV](tsv/cmn_hani_phonemic.tsv) | cmn | Mandarin Chinese | Chinese (Han) | False | Phonemic | 133,686 |
| [TSV](tsv/cho_phonemic.tsv) | cho | Choctaw | Choctaw | True | Phonemic | 112 |
| [TSV](tsv/nci_phonemic.tsv) | nci | Classical Nahuatl | Classical Nahuatl | True | Phonemic | 820 |
| [TSV](tsv/nci_phonetic.tsv) | nci | Classical Nahuatl | Classical Nahuatl | True | Phonetic | 1,396 |
Expand Down Expand Up @@ -253,7 +254,7 @@
| [TSV](tsv/rum_phonemic.tsv) | rum | Romanian; Moldavian; Moldovan | Romanian | True | Phonemic | 4,108 |
| [TSV](tsv/rum_phonetic.tsv) | rum | Romanian; Moldavian; Moldovan | Romanian | True | Phonetic | 6,394 |
| [TSV](tsv/rum_phonetic_filtered.tsv) | rum | Romanian; Moldavian; Moldovan | Romanian | True | Phonetic_filtered | 6,286 |
| [TSV](tsv/rus_phonetic.tsv) | rus | Russian | Russian | True | Phonetic | 402,483 |
| [TSV](tsv/rus_phonetic.tsv) | rus | Russian | Russian | True | Phonetic | 402,600 |
| [TSV](tsv/san_phonemic.tsv) | san | Sanskrit | Sanskrit | False | Phonemic | 6,841 |
| [TSV](tsv/san_phonetic.tsv) | san | Sanskrit | Sanskrit | False | Phonetic | 673 |
| [TSV](tsv/srd_phonemic.tsv) | srd | Sardinian | Sardinian | True | Phonemic | 216 |
Expand Down
5 changes: 3 additions & 2 deletions data/languages_summary.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,12 @@ bul_phonemic_filtered.tsv bul Bulgarian Bulgarian True Phonemic_filtered 31782
bul_phonetic.tsv bul Bulgarian Bulgarian True Phonetic 6377
bur_phonemic.tsv bur Burmese Burmese False Phonemic 4636
bur_phonemic_filtered.tsv bur Burmese Burmese False Phonemic_filtered 4631
yue_phonemic.tsv yue Yue Chinese Cantonese False Phonemic 87961
crx_phonemic.tsv crx Carrier Carrier False Phonemic 175
cat_phonemic.tsv cat Catalan; Valencian Catalan True Phonemic 55829
ceb_phonemic.tsv ceb Cebuano Cebuano True Phonemic 326
nya_phonemic.tsv nya Nyanja Chichewa True Phonemic 823
cmn_hani_phonemic.tsv cmn Mandarin Chinese Chinese (Han) False Phonemic 125901
cmn_hani_phonemic.tsv cmn Mandarin Chinese Chinese (Han) False Phonemic 133686
cho_phonemic.tsv cho Choctaw Choctaw True Phonemic 112
nci_phonemic.tsv nci Classical Nahuatl Classical Nahuatl True Phonemic 820
nci_phonetic.tsv nci Classical Nahuatl Classical Nahuatl True Phonetic 1396
Expand Down Expand Up @@ -251,7 +252,7 @@ pan_guru_phonemic.tsv pan Panjabi Punjabi (Gurmukhi) False Phonemic 139
rum_phonemic.tsv rum Romanian; Moldavian; Moldovan Romanian True Phonemic 4108
rum_phonetic.tsv rum Romanian; Moldavian; Moldovan Romanian True Phonetic 6394
rum_phonetic_filtered.tsv rum Romanian; Moldavian; Moldovan Romanian True Phonetic_filtered 6286
rus_phonetic.tsv rus Russian Russian True Phonetic 402483
rus_phonetic.tsv rus Russian Russian True Phonetic 402600
san_phonemic.tsv san Sanskrit Sanskrit False Phonemic 6841
san_phonetic.tsv san Sanskrit Sanskrit False Phonetic 673
srd_phonemic.tsv srd Sardinian Sardinian True Phonemic 216
Expand Down
59 changes: 15 additions & 44 deletions data/src/scrape.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,10 @@
import json
import logging
import os
import time
import re

from typing import Any, Dict, FrozenSet, Iterator

import requests
import wikipron # type: ignore

from data.src.codes import (
Expand Down Expand Up @@ -49,48 +47,21 @@ def _call_scrape(
phones_set: FrozenSet[str] = None,
tsv_filtered_path: str = "",
) -> None:
for unused_retries in range(10):
with open(tsv_path, "w", encoding="utf-8") as source:
try:
scrape_results = wikipron.scrape(config)
# Given phones, opens up a second tsv for scraping.
if phones_set:
with open(
tsv_filtered_path, "w", encoding="utf-8"
) as source_filtered:
for (word, pron) in scrape_results:
line = f"{word}\t{pron}"
if _filter(word, pron, phones_set):
print(line, file=source_filtered)
print(line, file=source)
else:
for (word, pron) in scrape_results:
print(f"{word}\t{pron}", file=source)
return
except (
requests.exceptions.Timeout,
requests.exceptions.ConnectionError,
):
logging.info(
"Exception detected while scraping: %r, %r, %r",
lang_settings["key"],
tsv_path,
tsv_filtered_path,
)
# Pauses execution for 10 min.
time.sleep(600)
# Log and remove TSVs for languages that failed.
logging.info(
"Failed to scrape %r with 10 retries (%s)",
lang_settings["key"],
lang_settings,
)
# Checks if second TSV was opened.
try:
os.remove(tsv_filtered_path)
except OSError:
pass
os.remove(tsv_path)
with open(tsv_path, "w", encoding="utf-8") as source:
scrape_results = wikipron.scrape(config)
# Given phones, opens up a second TSV for scraping.
if phones_set:
with open(
tsv_filtered_path, "w", encoding="utf-8"
) as source_filtered:
for (word, pron) in scrape_results:
line = f"{word}\t{pron}"
if _filter(word, pron, phones_set):
print(line, file=source_filtered)
print(line, file=source)
else:
for (word, pron) in scrape_results:
print(f"{word}\t{pron}", file=source)
kylebgorman marked this conversation as resolved.
Show resolved Hide resolved


def _build_scraping_config(
Expand Down
Loading