graphiti-core 0.12.0rc1__py3-none-any.whl → 0.12.0rc2__py3-none-any.whl

graphiti_core/search/search_filters.py

@@ -21,6 +21,8 @@ from typing import Any
 from pydantic import BaseModel, Field
 from typing_extensions import LiteralString
 
+from graphiti_core.helpers import lucene_sanitize
+
 
 class ComparisonOperator(Enum):
     equals = '='
@@ -42,6 +44,9 @@ class SearchFilters(BaseModel):
     node_labels: list[str] | None = Field(
         default=None, description='List of node labels to filter on'
     )
+    edge_types: list[str] | None = Field(
+        default=None, description='List of edge types to filter on'
+    )
     valid_at: list[list[DateFilter]] | None = Field(default=None)
     invalid_at: list[list[DateFilter]] | None = Field(default=None)
     created_at: list[list[DateFilter]] | None = Field(default=None)
@@ -55,7 +60,7 @@ def node_search_filter_query_constructor(
     filter_params: dict[str, Any] = {}
 
     if filters.node_labels is not None:
-        node_labels = '|'.join(filters.node_labels)
+        node_labels = '|'.join(list(map(lucene_sanitize, filters.node_labels)))
         node_label_filter = ' AND n:' + node_labels
         filter_query += node_label_filter
 
@@ -68,8 +73,19 @@ def edge_search_filter_query_constructor(
     filter_query: LiteralString = ''
     filter_params: dict[str, Any] = {}
 
+    if filters.edge_types is not None:
+        edge_types = filters.edge_types
+        edge_types_filter = '\nAND r.name in $edge_types'
+        filter_query += edge_types_filter
+        filter_params['edge_types'] = edge_types
+
+    if filters.node_labels is not None:
+        node_labels = '|'.join(list(map(lucene_sanitize, filters.node_labels)))
+        node_label_filter = '\nAND n:' + node_labels + ' AND m:' + node_labels
+        filter_query += node_label_filter
+
     if filters.valid_at is not None:
-        valid_at_filter = ' AND ('
+        valid_at_filter = '\nAND ('
         for i, or_list in enumerate(filters.valid_at):
             for j, date_filter in enumerate(or_list):
                 filter_params['valid_at_' + str(j)] = date_filter.date

graphiti_core/search/search_utils.py

@@ -159,7 +159,7 @@ async def edge_fulltext_search(
         """
               CALL db.index.fulltext.queryRelationships("edge_name_and_fact", $query, {limit: $limit}) 
               YIELD relationship AS rel, score
-              MATCH (:Entity)-[r:RELATES_TO]->(:Entity)
+              MATCH (n:Entity)-[r:RELATES_TO]->(m:Entity)
               WHERE r.group_id IN $group_ids"""
         + filter_query
         + """\nWITH r, score, startNode(r) AS n, endNode(r) AS m
@@ -211,9 +211,9 @@ async def edge_similarity_search(
     filter_query, filter_params = edge_search_filter_query_constructor(search_filter)
     query_params.update(filter_params)
 
-    group_filter_query: LiteralString = ''
+    group_filter_query: LiteralString = 'WHERE r.group_id IS NOT NULL'
     if group_ids is not None:
-        group_filter_query += 'WHERE r.group_id IN $group_ids'
+        group_filter_query += '\nAND r.group_id IN $group_ids'
         query_params['group_ids'] = group_ids
         query_params['source_node_uuid'] = source_node_uuid
         query_params['target_node_uuid'] = target_node_uuid
@@ -227,8 +227,8 @@ async def edge_similarity_search(
     query: LiteralString = (
         RUNTIME_QUERY
         + """
-                                                                                                                                                                MATCH (n:Entity)-[r:RELATES_TO]->(m:Entity)
-                                                                                                                                               """
+        MATCH (n:Entity)-[r:RELATES_TO]->(m:Entity)
+         """
         + group_filter_query
         + filter_query
         + """\nWITH DISTINCT r, vector.similarity.cosine(r.fact_embedding, $search_vector) AS score
@@ -287,7 +287,7 @@ async def edge_bfs_search(
                 UNWIND $bfs_origin_node_uuids AS origin_uuid
                 MATCH path = (origin:Entity|Episodic {uuid: origin_uuid})-[:RELATES_TO|MENTIONS]->{1,3}(n:Entity)
                 UNWIND relationships(path) AS rel
-                MATCH ()-[r:RELATES_TO]-()
+                MATCH (n:Entity)-[r:RELATES_TO]-(m:Entity)
                 WHERE r.uuid = rel.uuid
                 """
         + filter_query
@@ -340,10 +340,10 @@ async def node_fulltext_search(
 
     query = (
         """
-                                                                                        CALL db.index.fulltext.queryNodes("node_name_and_summary", $query, {limit: $limit}) 
-                                                                                        YIELD node AS n, score
-                                                                                        WHERE n:Entity
-                                                                                        """
+                                                                                                    CALL db.index.fulltext.queryNodes("node_name_and_summary", $query, {limit: $limit}) 
+                                                                                                    YIELD node AS n, score
+                                                                                                    WHERE n:Entity
+                                                                                                    """
         + filter_query
         + ENTITY_NODE_RETURN
         + """
@@ -376,9 +376,9 @@ async def node_similarity_search(
     # vector similarity search over entity names
     query_params: dict[str, Any] = {}
 
-    group_filter_query: LiteralString = ''
+    group_filter_query: LiteralString = 'WHERE n.group_id IS NOT NULL'
     if group_ids is not None:
-        group_filter_query += 'WHERE n.group_id IN $group_ids'
+        group_filter_query += ' AND n.group_id IN $group_ids'
         query_params['group_ids'] = group_ids
 
     filter_query, filter_params = node_search_filter_query_constructor(search_filter)

graphiti_core/utils/maintenance/edge_operations.py

@@ -160,6 +160,14 @@ async def extract_edges(
         invalid_at = edge_data.get('invalid_at', None)
         valid_at_datetime = None
         invalid_at_datetime = None
+        source_node_uuid = node_uuids_by_name_map.get(edge_data.get('source_entity_name', ''), '')
+        target_node_uuid = node_uuids_by_name_map.get(edge_data.get('target_entity_name', ''), '')
+
+        if source_node_uuid == '' or target_node_uuid == '':
+            logger.warning(
+                f'WARNING: source or target node not filled {edge_data.get("edge_name")}. source_node_uuid: {source_node_uuid} and target_node_uuid: {target_node_uuid} '
+            )
+            continue
 
         if valid_at:
             try:
@@ -177,12 +185,8 @@ async def extract_edges(
             except ValueError as e:
                 logger.warning(f'WARNING: Error parsing invalid_at date: {e}. Input: {invalid_at}')
         edge = EntityEdge(
-            source_node_uuid=node_uuids_by_name_map.get(
-                edge_data.get('source_entity_name', ''), ''
-            ),
-            target_node_uuid=node_uuids_by_name_map.get(
-                edge_data.get('target_entity_name', ''), ''
-            ),
+            source_node_uuid=source_node_uuid,
+            target_node_uuid=target_node_uuid,
             name=edge_data.get('relation_type', ''),
             group_id=group_id,
             fact=edge_data.get('fact', ''),
@@ -276,8 +280,8 @@ async def resolve_extracted_edges(
     # Determine which edge types are relevant for each edge
     edge_types_lst: list[dict[str, BaseModel]] = []
     for extracted_edge in extracted_edges:
-        source_node_labels = uuid_entity_map[extracted_edge.source_node_uuid].labels
-        target_node_labels = uuid_entity_map[extracted_edge.target_node_uuid].labels
+        source_node_labels = uuid_entity_map[extracted_edge.source_node_uuid].labels + ['Entity']
+        target_node_labels = uuid_entity_map[extracted_edge.target_node_uuid].labels + ['Entity']
         label_tuples = [
             (source_label, target_label)
             for source_label in source_node_labels
@@ -439,7 +443,7 @@ async def resolve_extracted_edge(
         resolved_edge.name = fact_type
 
         edge_attributes_context = {
-            'message': episode.content,
+            'episode_content': episode.content,
             'reference_time': episode.valid_at,
             'fact': resolved_edge.fact,
         }

{graphiti_core-0.12.0rc1.dist-info → graphiti_core-0.12.0rc2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: graphiti-core
-Version: 0.12.0rc1
+Version: 0.12.0rc2
 Summary: A temporal graph building library
 License: Apache-2.0
 Author: Paul Paliychuk

{graphiti_core-0.12.0rc1.dist-info → graphiti_core-0.12.0rc2.dist-info}/RECORD

@@ -46,21 +46,21 @@ graphiti_core/search/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 graphiti_core/search/search.py,sha256=XCEYz4-I341eWiZ-czeFlH5hdbHTTLymhHiD153p6DQ,15122
 graphiti_core/search/search_config.py,sha256=VvKg6AB_RPhoe56DBBXHRBXHThAVJ_OLFCyq_yKof-A,3765
 graphiti_core/search/search_config_recipes.py,sha256=4GquRphHhJlpXQhAZOySYnCzBWYoTwxlJj44eTOavZQ,7443
-graphiti_core/search/search_filters.py,sha256=JkP7NbM4Dor27dne5vAuxbJic12dIJDtWJxNqmVuRec,5884
+graphiti_core/search/search_filters.py,sha256=AT074LfIw3nc-jKtDbHCopkUIk5eY1_HRl6EoHSQsUc,6551
 graphiti_core/search/search_helpers.py,sha256=G5Ceaq5Pfgx0Weelqgeylp_pUHwiBnINaUYsDbURJbE,2636
-graphiti_core/search/search_utils.py,sha256=Q36whL7VTlVRuFkktqjbIlLqVYf7myE6iHo4i0bW73E,34634
+graphiti_core/search/search_utils.py,sha256=AimBkRgvSFHqAkt1vraTVj_bVAp3JKrR6JUMpoZa8RI,34469
 graphiti_core/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 graphiti_core/utils/bulk_utils.py,sha256=WFCfo_OrFD2bpm13Vkex4A1YLVHX4pjCm5acZ1CwzEI,15848
 graphiti_core/utils/datetime_utils.py,sha256=Ti-2tnrDFRzBsbfblzsHybsM3jaDLP4-VT2t0VhpIzU,1357
 graphiti_core/utils/maintenance/__init__.py,sha256=vW4H1KyapTl-OOz578uZABYcpND4wPx3Vt6aAPaXh78,301
 graphiti_core/utils/maintenance/community_operations.py,sha256=TF-4eHuvMe_jMqvWg3swxK80zLLtOR0t1pmUUQlNulM,10067
-graphiti_core/utils/maintenance/edge_operations.py,sha256=KeHcNJ2YXApC-cuoR1zBdXPtinOdv0DfvQcBicVnuBQ,18865
+graphiti_core/utils/maintenance/edge_operations.py,sha256=9_vC3piLUlGM-C30Z4DsN6UWQoxbabsSlJYD7z1zsr4,19222
 graphiti_core/utils/maintenance/graph_data_operations.py,sha256=BIJKc8tbvU4IjWxLgeotw57b1eE3Iw8YtV74j6eo4RQ,7493
 graphiti_core/utils/maintenance/node_operations.py,sha256=xuXKY0aoe_Idl9Edtb8FxSqoCa45M043nCMraJuAcW8,16606
 graphiti_core/utils/maintenance/temporal_operations.py,sha256=mJkw9xLB4W2BsLfC5POr0r-PHWL9SIfNj_l_xu0B5ug,3410
 graphiti_core/utils/maintenance/utils.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 graphiti_core/utils/ontology_utils/entity_types_utils.py,sha256=QJX5cG0GSSNF_Mm_yrldr69wjVAbN_MxLhOSznz85Hk,1279
-graphiti_core-0.12.0rc1.dist-info/LICENSE,sha256=KCUwCyDXuVEgmDWkozHyniRyWjnWUWjkuDHfU6o3JlA,11325
-graphiti_core-0.12.0rc1.dist-info/METADATA,sha256=NWn1DI3wq2YnAPzTi7chWv1c22UhaEKaSzmt_ky9B9s,15301
-graphiti_core-0.12.0rc1.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-graphiti_core-0.12.0rc1.dist-info/RECORD,,
+graphiti_core-0.12.0rc2.dist-info/LICENSE,sha256=KCUwCyDXuVEgmDWkozHyniRyWjnWUWjkuDHfU6o3JlA,11325
+graphiti_core-0.12.0rc2.dist-info/METADATA,sha256=-fYdpjbrMX_KEX-KjyoGONa042ydQ8mlH0henpu9Z9U,15301
+graphiti_core-0.12.0rc2.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+graphiti_core-0.12.0rc2.dist-info/RECORD,,