kleinkram 0.22.2.dev20240924083348__tar.gz → 0.23.1.dev20240925145619__tar.gz

{kleinkram-0.22.2.dev20240924083348 → kleinkram-0.23.1.dev20240925145619}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: kleinkram
-Version: 0.22.2.dev20240924083348
+Version: 0.23.1.dev20240925145619
 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.22.2.dev20240924083348 → kleinkram-0.23.1.dev20240925145619}/pyproject.toml

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

{kleinkram-0.22.2.dev20240924083348 → kleinkram-0.23.1.dev20240925145619}/src/kleinkram/file/file.py

@@ -56,7 +56,11 @@ def list_files(
             url,
             params=params,
         )
-        response.raise_for_status()
+        if response.status_code >= 400:
+            raise AccessDeniedException(
+                f"Failed to fetch files: {response.json()['message']} ({response.status_code})",
+                "Access Denied",
+            )
         data = response.json()
         missions_by_project_uuid = {}
         files_by_mission_uuid = {}

{kleinkram-0.22.2.dev20240924083348 → kleinkram-0.23.1.dev20240925145619}/src/kleinkram/main.py

@@ -16,7 +16,7 @@ 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.mission.mission import missionCommands
 from kleinkram.project.project import project
 from kleinkram.queue.queue import queue
 from kleinkram.tag.tag import tag
@@ -33,7 +33,10 @@ class CommandPanel(str, Enum):
 
 def version_callback(value: bool):
     if value:
-        _version = importlib.metadata.version("kleinkram")
+        try:
+            _version = importlib.metadata.version("kleinkram")
+        except importlib.metadata.PackageNotFoundError:
+            _version = "local"
         typer.echo(f"CLI Version: {_version}")
         raise typer.Exit()
 
@@ -88,7 +91,7 @@ def version(
 
 
 app.add_typer(project, rich_help_panel=CommandPanel.Commands)
-app.add_typer(mission, rich_help_panel=CommandPanel.Commands)
+app.add_typer(missionCommands, rich_help_panel=CommandPanel.Commands)
 
 app.add_typer(topic, rich_help_panel=CommandPanel.Commands)
 app.add_typer(file, rich_help_panel=CommandPanel.Commands)
@@ -223,7 +226,7 @@ def upload(
         for _file in filenames:
             if not _file in confirmed_files.keys():
                 raise Exception(
-                    "Could not upload File '" + file + "'. Is the filename unique? "
+                    "Could not upload File '" + _file + "'. Is the filename unique? "
                 )
             confirmed_files[_file]["filepath"] = filepaths[_file]
         if len(confirmed_files.keys()) > 0:

{kleinkram-0.22.2.dev20240924083348 → kleinkram-0.23.1.dev20240925145619}/src/kleinkram/mission/mission.py

@@ -9,8 +9,9 @@ from rich.table import Table
 
 from kleinkram.api_client import AuthenticatedClient
 from kleinkram.error_handling import AccessDeniedException
+from kleinkram.helper import expand_and_match, uploadFiles
 
-mission = typer.Typer(
+missionCommands = typer.Typer(
     name="mission",
     help="Mission operations",
     no_args_is_help=True,
@@ -18,7 +19,7 @@ mission = typer.Typer(
 )
 
 
-@mission.command("tag")
+@missionCommands.command("tag")
 def addTag(
     mission_uuid: Annotated[str, typer.Argument()],
     tagtype_uuid: Annotated[str, typer.Argument()],
@@ -43,7 +44,7 @@ def addTag(
         raise e
 
 
-@mission.command("list")
+@missionCommands.command("list")
 def list_missions(
     project: Optional[str] = typer.Option(None, help="Name of Project"),
     verbose: Optional[bool] = typer.Option(
@@ -111,7 +112,7 @@ def list_missions(
         console.print(table)
 
 
-@mission.command("byUUID")
+@missionCommands.command("byUUID")
 def mission_by_uuid(
     uuid: Annotated[str, typer.Argument()],
     json: Optional[bool] = typer.Option(False, help="Output as JSON"),
@@ -123,7 +124,7 @@ def mission_by_uuid(
 
     Can be run with API Key or with login.
     """
-    url = "/mission/byUUID"
+    url = "/mission/one"
     client = AuthenticatedClient()
     response = client.get(url, params={"uuid": uuid})
 
@@ -131,7 +132,7 @@ def mission_by_uuid(
         response.raise_for_status()
     except httpx.HTTPError:
         raise AccessDeniedException(
-            f"Failed to fetch mission."
+            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})",
         )
@@ -151,7 +152,7 @@ def mission_by_uuid(
         console.print(table)
 
 
-@mission.command("download")
+@missionCommands.command("download")
 def download(
     mission_uuid: Annotated[str, typer.Argument()],
     local_path: Annotated[str, typer.Argument()],
@@ -169,7 +170,7 @@ def download(
         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})
+    response = client.get("/mission/download", params={"uuid": mission_uuid})
 
     try:
         response.raise_for_status()
@@ -197,3 +198,59 @@ def download(
                 if chunk:  # Filter out keep-alive new chunks
                     f.write(chunk)
             print(f"   Downloaded {filename}")
+
+@missionCommands.command("upload")
+def upload(
+    path: Annotated[
+        str, typer.Option(prompt=True, help="Path to files to upload, Regex supported")
+    ],
+    mission: Annotated[
+        str, typer.Option(prompt=True, help="UUID of Mission to create")
+    ],
+):
+    """
+    Upload files matching the path to a mission in a project.
+
+    The mission name must be unique within the project and already created.\n
+    Examples:\n
+        - 'klein upload --path "~/data/**/*.bag" --project "Project 1" --mission "Mission 1" '\n
+
+    """
+    files = expand_and_match(path)
+    filenames = list(
+        map(lambda x: x.split("/")[-1], filter(lambda x: not os.path.isdir(x), files))
+    )
+    if not filenames:
+        raise ValueError("No files found matching the given path.")
+
+    print(
+        f"Uploading the following files to mission '{mission}':"
+    )
+    filepaths = {}
+    for path in files:
+        if not os.path.isdir(path):
+            filepaths[path.split("/")[-1]] = path
+            typer.secho(f" - {path}", fg=typer.colors.RESET)
+
+    try:
+        client = AuthenticatedClient()
+        res = client.post("/file/temporaryAccess", json={"missionUUID": mission, "filenames": filenames})
+        if res.status_code >= 400:
+            raise ValueError("Failed to get temporary access. Status code: " + str(res.status_code) + " Message: " + res.json()['message'])
+
+        temp_credentials = res.json()
+        credential = temp_credentials["credentials"]
+        confirmed_files = temp_credentials["files"]
+        for _file in filenames:
+            if not _file in confirmed_files.keys():
+                raise Exception(
+                    "Could not upload File '" + _file + "'. Is the filename unique? "
+                )
+            confirmed_files[_file]["filepath"] = filepaths[_file]
+        if len(confirmed_files.keys()) > 0:
+            uploadFiles(confirmed_files, credential, 4)
+    except Exception as e:
+        print(e)
+        print("Failed to upload files")
+        raise e
+