Update app.py

app.py

@@ -19,6 +19,7 @@ from starlette.requests import Request
 from starlette.responses import HTMLResponse, JSONResponse
 from fastapi.responses import HTMLResponse
 from fastapi.middleware.cors import CORSMiddleware
+from fastapi.staticfiles import StaticFiles
 
 # Настройка логирования
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
@@ -71,6 +72,9 @@ app.add_middleware(
     allow_headers=["*"],
 )
 
+# Добавляем монтирование static файлов для 404.png
+app.mount("/static", StaticFiles(directory="static"), name="static")
+
 def get_db_connection():
     """Устанавливает соединение с базой данных."""
     try:
@@ -172,13 +176,8 @@ def get_movie_data_from_db(conn, movie_ids):
                 WHERE id IN %s
             """, (tuple(movie_ids),))
             for movie_id, movie_data, prepared_json in cur.fetchall():
-                prepared_string = (
-                    f"Название: {prepared_json['Название']}\n"
-                    f"Год: {prepared_json['Год']}\n"
-                    f"Жанры: {prepared_json['Жанры']}\n"
-                    f"Описание: {prepared_json['Описание']}"
-                )
-                movie_data_dict[movie_id] = (movie_data, prepared_string, prepared_json)
+                # Исправлено: убрано формирование prepared_string, так как оно больше не используется для вывода relevance_score
+                movie_data_dict[movie_id] = (movie_data, prepared_json)
     except Exception as e:
         logging.error(f"Ошибка при получении данных фильмов из БД: {e}")
     return movie_data_dict
@@ -217,8 +216,15 @@ def rerank_with_api(query, results, top_k, rerank_top_k=None, api_key=None):
 
     documents = []
     for movie_id, _ in results:
-        movie_data, prepared_string, _ = movie_data_dict.get(movie_id, (None, None, None))
+        movie_data, prepared_json = movie_data_dict.get(movie_id, (None, None))
         if movie_data:
+            # Исправлено: добавлено формирование строки, так как она используется в data
+            prepared_string = (
+                f"Название: {prepared_json['Название']}\n"
+                f"Год: {prepared_json['Год']}\n"
+                f"Жанры: {prepared_json['Жанры']}\n"
+                f"Описание: {prepared_json['Описание']}"
+            )
             documents.append(prepared_string)
         else:
             logging.warning(f"Данные для фильма с ID {movie_id} не найдены в БД.")
@@ -323,7 +329,7 @@ def search_movies_internal(query: str, top_k: int = 25, rerank_top_k: Optional[i
             results = []
         finally:
             conn.close()
-
+        
         # Используем реранкер только если rerank_top_k не равен 0
         if rerank_top_k != 0:
             reranked_results, rerank_success, reranked_count = rerank_with_api(query, results, top_k, rerank_top_k, jina_api_key)
@@ -364,7 +370,7 @@ def search_movies_internal(query: str, top_k: int = 25, rerank_top_k: Optional[i
 
         formatted_results = []
         for movie_id, score in reranked_results:
-            movie_data, _, prepared_json = movie_data_dict.get(movie_id, (None, None, None))
+            movie_data, prepared_json = movie_data_dict.get(movie_id, (None, None))
             if movie_data:
                 formatted_results.append({
                     "movie_id": movie_id,
@@ -374,8 +380,7 @@ def search_movies_internal(query: str, top_k: int = 25, rerank_top_k: Optional[i
                     "description": prepared_json['Описание'],
                     "poster_preview_url": prepared_json['Постер'],
                     "rating_kp": prepared_json['Рейтинг'],
-                    "relevance_score": score if rerank_success else (
-                        movie_data_dict.get(movie_id, (None, None, None))[1] if movie_data_dict.get(movie_id, (None, None, None)) is not None else 0.0)
+                    "relevance_score": score if rerank_success else 0.0  # Возвращаем 0 если реранжировка не проводилась
                 })
             else:
                 logging.warning(f"Данные для фильма с ID {movie_id} не найдены в БД.")
@@ -391,9 +396,9 @@ def search_movies_internal(query: str, top_k: int = 25, rerank_top_k: Optional[i
             "search_time": search_time,
             "total_movies": total_movies,
             "searched_movies": searched_movies,
-            "returned_movies": len(formatted_results),
-            "reranked_movies": reranked_count,
-            "jina_balance": jina_balance
+            "returned_movies": len(formatted_results),  # Количество возвращенных фильмов
+            "reranked_movies": reranked_count,  # Количество фильмов, обработанных реранкером
+            "jina_balance": jina_balance  # Остаток баланса Jina AI
         }, search_time
 
     except Exception as e:
@@ -727,8 +732,13 @@ async def root():
                                 const movieCard = document.createElement('div');
                                 movieCard.className = 'movie-card';
                                 const ratingColor = getRatingColor(movie.rating_kp);
+                                let posterUrl = movie.poster_preview_url;
+                                if (!posterUrl) {
+                                    posterUrl = '/static/404.png';
+                                }
+
                                 movieCard.innerHTML = `
-                                    <img src="${movie.poster_preview_url}" alt="${movie.name}" class="movie-poster">
+                                    <img src="${posterUrl}" alt="${movie.name}" class="movie-poster" onerror="this.onerror=null;this.src='/static/404.png';">
                                     <div class="movie-info">
                                         <div class="top-info">
                                             <span class="movie-year">${movie.year}</span>