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

Fix Docke Compose file to use KernelMemory instead of SemanticMemory #720

Merged
merged 9 commits into from
Dec 20, 2023
Merged

Fix Docke Compose file to use KernelMemory instead of SemanticMemory #720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7a4438c
Add build image run workflow
huangyingting Oct 20, 2023
8c0a4a4
Update webapi .env.example
huangyingting Oct 20, 2023
a445e9e
Merge branch 'microsoft:main' into main
huangyingting Nov 3, 2023
a8f7f1e
Merge branch 'microsoft:main' into main
huangyingting Nov 8, 2023
78ee374
Merge branch 'microsoft:main' into main
huangyingting Nov 14, 2023
39c3458
Merge branch 'microsoft:main' into main
huangyingting Dec 1, 2023
47d3bce
Merge branch 'microsoft:main' into main
huangyingting Dec 8, 2023
d1b304e
Rename SemanticMemory to KernelMemory
huangyingting Dec 8, 2023
84ba527
Remove local build pipeline
huangyingting Dec 8, 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
60 changes: 30 additions & 30 deletions docker/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,21 +48,21 @@ services:
- webapi/.env
environment:
- Authentication__Type=AzureAd
- SemanticMemory__Services__Qdrant__Endpoint=http://qdrant:6333
- SemanticMemory__Services__Qdrant__APIKey=chat-copilot
- SemanticMemory__Services__RabbitMq__Host=rabbitmq
- SemanticMemory__Services__RabbitMq__Port=5672
- SemanticMemory__Services__RabbitMq__Username=chat-copilot
- SemanticMemory__Services__RabbitMq__Password=chat-copilot
- SemanticMemory__ContentStorageType=AzureBlobs
- SemanticMemory__ImageOcrType=Tesseract
- SemanticMemory__TextGeneratorType=AzureOpenAI
- SemanticMemory__DataIngestion__OrchestrationType=Distributed
- SemanticMemory__DataIngestion__DistributedOrchestration__QueueType=RabbitMQ
- SemanticMemory__DataIngestion__VectorDbTypes__0=Qdrant
- SemanticMemory__DataIngestion__EmbeddingGeneratorTypes__0=AzureOpenAI
- SemanticMemory__Retrieval__EmbeddingGeneratorType=AzureOpenAI
- SemanticMemory__Retrieval__VectorDbType=Qdrant
- KernelMemory__Services__Qdrant__Endpoint=http://qdrant:6333
- KernelMemory__Services__Qdrant__APIKey=chat-copilot
- KernelMemory__Services__RabbitMq__Host=rabbitmq
- KernelMemory__Services__RabbitMq__Port=5672
- KernelMemory__Services__RabbitMq__Username=chat-copilot
- KernelMemory__Services__RabbitMq__Password=chat-copilot
- KernelMemory__ContentStorageType=AzureBlobs
- KernelMemory__ImageOcrType=Tesseract
- KernelMemory__TextGeneratorType=AzureOpenAI
- KernelMemory__DataIngestion__OrchestrationType=Distributed
- KernelMemory__DataIngestion__DistributedOrchestration__QueueType=RabbitMQ
- KernelMemory__DataIngestion__VectorDbTypes__0=Qdrant
- KernelMemory__DataIngestion__EmbeddingGeneratorTypes__0=AzureOpenAI
- KernelMemory__Retrieval__EmbeddingGeneratorType=AzureOpenAI
- KernelMemory__Retrieval__VectorDbType=Qdrant
- Plugins__1__Name=WebSearcher
- Plugins__1__ManifestDomain=http://web-searcher
- Plugins__1__Key=chat-copilot
Expand Down Expand Up @@ -117,21 +117,21 @@ services:
env_file:
- memorypipeline/.env
environment:
- SemanticMemory__Services__Qdrant__Endpoint=http://qdrant:6333
- SemanticMemory__Services__Qdrant__APIKey=chat-copilot
- SemanticMemory__Services__RabbitMq__Host=rabbitmq
- SemanticMemory__Services__RabbitMq__Port=5672
- SemanticMemory__Services__RabbitMq__Username=chat-copilot
- SemanticMemory__Services__RabbitMq__Password=chat-copilot
- SemanticMemory__ContentStorageType=AzureBlobs
- SemanticMemory__ImageOcrType=Tesseract
- SemanticMemory__TextGeneratorType=AzureOpenAI
- SemanticMemory__DataIngestion__OrchestrationType=Distributed
- SemanticMemory__DataIngestion__DistributedOrchestration__QueueType=RabbitMQ
- SemanticMemory__DataIngestion__VectorDbTypes__0=Qdrant
- SemanticMemory__DataIngestion__EmbeddingGeneratorTypes__0=AzureOpenAI
- SemanticMemory__Retrieval__EmbeddingGeneratorType=AzureOpenAI
- SemanticMemory__Retrieval__VectorDbType=Qdrant
- KernelMemory__Services__Qdrant__Endpoint=http://qdrant:6333
- KernelMemory__Services__Qdrant__APIKey=chat-copilot
- KernelMemory__Services__RabbitMq__Host=rabbitmq
- KernelMemory__Services__RabbitMq__Port=5672
- KernelMemory__Services__RabbitMq__Username=chat-copilot
- KernelMemory__Services__RabbitMq__Password=chat-copilot
- KernelMemory__ContentStorageType=AzureBlobs
- KernelMemory__ImageOcrType=Tesseract
- KernelMemory__TextGeneratorType=AzureOpenAI
- KernelMemory__DataIngestion__OrchestrationType=Distributed
- KernelMemory__DataIngestion__DistributedOrchestration__QueueType=RabbitMQ
- KernelMemory__DataIngestion__VectorDbTypes__0=Qdrant
- KernelMemory__DataIngestion__EmbeddingGeneratorTypes__0=AzureOpenAI
- KernelMemory__Retrieval__EmbeddingGeneratorType=AzureOpenAI
- KernelMemory__Retrieval__VectorDbType=Qdrant
depends_on:
qdrant:
condition: service_started
Expand Down
16 changes: 8 additions & 8 deletions docker/memorypipeline/.env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Azure OpenAI embedding settings
SemanticMemory__Services__AzureOpenAIEmbedding__Deployment=
SemanticMemory__Services__AzureOpenAIEmbedding__Endpoint=
SemanticMemory__Services__AzureOpenAIEmbedding__APIKey=
KernelMemory__Services__AzureOpenAIEmbedding__Deployment=
KernelMemory__Services__AzureOpenAIEmbedding__Endpoint=
KernelMemory__Services__AzureOpenAIEmbedding__APIKey=

