Fix json_encoders warning

Signed-off-by: Madhav Kandukuri <[email protected]>

Author: madhav165

mcpgateway/schemas.py

@@ -42,7 +42,8 @@
     model_validator,
     root_validator,
     validator,
-    ConfigDict
+    ConfigDict,
+    field_serializer
 )
 
 logger = logging.getLogger(__name__)
@@ -96,36 +97,11 @@ class BaseModelWithConfigDict(BaseModel):
         from_attributes=True,
         alias_generator=to_camel_case,
         populate_by_name=True,
-        json_encoders={datetime: encode_datetime},
         use_enum_values=True,
         extra="ignore",
         json_schema_extra={"nullable": True},
     )
 
-    # class Config:
-    #     """
-    #     A configuration class that provides default behaviors for how to handle serialization,
-    #     alias generation, enum values, and extra fields when working with models.
-
-    #     Attributes:
-    #         from_attributes (bool): Flag to indicate if attributes should be taken from model fields.
-    #         alias_generator (callable): Function used to generate aliases for field names (e.g., converting to camelCase).
-    #         populate_by_name (bool): Flag to specify whether to populate fields by name during initialization.
-    #         json_encoders (dict): Custom JSON encoders for specific types, such as datetime encoding.
-    #         use_enum_values (bool): Flag to determine if enum values should be serialized or the enum type itself.
-    #         extra (str): Defines behavior for extra fields in models. The "ignore" option means extra fields are ignored.
-    #         json_schema_extra (dict): Additional schema information, e.g., specifying that fields can be nullable.
-
-    #     """
-
-    #     from_attributes = True
-    #     alias_generator = to_camel_case
-    #     populate_by_name = True
-    #     json_encoders = {datetime: encode_datetime}
-    #     use_enum_values = True
-    #     extra = "ignore"
-    #     json_schema_extra = {"nullable": True}
-
     def to_dict(self, use_alias: bool = False) -> Dict[str, Any]:
         """
         Converts the model instance into a dictionary representation.
@@ -548,6 +524,11 @@ class ResourceNotification(BaseModelWithConfigDict):
     content: ResourceContent
     timestamp: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
 
+    @field_serializer("timestamp")
+    def serialize_timestamp(self, dt: datetime) -> str:
+        # now returns ISO string with Z
+        return dt.astimezone(timezone.utc).isoformat().replace("+00:00", "Z")
+
 
 # --- Prompt Schemas ---
 
@@ -1027,6 +1008,11 @@ class EventMessage(BaseModelWithConfigDict):
     data: Dict[str, Any] = Field(..., description="Event payload")
     timestamp: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
 
+    @field_serializer("timestamp")
+    def serialize_timestamp(self, dt: datetime) -> str:
+        # now returns ISO string with Z
+        return dt.astimezone(timezone.utc).isoformat().replace("+00:00", "Z")
+
 
 class AdminToolCreate(BaseModelWithConfigDict):
     """Schema for creating tools via admin UI.

mcpgateway/types.py

@@ -260,20 +260,8 @@ class InitializeRequest(BaseModel):
 
     model_config = ConfigDict(
         populate_by_name=True,
-        allow_population_by_field_name=True,
     )
 
-    # class Config:
-    #     """Configuration for InitializeRequest.
-
-    #     Attributes:
-    #         populate_by_name (bool): Enables population by field name.
-    #         allow_population_by_field_name (bool): Allows backward compatibility with older Pydantic versions.
-    #     """
-
-    #     populate_by_name = True
-    #     allow_population_by_field_name = True  # Use this for backward compatibility with older Pydantic versions
-
 
 class InitializeResult(BaseModel):
     """Server's response to the initialization request.
@@ -292,20 +280,8 @@ class InitializeResult(BaseModel):
 
     model_config = ConfigDict(
         populate_by_name=True,
-        allow_population_by_field_name=True,
     )
 
-    # class Config:
-    #     """
-    #     Configuration class for Pydantic models.
-
-    #     Enables population of model fields by name and by field name.
-    #     """
-
-    #     populate_by_name = True
-    #     allow_population_by_field_name = True
-
-
 # Message types
 class Message(BaseModel):
     """A message in a conversation.
@@ -486,16 +462,8 @@ class ListResourceTemplatesResult(BaseModel):
 
     model_config = ConfigDict(
         populate_by_name=True,
-        allow_population_by_field_name=True,
     )
 
-    # class Config:
-    #     """Configuration for model serialization."""
-
-    #     populate_by_name = True
-    #     allow_population_by_field_name = True
-
-
 # Root types
 class FileUrl(AnyUrl):
     """A specialized URL type for local file-scheme resources.