fixed acces

src/tasksource/access.py

@@ -1,80 +1,81 @@
-from .preprocess import Preprocessing
-import re
-import pandas as pd
-from . import tasks
-from .metadata import dataset_rank
-from datasets import load_dataset
-import funcy as fc
-import os
-import copy
-from sorcery import dict_of
-
-def parse_var_name(s):
-    config_name,task_name = None,None
-    if '__' in s and '___' not in s: # dataset__task
-        dataset_name, task_name = s.split('__') 
-    elif '__' not in s.replace('___','') and '___' in s: #dataset___config
-        dataset_name, config_name = s.split('___') 
-    elif  '___' in s and '__' in s.split('___')[1]: #dataset___config__task
-        dataset_name, config_task=s.split('___')
-        config_name,task_name = config_task.split('__')
-    else: # dataset 
-        dataset_name = s
-    return dataset_name,config_name,task_name
-
-def pretty_name(x):
-    dn = x.dataset_name.split("/")[-1]   
-    cn = x.config_name if x.config_name else ""
-    tn = x.task_name if x.task_name else ""
-    return f"{dn}/{cn}/{tn}".replace('//','/').rstrip('/')
-
-def list_tasks(tasks_path=f'{os.path.dirname(__file__)}/tasks.py'):
-    task_order = open(tasks_path).readlines()
-    task_order = [x.split('=')[0].rstrip() for x in task_order if '=' in x]
-    task_order = [x for x in task_order if x.isidentifier()]
-    task_order = fc.flip(dict(enumerate(task_order)))
-
-    l = []
-    for key in dir(tasks):
-        if key not in task_order:
-            continue
-        value=getattr(tasks, key)
-        if isinstance(value,Preprocessing):
-            dataset_name, config_name, task_name = parse_var_name(key)
-            dataset_name = (value.dataset_name if value.dataset_name else dataset_name)
-            config_name = (value.config_name if value.config_name else config_name)
-            hasattr(value,key)
-            l+=[{'dataset_name': dataset_name,
-                 'config_name' : config_name,
-                 'task_name': task_name,
-                 'preprocessing_name': key,
-                'task_type': value.__class__.__name__,'mapping': value,
-                'rank':task_order.get(key,None)}]   
-    df=pd.DataFrame(l).explode('config_name')
-    df = df.sort_values('rank').reset_index(drop=True)
-    df['id'] = df.apply(lambda x: pretty_name(x), axis=1)
-    df.insert(0, 'id', df.pop('id'))
-    del df['rank']
-    return df
-
-task_df = list_tasks()
-
-def dict_to_query(d=dict(), **kwargs):
-    d={**d,**kwargs}
-    return '&'.join([f'`{k}`=="{v}"' for k,v in d.items()])
-
-def load_preprocessing(tasks=tasks, **kwargs):
-    y = task_df.copy().query(dict_to_query(**kwargs)).iloc[0]
-    preprocessing= copy.deepcopy(getattr(tasks, y.preprocessing_name))
-    for c in 'dataset_name','config_name':
-        if not isinstance(getattr(preprocessing,c), str):
-             setattr(preprocessing,c,getattr(y,c))
-    return preprocessing
-
-def load_task(id=None, dataset_name=None,config_name=None,task_name=None,preprocessing_name=None,
-         max_rows=None, max_rows_eval=None):
-    query = dict_of(id, dataset_name, config_name, task_name,preprocessing_name)
-    query = {k:v for k,v in query.items() if v}
-    preprocessing = load_preprocessing(**query)
-    dataset = load_dataset(preprocessing.dataset_name, preprocessing.config_name)
+from .preprocess import Preprocessing
+import re
+import pandas as pd
+from . import tasks
+from .metadata import dataset_rank
+from datasets import load_dataset
+import funcy as fc
+import os
+import copy
+from sorcery import dict_of
+
+def parse_var_name(s):
+    config_name,task_name = None,None
+    if '__' in s and '___' not in s: # dataset__task
+        dataset_name, task_name = s.split('__') 
+    elif '__' not in s.replace('___','') and '___' in s: #dataset___config
+        dataset_name, config_name = s.split('___') 
+    elif  '___' in s and '__' in s.split('___')[1]: #dataset___config__task
+        dataset_name, config_task=s.split('___')
+        config_name,task_name = config_task.split('__')
+    else: # dataset 
+        dataset_name = s
+    return dataset_name,config_name,task_name
+
+def pretty_name(x):
+    dn = x.dataset_name.split("/")[-1]   
+    cn = x.config_name if x.config_name else ""
+    tn = x.task_name if x.task_name else ""
+    return f"{dn}/{cn}/{tn}".replace('//','/').rstrip('/')
+
+def list_tasks(tasks_path=f'{os.path.dirname(__file__)}/tasks.py'):
+    task_order = open(tasks_path).readlines()
+    task_order = [x.split('=')[0].rstrip() for x in task_order if '=' in x]
+    task_order = [x for x in task_order if x.isidentifier()]
+    task_order = fc.flip(dict(enumerate(task_order)))
+
+    l = []
+    for key in dir(tasks):
+        if key not in task_order:
+            continue
+        value=getattr(tasks, key)
+        if isinstance(value,Preprocessing):
+            dataset_name, config_name, task_name = parse_var_name(key)
+            dataset_name = (value.dataset_name if value.dataset_name else dataset_name)
+            config_name = (value.config_name if value.config_name else config_name)
+            hasattr(value,key)
+            l+=[{'dataset_name': dataset_name,
+                 'config_name' : config_name,
+                 'task_name': task_name,
+                 'preprocessing_name': key,
+                'task_type': value.__class__.__name__,'mapping': value,
+                'rank':task_order.get(key,None)}]   
+    df=pd.DataFrame(l).explode('config_name')
+    df = df.sort_values('rank').reset_index(drop=True)
+    df['id'] = df.apply(lambda x: pretty_name(x), axis=1)
+    df.insert(0, 'id', df.pop('id'))
+    del df['rank']
+    return df
+
+task_df = list_tasks()
+
+def dict_to_query(d=dict(), **kwargs):
+    d={**d,**kwargs}
+    return '&'.join([f'`{k}`=="{v}"' for k,v in d.items()])
+
+def load_preprocessing(tasks=tasks, **kwargs):
+    y = task_df.copy().query(dict_to_query(**kwargs)).iloc[0]
+    preprocessing= copy.copy(getattr(tasks, y.preprocessing_name))
+    #preprocessing= getattr(tasks, y.preprocessing_name)
+    for c in 'dataset_name','config_name':
+        if not isinstance(getattr(preprocessing,c), str):
+             setattr(preprocessing,c,getattr(y,c))
+    return preprocessing
+
+def load_task(id=None, dataset_name=None,config_name=None,task_name=None,preprocessing_name=None,
+         max_rows=None, max_rows_eval=None):
+    query = dict_of(id, dataset_name, config_name, task_name,preprocessing_name)
+    query = {k:v for k,v in query.items() if v}
+    preprocessing = load_preprocessing(**query)
+    dataset = load_dataset(preprocessing.dataset_name, preprocessing.config_name)
     return preprocessing(dataset,max_rows, max_rows_eval)