# Azure OpenAI text settings
SemanticMemory__Services__AzureOpenAIText__Deployment=
SemanticMemory__Services__AzureOpenAIText__Endpoint=
SemanticMemory__Services__AzureOpenAIText__APIKey=
KernelMemory__Services__AzureOpenAIText__Deployment=
KernelMemory__Services__AzureOpenAIText__Endpoint=
KernelMemory__Services__AzureOpenAIText__APIKey=

# Azure blob
SemanticMemory__Services__AzureBlobs__Auth=
SemanticMemory__Services__AzureBlobs__ConnectionString=
KernelMemory__Services__AzureBlobs__Auth=
KernelMemory__Services__AzureBlobs__ConnectionString=
16 changes: 8 additions & 8 deletions docker/webapi/.env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ AzureSpeech__Region=
AzureSpeech__Key=

# Azure OpenAI embedding settings
SemanticMemory__Services__AzureOpenAIEmbedding__Deployment=
SemanticMemory__Services__AzureOpenAIEmbedding__Endpoint=
SemanticMemory__Services__AzureOpenAIEmbedding__APIKey=
KernelMemory__Services__AzureOpenAIEmbedding__Deployment=
KernelMemory__Services__AzureOpenAIEmbedding__Endpoint=
KernelMemory__Services__AzureOpenAIEmbedding__APIKey=

# Azure OpenAI text settings
SemanticMemory__Services__AzureOpenAIText__Deployment=
SemanticMemory__Services__AzureOpenAIText__Endpoint=
SemanticMemory__Services__AzureOpenAIText__APIKey=
KernelMemory__Services__AzureOpenAIText__Deployment=
KernelMemory__Services__AzureOpenAIText__Endpoint=
KernelMemory__Services__AzureOpenAIText__APIKey=

# Azure blobs settings
SemanticMemory__Services__AzureBlobs__Auth=
SemanticMemory__Services__AzureBlobs__ConnectionString=
KernelMemory__Services__AzureBlobs__Auth=
KernelMemory__Services__AzureBlobs__ConnectionString=