Skip to content

Commit 8ae0136

Browse files
committed
fix a few things, comment out facts
1 parent 6218818 commit 8ae0136

File tree

5 files changed

+34
-25
lines changed

5 files changed

+34
-25
lines changed

.env.example

-4
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@ SMALL_OLLAMA_MODEL= #default llama3.2
3737
MEDIUM_OLLAMA_MODEL= #default herems3
3838
LARGE_OLLAMA_MODEL= #default hermes3:70b
3939

40-
#to still use the original LOCALLLAMA provider but with ollama
41-
LOCAL_LLAMA_PROVIDER= #"OLLAMA" #Leave blank for LLAMA-CPP or add OLLAMA
42-
43-
4440
# For asking Claude stuff
4541
ANTHROPIC_API_KEY=
4642

packages/adapter-sqlite/src/index.ts

+2
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,8 @@ export class SqliteDatabaseAdapter extends DatabaseAdapter {
350350
ORDER BY vec_distance_L2(${opts.query_field_name}, ?) ASC
351351
LIMIT ?
352352
`;
353+
console.log("sql", sql)
354+
console.log("opts.query_input", opts.query_input)
353355
const memories = this.db.prepare(sql).all(
354356
opts.query_table_name,
355357
new Float32Array(opts.query_input.split(",").map(Number)), // Convert string to Float32Array

packages/client-discord/src/providers/channelState.ts

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ const channelStateProvider: Provider = {
1616
(state?.discordMessage as DiscordMessage) ||
1717
(state?.discordChannel as DiscordMessage);
1818
if (!discordMessage) {
19-
console.log("discordMessage is null");
2019
return "";
2120
}
2221

packages/core/src/embedding.ts

+20-12
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,28 @@ import {
1313
*/
1414
export async function embed(runtime: IAgentRuntime, input: string) {
1515
// get the charcter, and handle by model type
16-
const model = models[runtime.character.settings.model];
16+
const modelProvider = models[runtime.character.modelProvider];
17+
const embeddingModel = modelProvider.model.embedding;
1718

1819
if (
19-
model !== ModelProviderName.OPENAI &&
20-
model !== ModelProviderName.OLLAMA
20+
runtime.character.modelProvider !== ModelProviderName.OPENAI &&
21+
runtime.character.modelProvider !== ModelProviderName.OLLAMA
2122
) {
2223
const service = runtime.getService<ITextGenerationService>(
2324
ServiceType.TEXT_GENERATION
2425
);
25-
return await service.getInstance().getEmbeddingResponse(input);
26-
}
27-
28-
const embeddingModel = models[runtime.modelProvider].model.embedding;
26+
27+
const instance = service?.getInstance();
2928

30-
// Check if we already have the embedding in the lore
31-
const cachedEmbedding = await retrieveCachedEmbedding(runtime, input);
32-
if (cachedEmbedding) {
33-
return cachedEmbedding;
29+
if (instance) {
30+
return await instance.getEmbeddingResponse(input);
31+
}
3432
}
33+
// Check if we already have the embedding in the lore
34+
// const cachedEmbedding = await retrieveCachedEmbedding(runtime, input);
35+
// if (cachedEmbedding) {
36+
// return cachedEmbedding;
37+
// }
3538

3639
const requestOptions = {
3740
method: "POST",
@@ -51,7 +54,7 @@ export async function embed(runtime: IAgentRuntime, input: string) {
5154
try {
5255
const response = await fetch(
5356
// TODO: make this not hardcoded
54-
`${runtime.serverUrl}${runtime.modelProvider === ModelProviderName.OLLAMA ? "/v1" : ""}/embeddings`,
57+
`${runtime.character.modelEndpointOverride || modelProvider.endpoint}${runtime.character.modelProvider === ModelProviderName.OLLAMA ? "/v1" : ""}/embeddings`,
5558
requestOptions
5659
);
5760

@@ -81,6 +84,11 @@ export async function retrieveCachedEmbedding(
8184
runtime: IAgentRuntime,
8285
input: string
8386
) {
87+
if(!input) {
88+
console.log("No input to retrieve cached embedding for");
89+
return null;
90+
}
91+
8492
const similaritySearchResult =
8593
await runtime.messageManager.getCachedEmbeddings(input);
8694
if (similaritySearchResult.length > 0) {

packages/plugin-bootstrap/src/providers/facts.ts

+12-8
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,23 @@ const factsProvider: Provider = {
2020

2121
const embedding = await embed(runtime, recentMessages);
2222

23+
console.log("embedding", embedding);
24+
2325
const memoryManager = new MemoryManager({
2426
runtime,
2527
tableName: "facts",
2628
});
2729

28-
const relevantFacts = await memoryManager.searchMemoriesByEmbedding(
29-
embedding,
30-
{
31-
roomId: message.roomId,
32-
count: 10,
33-
agentId: runtime.agentId,
34-
}
35-
);
30+
const relevantFacts = []
31+
32+
// await memoryManager.searchMemoriesByEmbedding(
33+
// embedding,
34+
// {
35+
// roomId: message.roomId,
36+
// count: 10,
37+
// agentId: runtime.agentId,
38+
// }
39+
// );
3640

3741
const recentFactsData = await memoryManager.getMemories({
3842
roomId: message.roomId,

0 commit comments

Comments
 (0)