update
This commit is contained in:
parent
fd1c360e8c
commit
d7ae1c92b4
3 changed files with 83 additions and 77 deletions
|
|
@ -79,7 +79,9 @@ class Edge(BaseModel, ABC):
|
||||||
|
|
||||||
if driver.aoss_client:
|
if driver.aoss_client:
|
||||||
await driver.aoss_client.delete(
|
await driver.aoss_client.delete(
|
||||||
index=ENTITY_EDGE_INDEX_NAME, id=self.uuid, routing=self.group_id
|
index=ENTITY_EDGE_INDEX_NAME,
|
||||||
|
id=self.uuid,
|
||||||
|
params={'routing': self.group_id},
|
||||||
)
|
)
|
||||||
|
|
||||||
logger.debug(f'Deleted Edge: {self.uuid}')
|
logger.debug(f'Deleted Edge: {self.uuid}')
|
||||||
|
|
@ -273,7 +275,7 @@ class EntityEdge(Edge):
|
||||||
'size': 1,
|
'size': 1,
|
||||||
},
|
},
|
||||||
index=ENTITY_EDGE_INDEX_NAME,
|
index=ENTITY_EDGE_INDEX_NAME,
|
||||||
routing=self.group_id,
|
params={'routing': self.group_id},
|
||||||
)
|
)
|
||||||
|
|
||||||
if resp['hits']['hits']:
|
if resp['hits']['hits']:
|
||||||
|
|
|
||||||
|
|
@ -119,7 +119,9 @@ class Node(BaseModel, ABC):
|
||||||
# Delete the node from OpenSearch indices
|
# Delete the node from OpenSearch indices
|
||||||
for index in (EPISODE_INDEX_NAME, ENTITY_INDEX_NAME, COMMUNITY_INDEX_NAME):
|
for index in (EPISODE_INDEX_NAME, ENTITY_INDEX_NAME, COMMUNITY_INDEX_NAME):
|
||||||
await driver.aoss_client.delete(
|
await driver.aoss_client.delete(
|
||||||
index=index, id=self.uuid, routing=self.group_id
|
index=index,
|
||||||
|
id=self.uuid,
|
||||||
|
params={'routing': self.group_id},
|
||||||
)
|
)
|
||||||
|
|
||||||
# Bulk delete the detached edges
|
# Bulk delete the detached edges
|
||||||
|
|
@ -198,25 +200,25 @@ class Node(BaseModel, ABC):
|
||||||
await driver.aoss_client.delete_by_query(
|
await driver.aoss_client.delete_by_query(
|
||||||
index=EPISODE_INDEX_NAME,
|
index=EPISODE_INDEX_NAME,
|
||||||
body={'query': {'term': {'group_id': group_id}}},
|
body={'query': {'term': {'group_id': group_id}}},
|
||||||
routing=group_id,
|
params={'routing': group_id},
|
||||||
)
|
)
|
||||||
|
|
||||||
await driver.aoss_client.delete_by_query(
|
await driver.aoss_client.delete_by_query(
|
||||||
index=ENTITY_INDEX_NAME,
|
index=ENTITY_INDEX_NAME,
|
||||||
body={'query': {'term': {'group_id': group_id}}},
|
body={'query': {'term': {'group_id': group_id}}},
|
||||||
routing=group_id,
|
params={'routing': group_id},
|
||||||
)
|
)
|
||||||
|
|
||||||
await driver.aoss_client.delete_by_query(
|
await driver.aoss_client.delete_by_query(
|
||||||
index=COMMUNITY_INDEX_NAME,
|
index=COMMUNITY_INDEX_NAME,
|
||||||
body={'query': {'term': {'group_id': group_id}}},
|
body={'query': {'term': {'group_id': group_id}}},
|
||||||
routing=group_id,
|
params={'routing': group_id},
|
||||||
)
|
)
|
||||||
|
|
||||||
await driver.aoss_client.delete_by_query(
|
await driver.aoss_client.delete_by_query(
|
||||||
index=ENTITY_EDGE_INDEX_NAME,
|
index=ENTITY_EDGE_INDEX_NAME,
|
||||||
body={'query': {'term': {'group_id': group_id}}},
|
body={'query': {'term': {'group_id': group_id}}},
|
||||||
routing=group_id,
|
params={'routing': group_id},
|
||||||
)
|
)
|
||||||
|
|
||||||
case GraphProvider.KUZU:
|
case GraphProvider.KUZU:
|
||||||
|
|
@ -520,7 +522,7 @@ class EntityNode(Node):
|
||||||
'size': 1,
|
'size': 1,
|
||||||
},
|
},
|
||||||
index=ENTITY_INDEX_NAME,
|
index=ENTITY_INDEX_NAME,
|
||||||
routing=self.group_id,
|
params={'routing': self.group_id},
|
||||||
)
|
)
|
||||||
|
|
||||||
if resp['hits']['hits']:
|
if resp['hits']['hits']:
|
||||||
|
|
|
||||||
|
|
@ -256,15 +256,16 @@ async def edge_fulltext_search(
|
||||||
filters = build_aoss_edge_filters(group_ids or [], search_filter)
|
filters = build_aoss_edge_filters(group_ids or [], search_filter)
|
||||||
res = await driver.aoss_client.search(
|
res = await driver.aoss_client.search(
|
||||||
index=ENTITY_EDGE_INDEX_NAME,
|
index=ENTITY_EDGE_INDEX_NAME,
|
||||||
routing=route,
|
params={'routing': route},
|
||||||
_source=['uuid'],
|
|
||||||
body={
|
body={
|
||||||
|
'size': limit,
|
||||||
|
'_source': ['uuid'],
|
||||||
'query': {
|
'query': {
|
||||||
'bool': {
|
'bool': {
|
||||||
'filter': filters,
|
'filter': filters,
|
||||||
'must': [{'match': {'fact': {'query': query, 'operator': 'or'}}}],
|
'must': [{'match': {'fact': {'query': query, 'operator': 'or'}}}],
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
@ -417,10 +418,10 @@ async def edge_similarity_search(
|
||||||
filters = build_aoss_edge_filters(group_ids or [], search_filter)
|
filters = build_aoss_edge_filters(group_ids or [], search_filter)
|
||||||
res = await driver.aoss_client.search(
|
res = await driver.aoss_client.search(
|
||||||
index=ENTITY_EDGE_INDEX_NAME,
|
index=ENTITY_EDGE_INDEX_NAME,
|
||||||
routing=route,
|
params={'routing': route},
|
||||||
_source=['uuid'],
|
|
||||||
size=limit,
|
|
||||||
body={
|
body={
|
||||||
|
'size': limit,
|
||||||
|
'_source': ['uuid'],
|
||||||
'query': {
|
'query': {
|
||||||
'knn': {
|
'knn': {
|
||||||
'fact_embedding': {
|
'fact_embedding': {
|
||||||
|
|
@ -429,7 +430,7 @@ async def edge_similarity_search(
|
||||||
'filter': {'bool': {'filter': filters}},
|
'filter': {'bool': {'filter': filters}},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
@ -663,10 +664,10 @@ async def node_fulltext_search(
|
||||||
filters = build_aoss_node_filters(group_ids or [], search_filter)
|
filters = build_aoss_node_filters(group_ids or [], search_filter)
|
||||||
res = await driver.aoss_client.search(
|
res = await driver.aoss_client.search(
|
||||||
index=ENTITY_INDEX_NAME,
|
index=ENTITY_INDEX_NAME,
|
||||||
routing=route,
|
params={'routing': route},
|
||||||
_source=['uuid'],
|
|
||||||
size=limit,
|
|
||||||
body={
|
body={
|
||||||
|
'_source': ['uuid'],
|
||||||
|
'size': limit,
|
||||||
'query': {
|
'query': {
|
||||||
'bool': {
|
'bool': {
|
||||||
'filter': filters,
|
'filter': filters,
|
||||||
|
|
@ -680,7 +681,7 @@ async def node_fulltext_search(
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
@ -809,9 +810,9 @@ async def node_similarity_search(
|
||||||
res = await driver.aoss_client.search(
|
res = await driver.aoss_client.search(
|
||||||
index=ENTITY_INDEX_NAME,
|
index=ENTITY_INDEX_NAME,
|
||||||
params={'routing': route},
|
params={'routing': route},
|
||||||
_source=['uuid'],
|
|
||||||
size=limit,
|
|
||||||
body={
|
body={
|
||||||
|
'size': limit,
|
||||||
|
'_source': ['uuid'],
|
||||||
'query': {
|
'query': {
|
||||||
'knn': {
|
'knn': {
|
||||||
'name_embedding': {
|
'name_embedding': {
|
||||||
|
|
@ -820,7 +821,7 @@ async def node_similarity_search(
|
||||||
'filter': {'bool': {'filter': filters}},
|
'filter': {'bool': {'filter': filters}},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
@ -1013,9 +1014,10 @@ async def episode_fulltext_search(
|
||||||
route = group_ids[0] if group_ids else None
|
route = group_ids[0] if group_ids else None
|
||||||
res = await driver.aoss_client.search(
|
res = await driver.aoss_client.search(
|
||||||
EPISODE_INDEX_NAME,
|
EPISODE_INDEX_NAME,
|
||||||
routing=route,
|
params={'routing': route},
|
||||||
_source=['uuid'],
|
|
||||||
query={
|
query={
|
||||||
|
'size': limit,
|
||||||
|
'_source': ['uuid'],
|
||||||
'bool': {
|
'bool': {
|
||||||
'filter': {'terms': group_ids},
|
'filter': {'terms': group_ids},
|
||||||
'must': [
|
'must': [
|
||||||
|
|
@ -1027,7 +1029,7 @@ async def episode_fulltext_search(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
limit=limit,
|
limit=limit,
|
||||||
)
|
)
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue