Merge pull request #1770 from leggedrobotics/feat/1712_CRUD_mission_ops

CRUD mission ops

Author: lbarberi1927

backend/src/endpoints/project/project.controller.ts

@@ -8,7 +8,7 @@ import { CreateProject } from '@common/api/types/create-project.dto';
 import { ProjectDto } from '@common/api/types/project/base-project.dto';
 import { DeleteProjectResponseDto } from '@common/api/types/project/delete-project-response.dto';
 import { ProjectQueryDto } from '@common/api/types/project/project-query.dto';
-import { ProjectWithRequiredTags } from '@common/api/types/project/project-with-required-tags';
+import { ProjectWithRequiredTagsDto } from '@common/api/types/project/project-with-required-tags.dto';
 import { ProjectsDto } from '@common/api/types/project/projects.dto';
 import { ResentProjectsDto } from '@common/api/types/project/recent-projects.dto';
 import { RemoveTagTypeDto } from '@common/api/types/remove-tag-type.dto';
@@ -64,11 +64,11 @@ export class ProjectController {
     @CanReadProject()
     @ApiOkResponse({
         description: 'Returns the project',
-        type: ProjectWithRequiredTags,
+        type: ProjectWithRequiredTagsDto,
     })
     async getProjectById(
         @ParameterUID('uuid') uuid: string,
-    ): Promise<ProjectWithRequiredTags> {
+    ): Promise<ProjectWithRequiredTagsDto> {
         return this.projectService.findOne(uuid);
     }
 

backend/src/serialization.ts

@@ -27,6 +27,7 @@ import {
 import { ProjectDto } from '@common/api/types/project/base-project.dto';
 import { ProjectWithMissionCountDto } from '@common/api/types/project/project-with-mission-count.dto';
 import { ProjectWithMissionsDto } from '@common/api/types/project/project-with-missions.dto';
+import { ProjectWithRequiredTagsDto } from '@common/api/types/project/project-with-required-tags.dto';
 import { TagDto, TagTypeDto } from '@common/api/types/tags/tags.dto';
 import { TopicDto } from '@common/api/types/topic.dto';
 import { GroupMembershipDto, UserDto } from '@common/api/types/user.dto';
@@ -282,6 +283,21 @@ export const projectEntityToDtoWithRequiredTags = (
     };
 };
 
+export const projectEntityToDtoWithMissionCountAndTags = (
+    project: Project,
+): ProjectWithRequiredTagsDto => {
+    if (project.creator === undefined) {
+        throw new Error('Creator can never be undefined');
+    }
+
+    return {
+        ...(projectEntityToDto(project) as ProjectWithRequiredTagsDto),
+        creator: userEntityToDto(project.creator),
+        missionCount: project.missionCount ?? 0,
+        requiredTags: project.requiredTags?.map(tagTypeEntityToDto) ?? [],
+    };
+};
+
 export const projectEntityToDtoWithMissions = (
     project: Project,
 ): ProjectWithMissionsDto => {

backend/src/services/mission.service.ts

@@ -165,7 +165,9 @@ export class MissionService {
         let query = this.missionRepository
             .createQueryBuilder('mission')
             .leftJoinAndSelect('mission.project', 'project')
-            .leftJoinAndSelect('mission.creator', 'creator');
+            .leftJoinAndSelect('mission.creator', 'creator')
+            .leftJoinAndSelect('mission.tags', 'tag')
+            .leftJoinAndSelect('tag.tagType', 'tagType');
 
         query = addAccessConstraintsToMissionQuery(query, userUuid);
 

backend/src/services/project.service.ts

@@ -18,7 +18,7 @@ import { DefaultRightDto } from '@common/api/types/access-control/default-right.
 import { DefaultRights } from '@common/api/types/access-control/default-rights';
 import { SortOrder } from '@common/api/types/pagination';
 import { ProjectDto } from '@common/api/types/project/base-project.dto';
-import { ProjectWithRequiredTags } from '@common/api/types/project/project-with-required-tags';
+import { ProjectWithRequiredTagsDto } from '@common/api/types/project/project-with-required-tags.dto';
 import { ProjectsDto } from '@common/api/types/project/projects.dto';
 import { ResentProjectDto } from '@common/api/types/project/recent-projects.dto';
 import AccessGroup from '@common/entities/auth/accessgroup.entity';
@@ -32,7 +32,7 @@ import {
 import { ConfigService } from '@nestjs/config';
 import { AuthHeader } from '../endpoints/auth/parameter-decorator';
 import {
-    projectEntityToDtoWithMissionCount,
+    projectEntityToDtoWithMissionCountAndTags,
     projectEntityToDtoWithRequiredTags,
 } from '../serialization';
 import { AccessGroupConfig } from '../types/access-group-config';
@@ -80,7 +80,8 @@ export class ProjectService {
     ): Promise<ProjectsDto> {
         let query = this.projectRepository
             .createQueryBuilder('project')
-            .leftJoinAndSelect('project.creator', 'creator');
+            .leftJoinAndSelect('project.creator', 'creator')
+            .leftJoinAndSelect('project.requiredTags', 'requiredTags');
 
         query = addAccessConstraintsToProjectQuery(query, userUuid);
 
@@ -103,15 +104,15 @@ export class ProjectService {
 
         return {
             data: projects.map((element) =>
-                projectEntityToDtoWithMissionCount(element),
+                projectEntityToDtoWithMissionCountAndTags(element),
             ),
             count,
             skip,
             take,
         };
     }
 
-    async findOne(uuid: string): Promise<ProjectWithRequiredTags> {
+    async findOne(uuid: string): Promise<ProjectWithRequiredTagsDto> {
         const missionPromise = this.projectRepository
             .createQueryBuilder('project')
             .where('project.uuid = :uuid', { uuid })

backend/src/services/tag.service.ts

@@ -291,7 +291,11 @@ export class TagService {
         if (name !== '') {
             where.name = ILike(`%${name}%`);
         }
-        if (type !== undefined && type !== DataType.ANY) {
+        if (
+            type !== undefined &&
+            type !== DataType.ANY &&
+            (type as any) !== ''
+        ) {
             where.datatype = type;
         }
         const [tags, count] = await this.tagTypeRepository.findAndCount({

cli/kleinkram/api/deser.py

@@ -7,12 +7,13 @@
 from typing import Literal
 from typing import NewType
 from typing import Tuple
+from typing import List
 from uuid import UUID
 
 import dateutil.parser
 
 from kleinkram.errors import ParsingError
-from kleinkram.models import File
+from kleinkram.models import File, MetadataValue
 from kleinkram.models import FileState
 from kleinkram.models import Mission
 from kleinkram.models import Project
@@ -51,6 +52,7 @@ class MissionObjectKeys(str, Enum):
     DESCRIPTION = "description"
     CREATED_AT = "createdAt"
     UPDATED_AT = "updatedAt"
+    TAGS = "tags"
 
 
 class ProjectObjectKeys(str, Enum):
@@ -59,6 +61,7 @@ class ProjectObjectKeys(str, Enum):
     DESCRIPTION = "description"
     CREATED_AT = "createdAt"
     UPDATED_AT = "updatedAt"
+    REQUIRED_TAGS = "requiredTags"
 
 
 def _get_nested_info(data, key: Literal["mission", "project"]) -> Tuple[UUID, str]:
@@ -82,6 +85,19 @@ def _parse_file_state(state: str) -> FileState:
     except ValueError as e:
         raise ParsingError(f"error parsing file state: {state}") from e
 
+def _parse_metadata(tags: List[Dict]) -> Dict[str, MetadataValue]:
+    result = {}
+    try:
+        for tag in tags:
+            entry = {tag.get("name"): MetadataValue(tag.get("valueAsString"), tag.get("datatype"))}
+            result.update(entry)
+        return result
+    except ValueError as e:
+        raise ParsingError(f"error parsing metadata: {e}") from e
+
+def _parse_required_tags(tags: List[Dict]) -> list[str]:
+    return list(_parse_metadata(tags).keys())
+
 
 def _parse_project(project_object: ProjectObject) -> Project:
     try:
@@ -90,6 +106,7 @@ def _parse_project(project_object: ProjectObject) -> Project:
         description = project_object[ProjectObjectKeys.DESCRIPTION]
         created_at = _parse_datetime(project_object[ProjectObjectKeys.CREATED_AT])
         updated_at = _parse_datetime(project_object[ProjectObjectKeys.UPDATED_AT])
+        required_tags = _parse_required_tags(project_object[ProjectObjectKeys.REQUIRED_TAGS])
     except Exception as e:
         raise ParsingError(f"error parsing project: {project_object}") from e
     return Project(
@@ -98,6 +115,7 @@ def _parse_project(project_object: ProjectObject) -> Project:
         description=description,
         created_at=created_at,
         updated_at=updated_at,
+        required_tags=required_tags,
     )
 
 
@@ -107,7 +125,7 @@ def _parse_mission(mission: MissionObject) -> Mission:
         name = mission[MissionObjectKeys.NAME]
         created_at = _parse_datetime(mission[MissionObjectKeys.CREATED_AT])
         updated_at = _parse_datetime(mission[MissionObjectKeys.UPDATED_AT])
-        metadata = {}  # TODO: this crap is really bad to parse
+        metadata = _parse_metadata(mission[MissionObjectKeys.TAGS])
 
         project_id, project_name = _get_nested_info(mission, PROJECT)
 

cli/kleinkram/api/file_transfer.py

@@ -572,19 +572,20 @@ def upload_files(
 
         avg_speed_bps = total_uploaded_bytes / elapsed_time if elapsed_time > 0 else 0
 
-        console.print(f"Upload took {elapsed_time:.2f} seconds")
-        console.print(f"Total uploaded: {format_bytes(total_uploaded_bytes)}")
-        console.print(f"Average speed: {format_bytes(avg_speed_bps, speed=True)}")
-
-        if failed_files > 0:
-            console.print(
-                f"\nUploaded {len(files) - failed_files - skipped_files} files, {skipped_files} skipped, {failed_files} uploads failed",
-                style="red",
-            )
-        else:
-            console.print(
-                f"\nUploaded {len(files) - skipped_files} files, {skipped_files} skipped"
-            )
+        if verbose:
+            console.print(f"Upload took {elapsed_time:.2f} seconds")
+            console.print(f"Total uploaded: {format_bytes(total_uploaded_bytes)}")
+            console.print(f"Average speed: {format_bytes(avg_speed_bps, speed=True)}")
+
+            if failed_files > 0:
+                console.print(
+                    f"\nUploaded {len(files) - failed_files - skipped_files} files, {skipped_files} skipped, {failed_files} uploads failed",
+                    style="red",
+                )
+            else:
+                console.print(
+                    f"\nUploaded {len(files) - skipped_files} files, {skipped_files} skipped"
+                )
 
 
 def download_files(