continue fixing

Author: giancarloromeo

services/web/server/src/simcore_service_webserver/catalog/_api.py

@@ -284,17 +284,17 @@ async def get_compatible_inputs_given_source_output(
         from_service_key, from_service_version, from_output_key, ctx
     )
 
-    from_output: ServiceOutput = ServiceOutput.construct(
-        **service_output.dict(include=ServiceOutput.__fields__.keys())
+    from_output: ServiceOutput = ServiceOutput.model_construct(
+        **service_output.model_dump(include=ServiceOutput.model_fields.keys())
     )
 
     # N inputs
     service_inputs = await list_service_inputs(service_key, service_version, ctx)
 
     def iter_service_inputs() -> Iterator[tuple[ServiceInputKey, ServiceInput]]:
         for service_input in service_inputs:
-            yield service_input.key_id, ServiceInput.construct(
-                **service_input.dict(include=ServiceInput.__fields__.keys())
+            yield service_input.key_id, ServiceInput.model_construct(
+                **service_input.model_dump(include=ServiceInput.model_fields.keys())
             )
 
     # check
@@ -352,16 +352,16 @@ async def get_compatible_outputs_given_target_input(
 
     def iter_service_outputs() -> Iterator[tuple[ServiceOutputKey, ServiceOutput]]:
         for service_output in service_outputs:
-            yield service_output.key_id, ServiceOutput.construct(
-                **service_output.dict(include=ServiceOutput.__fields__.keys())
+            yield service_output.key_id, ServiceOutput.model_construct(
+                **service_output.model_dump(include=ServiceOutput.model_fields.keys())
             )
 
     # 1 input
     service_input = await get_service_input(
         to_service_key, to_service_version, to_input_key, ctx
     )
-    to_input: ServiceInput = ServiceInput.construct(
-        **service_input.dict(include=ServiceInput.__fields__.keys())
+    to_input: ServiceInput = ServiceInput.model_construct(
+        **service_input.model_dump(include=ServiceInput.model_fields.keys())
     )
 
     # check

services/web/server/src/simcore_service_webserver/products/_model.py

@@ -1,7 +1,7 @@
 import logging
 import re
 import string
-from typing import Any
+from typing import Annotated, Any
 
 from models_library.basic_regex import (
     PUBLIC_VARIABLE_NAME_RE,
@@ -11,7 +11,14 @@
 from models_library.emails import LowerCaseEmailStr
 from models_library.products import ProductName
 from models_library.utils.change_case import snake_to_camel
-from pydantic import BaseModel, ConfigDict, Field, PositiveInt, field_validator
+from pydantic import (
+    BaseModel,
+    BeforeValidator,
+    ConfigDict,
+    Field,
+    PositiveInt,
+    field_validator,
+)
 from simcore_postgres_database.models.products import (
     EmailFeedback,
     Forum,
@@ -48,7 +55,9 @@ class Product(BaseModel):
         description="Short display name for SMS",
     )
 
-    host_regex: re.Pattern = Field(..., description="Host regex")
+    host_regex: Annotated[re.Pattern, BeforeValidator(str.strip)] = Field(
+        ..., description="Host regex"
+    )
 
     support_email: LowerCaseEmailStr = Field(
         ...,
@@ -121,23 +130,14 @@ def _validate_name(cls, v):
             raise ValueError(msg)
         return v
 
-    @validator("host_regex", pre=True)
-    @classmethod
-    def _strip_whitespaces(cls, v):
-        if v and isinstance(v, str):
-            # Prevents unintended leading & trailing spaces when added
-            # manually in the database
-            return v.strip()
-        return v
-
     @property
     def twilio_alpha_numeric_sender_id(self) -> str:
         return self.short_name or self.display_name.replace(string.punctuation, "")[:11]
 
     model_config = ConfigDict(
         alias_generator=snake_to_camel,
         populate_by_name=True,
-        str_strip_whitespace = True,
+        str_strip_whitespace=True,
         frozen=True,
         from_attributes=True,
         extra="ignore",

services/web/server/src/simcore_service_webserver/studies_dispatcher/_projects.py

@@ -147,7 +147,7 @@ def _create_project_with_filepicker_and_service(
     viewer_info: ViewerInfo,
 ) -> Project:
     file_picker, file_picker_output_id = _create_file_picker(
-        download_link, output_label=None
+        f"{download_link}", output_label=None
     )
 
     viewer_service = Node(
@@ -346,7 +346,7 @@ async def get_or_create_project_with_file(
     ):
         # nodes
         file_picker, _ = _create_file_picker(
-            file_params.download_link, output_label=file_params.file_name
+            f"{file_params.download_link}", output_label=file_params.file_name
         )
 
         # project