Skip to content

Commit 42aed69

Browse files
committed
load_urls_into_new_dataset -> async_load_urls_into_new_dataset and added new synchronous version
1 parent 0741270 commit 42aed69

File tree

3 files changed

+19
-7
lines changed

3 files changed

+19
-7
lines changed

src/omnipy/__init__.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,8 @@
136136
union_all)
137137
from omnipy.modules.remote.datasets import HttpUrlDataset
138138
from omnipy.modules.remote.models import HttpUrlModel, QueryParamsModel, UrlPathModel
139-
from omnipy.modules.remote.tasks import (get_bytes_from_api_endpoint,
139+
from omnipy.modules.remote.tasks import (async_load_urls_into_new_dataset,
140+
get_bytes_from_api_endpoint,
140141
get_json_from_api_endpoint,
141142
get_str_from_api_endpoint,
142143
load_urls_into_new_dataset)
@@ -319,6 +320,7 @@
319320
'get_bytes_from_api_endpoint',
320321
'get_json_from_api_endpoint',
321322
'get_str_from_api_endpoint',
323+
'async_load_urls_into_new_dataset',
322324
'load_urls_into_new_dataset',
323325
'create_row_index_from_column',
324326
'remove_columns',

src/omnipy/modules/remote/tasks.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,20 @@ async def get_bytes_from_api_endpoint(
135135

136136

137137
@TaskTemplate()
138-
async def load_urls_into_new_dataset(
138+
async def async_load_urls_into_new_dataset(
139139
urls: HttpUrlDataset,
140140
dataset_cls: type[JsonDatasetT] = JsonDataset,
141141
) -> JsonDatasetT:
142142
dataset = dataset_cls()
143143
await dataset.load(urls)
144144
return dataset
145+
146+
147+
@TaskTemplate()
148+
def load_urls_into_new_dataset(
149+
urls: HttpUrlDataset,
150+
dataset_cls: type[JsonDatasetT] = JsonDataset,
151+
) -> JsonDatasetT:
152+
dataset = dataset_cls()
153+
dataset.load(urls)
154+
return dataset

tests/modules/remote/cases/request_types.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import pytest_cases as pc
44

55
from omnipy import BytesDataset, Dataset, JsonDataset, JsonDictDataset, StrDataset, TaskTemplate
6-
from omnipy.modules.remote.tasks import (get_bytes_from_api_endpoint,
6+
from omnipy.modules.remote.tasks import (async_load_urls_into_new_dataset,
7+
get_bytes_from_api_endpoint,
78
get_json_from_api_endpoint,
8-
get_str_from_api_endpoint,
9-
load_urls_into_new_dataset)
9+
get_str_from_api_endpoint)
1010

1111

1212
@dataclass
@@ -33,13 +33,13 @@ def case_get_bytes_from_api_endpoint() -> RequestTypeCase:
3333

3434
@pc.case
3535
def case_load_urls_into_new_dataset_default_json() -> RequestTypeCase:
36-
return RequestTypeCase(load_urls_into_new_dataset, dict(), JsonDataset)
36+
return RequestTypeCase(async_load_urls_into_new_dataset, dict(), JsonDataset)
3737

3838

3939
@pc.case
4040
def case_load_urls_into_new_dataset_other_dataset_cls() -> RequestTypeCase:
4141
return RequestTypeCase(
42-
load_urls_into_new_dataset,
42+
async_load_urls_into_new_dataset,
4343
dict(dataset_cls=JsonDictDataset),
4444
JsonDictDataset,
4545
)

0 commit comments

Comments
 (0)