Skip to content

Commit

Permalink
Add limit threshold by score and summarize field names
Browse files Browse the repository at this point in the history
  • Loading branch information
@ferdeleong
ferdeleong committed Aug 26, 2024
1 parent 0ae3595 commit c871dc4
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 43 deletions.
58 changes: 33 additions & 25 deletions data/relationships/amenity_relationships.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,35 @@ Hawaii coffee store,Similar_to,Coffee shop 829
Electronics store 145,Similar_to,Electronics store 642
Electronics store 145,Similar_to,Electronics store 520
Electronics store 642,Similar_to,Electronics store 520
Clothing store 487,Similar_to,Victoria's secret
Clothing store 487,Similar_to,Shop 971
Clothing store 487,Similar_to,Clothing store 193
Shop 971,Similar_to,Clothing store 193
Bar & grill 916,Similar_to,Fast food 714
Bar & grill 916,Similar_to,Pei wei asian diner
Sit-down restaurant 563,Similar_to,Sit-down restaurant 458
Sit-down restaurant 563,Similar_to,Flight deck bar & grill
Shop 971,Similar_to,Victoria's secret
Victoria's secret,Similar_to,Clothing store 193
Starbucks coffee,Similar_to,Peet's coffee & tea
Starbucks coffee,Similar_to,Local coffee roaster
Starbucks coffee,Similar_to,Laptop bar
Starbucks coffee,Similar_to,Hawaii coffee store
Pret a manger,Similar_to,Peet's coffee & tea
Pret a manger,Similar_to,Local coffee roaster
Pret a manger,Similar_to,Laptop bar
Pret a manger,Similar_to,Hawaii coffee store
Pret a manger,Similar_to,Starbucks coffee
Pret a manger,Similar_to,Gate gourmet deli
Pret a manger,Similar_to,Soup & salad station
Pret a manger,Similar_to,Cibo express gourmet market
Pret a manger,Similar_to,Subway
Pret a manger,Similar_to,Freshii
Pret a manger,Similar_to,Fresh market
Pret a manger,Similar_to,Deli counter
The deli counter,Similar_to,Freshii
The deli counter,Similar_to,Fresh market
The deli counter,Similar_to,Soup & salad station
The deli counter,Similar_to,Cibo express gourmet market
Freshii,Similar_to,Fresh market
Freshii,Similar_to,Soup & salad station
Freshii,Similar_to,Cibo express gourmet market
Laptop bar,Similar_to,Peet's coffee & tea
Laptop bar,Similar_to,Local coffee roaster
Laptop bar,Similar_to,Hawaii coffee store
Expand All @@ -27,8 +45,8 @@ Teavana,Similar_to,Peet's coffee & tea
Peet's coffee & tea,Similar_to,Local coffee roaster
Travel essentials store 352,Similar_to,Travel essentials store 265
Travel essentials store 352,Similar_to,Travelmart
Travel essentials store 352,Similar_to,The Market
The Market,Similar_to,Travel essentials store 265
Travel essentials store 352,Similar_to,The market
The market,Similar_to,Travel essentials store 265
Airport information desk,Similar_to,Information center
Travelex atm,Similar_to,Bank of america atm
Travelex atm,Similar_to,Currency exchange
Expand Down Expand Up @@ -72,8 +90,8 @@ L'occitane en provence,Similar_to,Mac cosmetics
Dufry duty free,Similar_to,Gucci duty free
Dufry duty free,Similar_to,L'occitane en provence
Dufry duty free,Similar_to,Hermes duty free
Dufry duty free,Similar_to,Duty-free spirits
Gucci duty free,Similar_to,Hermes duty free
Gucci duty free,Similar_to,Duty-free spirits
Tech gear,Similar_to,Brookstone
Tech gear,Similar_to,Travel plug adapters vending machine
Tech gear,Similar_to,Travel essentials
Expand All @@ -84,6 +102,7 @@ Mobile device charging station,Similar_to,Laptop bar
Public showers,Similar_to,Family restroom
Public showers,Similar_to,The executive lounge
Family restroom,Similar_to,Airport nursery
Airport nursery,Similar_to,Mother's room
Minute suites,Similar_to,Sleep pods
The executive lounge,Similar_to,The local tap room
The executive lounge,Similar_to,Johnnie walker lounge
Expand All @@ -97,17 +116,13 @@ Travel essentials,Similar_to,Travel plug adapters vending machine
Travel essentials,Similar_to,Travel essentials store 352
Travel essentials,Similar_to,Travel essentials store 265
Travel essentials,Similar_to,Newsbeat
Travel essentials,Similar_to,The Market
Travel essentials,Similar_to,The market
Travel essentials,Similar_to,Airpot pharmacy
The market,Similar_to,Travel essentials store 265
The market,Similar_to,Travel essentials
Dry cleaning & laundry service,Similar_to,Shoe shine service
Dry cleaning & laundry service,Similar_to,Shoe valet
Newsbeat,Similar_to,News & gifts
Newsbeat,Similar_to,The Market
Newsbeat,Similar_to,Bookworm books
Newsbeat,Similar_to,Children's book nook
Newsbeat,Similar_to,Book passage
Newsbeat,Similar_to,The reader's choice
The hangar bar & grill,Similar_to,Bar & grill 916
The hangar bar & grill,Similar_to,Bar & grill 301
The hangar bar & grill,Similar_to,Flight deck bar & grill
Expand All @@ -121,32 +136,25 @@ Luggage repair shop,Similar_to,Luggage carts
Luggage carts,Similar_to,Baggage storage
The reader's choice,Similar_to,Book passage
The reader's choice,Similar_to,Bookworm books
The reader's choice,Similar_to,News & gifts
Book passage,Similar_to,Bookworm books
Book passage,Similar_to,News & gifts
Children's book nook,Similar_to,Book passage
Children's book nook,Similar_to,News & gifts
Children's book nook,Similar_to,Bookworm books
Children's book nook,Similar_to,The reader's choice
Panda express,Similar_to,Thai express
Panda express,Similar_to,Pei wei asian diner
Panda express,Similar_to,Bar & grill 301
Panda express,Similar_to,Sushi & sake bar
Crabtree & evelyn, Similar_to,Kikki.k
Crabtree & evelyn, Similar_to,News & gifts
Crabtree & evelyn, Similar_to,News & gifts
Kikki.k, Similar_to,L'occitane en provence
Crabtree & evelyn,Similar_to,Kikki.k
Crabtree & evelyn,Similar_to,L'occitane en provence
Kikki.k, Similar_to,News & gifts
Homebaked,Similar_to,La crêperie
The deli counter,Similar_to,Freshii
The deli counter,Similar_to,Fresh market
Freshii,Similar_to,Fresh market
Sunglass station,Similar_to,Sunglass hut
Play port arcade,Similar_to,Golf simulator
Golf simulator,Similar_to,Airport Yoga Studio
Golf simulator,Similar_to,Airport yoga studio
Pop-up retail,Similar_to,Art gallery
Coffee shop 732,Similar_to,Fast food 241
Coffee shop 732,Similar_to,Coffee shop 829
Coffee shop 732,Similar_to,Sit-down restaurant 458
Coffee shop 732,Similar_to,Flight deck bar & grill
Coffee shop 732,Similar_to,The hangar bar & grill

