nucliadb-models 6.4.0.post4200__py3-none-any.whl → 6.4.0.post4210__py3-none-any.whl

nucliadb_models/filters.py

@@ -22,7 +22,7 @@ from enum import Enum
 from typing import Any, Generic, Literal, Optional, TypeVar, Union
 
 import pydantic
-from pydantic import BaseModel, Discriminator, Tag, model_validator
+from pydantic import AliasChoices, BaseModel, Discriminator, Tag, model_validator
 from typing_extensions import Annotated, Self
 
 from .common import FieldTypeName, Paragraph
@@ -35,7 +35,9 @@ F = TypeVar("F", bound=BaseModel)
 class And(BaseModel, Generic[F], extra="forbid"):
     """AND of other expressions"""
 
-    operands: list[F] = pydantic.Field(alias="and", min_length=1)
+    operands: list[F] = pydantic.Field(
+        serialization_alias="and", validation_alias=AliasChoices("operands", "and"), min_length=1
+    )
 
     @pydantic.model_serializer
     def serialize_boolean(self) -> dict[str, Any]:
@@ -45,7 +47,9 @@ class And(BaseModel, Generic[F], extra="forbid"):
 class Or(BaseModel, Generic[F], extra="forbid"):
     """OR of other expressions"""
 
-    operands: list[F] = pydantic.Field(alias="or", min_length=1)
+    operands: list[F] = pydantic.Field(
+        serialization_alias="or", validation_alias=AliasChoices("operands", "or"), min_length=1
+    )
 
     @pydantic.model_serializer
     def serialize_boolean(self) -> dict[str, Any]:
@@ -55,7 +59,9 @@ class Or(BaseModel, Generic[F], extra="forbid"):
 class Not(BaseModel, Generic[F], extra="forbid"):
     """NOT another expression"""
 
-    operand: F = pydantic.Field(alias="not")
+    operand: F = pydantic.Field(
+        serialization_alias="not", validation_alias=AliasChoices("operand", "not")
+    )
 
     @pydantic.model_serializer
     def serialize_boolean(self) -> dict[str, Any]:
@@ -65,7 +71,7 @@ class Not(BaseModel, Generic[F], extra="forbid"):
 class Resource(BaseModel, extra="forbid"):
     """Matches all fields of a resource given its id or slug"""
 
-    prop: Literal["resource"]
+    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")
 
@@ -81,7 +87,7 @@ class Resource(BaseModel, extra="forbid"):
 class Field(BaseModel, extra="forbid"):
     """Matches a field or set of fields"""
 
-    prop: Literal["field"]
+    prop: Literal["field"] = "field"
     type: FieldTypeName = pydantic.Field(description="Type of the field to match, ")
     name: Optional[str] = pydantic.Field(
         default=None,
@@ -92,14 +98,14 @@ class Field(BaseModel, extra="forbid"):
 class Keyword(BaseModel, extra="forbid"):
     """Matches all fields that contain a keyword"""
 
-    prop: Literal["keyword"]
+    prop: Literal["keyword"] = "keyword"
     word: str = pydantic.Field(description="Keyword to find")
 
 
 class DateCreated(BaseModel, extra="forbid"):
     """Matches all fields created in a date range"""
 
-    prop: Literal["created"]
+    prop: Literal["created"] = "created"
     since: Optional[DateTime] = pydantic.Field(
         default=None, description="Start of the date range. Leave blank for unbounded"
     )
@@ -117,7 +123,7 @@ class DateCreated(BaseModel, extra="forbid"):
 class DateModified(BaseModel, extra="forbid"):
     """Matches all fields modified in a date range"""
 
-    prop: Literal["modified"]
+    prop: Literal["modified"] = "modified"
     since: Optional[DateTime] = pydantic.Field(
         default=None, description="Start of the date range. Leave blank for unbounded"
     )
@@ -135,7 +141,7 @@ class DateModified(BaseModel, extra="forbid"):
 class Label(BaseModel, extra="forbid"):
     """Matches fields/paragraphs with a label (or labelset)"""
 
-    prop: Literal["label"]
+    prop: Literal["label"] = "label"
     labelset: str = pydantic.Field(description="The labelset to match")
     label: Optional[str] = pydantic.Field(
         default=None,
@@ -149,7 +155,7 @@ class ResourceMimetype(BaseModel, extra="forbid"):
     The mimetype of a resource can be assigned independently of the mimetype of its fields.
     In resources with multiple fields, you may prefer to use `field_mimetype`"""
 
-    prop: Literal["resource_mimetype"]
+    prop: Literal["resource_mimetype"] = "resource_mimetype"
     type: str = pydantic.Field(
         description="Type of the mimetype to match. e.g: In image/jpeg, type is image"
     )
@@ -165,7 +171,7 @@ class ResourceMimetype(BaseModel, extra="forbid"):
 class FieldMimetype(BaseModel, extra="forbid"):
     """Matches fields with a mimetype"""
 
-    prop: Literal["field_mimetype"]
+    prop: Literal["field_mimetype"] = "field_mimetype"
     type: str = pydantic.Field(
         description="Type of the mimetype to match. e.g: In image/jpeg, type is image"
     )
@@ -181,7 +187,7 @@ class FieldMimetype(BaseModel, extra="forbid"):
 class Entity(BaseModel, extra="forbid"):
     """Matches fields that contains a detected entity"""
 
-    prop: Literal["entity"]
+    prop: Literal["entity"] = "entity"
     subtype: str = pydantic.Field(description="Type of the entity. e.g: PERSON")
     value: Optional[str] = pydantic.Field(
         default=None,
@@ -192,7 +198,7 @@ class Entity(BaseModel, extra="forbid"):
 class Language(BaseModel, extra="forbid"):
     """Matches the language of the field"""
 
-    prop: Literal["language"]
+    prop: Literal["language"] = "language"
     only_primary: bool = pydantic.Field(
         default=False,
         description="Match only the primary language of the document. By default, matches any language that appears in the document",
@@ -203,14 +209,14 @@ class Language(BaseModel, extra="forbid"):
 class OriginTag(BaseModel, extra="forbid"):
     """Matches all fields with a given origin tag"""
 
-    prop: Literal["origin_tag"]
+    prop: Literal["origin_tag"] = "origin_tag"
     tag: str = pydantic.Field(description="The tag to match")
 
 
 class OriginMetadata(BaseModel, extra="forbid"):
     """Matches metadata from the origin"""
 
-    prop: Literal["origin_metadata"]
+    prop: Literal["origin_metadata"] = "origin_metadata"
     field: str = pydantic.Field(description="Metadata field")
     value: Optional[str] = pydantic.Field(
         default=None,
@@ -221,7 +227,7 @@ class OriginMetadata(BaseModel, extra="forbid"):
 class OriginPath(BaseModel, extra="forbid"):
     """Matches the origin path"""
 
-    prop: Literal["origin_path"]
+    prop: Literal["origin_path"] = "origin_path"
     prefix: Optional[str] = pydantic.Field(
         default=None,
         description=(
@@ -234,21 +240,21 @@ class OriginPath(BaseModel, extra="forbid"):
 class OriginSource(BaseModel, extra="forbid"):
     """Matches the origin source id"""
 
-    prop: Literal["origin_source"]
+    prop: Literal["origin_source"] = "origin_source"
     id: Optional[str] = pydantic.Field(default=None, description=("Source ID"))
 
 
 class OriginCollaborator(BaseModel, extra="forbid"):
     """Matches the origin collaborators"""
 
-    prop: Literal["origin_collaborator"]
+    prop: Literal["origin_collaborator"] = "origin_collaborator"
     collaborator: str = pydantic.Field(description=("Collaborator"))
 
 
 class Generated(BaseModel, extra="forbid"):
     """Matches if the field was generated by the given source"""
 
-    prop: Literal["generated"]
+    prop: Literal["generated"] = "generated"
     by: Literal["data-augmentation"] = pydantic.Field(
         description="Generator for this field. Currently, only data-augmentation is supported"
     )
@@ -260,14 +266,14 @@ class Generated(BaseModel, extra="forbid"):
 class Kind(BaseModel, extra="forbid"):
     """Matches paragraphs of a certain kind"""
 
-    prop: Literal["kind"]
+    prop: Literal["kind"] = "kind"
     kind: Paragraph.TypeParagraph = pydantic.Field(description="The kind of paragraph to match")
 
 
 class Status(BaseModel, extra="forbid"):
     """Matches resource in a certain processing status"""
 
-    prop: Literal["status"]
+    prop: Literal["status"] = "status"
     status: ResourceProcessingStatus = pydantic.Field(description="The status of the resource")
 
 

nucliadb_models/graph/requests.py

@@ -63,19 +63,19 @@ class GraphRelation(BaseModel, extra="forbid"):
 
 
 class AnyNode(GraphNode):
-    prop: Literal["node"]
+    prop: Literal["node"] = "node"
 
 
 class SourceNode(GraphNode):
-    prop: Literal["source_node"]
+    prop: Literal["source_node"] = "source_node"
 
 
 class DestinationNode(GraphNode):
-    prop: Literal["destination_node"]
+    prop: Literal["destination_node"] = "destination_node"
 
 
 class Relation(GraphRelation):
-    prop: Literal["relation"]
+    prop: Literal["relation"] = "relation"
 
 
 class GraphPath(BaseModel, extra="forbid"):
@@ -95,7 +95,7 @@ class Generator(str, Enum):
 class Generated(BaseModel, extra="forbid"):
     """Matches if the relation was generated by the given source"""
 
-    prop: Literal["generated"]
+    prop: Literal["generated"] = "generated"
     by: Generator = Field(description="Generator for this field.")
     da_task: Optional["str"] = Field(
         default=None, description="Matches relations generated by an specific DA task, given its prefix"

{nucliadb_models-6.4.0.post4200.dist-info → nucliadb_models-6.4.0.post4210.dist-info}/METADATA

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

{nucliadb_models-6.4.0.post4200.dist-info → nucliadb_models-6.4.0.post4210.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=WwQbbH-HM_-sPji0xbZjOxgPJ0iEWzVAh7Y3rxrFxbk,13674
+nucliadb_models/filters.py,sha256=fVbQLwzidnugeYBSAvc_NN32UwcGg44y2DMsuBFnvoM,14182
 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
@@ -27,12 +27,12 @@ nucliadb_models/vectorsets.py,sha256=avxwO9JPX2k5sCniuNhh2MSsP7aRNvf1eB1-h3-Ju1o
 nucliadb_models/writer.py,sha256=OLtCGmicpVf56pXi2_myTAvStpnaBKKOVNtZzHkKKtw,8472
 nucliadb_models/agents/ingestion.py,sha256=mV7gV6VpYg4VNpc59K3275TMUJZbUzeUnp3SZzO5uxY,3137
 nucliadb_models/graph/__init__.py,sha256=eu_1UK7GlBQRg5IRUqJkxVMcBxkXeqX4SZL6fuvwjDg,897
-nucliadb_models/graph/requests.py,sha256=w63Put4SvIHE-b0StA4MHqSt2vQkymfMlv5YPycpibA,8311
+nucliadb_models/graph/requests.py,sha256=k77EeuZOPaBrPdbc46le4FxpJSSNG_WNhE3YtL3cncw,8384
 nucliadb_models/graph/responses.py,sha256=3aimAHrd3YW1BXHU_ZXRoidlccRtkCcREkfCNotqgIQ,1651
 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.post4200.dist-info/METADATA,sha256=6HYM_tt-msn5qVEUtJaaEyzr9ix6TZnCc-lk29O5wjI,759
-nucliadb_models-6.4.0.post4200.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-nucliadb_models-6.4.0.post4200.dist-info/top_level.txt,sha256=UrY1I8oeovIRwkXLYplssTrxQdUjhSEFDFbnwaIV3tA,16
-nucliadb_models-6.4.0.post4200.dist-info/RECORD,,
+nucliadb_models-6.4.0.post4210.dist-info/METADATA,sha256=BDmVxJOvkuhM1pl3_L_w4x5sJh9xAzh-TstjiO5K5YQ,759
+nucliadb_models-6.4.0.post4210.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+nucliadb_models-6.4.0.post4210.dist-info/top_level.txt,sha256=UrY1I8oeovIRwkXLYplssTrxQdUjhSEFDFbnwaIV3tA,16
+nucliadb_models-6.4.0.post4210.dist-info/RECORD,,