nucliadb-models 6.3.4.post3675__py3-none-any.whl → 6.3.4.post3686__py3-none-any.whl

nucliadb_models/conversation.py

@@ -84,6 +84,7 @@ class FieldConversation(BaseModel):
     pages: Optional[int] = None
     size: Optional[int] = None
     total: Optional[int] = None
+    extract_strategy: Optional[str] = None
 
 
 # Creation and update classes (Those used on writer endpoints)
@@ -116,6 +117,10 @@ class InputMessage(BaseModel):
 
 class InputConversationField(BaseModel):
     messages: List[InputMessage] = []
+    extract_strategy: Optional[str] = Field(
+        default=None,
+        description="Id of the Nuclia extract strategy used at processing time. If not set, the default strategy was used. Extract strategies are defined at the learning configuration api.",
+    )
 
 
 # Processing classes (Those used to sent to push endpoints)
@@ -145,4 +150,5 @@ class PushMessage(BaseModel):
 
 class PushConversation(BaseModel):
     messages: List[PushMessage] = []
+    extract_strategy: Optional[str] = None
     classification_labels: list[ClassificationLabel] = []

nucliadb_models/graph/requests.py

@@ -24,7 +24,7 @@ from pydantic import BaseModel, Discriminator, Field, Tag, model_validator
 from typing_extensions import Self
 
 from nucliadb_models.filters import And, Not, Or, filter_discriminator
-from nucliadb_models.metadata import RelationNodeType
+from nucliadb_models.metadata import RelationNodeType, RelationType
 
 ## Models for graph nodes and relations
 
@@ -34,7 +34,7 @@ class NodeMatchKind(str, Enum):
     FUZZY = "fuzzy"
 
 
-class GraphNode(BaseModel):
+class GraphNode(BaseModel, extra="forbid"):
     value: Optional[str] = None
     match: NodeMatchKind = NodeMatchKind.EXACT
     type: Optional[RelationNodeType] = RelationNodeType.ENTITY
@@ -53,8 +53,9 @@ class GraphNode(BaseModel):
         return self
 
 
-class GraphRelation(BaseModel):
+class GraphRelation(BaseModel, extra="forbid"):
     label: Optional[str] = None
+    type: Optional[RelationType] = None
 
 
 ## Models for query expressions
@@ -140,6 +141,7 @@ class GraphNodesSearchRequest(BaseGraphSearchRequest):
 
 GraphRelationsQuery = Annotated[
     Union[
+        Annotated[And["GraphRelationsQuery"], Tag("and")],
         Annotated[Or["GraphRelationsQuery"], Tag("or")],
         Annotated[Not["GraphRelationsQuery"], Tag("not")],
         Annotated[Relation, Tag("relation")],

nucliadb_models/graph/responses.py

@@ -21,7 +21,7 @@ from enum import Enum
 
 from pydantic import BaseModel
 
-from nucliadb_models.metadata import RelationNodeType
+from nucliadb_models.metadata import RelationNodeType, RelationType
 
 
 class GraphNode(BaseModel):
@@ -42,6 +42,7 @@ class PositionedGraphNode(GraphNode):
 
 class GraphRelation(BaseModel):
     label: str
+    type: RelationType
 
 
 class GraphPath(BaseModel):

{nucliadb_models-6.3.4.post3675.dist-info → nucliadb_models-6.3.4.post3686.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: nucliadb_models
-Version: 6.3.4.post3675
+Version: 6.3.4.post3686
 Author-email: Nuclia <nucliadb@nuclia.com>
 License: AGPL
 Project-URL: Homepage, https://nuclia.com

{nucliadb_models-6.3.4.post3675.dist-info → nucliadb_models-6.3.4.post3686.dist-info}/RECORD

@@ -2,7 +2,7 @@ nucliadb_models/__init__.py,sha256=qSmhNKACMwdbU1rklMWlmJKmlRaWvrSksTtwEVkiydQ,1
 nucliadb_models/common.py,sha256=JEEY7_AxRCBPHUF6J8XptR_QnGEjRBd02Kqm5WOySYc,7828
 nucliadb_models/configuration.py,sha256=7iUgSCkmFinu6clCfT54P5tuz5Lvf6eJVmahYjwI7qk,2525
 nucliadb_models/content_types.py,sha256=2B3TJpPYJqd-9xGiNiHJFngSIrVyNsZlN4PeB-HafIk,3682
-nucliadb_models/conversation.py,sha256=tLeVnii6yvQ7C_1oMzeXTGu3354cSLSlTo6Chv0SKtY,3989
+nucliadb_models/conversation.py,sha256=_ubB_22-ovyS8PbRi4TZX5qf1WZ6nAvXIVJtu21BMeM,4339
 nucliadb_models/entities.py,sha256=IqsbF0dSCWkp222sd_R2Ste0iG1eoBPNh1Fh6mNVcu0,2608
 nucliadb_models/export_import.py,sha256=A1KTjwQCRtyVAWcgabXsdltI78rauXBmZX1ie6Rx_pQ,1325
 nucliadb_models/external_index_providers.py,sha256=aVyj-P4kVqfqPjF13E_lUM0FZsq8-DTbIsh-kHOgt2s,1787
@@ -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=CHUIpaYs-4Sdt5XktV45nF_mVThapvFb6mPSWL7MEUg,4395
-nucliadb_models/graph/responses.py,sha256=UXDwFY4va6p6T3kgNJSA4iZ7PrLBR5ibyXw_moQixj0,1614
+nucliadb_models/graph/requests.py,sha256=XniFIyCRrRgEvrPUUu-Tk2m1TiQ3t8m9xdRe1APGCUE,4540
+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=uZLsMkYWrJDHq3xy_w7snSeV2X3aDBuht9GC_MG3sKc,1976
-nucliadb_models-6.3.4.post3675.dist-info/METADATA,sha256=8vRTewKkgAZWAudQ2T7zfC9xQyRvGloC_R6y3kEIYMg,759
-nucliadb_models-6.3.4.post3675.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
-nucliadb_models-6.3.4.post3675.dist-info/top_level.txt,sha256=UrY1I8oeovIRwkXLYplssTrxQdUjhSEFDFbnwaIV3tA,16
-nucliadb_models-6.3.4.post3675.dist-info/RECORD,,
+nucliadb_models-6.3.4.post3686.dist-info/METADATA,sha256=IwB0fQh2W_uzxECRIc19mtsUxTg35FTPFd8grxKuNZI,759
+nucliadb_models-6.3.4.post3686.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
+nucliadb_models-6.3.4.post3686.dist-info/top_level.txt,sha256=UrY1I8oeovIRwkXLYplssTrxQdUjhSEFDFbnwaIV3tA,16
+nucliadb_models-6.3.4.post3686.dist-info/RECORD,,