Skip to content

Commit 0826d72

Browse files
committed
adjusting google to do semantic similarity, adjusting config to put api prefixes in front
1 parent 8b38c08 commit 0826d72

File tree

2 files changed

+18
-16
lines changed

2 files changed

+18
-16
lines changed

services/video-search/src/config.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ const {
3535
} = process.env;
3636

3737
const DEFAULT_VIDEO_INDEX_NAME = 'idx-videos';
38-
const DEFAULT_VIDEO_PREFIX = 'video';
38+
const DEFAULT_VIDEO_PREFIX = 'video:';
3939
const DEFAULT_VECTOR_SET = 'video-vectors';
40-
const DEFAULT_SUMMARY_PREFIX = 'video-summary';
40+
const DEFAULT_SUMMARY_PREFIX = 'video-summary:';
4141

4242
export default {
4343
app: {
@@ -70,35 +70,35 @@ export default {
7070
API_KEY: SEARCHAPI_API_KEY ?? '',
7171
},
7272
hf: {
73-
VIDEO_INDEX_NAME: HF_VIDEO_INDEX_NAME ?? `${DEFAULT_VIDEO_INDEX_NAME}-hf`,
74-
VIDEO_PREFIX: HF_VIDEO_PREFIX ?? `${DEFAULT_VIDEO_PREFIX}-hf:`,
73+
VIDEO_INDEX_NAME: HF_VIDEO_INDEX_NAME ?? `hf-${DEFAULT_VIDEO_INDEX_NAME}`,
74+
VIDEO_PREFIX: HF_VIDEO_PREFIX ?? `hf-${DEFAULT_VIDEO_PREFIX}`,
7575
EMBEDDING_MODEL: HF_EMBEDDING_MODEL ?? 'Xenova/all-MiniLM-L6-v2',
7676
SUMMARY_MODEL: HF_SUMMARY_MODEL ?? 'Xenova/paraphrase-albert-small-v2',
77-
VECTOR_SET: HF_VECTOR_SET ?? `${DEFAULT_VECTOR_SET}-hf`,
78-
SUMMARY_PREFIX: HF_SUMMARY_PREFIX ?? `${DEFAULT_SUMMARY_PREFIX}-hf:`,
77+
VECTOR_SET: HF_VECTOR_SET ?? `hf-${DEFAULT_VECTOR_SET}`,
78+
SUMMARY_PREFIX: HF_SUMMARY_PREFIX ?? `hf-${DEFAULT_SUMMARY_PREFIX}`,
7979
},
8080
google: {
8181
VIDEO_INDEX_NAME:
82-
GOOGLE_VIDEO_INDEX_NAME ?? `${DEFAULT_VIDEO_INDEX_NAME}-google`,
83-
VIDEO_PREFIX: GOOGLE_VIDEO_PREFIX ?? `${DEFAULT_VIDEO_PREFIX}-google:`,
82+
GOOGLE_VIDEO_INDEX_NAME ?? `google-${DEFAULT_VIDEO_INDEX_NAME}`,
83+
VIDEO_PREFIX: GOOGLE_VIDEO_PREFIX ?? `google-${DEFAULT_VIDEO_PREFIX}`,
8484
API_KEY: GOOGLE_API_KEY,
8585
EMBEDDING_MODEL: GOOGLE_EMBEDDING_MODEL ?? 'embedding-001',
8686
SUMMARY_MODEL: GOOGLE_SUMMARY_MODEL ?? 'gemini-pro',
87-
VECTOR_SET: GOOGLE_VECTOR_SET ?? `${DEFAULT_VECTOR_SET}-google`,
87+
VECTOR_SET: GOOGLE_VECTOR_SET ?? `google-${DEFAULT_VECTOR_SET}`,
8888
SUMMARY_PREFIX:
89-
GOOGLE_SUMMARY_PREFIX ?? `${DEFAULT_SUMMARY_PREFIX}-google:`,
89+
GOOGLE_SUMMARY_PREFIX ?? `google-${DEFAULT_SUMMARY_PREFIX}`,
9090
},
9191
openai: {
9292
VIDEO_INDEX_NAME:
93-
OPENAI_VIDEO_INDEX_NAME ?? `${DEFAULT_VIDEO_INDEX_NAME}-openai`,
94-
VIDEO_PREFIX: OPENAI_VIDEO_PREFIX ?? `${DEFAULT_VIDEO_PREFIX}-openai:`,
93+
OPENAI_VIDEO_INDEX_NAME ?? `openai-${DEFAULT_VIDEO_INDEX_NAME}`,
94+
VIDEO_PREFIX: OPENAI_VIDEO_PREFIX ?? `openai-${DEFAULT_VIDEO_PREFIX}`,
9595
API_KEY: OPENAI_API_KEY,
9696
ORGANIZATION: OPENAI_ORGANIZATION,
9797
EMBEDDING_MODEL: OPENAI_EMBEDDING_MODEL ?? 'gpt-4',
9898
SUMMARY_MODEL: OPENAI_SUMMARY_MODEL ?? 'gpt-4',
99-
VECTOR_SET: OPENAI_VECTOR_SET ?? `${DEFAULT_VECTOR_SET}-openai`,
99+
VECTOR_SET: OPENAI_VECTOR_SET ?? `openai-${DEFAULT_VECTOR_SET}`,
100100
SUMMARY_PREFIX:
101-
OPENAI_SUMMARY_PREFIX ?? `${DEFAULT_SUMMARY_PREFIX}-openai:`,
101+
OPENAI_SUMMARY_PREFIX ?? `openai-${DEFAULT_SUMMARY_PREFIX}`,
102102
},
103103
use: {
104104
GOOGLE: USE === 'GOOGLE',

services/video-search/src/google/config.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,19 @@ import config from '../config.js';
22
import { client } from '../db.js';
33
import { RedisVectorStore } from 'langchain/vectorstores/redis';
44
import { ChatGoogleGenerativeAI, GoogleGenerativeAIEmbeddings } from '@langchain/google-genai';
5+
import { TaskType } from '@google/generative-ai';
56

67
export const llm = new ChatGoogleGenerativeAI({
78
apiKey: config.google.API_KEY,
89
modelName: config.google.SUMMARY_MODEL,
9-
maxOutputTokens: 10000,
10+
maxOutputTokens: 2048,
1011
});
1112

1213
export function getEmbeddings(modelName?: string) {
1314
return new GoogleGenerativeAIEmbeddings({
1415
apiKey: config.google.API_KEY,
15-
modelName: modelName ?? config.google.EMBEDDING_MODEL
16+
modelName: modelName ?? config.google.EMBEDDING_MODEL,
17+
taskType: TaskType.SEMANTIC_SIMILARITY
1618
});
1719
}
1820

0 commit comments

Comments
 (0)