Skip to content
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

Jump to bottom

bugfix/OpenAITopP #617

Merged
merged 2 commits into from
Jul 27, 2023
Merged

bugfix/OpenAITopP #617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b454083
change parseInt to parseFloat
chungyau97 Jul 25, 2023
2ad873c
modify parse for topP and topK
chungyau97 Jul 25, 2023
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
4 changes: 2 additions & 2 deletions packages/components/nodes/chatmodels/ChatAnthropic/ChatAnthropic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ class ChatAnthropic_ChatModels implements INode {
}

if (maxTokensToSample) obj.maxTokensToSample = parseInt(maxTokensToSample, 10)
if (topP) obj.topP = parseInt(topP, 10)
if (topK) obj.topK = parseInt(topK, 10)
if (topP) obj.topP = parseFloat(topP)
if (topK) obj.topK = parseFloat(topK)

const model = new ChatAnthropic(obj)
return model
Expand Down
4 changes: 2 additions & 2 deletions packages/components/nodes/chatmodels/ChatHuggingFace/ChatHuggingFace.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ class ChatHuggingFace_ChatModels implements INode {

if (temperature) obj.temperature = parseFloat(temperature)
if (maxTokens) obj.maxTokens = parseInt(maxTokens, 10)
if (topP) obj.topP = parseInt(topP, 10)
if (hfTopK) obj.topK = parseInt(hfTopK, 10)
if (topP) obj.topP = parseFloat(topP)
if (hfTopK) obj.topK = parseFloat(hfTopK)
if (frequencyPenalty) obj.frequencyPenalty = parseInt(frequencyPenalty, 10)
if (endpoint) obj.endpoint = endpoint

Expand Down
2 changes: 1 addition & 1 deletion packages/components/nodes/chatmodels/ChatLocalAI/ChatLocalAI.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class ChatLocalAI_ChatModels implements INode {
}

if (maxTokens) obj.maxTokens = parseInt(maxTokens, 10)
if (topP) obj.topP = parseInt(topP, 10)
if (topP) obj.topP = parseFloat(topP)
if (timeout) obj.timeout = parseInt(timeout, 10)

const model = new OpenAIChat(obj, { basePath })
Expand Down
2 changes: 1 addition & 1 deletion packages/components/nodes/chatmodels/ChatOpenAI/ChatOpenAI.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ class ChatOpenAI_ChatModels implements INode {
}

if (maxTokens) obj.maxTokens = parseInt(maxTokens, 10)
if (topP) obj.topP = parseInt(topP, 10)
if (topP) obj.topP = parseFloat(topP)
if (frequencyPenalty) obj.frequencyPenalty = parseInt(frequencyPenalty, 10)
if (presencePenalty) obj.presencePenalty = parseInt(presencePenalty, 10)
if (timeout) obj.timeout = parseInt(timeout, 10)
Expand Down
2 changes: 1 addition & 1 deletion packages/components/nodes/llms/Azure OpenAI/AzureOpenAI.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ class AzureOpenAI_LLMs implements INode {
}

if (maxTokens) obj.maxTokens = parseInt(maxTokens, 10)
if (topP) obj.topP = parseInt(topP, 10)
if (topP) obj.topP = parseFloat(topP)
if (frequencyPenalty) obj.frequencyPenalty = parseInt(frequencyPenalty, 10)
if (presencePenalty) obj.presencePenalty = parseInt(presencePenalty, 10)
if (timeout) obj.timeout = parseInt(timeout, 10)
Expand Down
4 changes: 2 additions & 2 deletions packages/components/nodes/llms/HuggingFaceInference/HuggingFaceInference.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ class HuggingFaceInference_LLMs implements INode {

if (temperature) obj.temperature = parseFloat(temperature)
if (maxTokens) obj.maxTokens = parseInt(maxTokens, 10)
if (topP) obj.topP = parseInt(topP, 10)
if (hfTopK) obj.topK = parseInt(hfTopK, 10)
if (topP) obj.topP = parseFloat(topP)
if (hfTopK) obj.topK = parseFloat(hfTopK)
if (frequencyPenalty) obj.frequencyPenalty = parseInt(frequencyPenalty, 10)
if (endpoint) obj.endpoint = endpoint

Expand Down
2 changes: 1 addition & 1 deletion packages/components/nodes/llms/OpenAI/OpenAI.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ class OpenAI_LLMs implements INode {
}

if (maxTokens) obj.maxTokens = parseInt(maxTokens, 10)
if (topP) obj.topP = parseInt(topP, 10)
if (topP) obj.topP = parseFloat(topP)
if (frequencyPenalty) obj.frequencyPenalty = parseInt(frequencyPenalty, 10)
if (presencePenalty) obj.presencePenalty = parseInt(presencePenalty, 10)
if (timeout) obj.timeout = parseInt(timeout, 10)
Expand Down
2 changes: 1 addition & 1 deletion packages/components/nodes/vectorstores/Chroma_Existing/Chroma_Existing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class Chroma_Existing_VectorStores implements INode {
const chromaURL = nodeData.inputs?.chromaURL as string
const output = nodeData.outputs?.output as string
const topK = nodeData.inputs?.topK as string
const k = topK ? parseInt(topK, 10) : 4
const k = topK ? parseFloat(topK) : 4
HenryHengZJ marked this conversation as resolved.
Show resolved Hide resolved

const obj: {
collectionName: string
Expand Down
2 changes: 1 addition & 1 deletion packages/components/nodes/vectorstores/Chroma_Upsert/Chroma_Upsert.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ class ChromaUpsert_VectorStores implements INode {
const chromaURL = nodeData.inputs?.chromaURL as string
const output = nodeData.outputs?.output as string
const topK = nodeData.inputs?.topK as string
const k = topK ? parseInt(topK, 10) : 4
const k = topK ? parseFloat(topK) : 4

const flattenDocs = docs && docs.length ? flatten(docs) : []
const finalDocs = []
Expand Down
2 changes: 1 addition & 1 deletion packages/components/nodes/vectorstores/Faiss_Existing/Faiss_Existing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class Faiss_Existing_VectorStores implements INode {
const basePath = nodeData.inputs?.basePath as string
const output = nodeData.outputs?.output as string
const topK = nodeData.inputs?.topK as string
const k = topK ? parseInt(topK, 10) : 4
const k = topK ? parseFloat(topK) : 4

const vectorStore = await FaissStore.load(basePath, embeddings)

Expand Down
2 changes: 1 addition & 1 deletion packages/components/nodes/vectorstores/Faiss_Upsert/Faiss_Upsert.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class FaissUpsert_VectorStores implements INode {
const output = nodeData.outputs?.output as string
const basePath = nodeData.inputs?.basePath as string
const topK = nodeData.inputs?.topK as string
const k = topK ? parseInt(topK, 10) : 4
const k = topK ? parseFloat(topK) : 4

const flattenDocs = docs && docs.length ? flatten(docs) : []
const finalDocs = []
Expand Down
2 changes: 1 addition & 1 deletion packages/components/nodes/vectorstores/InMemory/InMemoryVectorStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class InMemoryVectorStore_VectorStores implements INode {
const embeddings = nodeData.inputs?.embeddings as Embeddings
const output = nodeData.outputs?.output as string
const topK = nodeData.inputs?.topK as string
const k = topK ? parseInt(topK, 10) : 4
const k = topK ? parseFloat(topK) : 4

const flattenDocs = docs && docs.length ? flatten(docs) : []
const finalDocs = []
Expand Down
2 changes: 1 addition & 1 deletion packages/components/nodes/vectorstores/OpenSearch_Existing/OpenSearch_existing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class OpenSearch_Existing_VectorStores implements INode {
const indexName = nodeData.inputs?.indexName as string
const output = nodeData.outputs?.output as string
const topK = nodeData.inputs?.topK as string
const k = topK ? parseInt(topK, 10) : 4
const k = topK ? parseFloat(topK) : 4

const client = new Client({
nodes: [opensearchURL]
Expand Down
2 changes: 1 addition & 1 deletion packages/components/nodes/vectorstores/OpenSearch_Upsert/OpenSearch_Upsert.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class OpenSearchUpsert_VectorStores implements INode {
const indexName = nodeData.inputs?.indexName as string
const output = nodeData.outputs?.output as string
const topK = nodeData.inputs?.topK as string
const k = topK ? parseInt(topK, 10) : 4
const k = topK ? parseFloat(topK) : 4

const flattenDocs = docs && docs.length ? flatten(docs) : []
const finalDocs = []
Expand Down
2 changes: 1 addition & 1 deletion packages/components/nodes/vectorstores/Pinecone_Existing/Pinecone_Existing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class Pinecone_Existing_VectorStores implements INode {
const embeddings = nodeData.inputs?.embeddings as Embeddings
const output = nodeData.outputs?.output as string
const topK = nodeData.inputs?.topK as string
const k = topK ? parseInt(topK, 10) : 4
const k = topK ? parseFloat(topK) : 4

const client = new PineconeClient()
await client.init({
Expand Down
2 changes: 1 addition & 1 deletion packages/components/nodes/vectorstores/Pinecone_Upsert/Pinecone_Upsert.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class PineconeUpsert_VectorStores implements INode {
const embeddings = nodeData.inputs?.embeddings as Embeddings
const output = nodeData.outputs?.output as string
const topK = nodeData.inputs?.topK as string
const k = topK ? parseInt(topK, 10) : 4
const k = topK ? parseFloat(topK) : 4

const client = new PineconeClient()
await client.init({
Expand Down
2 changes: 1 addition & 1 deletion packages/components/nodes/vectorstores/Qdrant_Existing/Qdrant_Existing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class Qdrant_Existing_VectorStores implements INode {
const embeddings = nodeData.inputs?.embeddings as Embeddings
const output = nodeData.outputs?.output as string
const topK = nodeData.inputs?.topK as string
const k = topK ? parseInt(topK, 10) : 4
const k = topK ? parseFloat(topK) : 4

// connect to Qdrant Cloud
const client = new QdrantClient({
Expand Down
2 changes: 1 addition & 1 deletion packages/components/nodes/vectorstores/Qdrant_Upsert/Qdrant_Upsert.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ class QdrantUpsert_VectorStores implements INode {
const embeddings = nodeData.inputs?.embeddings as Embeddings
const output = nodeData.outputs?.output as string
const topK = nodeData.inputs?.topK as string
const k = topK ? parseInt(topK, 10) : 4
const k = topK ? parseFloat(topK) : 4

// connect to Qdrant Cloud
const client = new QdrantClient({
Expand Down
2 changes: 1 addition & 1 deletion packages/components/nodes/vectorstores/Singlestore_Existing/Singlestore_Existing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ class SingleStoreExisting_VectorStores implements INode {
const embeddings = nodeData.inputs?.embeddings as Embeddings
const output = nodeData.outputs?.output as string
const topK = nodeData.inputs?.topK as string
const k = topK ? parseInt(topK, 10) : 4
const k = topK ? parseFloat(topK) : 4

let vectorStore: SingleStoreVectorStore

Expand Down
2 changes: 1 addition & 1 deletion packages/components/nodes/vectorstores/Singlestore_Upsert/Singlestore_Upsert.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ class SingleStoreUpsert_VectorStores implements INode {
const embeddings = nodeData.inputs?.embeddings as Embeddings
const output = nodeData.outputs?.output as string
const topK = nodeData.inputs?.topK as string
const k = topK ? parseInt(topK, 10) : 4
const k = topK ? parseFloat(topK) : 4

const flattenDocs = docs && docs.length ? flatten(docs) : []
const finalDocs = []
Expand Down
2 changes: 1 addition & 1 deletion packages/components/nodes/vectorstores/Supabase_Existing/Supabase_Exisiting.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ class Supabase_Existing_VectorStores implements INode {
const supabaseMetadataFilter = nodeData.inputs?.supabaseMetadataFilter
const output = nodeData.outputs?.output as string
const topK = nodeData.inputs?.topK as string
const k = topK ? parseInt(topK, 10) : 4
const k = topK ? parseFloat(topK) : 4

const client = createClient(supabaseProjUrl, supabaseApiKey)

Expand Down
2 changes: 1 addition & 1 deletion packages/components/nodes/vectorstores/Supabase_Upsert/Supabase_Upsert.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ class SupabaseUpsert_VectorStores implements INode {
const embeddings = nodeData.inputs?.embeddings as Embeddings
const output = nodeData.outputs?.output as string
const topK = nodeData.inputs?.topK as string
const k = topK ? parseInt(topK, 10) : 4
const k = topK ? parseFloat(topK) : 4

const client = createClient(supabaseProjUrl, supabaseApiKey)

Expand Down
2 changes: 1 addition & 1 deletion packages/components/nodes/vectorstores/Weaviate_Existing/Weaviate_Existing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ class Weaviate_Existing_VectorStores implements INode {
const embeddings = nodeData.inputs?.embeddings as Embeddings
const output = nodeData.outputs?.output as string
const topK = nodeData.inputs?.topK as string
const k = topK ? parseInt(topK, 10) : 4
const k = topK ? parseFloat(topK) : 4

const clientConfig: any = {
scheme: weaviateScheme,
Expand Down
2 changes: 1 addition & 1 deletion packages/components/nodes/vectorstores/Weaviate_Upsert/Weaviate_Upsert.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ class WeaviateUpsert_VectorStores implements INode {
const embeddings = nodeData.inputs?.embeddings as Embeddings
const output = nodeData.outputs?.output as string
const topK = nodeData.inputs?.topK as string
const k = topK ? parseInt(topK, 10) : 4
const k = topK ? parseFloat(topK) : 4

const clientConfig: any = {
scheme: weaviateScheme,
Expand Down