Expose InvalidArgmentError

Author: Ronen Hilewicz

.gitignore

@@ -2,9 +2,11 @@ dist
 __pycache__
 .DS_Store
 .env
+.envrc
 .mypy_cache
 .pytest_cache
 .vscode
 .coverage
 .python-version
 .ext
+.dmypy.json

poetry.lock

@@ -31,18 +31,16 @@ packages = [
 [tool.poetry.dependencies]
 python = "^3.9"
 aiohttp = "^3.10.2"
-grpcio = "^1.64.1"
-protobuf = "^5.27.2"
-aserto-authorizer = "^0.20.3"
-aserto-directory = "^0.33.5"
-certifi = ">=2024.8.30"
+aserto-directory = "^0.33.6"
+aserto-authorizer = "^0.20.5"
 
 [tool.poetry.group.dev.dependencies]
-black = "^24.0"
-isort= "^5.9.0"
+black = "^25.1.0"
+isort = "^6.0.1"
 pytest-asyncio = "^0.23"
 pyright = "^1.1.0"
 requests = "^2.31.0"
+grpc-stubs = ">=1.53.0.5"
 
 [tool.black]
 line-length = 100

pyproject.toml

@@ -1,5 +1,7 @@
 from typing import Literal, Tuple
 
+from grpc import RpcError, StatusCode
+
 from aserto.client.directory.channels import Channels
 
 __all__ = ["Channels"]
@@ -9,6 +11,10 @@ class NotFoundError(Exception):
     pass
 
 
+class InvalidArgumentError(Exception):
+    pass
+
+
 class ConfigError(Exception):
     pass
 
@@ -20,3 +26,10 @@ def get_metadata(api_key, tenant_id) -> Tuple[Tuple[str, str], ...]:
     if tenant_id:
         md += (("aserto-tenant-id", tenant_id),)
     return md
+
+
+def translate_rpc_error(err: RpcError) -> None:
+    if err.code() == StatusCode.NOT_FOUND:
+        raise NotFoundError from err
+    if err.code() == StatusCode.INVALID_ARGUMENT:
+        raise InvalidArgumentError from err

src/aserto/client/directory/__init__.py

@@ -6,27 +6,41 @@
 def build_grpc_channel(address: str, ca_cert_path: str) -> Optional[grpc_aio.Channel]:
     if address == "":
         return None
-        
+
     return grpc_aio.secure_channel(
-        target=address, 
+        target=address,
         credentials=channel_credentials(cert=ca_cert_path),
     )
 
+
 class Channels:
     def __init__(
-            self,
-            ca_cert_path: str,
-            default_address: str = "",
-            reader_address: str = "",
-            writer_address: str = "",
-            importer_address: str = "",
-            exporter_address: str = "",
-            model_address: str = "",
-        ) -> None:
-        validate_addresses(address=default_address, reader_address=reader_address, writer_address=writer_address,
-            importer_address=importer_address, exporter_address=exporter_address, model_address=model_address)
-        
-        self._addresses = [default_address, reader_address, writer_address, importer_address, exporter_address, model_address]
+        self,
+        ca_cert_path: str,
+        default_address: str = "",
+        reader_address: str = "",
+        writer_address: str = "",
+        importer_address: str = "",
+        exporter_address: str = "",
+        model_address: str = "",
+    ) -> None:
+        validate_addresses(
+            address=default_address,
+            reader_address=reader_address,
+            writer_address=writer_address,
+            importer_address=importer_address,
+            exporter_address=exporter_address,
+            model_address=model_address,
+        )
+
+        self._addresses = [
+            default_address,
+            reader_address,
+            writer_address,
+            importer_address,
+            exporter_address,
+            model_address,
+        ]
         self._channels = dict()
         for x in self._addresses:
             if x and x not in self._channels:
@@ -37,13 +51,13 @@ def get(self, address: str, default_address: str) -> Optional[grpc_aio.Channel]:
             return self._channels[address]
         if default_address != "":
             return self._channels[default_address]
-        
-        return None
 
+        return None
 
     async def close(self) -> None:
         for x in self._addresses:
             if x != "" and self._channels[x] is not None:
-               await self._channels[x].close()
+                await self._channels[x].close()
+
 
-__all__ = ["Channels"]
+__all__ = ["Channels"]

src/aserto/client/directory/aio/__init__.py

@@ -8,41 +8,65 @@ def validate_addresses(
     writer_address: str,
     importer_address: str,
     exporter_address: str,
-    model_address: str) -> None:
-    if address == "" and reader_address == "" and writer_address == "" and importer_address == "" and exporter_address == "" and model_address == "":
+    model_address: str,
+) -> None:
+    if (
+        address == ""
+        and reader_address == ""
+        and writer_address == ""
+        and importer_address == ""
+        and exporter_address == ""
+        and model_address == ""
+    ):
         raise ValueError("at least one directory service address must be specified")
 
+
 def channel_credentials(cert) -> ChannelCredentials:
     if cert:
         with open(cert, "rb") as f:
             return ssl_channel_credentials(f.read())
     else:
         return ssl_channel_credentials()
-    
+
+
 def build_grpc_channel(address: str, ca_cert_path: str) -> Optional[Channel]:
     if address == "":
         return None
-        
+
     return secure_channel(
-        target=address, 
+        target=address,
         credentials=channel_credentials(cert=ca_cert_path),
     )
 
+
 class Channels:
     def __init__(
-            self,
-            ca_cert_path: str,
-            default_address: str = "",
-            reader_address: str = "",
-            writer_address: str = "",
-            importer_address: str = "",
-            exporter_address: str = "",
-            model_address: str = "",
-        ) -> None:
-        validate_addresses(address=default_address, reader_address=reader_address, writer_address=writer_address,
-            importer_address=importer_address, exporter_address=exporter_address, model_address=model_address)
-        
-        self._addresses = [default_address, reader_address, writer_address, importer_address, exporter_address, model_address]
+        self,
+        ca_cert_path: str,
+        default_address: str = "",
+        reader_address: str = "",
+        writer_address: str = "",
+        importer_address: str = "",
+        exporter_address: str = "",
+        model_address: str = "",
+    ) -> None:
+        validate_addresses(
+            address=default_address,
+            reader_address=reader_address,
+            writer_address=writer_address,
+            importer_address=importer_address,
+            exporter_address=exporter_address,
+            model_address=model_address,
+        )
+
+        self._addresses = [
+            default_address,
+            reader_address,
+            writer_address,
+            importer_address,
+            exporter_address,
+            model_address,
+        ]
         self._channels = dict()
         for x in self._addresses:
             if x and x not in self._channels:
@@ -53,11 +77,10 @@ def get(self, address: str, default_address: str) -> Optional[Channel]:
             return self._channels[address]
         if default_address != "":
             return self._channels[default_address]
-        
-        return None
 
+        return None
 
     def close(self) -> None:
         for x in self._addresses:
             if x != "" and self._channels[x] is not None:
-               self._channels[x].close()
+                self._channels[x].close()