kleinkram 0.6.0.dev20240812074346__tar.gz → 0.6.0.dev20240812135206__tar.gz

{kleinkram-0.6.0.dev20240812074346 → kleinkram-0.6.0.dev20240812135206}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: kleinkram
-Version: 0.6.0.dev20240812074346
+Version: 0.6.0.dev20240812135206
 Summary: A CLI for the ETH project kleinkram
 Project-URL: Homepage, https://github.com/leggedrobotics/kleinkram
 Project-URL: Issues, https://github.com/leggedrobotics/kleinkram/issues

{kleinkram-0.6.0.dev20240812074346 → kleinkram-0.6.0.dev20240812135206}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "kleinkram"
-version = "0.6.0-dev20240812074346"
+version = "0.6.0-dev20240812135206"
 description = "A CLI for the ETH project kleinkram"
 readme = "README.md"
 requires-python = ">=3.7"

{kleinkram-0.6.0.dev20240812074346 → kleinkram-0.6.0.dev20240812135206}/src/kleinkram/api_client.py

@@ -1,10 +1,14 @@
 import httpx
-from rich.console import Console
-from rich.panel import Panel
 
 from kleinkram.auth.auth import TokenFile, CLI_KEY, AUTH_TOKEN, REFRESH_TOKEN
 
 
+class NotAuthenticatedException(Exception):
+
+    def __init__(self, endpoint: str):
+        self.message = f"You are not authenticated on endpoint '{endpoint}'. Please run 'klein login' to authenticate."
+
+
 class AuthenticatedClient(httpx.Client):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -12,21 +16,8 @@ class AuthenticatedClient(httpx.Client):
         try:
             self.tokenfile = TokenFile()
             self._load_cookies()
-        except Exception as e:
-
-            console = Console()
-            msg = f"You are not authenticated on endpoint '{self.tokenfile.endpoint}'. Please run 'klein login' to authenticate."
-
-            panel = Panel(
-                msg,
-                title="Not Authenticated",
-                style="yellow",
-                padding=(1, 2),
-                highlight=True,
-            )
-            print()
-            console.print(panel)
-            print()
+        except Exception:
+            raise NotAuthenticatedException(self.tokenfile.endpoint)
 
     def _load_cookies(self):
         if self.tokenfile.isCliToken():

{kleinkram-0.6.0.dev20240812074346 → kleinkram-0.6.0.dev20240812135206}/src/kleinkram/auth/auth.py

@@ -11,8 +11,6 @@ from typing_extensions import Annotated
 
 from kleinkram.consts import API_URL
 
-app = typer.Typer()
-
 TOKEN_FILE = Path(os.path.expanduser("~/.kleinkram.json"))
 REFRESH_TOKEN = "refreshtoken"
 AUTH_TOKEN = "authtoken"
