Merge pull request #186 from mailersend/bugfix/issue-185/pydantic-attribute-error

fix: Fixed Pydantic validation issues

Author: igorhrcek

mailersend/builders/activity.py

@@ -85,7 +85,7 @@ def _convert_to_timestamp(self, value: Union[datetime, int]) -> int:
     def build_list_request(self) -> ActivityRequest:
         """Build the ActivityRequest object for listing activities."""
         return self.build()
-    
+
     def build(self) -> ActivityRequest:
         """Build the ActivityRequest object."""
         # Convert dates to timestamps if needed
@@ -158,7 +158,7 @@ def reset(self) -> "SingleActivityBuilder":
     def build_get_request(self) -> SingleActivityRequest:
         """Build the SingleActivityRequest object for getting a single activity."""
         return self.build()
-    
+
     def build(self) -> SingleActivityRequest:
         """
         Build the SingleActivityRequest object.

mailersend/builders/email.py

@@ -7,10 +7,9 @@
 """
 
 import base64
-import mimetypes
 from datetime import datetime, timezone
 from pathlib import Path
-from typing import List, Dict, Any, Optional, Union, IO
+from typing import List, Dict, Any, Optional, Union
 
 from ..models.email import (
     EmailRequest,
@@ -130,7 +129,9 @@ def to_many(self, recipients: List[Dict[str, str]]) -> "EmailBuilder":
             )
         return self
 
-    def cc(self, email: Union[str, List[Dict[str, str]]], name: Optional[str] = None) -> "EmailBuilder":
+    def cc(
+        self, email: Union[str, List[Dict[str, str]]], name: Optional[str] = None
+    ) -> "EmailBuilder":
         """
         Add recipient(s) to the CC field.
 
@@ -162,7 +163,9 @@ def cc(self, email: Union[str, List[Dict[str, str]]], name: Optional[str] = None
             raise ValidationError("Email must be a string or list of recipient objects")
         return self
 
-    def bcc(self, email: Union[str, List[Dict[str, str]]], name: Optional[str] = None) -> "EmailBuilder":
+    def bcc(
+        self, email: Union[str, List[Dict[str, str]]], name: Optional[str] = None
+    ) -> "EmailBuilder":
         """
         Add recipient(s) to the BCC field.
 

mailersend/models/__init__.py

@@ -1,6 +1,7 @@
 """
 Data models used for communicating with the MailerSend API.
 """
