cacholong-cloud-cli 1.2.0__tar.gz → 1.4.0__tar.gz

{cacholong_cloud_cli-1.2.0 → cacholong_cloud_cli-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cacholong-cloud-cli
-Version: 1.2.0
+Version: 1.4.0
 Summary: Cacholong CLI, manage cloud environments at Cacholong!
 License: MIT
 Author: Matthijs Möhlmann

{cacholong_cloud_cli-1.2.0 → cacholong_cloud_cli-1.4.0}/cacholong_cli/AsyncTyper.py

@@ -1,8 +1,12 @@
 from asyncio import run
 from functools import wraps
 from typing import Callable, Any
+import sys
 
 import typer
+from rich.console import Console
+
+_error_console = Console(stderr=True)
 
 
 class AsyncTyper(typer.Typer):
@@ -12,7 +16,13 @@ class AsyncTyper(typer.Typer):
         def decorator(async_func: Callable) -> Callable:
             @wraps(async_func)
             def sync_func(*_args: Any, **_kwargs: Any) -> Any:
-                return run(async_func(*_args, **_kwargs))
+                try:
+                    return run(async_func(*_args, **_kwargs))
+                except SystemExit:
+                    raise
+                except Exception as e:
+                    _error_console.print(f"[bold red]Unexpected error:[/bold red] {e}")
+                    sys.exit(1)
 
             self.command(*args, **kwargs)(sync_func)
             return async_func

{cacholong_cloud_cli-1.2.0 → cacholong_cloud_cli-1.4.0}/cacholong_cli/commands/accounts.py

@@ -11,10 +11,17 @@ from cacholong_cli.common import (
     list_relation_resources,
     show_resource,
     print_document_error,
+    print_validation_error,
     TableDef,
 )
 from cacholong_cli.connection import Connection
-from cacholong_sdk import Filter, Inclusion, DocumentError, ResourceTuple
+from cacholong_sdk import (
+    Filter,
+    Inclusion,
+    DocumentError,
+    ResourceTuple,
+    ValidationException,
+)
 from cacholong_sdk import AccountBase, AccountBaseModel
 
 from cacholong_sdk.api_schema import api_schema
@@ -246,6 +253,8 @@ async def show(
             model = await ctrl.fetch(account_id)
 
             show_resource(ctx, model)
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)
 
@@ -427,5 +436,7 @@ async def list_user_roles(
             await list_relation_resources(
                 ctx, parent_model, "user-roles", tabledef, modifier
             )
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)

{cacholong_cloud_cli-1.2.0 → cacholong_cloud_cli-1.4.0}/cacholong_cli/commands/addresses.py

@@ -11,10 +11,17 @@ from cacholong_cli.common import (
     list_relation_resources,
     show_resource,
     print_document_error,
+    print_validation_error,
     TableDef,
 )
 from cacholong_cli.connection import Connection
-from cacholong_sdk import Filter, Inclusion, DocumentError, ResourceTuple
+from cacholong_sdk import (
+    Filter,
+    Inclusion,
+    DocumentError,
+    ResourceTuple,
+    ValidationException,
+)
 from cacholong_sdk import AddressShow, AddressShowModel
 from cacholong_sdk import AddressCreateWithUser, AddressCreateWithUserModel
 from cacholong_sdk import AddressCreateWithCompany, AddressCreateWithCompanyModel
@@ -298,6 +305,8 @@ async def show(
             model = await ctrl.fetch(address_id)
 
             show_resource(ctx, model)
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)
 
@@ -380,6 +389,8 @@ async def create(
             await ctrl.store(model, ctx.obj["create_issue"])  # type: ignore[arg-type]
 
             show_resource(ctx, model)
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)
 
@@ -444,6 +455,8 @@ async def update(
             await ctrl.update(model)
 
             show_resource(ctx, model)
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)
 
@@ -458,8 +471,14 @@ async def delete(
             ctrl = AddressShow(conn, api_schema)
             for resource_id in address_id:
                 tg.create_task(ctrl.destroy(resource_id))
-    except DocumentError as e:
-        await print_document_error(e)
+    except* ValidationException as eg:
+        for e in eg.exceptions:
+            if isinstance(e, ValidationException):
+                print_validation_error(e)
+    except* DocumentError as eg:
+        for e in eg.exceptions:
+            if isinstance(e, DocumentError):
+                await print_document_error(e)
 
 
 @app.async_command(
@@ -481,6 +500,8 @@ async def show_company(
             related = parent_model["company"].resource
 
             show_resource(ctx, related)
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)
 
@@ -504,5 +525,7 @@ async def show_user(
             related = parent_model["user"].resource
 
             show_resource(ctx, related)
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)

{cacholong_cloud_cli-1.2.0 → cacholong_cloud_cli-1.4.0}/cacholong_cli/commands/companies.py

@@ -11,10 +11,17 @@ from cacholong_cli.common import (
     list_relation_resources,
     show_resource,
     print_document_error,
+    print_validation_error,
     TableDef,
 )
 from cacholong_cli.connection import Connection
-from cacholong_sdk import Filter, Inclusion, DocumentError, ResourceTuple
+from cacholong_sdk import (
+    Filter,
+    Inclusion,
+    DocumentError,
+    ResourceTuple,
+    ValidationException,
+)
 from cacholong_sdk import CompanyBase, CompanyBaseModel
 
 from cacholong_sdk.api_schema import api_schema
@@ -35,6 +42,8 @@ async def show(
             model = await ctrl.fetch(company_id)
 
             show_resource(ctx, model)
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)
 
@@ -85,6 +94,8 @@ async def update(
             await ctrl.update(model)
 
             show_resource(ctx, model)
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)
 
@@ -336,6 +347,8 @@ async def list_addresses(
             await list_relation_resources(
                 ctx, parent_model, "addresses", tabledef, modifier
             )
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)
 
@@ -359,5 +372,7 @@ async def show_account(
             related = parent_model["account"].resource
 
             show_resource(ctx, related)
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)

{cacholong_cloud_cli-1.2.0 → cacholong_cloud_cli-1.4.0}/cacholong_cli/commands/dns_records.py

@@ -11,10 +11,17 @@ from cacholong_cli.common import (
     list_relation_resources,
     show_resource,
     print_document_error,
+    print_validation_error,
     TableDef,
 )
 from cacholong_cli.connection import Connection
-from cacholong_sdk import Filter, Inclusion, DocumentError, ResourceTuple
+from cacholong_sdk import (
+    Filter,
+    Inclusion,
+    DocumentError,
+    ResourceTuple,
+    ValidationException,
+)
 from cacholong_sdk import DnsRecordBase, DnsRecordBaseModel
 from cacholong_sdk import DnsRecordCreateWithZone, DnsRecordCreateWithZoneModel
 from cacholong_sdk import DnsRecordCreateWithTemplate, DnsRecordCreateWithTemplateModel
@@ -273,6 +280,8 @@ async def show(
             model = await ctrl.fetch(dns_record_id)
 
             show_resource(ctx, model)
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)
 
@@ -344,6 +353,8 @@ async def create(
             await ctrl.store(model, ctx.obj["create_issue"])  # type: ignore[arg-type]
 
             show_resource(ctx, model)
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)
 
@@ -397,6 +408,8 @@ async def update(
             await ctrl.update(model)
 
             show_resource(ctx, model)
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)
 
@@ -413,5 +426,11 @@ async def delete(
             ctrl = DnsRecordBase(conn, api_schema)
             for resource_id in dns_record_id:
                 tg.create_task(ctrl.destroy(resource_id))
-    except DocumentError as e:
-        await print_document_error(e)
+    except* ValidationException as eg:
+        for e in eg.exceptions:
+            if isinstance(e, ValidationException):
+                print_validation_error(e)
+    except* DocumentError as eg:
+        for e in eg.exceptions:
+            if isinstance(e, DocumentError):
+                await print_document_error(e)

{cacholong_cloud_cli-1.2.0 → cacholong_cloud_cli-1.4.0}/cacholong_cli/commands/dns_templates.py

@@ -11,10 +11,17 @@ from cacholong_cli.common import (
     list_relation_resources,
     show_resource,
     print_document_error,
+    print_validation_error,
     TableDef,
 )
 from cacholong_cli.connection import Connection
-from cacholong_sdk import Filter, Inclusion, DocumentError, ResourceTuple
+from cacholong_sdk import (
+    Filter,
+    Inclusion,
+    DocumentError,
+    ResourceTuple,
+    ValidationException,
+)
 from cacholong_sdk import DnsTemplateShow, DnsTemplateShowModel
 
 from cacholong_sdk.api_schema import api_schema
@@ -226,6 +233,8 @@ async def show(
             model = await ctrl.fetch(dns_template_id)
 
             show_resource(ctx, model)
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)
 
@@ -254,6 +263,8 @@ async def create(
             await ctrl.store(model, ctx.obj["create_issue"])
 
             show_resource(ctx, model)
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)
 
@@ -277,6 +288,8 @@ async def update(
             await ctrl.update(model)
 
             show_resource(ctx, model)
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)
 
@@ -293,5 +306,11 @@ async def delete(
             ctrl = DnsTemplateShow(conn, api_schema)
             for resource_id in dns_template_id:
                 tg.create_task(ctrl.destroy(resource_id))
-    except DocumentError as e:
-        await print_document_error(e)
+    except* ValidationException as eg:
+        for e in eg.exceptions:
+            if isinstance(e, ValidationException):
+                print_validation_error(e)
+    except* DocumentError as eg:
+        for e in eg.exceptions:
+            if isinstance(e, DocumentError):
+                await print_document_error(e)

{cacholong_cloud_cli-1.2.0 → cacholong_cloud_cli-1.4.0}/cacholong_cli/commands/dns_zones.py

@@ -11,10 +11,17 @@ from cacholong_cli.common import (
     list_relation_resources,
     show_resource,
     print_document_error,
+    print_validation_error,
     TableDef,
 )
 from cacholong_cli.connection import Connection
-from cacholong_sdk import Filter, Inclusion, DocumentError, ResourceTuple
+from cacholong_sdk import (
+    Filter,
+    Inclusion,
+    DocumentError,
+    ResourceTuple,
+    ValidationException,
+)
 from cacholong_sdk import DnsZoneCreate, DnsZoneCreateModel
 
 from cacholong_sdk.api_schema import api_schema
@@ -308,6 +315,8 @@ async def show(
             model = await ctrl.fetch(dns_zone_id)
 
             show_resource(ctx, model)
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)
 
@@ -346,6 +355,8 @@ async def create(
             await ctrl.store(model, ctx.obj["create_issue"])
 
             show_resource(ctx, model)
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)
 
@@ -383,6 +394,8 @@ async def update(
             await ctrl.update(model)
 
             show_resource(ctx, model)
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)
 
@@ -397,5 +410,11 @@ async def delete(
             ctrl = DnsZoneCreate(conn, api_schema)
             for resource_id in dns_zone_id:
                 tg.create_task(ctrl.destroy(resource_id))
-    except DocumentError as e:
-        await print_document_error(e)
+    except* ValidationException as eg:
+        for e in eg.exceptions:
+            if isinstance(e, ValidationException):
+                print_validation_error(e)
+    except* DocumentError as eg:
+        for e in eg.exceptions:
+            if isinstance(e, DocumentError):
+                await print_document_error(e)

{cacholong_cloud_cli-1.2.0 → cacholong_cloud_cli-1.4.0}/cacholong_cli/commands/mail_address_aliases.py

@@ -11,10 +11,17 @@ from cacholong_cli.common import (
     list_relation_resources,
     show_resource,
     print_document_error,
+    print_validation_error,
     TableDef,
 )
 from cacholong_cli.connection import Connection
-from cacholong_sdk import Filter, Inclusion, DocumentError, ResourceTuple
+from cacholong_sdk import (
+    Filter,
+    Inclusion,
+    DocumentError,
+    ResourceTuple,
+    ValidationException,
+)
 from cacholong_sdk import MailAddressAliasBase, MailAddressAliasBaseModel
 
 from cacholong_sdk.api_schema import api_schema
@@ -250,6 +257,8 @@ async def show(
             model = await ctrl.fetch(mail_address_alias_id)
 
             show_resource(ctx, model)
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)
 
@@ -285,6 +294,8 @@ async def create(
             await ctrl.store(model, ctx.obj["create_issue"])
 
             show_resource(ctx, model)
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)
 
@@ -320,6 +331,8 @@ async def update(
             await ctrl.update(model)
 
             show_resource(ctx, model)
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)
 
@@ -336,8 +349,14 @@ async def delete(
             ctrl = MailAddressAliasBase(conn, api_schema)
             for resource_id in mail_address_alias_id:
                 tg.create_task(ctrl.destroy(resource_id))
-    except DocumentError as e:
-        await print_document_error(e)
+    except* ValidationException as eg:
+        for e in eg.exceptions:
+            if isinstance(e, ValidationException):
+                print_validation_error(e)
+    except* DocumentError as eg:
+        for e in eg.exceptions:
+            if isinstance(e, DocumentError):
+                await print_document_error(e)
 
 
 @app.async_command(
@@ -360,5 +379,7 @@ async def show_mail_address(
             related = parent_model["mail-address"].resource
 
             show_resource(ctx, related)
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)

{cacholong_cloud_cli-1.2.0 → cacholong_cloud_cli-1.4.0}/cacholong_cli/commands/mail_addresses.py

@@ -11,10 +11,17 @@ from cacholong_cli.common import (
     list_relation_resources,
     show_resource,
     print_document_error,
+    print_validation_error,
     TableDef,
 )
 from cacholong_cli.connection import Connection
-from cacholong_sdk import Filter, Inclusion, DocumentError, ResourceTuple
+from cacholong_sdk import (
+    Filter,
+    Inclusion,
+    DocumentError,
+    ResourceTuple,
+    ValidationException,
+)
 from cacholong_sdk import MailAddressBase, MailAddressBaseModel
 
 from cacholong_sdk.api_schema import api_schema
@@ -285,6 +292,8 @@ async def show(
             model = await ctrl.fetch(mail_address_id)
 
             show_resource(ctx, model)
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)
 
@@ -339,6 +348,8 @@ async def create(
             await ctrl.store(model, ctx.obj["create_issue"])
 
             show_resource(ctx, model)
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)
 
@@ -398,6 +409,8 @@ async def update(
             await ctrl.update(model)
 
             show_resource(ctx, model)
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)
 
@@ -414,8 +427,14 @@ async def delete(
             ctrl = MailAddressBase(conn, api_schema)
             for resource_id in mail_address_id:
                 tg.create_task(ctrl.destroy(resource_id))
-    except DocumentError as e:
-        await print_document_error(e)
+    except* ValidationException as eg:
+        for e in eg.exceptions:
+            if isinstance(e, ValidationException):
+                print_validation_error(e)
+    except* DocumentError as eg:
+        for e in eg.exceptions:
+            if isinstance(e, DocumentError):
+                await print_document_error(e)
 
 
 @app.async_command(
@@ -438,6 +457,8 @@ async def show_mail_domain(
             related = parent_model["mail-domain"].resource
 
             show_resource(ctx, related)
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)
 
@@ -668,5 +689,7 @@ async def list_aliases(
             await list_relation_resources(
                 ctx, parent_model, "aliases", tabledef, modifier
             )
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)

{cacholong_cloud_cli-1.2.0 → cacholong_cloud_cli-1.4.0}/cacholong_cli/commands/mail_domains.py

@@ -11,10 +11,17 @@ from cacholong_cli.common import (
     list_relation_resources,
     show_resource,
     print_document_error,
+    print_validation_error,
     TableDef,
 )
 from cacholong_cli.connection import Connection
-from cacholong_sdk import Filter, Inclusion, DocumentError, ResourceTuple
+from cacholong_sdk import (
+    Filter,
+    Inclusion,
+    DocumentError,
+    ResourceTuple,
+    ValidationException,
+)
 from cacholong_sdk import MailDomainBase, MailDomainBaseModel
 
 from cacholong_sdk.api_schema import api_schema
@@ -259,6 +266,8 @@ async def show(
             model = await ctrl.fetch(mail_domain_id)
 
             show_resource(ctx, model)
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)
 
@@ -282,6 +291,8 @@ async def show_account(
             related = parent_model["account"].resource
 
             show_resource(ctx, related)
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)
 
@@ -551,6 +562,8 @@ async def list_mail_addresses(
             await list_relation_resources(
                 ctx, parent_model, "mail-addresses", tabledef, modifier
             )
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)
 
@@ -575,5 +588,7 @@ async def show_service_mail(
             related = parent_model["service-mail"].resource
 
             show_resource(ctx, related)
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)

{cacholong_cloud_cli-1.2.0 → cacholong_cloud_cli-1.4.0}/cacholong_cli/commands/mail_forwards.py

@@ -11,10 +11,17 @@ from cacholong_cli.common import (
     list_relation_resources,
     show_resource,
     print_document_error,
+    print_validation_error,
     TableDef,
 )
 from cacholong_cli.connection import Connection
-from cacholong_sdk import Filter, Inclusion, DocumentError, ResourceTuple
+from cacholong_sdk import (
+    Filter,
+    Inclusion,
+    DocumentError,
+    ResourceTuple,
+    ValidationException,
+)
 from cacholong_sdk import MailForwardBase, MailForwardBaseModel
 
 from cacholong_sdk.api_schema import api_schema
@@ -241,6 +248,8 @@ async def show(
             model = await ctrl.fetch(mail_forward_id)
 
             show_resource(ctx, model)
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)
 
@@ -271,6 +280,8 @@ async def create(
             await ctrl.store(model, ctx.obj["create_issue"])
 
             show_resource(ctx, model)
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)
 
@@ -299,6 +310,8 @@ async def update(
             await ctrl.update(model)
 
             show_resource(ctx, model)
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)
 
@@ -315,8 +328,14 @@ async def delete(
             ctrl = MailForwardBase(conn, api_schema)
             for resource_id in mail_forward_id:
                 tg.create_task(ctrl.destroy(resource_id))
-    except DocumentError as e:
-        await print_document_error(e)
+    except* ValidationException as eg:
+        for e in eg.exceptions:
+            if isinstance(e, ValidationException):
+                print_validation_error(e)
+    except* DocumentError as eg:
+        for e in eg.exceptions:
+            if isinstance(e, DocumentError):
+                await print_document_error(e)
 
 
 @app.async_command(
@@ -339,5 +358,7 @@ async def show_mail_domain(
             related = parent_model["mail-domain"].resource
 
             show_resource(ctx, related)
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)

{cacholong_cloud_cli-1.2.0 → cacholong_cloud_cli-1.4.0}/cacholong_cli/commands/products.py

@@ -11,10 +11,17 @@ from cacholong_cli.common import (
     list_relation_resources,
     show_resource,
     print_document_error,
+    print_validation_error,
     TableDef,
 )
 from cacholong_cli.connection import Connection
-from cacholong_sdk import Filter, Inclusion, DocumentError, ResourceTuple
+from cacholong_sdk import (
+    Filter,
+    Inclusion,
+    DocumentError,
+    ResourceTuple,
+    ValidationException,
+)
 from cacholong_sdk import ProductBase, ProductBaseModel
 
 from cacholong_sdk.api_schema import api_schema
@@ -381,5 +388,7 @@ async def show(
             model = await ctrl.fetch(product_id)
 
             show_resource(ctx, model)
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)

{cacholong_cloud_cli-1.2.0 → cacholong_cloud_cli-1.4.0}/cacholong_cli/commands/purchases.py

@@ -11,10 +11,17 @@ from cacholong_cli.common import (
     list_relation_resources,
     show_resource,
     print_document_error,
+    print_validation_error,
     TableDef,
 )
 from cacholong_cli.connection import Connection
-from cacholong_sdk import Filter, Inclusion, DocumentError, ResourceTuple
+from cacholong_sdk import (
+    Filter,
+    Inclusion,
+    DocumentError,
+    ResourceTuple,
+    ValidationException,
+)
 from cacholong_sdk import PurchaseBase, PurchaseBaseModel
 
 from cacholong_sdk.api_schema import api_schema
@@ -518,5 +525,7 @@ async def show(
             model = await ctrl.fetch(purchase_id)
 
             show_resource(ctx, model)
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)

{cacholong_cloud_cli-1.2.0 → cacholong_cloud_cli-1.4.0}/cacholong_cli/commands/users.py

@@ -11,10 +11,17 @@ from cacholong_cli.common import (
     list_relation_resources,
     show_resource,
     print_document_error,
+    print_validation_error,
     TableDef,
 )
 from cacholong_cli.connection import Connection
-from cacholong_sdk import Filter, Inclusion, DocumentError, ResourceTuple
+from cacholong_sdk import (
+    Filter,
+    Inclusion,
+    DocumentError,
+    ResourceTuple,
+    ValidationException,
+)
 from cacholong_sdk import UserBase, UserBaseModel
 
 from cacholong_sdk.api_schema import api_schema
@@ -200,5 +207,7 @@ async def list_user_roles(
             await list_relation_resources(
                 ctx, parent_model, "user-roles", tabledef, modifier
             )
+    except ValidationException as e:
+        print_validation_error(e)
     except DocumentError as e:
         await print_document_error(e)

{cacholong_cloud_cli-1.2.0 → cacholong_cloud_cli-1.4.0}/cacholong_cli/common.py

@@ -3,15 +3,17 @@ from typing import List, Dict, Any, Optional, Callable, Union
 from enum import Enum
 import typer
 from rich.console import Console
+from rich.panel import Panel
 from rich.table import Table
 from rich.table import Column
 from cacholong_cli.connection import Connection
 import json
 from cacholong_sdk import BaseController, BaseModel
 from cacholong_sdk import Modifier, Sort, SparseField, DocumentError
+from cacholong_sdk.exception import ValidationException
 from uuid import UUID
 
-ErrorConsole = Console(stderr=True, style="bold red")
+ErrorConsole = Console(stderr=True)
 
 
 class UUIDEncoder(json.JSONEncoder):
@@ -29,16 +31,43 @@ class OutputFormat(str, Enum):
 TableDef = List[Dict[str, Any]]
 
 
-async def print_document_error(doc_error: DocumentError):
-    ErrorConsole.print("Status: {}".format(doc_error.errors["status_code"]))
+def print_validation_error(exc: ValidationException) -> None:
+    rows = []
+    for entry in exc.errors:
+        if entry.field:
+            rows.append(f"  [bold]{entry.field}[/bold]    {entry.message}")
+        else:
+            rows.append(f"  {entry.message}")
+    ErrorConsole.print(
+        Panel(
+            "\n".join(rows), title="[bold red]Validation Error[/bold red]", expand=False
+        )
+    )
+
+
+async def print_document_error(doc_error: DocumentError) -> None:
+    status_code = doc_error.errors.get("status_code", "")
     js = await doc_error.response.json()
-    i = 1
-    for error in js["errors"]:
-        detail = ""
-        if "detail" in error:
-            detail = error["detail"]
-        ErrorConsole.print("{}: {}: {}".format(i, error["title"], detail))
-        i = i + 1
+    rows = []
+    for error in js.get("errors", []):
+        title = error.get("title", "")
+        detail = error.get("detail", title)
+        source = error.get("source", {})
+        pointer = source.get("pointer", "")
+        if pointer.startswith("/data/attributes/"):
+            field = pointer[len("/data/attributes/") :]
+            rows.append(f"  [bold]{field}[/bold]    {detail}")
+        elif pointer:
+            rows.append(f"  [bold]{pointer}[/bold]    {detail}")
+        else:
+            rows.append(f"  {detail}")
+    ErrorConsole.print(
+        Panel(
+            "\n".join(rows) if rows else "",
+            title=f"[bold red]API Error · {status_code}[/bold red]",
+            expand=False,
+        )
+    )
 
 
 async def _perform_list_resources(
@@ -112,7 +141,7 @@ async def list_resources(
                             if d["column"] != "id"
                         ]
                     )
-                )
+                ),
             )
         )
 

{cacholong_cloud_cli-1.2.0 → cacholong_cloud_cli-1.4.0}/cacholong_sdk/__init__.py

@@ -70,3 +70,6 @@ from .purchase_show import PurchaseShowModel, PurchaseShow
 from jsonapi_client import Modifier, Filter, Inclusion, Sort, SparseField
 from jsonapi_client import ResourceTuple
 from jsonapi_client.exceptions import DocumentError
+
+# Import exceptions
+from .exception import ValidationException

{cacholong_cloud_cli-1.2.0 → cacholong_cloud_cli-1.4.0}/cacholong_sdk/common.py

@@ -2,7 +2,7 @@ from typing import Generic, TypeVar, Optional, Any, Union, Awaitable, Type, Dict
 from jsonapi_client.resourceobject import ResourceObject
 from jsonapi_client import Modifier, Filter
 from jsonapi_client.exceptions import DocumentError
-from .exception import ValidationException
+from .exception import ValidationException, ErrorEntry
 
 from rich.console import Console, ConsoleOptions, RenderResult
 from rich.json import JSON
@@ -133,7 +133,11 @@ class BaseController(Generic[Model]):
         try:
             jsonschema.validate(data_to_validate, json_schema)
         except jsonschema.ValidationError as e:
-            raise ValidationException(f"Validation failed for {operation}", [str(e)])
+            field = str(e.path[0]) if e.path else None
+            raise ValidationException(
+                f"Validation failed for {operation}",
+                [ErrorEntry(field=field, message=e.message)],
+            )
 
     async def fetch(self, resource_id) -> Model:
         doc = await self._connection.get(self._resource, resource_id)
@@ -186,5 +190,5 @@ class BaseController(Generic[Model]):
             # the cache, just handle the exception and that's it. The resource
             # is succesfully removed from the server.
             pass
-        except DocumentError as e:
-            raise ValidationException("Validation failed", e.errors)
+        except DocumentError:
+            raise

cacholong_cloud_cli-1.4.0/cacholong_sdk/exception.py

@@ -0,0 +1,17 @@
+from typing import List, Optional
+from dataclasses import dataclass
+
+
+@dataclass
+class ErrorEntry:
+    field: Optional[str]
+    message: str
+
+
+class ValidationException(Exception):
+    def __init__(self, message: str, errors: List[ErrorEntry]):
+        self.message = message
+        self.errors = errors
+
+        # call parent constructor
+        super().__init__(self.message)

{cacholong_cloud_cli-1.2.0 → cacholong_cloud_cli-1.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cacholong-cloud-cli"
-version = "1.2.0"
+version = "1.4.0"
 description = "Cacholong CLI, manage cloud environments at Cacholong!"
 authors = ["Matthijs Möhlmann <matthijs@cacholong.nl>"]
 readme = "README.md"

cacholong_cloud_cli-1.2.0/cacholong_sdk/exception.py

@@ -1,7 +0,0 @@
-class ValidationException(Exception):
-    def __init__(self, message, errors):
-        self.message = message
-        self.errors = errors
-
-        # call parent constructor
-        super().__init__(self.message)