kleinkram 0.34.2.dev20241029064830__py3-none-any.whl → 0.34.2.dev20241029082227__py3-none-any.whl

kleinkram/file/file.py

@@ -86,8 +86,8 @@ def list_files(
     Can list files of a project, mission, or with specific topics (Logical AND).
     Examples:\n
         - 'klein filelist'\n
-        - 'klein file list --project "Project 1"'\n
-        - 'klein file list --mission "Mission 1"'\n
+        - 'klein file list --project "Project_1"'\n
+        - 'klein file list --mission "Mission_1"'\n
         - 'klein file list --topics "/elevation_mapping/semantic_map,/elevation_mapping/elevation_map_raw"'\n
         - 'klein file list --topics "/elevation_mapping/semantic_map,/elevation_mapping/elevation_map_raw" --mission "Mission A"'
     """

kleinkram/main.py

@@ -26,11 +26,11 @@ from kleinkram.tag.tag import tag
 from kleinkram.topic.topic import topic
 from kleinkram.user.user import user
 from .helper import (
-    uploadFiles,
-    expand_and_match,
+    is_valid_UUIDv4,
     canUploadMission,
     promptForTags,
-    is_valid_UUIDv4,
+    expand_and_match,
+    uploadFiles,
 )
 
 
@@ -148,6 +148,22 @@ def upload(
         bool,
         typer.Option(help="Allows adding files to an existing mission"),
     ] = False,
+    overwrite: Annotated[
+        bool,
+        typer.Option(
+            help="Overwrite files with the same name.\n\n*WARNING:* This cannot be undone! This command will NOT delete"
+            "converted files, i.g. if the file is of type 'some-name.bag' the converted 'some-name.mcap' file will not "
+            "be deleted."
+        ),
+    ] = False,
+    overwrite_all: Annotated[
+        bool,
+        typer.Option(
+            help="Overwrite files with the same name.\n\n*WARNING:* This cannot be undone! This command WILL "
+            "automatically delete converted files, i.g. if the file is of type 'some-name.bag' the converted "
+            "'some-name.mcap' file will be deleted."
+        ),
+    ] = False,
 ):
     """
     Upload files matching the path to a mission in a project.
@@ -155,7 +171,7 @@ def upload(
     The mission name must be unique within the project and not yet created.\n
     Multiple paths can be given by using the option multiple times.\n
     Examples:\n
-        - 'klein upload --path "~/data/**/*.bag" --project "Project 1" --mission "Mission 1" --tags "0700946d-1d6a-4520-b263-0e177f49c35b:LEE-H" --tags "1565118d-593c-4517-8c2d-9658452d9319:Dodo"'\n
+        - 'klein upload --path "~/data/**/*.bag" --project "Project_1" --mission "Mission_1" --tags "0700946d-1d6a-4520-b263-0e177f49c35b:LEE-H" --tags "1565118d-593c-4517-8c2d-9658452d9319:Dodo"'\n
 
     """
 
@@ -197,10 +213,11 @@ def upload(
                 },
             )
             if project_response.status_code >= 400:
+                msg = str(project_response.json()["message"])
                 raise ValueError(
                     f"Failed to create project. Status Code: "
                     f"{str(project_response.status_code)}\n"
-                    f"{project_response.json()['message'][0]}"
+                    f"{msg}"
                 )
             print("Project created successfully.")
 
@@ -321,6 +338,85 @@ def upload(
             "multiple files with the same name in different directories or use the '--fix-filenames' option."
         )
 
+    # check if files already exist
+    get_files_url = "/file/ofMission"
+    response = client.get(
+        get_files_url,
+        params={"uuid": mission_json["uuid"]},
+    )
+    if response.status_code >= 400:
+        raise ValueError(
+            "Failed to check for existing files. Status Code: "
+            + str(response.status_code)
+            + "\n"
+            + response.json()["message"]
+        )
+
+    existing_files = response.json()[0]
+    conflicting_files = [
+        file for file in existing_files if file["filename"] in filenames
+    ]
+
+    if conflicting_files and len(conflicting_files):
+        print("The following files already exist in the mission:")
+        for file in conflicting_files:
+            typer.secho(f" - {file['filename']}", fg=typer.colors.RED, nl=False)
+            if overwrite or overwrite_all:
+                # delete existing files
+                delete_files_url = f"/file/{file['uuid']}"
+                response = client.delete(delete_files_url)
+                if response.status_code >= 400:
+                    raise ValueError(
+                        "Failed to delete existing files. Status Code: "
+                        + str(response.status_code)
+                        + "\n"
+                        + response.json()["message"]
+                    )
+                print("   » deleted")
+
+                # check if converted files exist
+                mcap_file = file["filename"].replace(".bag", ".mcap")
+
+                if mcap_file == file["filename"]:
+                    continue
+
+                mcap_uuid = next(
+                    (
+                        file["uuid"]
+                        for file in existing_files
+                        if file["filename"] == mcap_file
+                    ),
+                    None,
+                )
+
+                if mcap_uuid and overwrite_all:
+                    typer.secho(f"   {mcap_file}", fg=typer.colors.RED, nl=False)
+                    delete_files_url = f"/file/{mcap_uuid}"
+                    response = client.delete(delete_files_url)
+                    if response.status_code >= 400:
+                        raise ValueError(
+                            "Failed to delete existing files. Status Code: "
+                            + str(response.status_code)
+                            + "\n"
+                            + response.json()["message"]
+                        )
+                    print("  » deleted")
+                elif mcap_uuid and not overwrite_all:
+                    print(
+                        f"   {mcap_file}  » skipped (consider using '--overwrite-all' to delete this file)"
+                    )
+                else:
+                    print("   » not found")
+
+            else:
+                print("")
+
+        if not overwrite and not overwrite_all:
+            print(
+                "\nYou may use the '--overwrite' or '--overwrite-all' flag to overwrite existing files."
+            )
+        print("")
+
     get_temporary_credentials = "/file/temporaryAccess"
     response = client.post(
         get_temporary_credentials,
@@ -328,7 +424,7 @@ def upload(
     )
     if response.status_code >= 400:
         raise ValueError(
-            "Failed to get temporary credentials. Status Code: "
+            "Failed to upload data. Status Code: "
             + str(response.status_code)
             + "\n"
             + response.json()["message"][0]

kleinkram/mission/mission.py

@@ -49,8 +49,8 @@ def addTag(
 @missionCommands.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"
+    table: Optional[bool] = typer.Option(
+        True, help="Outputs a table with more information"
     ),
 ):
     """
@@ -93,20 +93,28 @@ def list_missions(
         return
 
     print("missions by Project:")
-    if not verbose:
+    if not table:
         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")
+        table = Table(
+            "project",
+            "name",
+            "UUID",
+            "creator",
+            "createdAt",
+            title="Missions",
+            expand=True,
+        )
         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["name"],
+                    mission["uuid"],
                     mission["creator"]["name"],
                     mission["createdAt"],
                 )
@@ -261,7 +269,7 @@ def upload(
     Multiple paths can be given by using the option multiple times.\n
     \n
     Examples:\n
-        - 'klein upload --path "~/data/**/*.bag" --project "Project 1" --mission "2518cfc2-07f2-41a5-b74c-fdedb1b97f88" '\n
+        - 'klein upload --path "~/data/**/*.bag" --project "Project_1" --mission "2518cfc2-07f2-41a5-b74c-fdedb1b97f88" '\n
 
     """
     files = []

{kleinkram-0.34.2.dev20241029064830.dist-info → kleinkram-0.34.2.dev20241029082227.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: kleinkram
-Version: 0.34.2.dev20241029064830
+Version: 0.34.2.dev20241029082227
 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.34.2.dev20241029064830.dist-info → kleinkram-0.34.2.dev20241029082227.dist-info}/RECORD

@@ -3,18 +3,18 @@ kleinkram/api_client.py,sha256=1GPsM-XFbPYEKP7RfWmzMTwxRqnVh4wtHVuW25KT8kA,2264
 kleinkram/consts.py,sha256=pm_6OuQcO-tYcRhwauTtyRRsuYY0y0yb6EGuIl49LnI,50
 kleinkram/error_handling.py,sha256=vvNtXSOnXs4b-aYEUIA0GVQWXLRW5I5FtNE1PZPHEPc,4704
 kleinkram/helper.py,sha256=ELvs-p7zpJUP_rtTIVpcUCTz0D4WegoUZQ11UqUrUkg,9288
-kleinkram/main.py,sha256=Ew4KViP1GkqUZYRtFbZ3HRxlU1TMGnfWJq8dBr0Y8_A,13615
+kleinkram/main.py,sha256=WCdZk8PLmSi5dTRPgrKAsp0EljNXFZVD1Ce8fdKSZNs,17348
 kleinkram/auth/auth.py,sha256=w3-TsxWxURzLQ3_p43zgV4Rlh4dVL_WqI6HG2aes-b4,4991
 kleinkram/endpoint/endpoint.py,sha256=WmHUH10_OSZUMrovh2yBeth9dBcn0yE7PxnnD4yPW-Y,1582
-kleinkram/file/file.py,sha256=gLCZDHHgQWq25OmeG-lwkIh4aRZaLK12xxLkbhZ_m-g,5390
-kleinkram/mission/mission.py,sha256=SkTjauagLamwZaQTWTeGmXAJ9YgUrBdh_3EbjYNZfZM,10082
+kleinkram/file/file.py,sha256=1IRXTxGGH5tIvvmMoee5jvmN4QGyIJSJ2xtHraHGFHE,5390
+kleinkram/mission/mission.py,sha256=1nBF8TX76JqY-Gi50cRWe7WZhAYsrHP5gXtLOLH_XLs,10203
 kleinkram/project/project.py,sha256=4BOT3iOZZnMrZuALzBxQ5r-8dC8eZkel1OjxUFzK0w4,4336
 kleinkram/queue/queue.py,sha256=MaLBjAu8asi9BkPvbbT-5AobCcpy3ex5rxM1kHpRINA,181
 kleinkram/tag/tag.py,sha256=JSHbDPVfsvP34MuQhw__DPQk-Bah5G9BgwYsj_K_JGc,1805
 kleinkram/topic/topic.py,sha256=IaXhrIHcJ3FSIr0WC-N7u9fkz-lAvSBgQklTX67t0Yc,1641
 kleinkram/user/user.py,sha256=SzUM-CTTmC3TYCNt4Crizc7n3Rpf2ObJeNWEeEmMfpo,1893
-kleinkram-0.34.2.dev20241029064830.dist-info/METADATA,sha256=bp5-b98UU3UKQrUcY2EreuybRL2yJ_zxAnKMzFztc9o,845
-kleinkram-0.34.2.dev20241029064830.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-kleinkram-0.34.2.dev20241029064830.dist-info/entry_points.txt,sha256=RHXtRzcreVHImatgjhQwZQ6GdJThElYjHEWcR1BPXUI,45
-kleinkram-0.34.2.dev20241029064830.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
-kleinkram-0.34.2.dev20241029064830.dist-info/RECORD,,
+kleinkram-0.34.2.dev20241029082227.dist-info/METADATA,sha256=v3CpNCO_bfMbldYfdxlw9RBcHBN7sqeaahDxuwyUx7Y,845
+kleinkram-0.34.2.dev20241029082227.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+kleinkram-0.34.2.dev20241029082227.dist-info/entry_points.txt,sha256=RHXtRzcreVHImatgjhQwZQ6GdJThElYjHEWcR1BPXUI,45
+kleinkram-0.34.2.dev20241029082227.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
+kleinkram-0.34.2.dev20241029082227.dist-info/RECORD,,