reverts httpurl after tests

Author: pcrespov

services/api-server/src/simcore_service_api_server/api/routes/files.py

@@ -261,7 +261,7 @@ async def get_upload_links(
     abort_url: URL = request.url_for("abort_multipart_upload", file_id=file_meta.id)
     upload_data: FileUploadData = FileUploadData(
         chunk_size=upload_links.chunk_size,
-        urls=upload_links.urls,
+        urls=upload_links.urls,  # type: ignore[arg-type]
         links=UploadLinks(
             complete_upload=completion_url.path, abort_upload=abort_url.path
         ),

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

@@ -8,10 +8,10 @@
 from models_library.projects_nodes_io import NodeID
 from models_library.projects_state import RunningState
 from pydantic import (
-    AnyHttpUrl,
     BaseModel,
     ConfigDict,
     Field,
+    HttpUrl,
     PositiveInt,
     StrictBool,
     StrictFloat,
@@ -153,7 +153,7 @@ class JobMetadata(BaseModel):
     metadata: dict[str, MetaValueType] = Field(..., description="Custom key-value map")
 
     # Links
-    url: Annotated[AnyHttpUrl, UriSchema()] | None = Field(
+    url: Annotated[HttpUrl, UriSchema()] | None = Field(
         ..., description="Link to get this resource (self)"
     )
 
@@ -201,13 +201,13 @@ class Job(BaseModel):
     )
 
     # Get links to other resources
-    url: Annotated[AnyHttpUrl, UriSchema()] | None = Field(
+    url: Annotated[HttpUrl, UriSchema()] | None = Field(
         ..., description="Link to get this resource (self)"
     )
-    runner_url: Annotated[AnyHttpUrl, UriSchema()] | None = Field(
+    runner_url: Annotated[HttpUrl, UriSchema()] | None = Field(
         ..., description="Link to the solver's job (parent collection)"
     )
-    outputs_url: Annotated[AnyHttpUrl, UriSchema()] | None = Field(
+    outputs_url: Annotated[HttpUrl, UriSchema()] | None = Field(
         ..., description="Link to the job outputs (sub-collection)"
     )
 

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

@@ -1,13 +1,13 @@
 from typing import Annotated
 
 from models_library.api_schemas__common.meta import BaseMeta
-from pydantic import AnyHttpUrl, ConfigDict
+from pydantic import ConfigDict, HttpUrl
 from simcore_service_api_server.models._utils_pydantic import UriSchema
 
 
 class Meta(BaseMeta):
-    docs_url: Annotated[AnyHttpUrl, UriSchema()]
-    docs_dev_url: Annotated[AnyHttpUrl, UriSchema()]
+    docs_url: Annotated[HttpUrl, UriSchema()]
+    docs_dev_url: Annotated[HttpUrl, UriSchema()]
     model_config = ConfigDict(
         json_schema_extra={
             "example": {

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

@@ -6,7 +6,7 @@
 from models_library.services import ServiceMetaDataPublished
 from models_library.services_regex import COMPUTATIONAL_SERVICE_KEY_RE
 from packaging.version import Version
-from pydantic import AnyHttpUrl, BaseModel, ConfigDict, Field, StringConstraints
+from pydantic import BaseModel, ConfigDict, Field, HttpUrl, StringConstraints
 from simcore_service_api_server.models._utils_pydantic import UriSchema
 
 from ..api_resources import compose_resource_name
@@ -54,7 +54,7 @@ class Solver(BaseModel):
 
     # Get links to other resources
     url: Annotated[
-        Annotated[AnyHttpUrl, UriSchema()] | None,
+        Annotated[HttpUrl, UriSchema()] | None,
         Field(..., description="Link to get this resource"),
     ]
 

services/api-server/src/simcore_service_api_server/services/director_v2.py

@@ -7,15 +7,7 @@
 from models_library.projects_nodes_io import NodeID
 from models_library.projects_pipeline import ComputationTask
 from models_library.projects_state import RunningState
-from pydantic import (
-    AnyHttpUrl,
-    AnyUrl,
-    BaseModel,
-    ConfigDict,
-    Field,
-    PositiveInt,
-    TypeAdapter,
-)
+from pydantic import AnyHttpUrl, BaseModel, ConfigDict, Field, PositiveInt, TypeAdapter
 from settings_library.tracing import TracingSettings
 from starlette import status
 
@@ -62,7 +54,7 @@ def guess_progress(self) -> PercentageInt:
 
 class TaskLogFileGet(BaseModel):
     task_id: NodeID
-    download_link: AnyUrl | None = Field(
+    download_link: AnyHttpUrl | None = Field(
         None, description="Presigned link for log file or None if still not available"
     )