Skip to content

[pull] main from elastic:main #84

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

Merged
merged 1 commit into from
Aug 14, 2025
Merged

[pull] main from elastic:main #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 22 additions & 1 deletion ...ting-blog-content/building-elasticsearch-apis-with-fastapi-websockets/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,28 @@ python3 -m venv venv
pip install -r requirements.txt
```

4. **Run the API with uvicorn:**
4. **Set up Elasticsearch credentials:**

Set your Elasticsearch endpoint and API key as environment variables:

```bash
export ELASTICSEARCH_ENDPOINT="your-elasticsearch-endpoint"
export ELASTICSEARCH_API_KEY="your-elasticsearch-api-key"
```

5. **Create the index and load data:**

Run the ingest script to create the products index and load the sample data:

```bash
python ingest_data.py
```

This will:
- Create the `products` index with the proper mapping
- Load all products from `products.ndjson` into Elasticsearch

6. **Run the API with uvicorn:**

```bash
uvicorn main:app --reload
Expand Down
175 changes: 111 additions & 64 deletions supporting-blog-content/building-elasticsearch-apis-with-fastapi-websockets/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,51 +4,88 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>TechStore - Product Search</title>
<script src="https://cdn.tailwindcss.com"></script>
</head>
<body>
<header>
<h1>🛍️ TechStore - Find Your Perfect Product</h1>
<body class="bg-gray-50 min-h-screen">
<header class="bg-white shadow-sm border-b">
<div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-6">
<h1 class="text-3xl font-bold text-gray-900">
🛍️ TechStore - Find Your Perfect Product
</h1>
</div>
</header>

<main>
<form onsubmit="event.preventDefault(); searchProducts();">
<fieldset>
<legend>Product Search</legend>
<p>
<label for="searchQuery">Search Products:</label><br />
<input
type="text"
id="searchQuery"
placeholder="Search for phones, laptops, headphones..."
size="50"
required />
<button type="submit">🔍 Search</button>
</p>
</fieldset>
<main class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-8">
<form onsubmit="event.preventDefault(); searchProducts();" class="mb-8">
<div class="bg-white rounded-lg shadow-sm border p-6">
<h2 class="text-lg font-semibold text-gray-900 mb-4">
Product Search
</h2>
<div class="flex flex-col sm:flex-row gap-4">
<div class="flex-1">
<label
for="searchQuery"
class="block text-sm font-medium text-gray-700 mb-2"
>Search Products:</label
>
<input
type="text"
id="searchQuery"
placeholder="Search for phones, laptops, headphones..."
class="w-full px-4 py-2 border border-gray-300 rounded-md focus:ring-2 focus:ring-blue-500 focus:border-blue-500"
required />
</div>
<div class="flex items-end">
<button
type="submit"
class="bg-blue-600 hover:bg-blue-700 text-white px-6 py-2 rounded-md font-medium transition-colors">
🔍 Search
</button>
</div>
</div>
</div>
</form>

<fieldset>
<legend>Live Notifications</legend>
<p id="status">🟡 Connecting to live notifications...</p>
</fieldset>
<div class="bg-white rounded-lg shadow-sm border p-4 mb-8">
<div class="flex items-center justify-between">
<div>
<h3 class="text-sm font-medium text-gray-900">
Live Notifications
</h3>
<p id="status" class="text-xs text-gray-500 mt-1">
🟡 Connecting to live notifications...
</p>
</div>
<div class="w-2 h-2 bg-yellow-400 rounded-full animate-pulse"></div>
</div>
</div>

<section id="searchResults">
<h2>Search Results</h2>
<blockquote>
<em>🔍 Enter a search term above to find products</em>
</blockquote>
<h2 class="text-2xl font-bold text-gray-900 mb-4">Search Results</h2>
<div class="bg-white rounded-lg shadow-sm border p-6">
<p class="text-gray-600 italic">
🔍 Enter a search term above to find products
</p>
</div>
</section>
</main>

<!-- HTML Dialog for notifications -->
<dialog id="notificationDialog">
<fieldset>
<legend>🔔 Live Search Activity</legend>
<p id="notificationMessage"></p>
<p>
<button onclick="closeNotification()" autofocus>OK</button>
</p>
</fieldset>
<dialog id="notificationDialog" class="rounded-lg shadow-xl border">
<div class="bg-white p-6 rounded-lg">
<h3 class="text-lg font-semibold text-gray-900 mb-4">
🔔 Live Search Activity
</h3>
<p id="notificationMessage" class="text-gray-700 mb-6"></p>
<div class="flex justify-end">
<button
onclick="closeNotification()"
autofocus
class="bg-blue-600 hover:bg-blue-700 text-white px-4 py-2 rounded-md font-medium transition-colors">
OK
</button>
</div>
</div>
</dialog>

