Merge pull request #17 from swarmauri/dev

v0.4.0.dev9

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 <[email protected]>"]
 license = "Apache-2.0"

pkgs/crouton_client/crouton_client/async.py

@@ -35,18 +35,16 @@ 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, 
-        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:
@@ -58,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.
         """
@@ -77,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.
         """
@@ -93,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 adelete(self, resource: str, item_id: Optional[str] = None) -> Dict[str, Any]:
         """
         Perform an asynchronous DELETE request to delete a resource.
         """

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.
         """

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 <[email protected]>"]
 license = "Apache-2.0"