release

Author: lsbardel

metablock/__init__.py

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

metablock/components.py

@@ -110,8 +110,8 @@ def name(self) -> str:
     def url(self) -> str:
         return "%s/%s" % (self.root.url, self.id)
 
-    async def execute(self, url: str | URL, **params: Any) -> Any:
-        return await self.cli.execute(url, **params)
+    async def execute(self, url: str | URL, **kwargs: Any) -> Any:
+        return await self.cli.execute(url, **kwargs)
 
     def nice(self) -> str:
         return json.dumps(self.data, indent=4)
@@ -188,19 +188,20 @@ async def paginate(self, **params: Any) -> AsyncIterator[MetablockEntity]:
             for d in data["data"]:
                 yield self.wrap(d)
 
-    async def get_list(self, **params: Any) -> list[MetablockEntity]:
+    async def get_list(self, **kwargs: Any) -> list[MetablockEntity]:
         url = self.list_create_url()
+        kwargs.setdefault("wrap", self.wrap_list)
         return cast(
             list[MetablockEntity],
-            await self.execute(url, params=as_params(**params), wrap=self.wrap_list),
+            await self.execute(url, **kwargs),
         )
 
-    async def get_full_list(self, **params: Any) -> list[MetablockEntity]:
-        return [d async for d in self.paginate(**params)]
+    async def get_full_list(self, **kwargs: Any) -> list[MetablockEntity]:
+        return [d async for d in self.paginate(**kwargs)]
 
     async def get(self, id_: str, **kwargs: Any) -> MetablockEntity:  # type: ignore
         url = f"{self.url}/{id_}"
-        kwargs.update(wrap=self.wrap)
+        kwargs.setdefault("wrap", self.wrap)
         return cast(MetablockEntity, await self.execute(url, **kwargs))
 
     async def has(self, id_: str, **kwargs: Any) -> bool:

metablock/extensions.py

@@ -1,4 +1,4 @@
-from typing import List
+from typing import Any
 
 from .components import CrudComponent, MetablockEntity
 from .spaces import BlockPlugin
@@ -19,8 +19,8 @@ class Extensions(CrudComponent):
 class Plugin(MetablockEntity):
     """Object representing an Plugin"""
 
-    async def blocks(self) -> List[BlockPlugin]:
-        return await self.get(f"{self.url}/services")
+    async def blocks(self, **kwargs: Any) -> list[BlockPlugin]:
+        return await self.get(f"{self.url}/services", **kwargs)
 
 
 class Plugins(CrudComponent):

metablock/user.py

@@ -11,30 +11,29 @@ class User(MetablockEntity):
     def url(self) -> str:
         return f"{self.root.url}/user"
 
-    async def orgs(self) -> list[Org]:
+    async def orgs(self, **kwargs: Any) -> list[Org]:
         """List user organizations"""
         orgs = Orgs(self.root)
-        return await self.cli.get(
-            f"{self.url}/orgs", wrap=lambda dl: [Org(orgs, d) for d in dl]
-        )
+        kwargs.setdefault("wrap", lambda dl: [Org(orgs, d) for d in dl])
+        return await self.cli.get(f"{self.url}/orgs", **kwargs)
 
     async def get_permissions(self, **kwargs: Any) -> list[dict]:
         """List user permissions"""
         return await self.cli.get(f"{self.url}/permissions", **kwargs)
 
-    async def tokens(self) -> list[dict]:
-        return await self.cli.get(f"{self.url}/tokens")
+    async def tokens(self, **kwargs: Any) -> list[dict]:
+        return await self.cli.get(f"{self.url}/tokens", **kwargs)
 
-    async def create_token(self) -> dict:
-        return await self.cli.post(f"{self.url}/tokens")
+    async def create_token(self, **kwargs: Any) -> dict:
+        return await self.cli.post(f"{self.url}/tokens", **kwargs)
 
-    async def delete_token(self, token_id: str) -> dict:
-        return await self.cli.delete(f"{self.url}/tokens/{token_id}")
+    async def delete_token(self, token_id: str, **kwargs: Any) -> dict:
+        return await self.cli.delete(f"{self.url}/tokens/{token_id}", **kwargs)
 
-    async def check_password(self, password: str) -> bool:
+    async def check_password(self, password: str, **kwargs: Any) -> bool:
         try:
             return await self.root.post(
-                f"{self.url}/password", json=dict(password=password)
+                f"{self.url}/password", json=dict(password=password), **kwargs
             )
         except MetablockResponseError as exc:
             if exc.status == 401:

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "metablock"
-version = "0.6.0"
+version = "0.6.1"
 description = "Metablock cloud python client"
 authors = ["Luca <luca@quantmind.com>"]
 license = "BSD"

tests/conftest.py

@@ -18,3 +18,8 @@ def event_loop():
 async def cli():
     async with Metablock() as cli:
         yield cli
+
+
+@pytest.fixture
+def invalid_headers(cli):
+    return {cli.auth_key_name: "invalid"}

tests/test_cli.py

@@ -1,4 +1,5 @@
-from metablock import Metablock
+import pytest
+from metablock import Metablock, MetablockResponseError
 
 
 def test_cli(cli: Metablock):
@@ -9,6 +10,21 @@ def test_cli(cli: Metablock):
 async def test_user(cli: Metablock):
     user = await cli.get_user()
     assert user.id
+    orgs = await user.orgs()
+    assert orgs
+
+
+async def test_user_403(cli: Metablock, invalid_headers: dict):
+    with pytest.raises(MetablockResponseError) as exc:
+        await cli.get_user(headers=invalid_headers)
+    assert exc.value.status == 403
+
+
+async def test_orgs_403(cli: Metablock, invalid_headers: dict):
+    user = await cli.get_user()
+    with pytest.raises(MetablockResponseError) as exc:
+        await user.orgs(headers=invalid_headers)
+    assert exc.value.status == 403
 
 
 async def test_space(cli: Metablock):

tests/test_spaces.py

@@ -1,6 +1,13 @@
-from metablock import Metablock
+import pytest
+from metablock import Metablock, MetablockResponseError
 
 
 async def test_list_spaces(cli: Metablock) -> None:
     spaces = await cli.spaces.get_list()
     assert spaces
+
+
+async def test_get_space_403(cli: Metablock, invalid_headers: dict) -> None:
+    with pytest.raises(MetablockResponseError) as exc:
+        await cli.spaces.get_list(headers=invalid_headers)
+    assert exc.value.status == 403