<script>
Expand All @@ -68,6 +105,9 @@ <h2>Search Results</h2>
ws.onopen = function () {
statusDiv.innerHTML =
"🟢 Connected - You will see when others search for products";

statusDiv.className = "text-sm text-green-600";

console.log("Connected to WebSocket");
};

Expand All @@ -84,11 +124,16 @@ <h2>Search Results</h2>

ws.onclose = function () {
statusDiv.innerHTML = "🔴 Disconnected from live notifications";

statusDiv.className = "text-sm text-red-600";

console.log("Disconnected from WebSocket");
};

ws.onerror = function (error) {
statusDiv.innerHTML = "❌ Connection error";
statusDiv.className = "text-sm text-red-600";

console.error("WebSocket error:", error);
};
}
Expand Down Expand Up @@ -118,19 +163,19 @@ <h2>Search Results</h2>

if (!query) {
resultsDiv.innerHTML = `
<h2>Search Results</h2>
<blockquote>
<strong>⚠️ Please enter a search term</strong>
</blockquote>
<h2 class="text-2xl font-bold text-gray-900 mb-4">Search Results</h2>
<div class="bg-white rounded-lg shadow-sm border p-6">
<p class="text-red-600 font-medium">⚠️ Please enter a search term</p>
</div>
`;
return;
}

resultsDiv.innerHTML = `
<h2>Search Results</h2>
<blockquote>
<em>🔍 Searching TechStore inventory...</em>
</blockquote>
<h2 class="text-2xl font-bold text-gray-900 mb-4">Search Results</h2>
<div class="bg-white rounded-lg shadow-sm border p-6">
<p class="text-gray-600 italic">🔍 Searching TechStore inventory...</p>
</div>
`;

try {
Expand All @@ -148,12 +193,12 @@ <h2>Search Results</h2>
}
} catch (error) {
resultsDiv.innerHTML = `
<h2>Search Results</h2>
<fieldset>
<legend>❌ Search Error</legend>
<p><strong>Error:</strong> ${error.message}</p>
</fieldset>
`;
<h2 class="text-2xl font-bold text-gray-900 mb-4">Search Results</h2>
<div class="bg-white rounded-lg shadow-sm border p-6">
<h3 class="text-lg font-semibold text-red-600 mb-2">❌ Search Error</h3>
<p class="text-gray-700"><strong>Error:</strong> ${error.message}</p>
</div>
`;
}
}

Expand All @@ -162,28 +207,30 @@ <h2>Search Results</h2>

if (data.results.length === 0) {
resultsDiv.innerHTML = `
<h2>Search Results</h2>
<fieldset>
<legend>❌ No products found</legend>
<p>No products match "<strong>${data.query}</strong>"</p>
<p><em>Try searching for: iPhone, laptop, headphones, watch, etc.</em></p>
</fieldset>
`;
<h2 class="text-2xl font-bold text-gray-900 mb-4">Search Results</h2>
<div class="bg-white rounded-lg shadow-sm border p-6">
<h3 class="text-lg font-semibold text-red-600 mb-2">❌ No products found</h3>
<p class="text-gray-700 mb-2">No products match "<strong>${data.query}</strong>"</p>
<p class="text-gray-600 italic">Try searching for: iPhone, laptop, headphones, watch, etc.</p>
</div>
`;
return;
}

let html = `<h2>✅ Found ${data.total} products for "${data.query}"</h2>`;
let html = `<h2 class="text-2xl font-bold text-gray-900 mb-4">✅ Found ${data.total} products for "${data.query}"</h2>`;

data.results.forEach((product) => {
html += `
<fieldset>
<legend><strong>${
product.product_name
}</strong></legend>
<p><big>💰 $${product.price.toFixed(2)}</big></p>
<p>${product.description}</p>
</fieldset>
`;
<div class="bg-white rounded-lg shadow-sm border p-6 mb-4">
<h3 class="text-xl font-semibold text-gray-900 mb-3">${
product.product_name
}</h3>
<p class="text-2xl font-bold text-green-600 mb-3">💰 $${product.price.toFixed(
2
)}</p>
<p class="text-gray-600">${product.description}</p>
</div>
`;
});

resultsDiv.innerHTML = html;
Expand Down
4 changes: 2 additions & 2 deletions supporting-blog-content/building-elasticsearch-apis-with-fastapi-websockets/inegst_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ def create_products_index():
mapping = {
"mappings": {
"properties": {
"product_name": {"type": "text", "analyzer": "standard"},
"product_name": {"type": "text"},
"price": {"type": "float"},
"description": {"type": "text", "analyzer": "standard"},
"description": {"type": "text"},
}
}
}
Expand Down
Loading