From 57b65ed48fef08325fb9d872c6179b0f6d91ccfc Mon Sep 17 00:00:00 2001 From: Lucas Fayoux Date: Wed, 16 Aug 2023 14:07:00 -0400 Subject: [PATCH 1/2] rename dataset.urls to dataset.download_urls --- cohere/responses/dataset.py | 14 +++++++------- pyproject.toml | 2 +- tests/async/test_async_dataset.py | 2 +- tests/sync/test_dataset.py | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cohere/responses/dataset.py b/cohere/responses/dataset.py index 863a7d309..240a5c3cd 100644 --- a/cohere/responses/dataset.py +++ b/cohere/responses/dataset.py @@ -21,7 +21,7 @@ class BaseDataset(CohereObject, JobWithStatus): validation_error: Optional[str] created_at: datetime updated_at: datetime - urls: List[str] + download_urls: List[str] size_bytes: int _wait_fn: Callable[[], "Dataset"] @@ -34,7 +34,7 @@ def __init__( created_at: str, updated_at: str, validation_error: str = None, - urls: List[str] = None, + download_urls: List[str] = None, wait_fn=None, ) -> None: self.id = id @@ -43,15 +43,15 @@ def __init__( self.validation_status = validation_status self.created_at = parse_datetime(created_at) self.updated_at = parse_datetime(updated_at) - self.urls = urls + self.download_urls = download_urls self._wait_fn = wait_fn self.validation_error = validation_error @classmethod def from_dict(cls, data: Dict[str, Any], wait_fn) -> "Dataset": - urls = [] + download_urls = [] if data["validation_status"] == "validated": - urls = [part.get("url") for part in data["dataset_parts"] if part.get("url")] + download_urls = [part.get("url") for part in data["dataset_parts"] if part.get("url")] return cls( id=data["id"], @@ -60,7 +60,7 @@ def from_dict(cls, data: Dict[str, Any], wait_fn) -> "Dataset": validation_status=data["validation_status"], created_at=data["created_at"], updated_at=data["updated_at"], - urls=urls, + download_urls=download_urls, wait_fn=wait_fn, validation_error=data.get("validation_error"), ) @@ -74,7 +74,7 @@ def await_validation(self, timeout: Optional[float] = None, interval: float = 10 def open(self): if self.validation_status != "validated": raise CohereError(message="cannot open non-validated dataset") - for url in self.urls: + for url in self.download_urls: resp = requests.get(url, stream=True) for record in reader(resp.raw): yield record diff --git a/pyproject.toml b/pyproject.toml index a635fe43c..af29e6b35 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "cohere" -version = "4.20.1" +version = "4.20.2" description = "" authors = ["Cohere"] readme = "README.md" diff --git a/tests/async/test_async_dataset.py b/tests/async/test_async_dataset.py index b8b75e0cc..681842f30 100644 --- a/tests/async/test_async_dataset.py +++ b/tests/async/test_async_dataset.py @@ -101,7 +101,7 @@ def check_result(dataset: AsyncDataset, status: Optional[str] = None): assert dataset.validation_status == status if status == "validated": - assert dataset.urls + assert dataset.download_urls for row in dataset.open(): assert row diff --git a/tests/sync/test_dataset.py b/tests/sync/test_dataset.py index e38ecd72b..ee7a9760f 100644 --- a/tests/sync/test_dataset.py +++ b/tests/sync/test_dataset.py @@ -95,7 +95,7 @@ def check_result(self, dataset: Dataset, status: Optional[str] = None): assert dataset.validation_status == status if status == "validated": - assert dataset.urls + assert dataset.download_urls for row in dataset.open(): assert row From ed5543b26ddc11b14e9ad8354f37d96768b138b9 Mon Sep 17 00:00:00 2001 From: Lucas Fayoux Date: Wed, 16 Aug 2023 14:08:07 -0400 Subject: [PATCH 2/2] update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 89c277764..26003a8fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 4.20.2 +- [#284] (https://github.com/cohere-ai/cohere-python/pull/284) + - Rename dataset urls to download_urls + ## 4.20.1 - [#279] (https://github.com/cohere-ai/cohere-python/pull/279) - Fix dataset listing key error