addresses feedback and cleans up azure

Signed-off-by: Adrian Cole <[email protected]>

Author: codefromthecrypt

example-apps/chatbot-rag-app/README.md

@@ -24,8 +24,7 @@ Copy [env.example](env.example) to `.env` and fill in values noted inside.
 There are a number of ways to install Elasticsearch. Cloud is best for most
 use-cases. Visit the [Install Elasticsearch](https://www.elastic.co/search-labs/tutorials/install-elasticsearch) for more information.
 
-Once you decided your approach, edit your `.env` file corresponding to your
-Elastic Cloud or self-hosted Elasticsearch instance.
+Once you decided your approach, edit your `.env` file accordingly.
 
 ### Elasticsearch index and chat_history index
 

example-apps/chatbot-rag-app/api/elasticsearch_client.py

@@ -6,21 +6,20 @@
 ELASTICSEARCH_URL = os.getenv("ELASTICSEARCH_URL")
 ELASTICSEARCH_USER = os.getenv("ELASTICSEARCH_USER")
 ELASTICSEARCH_PASSWORD = os.getenv("ELASTICSEARCH_PASSWORD")
-ELASTIC_CLOUD_ID = os.getenv("ELASTIC_CLOUD_ID")
-ELASTIC_API_KEY = os.getenv("ELASTIC_API_KEY")
+ELASTICSEARCH_API_KEY = os.getenv("ELASTICSEARCH_API_KEY")
 
-if ELASTICSEARCH_URL:
+if ELASTICSEARCH_USER:
     elasticsearch_client = Elasticsearch(
         hosts=[ELASTICSEARCH_URL],
         basic_auth=(ELASTICSEARCH_USER, ELASTICSEARCH_PASSWORD),
     )
-elif ELASTIC_CLOUD_ID:
+elif ELASTICSEARCH_API_KEY:
     elasticsearch_client = Elasticsearch(
-        cloud_id=ELASTIC_CLOUD_ID, api_key=ELASTIC_API_KEY
+        hosts=[ELASTICSEARCH_URL], api_key=ELASTICSEARCH_API_KEY
     )
 else:
     raise ValueError(
-        "Please provide either ELASTICSEARCH_URL or ELASTIC_CLOUD_ID and ELASTIC_API_KEY"
+        "Please provide either ELASTICSEARCH_USER or ELASTICSEARCH_API_KEY"
     )
 
 

example-apps/chatbot-rag-app/api/llm_integrations.py

@@ -7,7 +7,6 @@
 
 import os
 import vertexai
-import boto3
 
 LLM_TYPE = os.getenv("LLM_TYPE", "openai")
 
@@ -26,17 +25,8 @@ def init_vertex_chat(temperature):
 
 
 def init_azure_chat(temperature):
-    OPENAI_VERSION = os.getenv("OPENAI_VERSION", "2023-05-15")
-    BASE_URL = os.getenv("OPENAI_BASE_URL")
-    OPENAI_API_KEY = os.getenv("OPENAI_API_KEY")
-    OPENAI_ENGINE = os.getenv("OPENAI_ENGINE")
     return AzureChatOpenAI(
-        deployment_name=OPENAI_ENGINE,
-        openai_api_base=BASE_URL,
-        openai_api_version=OPENAI_VERSION,
-        openai_api_key=OPENAI_API_KEY,
-        streaming=True,
-        temperature=temperature,
+        model=os.getenv("CHAT_DEPLOYMENT"), streaming=True, temperature=temperature
     )
 
 

example-apps/chatbot-rag-app/data/index_data.py

@@ -14,22 +14,21 @@
 ELASTICSEARCH_URL = os.getenv("ELASTICSEARCH_URL")
 ELASTICSEARCH_USER = os.getenv("ELASTICSEARCH_USER")
 ELASTICSEARCH_PASSWORD = os.getenv("ELASTICSEARCH_PASSWORD")
-ELASTIC_CLOUD_ID = os.getenv("ELASTIC_CLOUD_ID")
-ELASTIC_API_KEY = os.getenv("ELASTIC_API_KEY")
+ELASTICSEARCH_API_KEY = os.getenv("ELASTICSEARCH_API_KEY")
 ELSER_MODEL = os.getenv("ELSER_MODEL", ".elser_model_2")
 
-if ELASTICSEARCH_URL:
+if ELASTICSEARCH_USER:
     elasticsearch_client = Elasticsearch(
         hosts=[ELASTICSEARCH_URL],
         basic_auth=(ELASTICSEARCH_USER, ELASTICSEARCH_PASSWORD),
     )
-elif ELASTIC_CLOUD_ID:
+elif ELASTICSEARCH_API_KEY:
     elasticsearch_client = Elasticsearch(
-        cloud_id=ELASTIC_CLOUD_ID, api_key=ELASTIC_API_KEY
+        hosts=[ELASTICSEARCH_URL], api_key=ELASTICSEARCH_API_KEY
     )
 else:
     raise ValueError(
-        "Please provide either ELASTICSEARCH_URL or ELASTIC_CLOUD_ID and ELASTIC_API_KEY"
+        "Please provide either ELASTICSEARCH_USER or ELASTICSEARCH_API_KEY"
     )
 
 

example-apps/chatbot-rag-app/env.example

@@ -1,29 +1,30 @@
 # Make a copy of this file with the name .env and assign values to variables
 
-# Your Elastic Cloud credentials
-ELASTIC_CLOUD_ID=
-ELASTIC_API_KEY=
-
-# If you are using a self-hosted Elasticsearch
-# ELASTICSEARCH_URL=
-# ELASTICSEARCH_USER=
-# ELASTICSEARCH_PASSWORD=
+# How you connect to Elasticsearch: change details to your instance
+ELASTICSEARCH_URL=http://localhost:9200
+ELASTICSEARCH_USER=elastic
+ELASTICSEARCH_PASSWORD=elastic
+# ELASTICSEARCH_API_KEY=
 
 # The name of the Elasticsearch indexes
 ES_INDEX=workplace-app-docs
 ES_INDEX_CHAT_HISTORY=workplace-app-docs-chat-history
 
 # Uncomment and complete if you want to use OpenAI
 # LLM_TYPE=openai
-# OPENAI_API_KEY=
+# OPENAI_API_KEY=sk-YOUR_API_KEY
 # CHAT_MODEL=gpt-4o-mini
 
 # Uncomment and complete if you want to use Azure OpenAI
 # LLM_TYPE=azure
-# OPENAI_VERSION=
-# OPENAI_BASE_URL=
-# OPENAI_API_KEY=
-# OPENAI_ENGINE=
+## "Azure OpenAI Endpoint" in https://oai.azure.com/resource/overview
+# AZURE_OPENAI_ENDPOINT=https://YOUR_RESOURCE_NAME.openai.azure.com/
+## "API key 1 (or 2)" in https://oai.azure.com/resource/overview
+# AZURE_OPENAI_API_KEY=abc01...
+## "Inference version" from https://learn.microsoft.com/en-us/azure/ai-services/openai/api-version-deprecation
+# OPENAI_API_VERSION=2024-10-01-preview
+## "Name" from https://oai.azure.com/resource/deployments
+# CHAT_DEPLOYMENT=YOUR_DEPLOYMENT_NAME
 
 # Uncomment and complete if you want to use Bedrock LLM
 # LLM_TYPE=bedrock