Merge remote-tracking branch 'origin/feat/expand_sdk-cli_actions_functionality' into dev

Author: wp99cp

cli/kleinkram/__init__.py

@@ -3,17 +3,28 @@
 from kleinkram._version import __version__
 from kleinkram.wrappers import create_mission
 from kleinkram.wrappers import create_project
+from kleinkram.wrappers import create_template
+from kleinkram.wrappers import create_template_version
+from kleinkram.wrappers import launch_execution
 from kleinkram.wrappers import delete_file
 from kleinkram.wrappers import delete_files
 from kleinkram.wrappers import delete_mission
 from kleinkram.wrappers import delete_project
+from kleinkram.wrappers import delete_template
+from kleinkram.wrappers import delete_execution
 from kleinkram.wrappers import download
+from kleinkram.wrappers import download_artifact
+from kleinkram.wrappers import get_execution
 from kleinkram.wrappers import get_file
 from kleinkram.wrappers import get_mission
 from kleinkram.wrappers import get_project
+from kleinkram.wrappers import get_template
+from kleinkram.wrappers import get_template_revisions
+from kleinkram.wrappers import list_executions
 from kleinkram.wrappers import list_files
 from kleinkram.wrappers import list_missions
 from kleinkram.wrappers import list_projects
+from kleinkram.wrappers import list_templates
 from kleinkram.wrappers import update_file
 from kleinkram.wrappers import update_mission
 from kleinkram.wrappers import update_project
@@ -25,19 +36,30 @@
     "upload",
     "verify",
     "download",
+    "download_artifact",
+    "get_execution",
     "get_file",
     "get_mission",
     "get_project",
+    "get_template",
+    "get_template_revisions",
     "list_files",
     "list_missions",
     "list_projects",
+    "list_templates",
+    "list_executions",
     "update_file",
     "update_mission",
     "update_project",
     "delete_files",
     "delete_file",
     "delete_mission",
     "delete_project",
+    "delete_template",
+    "delete_execution",
     "create_mission",
     "create_project",
+    "create_template",
+    "create_template_version",
+    "launch_execution",
 ]

cli/kleinkram/api/deser.py

@@ -86,6 +86,7 @@ class ExecutionObjectKeys(str, Enum):
 class TemplateObjectKeys(str, Enum):
     UUID = "uuid"
     NAME = "name"
+    DESCRIPTION = "description"
     ACCESS_RIGHTS = "accessRights"
     COMMAND = "command"
     CPU_CORES = "cpuCores"
@@ -233,6 +234,7 @@ def _parse_action_template(template_object: Dict[str, Any]) -> ActionTemplate:
         command = template_object[TemplateObjectKeys.COMMAND]
         cpu_cores = template_object[TemplateObjectKeys.CPU_CORES]
         cpu_memory_gb = template_object[TemplateObjectKeys.CPU_MEMORY_GB]
+        description = template_object[TemplateObjectKeys.DESCRIPTION]
         entrypoint = template_object[TemplateObjectKeys.ENTRYPOINT]
         gpu_memory_gb = template_object[TemplateObjectKeys.GPU_MEMORY_GB]
         image_name = template_object[TemplateObjectKeys.IMAGE_NAME]
@@ -250,6 +252,7 @@ def _parse_action_template(template_object: Dict[str, Any]) -> ActionTemplate:
         command=command,
         cpu_cores=cpu_cores,
         cpu_memory_gb=cpu_memory_gb,
+        description=description,
         entrypoint=entrypoint,
         gpu_memory_gb=gpu_memory_gb,
         image_name=image_name,

cli/kleinkram/api/file_transfer.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import logging
+import re
 import sys
 from concurrent.futures import Future
 from concurrent.futures import ThreadPoolExecutor
@@ -262,6 +263,16 @@ def _get_file_download(client: AuthenticatedClient, id: UUID) -> str:
     return resp.json()["url"]
 
 
+def _get_filename_from_cd(cd: str | None) -> Optional[str]:
+    """Extract filename from Content-Disposition header."""
+    if not cd:
+        return None
+    fname = re.findall("filename=(.+)", cd)
+    if len(fname) == 0:
+        return None
+    return fname[0].strip().strip('"')
+
+
 def _url_download(url: str, *, path: Path, size: int, overwrite: bool = False, verbose: bool = False) -> None:
     if path.exists():
         if overwrite:

cli/kleinkram/api/query.py

@@ -12,6 +12,7 @@
 from dataclasses import dataclass
 from dataclasses import field
 from typing import List
+from typing import Optional
 from uuid import UUID
 
 from kleinkram.errors import InvalidMissionQuery
@@ -43,10 +44,15 @@ class FileQuery:
 
 @dataclass
 class ExecutionQuery:
-    mission_ids: List[UUID] = field(default_factory=list)
-    mission_patterns: List[str] = field(default_factory=list)
-    project_ids: List[UUID] = field(default_factory=list)
-    project_patterns: List[str] = field(default_factory=list)
+    """
+    This matches the parameters supported by the backend. The backend
+    does not yet support filtering by list of ids as for
+    other resources (e.g. projects and missions).
+    """
+
+    project_uuid: Optional[UUID] = None
+    mission_uuid: Optional[UUID] = None
+    template_name: Optional[str] = None
 
 
 def check_mission_query_is_creatable(query: MissionQuery) -> str: