From 1696a41dcaf832bd64aaab3b2b13e079c4e31404 Mon Sep 17 00:00:00 2001 From: Ibrahim Koujar Date: Mon, 18 Sep 2023 22:47:53 +0200 Subject: [PATCH 1/4] chore: update backend endpoints. --- aixplain/factories/corpus_factory.py | 2 +- aixplain/factories/dataset_factory.py | 2 +- aixplain/factories/finetune_factory.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/aixplain/factories/corpus_factory.py b/aixplain/factories/corpus_factory.py index d8cc611e..1af9cb53 100644 --- a/aixplain/factories/corpus_factory.py +++ b/aixplain/factories/corpus_factory.py @@ -117,7 +117,7 @@ def get(cls, corpus_id: Text) -> Corpus: Returns: Corpus: Created 'Corpus' object """ - url = urljoin(cls.backend_url, f"sdk/corpus/{corpus_id}/overview") + url = urljoin(cls.backend_url, f"sdk/corpora/{corpus_id}/overview") if cls.aixplain_key != "": headers = {"x-aixplain-key": f"{cls.aixplain_key}", "Content-Type": "application/json"} else: diff --git a/aixplain/factories/dataset_factory.py b/aixplain/factories/dataset_factory.py index 54d98ace..1b136619 100644 --- a/aixplain/factories/dataset_factory.py +++ b/aixplain/factories/dataset_factory.py @@ -165,7 +165,7 @@ def get(cls, dataset_id: Text) -> Dataset: Returns: Dataset: Created 'Dataset' object """ - url = urljoin(cls.backend_url, f"sdk/dataset/{dataset_id}/overview") + url = urljoin(cls.backend_url, f"sdk/datasets/{dataset_id}/overview") if cls.aixplain_key != "": headers = {"x-aixplain-key": f"{cls.aixplain_key}", "Content-Type": "application/json"} else: diff --git a/aixplain/factories/finetune_factory.py b/aixplain/factories/finetune_factory.py index 91708f4c..28b615c4 100644 --- a/aixplain/factories/finetune_factory.py +++ b/aixplain/factories/finetune_factory.py @@ -79,7 +79,7 @@ def create( train_percentage + dev_percentage <= 100 ), f"Create FineTune: Train percentage + dev percentage ({train_percentage + dev_percentage}) must be less than or equal to one" try: - url = urljoin(cls.backend_url, f"sdk/finetune/cost-estimation") + url = urljoin(cls.backend_url, f"sdk/finetunes/cost-estimation") headers = {"Authorization": f"Token {cls.api_key}", "Content-Type": "application/json"} payload = json.dumps( { From 98a94b86a7ca5a4f8847f1ba81d1a8664fab52fa Mon Sep 17 00:00:00 2001 From: Ibrahim Koujar Date: Mon, 18 Sep 2023 22:59:18 +0200 Subject: [PATCH 2/4] chore: update backend endpoints. --- aixplain/factories/corpus_factory.py | 2 +- aixplain/factories/dataset_factory.py | 2 +- aixplain/modules/finetune.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/aixplain/factories/corpus_factory.py b/aixplain/factories/corpus_factory.py index 1af9cb53..d14cad10 100644 --- a/aixplain/factories/corpus_factory.py +++ b/aixplain/factories/corpus_factory.py @@ -163,7 +163,7 @@ def list( Returns: Dict: list of corpora in agreement with the filters, page number, page total and total elements """ - url = urljoin(cls.backend_url, "sdk/corpus/paginate") + url = urljoin(cls.backend_url, "sdk/corpora/paginate") if cls.aixplain_key != "": headers = {"x-aixplain-key": f"{cls.aixplain_key}", "Content-Type": "application/json"} else: diff --git a/aixplain/factories/dataset_factory.py b/aixplain/factories/dataset_factory.py index 1b136619..f1c8a74e 100644 --- a/aixplain/factories/dataset_factory.py +++ b/aixplain/factories/dataset_factory.py @@ -206,7 +206,7 @@ def list( Returns: Dict: list of datasets in agreement with the filters, page number, page total and total elements """ - url = urljoin(cls.backend_url, "sdk/dataset/paginate") + url = urljoin(cls.backend_url, "sdk/datasets/paginate") if cls.aixplain_key != "": headers = {"x-aixplain-key": f"{cls.aixplain_key}", "Content-Type": "application/json"} else: diff --git a/aixplain/modules/finetune.py b/aixplain/modules/finetune.py index 3bc86ad7..53ec4a78 100644 --- a/aixplain/modules/finetune.py +++ b/aixplain/modules/finetune.py @@ -100,7 +100,7 @@ def start(self) -> Model: """ payload = {} try: - url = urljoin(self.backend_url, f"sdk/finetune") + url = urljoin(self.backend_url, f"sdk/finetunes") headers = {"Authorization": f"Token {self.api_key}", "Content-Type": "application/json"} payload = json.dumps( { From e4a875e7d7039d3d4faf22794f552acc5bc3dcc3 Mon Sep 17 00:00:00 2001 From: Thiago Castro Ferreira Date: Thu, 5 Oct 2023 15:02:11 +0000 Subject: [PATCH 3/4] finetunes -> finetune --- aixplain/factories/finetune_factory.py | 2 +- aixplain/modules/finetune.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aixplain/factories/finetune_factory.py b/aixplain/factories/finetune_factory.py index 28b615c4..91708f4c 100644 --- a/aixplain/factories/finetune_factory.py +++ b/aixplain/factories/finetune_factory.py @@ -79,7 +79,7 @@ def create( train_percentage + dev_percentage <= 100 ), f"Create FineTune: Train percentage + dev percentage ({train_percentage + dev_percentage}) must be less than or equal to one" try: - url = urljoin(cls.backend_url, f"sdk/finetunes/cost-estimation") + url = urljoin(cls.backend_url, f"sdk/finetune/cost-estimation") headers = {"Authorization": f"Token {cls.api_key}", "Content-Type": "application/json"} payload = json.dumps( { diff --git a/aixplain/modules/finetune.py b/aixplain/modules/finetune.py index 53ec4a78..3bc86ad7 100644 --- a/aixplain/modules/finetune.py +++ b/aixplain/modules/finetune.py @@ -100,7 +100,7 @@ def start(self) -> Model: """ payload = {} try: - url = urljoin(self.backend_url, f"sdk/finetunes") + url = urljoin(self.backend_url, f"sdk/finetune") headers = {"Authorization": f"Token {self.api_key}", "Content-Type": "application/json"} payload = json.dumps( { From f9b3362522927b6ea96f808fe10efd30e1ae4fb1 Mon Sep 17 00:00:00 2001 From: Thiago Castro Ferreira Date: Thu, 5 Oct 2023 15:07:04 +0000 Subject: [PATCH 4/4] Update test requirements --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ba752325..b8a7f591 100644 --- a/setup.py +++ b/setup.py @@ -42,7 +42,7 @@ sys.exit(1) requires = ["requests>=2.1.0", "tqdm>=4.1.0", "pandas>=1.2.1", "python-dotenv>=1.0.0", "validators>=0.20.0", "filetype>=1.2.0"] -test_requirements = ["python-dotenv~=0.20.0", "pytest>=6.1.0"] +test_requirements = ["python-dotenv~=0.20.0", "coverage>=7.3.2", "pytest>=6.1.0", "requests-mock>=1.11.0"] about = {} here = os.path.abspath(os.path.dirname(__file__))