nucliadb-models 6.4.2.post4375__py3-none-any.whl → 6.4.2.post4378__py3-none-any.whl

nucliadb_models/graph/requests.py

@@ -107,8 +107,34 @@ class Generated(BaseModel, extra="forbid"):
 ## Requests models
 
 
+class GraphFilterExpression(BaseModel, extra="forbid"):
+    """Returns only relations from documents that match this filter expression.
+    Filtering examples can be found here: https://docs.nuclia.dev/docs/rag/advanced/search-filters
+    """
+
+    field: FieldFilterExpression = Field(description="Filter to apply to fields")
+
+
 class BaseGraphSearchRequest(BaseModel):
     top_k: int = Field(default=50, title="Number of results to retrieve")
+    filter_expression: Optional[GraphFilterExpression] = Field(
+        default=None,
+        title="Filter resource by an expression",
+        description=(
+            "Returns only relations from documents that match this filter expression."
+            "Filtering examples can be found here: https://docs.nuclia.dev/docs/rag/advanced/search-filters "
+        ),
+    )
+    security: Optional[RequestSecurity] = Field(
+        default=None,
+        title="Security",
+        description="Security metadata for the request. If not provided, the search request is done without the security lookup phase.",  # noqa: E501
+    )
+    show_hidden: bool = Field(
+        default=False,
+        title="Show hidden resources",
+        description="If set to false (default), excludes hidden resources from search",
+    )
 
 
 graph_query_discriminator = filter_discriminator
@@ -137,34 +163,8 @@ GraphPathQuery = Annotated[
 ]
 
 
-class GraphFilterExpression(BaseModel, extra="forbid"):
-    """Returns only relations from documents that match this filter expression.
-    Filtering examples can be found here: https://docs.nuclia.dev/docs/rag/advanced/search-filters
-    """
-
-    field: FieldFilterExpression = Field(description="Filter to apply to fields")
-
-
 class GraphSearchRequest(BaseGraphSearchRequest):
     query: GraphPathQuery
-    filter_expression: Optional[GraphFilterExpression] = Field(
-        default=None,
-        title="Filter resource by an expression",
-        description=(
-            "Returns only relations from documents that match this filter expression."
-            "Filtering examples can be found here: https://docs.nuclia.dev/docs/rag/advanced/search-filters "
-        ),
-    )
-    security: Optional[RequestSecurity] = Field(
-        default=None,
-        title="Security",
-        description="Security metadata for the request. If not provided, the search request is done without the security lookup phase.",  # noqa: E501
-    )
-    show_hidden: bool = Field(
-        default=False,
-        title="Show hidden resources",
-        description="If set to false (default), excludes hidden resources from search",
-    )
 
 
 # Nodes search
@@ -183,24 +183,6 @@ GraphNodesQuery = Annotated[
 
 class GraphNodesSearchRequest(BaseGraphSearchRequest):
     query: GraphNodesQuery
-    filter_expression: Optional[GraphFilterExpression] = Field(
-        default=None,
-        title="Filter resource by an expression",
-        description=(
-            "Returns only relations from documents that match this filter expression."
-            "Filtering examples can be found here: https://docs.nuclia.dev/docs/rag/advanced/search-filters "
-        ),
-    )
-    security: Optional[RequestSecurity] = Field(
-        default=None,
-        title="Security",
-        description="Security metadata for the request. If not provided, the search request is done without the security lookup phase.",  # noqa: E501
-    )
-    show_hidden: bool = Field(
-        default=False,
-        title="Show hidden resources",
-        description="If set to false (default), excludes hidden resources from search",
-    )
 
 
 # Relations search
@@ -219,24 +201,6 @@ GraphRelationsQuery = Annotated[
 
 class GraphRelationsSearchRequest(BaseGraphSearchRequest):
     query: GraphRelationsQuery
-    filter_expression: Optional[GraphFilterExpression] = Field(
-        default=None,
-        title="Filter resource by an expression",
-        description=(
-            "Returns only relations from documents that match this filter expression."
-            "Filtering examples can be found here: https://docs.nuclia.dev/docs/rag/advanced/search-filters "
-        ),
-    )
-    security: Optional[RequestSecurity] = Field(
-        default=None,
-        title="Security",
-        description="Security metadata for the request. If not provided, the search request is done without the security lookup phase.",  # noqa: E501
-    )
-    show_hidden: bool = Field(
-        default=False,
-        title="Show hidden resources",
-        description="If set to false (default), excludes hidden resources from search",
-    )
 
 
 # We need this to avoid issues with pydantic and generic types defined in another module

nucliadb_models/search.py

@@ -1769,7 +1769,7 @@ class FindRequest(BaseSearchRequest):
     query_entities: SkipJsonSchema[Optional[list[KnowledgeGraphEntity]]] = Field(
         default=None, title="Query entities", description="Entities to use in a knowledge graph search"
     )
-    graph_query: SkipJsonSchema[Optional[GraphPathQuery]] = Field(
+    graph_query: Optional[GraphPathQuery] = Field(
         default=None,
         title="Graph query",
         description="Query for the knowledge graph. Paths (node-relation-node) extracted from a paragraph_id will be used to extend the results",

{nucliadb_models-6.4.2.post4375.dist-info → nucliadb_models-6.4.2.post4378.dist-info}/METADATA

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

{nucliadb_models-6.4.2.post4375.dist-info → nucliadb_models-6.4.2.post4378.dist-info}/RECORD

@@ -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=K__IKs-dDbJwvYNiodSM-6CVtZOs1PlEPtxi9k_uCyc,85409
+nucliadb_models/search.py,sha256=Cg7W4Ng7G5UgMOAD-pkSz6fEcaiSTBdju6q8ApUNgag,85393
 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=_cTN2W15UMfaAugP_3dG-BAX9ZohzyfxtDpjW_0C5qg,8132
+nucliadb_models/graph/requests.py,sha256=KwdP9xSDu1Td2O-7cRXBv_YFF6DsqAlD6M0-4LKAD60,6506
 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.4.2.post4375.dist-info/METADATA,sha256=YQPKOFz80LxHQ_pGxOwxXdUvp_cH23eIfSoSplR1NqI,776
-nucliadb_models-6.4.2.post4375.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nucliadb_models-6.4.2.post4375.dist-info/top_level.txt,sha256=UrY1I8oeovIRwkXLYplssTrxQdUjhSEFDFbnwaIV3tA,16
-nucliadb_models-6.4.2.post4375.dist-info/RECORD,,
+nucliadb_models-6.4.2.post4378.dist-info/METADATA,sha256=dwY_lyOcyf9myCoM6z4DUD5TJltA0aTI7XsLXjFoZ1c,776
+nucliadb_models-6.4.2.post4378.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nucliadb_models-6.4.2.post4378.dist-info/top_level.txt,sha256=UrY1I8oeovIRwkXLYplssTrxQdUjhSEFDFbnwaIV3tA,16
+nucliadb_models-6.4.2.post4378.dist-info/RECORD,,