kleinkram 0.21.8.dev20240920104547__tar.gz → 0.21.9.dev20240920112301__tar.gz

{kleinkram-0.21.8.dev20240920104547 → kleinkram-0.21.9.dev20240920112301}/PKG-INFO

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

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

{kleinkram-0.21.8.dev20240920104547 → kleinkram-0.21.9.dev20240920112301}/src/kleinkram/helper.py

@@ -2,8 +2,10 @@ 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
@@ -117,7 +119,7 @@ def uploadFiles(files: Dict[str, str], credentials: Dict[str, str], nrThreads: i
     else:
         minio_endpoint = api_endpoint.replace("api", "minio")
 
-    config = Config(retries = {
+    config = Config(retries={
         'max_attempts': 10,
         'mode': 'standard'
     })
@@ -168,6 +170,7 @@ def uploadFile(_queue: queue.Queue, s3: BaseClient, transferCallback: TransferCa
             print(f"Error uploading {filename}: {e}")
             _queue.task_done()
 
+
 def canUploadMission(client: AuthenticatedClient, project_uuid: str):
     permissions = client.get("/user/permissions")
     permissions.raise_for_status()
@@ -177,6 +180,35 @@ def canUploadMission(client: AuthenticatedClient, project_uuid: str):
     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.8.dev20240920104547 → kleinkram-0.21.9.dev20240920112301}/src/kleinkram/main.py

@@ -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, canUploadMission
+from .helper import uploadFiles, expand_and_match, canUploadMission, promptForTags
 
 
 class CommandPanel(str, Enum):
@@ -168,32 +168,7 @@ def upload(
             tags = []
         tags_dict = {item.split(":")[0]: item.split(":")[1] for item in tags}
 
-        for required_tag in project_json["requiredTags"]:
-            if required_tag["name"] not in tags_dict:
-                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'")
-
-                tags_dict[required_tag["uuid"]] = tag_value
+        promptForTags(tags_dict, project_json["requiredTags"])
 
         get_mission_url = "/mission/byName"
         mission_response = client.get(get_mission_url, params={"name": mission})