v1.0.0 streaming bug fix

RuREBus.py

@@ -3,17 +3,7 @@ import json
 import requests
 from urllib.parse import urlencode
 from pathlib import Path
-import zipfile
 import os
-import shutil
-
-from .utils import is_notebook
-
-if is_notebook:
-    from tqdm.notebook import tqdm
-else:
-    from tqdm import tqdm
-
 
 _NAME = 'RuREBus'
 _CITATION = '''
@@ -30,37 +20,6 @@ _HOMEPAGE = 'https://github.com/dialogue-evaluation/RuREBus'
 _VERSION = '1.0.0'
 
 
-# def decode_file_names(folder):
-#     for root, dirs, files in os.walk(folder, topdown=False):
-#         root = Path(root)
-#         for file in files:
-#             old_name = root / Path(file)
-#             new_name = root / Path(
-#                 file.encode('cp437').decode('cp866'))
-#             old_name.rename(new_name)
-#         for dir in dirs:
-#             old_name = root / Path(dir)
-#             new_name = root / Path(dir.encode('cp437').decode('cp866'))
-#             old_name.rename(new_name)
-
-
-def extract(zip_file_path):
-    p = Path(zip_file_path)
-    if not p.exists():
-        raise FileNotFoundError
-    dest_dir = str(p.parent / 'extracted' / p.stem)
-    os.makedirs(dest_dir, exist_ok=True)
-    with zipfile.ZipFile(zip_file_path) as archive:
-        for file_info in tqdm(archive.infolist(), desc='Extracting'):
-            filename = file_info.filename.encode('cp437').decode('cp866')
-            target = os.path.join(dest_dir, *filename.split('/'))
-            os.makedirs(os.path.dirname(target), exist_ok=True)
-            if not file_info.is_dir():
-                with archive.open(file_info) as source, open(target, 'wb') as dest:
-                    shutil.copyfileobj(source, dest)
-    return dest_dir
-
-
 class RuREBusBuilder(datasets.GeneratorBasedBuilder):
     base_url = 'https://cloud-api.yandex.net/v1/disk/public/resources/download?'
     public_key = 'https://disk.yandex.ru/d/t1WakmYXlL6jBw'
@@ -122,13 +81,7 @@ class RuREBusBuilder(datasets.GeneratorBasedBuilder):
                 ),
             ]
         else:
-            # folder = dl_manager.download_and_extract(self._RAW_TXT_URLS)['raw_txt']
-            # decode_file_names(folder)
-            zip_file = dl_manager.download(self._RAW_TXT_URLS)['raw_txt']
-            try:
-                folder = extract(zip_file)
-            except FileNotFoundError:
-                folder = None
+            folder = dl_manager.download_and_extract(self._RAW_TXT_URLS)['raw_txt']
             return [
                 datasets.SplitGenerator(
                     name='raw_txt',
@@ -143,15 +96,13 @@ class RuREBusBuilder(datasets.GeneratorBasedBuilder):
                 for i, line in enumerate(f):
                     yield i, json.loads(line)
         else:
-            if filepath is None:
-                return
-            path = Path(filepath) / 'MED_txt/unparsed_txt'
+            path = os.path.join(filepath, 'MED_txt/unparsed_txt')
             i = 0
             for root, dirs, files in os.walk(path):
                 if files:
                     root = Path(root)
-                    region = root.parent.name
-                    district = root.name
+                    region = root.parent.name.encode('cp437').decode('cp866')
+                    district = root.name.encode('cp437').decode('cp866')
                     titles = {}
                     with open(root / 'name_dict.txt', encoding='utf-8') as f_titles:
                         for line in f_titles:

utils.py

@@ -1,17 +0,0 @@
-
-class IsNotebook:
-    def __init__(self):
-        try:
-            shell = get_ipython().__class__.__name__
-            if shell == 'ZMQInteractiveShell':
-                self._is_notebook = True
-            else:
-                self._is_notebook = False
-        except NameError:
-            self._is_notebook = False
-
-    def __call__(self, *args, **kwargs):
-        return self._is_notebook
-
-
-is_notebook = IsNotebook()