+
 from .base import BaseModel
 from .email import (
     EmailContact,

mailersend/models/activity.py

@@ -1,7 +1,9 @@
-from typing import List, Optional, Any, Dict
-from pydantic import BaseModel, Field, EmailStr, ConfigDict
+"""Activity models."""
 
-from .base import BaseModel as BaseMailerSendModel
+from typing import List, Optional, Any
+from pydantic import Field, EmailStr, ConfigDict
+
+from .base import BaseModel
 
 
 class ActivityRecipient(BaseModel):

mailersend/models/analytics.py

@@ -1,10 +1,12 @@
+"""Analytics models."""
+
 from typing import List, Optional, Literal
 from pydantic import Field, field_validator, model_validator
 
-from .base import BaseModel as MailerSendBaseModel
+from .base import BaseModel
 
 
-class AnalyticsRequest(MailerSendBaseModel):
+class AnalyticsRequest(BaseModel):
     """
     Request model for Analytics API endpoints.
 
@@ -44,27 +46,30 @@ class AnalyticsRequest(MailerSendBaseModel):
     ] = Field(None, alias="event[]")
 
     @field_validator("date_from", "date_to")
+    @classmethod
     def validate_timestamps(cls, v):
         """Validate that timestamps are positive integers."""
         if v <= 0:
             raise ValueError("Timestamp must be a positive integer")
         return v
 
     @model_validator(mode="after")
-    def validate_date_range(cls, v):
+    def validate_date_range(self):
         """Validate that date_from is before date_to."""
-        if v.date_from >= v.date_to:
+        if self.date_from >= self.date_to:
             raise ValueError("date_from must be lower than date_to")
-        return v
+        return self
 
     @field_validator("recipient_id")
+    @classmethod
     def validate_recipient_count(cls, v):
         """Validate recipient count limit."""
         if v and len(v) > 50:
             raise ValueError("Maximum 50 recipients are allowed")
         return v
 
     @field_validator("tags")
+    @classmethod
     def validate_tags(cls, v):
         """Validate tags format."""
         if v:

mailersend/models/base.py

@@ -1,4 +1,6 @@
-from typing import List, Dict, Any, Generic, TypeVar, Optional, Union
+"""Base models."""
+
+from typing import List, Dict, Any, Generic, TypeVar, Optional
 from pydantic import BaseModel as PydanticBaseModel, ConfigDict
 import json
 

mailersend/models/domains.py

@@ -1,10 +1,12 @@
+"""Domains models."""
+
 from typing import Optional
 from pydantic import Field, field_validator
 
-from .base import BaseModel as MailerSendBaseModel
+from .base import BaseModel
 
 
-class DomainListQueryParams(MailerSendBaseModel):
+class DomainListQueryParams(BaseModel):
     """Model for domain list query parameters with validation."""
 
     page: Optional[int] = Field(default=1, ge=1)
@@ -14,15 +16,15 @@ class DomainListQueryParams(MailerSendBaseModel):
     def to_query_params(self) -> dict:
         """Convert to query parameters for API request."""
         params = {"page": self.page, "limit": self.limit}
-        
+
         # Convert boolean to lowercase string for API compatibility
         if self.verified is not None:
             params["verified"] = str(self.verified).lower()
 
         return {k: v for k, v in params.items() if v is not None}
 
 
-class DomainListRequest(MailerSendBaseModel):
+class DomainListRequest(BaseModel):
     """Request model for listing domains."""
 
     query_params: DomainListQueryParams
@@ -32,7 +34,7 @@ def to_query_params(self) -> dict:
         return self.query_params.to_query_params()
 
 
-class DomainRecipientsQueryParams(MailerSendBaseModel):
+class DomainRecipientsQueryParams(BaseModel):
     """Model for domain recipients query parameters with validation."""
 
     page: Optional[int] = Field(default=1, ge=1)
@@ -45,7 +47,7 @@ def to_query_params(self) -> dict:
         return {k: v for k, v in params.items() if v is not None}
 
 
-class DomainRecipientsRequest(MailerSendBaseModel):
+class DomainRecipientsRequest(BaseModel):
     """Request model for getting domain recipients."""
 
     domain_id: str  # Path parameter
@@ -63,7 +65,7 @@ def to_query_params(self) -> dict:
         return self.query_params.to_query_params()
 
 
-class DomainCreateRequest(MailerSendBaseModel):
+class DomainCreateRequest(BaseModel):
     """Request model for creating a new domain."""
 
     name: str
@@ -100,7 +102,7 @@ def validate_subdomains(cls, v):
         return v
 
 
-class DomainDeleteRequest(MailerSendBaseModel):
+class DomainDeleteRequest(BaseModel):
     """Request model for deleting a domain."""
 
     domain_id: str
@@ -113,7 +115,7 @@ def validate_domain_id(cls, v):
         return v.strip()
 
 
-class DomainGetRequest(MailerSendBaseModel):
+class DomainGetRequest(BaseModel):
     """Request model for getting a single domain."""
 
     domain_id: str
@@ -126,7 +128,7 @@ def validate_domain_id(cls, v):
         return v.strip()
 
 
-class DomainSettings(MailerSendBaseModel):
+class DomainSettings(BaseModel):
     """Model for domain settings."""
 
     send_paused: bool = False
@@ -149,7 +151,7 @@ class DomainSettings(MailerSendBaseModel):
     ignore_duplicated_recipients: bool = False
 
 
-class DomainUpdateSettingsRequest(MailerSendBaseModel):
+class DomainUpdateSettingsRequest(BaseModel):
     """Request model for updating domain settings."""
 
     domain_id: str
@@ -180,7 +182,7 @@ def validate_custom_tracking_subdomain(cls, v):
         return v
 
 
-class DomainDnsRecordsRequest(MailerSendBaseModel):
+class DomainDnsRecordsRequest(BaseModel):
     """Request model for getting domain DNS records."""
 
     domain_id: str
@@ -193,7 +195,7 @@ def validate_domain_id(cls, v):
         return v.strip()
 
 
-class DomainVerificationRequest(MailerSendBaseModel):
+class DomainVerificationRequest(BaseModel):
     """Request model for getting domain verification status."""
 
     domain_id: str

mailersend/models/email.py

@@ -1,13 +1,14 @@
-from typing_extensions import Self
+"""Email models."""
+
 from typing import List, Dict, Optional, Any
 from pydantic import (
-    BaseModel,
     Field,
     EmailStr,
     ConfigDict,
     field_validator,
     model_validator,
 )
+from .base import BaseModel
 import time
 
 
@@ -74,12 +75,12 @@ class EmailRequest(BaseModel):
     model_config = ConfigDict(validate_by_name=True)
 
     @model_validator(mode="after")
-    def validate_from_email(cls, v):
-        if v.from_email is None and v.template_id is None:
+    def validate_from_email(self):
+        if self.from_email is None and self.template_id is None:
             raise ValueError(
                 "At least one of 'from_email' or 'template_id' is required"
             )
-        return v
+        return self
 
     @field_validator("subject")
     def validate_subject_length(cls, v):
@@ -88,12 +89,12 @@ def validate_subject_length(cls, v):
         return v
 
     @model_validator(mode="after")
-    def validate_content_exists(cls, v):
-        if v.html is None and v.text is None and v.template_id is None:
+    def validate_content_exists(self):
+        if self.html is None and self.text is None and self.template_id is None:
             raise ValueError(
                 "At least one of 'text', 'html' or 'template_id' must be provided"
             )
-        return v
+        return self
 
     @field_validator("tags")
     def validate_tags_count(cls, v):

mailersend/models/email_verification.py

@@ -1,9 +1,9 @@
 """Email Verification API models for MailerSend SDK."""
 
-from datetime import datetime
 from typing import List, Optional, Dict, Any
 
-from pydantic import BaseModel, Field, field_validator
+from pydantic import Field, field_validator
+from .base import BaseModel
 
 
 # Query Parameters Models

mailersend/models/identities.py

@@ -1,3 +1,5 @@
+"""Identities models."""
+
 from typing import Optional, List, Any
 from pydantic import field_validator, Field