Use httpx (#24)

* Use httpx

* Drop 3.10

* Fix lock

Author: lsbardel

.github/workflows/build.yml

@@ -16,12 +16,12 @@ jobs:
       PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
     strategy:
       matrix:
-        python-version: ["3.10", "3.11", "3.12"]
+        python-version: ["3.11", "3.12", "3.13"]
 
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
@@ -31,11 +31,11 @@ jobs:
       - name: run tests
         run: make test
       - name: upload coverage
-        if: matrix.python-version == '3.12'
-        uses: codecov/codecov-action@v3
+        if: matrix.python-version == '3.13'
+        uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: ./build/coverage.xml
       - name: release
-        if: ${{matrix.python-version == '3.12' && github.ref == 'refs/heads/main' && github.event.head_commit.message == 'release'}}
+        if: ${{matrix.python-version == '3.13' && github.ref == 'refs/heads/main' && github.event.head_commit.message == 'release'}}
         run: make publish

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2020 Quantmind
+Copyright (c) 2025 Quantmind
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:

metablock/__init__.py

@@ -5,7 +5,7 @@
 from .spaces import Block, Service, Space, SpaceExtension
 from .user import User
 
-__version__ = "0.7.1"
+__version__ = "0.9.0"
 
 __all__ = [
     "Metablock",

metablock/client.py

@@ -3,10 +3,10 @@
 import logging
 import os
 import sys
-from typing import Any
+from typing import Any, Self
 
-from aiohttp import ClientResponse, ClientSession
-from yarl import URL
+from httpx import AsyncClient
+from httpx import Response as ClientResponse
 
 from .components import Callback, HttpComponent, MetablockResponseError
 from .extensions import Extension, Extensions, Plugin, Plugins
@@ -30,13 +30,14 @@ def __init__(
         url: str | None = None,
         auth_key: str = "",
         auth_key_name: str = "x-metablock-api-key",
-        session: ClientSession | None = None,
+        session: AsyncClient | None = None,
         user_agent: str = DEFAULT_USER_AGENT,
     ) -> None:
         self.url: str = url if url is not None else self.url
         self.auth_key: str = auth_key or self.auth_key
         self.auth_key_name = auth_key_name
         self.session = session
+        self.session_owner = session is None
         self.default_headers: dict[str, str] = {
             "user-agent": user_agent,
             "accept": "application/json",
@@ -49,18 +50,14 @@ def __init__(
         self.domains = Domains(self)
         self.services = self.blocks
 
-    def __repr__(self) -> str:
-        return self.url
-
-    __str__ = __repr__
-
     @property
-    def cli(self) -> Metablock:
+    def cli(self) -> Self:
         return self
 
     async def close(self) -> None:
-        if self.session:
-            await self.session.close()
+        if self.session and self.session_owner:
+            await self.session.aclose()
+            self.session = None
 
     async def __aenter__(self) -> Metablock:
         return self
@@ -71,37 +68,37 @@ async def __aexit__(self, exc_type: type, exc_val: Any, exc_tb: Any) -> None:
     async def spec(self) -> dict:
         return await self.request(f"{self.url}/spec")
 
-    async def get(self, url: str | URL, **kwargs: Any) -> Any:
+    async def get(self, url: str, **kwargs: Any) -> Any:
         kwargs["method"] = "GET"
         return await self.request(url, **kwargs)
 
-    async def patch(self, url: str | URL, **kwargs: Any) -> Any:
+    async def patch(self, url: str, **kwargs: Any) -> Any:
         kwargs["method"] = "PATCH"
         return await self.request(url, **kwargs)
 
-    async def post(self, url: str | URL, **kwargs: Any) -> Any:
+    async def post(self, url: str, **kwargs: Any) -> Any:
         kwargs["method"] = "POST"
         return await self.request(url, **kwargs)
 
-    async def put(self, url: str | URL, **kwargs: Any) -> Any:
+    async def put(self, url: str, **kwargs: Any) -> Any:
         kwargs["method"] = "PUT"
         return await self.request(url, **kwargs)
 
-    async def delete(self, url: str | URL, **kwargs: Any) -> Any:
+    async def delete(self, url: str, **kwargs: Any) -> Any:
         kwargs["method"] = "DELETE"
         return await self.request(url, **kwargs)
 
     async def request(
         self,
-        url: str | URL,
+        url: str,
         method: str = "",
         headers: dict[str, str] | None = None,
         callback: Callback | None = None,
         wrap: Any = None,
         **kw: Any,
     ) -> Any:
         if not self.session:
-            self.session = ClientSession()
+            self.session = AsyncClient()
         method = method or "GET"
         headers_ = self.get_default_headers()
         headers_.update(headers or ())
@@ -112,16 +109,16 @@ async def request(
             return await self.handle_response(response, wrap=wrap)
 
     async def handle_response(self, response: ClientResponse, wrap: Any = None) -> Any:
-        if response.status == 204:
+        if response.status_code == 204:
             return True
-        if response.status >= 400:
+        if response.status_code >= 400:
             try:
-                data = await response.json()
+                data = response.json()
             except Exception:
-                data = await response.text()
+                data = response.text
             raise MetablockResponseError(response, data)
         response.raise_for_status()
-        data = await response.json()
+        data = response.json()
         return wrap(data) if wrap else data
 
     async def get_user(self, **kw: Any) -> User:

metablock/components.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import json
-from abc import ABC, abstractproperty
+from abc import ABC, abstractmethod
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -14,7 +14,7 @@
     cast,
 )
 
-from aiohttp import ClientResponse
+from httpx import Response as ClientResponse
 
 from .utils import as_dict, as_params
 
@@ -34,23 +34,25 @@ def __init__(self, response: ClientResponse, message: Any = "") -> None:
         self.response = response
         self.message = as_dict(message, "message")
         self.message["request_url"] = str(response.url)
-        self.message["request_method"] = response.method
-        self.message["response_status"] = response.status
+        self.message["request_method"] = response.request.method
+        self.message["response_status"] = response.status_code
 
     @property
     def status(self) -> int:
-        return self.response.status
+        return self.response.status_code
 
     def __str__(self) -> str:
         return json.dumps(self.message, indent=4)
 
 
 class HttpComponent(ABC):
-    @abstractproperty
+    @property
+    @abstractmethod
     def cli(self) -> Metablock:  # pragma: no cover
         ...
 
-    @abstractproperty
+    @property
+    @abstractmethod
     def url(self) -> str:  # pragma: no cover
         ...
 
@@ -237,9 +239,9 @@ def delete_url(self, id_name: str) -> str:
     # callbacks
 
     async def _head(self, response: ClientResponse) -> bool:
-        if response.status == 404:
+        if response.status_code == 404:
             return False
-        elif response.status == 200:
+        elif response.status_code == 200:
             return True
         else:  # pragma: no cover
             raise MetablockResponseError(response)

metablock/spaces.py

@@ -2,8 +2,6 @@
 
 from typing import Any
 
-from aiohttp.formdata import FormData
-
 from .components import Component, CrudComponent, MetablockEntity
 
 
@@ -50,12 +48,11 @@ async def certificate(self, *, callback: Any = None) -> dict:
     async def ship(
         self, name: str, bundle: str, env: str = "stage", *, callback: Any = None
     ) -> dict:
-        data = FormData()
-        data.add_field("name", name)
-        data.add_field("bundle", open(bundle, "rb"), filename=bundle)
-        data.add_field("env", env)
         return await self.cli.post(
-            f"{self.url}/deployments", data=data, callback=callback
+            f"{self.url}/deployments",
+            data=dict(name=name, env=env),
+            files=dict(bundle=(bundle, open(bundle, "rb"))),
+            callback=callback,
         )
 
     async def add_route(self, *, callback: Any = None, **kwargs: Any) -> dict: