nucliadb-models 6.6.1.post4586__py3-none-any.whl → 6.6.1.post4595__py3-none-any.whl

nucliadb_models/filters.py

@@ -37,8 +37,8 @@ class And(BaseModel, Generic[F], extra="forbid"):
     )
 
     @pydantic.model_serializer
-    def serialize_boolean(self) -> dict[str, Any]:
-        return {"and": [op.model_dump() for op in self.operands]}
+    def serialize_boolean(self, info: pydantic.SerializationInfo) -> dict[str, Any]:
+        return {"and": [op.model_dump(exclude_unset=info.exclude_unset) for op in self.operands]}
 
 
 class Or(BaseModel, Generic[F], extra="forbid"):
@@ -49,8 +49,8 @@ class Or(BaseModel, Generic[F], extra="forbid"):
     )
 
     @pydantic.model_serializer
-    def serialize_boolean(self) -> dict[str, Any]:
-        return {"or": [op.model_dump() for op in self.operands]}
+    def serialize_boolean(self, info: pydantic.SerializationInfo) -> dict[str, Any]:
+        return {"or": [op.model_dump(exclude_unset=info.exclude_unset) for op in self.operands]}
 
 
 class Not(BaseModel, Generic[F], extra="forbid"):
@@ -61,11 +61,21 @@ class Not(BaseModel, Generic[F], extra="forbid"):
     )
 
     @pydantic.model_serializer
-    def serialize_boolean(self) -> dict[str, Any]:
-        return {"not": self.operand.model_dump()}
+    def serialize_boolean(self, info: pydantic.SerializationInfo) -> dict[str, Any]:
+        return {"not": self.operand.model_dump(exclude_unset=info.exclude_unset)}
 
 
-class Resource(BaseModel, extra="forbid"):
+class FilterProp(BaseModel):
+    prop: str
+
+    @model_validator(mode="after")
+    def set_discriminator(self) -> Self:
+        # Ensure discriminator is explicitly set so it's always serialized
+        self.prop = self.prop
+        return self
+
+
+class Resource(FilterProp, extra="forbid"):
     """Matches all fields of a resource given its id or slug"""
 
     prop: Literal["resource"] = "resource"
@@ -92,7 +102,7 @@ class Resource(BaseModel, extra="forbid"):
         return self
 
 
-class Field(BaseModel, extra="forbid"):
+class Field(FilterProp, extra="forbid"):
     """Matches a field or set of fields"""
 
     prop: Literal["field"] = "field"
@@ -103,14 +113,14 @@ class Field(BaseModel, extra="forbid"):
     )
 
 
-class Keyword(BaseModel, extra="forbid"):
+class Keyword(FilterProp, extra="forbid"):
     """Matches all fields that contain a keyword"""
 
     prop: Literal["keyword"] = "keyword"
     word: str = pydantic.Field(description="Keyword to find")
 
 
-class DateCreated(BaseModel, extra="forbid"):
+class DateCreated(FilterProp, extra="forbid"):
     """Matches all fields created in a date range"""
 
     prop: Literal["created"] = "created"
@@ -128,7 +138,7 @@ class DateCreated(BaseModel, extra="forbid"):
         return self
 
 
-class DateModified(BaseModel, extra="forbid"):
+class DateModified(FilterProp, extra="forbid"):
     """Matches all fields modified in a date range"""
 
     prop: Literal["modified"] = "modified"
@@ -146,7 +156,7 @@ class DateModified(BaseModel, extra="forbid"):
         return self
 
 
-class Label(BaseModel, extra="forbid"):
+class Label(FilterProp, extra="forbid"):
     """Matches fields/paragraphs with a label (or labelset)"""
 
     prop: Literal["label"] = "label"
@@ -157,7 +167,7 @@ class Label(BaseModel, extra="forbid"):
     )
 
 
