Skip to content

Commit aacf406

Browse files
committed
Merge main into update-ruby-on-rails-tutorial
Resolved conflict in test/test-markdown-frontmatter.js by merging tags arrays from both branches. Kept 'Rails' and 'Couchbase ORM' tags from feature branch and added 'LlamaIndex', 'GraphQL', and 'Semantic Kernel' tags from main.
2 parents 13cca0f + a4e87de commit aacf406

File tree

60 files changed

+13788
-546
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+13788
-546
lines changed

test/test-markdown-frontmatter.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ const chalk = require('chalk')
66
// accepted data field values
77
const sdk_languages = ['nodejs', 'scala', 'python', 'swift', 'csharp', 'objective-c', 'android-java', 'any', 'java', 'kotlin', 'dart', 'golang', 'ruby', 'c++']
88

9-
const tags = ['Ottoman', 'Ktor', 'REST API', 'Express', 'Flask', 'TLS', 'Configuration', 'Next.js', 'iOS', 'Xcode', '.NET', 'Xamarin', 'Authentication', 'OpenID', 'Keycloak', 'Android', 'P2P', 'UIKit', 'Installation', 'Spring Boot', 'Spring Data', 'Transactions', 'SQL++ (N1QL)', 'Optimization', 'Community Edition', 'Docker', 'Data Modeling', 'Metadata', 'Best Practices', 'Data Ingestion', 'Kafka', 'Support', 'Customer', 'Prometheus', 'Monitoring', 'Observability', 'Metrics', 'Query Workbench', 'ASP.NET', 'linq', 'DBaaS', 'App Services', 'Flutter', 'Gin Gonic', 'FastAPI', 'Rails', 'Couchbase ORM', 'LangChain', 'OpenAI', 'Streamlit', 'Google Gemini', 'Nvidia NIM', 'LLama3', 'AWS', 'Artificial Intelligence', 'Cohere', 'Jina AI', 'Mistral AI', 'Ragas', 'Haystack', 'LangGraph', 'Amazon Bedrock', 'CrewAI', 'PydanticAI', 'C++', 'C++ SDK', 'smolagents', 'Ag2', 'Autogen', 'Couchbase Edge Server', 'Deepseek', 'OpenRouter', 'mastra', 'Looker Studio', 'Google Data Studio', 'Connector', 'Couchbase Columnar', 'TAVs', 'Custom Queries', 'Data API', 'FTS', 'GSI', 'Hugging Face']
9+
const tags = ['Ottoman', 'Ktor', 'REST API', 'Express', 'Flask', 'TLS', 'Configuration', 'Next.js', 'iOS', 'Xcode', '.NET', 'Xamarin', 'Authentication', 'OpenID', 'Keycloak', 'Android', 'P2P', 'UIKit', 'Installation', 'Spring Boot', 'Spring Data', 'Transactions', 'SQL++ (N1QL)', 'Optimization', 'Community Edition', 'Docker', 'Data Modeling', 'Metadata', 'Best Practices', 'Data Ingestion', 'Kafka', 'Support', 'Customer', 'Prometheus', 'Monitoring', 'Observability', 'Metrics', 'Query Workbench', 'ASP.NET', 'linq', 'DBaaS', 'App Services', 'Flutter', 'Gin Gonic', 'FastAPI', 'Rails', 'Couchbase ORM', 'LangChain', 'OpenAI', 'Streamlit', 'Google Gemini', 'Nvidia NIM', 'LLama3', 'AWS', 'Artificial Intelligence', 'Cohere', 'Jina AI', 'Mistral AI', 'Ragas', 'Haystack', 'LangGraph', 'Amazon Bedrock', 'CrewAI', 'PydanticAI', 'C++', 'C++ SDK', 'smolagents', 'Ag2', 'Autogen', 'Couchbase Edge Server', 'Deepseek', 'OpenRouter', 'mastra', 'Looker Studio', 'Google Data Studio', 'Connector', 'Couchbase Columnar', 'TAVs', 'Custom Queries', 'Data API', 'FTS', 'GSI', 'Hugging Face', 'LlamaIndex', 'GraphQL', 'Semantic Kernel']
1010

11-
const technologies = ['connectors', 'kv', 'query', 'capella', 'server', 'index', 'mobile', 'fts', 'sync gateway', 'eventing', 'analytics', 'udf', 'vector search', 'react', 'edge-server', 'app-services']
11+
const technologies = ['connectors', 'kv', 'query', 'capella', 'server', 'index', 'mobile', 'fts', 'sync gateway', 'eventing', 'analytics', 'udf', 'vector search', 'react', 'edge-server', 'app-services', 'hyperscale vector index', 'composite vector index']
1212

