[REFACTOR] argilla server: using pydantic v2

argilla-server/src/argilla_server/api/handlers/v1/webhooks.py

@@ -53,7 +53,7 @@ async def create_webhook(
 ):
     await authorize(current_user, WebhookPolicy.create)
 
-    return await webhooks.create_webhook(db, webhook_create.dict())
+    return await webhooks.create_webhook(db, webhook_create.model_dump())
 
 
 @router.patch("/webhooks/{webhook_id}", response_model=WebhookSchema)
@@ -68,7 +68,7 @@ async def update_webhook(
 
     await authorize(current_user, WebhookPolicy.update)
 
-    return await webhooks.update_webhook(db, webhook, webhook_update.dict(exclude_unset=True))
+    return await webhooks.update_webhook(db, webhook, webhook_update.model_dump(exclude_unset=True))
 
 
 @router.delete("/webhooks/{webhook_id}", response_model=WebhookSchema)

argilla-server/src/argilla_server/api/schemas/v1/webhooks.py

@@ -12,13 +12,15 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
+from uuid import UUID
 from datetime import datetime
 from typing import List, Optional
-from uuid import UUID
+
+from pydantic import BaseModel, Field, HttpUrl, ConfigDict, field_validator, field_serializer
 
 from argilla_server.webhooks.v1.enums import WebhookEvent
 from argilla_server.api.schemas.v1.commons import UpdateSchema
-from argilla_server.pydantic_v1 import BaseModel, Field, HttpUrl
+
 
 WEBHOOK_EVENTS_MIN_ITEMS = 1
 WEBHOOK_DESCRIPTION_MIN_LENGTH = 1
@@ -31,12 +33,11 @@
     secret: str
     events: List[WebhookEvent]
     enabled: bool
-    description: Optional[str]
+    description: Optional[str] = None
     inserted_at: datetime
     updated_at: datetime
 
-    class Config:
-        orm_mode = True
+    model_config = ConfigDict(from_attributes=True)
 
 
 class Webhooks(BaseModel):
@@ -45,26 +46,52 @@
 
 class WebhookCreate(BaseModel):
     url: HttpUrl
-    events: List[WebhookEvent] = Field(
-        min_items=WEBHOOK_EVENTS_MIN_ITEMS,
-        unique_items=True,
-    )
+    events: List[WebhookEvent] = Field(min_length=WEBHOOK_EVENTS_MIN_ITEMS)
     description: Optional[str] = Field(
+        None,
         min_length=WEBHOOK_DESCRIPTION_MIN_LENGTH,
         max_length=WEBHOOK_DESCRIPTION_MAX_LENGTH,
     )
 
+    @field_validator("events")
+    @classmethod
+    def events_must_be_unique(cls, events: List[WebhookEvent]):
+        if len(set(events)) != len(events):
+            raise ValueError("Events must be unique")
+
+        return events
+
+    @field_serializer("url")
+    def serialize_url(self, url: HttpUrl):
+        return str(url)
+
 
 class WebhookUpdate(UpdateSchema):
-    url: Optional[HttpUrl]
-    events: Optional[List[WebhookEvent]] = Field(
-        min_items=WEBHOOK_EVENTS_MIN_ITEMS,
-        unique_items=True,
-    )
-    enabled: Optional[bool]
+    url: Optional[HttpUrl] = None
+    events: Optional[List[WebhookEvent]] = Field(None, min_length=WEBHOOK_EVENTS_MIN_ITEMS)
+    enabled: Optional[bool] = None
     description: Optional[str] = Field(
+        None,
         min_length=WEBHOOK_DESCRIPTION_MIN_LENGTH,
         max_length=WEBHOOK_DESCRIPTION_MAX_LENGTH,
     )
 
     __non_nullable_fields__ = {"url", "events", "enabled"}
+
+    @field_validator("events")
+    @classmethod
+    def events_must_be_unique(cls, events: Optional[List[WebhookEvent]]):
+        if events is None:
+            return None
+
+        if len(set(events)) != len(events):
+            raise ValueError("Events must be unique")
+
+        return events
+
+    @field_serializer("url")
+    def serialize_url(self, url: Optional[HttpUrl]):
+        if url is None:
+            return None
+
+        return str(url)

argilla-server/src/argilla_server/contexts/datasets.py

@@ -266,7 +266,7 @@ async def create_metadata_property(
         db,
         name=metadata_property_create.name,
         title=metadata_property_create.title,
-        settings=metadata_property_create.settings.dict(),
+        settings=metadata_property_create.settings.model_dump(),
         allowed_roles=_allowed_roles_for_metadata_property_create(metadata_property_create),
         dataset_id=dataset.id,
     )

argilla-server/src/argilla_server/webhooks/v1/datasets.py

@@ -51,5 +51,5 @@ async def build_dataset_event(db: AsyncSession, dataset_event: DatasetEvent, dat
     return Event(
         event=dataset_event,
         timestamp=datetime.utcnow(),
-        data=DatasetEventSchema.from_orm(dataset).dict(),
+        data=DatasetEventSchema.model_validate(dataset).model_dump(),
     )

argilla-server/src/argilla_server/webhooks/v1/records.py

@@ -51,5 +51,5 @@ async def build_record_event(db: AsyncSession, record_event: RecordEvent, record
     return Event(
         event=record_event,
         timestamp=datetime.utcnow(),
-        data=RecordEventSchema.from_orm(record).dict(),
+        data=RecordEventSchema.model_validate(record).model_dump(),
     )

argilla-server/src/argilla_server/webhooks/v1/responses.py

@@ -56,5 +56,5 @@ async def build_response_event(db: AsyncSession, response_event: ResponseEvent,
     return Event(
         event=response_event,
         timestamp=datetime.utcnow(),
-        data=ResponseEventSchema.from_orm(response).dict(),
+        data=ResponseEventSchema.model_validate(response).model_dump(),
     )

argilla-server/src/argilla_server/webhooks/v1/schemas.py

@@ -16,20 +16,19 @@
 from typing import Optional, List
 from datetime import datetime
 
-from argilla_server.pydantic_v1 import BaseModel, Field
+from pydantic import BaseModel, Field, ConfigDict
 
 
 class UserEventSchema(BaseModel):
     id: UUID
     first_name: str
-    last_name: Optional[str]
+    last_name: Optional[str] = None
     username: str
     role: str
     inserted_at: datetime
     updated_at: datetime
 
-    class Config:
-        orm_mode = True
+    model_config = ConfigDict(from_attributes=True)
 
 
 class WorkspaceEventSchema(BaseModel):
@@ -38,22 +37,20 @@ class WorkspaceEventSchema(BaseModel):
     inserted_at: datetime
     updated_at: datetime
 
-    class Config:
-        orm_mode = True
+    model_config = ConfigDict(from_attributes=True)
 
 
 class DatasetQuestionEventSchema(BaseModel):
     id: UUID
     name: str
     title: str
-    description: Optional[str]
+    description: Optional[str] = None
     required: bool
     settings: dict
     inserted_at: datetime
     updated_at: datetime
 
-    class Config:
-        orm_mode = True
+    model_config = ConfigDict(from_attributes=True)
 
 
 class DatasetFieldEventSchema(BaseModel):
@@ -65,8 +62,7 @@ class DatasetFieldEventSchema(BaseModel):
     inserted_at: datetime
     updated_at: datetime
 
-    class Config:
-        orm_mode = True
+    model_config = ConfigDict(from_attributes=True)
 
 
 class DatasetMetadataPropertyEventSchema(BaseModel):
@@ -78,8 +74,7 @@ class DatasetMetadataPropertyEventSchema(BaseModel):
     inserted_at: datetime
     updated_at: datetime
 
-    class Config:
-        orm_mode = True
+    model_config = ConfigDict(from_attributes=True)
 
 
 class DatasetVectorSettingsEventSchema(BaseModel):
@@ -90,14 +85,13 @@ class DatasetVectorSettingsEventSchema(BaseModel):
     inserted_at: datetime
     updated_at: datetime
 
-    class Config:
-        orm_mode = True
+    model_config = ConfigDict(from_attributes=True)
 
 
 class DatasetEventSchema(BaseModel):
     id: UUID
     name: str
-    guidelines: Optional[str]
+    guidelines: Optional[str] = None
     allow_extra_metadata: bool
     status: str
     distribution: dict
@@ -110,8 +104,7 @@ class DatasetEventSchema(BaseModel):
     inserted_at: datetime
     updated_at: datetime
 
-    class Config:
-        orm_mode = True
+    model_config = ConfigDict(from_attributes=True)
 
 
 class RecordEventSchema(BaseModel):
@@ -121,7 +114,7 @@ class RecordEventSchema(BaseModel):
     # Or find another possible solution.
     fields: dict
     metadata: Optional[dict] = Field(None, alias="metadata_")
-    external_id: Optional[str]
+    external_id: Optional[str] = None
     # TODO:
     # responses:
     # - Create a new `GET /api/v1/records/{record_id}/responses` endpoint.
@@ -142,18 +135,16 @@ class RecordEventSchema(BaseModel):
     inserted_at: datetime
     updated_at: datetime
 
-    class Config:
-        orm_mode = True
+    model_config = ConfigDict(from_attributes=True)
 
 
 class ResponseEventSchema(BaseModel):
     id: UUID
-    values: Optional[dict]
+    values: Optional[dict] = None
     status: str
     record: RecordEventSchema
     user: UserEventSchema
     inserted_at: datetime
     updated_at: datetime
 
-    class Config:
-        orm_mode = True
+    model_config = ConfigDict(from_attributes=True)

argilla-server/tests/unit/api/handlers/v1/webhooks/test_create_webhook.py

@@ -125,10 +125,8 @@ async def test_create_webhook_without_authentication(self, db: AsyncSession, asy
         [
             "",
             "example.com",
-            "http:example.com",
-            "https:example.com",
-            "http://localhost/webhooks",
-            "http://localhost:3000/webhooks",
+            "http.example.com",
+            "https.example.com",
         ],
     )
     async def test_create_webhook_with_invalid_url(

argilla-server/tests/unit/api/handlers/v1/webhooks/test_update_webhook.py

@@ -256,7 +256,7 @@ async def test_update_webhook_without_authentication(self, async_client: AsyncCl
         assert webhook.url != "https://example.com/webhook"
         assert webhook.events != [WebhookEvent.response_updated]
 
-    @pytest.mark.parametrize("invalid_url", ["", "example.com", "http:example.com", "https:example.com"])
+    @pytest.mark.parametrize("invalid_url", ["", "example.com", "http.example.com", "https.example.com"])
     async def test_update_webhook_with_invalid_url(
         self, async_client: AsyncClient, owner_auth_header: dict, invalid_url: str
     ):