From 7a4438c3d51dccaac2ecb60298665e048a464530 Mon Sep 17 00:00:00 2001 From: huangyingting Date: Fri, 20 Oct 2023 21:56:39 +0000 Subject: [PATCH 1/4] Add build image run workflow --- .../workflows/copilot-build-images-run.yml | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .github/workflows/copilot-build-images-run.yml diff --git a/.github/workflows/copilot-build-images-run.yml b/.github/workflows/copilot-build-images-run.yml new file mode 100644 index 000000000..9b53fb50d --- /dev/null +++ b/.github/workflows/copilot-build-images-run.yml @@ -0,0 +1,35 @@ +name: copilot-build-images-run + +on: + push: + branches: + - "main" + tags: + - "v*" + paths: + - "webapi/**" + - "webapp/**" + - "plugins/**" + - "memorypipeline/**" + - "shared/**" + - ".github/workflows/copilot-build-images-run.yml" + pull_request: + branches: + - "main" + paths: + - "webapi/**" + - "webapp/**" + - "plugins/**" + - "memorypipeline/**" + - "shared/**" + - ".github/workflows/copilot-build-images-run.yml" + +jobs: + copilot-build-images: + uses: ./.github/workflows/copilot-build-images.yml + with: + REACT_APP_BACKEND_URI: ${{ vars.REACT_APP_BACKEND_URI }} + AZURE_FUNCTION_MASTER_KEY: ${{ vars.AZURE_FUNCTION_MASTER_KEY }} + permissions: + contents: read + packages: write From 8c0a4a4bd2c03586129f8bee8fd86e7e84e6b7d6 Mon Sep 17 00:00:00 2001 From: huangyingting Date: Fri, 20 Oct 2023 22:16:55 +0000 Subject: [PATCH 2/4] Update webapi .env.example --- docker/webapi/.env.example | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/webapi/.env.example b/docker/webapi/.env.example index aa410589f..bf7b1f039 100644 --- a/docker/webapi/.env.example +++ b/docker/webapi/.env.example @@ -18,3 +18,6 @@ SemanticMemory__Services__AzureOpenAIText__Deployment= SemanticMemory__Services__AzureOpenAIText__Endpoint= SemanticMemory__Services__AzureOpenAIText__APIKey= +# Azure blobs settings +SemanticMemory__Services__AzureBlobs__Auth= +SemanticMemory__Services__AzureBlobs__ConnectionString= \ No newline at end of file From d1b304e895c1c98a4d1c38471c8854237cf18407 Mon Sep 17 00:00:00 2001 From: Yingting Huang Date: Fri, 8 Dec 2023 20:00:00 +0800 Subject: [PATCH 3/4] Rename SemanticMemory to KernelMemory --- docker/docker-compose.yaml | 60 +++++++++++++++--------------- docker/memorypipeline/.env.example | 16 ++++---- docker/webapi/.env.example | 16 ++++---- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index 563b825ea..3f8d10c0f 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -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 @@ -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 diff --git a/docker/memorypipeline/.env.example b/docker/memorypipeline/.env.example index ed54f8d28..6d37f0869 100644 --- a/docker/memorypipeline/.env.example +++ b/docker/memorypipeline/.env.example @@ -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= \ No newline at end of file +KernelMemory__Services__AzureBlobs__Auth= +KernelMemory__Services__AzureBlobs__ConnectionString= \ No newline at end of file diff --git a/docker/webapi/.env.example b/docker/webapi/.env.example index bf7b1f039..65e911592 100644 --- a/docker/webapi/.env.example +++ b/docker/webapi/.env.example @@ -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= \ No newline at end of file +KernelMemory__Services__AzureBlobs__Auth= +KernelMemory__Services__AzureBlobs__ConnectionString= \ No newline at end of file From 84ba527da8efc8baaebb08f75144a491ab005e86 Mon Sep 17 00:00:00 2001 From: Yingting Huang Date: Fri, 8 Dec 2023 20:02:00 +0800 Subject: [PATCH 4/4] Remove local build pipeline --- .../workflows/copilot-build-images-run.yml | 35 ------------------- 1 file changed, 35 deletions(-) delete mode 100644 .github/workflows/copilot-build-images-run.yml diff --git a/.github/workflows/copilot-build-images-run.yml b/.github/workflows/copilot-build-images-run.yml deleted file mode 100644 index 9b53fb50d..000000000 --- a/.github/workflows/copilot-build-images-run.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: copilot-build-images-run - -on: - push: - branches: - - "main" - tags: - - "v*" - paths: - - "webapi/**" - - "webapp/**" - - "plugins/**" - - "memorypipeline/**" - - "shared/**" - - ".github/workflows/copilot-build-images-run.yml" - pull_request: - branches: - - "main" - paths: - - "webapi/**" - - "webapp/**" - - "plugins/**" - - "memorypipeline/**" - - "shared/**" - - ".github/workflows/copilot-build-images-run.yml" - -jobs: - copilot-build-images: - uses: ./.github/workflows/copilot-build-images.yml - with: - REACT_APP_BACKEND_URI: ${{ vars.REACT_APP_BACKEND_URI }} - AZURE_FUNCTION_MASTER_KEY: ${{ vars.AZURE_FUNCTION_MASTER_KEY }} - permissions: - contents: read - packages: write