1313
const content_types = ['quickstart', 'tutorial', 'learn']
1414

tutorial/markdown/aspnet/semantic-kernel/semantic-kernel-tutorial.md

Lines changed: 394 additions & 0 deletions
Large diffs are not rendered by default.

tutorial/markdown/generated/vector-search-cookbook/agentchat_RetrieveChat_couchbase.md renamed to tutorial/markdown/generated/vector-search-cookbook/ag2-agentchat_RetrieveChat_couchbase.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ filter: sdk
1212
technology:
1313
- vector search
1414
tags:
15+
- FTS
1516
- Artificial Intelligence
1617
- Autogen
1718
- Ag2

tutorial/markdown/generated/vector-search-cookbook/Bedrock_Agents_Custom_Control.md renamed to tutorial/markdown/generated/vector-search-cookbook/awsbedrock-agents-custom-control-approach-Bedrock_Agents_Custom_Control.md

File renamed without changes.

tutorial/markdown/generated/vector-search-cookbook/Bedrock_Agents_Lambda.md renamed to tutorial/markdown/generated/vector-search-cookbook/awsbedrock-agents-lambda-approach-Bedrock_Agents_Lambda.md

File renamed without changes.

tutorial/markdown/generated/vector-search-cookbook/awsbedrock-fts-RAG_with_Couchbase_and_Bedrock.md

Lines changed: 814 additions & 0 deletions
Large diffs are not rendered by default.

tutorial/markdown/generated/vector-search-cookbook/RAG_with_Couchbase_and_Bedrock.md renamed to tutorial/markdown/generated/vector-search-cookbook/awsbedrock-gsi-RAG_with_Couchbase_and_Bedrock.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ filter: sdk
1212
technology:
1313
- vector search
1414
tags:
15+
- GSI
1516
- Artificial Intelligence
1617
- LangChain
1718
- Amazon Bedrock
@@ -32,7 +33,7 @@ In this guide, we will walk you through building a powerful semantic search engi
3233

3334
# How to run this tutorial
3435

35-
This tutorial is available as a Jupyter Notebook (`.ipynb` file) that you can run interactively. You can access the original notebook [here](https://github.com/couchbase-examples/vector-search-cookbook/blob/main/awsbedrock/RAG_with_Couchbase_and_Bedrock.ipynb).
36+
This tutorial is available as a Jupyter Notebook (`.ipynb` file) that you can run interactively. You can access the original notebook [here](https://github.com/couchbase-examples/vector-search-cookbook/blob/main/awsbedrock/gsi/RAG_with_Couchbase_and_Bedrock.ipynb).
3637

3738
You can either download the notebook file and run it on [Google Colab](https://colab.research.google.com/) or run it on your system by setting up the Python environment.
3839

tutorial/markdown/generated/vector-search-cookbook/azure-fts-RAG_with_Couchbase_and_AzureOpenAI.md

Lines changed: 605 additions & 0 deletions
Large diffs are not rendered by default.

tutorial/markdown/generated/vector-search-cookbook/RAG_with_Couchbase_and_AzureOpenAI.md renamed to tutorial/markdown/generated/vector-search-cookbook/azure-gsi-RAG_with_Couchbase_and_AzureOpenAI.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ filter: sdk
1212
technology:
1313
- vector search
1414
tags:
15+
- GSI
1516
- Artificial Intelligence
1617
- LangChain
1718
- OpenAI
@@ -31,7 +32,7 @@ In this guide, we will walk you through building a powerful semantic search engi
3132

3233
# How to run this tutorial
3334

34-
This tutorial is available as a Jupyter Notebook (`.ipynb` file) that you can run interactively. You can access the original notebook [here](https://github.com/couchbase-examples/vector-search-cookbook/blob/main/azure/RAG_with_Couchbase_and_AzureOpenAI.ipynb).
35+
This tutorial is available as a Jupyter Notebook (`.ipynb` file) that you can run interactively. You can access the original notebook [here](https://github.com/couchbase-examples/vector-search-cookbook/blob/main/azure/gsi/RAG_with_Couchbase_and_AzureOpenAI.ipynb).
3536

3637
You can either download the notebook file and run it on [Google Colab](https://colab.research.google.com/) or run it on your system by setting up the Python environment.
3738

0 commit comments

Comments
 (0)