@@ -127,12 +125,10 @@ def login(
             auth_tokens = get_auth_tokens()
 
             if not auth_tokens:
-                print("Failed to get authentication tokens.")
-                return
+                raise Exception("Failed to get authentication tokens.")
 
             tokenfile.saveTokens(auth_tokens)
             print("Authentication complete. Tokens saved to ~/.kleinkram.json.")
-
             return
 
         print(
@@ -147,41 +143,7 @@ def login(
             )
             print("Authentication complete. Tokens saved to tokens.json.")
         else:
-            print("No authentication token provided.")
-        return
-
-
-def setEndpoint(
-    endpoint: Optional[str] = typer.Argument(None, help="API endpoint to use")
-):
-    """
-    Set the current endpoint
-
-    Use this command to switch between different API endpoints.\n
-    Standard endpoints are:\n
-    - http://localhost:3000\n
-    - https://api.datasets.leggedrobotics.com\n
-    - https://api.datasets.dev.leggedrobotics.com
-    """
-    tokenfile = TokenFile()
-    tokenfile.endpoint = endpoint
-    tokenfile.writeToFile()
-    print("Endpoint set to: " + endpoint)
-    if tokenfile.endpoint not in tokenfile.tokens:
-        print("No tokens found for this endpoint.")
-
-
-def endpoint():
-    """
-    Get the current endpoint
-
-    Also displays all endpoints with saved tokens.
-    """
-    tokenfile = TokenFile()
-    print("Current: " + tokenfile.endpoint)
-    print("Saved Tokens found for:")
-    for _endpoint, _ in tokenfile.tokens.items():
-        print("- " + _endpoint)
+            raise ValueError("Failed to get authentication tokens.")
 
 
 def setCliKey(key: Annotated[str, typer.Argument(help="CLI Key")]):

kleinkram-0.6.0.dev20240812135206/src/kleinkram/endpoint/endpoint.py

@@ -0,0 +1,55 @@
+import typer
+
+from kleinkram.auth.auth import TokenFile
+
+endpoint = typer.Typer(
+    name="endpoint",
+    help="Get Or Set the current endpoint",
+    no_args_is_help=True,
+    context_settings={"help_option_names": ["-h", "--help"]},
+)
+
+
+@endpoint.command("set")
+def set_endpoint(endpoint: str = typer.Argument(None, help="API endpoint to use")):
+    """
+    Set the current endpoint
+
+    Use this command to switch between different API endpoints.\n
+    Standard endpoints are:\n
+    - http://localhost:3000\n
+    - https://api.datasets.leggedrobotics.com\n
+    - https://api.datasets.dev.leggedrobotics.com
+    """
+
+    if not endpoint:
+        raise ValueError("No endpoint provided.")
+
+    tokenfile = TokenFile()
+    tokenfile.endpoint = endpoint
+    tokenfile.writeToFile()
+
+    print()
+    print("Endpoint set to: " + endpoint)
+    if tokenfile.endpoint not in tokenfile.tokens:
+        print("No tokens found for this endpoint.")
+
+
+@endpoint.command("get")
+def get_endpoints():
+    """
+    Get the current endpoint
+
+    Also displays all endpoints with saved tokens.
+    """
+    tokenfile = TokenFile()
+    print("Current: " + tokenfile.endpoint)
+    print()
+
+    if not tokenfile.tokens:
+        print("No saved tokens found.")
+        return
+
+    print("Saved Tokens found for:")
+    for _endpoint, _ in tokenfile.tokens.items():
+        print("- " + _endpoint)

kleinkram-0.6.0.dev20240812135206/src/kleinkram/error_handling.py

@@ -0,0 +1,149 @@
+import typing
+
+import typer
+from httpx import HTTPStatusError, ReadError, RemoteProtocolError
+from rich.console import Console
+from rich.panel import Panel
+from typer import Typer
+
+from kleinkram.api_client import NotAuthenticatedException
+
+ExceptionType = "typing.Type[Exception]"
+ErrorHandlingCallback = typing.Callable[[Exception], int]
+
+
+class AccessDeniedException(Exception):
+
+    def __init__(self, message: str, api_error: str):
+        self.message = message
+        self.api_error = api_error
+
+
+def not_yet_implemented_handler(e: Exception):
+    console = Console()
+    panel = Panel(
+        "This feature is not yet implemented, please check for updates.",
+        title="Not Yet Implemented",
+        style="yellow",
+        padding=(1, 2),
+        highlight=True,
+    )
+    print()
+    console.print(panel)
+    print()
+
+
+def not_authenticated_handler(e: NotAuthenticatedException):
+    console = Console()
+    panel = Panel(
+        f"{e.message}\n » Please run 'klein login' to authenticate.",
+        title="Not Authenticated",
+        style="yellow",
+        padding=(1, 2),
+        highlight=True,
+    )
+    print()
+    console.print(panel)
+    print()
+
+
+def access_denied_handler(e: AccessDeniedException):
+    console = Console()
+    panel = Panel(
+        f"{e.message}\n » API Response: {e.api_error}",
+        title="Access Denied",
+        style="red",
+        padding=(1, 2),
+        highlight=True,
+    )
+    print()
+    console.print(panel)
+    print()
+
+
+def value_error_handler(e: Exception):
+    console = Console()
+    panel = Panel(
+        str(e),
+        title="Invalid Argument",
+        style="red",
+        padding=(1, 2),
+        highlight=True,
+    )
+    print()
+    console.print(panel)
+    print()
+
+
+def http_status_error_handler(e: HTTPStatusError):
+    console = Console()
+    panel = Panel(
+        f"An HTTP error occurred: {e}\n\n » Please report this error to the developers.",
+        title="HTTP Status Error",
+        style="red",
+        padding=(1, 2),
+        highlight=True,
+    )
+    print()
+    console.print(panel)
+    print()
+
+
+def remote_down_handler(e: Exception):
+    console = Console()
+    panel = Panel(
+        f"An error occurred while communicating with the remote server: {e}\n"
+        f"\n » The server may be down or unreachable; please try again.",
+        title="Remote Protocol Error",
+        style="yellow",
+        padding=(1, 2),
+        highlight=True,
+    )
+    print()
+    console.print(panel)
+    print()
+
+
+class ErrorHandledTyper(Typer):
+    error_handlers: typing.Dict[ExceptionType, ErrorHandlingCallback] = {
+        NotAuthenticatedException: not_authenticated_handler,
+        AccessDeniedException: access_denied_handler,
+        HTTPStatusError: http_status_error_handler,
+        NotImplementedError: not_yet_implemented_handler,
+        ValueError: value_error_handler,
+        RemoteProtocolError: remote_down_handler,
+        ReadError: remote_down_handler,
+    }
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+    def error_handler(self, exc: ExceptionType):
+        def decorator(f: ErrorHandlingCallback):
+            self.error_handlers[exc] = f
+            return f
+
+        return decorator
+
+    def __call__(self, *args, **kwargs):
+        try:
+            super(ErrorHandledTyper, self).__call__(*args, **kwargs)
+
+        except Exception as e:
+
+            # exit with error code 1 if no error handler is defined
+            if type(e) not in self.error_handlers:
+                typer.secho(
+                    f"An unhanded error of type {type(e).__name__} occurred.",
+                    fg=typer.colors.RED,
+                )
+                typer.secho(str(e), fg=typer.colors.RED)
+                typer.secho(
+                    " » Please report this error to the developers.",
+                    fg=typer.colors.RED,
+                )
+            else:
+                self.error_handlers[type(e)](e)
+
+            # exit with error code 1
+            exit(1)

{kleinkram-0.6.0.dev20240812074346 → kleinkram-0.6.0.dev20240812135206}/src/kleinkram/file/file.py

@@ -1,9 +1,12 @@
+import os
 from typing import Optional, Annotated
 
 import httpx
+import requests
 import typer
 
 from kleinkram.api_client import AuthenticatedClient
+from kleinkram.error_handling import AccessDeniedException
 
 file = typer.Typer(
     name="file",
@@ -79,18 +82,4 @@ def list_files(
 
     except httpx.HTTPError as e:
         print(f"Failed to fetch missions: {e}")
-
-
-@file.command("download")
-def download(
-    missionuuid: Annotated[str, typer.Argument()],
-):
-    """Download file"""
-    try:
-        client = AuthenticatedClient()
-        response = client.get("/file/downloadWithToken", params={"uuid": missionuuid})
-        response.raise_for_status()
-        print(response.json())
-    except:
-        print("Failed to download file")
-
+        raise e

{kleinkram-0.6.0.dev20240812074346 → kleinkram-0.6.0.dev20240812135206}/src/kleinkram/main.py

@@ -3,6 +3,7 @@ from datetime import datetime, timedelta
 from enum import Enum
 
 import httpx
+import pkg_resources
 import typer
 from rich import print
 from rich.table import Table
@@ -11,7 +12,9 @@ from typer.models import Context
 from typing_extensions import Annotated
 
 from kleinkram.api_client import AuthenticatedClient
-from kleinkram.auth.auth import login, endpoint, setEndpoint, setCliKey, logout
+from kleinkram.auth.auth import login, setCliKey, logout
+from kleinkram.endpoint.endpoint import endpoint
+from kleinkram.error_handling import ErrorHandledTyper, AccessDeniedException
 from kleinkram.file.file import file
 from kleinkram.mission.mission import mission
 from kleinkram.project.project import project
@@ -22,12 +25,20 @@ from kleinkram.user.user import user
 from .helper import uploadFiles, expand_and_match
 
 
-class Panel(str, Enum):
+class CommandPanel(str, Enum):
     CoreCommands = "CORE COMMANDS"
     Commands = "COMMANDS"
     AdditionalCommands = "ADDITIONAL COMMANDS"
 
 
+def version_callback(value: bool):
+    if value:
+        typer.echo(
+            f"CLI Version: {pkg_resources.get_distribution('kleinkram').version}"
+        )
+        raise typer.Exit()
+
+
 class OrderCommands(TyperGroup):
     """
 
@@ -36,7 +47,7 @@ class OrderCommands(TyperGroup):
     """
 
     def list_commands(self, _ctx: Context) -> list[str]:
-        order = list(Panel)
+        order = list(CommandPanel)
         grouped_commands = {
             name: getattr(command, "rich_help_panel")
             for name, command in sorted(self.commands.items())
@@ -56,34 +67,48 @@ class OrderCommands(TyperGroup):
         ] + sorted(ungrouped_command_names)
 
 
-app = typer.Typer(
+app = ErrorHandledTyper(
     context_settings={"help_option_names": ["-h", "--help"]},
     no_args_is_help=True,
     cls=OrderCommands,
 )
 
-app.add_typer(project, rich_help_panel=Panel.Commands)
-app.add_typer(mission, rich_help_panel=Panel.Commands)
 
-app.add_typer(topic, rich_help_panel=Panel.Commands)
-app.add_typer(file, rich_help_panel=Panel.Commands)
-app.add_typer(queue, rich_help_panel=Panel.Commands)
-app.add_typer(user, rich_help_panel=Panel.Commands)
-app.add_typer(tag, rich_help_panel=Panel.Commands)
+@app.callback()
+def version(
+    version: bool = typer.Option(
+        None,
+        "--version",
+        "-v",
+        callback=version_callback,
+        is_eager=True,
+        help="Print the version and exit",
+    )
+):
+    pass
 
-app.command(rich_help_panel=Panel.CoreCommands)(login)
-app.command(rich_help_panel=Panel.CoreCommands)(logout)
-app.command(rich_help_panel=Panel.AdditionalCommands)(endpoint)
-app.command(rich_help_panel=Panel.AdditionalCommands)(setEndpoint)
+
+app.add_typer(project, rich_help_panel=CommandPanel.Commands)
+app.add_typer(mission, rich_help_panel=CommandPanel.Commands)
+
+app.add_typer(topic, rich_help_panel=CommandPanel.Commands)
+app.add_typer(file, rich_help_panel=CommandPanel.Commands)
+app.add_typer(queue, rich_help_panel=CommandPanel.Commands)
+app.add_typer(user, rich_help_panel=CommandPanel.Commands)
+app.add_typer(tag, rich_help_panel=CommandPanel.Commands)
+app.add_typer(endpoint, rich_help_panel=CommandPanel.AdditionalCommands)
+
+app.command(rich_help_panel=CommandPanel.AdditionalCommands)(login)
+app.command(rich_help_panel=CommandPanel.AdditionalCommands)(logout)
 app.command(hidden=True)(setCliKey)
 
 
-@app.command("download", rich_help_panel=Panel.CoreCommands)
+@app.command("download", rich_help_panel=CommandPanel.CoreCommands)
 def download():
     raise NotImplementedError("Not implemented yet.")
 
 
-@app.command("upload", rich_help_panel=Panel.CoreCommands)
+@app.command("upload", rich_help_panel=CommandPanel.CoreCommands)
 def upload(
     path: Annotated[
         str, typer.Option(prompt=True, help="Path to files to upload, Regex supported")
@@ -106,24 +131,33 @@ def upload(
         map(lambda x: x.split("/")[-1], filter(lambda x: not os.path.isdir(x), files))
     )
     if not filenames:
-        print("No files found")
-        return
+        raise ValueError("No files found matching the given path.")
+
+    print(
+        f"Uploading the following files to mission '{mission}' in project '{project}':"
+    )
     filepaths = {}
     for path in files:
         if not os.path.isdir(path):
             filepaths[path.split("/")[-1]] = path
-            print(f"  - {path}")
+            typer.secho(f" - {path}", fg=typer.colors.RESET)
+
     try:
         client = AuthenticatedClient()
 
         get_project_url = "/project/byName"
         project_response = client.get(get_project_url, params={"name": project})
         if project_response.status_code >= 400:
-            print(f"Failed to fetch project: {project_response.text}")
-            return
+
+            raise AccessDeniedException(
+                f"The project '{project}' does not exist or you do not have access to it.\n"
+                f"Consider using the following command to create a project: 'klein project create'\n",
+                f"{project_response.json()['message']} ({project_response.status_code})",
+            )
+
         project_json = project_response.json()
         if not project_json["uuid"]:
-            print(f"Project not found: {project}")
+            print(f"Project not found: '{project}'")
             return
 
         get_mission_url = "/mission/byName"
@@ -132,12 +166,11 @@ def upload(
         if mission_response.content:
             mission_json = mission_response.json()
             if mission_json["uuid"]:
-                print(
-                    f"mission: {mission_json['uuid']} already exists. Delete it or select another name."
+                raise ValueError(
+                    f"Mission {mission_json['name']} ({mission_json['uuid']}) already exists. Delete it or select "
+                    f"another name."
                 )
-                return
-            print(f"Something failed, should not happen")
-            return
+            raise Exception(f"Something failed, should not happen")
 
         create_mission_url = "/mission/create"
         new_mission = client.post(
@@ -158,7 +191,9 @@ def upload(
         presigned_urls = response_2.json()
         for file in filenames:
             if not file in presigned_urls.keys():
-                print("Could not upload File '" + file + "'. Is the filename unique? ")
+                raise Exception(
+                    "Could not upload File '" + file + "'. Is the filename unique? "
+                )
         if len(presigned_urls) > 0:
             uploadFiles(presigned_urls, filepaths, 4)
 

kleinkram-0.6.0.dev20240812135206/src/kleinkram/mission/mission.py

@@ -0,0 +1,192 @@
+import os
+from typing import Annotated, Optional
+
+import httpx
+import requests
+import typer
+from rich.console import Console
+from rich.table import Table
+
+from kleinkram.api_client import AuthenticatedClient
+from kleinkram.error_handling import AccessDeniedException
+
+mission = typer.Typer(
+    name="mission",
+    help="Mission operations",
+    no_args_is_help=True,
+    context_settings={"help_option_names": ["-h", "--help"]},
+)
+
+
+@mission.command("tag")
+def addTag(
+    mission_uuid: Annotated[str, typer.Argument()],
+    tagtype_uuid: Annotated[str, typer.Argument()],
+    value: Annotated[str, typer.Argument()],
+):
+    """Tag a mission"""
+    try:
+        client = AuthenticatedClient()
+        response = client.post(
+            "/tag/addTag",
+            json={"mission": mission_uuid, "tagType": tagtype_uuid, "value": value},
+        )
+        if response.status_code < 400:
+            print("Tagged mission")
+        else:
+            print(response.json())
+            print("Failed to tag mission")
+            raise Exception("Failed to tag mission")
+    except httpx.HTTPError as e:
+        print(e)
+        print("Failed to tag mission")
+        raise e
+
+
+@mission.command("list")
+def list_missions(
+    project: Optional[str] = typer.Option(None, help="Name of Project"),
+    verbose: Optional[bool] = typer.Option(
+        False, help="Outputs a table with more information"
+    ),
+):
+    """
+    List all missions with optional filter for project.
+    """
+
+    url = "/mission"
+    if project:
+        url += f"/filteredByProjectName/{project}"
+    else:
+        url += "/all"
+
+    client = AuthenticatedClient()
+
+    try:
+
+        response = client.get(url)
+        response.raise_for_status()
+
+    except httpx.HTTPError:
+
+        raise AccessDeniedException(
+            f"Failed to fetch mission."
+            f"Consider using the following command to list all missions: 'klein mission list --verbose'\n",
+            f"{response.json()['message']} ({response.status_code})",
+        )
+
+    data = response.json()
+    missions_by_project_uuid = {}
+    for mission in data:
+        project_uuid = mission["project"]["uuid"]
+        if project_uuid not in missions_by_project_uuid:
+            missions_by_project_uuid[project_uuid] = []
+        missions_by_project_uuid[project_uuid].append(mission)
+
+    if len(missions_by_project_uuid.items()) == 0:
+        print(f"No missions found for project '{project}'. Does it exist?")
+        return
+
+    print("missions by Project:")
+    if not verbose:
+        for project_uuid, missions in missions_by_project_uuid.items():
+            print(f"* {missions_by_project_uuid[project_uuid][0]['project']['name']}")
+            for mission in missions:
+                print(f"  - {mission['name']}")
+
+    else:
+        table = Table("UUID", "name", "project", "creator", "createdAt")
+        for project_uuid, missions in missions_by_project_uuid.items():
+            for mission in missions:
+                table.add_row(
+                    mission["uuid"],
+                    mission["name"],
+                    mission["project"]["name"],
+                    mission["creator"]["name"],
+                    mission["createdAt"],
+                )
+        console = Console()
+        console.print(table)
+
+
+@mission.command("byUUID")
+def mission_by_uuid(
+    uuid: Annotated[str, typer.Argument()],
+    json: Optional[bool] = typer.Option(False, help="Output as JSON"),
+):
+    """
+    Get mission name, project name, creator and table of its files given a Mission UUID
+
+    Use the JSON flag to output the full JSON response instead.
+
+    Can be run with API Key or with login.
+    """
+    url = "/mission/byUUID"
+    client = AuthenticatedClient()
+    response = client.get(url, params={"uuid": uuid})
+
+    try:
+        response.raise_for_status()
+    except httpx.HTTPError:
+        raise AccessDeniedException(
+            f"Failed to fetch mission."
+            f"Consider using the following command to list all missions: 'klein mission list --verbose'\n",
+            f"{response.json()['message']} ({response.status_code})",
+        )
+
+    data = response.json()
+
+    if json:
+        print(data)
+    else:
+        print(f"mission: {data['name']}")
+        print(f"Creator: {data['creator']['name']}")
+        print("Project: " + data["project"]["name"])
+        table = Table("Filename", "Size", "date")
+        for file in data["files"]:
+            table.add_row(file["filename"], f"{file['size']}", file["date"])
+        console = Console()
+        console.print(table)
+
+
+@mission.command("download")
+def download(
+    mission_uuid: Annotated[str, typer.Argument()],
+    local_path: Annotated[str, typer.Argument()],
+):
+    """
+
+    Downloads all files of a mission to a local path.
+    The local path must be an empty directory.
+
+    """
+
+    if not os.path.isdir(local_path):
+        raise ValueError(f"Local path '{local_path}' is not a directory.")
+    if not os.listdir(local_path) == []:
+        raise ValueError(f"Local path '{local_path}' is not empty, but must be empty.")
+
+    client = AuthenticatedClient()
+    response = client.get("/file/downloadWithToken", params={"uuid": mission_uuid})
+
+    try:
+        response.raise_for_status()
+    except httpx.HTTPError as e:
+        raise AccessDeniedException(
+            f"Failed to download file."
+            f"Consider using the following command to list all missions: 'klein mission list --verbose'\n",
+            f"{response.json()['message']} ({response.status_code})",
+        )
+
+    paths = response.json()
+
+    print(f"Downloading files to {local_path}:")
+    for path in paths:
+
+        filename = path.split("/")[-1].split("?")[0]
+        print(f" - {filename}")
+
+        response = requests.get(path)
+        with open(os.path.join(local_path, filename), "wb") as f:
+            f.write(response.content)
+            print(f"   Downloaded {filename}")

{kleinkram-0.6.0.dev20240812074346 → kleinkram-0.6.0.dev20240812135206}/src/kleinkram/project/project.py

@@ -55,3 +55,4 @@ def create_project(
 
     except httpx.HTTPError as e:
         print(f"Failed to create project: {e}")
+        raise e

{kleinkram-0.6.0.dev20240812074346 → kleinkram-0.6.0.dev20240812135206}/src/kleinkram/tag/tag.py

@@ -1,23 +1,38 @@
 from typing import Annotated
 
+import httpx
 import typer
+from rich.console import Console
 from rich.table import Table
 
 from kleinkram.api_client import AuthenticatedClient
 
-tag = typer.Typer(name="tag", help="Tag operations")
+tag = typer.Typer(
+    name="tag",
+    help="Tag operations",
+    no_args_is_help=True,
+    context_settings={"help_option_names": ["-h", "--help"]},
+)
 
 
 @tag.command("list-tag-types")
-def tagTypes(
+def tag_types(
     verbose: Annotated[bool, typer.Option()] = False,
 ):
-    """List all tagtypes"""
+    """
+    List all tagtypes
+    """
+
     try:
         client = AuthenticatedClient()
         response = client.get("/tag/all")
         response.raise_for_status()
         data = response.json()
+
+        if not data or len(data) == 0:
+            print("No tagtypes found")
+            return
+
         if verbose:
             table = Table("UUID", "Name", "Datatype")
             for tagtype in data:
@@ -26,16 +41,22 @@ def tagTypes(
             table = Table("Name", "Datatype")
             for tagtype in data:
                 table.add_row(tagtype["name"], tagtype["datatype"])
-        print(table)
+        console = Console()
+        console.print(table)
+
     except:
         print("Failed to fetch tagtypes")
+        raise Exception("Failed to fetch tagtypes")
 
 
 @tag.command("delete")
-def deleteTag(
+def delete_tag(
     taguuid: Annotated[str, typer.Argument()],
 ):
-    """Delete a tag"""
+    """
+    Delete a tag
+    """
+
     try:
         client = AuthenticatedClient()
         response = client.delete("/tag/deleteTag", params={"uuid": taguuid})
@@ -44,5 +65,7 @@ def deleteTag(
         else:
             print(response)
             print("Failed to delete tag")
-    except:
+            raise Exception("Failed to delete tag")
+    except httpx.HTTPError as e:
         print("Failed to delete tag")
+        raise Exception("Failed to delete tag")

{kleinkram-0.6.0.dev20240812074346 → kleinkram-0.6.0.dev20240812135206}/src/kleinkram/topic/topic.py

@@ -52,3 +52,4 @@ def topics(
 
     except httpx.HTTPError as e:
         print(f"Failed")
+        raise e

kleinkram-0.6.0.dev20240812074346/src/kleinkram/mission/mission.py

@@ -1,126 +0,0 @@
-import sys
-from typing import Annotated, Optional
-
-import httpx
-import typer
-from rich.console import Console
-from rich.table import Table
-
-from kleinkram.api_client import AuthenticatedClient
-
-mission = typer.Typer(
-    name="mission",
-    help="Mission operations",
-    no_args_is_help=True,
-    context_settings={"help_option_names": ["-h", "--help"]},
-)
-
-
-@mission.command("tag")
-def addTag(
-    missionuuid: Annotated[str, typer.Argument()],
-    tagtypeuuid: Annotated[str, typer.Argument()],
-    value: Annotated[str, typer.Argument()],
-):
-    """Tag a mission"""
-    try:
-        client = AuthenticatedClient()
-        response = client.post(
-            "/tag/addTag",
-            json={"mission": missionuuid, "tagType": tagtypeuuid, "value": value},
-        )
-        if response.status_code < 400:
-            print("Tagged mission")
-        else:
-            print(response.json())
-            print("Failed to tag mission")
-    except httpx.HTTPError as e:
-        print(e)
-        print("Failed to tag mission")
-        sys.exit(1)
-
-
-@mission.command("list")
-def list_missions(
-    project: Optional[str] = typer.Option(None, help="Name of Project"),
-    verbose: Optional[bool] = typer.Option(
-        False, help="Outputs a table with more information"
-    ),
-):
-    """
-    List all missions with optional filter for project.
-    """
-    try:
-        url = "/mission"
-        if project:
-            url += f"/filteredByProjectName/{project}"
-        else:
-            url += "/all"
-            client = AuthenticatedClient()
-
-        response = client.get(url)
-        response.raise_for_status()
-        data = response.json()
-        missions_by_project_uuid = {}
-        for mission in data:
-            project_uuid = mission["project"]["uuid"]
-            if project_uuid not in missions_by_project_uuid:
-                missions_by_project_uuid[project_uuid] = []
-            missions_by_project_uuid[project_uuid].append(mission)
-
-        print("missions by Project:")
-        if not verbose:
-            for project_uuid, missions in missions_by_project_uuid.items():
-                print(
-                    f"* {missions_by_project_uuid[project_uuid][0]['project']['name']}"
-                )
-                for mission in missions:
-                    print(f"  - {mission['name']}")
-        else:
-            table = Table("UUID", "name", "project", "creator", "createdAt")
-            for project_uuid, missions in missions_by_project_uuid.items():
-                for mission in missions:
-                    table.add_row(
-                        mission["uuid"],
-                        mission["name"],
-                        mission["project"]["name"],
-                        mission["creator"]["name"],
-                        mission["createdAt"],
-                    )
-            print(table)
-
-    except httpx.HTTPError as e:
-        print(f"Failed to fetch missions: {e}")
-
-
-@mission.command("byUUID")
-def mission_by_uuid(
-    uuid: Annotated[str, typer.Argument()],
-    json: Optional[bool] = typer.Option(False, help="Output as JSON"),
-):
-    """
-    Get mission name, project name, creator and table of its files given a Mission UUID
-
-    Use the JSON flag to output the full JSON response instead.
-
-    Can be run with API Key or with login.
-    """
-    try:
-        url = "/mission/byUUID"
-        client = AuthenticatedClient()
-        response = client.get(url, params={"uuid": uuid})
-        response.raise_for_status()
-        data = response.json()
-        if json:
-            print(data)
-        else:
-            print(f"mission: {data['name']}")
-            print(f"Creator: {data['creator']['name']}")
-            print("Project: " + data["project"]["name"])
-            table = Table("Filename", "Size", "date")
-            for file in data["files"]:
-                table.add_row(file["filename"], f"{file['size']}", file["date"])
-            console = Console()
-            console.print(table)
-    except httpx.HTTPError as e:
-        print(f"Failed to fetch missions: {e}")