Family restroom,Similar_to,Restroom
36 changes: 18 additions & 18 deletions retrieval_service/datastore/providers/neo4j_graph.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,10 @@
import csv
from typing import Any, Literal, Optional

import models
from neo4j import AsyncDriver, AsyncGraphDatabase
from pydantic import BaseModel

import models

from .. import datastore

NEO4J_IDENTIFIER = "neo4j"
Expand Down Expand Up @@ -226,25 +225,26 @@ async def amenities_search(
# Similarity scores are bounded between 0 and 1, scores closer to 1 indicating higher similarity
result = await session.run(
"""
CALL db.index.vector.queryNodes('amenity_embedding', $top_k, $query_embedding)
CALL db.index.vector.queryNodes('amenity_embedding', 2, $query_embedding)
YIELD node AS sourceAmenity, score
WHERE score >= $similarity_threshold
OPTIONAL MATCH (sourceAmenity)-[r:Similar_to]-(targetAmenity)
RETURN sourceAmenity.id AS source_id,
sourceAmenity.name AS source_name,
sourceAmenity.description AS source_description,
sourceAmenity.location AS source_location,
sourceAmenity.terminal AS source_terminal,
sourceAmenity.category AS source_category,
sourceAmenity.hour AS source_hour,
type(r) AS relationship_type,
targetAmenity.id AS target_id,
targetAmenity.name AS target_name,
targetAmenity.description AS target_description,
targetAmenity.location AS target_location,
targetAmenity.terminal AS target_terminal,
targetAmenity.category AS target_category,
targetAmenity.hour AS target_hour
RETURN sourceAmenity.id AS id,
sourceAmenity.name AS name,
sourceAmenity.description AS description,
sourceAmenity.location AS location,
sourceAmenity.terminal AS terminal,
sourceAmenity.category AS category,
sourceAmenity.hour AS hour,
collect({
id: targetAmenity.id,
name: targetAmenity.name,
description: targetAmenity.description,
location: targetAmenity.location,
terminal: targetAmenity.terminal,
category: targetAmenity.category,
hour: targetAmenity.hour
}) AS SIMILAR_TO
""",
query_embedding=query_embedding,
similarity_threshold=similarity_threshold,
Expand Down

0 comments on commit c871dc4

Please sign in to comment.