Merge branch '206-upload_email_to_imap_task-unicodeencodeerror-ascii-codec-can-t-encode-characters' into 'main'

Author: 736-c41-2c1-e464fc974

.test_durations

@@ -71,7 +71,7 @@ models/SummaryStatisticsModel.ts
 models/TranslateAllRequest.ts
 models/TranslateFileRequest.ts
 models/TreeNodeModel.ts
-models/UpdateArchiveModel.ts
+models/UpdateArchiveRequest.ts
 models/UpdateFileRequest.ts
 models/UpdateFilesRequest.ts
 models/ValidationError.ts

Frontend/src/app/api/generated/.openapi-generator/FILES

@@ -19,7 +19,7 @@ import type {
     ArchiveRequest,
     ArchivesModel,
     HTTPValidationError,
-    UpdateArchiveModel,
+    UpdateArchiveRequest,
 } from "../models/index";
 import {
     ArchiveCreatedResponseFromJSON,
@@ -30,8 +30,8 @@ import {
     ArchivesModelToJSON,
     HTTPValidationErrorFromJSON,
     HTTPValidationErrorToJSON,
-    UpdateArchiveModelFromJSON,
-    UpdateArchiveModelToJSON,
+    UpdateArchiveRequestFromJSON,
+    UpdateArchiveRequestToJSON,
 } from "../models/index";
 
 export interface CreateNewArchiveV1ArchivePostRequest {
@@ -43,9 +43,9 @@ export interface DownloadArchiveV1ArchiveArchiveIdGetRequest {
     encrypted?: boolean;
 }
 
-export interface UpdateArchiveV1ArchiveArchiveIdPostRequest {
+export interface UpdateArchiveV1ArchiveArchiveIdPutRequest {
     archiveId: string;
-    updateArchiveModel: UpdateArchiveModel;
+    updateArchiveRequest: UpdateArchiveRequest;
 }
 
 /**
@@ -201,24 +201,23 @@ export class ArchivesApi extends runtime.BaseAPI {
     }
 
     /**
-     * Update archive.
      * Update Archive
      */
-    async updateArchiveV1ArchiveArchiveIdPostRaw(
-        requestParameters: UpdateArchiveV1ArchiveArchiveIdPostRequest,
+    async updateArchiveV1ArchiveArchiveIdPutRaw(
+        requestParameters: UpdateArchiveV1ArchiveArchiveIdPutRequest,
         initOverrides?: RequestInit | runtime.InitOverrideFunction,
     ): Promise<runtime.ApiResponse<any>> {
         if (requestParameters["archiveId"] == null) {
             throw new runtime.RequiredError(
                 "archiveId",
-                'Required parameter "archiveId" was null or undefined when calling updateArchiveV1ArchiveArchiveIdPost().',
+                'Required parameter "archiveId" was null or undefined when calling updateArchiveV1ArchiveArchiveIdPut().',
             );
         }
 
-        if (requestParameters["updateArchiveModel"] == null) {
+        if (requestParameters["updateArchiveRequest"] == null) {
             throw new runtime.RequiredError(
-                "updateArchiveModel",
-                'Required parameter "updateArchiveModel" was null or undefined when calling updateArchiveV1ArchiveArchiveIdPost().',
+                "updateArchiveRequest",
+                'Required parameter "updateArchiveRequest" was null or undefined when calling updateArchiveV1ArchiveArchiveIdPut().',
             );
         }
 
@@ -234,11 +233,11 @@ export class ArchivesApi extends runtime.BaseAPI {
                     `{${"archive_id"}}`,
                     encodeURIComponent(String(requestParameters["archiveId"])),
                 ),
-                method: "POST",
+                method: "PUT",
                 headers: headerParameters,
                 query: queryParameters,
-                body: UpdateArchiveModelToJSON(
-                    requestParameters["updateArchiveModel"],
+                body: UpdateArchiveRequestToJSON(
+                    requestParameters["updateArchiveRequest"],
                 ),
             },
             initOverrides,
@@ -252,14 +251,13 @@ export class ArchivesApi extends runtime.BaseAPI {
     }
 
     /**
-     * Update archive.
      * Update Archive
      */
-    async updateArchiveV1ArchiveArchiveIdPost(
-        requestParameters: UpdateArchiveV1ArchiveArchiveIdPostRequest,
+    async updateArchiveV1ArchiveArchiveIdPut(
+        requestParameters: UpdateArchiveV1ArchiveArchiveIdPutRequest,
         initOverrides?: RequestInit | runtime.InitOverrideFunction,
     ): Promise<any> {
-        const response = await this.updateArchiveV1ArchiveArchiveIdPostRaw(
+        const response = await this.updateArchiveV1ArchiveArchiveIdPutRaw(
             requestParameters,
             initOverrides,
         );

Frontend/src/app/api/generated/apis/ArchivesApi.ts

@@ -15,45 +15,44 @@
 
 import { mapValues } from "../runtime";
 /**
- * Update archive model.
+ *
  * @export
- * @interface UpdateArchiveModel
+ * @interface UpdateArchiveRequest
  */
-export interface UpdateArchiveModel {
+export interface UpdateArchiveRequest {
     /**
      *
      * @type {boolean}
-     * @memberof UpdateArchiveModel
+     * @memberof UpdateArchiveRequest
      */
-    hidden: boolean;
+    hidden?: boolean;
 }
 
 /**
- * Check if a given object implements the UpdateArchiveModel interface.
+ * Check if a given object implements the UpdateArchiveRequest interface.
  */
-export function instanceOfUpdateArchiveModel(value: object): boolean {
-    if (!("hidden" in value)) return false;
+export function instanceOfUpdateArchiveRequest(value: object): boolean {
     return true;
 }
 
-export function UpdateArchiveModelFromJSON(json: any): UpdateArchiveModel {
-    return UpdateArchiveModelFromJSONTyped(json, false);
+export function UpdateArchiveRequestFromJSON(json: any): UpdateArchiveRequest {
+    return UpdateArchiveRequestFromJSONTyped(json, false);
 }
 
-export function UpdateArchiveModelFromJSONTyped(
+export function UpdateArchiveRequestFromJSONTyped(
     json: any,
     ignoreDiscriminator: boolean,
-): UpdateArchiveModel {
+): UpdateArchiveRequest {
     if (json == null) {
         return json;
     }
     return {
-        hidden: json["hidden"],
+        hidden: json["hidden"] == null ? undefined : json["hidden"],
     };
 }
 
-export function UpdateArchiveModelToJSON(
-    value?: UpdateArchiveModel | null,
+export function UpdateArchiveRequestToJSON(
+    value?: UpdateArchiveRequest | null,
 ): any {
     if (value == null) {
         return value;

…i/generated/models/UpdateArchiveModel.ts …generated/models/UpdateArchiveRequest.tsFrontend/src/app/api/generated/models/UpdateArchiveModel.ts renamed to Frontend/src/app/api/generated/models/UpdateArchiveRequest.ts Frontend/src/app/api/generated/models/UpdateArchiveModel.ts renamed to Frontend/src/app/api/generated/models/UpdateArchiveRequest.ts

@@ -57,7 +57,7 @@ export * from "./SummaryStatisticsModel";
 export * from "./TranslateAllRequest";
 export * from "./TranslateFileRequest";
 export * from "./TreeNodeModel";
-export * from "./UpdateArchiveModel";
+export * from "./UpdateArchiveRequest";
 export * from "./UpdateFileRequest";
 export * from "./UpdateFilesRequest";
 export * from "./ValidationError";

Frontend/src/app/api/generated/models/index.ts

@@ -1,6 +1,12 @@
 from pydantic import BaseModel
 
 
+class CompleteEstimate(BaseModel):
+    samples_count: int
+    samples_period__s: int
+    estimate_timestamp: int
+
+
 class OverallQueuesStats(BaseModel):
     messages_in_queues: int
     complete_estimate_timestamp: int | None

backend/api/api/models/queues_model.py

@@ -2,7 +2,10 @@
 from typing import Annotated
 from uuid import UUID
 
-from common.archive.archive_repository import ArchiveRepository
+from common.archive.archive_repository import (
+    ArchiveNotFoundException,
+    ArchiveRepository,
+)
 from common.archive.archive_scheduling_service import ArchiveSchedulingService
 from common.dependencies import (
     get_archive_repository,
@@ -11,6 +14,7 @@
 )
 from common.services.lazybytes_service import LazyBytesService
 from common.services.query_builder import QueryParameters
+from common.services.task_scheduling_service import UpdateArchiveRequest
 from fastapi import APIRouter, Depends, HTTPException, Query, Response
 from fastapi.responses import StreamingResponse
 from pydantic import BaseModel
@@ -39,12 +43,6 @@ class ArchiveRequest(BaseModel):
     query: QueryParameters
 
 
-class UpdateArchiveModel(BaseModel):
-    """Update archive model."""
-
-    hidden: bool
-
-
 @router.get("/")
 def get_all_archives(
     archive_repository: ArchiveRepository = default_archive_repository,
@@ -107,15 +105,13 @@ def download_archive(
     )
 
 
-@router.post("/{archive_id}")
+@router.put("/{archive_id}")
 def update_archive(
     archive_id: UUID,
-    update_file_model: UpdateArchiveModel,
-    archive_repository: ArchiveRepository = default_archive_repository,
+    update_archive_request: UpdateArchiveRequest,
+    archive_scheduling_service: ArchiveSchedulingService = default_archive_scheduling_service,
 ):
-    """Update archive."""
-    archive = archive_repository.get_by_id(archive_id)
-    if archive is None:
-        raise HTTPException(status_code=404, detail="Invalid archive")
-    archive.hidden = update_file_model.hidden
-    archive_repository.update(archive, include={"hidden"})
+    try:
+        archive_scheduling_service.update_archive(archive_id, update_archive_request)
+    except ArchiveNotFoundException as e:
+        raise HTTPException(status_code=404, detail="Invalid archive") from e

backend/api/api/routers/archives.py

@@ -5,10 +5,9 @@
 from common.dependencies import get_queues_service
 from common.services.queues_service import QueuesService
 from fastapi import APIRouter, Depends
-from pydantic import BaseModel
 from sklearn.linear_model import LinearRegression
 
-from api.models.queues_model import OverallQueuesStats
+from api.models.queues_model import CompleteEstimate, OverallQueuesStats
 
 router = APIRouter()
 
@@ -60,12 +59,6 @@ def get_message_count(
     return message_count
 
 
-class CompleteEstimate(BaseModel):
-    samples_count: int
-    samples_period__s: int
-    estimate_timestamp: int
-
-
 def get_completed_estimate_for_period(
     sample_period__s: int,
     queue_name: str | None = None,

backend/api/api/routers/queues.py

@@ -7,6 +7,7 @@
 )
 from common.services.lazybytes_service import LazyBytes
 from common.services.query_builder import QueryParameters
+from common.services.task_scheduling_service import UpdateArchiveRequest
 from fastapi.testclient import TestClient
 
 from api.models.archives_model import ArchivesModel
@@ -91,24 +92,15 @@ def test_download_archive(client: TestClient):
 
 def test_hide_archive(client: TestClient):
     query = QueryParameters(query_id="0123456789", search_string="*")
-    content = [b"file content", b"and", b"another", b"chunk"]
-    content_encrypted = [b"encrypted file content", b"and", b"another", b"chunk"]
-    archive = Archive(
-        query=query,
-        plain_file=StoredArchive(
-            storage_data=LazyBytes(service_id=str(ObjectId())),
-            sha256="",
-            size=len(content),
-        ),
-        encrypted_file=StoredArchive(
-            storage_data=LazyBytes(service_id=str(ObjectId())),
-            sha256="",
-            size=len(content_encrypted),
-        ),
-    )
-    get_archive_repository().get_by_id.return_value = archive
+    archive = Archive(query=query)
+
+    request = UpdateArchiveRequest(hidden=True)
 
-    response = client.post(f"/v1/archive/{archive.id_}", json={"hidden": True})
+    get_archive_scheduling_service().update_archive.return_value = None
+
+    response = client.put(f"/v1/archive/{archive.id_}", json=request.model_dump())
 
     assert response.status_code == 200
-    get_archive_repository().update.assert_called_once_with(archive, include={"hidden"})
+    get_archive_scheduling_service().update_archive.assert_called_once_with(
+        archive.id_, request
+    )

backend/api/tests/test_archives.py

@@ -3,8 +3,7 @@
 from common.dependencies import get_queues_service
 from fastapi.testclient import TestClient
 
-from api.models.queues_model import OverallQueuesStats
-from api.routers.queues import CompleteEstimate
+from api.models.queues_model import CompleteEstimate, OverallQueuesStats
 
 
 def test_get_overall_queue_stats(client: TestClient):