nucliadb-models 6.3.3.post3626__py3-none-any.whl → 6.3.3.post3628__py3-none-any.whl

nucliadb_models/configuration.py

@@ -19,9 +19,11 @@
 #
 
 import warnings
-from typing import Optional
+from typing import Annotated, Literal, Optional, Union
 
-from pydantic import BaseModel
+from pydantic import BaseModel, Field, create_model
+
+from .search import AskRequest, FindRequest
 
 
 class KBConfiguration(BaseModel):
@@ -35,3 +37,45 @@ class KBConfiguration(BaseModel):
     ner_model: Optional[str] = None
     anonymization_model: Optional[str] = None
     visual_labeling: Optional[str] = None
+
+
+#
+# Search configurations
+#
+
+# FindConfig is a FindConfig without `search_configuration`
+FindConfig = create_model(
+    "FindConfig",
+    **{
+        name: (field.annotation, field)
+        for name, field in FindRequest.model_fields.items()
+        if name not in ("search_configuration")
+    },
+)  # type: ignore[call-overload]
+
+
+class FindSearchConfiguration(BaseModel):
+    kind: Literal["find"]
+    config: FindConfig  # type: ignore[valid-type]
+
+
+# AskConfig is an AskRequest where `query` is not mandatory and without `search_configuration`
+AskConfig = create_model(
+    "AskConfig",
+    **{
+        name: (field.annotation, field)
+        for name, field in AskRequest.model_fields.items()
+        if name not in ("query", "search_configuration")
+    },
+    query=(Optional[str], None),
+)  # type: ignore[call-overload]
+
+
+class AskSearchConfiguration(BaseModel):
+    kind: Literal["ask"]
+    config: AskConfig  # type: ignore[valid-type]
+
+
+SearchConfiguration = Annotated[
+    Union[FindSearchConfiguration, AskSearchConfiguration], Field(discriminator="kind")
+]

nucliadb_models/graph/requests.py

@@ -126,8 +126,6 @@ GraphNodesQuery = Annotated[
         Annotated[And["GraphNodesQuery"], Tag("and")],
         Annotated[Or["GraphNodesQuery"], Tag("or")],
         Annotated[Not["GraphNodesQuery"], Tag("not")],
-        Annotated[SourceNode, Tag("source_node")],
-        Annotated[DestinationNode, Tag("destination_node")],
         Annotated[AnyNode, Tag("node")],
     ],
     Discriminator(graph_query_discriminator),

nucliadb_models/search.py

@@ -1583,6 +1583,10 @@ Using this feature also disables the `citations` parameter. For maximal accuracy
         description="Whether to generate an answer using the generative model. If set to false, the response will only contain the retrieval results.",
     )
 
+    search_configuration: Optional[str] = Field(
+        default=None, description="Load ask parameters from this configuration"
+    )
+
     @field_validator("rag_strategies", mode="before")
     @classmethod
     def validate_rag_strategies(cls, rag_strategies: list[RagStrategies]) -> list[RagStrategies]:
@@ -1739,6 +1743,10 @@ class FindRequest(BaseSearchRequest):
         ],
     )
 
+    search_configuration: Optional[str] = Field(
+        default=None, description="Load find parameters from this configuration"
+    )
+
     @field_validator("features", mode="after")
     @classmethod
     def fulltext_not_supported(cls, v):

{nucliadb_models-6.3.3.post3626.dist-info → nucliadb_models-6.3.3.post3628.dist-info}/METADATA

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

{nucliadb_models-6.3.3.post3626.dist-info → nucliadb_models-6.3.3.post3628.dist-info}/RECORD

@@ -1,6 +1,6 @@
 nucliadb_models/__init__.py,sha256=qSmhNKACMwdbU1rklMWlmJKmlRaWvrSksTtwEVkiydQ,1331
 nucliadb_models/common.py,sha256=JEEY7_AxRCBPHUF6J8XptR_QnGEjRBd02Kqm5WOySYc,7828
-nucliadb_models/configuration.py,sha256=pKtxS8G_tGaJkvKopVeorZTuOEirlg-VLcpxUEAn2lc,1359
+nucliadb_models/configuration.py,sha256=7iUgSCkmFinu6clCfT54P5tuz5Lvf6eJVmahYjwI7qk,2525
 nucliadb_models/content_types.py,sha256=2B3TJpPYJqd-9xGiNiHJFngSIrVyNsZlN4PeB-HafIk,3682
 nucliadb_models/conversation.py,sha256=i9x80US5e2I40zIIxeQg8BtaNri_qmuk1cSb_6VZu6U,3845
 nucliadb_models/entities.py,sha256=IqsbF0dSCWkp222sd_R2Ste0iG1eoBPNh1Fh6mNVcu0,2608
@@ -16,7 +16,7 @@ nucliadb_models/notifications.py,sha256=jr2J3zncs880jYf2oZHYt0VFcnlZevsbkyX69ovT
 nucliadb_models/processing.py,sha256=UeU-VxbBlOzkNxviOS3a0X_k7Ye-jYu3UOdGuu21M8M,971
 nucliadb_models/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nucliadb_models/resource.py,sha256=cjYloaRuCJFc3lGIxLZcX959oOq_N1f3V9bpPMYv4WA,9255
-nucliadb_models/search.py,sha256=xukR-wsHXiXnmYhF3Qo2WBILV8Z1JGyp0y_J2thgDM0,81778
+nucliadb_models/search.py,sha256=gfoJvW1rkPmHCYPWRa-3TMqDJB5ANDyCtjgrD3K0NpQ,82051
 nucliadb_models/security.py,sha256=RewdzQ55nPZ9V7B0NX9KHeWg6B4Hg_RkeiFv2TQyrjs,1402
 nucliadb_models/synonyms.py,sha256=qXTPHfspMgw22hCjAOdFOIoUsRZ7Ju3JW-Lw9Nz4VaI,942
 nucliadb_models/text.py,sha256=RHN55PzQjyC0ghbf0r5GvVjTbFUTWzEDSCCkHkgnfig,3491
@@ -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=fQUoF89Y8IKFkDVQB0Lhxnv7bw0YSDec0NZ9-6-y-5Q,4507
+nucliadb_models/graph/requests.py,sha256=CHUIpaYs-4Sdt5XktV45nF_mVThapvFb6mPSWL7MEUg,4395
 nucliadb_models/graph/responses.py,sha256=UXDwFY4va6p6T3kgNJSA4iZ7PrLBR5ibyXw_moQixj0,1614
 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.3.post3626.dist-info/METADATA,sha256=Hns2Fz9RF2mC19pUR4a-WVz-2fVZ5DW178yu8Ml6jdE,759
-nucliadb_models-6.3.3.post3626.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-nucliadb_models-6.3.3.post3626.dist-info/top_level.txt,sha256=UrY1I8oeovIRwkXLYplssTrxQdUjhSEFDFbnwaIV3tA,16
-nucliadb_models-6.3.3.post3626.dist-info/RECORD,,
+nucliadb_models-6.3.3.post3628.dist-info/METADATA,sha256=TeOFLxcWFBx5asjqLQltwD35lFPiNEawSKkSFVD-jrs,759
+nucliadb_models-6.3.3.post3628.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+nucliadb_models-6.3.3.post3628.dist-info/top_level.txt,sha256=UrY1I8oeovIRwkXLYplssTrxQdUjhSEFDFbnwaIV3tA,16
+nucliadb_models-6.3.3.post3628.dist-info/RECORD,,