kleinkram 0.21.7.dev20240919182750__tar.gz → 0.21.9.dev20240920112301__tar.gz

{kleinkram-0.21.7.dev20240919182750 → kleinkram-0.21.9.dev20240920112301}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: kleinkram
-Version: 0.21.7.dev20240919182750
+Version: 0.21.9.dev20240920112301
 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.21.7.dev20240919182750 → kleinkram-0.21.9.dev20240920112301}/pyproject.toml

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

{kleinkram-0.21.7.dev20240919182750 → kleinkram-0.21.9.dev20240920112301}/src/kleinkram/helper.py

@@ -2,7 +2,11 @@ import glob
 import os
 import queue
 import threading
+from datetime import datetime
 from functools import partial
+
+import typer
+from botocore.config import Config
 from typing_extensions import Dict
 import boto3
 
@@ -114,7 +118,12 @@ def uploadFiles(files: Dict[str, str], credentials: Dict[str, str], nrThreads: i
         minio_endpoint = "http://localhost:9000"
     else:
         minio_endpoint = api_endpoint.replace("api", "minio")
-    s3 = session.resource("s3", endpoint_url=minio_endpoint)
+
+    config = Config(retries={
+        'max_attempts': 10,
+        'mode': 'standard'
+    })
+    s3 = session.resource("s3", endpoint_url=minio_endpoint, config=config)
 
     _queue = queue.Queue()
     for file in files.items():
@@ -162,6 +171,44 @@ def uploadFile(_queue: queue.Queue, s3: BaseClient, transferCallback: TransferCa
             _queue.task_done()
 
 
+def canUploadMission(client: AuthenticatedClient, project_uuid: str):
+    permissions = client.get("/user/permissions")
+    permissions.raise_for_status()
+    permissions_json = permissions.json()
+    for_project = filter(lambda x: x["uuid"] == project_uuid, permissions_json["projects"])
+    max_for_project = max(map(lambda x: x["access"], for_project))
+    return max_for_project >= 10
+
+
+def promptForTags(setTags: Dict[str, str], requiredTags: Dict[str, str]):
+    for required_tag in requiredTags:
+        if required_tag["name"] not in setTags:
+            while True:
+                if required_tag["datatype"] in ["LOCATION", "STRING", "LINK"]:
+                    tag_value = typer.prompt("Provide value for required tag " + required_tag["name"])
+                    if tag_value != "":
+                        break
+                elif required_tag["datatype"] == "BOOLEAN":
+                    tag_value = typer.confirm("Provide (y/N) for required tag " + required_tag["name"])
+                    break
+                elif required_tag["datatype"] == "NUMBER":
+                    tag_value = typer.prompt("Provide number for required tag " + required_tag["name"])
+                    try:
+                        tag_value = float(tag_value)
+                        break
+                    except ValueError:
+                        typer.echo("Invalid number format. Please provide a number.")
+                elif required_tag["datatype"] == "DATE":
+                    tag_value = typer.prompt("Provide date for required tag " + required_tag["name"])
+                    try:
+                        tag_value = datetime.strptime(tag_value, "%Y-%m-%d %H:%M:%S")
+                        break
+                    except ValueError:
+                        print("Invalid date format. Please use 'YYYY-MM-DD HH:MM:SS'")
+
+            setTags[required_tag["uuid"]] = tag_value
+
+
 if __name__ == "__main__":
     res = expand_and_match(
         "~/Downloads/dodo_mission_2024_02_08-20240408T074313Z-003/**.bag"

{kleinkram-0.21.7.dev20240919182750 → kleinkram-0.21.9.dev20240920112301}/src/kleinkram/main.py

@@ -9,7 +9,7 @@ from rich import print
 from rich.table import Table
 from typer.core import TyperGroup
 from typer.models import Context
-from typing_extensions import Annotated, List
+from typing_extensions import Annotated, List, Optional
 
 from kleinkram.api_client import AuthenticatedClient
 from kleinkram.auth.auth import login, setCliKey, logout
@@ -22,7 +22,7 @@ from kleinkram.queue.queue import queue
 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
+from .helper import uploadFiles, expand_and_match, canUploadMission, promptForTags
 
 
 class CommandPanel(str, Enum):
@@ -75,14 +75,14 @@ app = ErrorHandledTyper(
 
 @app.callback()
 def version(
-    version: bool = typer.Option(
-        None,
-        "--version",
-        "-v",
-        callback=version_callback,
-        is_eager=True,
-        help="Print the version and exit",
-    )
+        version: bool = typer.Option(
+            None,
+            "--version",
+            "-v",
+            callback=version_callback,
+            is_eager=True,
+            help="Print the version and exit",
+        )
 ):
     pass
 
@@ -109,20 +109,21 @@ def download():
 
 @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")
-    ],
-    project: Annotated[str, typer.Option(prompt=True, help="Name of Project")],
-    mission: Annotated[
-        str, typer.Option(prompt=True, help="Name of Mission to create")
-    ],
+        path: Annotated[
+            str, typer.Option(prompt=True, help="Path to files to upload, Regex supported")
+        ],
+        project: Annotated[str, typer.Option(prompt=True, help="Name of Project")],
+        mission: Annotated[
+            str, typer.Option(prompt=True, help="Name of Mission to create")
+        ],
+        tags: Annotated[Optional[List[str]], typer.Option(prompt=False, help="Tags to add to the mission")] = None,
 ):
     """
     Upload files matching the path to a mission in a project.
 
     The mission name must be unique within the project and not yet created.\n
     Examples:\n
-        - 'klein upload --path "~/data/**/*.bag" --project "Project 1" --mission "Mission 1"'\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
 
     """
     files = expand_and_match(path)
@@ -147,7 +148,6 @@ def upload(
         get_project_url = "/project/byName"
         project_response = client.get(get_project_url, params={"name": project})
         if project_response.status_code >= 400:
-
             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",
@@ -159,6 +159,17 @@ def upload(
             print(f"Project not found: '{project}'")
             return
 
+        can_upload = canUploadMission(client, project_json['uuid'])
+        if not can_upload:
+            raise AccessDeniedException(
+                f"You do not have the required permissions to upload to project '{project}'\n", "Access Denied")
+
+        if not tags:
+            tags = []
+        tags_dict = {item.split(":")[0]: item.split(":")[1] for item in tags}
+
+        promptForTags(tags_dict, project_json["requiredTags"])
+
         get_mission_url = "/mission/byName"
         mission_response = client.get(get_mission_url, params={"name": mission})
         mission_response.raise_for_status()
@@ -174,18 +185,23 @@ def upload(
         create_mission_url = "/mission/create"
         new_mission = client.post(
             create_mission_url,
-            json={"name": mission, "projectUUID": project_json["uuid"], "tags": []},
+            json={"name": mission, "projectUUID": project_json["uuid"], "tags": tags_dict},
         )
-        new_mission.raise_for_status()
+        if new_mission.status_code >= 400:
+            raise ValueError(
+                "Failed to create mission. Status Code: " + str(new_mission.status_code) + "\n" + new_mission.json()[
+                    "message"])
         new_mission_data = new_mission.json()
 
         get_temporary_credentials = "/file/temporaryAccess"
-
         response_2 = client.post(
             get_temporary_credentials,
             json={"filenames": filenames, "missionUUID": new_mission_data["uuid"]},
         )
-        response_2.raise_for_status()
+        if response_2.status_code >= 400:
+            raise ValueError(
+                "Failed to get temporary credentials. Status Code: " + str(response_2.status_code) + "\n" + response_2.json()[
+                    "message"])
         temp_credentials = response_2.json()
         credential = temp_credentials["credentials"]
         confirmed_files = temp_credentials["files"]