Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion docker/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -162,4 +162,11 @@ JWT_REFRESH_TOKEN_EXPIRY_IN_MINUTES=43200
# REDIS_KEY=
# REDIS_CA=
# REDIS_KEEP_ALIVE=
# ENABLE_BULLMQ_DASHBOARD=
# ENABLE_BULLMQ_DASHBOARD=

############################################################################################################
############################################# OLLAMA DEFAULTS ##############################################
############################################################################################################
# OLLAMA_DEFAULT_BASE_URL=http://host.docker.internal:11434
# OLLAMA_DEFAULT_MODEL=llama3.2
# OLLAMA_DEFAULT_EMBEDDING_MODEL=nomic-embed-text
7 changes: 4 additions & 3 deletions packages/components/nodes/chatmodels/ChatOllama/ChatOllama.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { ChatOllamaInput } from '@langchain/ollama'
import { BaseChatModelParams } from '@langchain/core/language_models/chat_models'
import { BaseCache } from '@langchain/core/caches'
import { IMultiModalOption, INode, INodeData, INodeParams } from '../../../src/Interface'
import { getBaseClasses } from '../../../src/utils'
import { getBaseClasses, getEnvironmentVariable } from '../../../src/utils'
import { ChatOllama } from './FlowiseChatOllama'

class ChatOllama_ChatModels implements INode {
Expand Down Expand Up @@ -37,13 +37,14 @@ class ChatOllama_ChatModels implements INode {
label: 'Base URL',
name: 'baseUrl',
type: 'string',
default: 'http://localhost:11434'
default: getEnvironmentVariable('OLLAMA_DEFAULT_BASE_URL') ?? 'http://localhost:11434'
},
{
label: 'Model Name',
name: 'modelName',
type: 'string',
placeholder: 'llama2'
placeholder: 'llama2',
default: getEnvironmentVariable('OLLAMA_DEFAULT_MODEL') ?? ''
},
{
label: 'Temperature',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { INode, INodeData, INodeParams } from '../../../src/Interface'
import { getBaseClasses } from '../../../src/utils'
import { getBaseClasses, getEnvironmentVariable } from '../../../src/utils'
import { OllamaParams, Ollama } from 'llamaindex'

class ChatOllama_LlamaIndex_ChatModels implements INode {
Expand Down Expand Up @@ -29,13 +29,14 @@ class ChatOllama_LlamaIndex_ChatModels implements INode {
label: 'Base URL',
name: 'baseUrl',
type: 'string',
default: 'http://localhost:11434'
default: getEnvironmentVariable('OLLAMA_DEFAULT_BASE_URL') ?? 'http://localhost:11434'
},
{
label: 'Model Name',
name: 'modelName',
type: 'string',
placeholder: 'llama3'
placeholder: 'llama3',
default: getEnvironmentVariable('OLLAMA_DEFAULT_MODEL') ?? ''
},
{
label: 'Temperature',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { OllamaEmbeddings } from '@langchain/community/embeddings/ollama'
import { OllamaInput } from '@langchain/community/llms/ollama'
import { INode, INodeData, INodeParams } from '../../../src/Interface'
import { getBaseClasses } from '../../../src/utils'
import { getBaseClasses, getEnvironmentVariable } from '../../../src/utils'

class OllamaEmbedding_Embeddings implements INode {
label: string
Expand Down Expand Up @@ -29,13 +29,14 @@ class OllamaEmbedding_Embeddings implements INode {
label: 'Base URL',
name: 'baseUrl',
type: 'string',
default: 'http://localhost:11434'
default: getEnvironmentVariable('OLLAMA_DEFAULT_BASE_URL') ?? 'http://localhost:11434'
},
{
label: 'Model Name',
name: 'modelName',
type: 'string',
placeholder: 'llama2'
placeholder: 'nomic-embed-text',
default: getEnvironmentVariable('OLLAMA_DEFAULT_EMBEDDING_MODEL') ?? ''
},
{
label: 'Number of GPU',
Expand Down
7 changes: 4 additions & 3 deletions packages/components/nodes/llms/Ollama/Ollama.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Ollama, OllamaInput } from '@langchain/community/llms/ollama'
import { BaseCache } from '@langchain/core/caches'
import { BaseLLMParams } from '@langchain/core/language_models/llms'
import { INode, INodeData, INodeParams } from '../../../src/Interface'
import { getBaseClasses } from '../../../src/utils'
import { getBaseClasses, getEnvironmentVariable } from '../../../src/utils'

class Ollama_LLMs implements INode {
label: string
Expand Down Expand Up @@ -36,13 +36,14 @@ class Ollama_LLMs implements INode {
label: 'Base URL',
name: 'baseUrl',
type: 'string',
default: 'http://localhost:11434'
default: getEnvironmentVariable('OLLAMA_DEFAULT_BASE_URL') ?? 'http://localhost:11434'
},
{
label: 'Model Name',
name: 'modelName',
type: 'string',
placeholder: 'llama2'
placeholder: 'llama2',
default: getEnvironmentVariable('OLLAMA_DEFAULT_MODEL') ?? ''
},
{
label: 'Temperature',
Expand Down