better typing

Author: lsbardel

blocks/sport.yaml

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

metablock/__init__.py

@@ -1,11 +1,10 @@
 import asyncio
 import os
 from pathlib import Path
-from typing import cast
 
 import click
 import yaml
-from metablock import Metablock, Space
+from metablock import Metablock
 
 METABLOCK_SPACE = os.environ.get("METABLOCK_SPACE", "")
 METABLOCK_API_TOKEN = os.environ.get("METABLOCK_API_TOKEN", "")
@@ -16,17 +15,19 @@ def manifest(file_path: Path) -> dict:
 
 
 @click.group()
-def cli() -> None:
+def main() -> None:
     pass
 
 
-@cli.command()
+@main.command()
 @click.argument("path", type=click.Path(exists=True))
 @click.option("--space", "space_name", help="Space name", default=METABLOCK_SPACE)
 @click.option("--token", help="metablock API token", default=METABLOCK_API_TOKEN)
 def apply(path: str, space_name: str, token: str) -> None:
     """Apply metablock manifest"""
-    asyncio.get_event_loop().run_until_complete(_apply(path, space_name, token))
+    asyncio.get_event_loop().run_until_complete(
+        _apply(path, space_name or METABLOCK_SPACE, token or METABLOCK_API_TOKEN)
+    )
 
 
 async def _apply(path: str, space_name: str, token: str) -> None:
@@ -42,7 +43,7 @@ async def _apply(path: str, space_name: str, token: str) -> None:
         name = file_path.name.split(".")[0]
         blocks.append((name, manifest(file_path)))
     async with Metablock(auth_key=token) as mb:
-        space: Space = cast(Space, await mb.spaces.get(space_name))
+        space = await mb.spaces.get(space_name)
         svc = await space.blocks.get_list()
         click.echo(f"space {space.name} has {len(svc)} blocks")
         by_name = {s["name"]: s for s in svc}
@@ -56,7 +57,3 @@ async def _apply(path: str, space_name: str, token: str) -> None:
                 # create
                 await space.services.create(name=name, **config)
                 click.echo(f"created new block {name}")
-
-
-if __name__ == "__main__":
-    cli()

metablock/cli.py

@@ -9,9 +9,9 @@
 from yarl import URL
 
 from .components import Callback, HttpComponent, MetablockResponseError
-from .extensions import Extensions, Plugins
-from .orgs import Orgs
-from .spaces import Blocks, Domains, Space, Spaces
+from .extensions import Extension, Extensions, Plugin, Plugins
+from .orgs import Org, Orgs
+from .spaces import Block, Blocks, Domains, Space, Spaces
 from .user import User
 
 DEFAULT_USER_AGENT = f"Python/{'.'.join(map(str, sys.version_info[:2]))} metablock"
@@ -41,13 +41,13 @@ def __init__(
             "user-agent": user_agent,
             "accept": "application/json",
         }
-        self.spaces: Spaces = Spaces(self)
+        self.orgs: Orgs = Orgs(self, Org)
+        self.spaces: Spaces = Spaces(self, Space)
+        self.blocks: Blocks = Blocks(self, Block, "services")
+        self.plugins: Plugins = Plugins(self, Plugin)
+        self.extensions: Extensions = Extensions(self, Extension)
         self.domains = Domains(self)
-        self.orgs: Orgs = Orgs(self)
-        self.blocks: Blocks = Blocks(self, "services")
         self.services = self.blocks
-        self.plugins: Plugins = Plugins(self)
-        self.extensions: Extensions = Extensions(self)
 
     def __repr__(self) -> str:
         return self.url
@@ -69,9 +69,29 @@ async def __aexit__(self, exc_type: type, exc_val: Any, exc_tb: Any) -> None:
         await self.close()
 
     async def spec(self) -> dict:
-        return await self.execute(f"{self.url}/spec")
+        return await self.request(f"{self.url}/spec")
 
-    async def execute(
+    async def get(self, url: str | URL, **kwargs: Any) -> Any:
+        kwargs["method"] = "GET"
+        return await self.request(url, **kwargs)
+
+    async def patch(self, url: str | URL, **kwargs: Any) -> Any:
+        kwargs["method"] = "PATCH"
+        return await self.request(url, **kwargs)
+
+    async def post(self, url: str | URL, **kwargs: Any) -> Any:
+        kwargs["method"] = "POST"
+        return await self.request(url, **kwargs)
+
+    async def put(self, url: str | URL, **kwargs: Any) -> Any:
+        kwargs["method"] = "PUT"
+        return await self.request(url, **kwargs)
+
+    async def delete(self, url: str | URL, **kwargs: Any) -> Any:
+        kwargs["method"] = "DELETE"
+        return await self.request(url, **kwargs)
+
+    async def request(
         self,
         url: str | URL,
         method: str = "",