Skip to content

Add empty and null check for the vefctorQuery.matches[0], output nece… #17478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 11, 2024
Merged

Add empty and null check for the vefctorQuery.matches[0], output nece… #17478

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32910f9
Add empty and null check for the vefctorQuery.matches[0], output nece…
xqliu Oct 10, 2024
2d0023d
Merge branch 'production' into patch-4
daisyfaithauma Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 39 additions & 40 deletions ...content/docs/workers-ai/tutorials/build-a-retrieval-augmented-generation-ai.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,47 +280,46 @@ const app = new Hono();
// Existing post route...
// app.post('/notes', async (c) => { ... })

app.get("/", async (c) => {
const question = c.req.query("text") || "What is the square root of 9?";

const embeddings = await c.env.AI.run("@cf/baai/bge-base-en-v1.5", {
text: question,
});
const vectors = embeddings.data[0];

const vectorQuery = await c.env.VECTOR_INDEX.query(vectors, { topK: 1 });
let vecId;
if (vectorQuery?.matches?.length) {
vecId = vectorQuery.matches[0].id;
} else {
console.log("No matching vector found or vectorQuery.matches is empty");
}

let notes = [];
if (vecId) {
const query = `SELECT * FROM notes WHERE id = ?`;
const { results } = await c.env.DB.prepare(query).bind(vecId).all();
if (results) notes = results.map((vec) => vec.text);
}

const contextMessage = notes.length
? `Context:\n${notes.map((note) => `- ${note}`).join("\n")}`
: "";

const systemPrompt = `When answering the question or responding, use the context provided, if it is provided and relevant.`;

const { response: answer } = await c.env.AI.run(
"@cf/meta/llama-3-8b-instruct",
{
messages: [
...(notes.length ? [{ role: "system", content: contextMessage }] : []),
{ role: "system", content: systemPrompt },
{ role: "user", content: question },
],
},
);
app.get('/', async (c) => {
const question = c.req.query('text') || "What is the square root of 9?"

const embeddings = await c.env.AI.run('@cf/baai/bge-base-en-v1.5', { text: question })
const vectors = embeddings.data[0]

const vectorQuery = await c.env.VECTOR_INDEX.query(vectors, { topK: 1 });
let vecId;
if (vectorQuery.matches && vectorQuery.matches.length > 0 && vectorQuery.matches[0]) {
vecId = vectorQuery.matches[0].id;
} else {
console.log("No matching vector found or vectorQuery.matches is empty");
}

let notes = []
if (vecId) {
const query = `SELECT * FROM notes WHERE id = ?`
const { results } = await c.env.DB.prepare(query).bind(vecId).all()
if (results) notes = results.map(vec => vec.text)
}

const contextMessage = notes.length
? `Context:\n${notes.map(note => `- ${note}`).join("\n")}`
: ""

const systemPrompt = `When answering the question or responding, use the context provided, if it is provided and relevant.`

const { response: answer } = await c.env.AI.run(
'@cf/meta/llama-3-8b-instruct',
{
messages: [
...(notes.length ? [{ role: 'system', content: contextMessage }] : []),
{ role: 'system', content: systemPrompt },
{ role: 'user', content: question }
]
}
)

return c.text(answer);

return c.text(answer);
});

app.onError((err, c) => {
Expand Down
Loading