code cleanup

Changed files
+10 -17
src
-5
src/atpasser/model/base.py
···
import base64
-
import re
-
from datetime import datetime
from typing import Any
-
from collections.abc import Mapping
from cid.cid import CIDv1, make_cid
from pydantic import BaseModel, field_serializer, field_validator, ConfigDict
-
from pydantic.fields import FieldInfo
from .exceptions import (
-
ValidationError,
SerializationError,
DeserializationError,
InvalidCIDError
+5 -5
src/atpasser/model/blob.py
···
from typing import Any
from pydantic import field_validator, ConfigDict
from .base import DataModel
-
from .exceptions import ValidationError, InvalidBlobError
+
from .exceptions import ValidationError
class BlobModel(DataModel):
"""
···
Validated size
Raises:
-
ValueError: If size is not positive
+
ValidationError: If size is not positive
"""
if v <= 0:
-
raise ValueError("Blob size must be positive and non-zero")
+
raise ValidationError(field="size", message="must be positive and non-zero")
return v
@field_validator("mimeType")
···
Validated MIME type
Raises:
-
ValueError: If MIME type is empty
+
ValidationError: If MIME type is empty
"""
if not v:
-
raise ValueError("MIME type cannot be empty")
+
raise ValidationError(field="mimeType", message="cannot be empty")
return v
+4 -4
src/atpasser/model/converter.py
···
Provides bidirectional conversion between Lexicon JSON schemas and Python data models.
"""
import json
-
from typing import Any, Dict, Type, Union, TypeVar
+
from typing import Any
from pydantic import BaseModel
from .exceptions import ValidationError, SerializationError
from .types.primitive import NullModel, BooleanModel, IntegerModel
···
}
@classmethod
-
def fromLexicon(cls, lexiconJson: Union[str, Dict[str, Any]]) -> BaseModel:
+
def fromLexicon(cls, lexiconJson: str | dict[str, Any]) -> BaseModel:
"""
Convert Lexicon JSON to Python data model instance.
···
raise SerializationError(typeName, f"Failed to create model: {e}")
@classmethod
-
def toLexicon(cls, modelInstance: BaseModel) -> Dict[str, Any]:
+
def toLexicon(cls, modelInstance: BaseModel) -> dict[str, Any]:
"""
Convert Python model instance back to Lexicon JSON format.
···
raise SerializationError("toLexicon", f"Failed to serialize model: {e}")
@classmethod
-
def validateLexicon(cls, lexiconJson: Union[str, Dict[str, Any]]) -> bool:
+
def validateLexicon(cls, lexiconJson: str | dict[str, Any]) -> bool:
"""
Validate Lexicon JSON against schema definitions.
+1 -1
src/atpasser/model/types/complex.py
···
-
from typing import Any, Optional
+
from typing import Any
from pydantic import field_validator
from ..base import DataModel
-2
src/atpasser/model/validation.py
···
from typing import Any
from cid.cid import CIDv1, make_cid
import base64
-
import re
-
from datetime import datetime
def validateAtprotoData(data: Any) -> bool:
"""