From e16f85243c2d02817218c5ad1472a239a62ad1b9 Mon Sep 17 00:00:00 2001 From: cobycloud <25079070+cobycloud@users.noreply.github.com> Date: Fri, 29 Nov 2024 19:47:09 -0600 Subject: [PATCH 1/6] croutonclient - Update async.py --- pkgs/crouton_client/crouton_client/async.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/crouton_client/crouton_client/async.py b/pkgs/crouton_client/crouton_client/async.py index c0aeeb2..9e3ffbf 100644 --- a/pkgs/crouton_client/crouton_client/async.py +++ b/pkgs/crouton_client/crouton_client/async.py @@ -39,14 +39,12 @@ async def get( self, resource: str, item_id: Optional[str] = None, - filter_key: Optional[str] = None, - filter_value: Optional[str] = None + filters: Optional[Dict[str, Any]] = None ) -> Dict[str, Any]: """ Perform an asynchronous GET request with optional filters and an item ID. """ - query_params = {filter_key: filter_value} if filter_key and filter_value else None - url = await self._build_url(resource, item_id, query_params) + url = await self._build_url(resource, item_id, filters) logger.info(f"Performing GET request to {url}") async with aiohttp.ClientSession() as session: From b19da3af424355f7508c113b4e5a0e3be8cfb077 Mon Sep 17 00:00:00 2001 From: cobycloud <25079070+cobycloud@users.noreply.github.com> Date: Fri, 29 Nov 2024 19:50:57 -0600 Subject: [PATCH 2/6] croutonclient - Update async.py --- pkgs/crouton_client/crouton_client/async.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/crouton_client/crouton_client/async.py b/pkgs/crouton_client/crouton_client/async.py index 9e3ffbf..906420d 100644 --- a/pkgs/crouton_client/crouton_client/async.py +++ b/pkgs/crouton_client/crouton_client/async.py @@ -35,7 +35,7 @@ async def _build_url(self, resource: str, item_id: Optional[str] = None, query_p return url - async def get( + async def aget( self, resource: str, item_id: Optional[str] = None, @@ -56,7 +56,7 @@ async def get( logger.error(f"GET request failed with status {res.status}: {error_content}") raise ValueError(f"GET request failed with status {res.status}: {error_content}") - async def post(self, resource: str, data_obj: Dict[str, Any]) -> Dict[str, Any]: + async def apost(self, resource: str, data_obj: Dict[str, Any]) -> Dict[str, Any]: """ Perform an asynchronous POST request to create a resource. """ @@ -75,7 +75,7 @@ async def post(self, resource: str, data_obj: Dict[str, Any]) -> Dict[str, Any]: logger.error(f"POST request failed with status {res.status}: {error_content}") raise ValueError(f"POST request failed with status {res.status}: {error_content}") - async def put(self, resource: str, data_obj: Dict[str, Any], item_id: Optional[str] = None) -> Dict[str, Any]: + async def aput(self, resource: str, data_obj: Dict[str, Any], item_id: Optional[str] = None) -> Dict[str, Any]: """ Perform an asynchronous PUT request to update a resource. """ @@ -91,7 +91,7 @@ async def put(self, resource: str, data_obj: Dict[str, Any], item_id: Optional[s logger.error(f"PUT request failed with status {res.status}: {error_content}") raise ValueError(f"PUT request failed with status {res.status}: {error_content}") - async def delete(self, resource: str, item_id: Optional[str] = None) -> Dict[str, Any]: + async def adel(self, resource: str, item_id: Optional[str] = None) -> Dict[str, Any]: """ Perform an asynchronous DELETE request to delete a resource. """ From a10bd2908fb376ae15c03c3510ec802166bf49ef Mon Sep 17 00:00:00 2001 From: cobycloud <25079070+cobycloud@users.noreply.github.com> Date: Fri, 29 Nov 2024 19:51:25 -0600 Subject: [PATCH 3/6] croutonclient - Update blocking.py --- pkgs/crouton_client/crouton_client/blocking.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/crouton_client/crouton_client/blocking.py b/pkgs/crouton_client/crouton_client/blocking.py index 7573c0c..6c8a34d 100644 --- a/pkgs/crouton_client/crouton_client/blocking.py +++ b/pkgs/crouton_client/crouton_client/blocking.py @@ -35,7 +35,7 @@ def _build_url(self, resource: str, item_id: Optional[str] = None, query_params: return url - def api_get_call( + def get( self, resource: str, item_id: Optional[str] = None, @@ -54,7 +54,7 @@ def api_get_call( logger.error(f"GET request failed with status {res.status_code}: {res.text}") raise ValueError(f"GET request failed with status {res.status_code}: {res.text}") - def api_post_call(self, resource: str, data_obj: dict) -> dict: + def post(self, resource: str, data_obj: dict) -> dict: """ Perform a POST request to create a resource. """ @@ -71,7 +71,7 @@ def api_post_call(self, resource: str, data_obj: dict) -> dict: logger.error(f"POST request failed with status {res.status_code}: {res.text}") raise ValueError(f"POST request failed with status {res.status_code}: {res.text}") - def api_put_call(self, resource: str, data_obj: dict, item_id: str) -> dict: + def put(self, resource: str, data_obj: dict, item_id: str) -> dict: """ Perform a PUT request to update a resource. """ @@ -85,7 +85,7 @@ def api_put_call(self, resource: str, data_obj: dict, item_id: str) -> dict: logger.error(f"PUT request failed with status {res.status_code}: {res.text}") raise ValueError(f"PUT request failed with status {res.status_code}: {res.text}") - def api_delete_call(self, resource: str, item_id: Optional[str] = None) -> dict: + def delete(self, resource: str, item_id: Optional[str] = None) -> dict: """ Perform a DELETE request to delete a resource. """ From 676490fb09603effab71246de03ac421c769dfe7 Mon Sep 17 00:00:00 2001 From: cobycloud <25079070+cobycloud@users.noreply.github.com> Date: Fri, 29 Nov 2024 19:51:39 -0600 Subject: [PATCH 4/6] croutoncli - Update async.py --- pkgs/crouton_client/crouton_client/async.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/crouton_client/crouton_client/async.py b/pkgs/crouton_client/crouton_client/async.py index 906420d..75c193c 100644 --- a/pkgs/crouton_client/crouton_client/async.py +++ b/pkgs/crouton_client/crouton_client/async.py @@ -91,7 +91,7 @@ async def aput(self, resource: str, data_obj: Dict[str, Any], item_id: Optional[ logger.error(f"PUT request failed with status {res.status}: {error_content}") raise ValueError(f"PUT request failed with status {res.status}: {error_content}") - async def adel(self, resource: str, item_id: Optional[str] = None) -> Dict[str, Any]: + async def adelete(self, resource: str, item_id: Optional[str] = None) -> Dict[str, Any]: """ Perform an asynchronous DELETE request to delete a resource. """ From d9c6f475e5ba72c0c33adf1fda41579c588fee9c Mon Sep 17 00:00:00 2001 From: cobycloud <25079070+cobycloud@users.noreply.github.com> Date: Fri, 29 Nov 2024 19:52:06 -0600 Subject: [PATCH 5/6] croutonclient - Update pyproject.toml --- pkgs/crouton_client/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/crouton_client/pyproject.toml b/pkgs/crouton_client/pyproject.toml index aa311bd..3346f07 100644 --- a/pkgs/crouton_client/pyproject.toml +++ b/pkgs/crouton_client/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "crouton_client" -version = "0.0.4.dev8" +version = "0.0.4.dev9" description = "A client for Swarmauri's crouton." authors = ["Jacob Stewart "] license = "Apache-2.0" From 6d5dd0d96ec4f954f6e216a81a75a1bcee209b7c Mon Sep 17 00:00:00 2001 From: cobycloud <25079070+cobycloud@users.noreply.github.com> Date: Fri, 29 Nov 2024 19:52:22 -0600 Subject: [PATCH 6/6] croutonclient - Update pyproject.toml --- pkgs/crouton/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/crouton/pyproject.toml b/pkgs/crouton/pyproject.toml index 4a68e4b..707f1f6 100644 --- a/pkgs/crouton/pyproject.toml +++ b/pkgs/crouton/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "crouton" -version = "0.0.4.dev8" +version = "0.0.4.dev9" description = "A repository to enable API CRUD Routing" authors = ["Jacob Stewart "] license = "Apache-2.0"