httpx instead of aiohttp

Author: vvaezian

CHANGELOG.md

@@ -1,6 +1,6 @@
 ## 3.5
 ### Added
-- Asynchronous API support using `aiohttp`
+- Asynchronous API support using `httpx`
 - New class `Metabase_API_Async` for async operations
 - Async versions of core API methods
 

README.md

@@ -21,7 +21,7 @@ mb = Metabase_API('https://...', api_key='YOUR_API_KEY')
 ```
 
 ## Asynchronous Usage
-The library now supports asynchronous operations using `aiohttp`:
+The library now supports asynchronous operations using `httpx`:
 
 ```python
 import asyncio

metabase_api/_rest_methods_async.py

@@ -1,72 +1,69 @@
-import aiohttp
+import httpx
 
 async def get(self, endpoint, *args, **kwargs):
     """Async version of GET request"""
     await self.validate_session_async()
-    auth = aiohttp.BasicAuth(self.email, self.password) if self.auth else None
-    
-    async with aiohttp.ClientSession() as session:
-        async with session.get(
-            self.domain + endpoint, 
-            headers=self.header, 
+    auth = (self.email, self.password) if self.auth else None
+
+    async with httpx.AsyncClient() as client:
+        res = await client.get(
+            self.domain + endpoint,
+            headers=self.header,
             auth=auth,
             **kwargs
-        ) as res:
-            if 'raw' in args:
-                return res
-            else:
-                return await res.json() if res.status == 200 else False
-
+        )
+        if 'raw' in args:
+            return res
+        else:
+            return res.json() if res.status_code == 200 else False
 
 async def post(self, endpoint, *args, **kwargs):
     """Async version of POST request"""
     await self.validate_session_async()
-    auth = aiohttp.BasicAuth(self.email, self.password) if self.auth else None
-    
-    async with aiohttp.ClientSession() as session:
-        async with session.post(
-            self.domain + endpoint, 
-            headers=self.header, 
+    auth = (self.email, self.password) if self.auth else None
+
+    async with httpx.AsyncClient() as client:
+        res = await client.post(
+            self.domain + endpoint,
+            headers=self.header,
             auth=auth,
             **kwargs
-        ) as res:
-            if 'raw' in args:
-                return res
-            else:
-                return await res.json() if res.status == 200 else False
-
+        )
+        if 'raw' in args:
+            return res
+        else:
+            return res.json() if res.status_code == 200 else False
 
 async def put(self, endpoint, *args, **kwargs):
     """Async version of PUT request for updating objects"""
     await self.validate_session_async()
-    auth = aiohttp.BasicAuth(self.email, self.password) if self.auth else None
-    
-    async with aiohttp.ClientSession() as session:
-        async with session.put(
-            self.domain + endpoint, 
-            headers=self.header, 
+    auth = (self.email, self.password) if self.auth else None
+
+    async with httpx.AsyncClient() as client:
+        res = await client.put(
+            self.domain + endpoint,
+            headers=self.header,
             auth=auth,
             **kwargs
-        ) as res:
-            if 'raw' in args:
-                return res
-            else:
-                return res.status
-
+        )
+        if 'raw' in args:
+            return res
+        else:
+            return res.status_code
 
 async def delete(self, endpoint, *args, **kwargs):
     """Async version of DELETE request"""
     await self.validate_session_async()
-    auth = aiohttp.BasicAuth(self.email, self.password) if self.auth else None
-    
-    async with aiohttp.ClientSession() as session:
-        async with session.delete(
-            self.domain + endpoint, 
-            headers=self.header, 
+    auth = (self.email, self.password) if self.auth else None
+
+    async with httpx.AsyncClient() as client:
+        res = await client.delete(
+            self.domain + endpoint,
+            headers=self.header,
             auth=auth,
             **kwargs
-        ) as res:
-            if 'raw' in args:
-                return res
-            else:
-                return res.status
+        )
+        if 'raw' in args:
+            return res
+        else:
+            return res.status_code

metabase_api/metabase_api_async.py

@@ -1,4 +1,4 @@
-import aiohttp
+import httpx
 import getpass
 from .metabase_api import Metabase_API
 
@@ -40,19 +40,19 @@ async def authenticate_async(self):
             'password': self.password
         }
 
-        async with aiohttp.ClientSession() as session:
-            auth = aiohttp.BasicAuth(self.email, self.password) if self.auth else None
-            async with session.post(
-                self.domain + '/api/session', 
-                json=conn_header, 
+        auth = (self.email, self.password) if self.auth else None
+        async with httpx.AsyncClient() as client:
+            res = await client.post(
+                self.domain + '/api/session',
+                json=conn_header,
                 auth=auth
-            ) as res:
-                if res.status != 200:
-                    raise Exception(f"Authentication failed with status {res.status}")
-                
-                data = await res.json()
-                self.session_id = data['id']
-                self.header = {'X-Metabase-Session': self.session_id}
+            )
+            if res.status_code != 200:
+                raise Exception(f"Authentication failed with status {res.status_code}")
+
+            data = res.json()
+            self.session_id = data['id']
+            self.header = {'X-Metabase-Session': self.session_id}
 
     async def validate_session_async(self):
         """Asynchronously get a new session ID if the previous one has expired"""
@@ -62,19 +62,19 @@ async def validate_session_async(self):
         if not self.session_id:  # First request
             return await self.authenticate_async()
 
-        async with aiohttp.ClientSession() as session:
-            auth = aiohttp.BasicAuth(self.email, self.password) if self.auth else None
-            async with session.get(
-                self.domain + '/api/user/current', 
+        auth = (self.email, self.password) if self.auth else None
+        async with httpx.AsyncClient() as client:
+            res = await client.get(
+                self.domain + '/api/user/current',
                 headers=self.header,
                 auth=auth
-            ) as res:
-                if res.status == 200:
-                    return True
-                elif res.status == 401:  # unauthorized
-                    return await self.authenticate_async()
-                else:
-                    raise Exception(f"Session validation failed with status {res.status}")
+            )
+            if res.status_code == 200:
+                return True
+            elif res.status_code == 401:  # unauthorized
+                return await self.authenticate_async()
+            else:
+                raise Exception(f"Session validation failed with status {res.status_code}")
 
 
 
@@ -152,8 +152,8 @@ async def get_card_data(self, card_name=None, card_id=None, collection_name=None
 
         # return the results in the requested format
         if data_format == 'json':
-            text = await res.text()
+            text = res.text if hasattr(res, 'text') else await res.text()
             return json.loads(text)
         if data_format == 'csv':
-            text = await res.text()
+            text = res.text if hasattr(res, 'text') else await res.text()
             return text.replace('null', '')

requirements.txt

@@ -1,2 +1,2 @@
 requests>=2.25.0
-aiohttp>=3.8.0
+httpx>=0.23.0

setup.py

@@ -15,7 +15,7 @@
     packages=setuptools.find_packages(),
     install_requires=[
         "requests",
-        "aiohttp",  # Added aiohttp dependency
+        "httpx",
     ],
     classifiers=[
         "Programming Language :: Python :: 3",