uses AnyHttpUrl

Author: pcrespov

services/api-server/openapi.json

@@ -5544,8 +5544,6 @@
           "urls": {
             "items": {
               "type": "string",
-              "maxLength": 2083,
-              "minLength": 1,
               "format": "uri"
             },
             "type": "array",
@@ -5681,8 +5679,6 @@
             "anyOf": [
               {
                 "type": "string",
-                "maxLength": 2083,
-                "minLength": 1,
                 "format": "uri"
               },
               {
@@ -5696,8 +5692,6 @@
             "anyOf": [
               {
                 "type": "string",
-                "maxLength": 2083,
-                "minLength": 1,
                 "format": "uri"
               },
               {
@@ -5711,8 +5705,6 @@
             "anyOf": [
               {
                 "type": "string",
-                "maxLength": 2083,
-                "minLength": 1,
                 "format": "uri"
               },
               {
@@ -5894,8 +5886,6 @@
             "anyOf": [
               {
                 "type": "string",
-                "maxLength": 2083,
-                "minLength": 1,
                 "format": "uri"
               },
               {
@@ -6159,8 +6149,6 @@
           },
           "download_link": {
             "type": "string",
-            "maxLength": 2083,
-            "minLength": 1,
             "format": "uri",
             "title": "Download Link"
           }
@@ -6201,15 +6189,11 @@
           },
           "docs_url": {
             "type": "string",
-            "maxLength": 2083,
-            "minLength": 1,
             "format": "uri",
             "title": "Docs Url"
           },
           "docs_dev_url": {
             "type": "string",
-            "maxLength": 2083,
-            "minLength": 1,
             "format": "uri",
             "title": "Docs Dev Url"
           }
@@ -6733,8 +6717,6 @@
             "anyOf": [
               {
                 "type": "string",
-                "maxLength": 2083,
-                "minLength": 1,
                 "format": "uri"
               },
               {

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

@@ -11,10 +11,10 @@
 from models_library.basic_types import SHA256Str
 from models_library.projects_nodes_io import StorageFileID
 from pydantic import (
+    AnyHttpUrl,
     BaseModel,
     ConfigDict,
     Field,
-    HttpUrl,
     NonNegativeInt,
     StringConstraints,
     TypeAdapter,
@@ -169,7 +169,7 @@ class UploadLinks(BaseModel):
 
 class FileUploadData(BaseModel):
     chunk_size: NonNegativeInt
-    urls: list[Annotated[HttpUrl, UriSchema()]]
+    urls: list[Annotated[AnyHttpUrl, UriSchema()]]
     links: UploadLinks
 
 

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[HttpUrl, UriSchema()] | None = Field(
+    url: Annotated[AnyHttpUrl, UriSchema()] | None = Field(
         ..., description="Link to get this resource (self)"
     )
 
@@ -201,13 +201,13 @@ class Job(BaseModel):
     )
 
     # Get links to other resources
-    url: Annotated[HttpUrl, UriSchema()] | None = Field(
+    url: Annotated[AnyHttpUrl, UriSchema()] | None = Field(
         ..., description="Link to get this resource (self)"
     )
-    runner_url: Annotated[HttpUrl, UriSchema()] | None = Field(
+    runner_url: Annotated[AnyHttpUrl, UriSchema()] | None = Field(
         ..., description="Link to the solver's job (parent collection)"
     )
-    outputs_url: Annotated[HttpUrl, UriSchema()] | None = Field(
+    outputs_url: Annotated[AnyHttpUrl, 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 ConfigDict, HttpUrl
+from pydantic import AnyHttpUrl, ConfigDict
 from simcore_service_api_server.models._utils_pydantic import UriSchema
 
 
 class Meta(BaseMeta):
-    docs_url: Annotated[HttpUrl, UriSchema()]
-    docs_dev_url: Annotated[HttpUrl, UriSchema()]
+    docs_url: Annotated[AnyHttpUrl, UriSchema()]
+    docs_dev_url: Annotated[AnyHttpUrl, 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 BaseModel, ConfigDict, Field, HttpUrl, StringConstraints
+from pydantic import AnyHttpUrl, BaseModel, ConfigDict, Field, 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[HttpUrl, UriSchema()] | None,
+        Annotated[AnyHttpUrl, UriSchema()] | None,
         Field(..., description="Link to get this resource"),
     ]
 

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

@@ -1,15 +1,15 @@
 from typing import Annotated, TypeAlias
 
 from models_library import projects, projects_nodes_io
-from pydantic import BaseModel, ConfigDict, Field, HttpUrl
+from pydantic import AnyHttpUrl, BaseModel, ConfigDict, Field
 from simcore_service_api_server.models._utils_pydantic import UriSchema
 
 from .. import api_resources
 from . import solvers
 
 StudyID: TypeAlias = projects.ProjectID
 NodeName: TypeAlias = str
-DownloadLink: TypeAlias = Annotated[HttpUrl, UriSchema()]
+DownloadLink: TypeAlias = Annotated[AnyHttpUrl, UriSchema()]
 
 
 class Study(BaseModel):