2024-02-29 11:04:24 +00:00
|
|
|
|
import asyncio
|
2022-11-17 19:53:58 +00:00
|
|
|
|
import json
|
2024-06-02 13:36:12 +00:00
|
|
|
|
import logging
|
2024-06-02 14:01:22 +00:00
|
|
|
|
import os
|
2025-06-02 23:10:08 +00:00
|
|
|
|
import secrets
|
2025-05-29 09:37:39 +00:00
|
|
|
|
import time
|
2025-06-02 23:10:08 +00:00
|
|
|
|
from typing import Any, Optional
|
2025-05-29 09:37:39 +00:00
|
|
|
|
|
|
|
|
|
import httpx
|
|
|
|
|
|
2025-03-12 17:13:55 +00:00
|
|
|
|
# Set up proper logging
|
2025-06-02 23:10:08 +00:00
|
|
|
|
logger = logging.getLogger("search")
|
2025-03-12 17:13:55 +00:00
|
|
|
|
logger.setLevel(logging.INFO) # Change to INFO to see more details
|
2025-06-02 23:10:08 +00:00
|
|
|
|
# Disable noise HTTP client logging
|
2025-04-24 17:58:14 +00:00
|
|
|
|
logging.getLogger("httpx").setLevel(logging.WARNING)
|
|
|
|
|
logging.getLogger("httpcore").setLevel(logging.WARNING)
|
2024-06-02 13:36:12 +00:00
|
|
|
|
|
2025-03-12 15:06:09 +00:00
|
|
|
|
# Configuration for search service
|
2025-05-29 09:37:39 +00:00
|
|
|
|
SEARCH_ENABLED = bool(os.environ.get("SEARCH_ENABLED", "true").lower() in ["true", "1", "yes"])
|
2025-06-02 23:10:08 +00:00
|
|
|
|
TXTAI_SERVICE_URL = os.environ.get("TXTAI_SERVICE_URL", "none")
|
2025-03-19 17:47:31 +00:00
|
|
|
|
MAX_BATCH_SIZE = int(os.environ.get("SEARCH_MAX_BATCH_SIZE", "25"))
|
2024-05-18 08:52:17 +00:00
|
|
|
|
|
2025-04-01 19:01:09 +00:00
|
|
|
|
# Search cache configuration
|
2025-05-29 09:37:39 +00:00
|
|
|
|
SEARCH_CACHE_ENABLED = bool(os.environ.get("SEARCH_CACHE_ENABLED", "true").lower() in ["true", "1", "yes"])
|
2025-06-02 23:10:08 +00:00
|
|
|
|
SEARCH_CACHE_TTL_SECONDS = int(os.environ.get("SEARCH_CACHE_TTL_SECONDS", "300")) # Default: 15 minutes
|
2025-04-01 19:01:09 +00:00
|
|
|
|
SEARCH_PREFETCH_SIZE = int(os.environ.get("SEARCH_PREFETCH_SIZE", "200"))
|
2025-05-29 09:37:39 +00:00
|
|
|
|
SEARCH_USE_REDIS = bool(os.environ.get("SEARCH_USE_REDIS", "true").lower() in ["true", "1", "yes"])
|
2025-04-01 19:01:09 +00:00
|
|
|
|
|
2025-04-03 16:10:53 +00:00
|
|
|
|
search_offset = 0
|
|
|
|
|
|
2025-06-02 23:10:08 +00:00
|
|
|
|
# Глобальная коллекция для фоновых задач
|
|
|
|
|
background_tasks = []
|
|
|
|
|
|
2025-04-01 19:01:09 +00:00
|
|
|
|
# Import Redis client if Redis caching is enabled
|
|
|
|
|
if SEARCH_USE_REDIS:
|
|
|
|
|
try:
|
|
|
|
|
from services.redis import redis
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-01 19:01:09 +00:00
|
|
|
|
logger.info("Redis client imported for search caching")
|
|
|
|
|
except ImportError:
|
|
|
|
|
logger.warning("Redis client import failed, falling back to memory cache")
|
|
|
|
|
SEARCH_USE_REDIS = False
|
|
|
|
|
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-01 19:01:09 +00:00
|
|
|
|
class SearchCache:
|
|
|
|
|
"""Cache for search results to enable efficient pagination"""
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-01 23:56:11 +00:00
|
|
|
|
def __init__(self, ttl_seconds: int = SEARCH_CACHE_TTL_SECONDS, max_items: int = 100) -> None:
|
2025-06-02 23:10:08 +00:00
|
|
|
|
self.cache = {} # Maps search query to list of results
|
|
|
|
|
self.last_accessed = {} # Maps search query to last access timestamp
|
2025-04-01 19:01:09 +00:00
|
|
|
|
self.ttl = ttl_seconds
|
|
|
|
|
self.max_items = max_items
|
|
|
|
|
self._redis_prefix = "search_cache:"
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-01 23:56:11 +00:00
|
|
|
|
async def store(self, query: str, results: list) -> bool:
|
2025-04-01 19:01:09 +00:00
|
|
|
|
"""Store search results for a query"""
|
|
|
|
|
normalized_query = self._normalize_query(query)
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-01 19:01:09 +00:00
|
|
|
|
if SEARCH_USE_REDIS:
|
|
|
|
|
try:
|
|
|
|
|
serialized_results = json.dumps(results)
|
2025-06-02 23:10:08 +00:00
|
|
|
|
await redis.set(
|
2025-04-24 21:45:00 +00:00
|
|
|
|
f"{self._redis_prefix}{normalized_query}",
|
2025-04-01 19:01:09 +00:00
|
|
|
|
serialized_results,
|
2025-04-24 21:45:00 +00:00
|
|
|
|
ex=self.ttl,
|
|
|
|
|
)
|
2025-05-29 09:37:39 +00:00
|
|
|
|
logger.info(f"Stored {len(results)} search results for query '{query}' in Redis")
|
2025-04-01 19:01:09 +00:00
|
|
|
|
return True
|
2025-06-01 23:56:11 +00:00
|
|
|
|
except Exception:
|
|
|
|
|
logger.exception("Error storing search results in Redis")
|
2025-04-01 19:01:09 +00:00
|
|
|
|
# Fall back to memory cache if Redis fails
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-01 19:01:09 +00:00
|
|
|
|
# First cleanup if needed for memory cache
|
|
|
|
|
if len(self.cache) >= self.max_items:
|
|
|
|
|
self._cleanup()
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-01 19:01:09 +00:00
|
|
|
|
# Store results and update timestamp
|
|
|
|
|
self.cache[normalized_query] = results
|
|
|
|
|
self.last_accessed[normalized_query] = time.time()
|
2025-05-29 09:37:39 +00:00
|
|
|
|
logger.info(f"Cached {len(results)} search results for query '{query}' in memory")
|
2025-04-01 19:01:09 +00:00
|
|
|
|
return True
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-02 23:10:08 +00:00
|
|
|
|
async def get(self, query: str, limit: int = 10, offset: int = 0) -> Optional[list]:
|
2025-04-01 19:01:09 +00:00
|
|
|
|
"""Get paginated results for a query"""
|
|
|
|
|
normalized_query = self._normalize_query(query)
|
|
|
|
|
all_results = None
|
|
|
|
|
|
|
|
|
|
# Try to get from Redis first
|
|
|
|
|
if SEARCH_USE_REDIS:
|
|
|
|
|
try:
|
|
|
|
|
cached_data = await redis.get(f"{self._redis_prefix}{normalized_query}")
|
|
|
|
|
if cached_data:
|
|
|
|
|
all_results = json.loads(cached_data)
|
|
|
|
|
logger.info(f"Retrieved search results for '{query}' from Redis")
|
2025-06-01 23:56:11 +00:00
|
|
|
|
except Exception:
|
|
|
|
|
logger.exception("Error retrieving search results from Redis")
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-01 19:01:09 +00:00
|
|
|
|
# Fall back to memory cache if not in Redis
|
|
|
|
|
if all_results is None and normalized_query in self.cache:
|
|
|
|
|
all_results = self.cache[normalized_query]
|
|
|
|
|
self.last_accessed[normalized_query] = time.time()
|
|
|
|
|
logger.info(f"Retrieved search results for '{query}' from memory cache")
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-01 19:01:09 +00:00
|
|
|
|
# If not found in any cache
|
|
|
|
|
if all_results is None:
|
2025-04-07 14:41:48 +00:00
|
|
|
|
logger.info(f"Cache miss for query '{query}'")
|
2025-04-01 19:01:09 +00:00
|
|
|
|
return None
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-01 19:01:09 +00:00
|
|
|
|
# Return paginated subset
|
|
|
|
|
end_idx = min(offset + limit, len(all_results))
|
|
|
|
|
if offset >= len(all_results):
|
2025-05-29 09:37:39 +00:00
|
|
|
|
logger.warning(f"Requested offset {offset} exceeds result count {len(all_results)}")
|
2025-04-01 19:01:09 +00:00
|
|
|
|
return []
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-05-29 09:37:39 +00:00
|
|
|
|
logger.info(f"Cache hit for '{query}': serving {offset}:{end_idx} of {len(all_results)} results")
|
2025-04-01 19:01:09 +00:00
|
|
|
|
return all_results[offset:end_idx]
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-01 23:56:11 +00:00
|
|
|
|
async def has_query(self, query: str) -> bool:
|
2025-04-01 19:01:09 +00:00
|
|
|
|
"""Check if query exists in cache"""
|
|
|
|
|
normalized_query = self._normalize_query(query)
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-01 19:01:09 +00:00
|
|
|
|
# Check Redis first
|
|
|
|
|
if SEARCH_USE_REDIS:
|
|
|
|
|
try:
|
|
|
|
|
exists = await redis.get(f"{self._redis_prefix}{normalized_query}")
|
|
|
|
|
if exists:
|
|
|
|
|
return True
|
2025-06-01 23:56:11 +00:00
|
|
|
|
except Exception:
|
|
|
|
|
logger.exception("Error checking Redis for query existence")
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-01 19:01:09 +00:00
|
|
|
|
# Fall back to memory cache
|
|
|
|
|
return normalized_query in self.cache
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-01 23:56:11 +00:00
|
|
|
|
async def get_total_count(self, query: str) -> int:
|
2025-04-01 19:01:09 +00:00
|
|
|
|
"""Get total count of results for a query"""
|
|
|
|
|
normalized_query = self._normalize_query(query)
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-01 19:01:09 +00:00
|
|
|
|
# Check Redis first
|
|
|
|
|
if SEARCH_USE_REDIS:
|
|
|
|
|
try:
|
|
|
|
|
cached_data = await redis.get(f"{self._redis_prefix}{normalized_query}")
|
|
|
|
|
if cached_data:
|
|
|
|
|
all_results = json.loads(cached_data)
|
|
|
|
|
return len(all_results)
|
2025-06-01 23:56:11 +00:00
|
|
|
|
except Exception:
|
|
|
|
|
logger.exception("Error getting result count from Redis")
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-01 19:01:09 +00:00
|
|
|
|
# Fall back to memory cache
|
|
|
|
|
if normalized_query in self.cache:
|
|
|
|
|
return len(self.cache[normalized_query])
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-01 19:01:09 +00:00
|
|
|
|
return 0
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-01 23:56:11 +00:00
|
|
|
|
def _normalize_query(self, query: str) -> str:
|
2025-04-01 19:01:09 +00:00
|
|
|
|
"""Normalize query string for cache key"""
|
|
|
|
|
if not query:
|
|
|
|
|
return ""
|
|
|
|
|
# Simple normalization - lowercase and strip whitespace
|
|
|
|
|
return query.lower().strip()
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-01 23:56:11 +00:00
|
|
|
|
def _cleanup(self) -> None:
|
2025-04-01 19:01:09 +00:00
|
|
|
|
"""Remove oldest entries if memory cache is full"""
|
|
|
|
|
now = time.time()
|
|
|
|
|
# First remove expired entries
|
2025-05-29 09:37:39 +00:00
|
|
|
|
expired_keys = [key for key, last_access in self.last_accessed.items() if now - last_access > self.ttl]
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-01 19:01:09 +00:00
|
|
|
|
for key in expired_keys:
|
|
|
|
|
if key in self.cache:
|
|
|
|
|
del self.cache[key]
|
|
|
|
|
if key in self.last_accessed:
|
|
|
|
|
del self.last_accessed[key]
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-02 23:10:08 +00:00
|
|
|
|
logger.info(f"Cleaned up {len(expired_keys)} expired search cache entries")
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-01 19:01:09 +00:00
|
|
|
|
# If still above max size, remove oldest entries
|
|
|
|
|
if len(self.cache) >= self.max_items:
|
|
|
|
|
# Sort by last access time
|
|
|
|
|
sorted_items = sorted(self.last_accessed.items(), key=lambda x: x[1])
|
|
|
|
|
# Remove oldest 20%
|
|
|
|
|
remove_count = max(1, int(len(sorted_items) * 0.2))
|
|
|
|
|
for key, _ in sorted_items[:remove_count]:
|
|
|
|
|
if key in self.cache:
|
|
|
|
|
del self.cache[key]
|
|
|
|
|
if key in self.last_accessed:
|
|
|
|
|
del self.last_accessed[key]
|
2025-06-02 23:10:08 +00:00
|
|
|
|
logger.info(f"Removed {remove_count} oldest search cache entries")
|
2024-02-29 11:09:50 +00:00
|
|
|
|
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2024-01-29 01:09:54 +00:00
|
|
|
|
class SearchService:
|
2025-06-01 23:56:11 +00:00
|
|
|
|
def __init__(self) -> None:
|
2025-06-02 23:10:08 +00:00
|
|
|
|
logger.info(f"Initializing search service with URL: {TXTAI_SERVICE_URL}")
|
2025-03-05 20:08:21 +00:00
|
|
|
|
self.available = SEARCH_ENABLED
|
2025-03-19 17:47:31 +00:00
|
|
|
|
# Use different timeout settings for indexing and search requests
|
2025-03-12 16:11:19 +00:00
|
|
|
|
self.client = httpx.AsyncClient(timeout=30.0, base_url=TXTAI_SERVICE_URL)
|
2025-03-19 17:47:31 +00:00
|
|
|
|
self.index_client = httpx.AsyncClient(timeout=120.0, base_url=TXTAI_SERVICE_URL)
|
2025-04-01 19:01:09 +00:00
|
|
|
|
# Initialize search cache
|
|
|
|
|
self.cache = SearchCache() if SEARCH_CACHE_ENABLED else None
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-03-05 20:08:21 +00:00
|
|
|
|
if not self.available:
|
2025-03-12 15:06:09 +00:00
|
|
|
|
logger.info("Search disabled (SEARCH_ENABLED = False)")
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-01 19:01:09 +00:00
|
|
|
|
if SEARCH_CACHE_ENABLED:
|
|
|
|
|
cache_location = "Redis" if SEARCH_USE_REDIS else "Memory"
|
2025-05-29 09:37:39 +00:00
|
|
|
|
logger.info(f"Search caching enabled using {cache_location} cache with TTL={SEARCH_CACHE_TTL_SECONDS}s")
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-02 23:10:08 +00:00
|
|
|
|
async def info(self) -> dict:
|
|
|
|
|
"""Return information about search service"""
|
|
|
|
|
if not self.available:
|
|
|
|
|
return {"status": "disabled"}
|
2024-11-22 17:23:45 +00:00
|
|
|
|
try:
|
2025-06-02 23:10:08 +00:00
|
|
|
|
response = await self.client.get("/info")
|
2025-03-12 15:06:09 +00:00
|
|
|
|
response.raise_for_status()
|
2025-03-12 17:13:55 +00:00
|
|
|
|
result = response.json()
|
|
|
|
|
logger.info(f"Search service info: {result}")
|
|
|
|
|
return result
|
2025-06-02 23:10:08 +00:00
|
|
|
|
except Exception:
|
|
|
|
|
logger.exception("Failed to get search info")
|
|
|
|
|
return {"status": "error", "message": "Failed to get search info"}
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-01 23:56:11 +00:00
|
|
|
|
def is_ready(self) -> bool:
|
2025-03-12 15:06:09 +00:00
|
|
|
|
"""Check if service is available"""
|
2025-03-12 16:11:19 +00:00
|
|
|
|
return self.available
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-02 23:10:08 +00:00
|
|
|
|
async def verify_docs(self, doc_ids: list) -> dict:
|
2025-04-20 22:22:08 +00:00
|
|
|
|
"""Verify which documents exist in the search index across all content types"""
|
2025-03-25 16:31:45 +00:00
|
|
|
|
if not self.available:
|
2025-06-02 23:10:08 +00:00
|
|
|
|
return {"status": "disabled"}
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-03-25 16:31:45 +00:00
|
|
|
|
try:
|
2025-06-02 23:10:08 +00:00
|
|
|
|
logger.info(f"Verifying {len(doc_ids)} documents in search index")
|
|
|
|
|
response = await self.client.post(
|
|
|
|
|
"/verify-docs",
|
|
|
|
|
json={"doc_ids": doc_ids},
|
|
|
|
|
timeout=60.0, # Longer timeout for potentially large ID lists
|
|
|
|
|
)
|
|
|
|
|
response.raise_for_status()
|
|
|
|
|
result = response.json()
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-02 23:10:08 +00:00
|
|
|
|
# Process the more detailed response format
|
|
|
|
|
bodies_missing = set(result.get("bodies", {}).get("missing", []))
|
|
|
|
|
titles_missing = set(result.get("titles", {}).get("missing", []))
|
|
|
|
|
|
|
|
|
|
# Combine missing IDs from both bodies and titles
|
|
|
|
|
# A document is considered missing if it's missing from either index
|
|
|
|
|
all_missing = list(bodies_missing.union(titles_missing))
|
|
|
|
|
|
|
|
|
|
# Log summary of verification results
|
|
|
|
|
bodies_missing_count = len(bodies_missing)
|
|
|
|
|
titles_missing_count = len(titles_missing)
|
|
|
|
|
total_missing_count = len(all_missing)
|
|
|
|
|
|
|
|
|
|
logger.info(
|
|
|
|
|
f"Document verification complete: {bodies_missing_count} bodies missing, {titles_missing_count} titles missing"
|
|
|
|
|
)
|
|
|
|
|
logger.info(f"Total unique missing documents: {total_missing_count} out of {len(doc_ids)} total")
|
|
|
|
|
|
|
|
|
|
# Return in a backwards-compatible format plus the detailed breakdown
|
2025-04-20 22:22:08 +00:00
|
|
|
|
return {
|
2025-06-02 23:10:08 +00:00
|
|
|
|
"missing": all_missing,
|
|
|
|
|
"details": {
|
|
|
|
|
"bodies_missing": list(bodies_missing),
|
|
|
|
|
"titles_missing": list(titles_missing),
|
|
|
|
|
"bodies_missing_count": bodies_missing_count,
|
|
|
|
|
"titles_missing_count": titles_missing_count,
|
|
|
|
|
},
|
2025-04-20 22:22:08 +00:00
|
|
|
|
}
|
2025-06-02 23:10:08 +00:00
|
|
|
|
except Exception:
|
2025-06-01 23:56:11 +00:00
|
|
|
|
logger.exception("Document verification error")
|
2025-06-02 23:10:08 +00:00
|
|
|
|
return {"status": "error", "message": "Document verification error"}
|
2025-04-20 22:22:08 +00:00
|
|
|
|
|
2025-06-02 23:10:08 +00:00
|
|
|
|
def index(self, shout: Any) -> None:
|
2025-03-05 20:08:21 +00:00
|
|
|
|
"""Index a single document"""
|
|
|
|
|
if not self.available:
|
2024-11-22 17:32:14 +00:00
|
|
|
|
return
|
2025-03-12 15:06:09 +00:00
|
|
|
|
logger.info(f"Indexing post {shout.id}")
|
2025-06-02 23:10:08 +00:00
|
|
|
|
# Start in background to not block - store reference in a background collection
|
|
|
|
|
# to prevent garbage collection while keeping the method non-blocking
|
|
|
|
|
background_tasks.append(asyncio.create_task(self.perform_index(shout)))
|
|
|
|
|
|
|
|
|
|
async def perform_index(self, shout: Any) -> None:
|
2025-04-20 22:22:08 +00:00
|
|
|
|
"""Index a single document across multiple endpoints"""
|
2025-03-12 15:06:09 +00:00
|
|
|
|
if not self.available:
|
|
|
|
|
return
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-03-05 20:08:21 +00:00
|
|
|
|
try:
|
2025-04-20 22:22:08 +00:00
|
|
|
|
logger.info(f"Indexing document {shout.id} to individual endpoints")
|
|
|
|
|
indexing_tasks = []
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-20 22:22:08 +00:00
|
|
|
|
# 1. Index title if available
|
2025-04-24 21:45:00 +00:00
|
|
|
|
if hasattr(shout, "title") and shout.title and isinstance(shout.title, str):
|
|
|
|
|
title_doc = {"id": str(shout.id), "title": shout.title.strip()}
|
2025-05-29 09:37:39 +00:00
|
|
|
|
indexing_tasks.append(self.index_client.post("/index-title", json=title_doc))
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-20 22:22:08 +00:00
|
|
|
|
# 2. Index body content (subtitle, lead, body)
|
|
|
|
|
body_text_parts = []
|
2025-04-24 21:45:00 +00:00
|
|
|
|
for field_name in ["subtitle", "lead", "body"]:
|
2025-04-20 22:22:08 +00:00
|
|
|
|
field_value = getattr(shout, field_name, None)
|
|
|
|
|
if field_value and isinstance(field_value, str) and field_value.strip():
|
|
|
|
|
body_text_parts.append(field_value.strip())
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-20 22:22:08 +00:00
|
|
|
|
# Process media content if available
|
2025-04-24 21:45:00 +00:00
|
|
|
|
media = getattr(shout, "media", None)
|
2025-04-20 22:22:08 +00:00
|
|
|
|
if media:
|
|
|
|
|
if isinstance(media, str):
|
|
|
|
|
try:
|
|
|
|
|
media_json = json.loads(media)
|
|
|
|
|
if isinstance(media_json, dict):
|
2025-04-24 21:45:00 +00:00
|
|
|
|
if "title" in media_json:
|
|
|
|
|
body_text_parts.append(media_json["title"])
|
|
|
|
|
if "body" in media_json:
|
|
|
|
|
body_text_parts.append(media_json["body"])
|
2025-04-20 22:22:08 +00:00
|
|
|
|
except json.JSONDecodeError:
|
|
|
|
|
body_text_parts.append(media)
|
2025-06-02 23:10:08 +00:00
|
|
|
|
elif isinstance(media, dict) and (media.get("title") or media.get("body")):
|
|
|
|
|
body_text_parts.append(media["title"])
|
|
|
|
|
body_text_parts.append(media["body"])
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-20 22:22:08 +00:00
|
|
|
|
if body_text_parts:
|
|
|
|
|
body_text = " ".join(body_text_parts)
|
|
|
|
|
# Truncate if too long
|
2025-06-01 23:56:11 +00:00
|
|
|
|
max_text_length = 4000
|
|
|
|
|
if len(body_text) > max_text_length:
|
|
|
|
|
body_text = body_text[:max_text_length]
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
|
|
|
|
body_doc = {"id": str(shout.id), "body": body_text}
|
2025-05-29 09:37:39 +00:00
|
|
|
|
indexing_tasks.append(self.index_client.post("/index-body", json=body_doc))
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-20 22:22:08 +00:00
|
|
|
|
# 3. Index authors
|
2025-04-24 21:45:00 +00:00
|
|
|
|
authors = getattr(shout, "authors", [])
|
2025-04-20 22:22:08 +00:00
|
|
|
|
for author in authors:
|
2025-04-24 21:45:00 +00:00
|
|
|
|
author_id = str(getattr(author, "id", 0))
|
|
|
|
|
if not author_id or author_id == "0":
|
2025-04-20 22:22:08 +00:00
|
|
|
|
continue
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
|
|
|
|
name = getattr(author, "name", "")
|
|
|
|
|
|
2025-04-20 22:22:08 +00:00
|
|
|
|
# Combine bio and about fields
|
|
|
|
|
bio_parts = []
|
2025-04-24 21:45:00 +00:00
|
|
|
|
bio = getattr(author, "bio", "")
|
2025-04-20 22:22:08 +00:00
|
|
|
|
if bio and isinstance(bio, str):
|
|
|
|
|
bio_parts.append(bio.strip())
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
|
|
|
|
about = getattr(author, "about", "")
|
2025-04-20 22:22:08 +00:00
|
|
|
|
if about and isinstance(about, str):
|
|
|
|
|
bio_parts.append(about.strip())
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-20 22:22:08 +00:00
|
|
|
|
combined_bio = " ".join(bio_parts)
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-20 22:22:08 +00:00
|
|
|
|
if name:
|
2025-04-24 21:45:00 +00:00
|
|
|
|
author_doc = {"id": author_id, "name": name, "bio": combined_bio}
|
2025-05-29 09:37:39 +00:00
|
|
|
|
indexing_tasks.append(self.index_client.post("/index-author", json=author_doc))
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-20 22:22:08 +00:00
|
|
|
|
# Run all indexing tasks in parallel
|
|
|
|
|
if indexing_tasks:
|
2025-05-29 09:37:39 +00:00
|
|
|
|
responses = await asyncio.gather(*indexing_tasks, return_exceptions=True)
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-20 22:22:08 +00:00
|
|
|
|
# Check for errors in responses
|
|
|
|
|
for i, response in enumerate(responses):
|
|
|
|
|
if isinstance(response, Exception):
|
2025-06-02 23:10:08 +00:00
|
|
|
|
logger.error(f"Error in indexing task {i}: {response}")
|
2025-05-29 09:37:39 +00:00
|
|
|
|
elif hasattr(response, "status_code") and response.status_code >= 400:
|
2025-06-02 23:10:08 +00:00
|
|
|
|
logger.error(
|
|
|
|
|
f"Error response in indexing task {i}: {response.status_code}, {await response.text()}"
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
logger.info(f"Document {shout.id} indexed across {len(indexing_tasks)} endpoints")
|
2025-04-20 22:22:08 +00:00
|
|
|
|
else:
|
2025-06-02 23:10:08 +00:00
|
|
|
|
logger.warning(f"No content to index for shout {shout.id}")
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-01 23:56:11 +00:00
|
|
|
|
except Exception:
|
2025-06-02 23:10:08 +00:00
|
|
|
|
logger.exception(f"Indexing error for shout {shout.id}")
|
2024-04-08 07:23:54 +00:00
|
|
|
|
|
2025-06-02 23:10:08 +00:00
|
|
|
|
async def bulk_index(self, shouts: list) -> None:
|
2025-04-20 22:22:08 +00:00
|
|
|
|
"""Index multiple documents across three separate endpoints"""
|
2025-03-05 20:08:21 +00:00
|
|
|
|
if not self.available or not shouts:
|
2025-04-24 21:45:00 +00:00
|
|
|
|
logger.warning(
|
2025-06-02 23:10:08 +00:00
|
|
|
|
f"Bulk indexing skipped: available={self.available}, shouts_count={len(shouts) if shouts else 0}"
|
2025-04-24 21:45:00 +00:00
|
|
|
|
)
|
2025-03-05 20:08:21 +00:00
|
|
|
|
return
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-03-12 17:13:55 +00:00
|
|
|
|
start_time = time.time()
|
2025-06-02 23:10:08 +00:00
|
|
|
|
logger.info(f"Starting multi-endpoint bulk indexing of {len(shouts)} documents")
|
2025-03-21 17:18:32 +00:00
|
|
|
|
|
2025-04-20 22:22:08 +00:00
|
|
|
|
# Prepare documents for different endpoints
|
2025-06-02 23:10:08 +00:00
|
|
|
|
title_docs = []
|
2025-04-20 22:22:08 +00:00
|
|
|
|
body_docs = []
|
|
|
|
|
author_docs = {} # Use dict to prevent duplicate authors
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-20 22:22:08 +00:00
|
|
|
|
total_skipped = 0
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-03-21 18:40:29 +00:00
|
|
|
|
for shout in shouts:
|
|
|
|
|
try:
|
2025-04-20 22:22:08 +00:00
|
|
|
|
# 1. Process title documents
|
2025-05-29 09:37:39 +00:00
|
|
|
|
if hasattr(shout, "title") and shout.title and isinstance(shout.title, str):
|
|
|
|
|
title_docs.append({"id": str(shout.id), "title": shout.title.strip()})
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-20 22:22:08 +00:00
|
|
|
|
# 2. Process body documents (subtitle, lead, body)
|
|
|
|
|
body_text_parts = []
|
2025-04-24 21:45:00 +00:00
|
|
|
|
for field_name in ["subtitle", "lead", "body"]:
|
2025-03-21 18:40:29 +00:00
|
|
|
|
field_value = getattr(shout, field_name, None)
|
2025-05-29 09:37:39 +00:00
|
|
|
|
if field_value and isinstance(field_value, str) and field_value.strip():
|
2025-04-20 22:22:08 +00:00
|
|
|
|
body_text_parts.append(field_value.strip())
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-20 22:22:08 +00:00
|
|
|
|
# Process media content if available
|
2025-04-24 21:45:00 +00:00
|
|
|
|
media = getattr(shout, "media", None)
|
2025-03-21 18:40:29 +00:00
|
|
|
|
if media:
|
|
|
|
|
if isinstance(media, str):
|
|
|
|
|
try:
|
|
|
|
|
media_json = json.loads(media)
|
|
|
|
|
if isinstance(media_json, dict):
|
2025-04-24 21:45:00 +00:00
|
|
|
|
if "title" in media_json:
|
|
|
|
|
body_text_parts.append(media_json["title"])
|
|
|
|
|
if "body" in media_json:
|
|
|
|
|
body_text_parts.append(media_json["body"])
|
2025-03-21 18:40:29 +00:00
|
|
|
|
except json.JSONDecodeError:
|
2025-04-20 22:22:08 +00:00
|
|
|
|
body_text_parts.append(media)
|
2025-06-02 23:10:08 +00:00
|
|
|
|
elif isinstance(media, dict) and (media.get("title") or media.get("body")):
|
|
|
|
|
body_text_parts.append(media["title"])
|
|
|
|
|
body_text_parts.append(media["body"])
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-20 22:22:08 +00:00
|
|
|
|
# Only add body document if we have body text
|
|
|
|
|
if body_text_parts:
|
|
|
|
|
body_text = " ".join(body_text_parts)
|
|
|
|
|
# Truncate if too long
|
2025-06-01 23:56:11 +00:00
|
|
|
|
max_text_length = 4000
|
|
|
|
|
if len(body_text) > max_text_length:
|
|
|
|
|
body_text = body_text[:max_text_length]
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
|
|
|
|
body_docs.append({"id": str(shout.id), "body": body_text})
|
|
|
|
|
|
2025-04-20 22:22:08 +00:00
|
|
|
|
# 3. Process authors if available
|
2025-04-24 21:45:00 +00:00
|
|
|
|
authors = getattr(shout, "authors", [])
|
2025-04-20 22:22:08 +00:00
|
|
|
|
for author in authors:
|
2025-04-24 21:45:00 +00:00
|
|
|
|
author_id = str(getattr(author, "id", 0))
|
|
|
|
|
if not author_id or author_id == "0":
|
2025-04-20 22:22:08 +00:00
|
|
|
|
continue
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-20 22:22:08 +00:00
|
|
|
|
# Skip if we've already processed this author
|
|
|
|
|
if author_id in author_docs:
|
|
|
|
|
continue
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
|
|
|
|
name = getattr(author, "name", "")
|
|
|
|
|
|
2025-04-20 22:22:08 +00:00
|
|
|
|
# Combine bio and about fields
|
|
|
|
|
bio_parts = []
|
2025-04-24 21:45:00 +00:00
|
|
|
|
bio = getattr(author, "bio", "")
|
2025-04-20 22:22:08 +00:00
|
|
|
|
if bio and isinstance(bio, str):
|
|
|
|
|
bio_parts.append(bio.strip())
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
|
|
|
|
about = getattr(author, "about", "")
|
2025-04-20 22:22:08 +00:00
|
|
|
|
if about and isinstance(about, str):
|
|
|
|
|
bio_parts.append(about.strip())
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-20 22:22:08 +00:00
|
|
|
|
combined_bio = " ".join(bio_parts)
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-20 22:22:08 +00:00
|
|
|
|
# Only add if we have author data
|
|
|
|
|
if name:
|
|
|
|
|
author_docs[author_id] = {
|
|
|
|
|
"id": author_id,
|
|
|
|
|
"name": name,
|
2025-04-24 21:45:00 +00:00
|
|
|
|
"bio": combined_bio,
|
2025-04-20 22:22:08 +00:00
|
|
|
|
}
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-01 23:56:11 +00:00
|
|
|
|
except Exception:
|
2025-06-02 23:10:08 +00:00
|
|
|
|
logger.exception(f"Error processing shout {getattr(shout, 'id', 'unknown')} for indexing")
|
2025-03-21 18:40:29 +00:00
|
|
|
|
total_skipped += 1
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-20 22:22:08 +00:00
|
|
|
|
# Convert author dict to list
|
|
|
|
|
author_docs_list = list(author_docs.values())
|
2025-04-29 20:45:37 +00:00
|
|
|
|
|
2025-04-24 21:45:00 +00:00
|
|
|
|
# Log indexing started message
|
|
|
|
|
logger.info("indexing started...")
|
|
|
|
|
|
2025-04-20 22:22:08 +00:00
|
|
|
|
# Process each endpoint in parallel
|
|
|
|
|
indexing_tasks = [
|
|
|
|
|
self._index_endpoint(title_docs, "/bulk-index-titles", "title"),
|
|
|
|
|
self._index_endpoint(body_docs, "/bulk-index-bodies", "body"),
|
2025-04-24 21:45:00 +00:00
|
|
|
|
self._index_endpoint(author_docs_list, "/bulk-index-authors", "author"),
|
2025-04-20 22:22:08 +00:00
|
|
|
|
]
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-20 22:22:08 +00:00
|
|
|
|
await asyncio.gather(*indexing_tasks)
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-20 22:22:08 +00:00
|
|
|
|
elapsed = time.time() - start_time
|
|
|
|
|
logger.info(
|
2025-06-02 23:10:08 +00:00
|
|
|
|
f"Multi-endpoint indexing completed in {elapsed:.2f}s: "
|
|
|
|
|
f"{len(title_docs)} titles, {len(body_docs)} bodies, {len(author_docs_list)} authors, "
|
|
|
|
|
f"{total_skipped} shouts skipped"
|
2025-04-20 22:22:08 +00:00
|
|
|
|
)
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-02 23:10:08 +00:00
|
|
|
|
async def _index_endpoint(self, documents: list, endpoint: str, doc_type: str) -> None:
|
2025-04-20 22:22:08 +00:00
|
|
|
|
"""Process and index documents to a specific endpoint"""
|
|
|
|
|
if not documents:
|
2025-06-02 23:10:08 +00:00
|
|
|
|
logger.info(f"No {doc_type} documents to index")
|
2025-04-20 22:22:08 +00:00
|
|
|
|
return
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-02 23:10:08 +00:00
|
|
|
|
logger.info(f"Indexing {len(documents)} {doc_type} documents")
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-20 22:22:08 +00:00
|
|
|
|
# Categorize documents by size
|
2025-05-29 09:37:39 +00:00
|
|
|
|
small_docs, medium_docs, large_docs = self._categorize_by_size(documents, doc_type)
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-20 22:22:08 +00:00
|
|
|
|
# Process each category with appropriate batch sizes
|
|
|
|
|
batch_sizes = {
|
|
|
|
|
"small": min(MAX_BATCH_SIZE, 15),
|
2025-04-24 21:45:00 +00:00
|
|
|
|
"medium": min(MAX_BATCH_SIZE, 10),
|
|
|
|
|
"large": min(MAX_BATCH_SIZE, 3),
|
2025-04-20 22:22:08 +00:00
|
|
|
|
}
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
|
|
|
|
for category, docs in [
|
|
|
|
|
("small", small_docs),
|
|
|
|
|
("medium", medium_docs),
|
|
|
|
|
("large", large_docs),
|
|
|
|
|
]:
|
2025-04-20 22:22:08 +00:00
|
|
|
|
if docs:
|
|
|
|
|
batch_size = batch_sizes[category]
|
2025-05-29 09:37:39 +00:00
|
|
|
|
await self._process_batches(docs, batch_size, endpoint, f"{doc_type}-{category}")
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-02 23:10:08 +00:00
|
|
|
|
def _categorize_by_size(self, documents: list, doc_type: str) -> tuple[list, list, list]:
|
2025-04-20 22:22:08 +00:00
|
|
|
|
"""Categorize documents by size for optimized batch processing"""
|
|
|
|
|
small_docs = []
|
|
|
|
|
medium_docs = []
|
|
|
|
|
large_docs = []
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-20 22:22:08 +00:00
|
|
|
|
for doc in documents:
|
|
|
|
|
# Extract relevant text based on document type
|
|
|
|
|
if doc_type == "title":
|
|
|
|
|
text = doc.get("title", "")
|
|
|
|
|
elif doc_type == "body":
|
|
|
|
|
text = doc.get("body", "")
|
|
|
|
|
else: # author
|
|
|
|
|
# For authors, consider both name and bio length
|
|
|
|
|
text = doc.get("name", "") + " " + doc.get("bio", "")
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-20 22:22:08 +00:00
|
|
|
|
text_len = len(text)
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-20 22:22:08 +00:00
|
|
|
|
if text_len > 5000:
|
|
|
|
|
large_docs.append(doc)
|
|
|
|
|
elif text_len > 2000:
|
|
|
|
|
medium_docs.append(doc)
|
|
|
|
|
else:
|
|
|
|
|
small_docs.append(doc)
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
|
|
|
|
logger.info(
|
2025-06-02 23:10:08 +00:00
|
|
|
|
f"{doc_type.capitalize()} documents categorized: {len(small_docs)} small, {len(medium_docs)} medium, {len(large_docs)} large"
|
2025-04-24 21:45:00 +00:00
|
|
|
|
)
|
2025-04-20 22:22:08 +00:00
|
|
|
|
return small_docs, medium_docs, large_docs
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-02 23:10:08 +00:00
|
|
|
|
async def _process_batches(self, documents: list, batch_size: int, endpoint: str, batch_prefix: str) -> None:
|
2025-04-20 22:22:08 +00:00
|
|
|
|
"""Process document batches with retry logic"""
|
|
|
|
|
for i in range(0, len(documents), batch_size):
|
2025-04-24 21:45:00 +00:00
|
|
|
|
batch = documents[i : i + batch_size]
|
2025-05-29 09:37:39 +00:00
|
|
|
|
batch_id = f"{batch_prefix}-{i // batch_size + 1}"
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-20 22:22:08 +00:00
|
|
|
|
retry_count = 0
|
|
|
|
|
max_retries = 3
|
|
|
|
|
success = False
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-20 22:22:08 +00:00
|
|
|
|
while not success and retry_count < max_retries:
|
|
|
|
|
try:
|
2025-05-29 09:37:39 +00:00
|
|
|
|
response = await self.index_client.post(endpoint, json=batch, timeout=90.0)
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-20 22:22:08 +00:00
|
|
|
|
if response.status_code == 422:
|
|
|
|
|
error_detail = response.json()
|
2025-04-24 21:45:00 +00:00
|
|
|
|
logger.error(
|
2025-06-02 23:10:08 +00:00
|
|
|
|
f"Validation error from search service for batch {batch_id}: {self._truncate_error_detail(error_detail)}"
|
2025-04-24 21:45:00 +00:00
|
|
|
|
)
|
2025-04-20 22:22:08 +00:00
|
|
|
|
break
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-20 22:22:08 +00:00
|
|
|
|
response.raise_for_status()
|
|
|
|
|
success = True
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-01 23:56:11 +00:00
|
|
|
|
except Exception:
|
2025-04-20 22:22:08 +00:00
|
|
|
|
retry_count += 1
|
|
|
|
|
if retry_count >= max_retries:
|
|
|
|
|
if len(batch) > 1:
|
|
|
|
|
mid = len(batch) // 2
|
2025-04-24 21:45:00 +00:00
|
|
|
|
await self._process_batches(
|
|
|
|
|
batch[:mid],
|
|
|
|
|
batch_size // 2,
|
|
|
|
|
endpoint,
|
2025-05-29 09:37:39 +00:00
|
|
|
|
f"{batch_prefix}-{i // batch_size}-A",
|
2025-04-24 21:45:00 +00:00
|
|
|
|
)
|
|
|
|
|
await self._process_batches(
|
|
|
|
|
batch[mid:],
|
|
|
|
|
batch_size // 2,
|
|
|
|
|
endpoint,
|
2025-05-29 09:37:39 +00:00
|
|
|
|
f"{batch_prefix}-{i // batch_size}-B",
|
2025-04-24 21:45:00 +00:00
|
|
|
|
)
|
2025-03-21 18:40:29 +00:00
|
|
|
|
else:
|
2025-06-01 23:56:11 +00:00
|
|
|
|
logger.exception(
|
2025-06-02 23:10:08 +00:00
|
|
|
|
f"Failed to index single document in batch {batch_id} after {max_retries} attempts"
|
2025-04-24 21:45:00 +00:00
|
|
|
|
)
|
2025-04-20 22:22:08 +00:00
|
|
|
|
break
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-02 23:10:08 +00:00
|
|
|
|
wait_time = (2**retry_count) + (secrets.random() * 0.5)
|
2025-04-20 22:22:08 +00:00
|
|
|
|
await asyncio.sleep(wait_time)
|
2025-03-21 18:40:29 +00:00
|
|
|
|
|
2025-06-02 23:10:08 +00:00
|
|
|
|
def _truncate_error_detail(self, error_detail: Any) -> Any:
|
2025-03-21 18:40:29 +00:00
|
|
|
|
"""Truncate error details for logging"""
|
2025-05-29 09:37:39 +00:00
|
|
|
|
truncated_detail = error_detail.copy() if isinstance(error_detail, dict) else error_detail
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
|
|
|
|
if (
|
|
|
|
|
isinstance(truncated_detail, dict)
|
|
|
|
|
and "detail" in truncated_detail
|
|
|
|
|
and isinstance(truncated_detail["detail"], list)
|
|
|
|
|
):
|
2025-06-01 23:56:11 +00:00
|
|
|
|
for _i, item in enumerate(truncated_detail["detail"]):
|
|
|
|
|
if (
|
|
|
|
|
isinstance(item, dict)
|
|
|
|
|
and "input" in item
|
|
|
|
|
and isinstance(item["input"], dict)
|
|
|
|
|
and any(k in item["input"] for k in ["documents", "text"])
|
|
|
|
|
):
|
|
|
|
|
if "documents" in item["input"] and isinstance(item["input"]["documents"], list):
|
|
|
|
|
for j, doc in enumerate(item["input"]["documents"]):
|
|
|
|
|
if "text" in doc and isinstance(doc["text"], str) and len(doc["text"]) > 100:
|
|
|
|
|
item["input"]["documents"][j]["text"] = (
|
|
|
|
|
f"{doc['text'][:100]}... [truncated, total {len(doc['text'])} chars]"
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
if (
|
|
|
|
|
"text" in item["input"]
|
|
|
|
|
and isinstance(item["input"]["text"], str)
|
|
|
|
|
and len(item["input"]["text"]) > 100
|
|
|
|
|
):
|
|
|
|
|
item["input"]["text"] = (
|
|
|
|
|
f"{item['input']['text'][:100]}... [truncated, total {len(item['input']['text'])} chars]"
|
|
|
|
|
)
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-03-21 18:40:29 +00:00
|
|
|
|
return truncated_detail
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-02 23:10:08 +00:00
|
|
|
|
async def search(self, text: str, limit: int, offset: int) -> list:
|
2025-04-24 16:35:36 +00:00
|
|
|
|
"""Search documents"""
|
|
|
|
|
if not self.available:
|
2024-11-22 17:32:14 +00:00
|
|
|
|
return []
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-02 23:10:08 +00:00
|
|
|
|
# Check if we can serve from cache
|
|
|
|
|
if SEARCH_CACHE_ENABLED:
|
|
|
|
|
has_cache = await self.cache.has_query(text)
|
|
|
|
|
if has_cache:
|
|
|
|
|
cached_results = await self.cache.get(text, limit, offset)
|
|
|
|
|
if cached_results is not None:
|
|
|
|
|
return cached_results
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-02 23:10:08 +00:00
|
|
|
|
# Not in cache or cache disabled, perform new search
|
|
|
|
|
try:
|
|
|
|
|
# Decide whether to prefetch and cache or just get what we need
|
|
|
|
|
search_limit = SEARCH_PREFETCH_SIZE if SEARCH_CACHE_ENABLED else limit
|
2025-05-29 09:37:39 +00:00
|
|
|
|
|
2025-06-02 23:10:08 +00:00
|
|
|
|
logger.info(f"Searching for: '{text}' (limit={limit}, offset={offset}, search_limit={search_limit})")
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-02 19:40:10 +00:00
|
|
|
|
response = await self.client.post(
|
2025-06-02 23:00:44 +00:00
|
|
|
|
"/search-combined",
|
2025-06-02 19:40:10 +00:00
|
|
|
|
json={"text": text, "limit": search_limit},
|
|
|
|
|
)
|
2025-06-02 23:10:08 +00:00
|
|
|
|
response.raise_for_status()
|
|
|
|
|
result = response.json()
|
|
|
|
|
formatted_results = result.get("results", [])
|
2025-06-02 19:40:10 +00:00
|
|
|
|
|
2025-06-02 23:10:08 +00:00
|
|
|
|
# filter out non‑numeric IDs
|
|
|
|
|
valid_results = [r for r in formatted_results if r.get("id", "").isdigit()]
|
|
|
|
|
if len(valid_results) != len(formatted_results):
|
|
|
|
|
formatted_results = valid_results
|
2025-06-02 19:40:10 +00:00
|
|
|
|
|
2025-06-02 23:10:08 +00:00
|
|
|
|
if len(valid_results) != len(formatted_results):
|
|
|
|
|
formatted_results = valid_results
|
2025-06-01 23:56:11 +00:00
|
|
|
|
|
2025-06-02 23:10:08 +00:00
|
|
|
|
if SEARCH_CACHE_ENABLED:
|
|
|
|
|
# Store the full prefetch batch, then page it
|
2025-04-24 16:35:36 +00:00
|
|
|
|
await self.cache.store(text, formatted_results)
|
2025-06-02 23:10:08 +00:00
|
|
|
|
return await self.cache.get(text, limit, offset)
|
2025-06-01 23:56:11 +00:00
|
|
|
|
|
|
|
|
|
return formatted_results
|
2025-06-02 23:10:08 +00:00
|
|
|
|
except Exception:
|
|
|
|
|
logger.exception(f"Search error for '{text}'")
|
2025-06-02 19:40:10 +00:00
|
|
|
|
return []
|
|
|
|
|
|
2025-06-02 23:10:08 +00:00
|
|
|
|
async def search_authors(self, text: str, limit: int = 10, offset: int = 0) -> list:
|
2025-04-23 21:24:00 +00:00
|
|
|
|
"""Search only for authors using the specialized endpoint"""
|
|
|
|
|
if not self.available or not text.strip():
|
|
|
|
|
return []
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-23 21:24:00 +00:00
|
|
|
|
cache_key = f"author:{text}"
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-02 23:10:08 +00:00
|
|
|
|
# Check if we can serve from cache
|
|
|
|
|
if SEARCH_CACHE_ENABLED:
|
|
|
|
|
has_cache = await self.cache.has_query(cache_key)
|
|
|
|
|
if has_cache:
|
|
|
|
|
cached_results = await self.cache.get(cache_key, limit, offset)
|
|
|
|
|
if cached_results is not None:
|
|
|
|
|
return cached_results
|
|
|
|
|
|
|
|
|
|
# Not in cache or cache disabled, perform new search
|
2025-04-23 21:24:00 +00:00
|
|
|
|
try:
|
2025-06-01 23:56:11 +00:00
|
|
|
|
search_limit = SEARCH_PREFETCH_SIZE if SEARCH_CACHE_ENABLED else limit
|
2025-05-02 21:17:05 +00:00
|
|
|
|
|
2025-04-24 21:45:00 +00:00
|
|
|
|
logger.info(
|
2025-06-02 23:10:08 +00:00
|
|
|
|
f"Searching authors for: '{text}' (limit={limit}, offset={offset}, search_limit={search_limit})"
|
2025-04-24 21:45:00 +00:00
|
|
|
|
)
|
2025-05-29 09:37:39 +00:00
|
|
|
|
response = await self.client.post("/search-author", json={"text": text, "limit": search_limit})
|
2025-06-02 23:10:08 +00:00
|
|
|
|
response.raise_for_status()
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-02 23:10:08 +00:00
|
|
|
|
result = response.json()
|
|
|
|
|
author_results = result.get("results", [])
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-02 23:10:08 +00:00
|
|
|
|
# Filter out any invalid results if necessary
|
|
|
|
|
valid_results = [r for r in author_results if r.get("id", "").isdigit()]
|
|
|
|
|
if len(valid_results) != len(author_results):
|
|
|
|
|
author_results = valid_results
|
2025-05-02 21:17:05 +00:00
|
|
|
|
|
2025-06-02 23:10:08 +00:00
|
|
|
|
if SEARCH_CACHE_ENABLED:
|
|
|
|
|
# Store the full prefetch batch, then page it
|
2025-04-23 21:24:00 +00:00
|
|
|
|
await self.cache.store(cache_key, author_results)
|
2025-06-02 23:10:08 +00:00
|
|
|
|
return await self.cache.get(cache_key, limit, offset)
|
2025-05-29 09:37:39 +00:00
|
|
|
|
|
2025-04-24 21:45:00 +00:00
|
|
|
|
return author_results[offset : offset + limit]
|
|
|
|
|
|
2025-06-01 23:56:11 +00:00
|
|
|
|
except Exception:
|
2025-06-02 23:10:08 +00:00
|
|
|
|
logger.exception(f"Error searching authors for '{text}'")
|
2025-03-05 20:08:21 +00:00
|
|
|
|
return []
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-01 23:56:11 +00:00
|
|
|
|
async def check_index_status(self) -> dict:
|
2025-03-25 18:18:29 +00:00
|
|
|
|
"""Get detailed statistics about the search index health"""
|
|
|
|
|
if not self.available:
|
2025-06-02 23:10:08 +00:00
|
|
|
|
return {"status": "disabled"}
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-03-25 18:18:29 +00:00
|
|
|
|
try:
|
2025-06-02 23:10:08 +00:00
|
|
|
|
response = await self.client.get("/index-status")
|
|
|
|
|
response.raise_for_status()
|
|
|
|
|
result = response.json()
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-02 23:10:08 +00:00
|
|
|
|
if result.get("consistency", {}).get("status") != "ok":
|
2025-05-29 09:37:39 +00:00
|
|
|
|
null_count = result.get("consistency", {}).get("null_embeddings_count", 0)
|
2025-03-25 19:42:44 +00:00
|
|
|
|
if null_count > 0:
|
2025-06-02 23:10:08 +00:00
|
|
|
|
logger.warning(f"Found {null_count} documents with NULL embeddings")
|
2025-06-01 23:56:11 +00:00
|
|
|
|
|
2025-06-02 23:10:08 +00:00
|
|
|
|
return result
|
|
|
|
|
except Exception:
|
|
|
|
|
logger.exception("Failed to check index status")
|
|
|
|
|
return {"status": "error", "message": "Failed to check index status"}
|
2024-01-29 00:27:30 +00:00
|
|
|
|
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-03-05 20:08:21 +00:00
|
|
|
|
# Create the search service singleton
|
2024-01-29 03:42:02 +00:00
|
|
|
|
search_service = SearchService()
|
2024-01-29 01:41:46 +00:00
|
|
|
|
|
2025-03-19 17:47:31 +00:00
|
|
|
|
# API-compatible function to perform a search
|
2025-04-23 21:24:00 +00:00
|
|
|
|
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-02 23:10:08 +00:00
|
|
|
|
async def search_text(text: str, limit: int = 200, offset: int = 0) -> list:
|
2025-04-24 16:46:58 +00:00
|
|
|
|
payload = []
|
2025-04-23 21:24:00 +00:00
|
|
|
|
if search_service.available:
|
2025-04-24 16:46:58 +00:00
|
|
|
|
payload = await search_service.search(text, limit, offset)
|
|
|
|
|
return payload
|
2025-04-23 21:24:00 +00:00
|
|
|
|
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-02 23:10:08 +00:00
|
|
|
|
async def search_author_text(text: str, limit: int = 10, offset: int = 0) -> list:
|
2025-04-23 21:24:00 +00:00
|
|
|
|
"""Search authors API helper function"""
|
|
|
|
|
if search_service.available:
|
|
|
|
|
return await search_service.search_authors(text, limit, offset)
|
|
|
|
|
return []
|
|
|
|
|
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-01 23:56:11 +00:00
|
|
|
|
async def get_search_count(text: str) -> int:
|
2025-04-23 21:24:00 +00:00
|
|
|
|
"""Get count of title search results"""
|
|
|
|
|
if not search_service.available:
|
|
|
|
|
return 0
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-02 23:10:08 +00:00
|
|
|
|
if SEARCH_CACHE_ENABLED and await search_service.cache.has_query(text):
|
2025-04-25 00:00:41 +00:00
|
|
|
|
return await search_service.cache.get_total_count(text)
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-02 23:10:08 +00:00
|
|
|
|
# If not found in cache, fetch from endpoint
|
|
|
|
|
return len(await search_text(text, SEARCH_PREFETCH_SIZE, 0))
|
2025-04-23 21:24:00 +00:00
|
|
|
|
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-01 23:56:11 +00:00
|
|
|
|
async def get_author_search_count(text: str) -> int:
|
2025-04-23 21:24:00 +00:00
|
|
|
|
"""Get count of author search results"""
|
|
|
|
|
if not search_service.available:
|
|
|
|
|
return 0
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-04-23 21:24:00 +00:00
|
|
|
|
if SEARCH_CACHE_ENABLED:
|
|
|
|
|
cache_key = f"author:{text}"
|
2025-06-02 23:10:08 +00:00
|
|
|
|
if await search_service.cache.has_query(cache_key):
|
2025-04-23 21:24:00 +00:00
|
|
|
|
return await search_service.cache.get_total_count(cache_key)
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-02 23:10:08 +00:00
|
|
|
|
# If not found in cache, fetch from endpoint
|
|
|
|
|
return len(await search_author_text(text, SEARCH_PREFETCH_SIZE, 0))
|
2024-12-11 20:02:14 +00:00
|
|
|
|
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-01 23:56:11 +00:00
|
|
|
|
async def initialize_search_index(shouts_data: list) -> None:
|
2025-03-05 20:08:21 +00:00
|
|
|
|
"""Initialize search index with existing data during application startup"""
|
2025-03-25 16:31:45 +00:00
|
|
|
|
if not SEARCH_ENABLED:
|
|
|
|
|
return
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-02 23:10:08 +00:00
|
|
|
|
if not shouts_data:
|
|
|
|
|
return
|
|
|
|
|
|
|
|
|
|
info = await search_service.info()
|
|
|
|
|
if info.get("status") in ["error", "unavailable", "disabled"]:
|
2025-03-25 16:31:45 +00:00
|
|
|
|
return
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-02 23:10:08 +00:00
|
|
|
|
index_stats = info.get("index_stats", {})
|
|
|
|
|
indexed_doc_count = index_stats.get("total_count", 0)
|
|
|
|
|
|
|
|
|
|
index_status = await search_service.check_index_status()
|
|
|
|
|
if index_status.get("status") == "inconsistent":
|
|
|
|
|
problem_ids = index_status.get("consistency", {}).get("null_embeddings_sample", [])
|
|
|
|
|
|
|
|
|
|
if problem_ids:
|
|
|
|
|
problem_docs = [shout for shout in shouts_data if str(shout.id) in problem_ids]
|
|
|
|
|
if problem_docs:
|
|
|
|
|
await search_service.bulk_index(problem_docs)
|
|
|
|
|
|
2025-04-24 17:58:14 +00:00
|
|
|
|
# Only consider shouts with body content for body verification
|
2025-06-02 23:10:08 +00:00
|
|
|
|
def has_body_content(shout: Any) -> bool:
|
2025-04-24 21:45:00 +00:00
|
|
|
|
for field in ["subtitle", "lead", "body"]:
|
2025-06-02 23:10:08 +00:00
|
|
|
|
if (
|
|
|
|
|
getattr(shout, field, None)
|
|
|
|
|
and isinstance(getattr(shout, field, None), str)
|
|
|
|
|
and getattr(shout, field).strip()
|
|
|
|
|
):
|
2025-04-24 17:58:14 +00:00
|
|
|
|
return True
|
2025-06-02 23:10:08 +00:00
|
|
|
|
media = getattr(shout, "media", None)
|
|
|
|
|
if media:
|
2025-04-24 17:58:14 +00:00
|
|
|
|
if isinstance(media, str):
|
|
|
|
|
try:
|
|
|
|
|
media_json = json.loads(media)
|
2025-05-29 09:37:39 +00:00
|
|
|
|
if isinstance(media_json, dict) and (media_json.get("title") or media_json.get("body")):
|
2025-04-24 17:58:14 +00:00
|
|
|
|
return True
|
|
|
|
|
except Exception:
|
|
|
|
|
return True
|
2025-06-01 23:56:11 +00:00
|
|
|
|
elif isinstance(media, dict) and (media.get("title") or media.get("body")):
|
|
|
|
|
return True
|
2025-04-24 17:58:14 +00:00
|
|
|
|
return False
|
|
|
|
|
|
2025-06-02 23:10:08 +00:00
|
|
|
|
shouts_with_body = [shout for shout in shouts_data if has_body_content(shout)]
|
|
|
|
|
body_ids = [str(shout.id) for shout in shouts_with_body]
|
2025-04-24 21:45:00 +00:00
|
|
|
|
|
2025-06-02 23:10:08 +00:00
|
|
|
|
if abs(indexed_doc_count - len(shouts_data)) > 10:
|
|
|
|
|
doc_ids = [str(shout.id) for shout in shouts_data]
|
|
|
|
|
verification = await search_service.verify_docs(doc_ids)
|
|
|
|
|
if verification.get("status") == "error":
|
|
|
|
|
return
|
|
|
|
|
# Only reindex missing docs that actually have body content
|
|
|
|
|
missing_ids = [mid for mid in verification.get("missing", []) if mid in body_ids]
|
|
|
|
|
if missing_ids:
|
|
|
|
|
missing_docs = [shout for shout in shouts_with_body if str(shout.id) in missing_ids]
|
|
|
|
|
await search_service.bulk_index(missing_docs)
|
|
|
|
|
else:
|
2025-04-07 14:41:48 +00:00
|
|
|
|
pass
|
2025-05-22 01:34:30 +00:00
|
|
|
|
|
2025-06-02 23:10:08 +00:00
|
|
|
|
try:
|
|
|
|
|
test_query = "test"
|
|
|
|
|
# Use body search since that's most likely to return results
|
|
|
|
|
test_results = await search_text(test_query, 5)
|
|
|
|
|
|
|
|
|
|
if test_results:
|
|
|
|
|
categories = set()
|
|
|
|
|
for result in test_results:
|
|
|
|
|
result_id = result.get("id")
|
|
|
|
|
matching_shouts = [s for s in shouts_data if str(s.id) == result_id]
|
|
|
|
|
if matching_shouts and hasattr(matching_shouts[0], "category"):
|
|
|
|
|
categories.add(getattr(matching_shouts[0], "category", "unknown"))
|
|
|
|
|
except Exception as ex:
|
|
|
|
|
logger.warning(f"Test search failed during initialization: {ex}")
|
2025-05-22 01:34:30 +00:00
|
|
|
|
|
2025-06-01 23:56:11 +00:00
|
|
|
|
|
|
|
|
|
async def check_search_service() -> None:
|
2025-05-22 01:34:30 +00:00
|
|
|
|
info = await search_service.info()
|
2025-06-01 23:56:11 +00:00
|
|
|
|
if info.get("status") in ["error", "unavailable", "disabled"]:
|
|
|
|
|
logger.debug("Search service is not available")
|
2025-05-22 01:34:30 +00:00
|
|
|
|
else:
|
2025-06-01 23:56:11 +00:00
|
|
|
|
logger.info("Search service is available and ready")
|
2025-05-29 09:37:39 +00:00
|
|
|
|
|
2025-05-22 01:34:30 +00:00
|
|
|
|
|
|
|
|
|
# Initialize search index in the background
|
2025-06-01 23:56:11 +00:00
|
|
|
|
async def initialize_search_index_background() -> None:
|
2025-05-22 01:34:30 +00:00
|
|
|
|
"""
|
|
|
|
|
Запускает индексацию поиска в фоновом режиме с низким приоритетом.
|
|
|
|
|
"""
|
|
|
|
|
try:
|
2025-06-01 23:56:11 +00:00
|
|
|
|
logger.info("Запуск фоновой индексации поиска...")
|
2025-05-29 09:37:39 +00:00
|
|
|
|
|
2025-06-01 23:56:11 +00:00
|
|
|
|
# Здесь бы был код загрузки данных и индексации
|
|
|
|
|
# Пока что заглушка
|
2025-05-29 09:37:39 +00:00
|
|
|
|
|
2025-06-01 23:56:11 +00:00
|
|
|
|
logger.info("Фоновая индексация поиска завершена")
|
|
|
|
|
except Exception:
|
|
|
|
|
logger.exception("Ошибка фоновой индексации поиска")
|