undo wrong files

Author: pcrespov

services/api-server/src/simcore_service_api_server/models/schemas/files.py

@@ -37,28 +37,28 @@ class ClientFile(BaseModel):
     filename: FileName = Field(..., description="File name")
     filesize: NonNegativeInt = Field(..., description="File size in bytes")
     sha256_checksum: SHA256Str = Field(..., description="SHA256 checksum")
-    destination: Annotated[
-        ProgramJobFilePath | None,
-        Field(..., description="Destination within a program job"),
-    ]
 
 
 class File(BaseModel):
     """Represents a file stored on the server side i.e. a unique reference to a file in the cloud."""
 
-    id: Annotated[UUID, Field(description="Resource identifier")]
-    filename: Annotated[str, Field(description="Name of the file with extension")]
-    content_type: Annotated[
-        str | None,
-        Field(
-            description="Guess of type content [EXPERIMENTAL]", validate_default=True
-        ),
-    ] = None
-    sha256_checksum: Annotated[
-        SHA256Str | None,
-        Field(description="SHA256 hash of the file's content", alias="checksum"),
-    ] = None
-    e_tag: Annotated[ETag | None, Field(description="S3 entity tag")] = None
+    # WARNING: from pydantic import File as FileParam
+    # NOTE: see https://ant.apache.org/manual/Tasks/checksum.html
+
+    id: UUID = Field(..., description="Resource identifier")
+
+    filename: str = Field(..., description="Name of the file with extension")
+    content_type: str | None = Field(
+        default=None,
+        description="Guess of type content [EXPERIMENTAL]",
+        validate_default=True,
+    )
+    sha256_checksum: SHA256Str | None = Field(
+        default=None,
+        description="SHA256 hash of the file's content",
+        alias="checksum",  # alias for backwards compatibility
+    )
+    e_tag: ETag | None = Field(default=None, description="S3 entity tag")
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -163,18 +163,16 @@ def quoted_storage_file_id(self) -> str:
 
 
 class UploadLinks(BaseModel):
-    abort_upload: Annotated[str, Field()]
-    complete_upload: Annotated[str, Field()]
+    abort_upload: str
+    complete_upload: str
 
 
 class FileUploadData(BaseModel):
-    chunk_size: Annotated[int, Field(description="Chunk size in bytes")]
-    urls: Annotated[list[Annotated[AnyHttpUrl, UriSchema()]], Field()]
-    links: Annotated[UploadLinks, Field()]
+    chunk_size: NonNegativeInt
+    urls: list[Annotated[AnyHttpUrl, UriSchema()]]
+    links: UploadLinks
 
 
 class ClientFileUploadData(BaseModel):
-    file_id: Annotated[UUID, Field(description="The file resource id")]
-    upload_schema: Annotated[
-        FileUploadData, Field(description="Schema for uploading file")
-    ]
+    file_id: UUID = Field(..., description="The file resource id")
+    upload_schema: FileUploadData = Field(..., description="Schema for uploading file")

services/api-server/src/simcore_service_api_server/services_http/webserver.py

@@ -186,15 +186,15 @@ async def _page_projects(
         limit: int,
         offset: int,
         show_hidden: bool,
-        job_parent_resource_name: str | None = None,
+        search_by_project_name: str | None = None,
     ) -> Page[ProjectGet]:
         assert 1 <= limit <= MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE  # nosec
         assert offset >= 0  # nosec
 
         optional: dict[str, Any] = {}
-        if job_parent_resource_name is not None:
+        if search_by_project_name is not None:
             optional["filters"] = json_dumps(
-                {"job_parent_resource_name": job_parent_resource_name}
+                {"search_by_project_name": search_by_project_name}
             )
 
         with service_exception_handler(
@@ -361,7 +361,7 @@ async def get_projects_w_solver_page(
             limit=limit,
             offset=offset,
             show_hidden=True,
-            job_parent_resource_name=solver_name,
+            search_by_project_name=solver_name,
         )
 
     async def get_projects_page(self, *, limit: int, offset: int):