fixup! feat(sdk): upgrade to Pydantic v2

tests/responses/issue.json

@@ -91,7 +91,7 @@
       "$type": "SingleEnumIssueCustomField"
     },
     {
-      "value": 1645110000000,
+      "value": 1688472000000,
       "projectCustomField": {
         "field": {
           "fieldType": {

tests/responses/issues.json

@@ -92,7 +92,7 @@
         "$type": "SingleEnumIssueCustomField"
       },
       {
-        "value": 1645110000000,
+        "value": 1688472000000,
         "projectCustomField": {
           "field": {
             "fieldType": {

tests/responses/sprints.json

@@ -114,7 +114,7 @@
             "$type": "SingleEnumIssueCustomField"
           },
           {
-            "value": 1645110000000,
+            "value": 1688472000000,
             "projectCustomField": {
               "field": {
                 "fieldType": {

tests/test_definitions.py

@@ -29,15 +29,14 @@
     UserGroup,
     UserProjectCustomField,
 )
-from youtrack_sdk.types import TimeZoneDateTime
 
 
 class CustomIssue(BaseModel):
     type: Literal["Issue"] = Field(alias="$type", default="Issue")
     id_readable: Optional[str] = Field(alias="idReadable", default=None)
-    created: Optional[TimeZoneDateTime] = None
-    updated: Optional[TimeZoneDateTime] = None
-    resolved: Optional[TimeZoneDateTime] = None
+    created: Optional[datetime] = None
+    updated: Optional[datetime] = None
+    resolved: Optional[datetime] = None
     comments_count: Optional[int] = Field(alias="commentsCount", default=None)
     custom_fields: Optional[Sequence[IssueCustomFieldType]] = Field(alias="customFields", default=None)
 
@@ -61,13 +60,15 @@ class CustomIssue(BaseModel):
         ring_id="b0fea1e1-ed18-43f6-a99d-40044fb1dfb0",
         login="support",
         email="[email protected]",
+        name=None,
     ),
     updater=User.model_construct(
         type="User",
         id="1-17",
         ring_id="c5d08431-dd52-4cdd-9911-7ec3a18ad117",
         login="max.demo",
         email="[email protected]",
+        name=None,
     ),
     summary="Summary text",
     description="Issue description",
@@ -136,7 +137,7 @@ class CustomIssue(BaseModel):
             id="145-34",
             name="Due Date",
             type="DateIssueCustomField",
-            value=date(2022, 2, 17),
+            value=date(2023, 7, 4),
             project_custom_field=SimpleProjectCustomField.model_construct(
                 field=CustomField.model_construct(
                     type="CustomField",

youtrack_sdk/entities.py

@@ -1,13 +1,11 @@
-from datetime import datetime
+from datetime import UTC, datetime
 from typing import Literal, Optional, Sequence
 
 from pydantic import BaseModel as PydanticBaseModel
 from pydantic import ConfigDict, Field, StrictFloat, StrictInt, StrictStr, field_validator
 from pydantic_core.core_schema import FieldValidationInfo
 
-from .exceptions import StrictIntError
-from .helpers import from_unix_seconds
-from .types import CustomDate, TimeZoneDateTime
+from .types import UnixMidDayDate
 
 
 class BaseModel(PydanticBaseModel):
@@ -170,16 +168,16 @@ def validate_value(cls, value, info: FieldValidationInfo):
                 return value
 
             if not isinstance(value, int):
-                raise StrictIntError
+                raise ValueError("Expects value to be int")
 
-            return from_unix_seconds(value)
+            return datetime.fromtimestamp(value / 1000, UTC)
 
         return value
 
 
 class DateIssueCustomField(SimpleIssueCustomField):
     type: Literal["DateIssueCustomField"] = Field(alias="$type", default="DateIssueCustomField")
-    value: Optional[CustomDate]
+    value: Optional[UnixMidDayDate]
 
 
 class PeriodIssueCustomField(IssueCustomField):
@@ -290,9 +288,9 @@ class Issue(BaseModel):
     type: Literal["Issue"] = Field(alias="$type", default="Issue")
     id: Optional[str] = None
     id_readable: Optional[str] = Field(alias="idReadable", default=None)
-    created: Optional[TimeZoneDateTime] = None
-    updated: Optional[TimeZoneDateTime] = None
-    resolved: Optional[TimeZoneDateTime] = None
+    created: Optional[datetime] = None
+    updated: Optional[datetime] = None
+    resolved: Optional[datetime] = None
     project: Optional[Project] = None
     reporter: Optional[User] = None
     updater: Optional[User] = None
@@ -309,8 +307,8 @@ class IssueAttachment(BaseModel):
     id: Optional[str] = None
     name: Optional[str] = None
     author: Optional[User] = None
-    created: Optional[TimeZoneDateTime] = None
-    updated: Optional[TimeZoneDateTime] = None
+    created: Optional[datetime] = None
+    updated: Optional[datetime] = None
     mime_type: Optional[str] = Field(alias="mimeType", default=None)
     url: Optional[str] = None
 
@@ -320,8 +318,8 @@ class IssueComment(BaseModel):
     id: Optional[str] = None
     text: Optional[str] = None
     text_preview: Optional[str] = Field(alias="textPreview", default=None)
-    created: Optional[TimeZoneDateTime] = None
-    updated: Optional[TimeZoneDateTime] = None
+    created: Optional[datetime] = None
+    updated: Optional[datetime] = None
     author: Optional[User] = None
     attachments: Optional[Sequence[IssueAttachment]] = None
     deleted: Optional[bool] = None
@@ -372,8 +370,8 @@ class Agile(AgileRef):
 class Sprint(SprintRef):
     agile: Optional[AgileRef] = None
     goal: Optional[str] = None
-    start: Optional[TimeZoneDateTime] = None
-    finish: Optional[TimeZoneDateTime] = None
+    start: Optional[datetime] = None
+    finish: Optional[datetime] = None
     archived: Optional[bool] = None
     is_default: Optional[bool] = Field(alias="isDefault", default=None)
     issues: Optional[Sequence[Issue]] = None

youtrack_sdk/exceptions.py

@@ -1,6 +1,3 @@
-from pydantic.errors import PydanticUserError
-
-
 class YouTrackException(Exception):
     pass
 
@@ -11,17 +8,3 @@ class YouTrackNotFound(YouTrackException):
 
 class YouTrackUnauthorized(YouTrackException):
     pass
-
-
-class StrictIntError(PydanticUserError):
-    message = "value is not a valid integer"
-
-    def __init__(self) -> None:
-        super().__init__(self.message, code=None)
-
-
-class IncompatibleFieldTypeError(PydanticUserError):
-    message = "incompatible field type"
-
-    def __init__(self) -> None:
-        super().__init__(self.message, code=None)

youtrack_sdk/helpers.py

@@ -1,6 +1,6 @@
 import json
 from copy import deepcopy
-from datetime import UTC, date, datetime, time, timedelta
+from datetime import UTC, date, datetime, time
 from itertools import starmap
 from typing import Any, Optional, Type, Union, get_args
 
@@ -114,23 +114,3 @@ def custom_json_dumps(obj: Any) -> str:
 
 def obj_to_json(obj: Optional[BaseModel]) -> str:
     return custom_json_dumps(obj_to_dict(obj))
-
-
-def from_unix_seconds(seconds: Union[int, float]) -> datetime:
-    EPOCH = datetime(1970, 1, 1)
-    # if greater than this, the number is in ms, if less than or equal it's in seconds
-    # (in seconds this is 11th October 2603, in ms it's 20th August 1970)
-    MS_WATERSHED = int(2e10)
-    # slightly more than datetime.max in ns - (datetime.max - EPOCH).total_seconds() * 1e9
-    MAX_NUMBER = int(3e20)
-
-    if seconds > MAX_NUMBER:
-        return datetime.max
-    elif seconds < -MAX_NUMBER:
-        return datetime.min
-
-    while abs(seconds) > MS_WATERSHED:
-        seconds /= 1000
-    dt = EPOCH + timedelta(seconds=seconds)
-
-    return dt.replace(tzinfo=UTC)

youtrack_sdk/types.py

@@ -1,64 +1,15 @@
-from datetime import UTC, date, datetime
+from datetime import UTC, date, datetime, timedelta
 from enum import StrEnum
-from typing import Any
+from typing import Annotated
 
-from pydantic._internal import _annotated_handlers
-from pydantic_core import core_schema
+from pydantic import BeforeValidator
 
-from .exceptions import StrictIntError
-from .helpers import from_unix_seconds
-
-
-class CustomDate:
-    """A custom date implementation that does not raise Pydantic's `date_from_datetime_inexact`.
-    For further information visit https://errors.pydantic.dev/2.0.1/v/date_from_datetime_inexact"""
-
-    @staticmethod
-    def _validate(value: Any, _: core_schema.ValidationInfo) -> date:
-        if isinstance(value, date):
-            return value
-
-        if not isinstance(value, int):
-            raise StrictIntError
-
-        return from_unix_seconds(value).date()
-
-    @classmethod
-    def __get_pydantic_core_schema__(
-        cls,
-        _: type[Any],
-        __: _annotated_handlers.GetCoreSchemaHandler,
-    ) -> core_schema.CoreSchema:
-        return core_schema.general_before_validator_function(
-            function=cls._validate,
-            schema=core_schema.date_schema(),
-        )
-
-    def __repr__(self) -> str:
-        return "CustomDate"
-
-
-DEFAULT_TIME_ZONE = UTC
-
-
-class TimeZoneDateTime(datetime):
-    """A custom datetime implementation that returns datetime with tzinfo."""
-
-    @staticmethod
-    def _validate(
-        v: str,
-        validator: core_schema.ValidatorFunctionWrapHandler,
-        _: core_schema.ValidationInfo,
-    ) -> datetime:
-        return validator(input_value=v).replace(tzinfo=DEFAULT_TIME_ZONE)
-
-    @classmethod
-    def __get_pydantic_core_schema__(
-        cls,
-        _: type[Any],
-        __: _annotated_handlers.GetCoreSchemaHandler,
-    ) -> core_schema.CoreSchema:
-        return core_schema.general_wrap_validator_function(cls._validate, core_schema.datetime_schema())
+UnixMidDayDate = Annotated[
+    date,
+    BeforeValidator(
+        lambda d: (datetime.fromtimestamp(d / 1000, UTC) - timedelta(hours=12)) if isinstance(d, int) else d,
+    ),
+]
 
 
 class IssueLinkDirection(StrEnum):