-class ResourceMimetype(BaseModel, extra="forbid"):
+class ResourceMimetype(FilterProp, extra="forbid"):
     """Matches resources with a mimetype.
 
     The mimetype of a resource can be assigned independently of the mimetype of its fields.
@@ -176,7 +186,7 @@ class ResourceMimetype(BaseModel, extra="forbid"):
     )
 
 
-class FieldMimetype(BaseModel, extra="forbid"):
+class FieldMimetype(FilterProp, extra="forbid"):
     """Matches fields with a mimetype"""
 
     prop: Literal["field_mimetype"] = "field_mimetype"
@@ -192,7 +202,7 @@ class FieldMimetype(BaseModel, extra="forbid"):
     )
 
 
-class Entity(BaseModel, extra="forbid"):
+class Entity(FilterProp, extra="forbid"):
     """Matches fields that contains a detected entity"""
 
     prop: Literal["entity"] = "entity"
@@ -203,7 +213,7 @@ class Entity(BaseModel, extra="forbid"):
     )
 
 
-class Language(BaseModel, extra="forbid"):
+class Language(FilterProp, extra="forbid"):
     """Matches the language of the field"""
 
     prop: Literal["language"] = "language"
@@ -214,14 +224,14 @@ class Language(BaseModel, extra="forbid"):
     language: str = pydantic.Field(description="The code of the language to match, e.g: en")
 
 
-class OriginTag(BaseModel, extra="forbid"):
+class OriginTag(FilterProp, extra="forbid"):
     """Matches all fields with a given origin tag"""
 
     prop: Literal["origin_tag"] = "origin_tag"
     tag: str = pydantic.Field(description="The tag to match")
 
 
-class OriginMetadata(BaseModel, extra="forbid"):
+class OriginMetadata(FilterProp, extra="forbid"):
     """Matches metadata from the origin"""
 
     prop: Literal["origin_metadata"] = "origin_metadata"
@@ -232,7 +242,7 @@ class OriginMetadata(BaseModel, extra="forbid"):
     )
 
 
-class OriginPath(BaseModel, extra="forbid"):
+class OriginPath(FilterProp, extra="forbid"):
     """Matches the origin path"""
 
     prop: Literal["origin_path"] = "origin_path"
@@ -245,21 +255,21 @@ class OriginPath(BaseModel, extra="forbid"):
     )
 
 
-class OriginSource(BaseModel, extra="forbid"):
+class OriginSource(FilterProp, extra="forbid"):
     """Matches the origin source id"""
 
     prop: Literal["origin_source"] = "origin_source"
     id: Optional[str] = pydantic.Field(default=None, description=("Source ID"))
 
 
-class OriginCollaborator(BaseModel, extra="forbid"):
+class OriginCollaborator(FilterProp, extra="forbid"):
     """Matches the origin collaborators"""
 
     prop: Literal["origin_collaborator"] = "origin_collaborator"
     collaborator: str = pydantic.Field(description=("Collaborator"))
 
 
-class Generated(BaseModel, extra="forbid"):
+class Generated(FilterProp, extra="forbid"):
     """Matches if the field was generated by the given source"""
 
     prop: Literal["generated"] = "generated"
@@ -271,14 +281,14 @@ class Generated(BaseModel, extra="forbid"):
     )
 
 
-class Kind(BaseModel, extra="forbid"):
+class Kind(FilterProp, extra="forbid"):
     """Matches paragraphs of a certain kind"""
 
     prop: Literal["kind"] = "kind"
     kind: Paragraph.TypeParagraph = pydantic.Field(description="The kind of paragraph to match")
 
 
-class Status(BaseModel, extra="forbid"):
+class Status(FilterProp, extra="forbid"):
     """Matches resource in a certain processing status"""
 
     prop: Literal["status"] = "status"

nucliadb_models/graph/requests.py

@@ -25,6 +25,16 @@ from nucliadb_models.security import RequestSecurity
 ## Models for graph nodes and relations
 
 
+class GraphProp(BaseModel):
+    prop: str
+
+    @model_validator(mode="after")
+    def set_discriminator(self) -> Self:
+        # Ensure discriminator is explicitly set so it's always serialized
+        self.prop = self.prop
+        return self
+
+
 class NodeMatchKindName(str, Enum):
     EXACT = "exact"
     FUZZY = "fuzzy"
@@ -57,23 +67,23 @@ class GraphRelation(BaseModel, extra="forbid"):
 ## Models for query expressions
 
 
-class AnyNode(GraphNode):
+class AnyNode(GraphNode, GraphProp):
     prop: Literal["node"] = "node"
 
 
-class SourceNode(GraphNode):
+class SourceNode(GraphNode, GraphProp):
     prop: Literal["source_node"] = "source_node"
 
 
-class DestinationNode(GraphNode):
+class DestinationNode(GraphNode, GraphProp):
     prop: Literal["destination_node"] = "destination_node"
 
 
-class Relation(GraphRelation):
+class Relation(GraphRelation, GraphProp):
     prop: Literal["relation"] = "relation"
 
 
-class GraphPath(BaseModel, extra="forbid"):
+class GraphPath(GraphProp, extra="forbid"):
     prop: Literal["path"] = "path"
     source: Optional[GraphNode] = None
     relation: Optional[GraphRelation] = None
@@ -87,7 +97,7 @@ class Generator(str, Enum):
     USER = "user"
 
 
-class Generated(BaseModel, extra="forbid"):
+class Generated(GraphProp, extra="forbid"):
     """Matches if the relation was generated by the given source"""
 
     prop: Literal["generated"] = "generated"

nucliadb_models/search.py

@@ -355,6 +355,12 @@ class RankFusionName(str, Enum):
 class _BaseRankFusion(BaseModel):
     name: str
 
+    @model_validator(mode="after")
+    def set_discriminator(self) -> Self:
+        # Ensure discriminator is explicitly set so it's always serialized
+        self.name = self.name
+        return self
+
 
 class ReciprocalRankFusionWeights(BaseModel):
     keyword: float = 1.0
@@ -415,6 +421,12 @@ class RerankerName(str, Enum):
 class _BaseReranker(BaseModel):
     name: str
 
+    @model_validator(mode="after")
+    def set_discriminator(self) -> Self:
+        # Ensure discriminator is explicitly set so it's always serialized
+        self.name = self.name
+        return self
+
 
 class PredictReranker(_BaseReranker):
     name: Literal[RerankerName.PREDICT_RERANKER] = RerankerName.PREDICT_RERANKER
@@ -1090,10 +1102,22 @@ class ImageRagStrategyName:
 class RagStrategy(BaseModel):
     name: str
 
+    @model_validator(mode="after")
+    def set_discriminator(self) -> Self:
+        # Ensure discriminator is explicitly set so it's always serialized
+        self.name = self.name
+        return self
+
 
 class ImageRagStrategy(BaseModel):
     name: str
 
+    @model_validator(mode="after")
+    def set_discriminator(self) -> Self:
+        # Ensure discriminator is explicitly set so it's always serialized
+        self.name = self.name
+        return self
+
 
 ALLOWED_FIELD_TYPES: dict[str, str] = {
     "t": "text",
@@ -1697,8 +1721,6 @@ Using this feature also disables the `citations` parameter. For maximal accuracy
                 obj = strategy
             elif isinstance(strategy, BaseModel):
                 obj = strategy.model_dump()
-                # Explicitly mark the name field as set, so it's always included (even with exclude_unset=True)
-                strategy.name = strategy.name
             else:
                 raise ValueError(
                     "RAG strategies must be defined using a valid RagStrategy object or a dictionary"

{nucliadb_models-6.6.1.post4586.dist-info → nucliadb_models-6.6.1.post4595.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nucliadb_models
-Version: 6.6.1.post4586
+Version: 6.6.1.post4595
 Author-email: Nuclia <nucliadb@nuclia.com>
 License-Expression: Apache-2.0
 Project-URL: Homepage, https://nuclia.com

{nucliadb_models-6.6.1.post4586.dist-info → nucliadb_models-6.6.1.post4595.dist-info}/RECORD

@@ -8,7 +8,7 @@ nucliadb_models/export_import.py,sha256=mNm9IArOLnC6TLupkwqVFhxD5d08mpIVOVFneECv
 nucliadb_models/external_index_providers.py,sha256=IIKjJjLixWQC1zrbzam2FDcAo5UUxShZfueZSxqZu8Y,1535
 nucliadb_models/extracted.py,sha256=Zh79jrOcqedVYc36qM4D5qrOn5RutTuJAHusEeyIDiU,6245
 nucliadb_models/file.py,sha256=U66oSmywTWqE48mpNv9KG4X--XZtNI9i4Kl3EcYSLLM,1740
-nucliadb_models/filters.py,sha256=KZwVTcqtY2HoGn_MuK5gBPTJSjL-lwoAXsnsLS6HdCA,14296
+nucliadb_models/filters.py,sha256=1Y1HwO6KBxIgQNg9MyJ3aJKnK_p6d1Y5-ZlUbX1WbvE,14759
 nucliadb_models/labels.py,sha256=9zqRgkpZuX3kUPwsTTgCH7JyOWK7dM5pwyuHJR86YdU,3949
 nucliadb_models/link.py,sha256=cfMOwaKDnaYSMxD5QClBu2Ab1orGfuTurFqNozp3KFk,2010
 nucliadb_models/metadata.py,sha256=7rCIpeWjvqDk4ytIVP3azR9Qmm5PTGVI1BNkNLXfHVo,8348
@@ -16,7 +16,7 @@ nucliadb_models/notifications.py,sha256=3w1HeX9F8nuA7WupHdpXIksX7d0bHO9ofmemYp4R
 nucliadb_models/processing.py,sha256=nhKuHQjqCdb9zJVkYGPTLub23tK9e_lwL5OCDVymZjY,719
 nucliadb_models/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nucliadb_models/resource.py,sha256=FkhwmbjoqQBGyKQIqa40WK2Vq3wtryZeIVWmJ4b-84g,9003
-nucliadb_models/search.py,sha256=eV3XKS4XbR8iw0Rnw3S3OTRLvjB_iHgWqezGnDrXIIU,90829
+nucliadb_models/search.py,sha256=eIJBJecl3A8a4pREi7c6kmDlGK9g1VsaVi00GncPbiA,91479
 nucliadb_models/security.py,sha256=opxaDLfvk3aU0sjesK0jGrYLx5h4YCwlKKN0moYs_ig,1150
 nucliadb_models/synonyms.py,sha256=afbaVqSQSxGLwi2PusVaLSRpkOtA5AZmWOKd1f4nl2E,690
 nucliadb_models/text.py,sha256=kY2ub7AaGm-4vNaLX3Ju2VvRw-eKZ2LRdM9z7XCNaG0,2898
@@ -27,12 +27,12 @@ nucliadb_models/vectorsets.py,sha256=XAgg9DfdfLYpfLh9OepJ_KPH0_RqRQNpVZJr74UnNh0
 nucliadb_models/writer.py,sha256=diwrarp6DxjSUoRmdEljZb68z_ghNvpOgPUGZeKg328,8220
 nucliadb_models/agents/ingestion.py,sha256=W9cJ0dQT_1vPcjeJ4_Fjb8DylnhQ6qqZrY4v8x1RqUs,3093
 nucliadb_models/graph/__init__.py,sha256=X538kZPZnndmQeEtnzzPv1hYVGUTDe9U1O7UmAqqxXU,645
-nucliadb_models/graph/requests.py,sha256=_J7iocrnb6o4Kgf30O8XmXiGuD7-2_t_obPa6S3TJcE,6874
+nucliadb_models/graph/requests.py,sha256=qkIOTL1lP6tstvnbrqIt6IFhlOPZbjShds_HbSgAK-8,7164
 nucliadb_models/graph/responses.py,sha256=Sdq8OgFAL1YT-1lJyLLrkqcScvj7YTEqAUwQ-kFAk9M,1399
 nucliadb_models/internal/__init__.py,sha256=zG33bUz1rHFPtvqQPWn4rDwBJt3FJodGuQYD45quiQg,583
 nucliadb_models/internal/predict.py,sha256=Pnx6MmLfK65eExe1XnVxqmSlvMwdowewwks9BOEoqMw,2029
 nucliadb_models/internal/shards.py,sha256=__y1OZtWGiNcPQEWfSFOj8yw458WGi7mM4vZe0K-L1Y,1691
-nucliadb_models-6.6.1.post4586.dist-info/METADATA,sha256=k9chkzpXBLCRde27pub9bPdo846397ZeekljDfyPmtM,794
-nucliadb_models-6.6.1.post4586.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nucliadb_models-6.6.1.post4586.dist-info/top_level.txt,sha256=UrY1I8oeovIRwkXLYplssTrxQdUjhSEFDFbnwaIV3tA,16
-nucliadb_models-6.6.1.post4586.dist-info/RECORD,,
+nucliadb_models-6.6.1.post4595.dist-info/METADATA,sha256=4SL8SFwCKQQMIpIfvIG_GLBVCSG5YwJlr1mUouctGCI,794
+nucliadb_models-6.6.1.post4595.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nucliadb_models-6.6.1.post4595.dist-info/top_level.txt,sha256=UrY1I8oeovIRwkXLYplssTrxQdUjhSEFDFbnwaIV3tA,16
+nucliadb_models-6.6.1.post4595.dist-info/RECORD,,