nucliadb-models 6.4.0.post4224__py3-none-any.whl → 6.4.0.post4241__py3-none-any.whl

nucliadb_models/filters.py

@@ -20,14 +20,15 @@
 
 from enum import Enum
 from typing import Any, Generic, Literal, Optional, TypeVar, Union
+from uuid import UUID
 
 import pydantic
-from pydantic import AliasChoices, BaseModel, Discriminator, Tag, model_validator
+from pydantic import AliasChoices, BaseModel, Discriminator, Tag, field_validator, model_validator
 from typing_extensions import Annotated, Self
 
 from .common import FieldTypeName, Paragraph
 from .metadata import ResourceProcessingStatus
-from .utils import DateTime
+from .utils import DateTime, SlugString
 
 F = TypeVar("F", bound=BaseModel)
 
@@ -72,8 +73,19 @@ class Resource(BaseModel, extra="forbid"):
     """Matches all fields of a resource given its id or slug"""
 
     prop: Literal["resource"] = "resource"
-    id: Optional[str] = pydantic.Field(default=None, description="ID of the resource to match")
-    slug: Optional[str] = pydantic.Field(default=None, description="Slug of the resource to match")
+    id: Optional[str] = pydantic.Field(default=None, description="UUID of the resource to match")
+    slug: Optional[SlugString] = pydantic.Field(
+        default=None, description="Slug of the resource to match"
+    )
+
+    @field_validator("id", mode="after")
+    def validate_id(cls, v: str) -> str:
+        if v is not None:
+            try:
+                UUID(v)
+            except ValueError:
+                raise ValueError("Invalid UUID")
+        return v
 
     @model_validator(mode="after")
     def single_field(self) -> Self:

{nucliadb_models-6.4.0.post4224.dist-info → nucliadb_models-6.4.0.post4241.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nucliadb_models
-Version: 6.4.0.post4224
+Version: 6.4.0.post4241
 Author-email: Nuclia <nucliadb@nuclia.com>
 License: AGPL
 Project-URL: Homepage, https://nuclia.com

{nucliadb_models-6.4.0.post4224.dist-info → nucliadb_models-6.4.0.post4241.dist-info}/RECORD

@@ -8,7 +8,7 @@ nucliadb_models/export_import.py,sha256=A1KTjwQCRtyVAWcgabXsdltI78rauXBmZX1ie6Rx
 nucliadb_models/external_index_providers.py,sha256=aVyj-P4kVqfqPjF13E_lUM0FZsq8-DTbIsh-kHOgt2s,1787
 nucliadb_models/extracted.py,sha256=CBeC0hUphXq1T79K7Cpohuyg7f1pqTB4WGErb0HGgRs,6497
 nucliadb_models/file.py,sha256=FKnaYUZPjxCEDUpbyDTudnHHKeSuQLfBnRR2FL6tL2s,1992
-nucliadb_models/filters.py,sha256=fVbQLwzidnugeYBSAvc_NN32UwcGg44y2DMsuBFnvoM,14182
+nucliadb_models/filters.py,sha256=xWSs5vHowbEHLfGGh8BTKBCZmFMY_rx6T0FR8Do2iPE,14503
 nucliadb_models/labels.py,sha256=OUlX-apmFkibEN9bWThRJlbCD84hzJdddN1YYUV2Y3w,4201
 nucliadb_models/link.py,sha256=x6YainEQ9gx6X1KF8oelA-RTaqjOesoWJNYENihDfgo,2262
 nucliadb_models/metadata.py,sha256=ppwU__5IWHvBNDUT5EGLZxgpSBTwuA-rEpY-8Ef-Lwo,8600
@@ -32,7 +32,7 @@ nucliadb_models/graph/responses.py,sha256=3aimAHrd3YW1BXHU_ZXRoidlccRtkCcREkfCNo
 nucliadb_models/internal/__init__.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn4bIXMa20ks,835
 nucliadb_models/internal/predict.py,sha256=5rgUPrH_98gerySOZ-TR2PX_qzCGF1_8VxyOu3bGhis,2281
 nucliadb_models/internal/shards.py,sha256=bcnkxF_zViHZfT6WTAMBcWgY3UV-OAV65cVdSqGkcHY,1943
-nucliadb_models-6.4.0.post4224.dist-info/METADATA,sha256=ATmZ4KIBCCE1eY0jszEzC1_gygUIb73-mGShmHNvLG8,759
-nucliadb_models-6.4.0.post4224.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-nucliadb_models-6.4.0.post4224.dist-info/top_level.txt,sha256=UrY1I8oeovIRwkXLYplssTrxQdUjhSEFDFbnwaIV3tA,16
-nucliadb_models-6.4.0.post4224.dist-info/RECORD,,
+nucliadb_models-6.4.0.post4241.dist-info/METADATA,sha256=72uIhNFBCdc1xaVdLPlYzcI-u0ols5EzCl__2to7MFQ,759
+nucliadb_models-6.4.0.post4241.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+nucliadb_models-6.4.0.post4241.dist-info/top_level.txt,sha256=UrY1I8oeovIRwkXLYplssTrxQdUjhSEFDFbnwaIV3tA,16
+nucliadb_models-6.4.0.post4241.dist-info/RECORD,,