Update app.py

app.py

@@ -216,11 +216,11 @@ def rerank_with_api(query, results, top_k, rerank_top_k=None):
             logging.warning("Ответ от API не содержит ключа 'results'.")
 
         logging.info("Переранжирование завершено.")
-        return reranked_results
+        return reranked_results, True
 
     except requests.exceptions.RequestException as e:
         logging.error(f"Ошибка при запросе к API реранжировщика: {e}")
-        return []
+        return results, False
 
 def search_movies_internal(query: str, top_k: int = 25, rerank_top_k: int = None):
     """Внутренняя функция для поиска фильмов по запросу (используется и в Gradio, и в API)."""
@@ -274,12 +274,37 @@ def search_movies_internal(query: str, top_k: int = 25, rerank_top_k: int = None
             conn.close()
 
         # Переранжируем результаты с помощью API
-        reranked_results = rerank_with_api(query, results, top_k, rerank_top_k)
+        reranked_results, rerank_success = rerank_with_api(query, results, top_k, rerank_top_k)
+        
+        if not rerank_success:
+            logging.warning("Переранжировка не удалась, используются сырые результаты.")
+            reranked_results = results[:top_k] # Используем срез для ограничения количества результатов
+        else:
+            reranked_results = reranked_results[:top_k]
 
         conn = get_db_connection()
         movie_ids = [movie_id for movie_id, _ in reranked_results]
         movie_data_dict = get_movie_data_from_db(conn, movie_ids)
-        conn.close()
+
+        # Получаем общее количество фильмов в базе данных
+        try:
+            with conn.cursor() as cur:
+                cur.execute(f'SELECT COUNT(*) FROM "{movies_table}"')
+                total_movies = cur.fetchone()[0]
+        except Exception as e:
+            logging.error(f"Ошибка при получении общего количества фильмов: {e}")
+            total_movies = 0
+
+        # Получаем количество фильмов, по которым производился поиск (количество строк в movie_embeddings)
+        try:
+            with conn.cursor() as cur:
+                cur.execute(f'SELECT COUNT(*) FROM "{embeddings_table}"')
+                searched_movies = cur.fetchone()[0]
+        except Exception as e:
+            logging.error(f"Ошибка при получении количества фильмов для поиска: {e}")
+            searched_movies = 0
+        finally:
+            conn.close()
 
         formatted_results = []
         for movie_id, score in reranked_results:
@@ -292,7 +317,7 @@ def search_movies_internal(query: str, top_k: int = 25, rerank_top_k: int = None
                     "year": movie_data['year'],
                     "genres": [genre['name'] for genre in movie_data['genres']],
                     "description": movie_data.get('description', ''),
-                    "relevance_score": score
+                    "relevance_score": score if rerank_success else (movie_data_dict.get(movie_id, (None, None))[1] if movie_data_dict.get(movie_id, (None, None)) is not None else 0.0) # Сохраняем similarity, если нет реранжировки
                 })
             else:
                 logging.warning(f"Данные для фильма с ID {movie_id} не найдены в БД.")
@@ -300,13 +325,22 @@ def search_movies_internal(query: str, top_k: int = 25, rerank_top_k: int = None
         search_time = time.time() - start_time
         logging.info(f"Поиск выполнен за {search_time:.2f} секунд.")
 
-        return formatted_results, search_time
+        return {
+            "status": "success",
+            "results": formatted_results,
+            "search_time": search_time,
+            "total_movies": total_movies,
+            "searched_movies": searched_movies
+        }, search_time
 
     except Exception as e:
         logging.error(f"Ошибка при выполнении поиска: {e}")
-        raise
+        return {
+            "status": "error",
+            "message": str(e)
+        }, 0
 
-@app.get("/search/", response_model=List[dict])
+@app.get("/search/", response_model=dict)
 async def api_search_movies(query: str = Query(..., description="Поисковый запрос"), 
                             top_k: int = Query(25, description="Количество возвращаемых результатов"),
                             rerank_top_k: int = Query(None, description="Количество фильмов для передачи в реранкер (если не указано, то top_k*2)")):
@@ -322,84 +356,239 @@ async def api_search_movies(query: str = Query(..., description="Поисков
 async def root():
     return """
     <!DOCTYPE html>
-    <html>
+    <html lang="ru">
     <head>
-        <title>Семантический поиск фильмов</title>
+        <meta name="robots" content="noindex, nofollow">
+        <meta charset="UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <title>VooFlex</title>
         <style>
+            * {
+                -webkit-tap-highlight-color: transparent;
+                -webkit-touch-callout: none;
+                -webkit-user-select: none;
+                user-select: none;
+            }
+
+            *:focus {
+                outline: none !important;
+                -webkit-tap-highlight-color: transparent;
+            }
+
+            input, button, a, div {
+                -webkit-tap-highlight-color: rgba(0,0,0,0);
+                -webkit-tap-highlight-color: transparent;
+                -webkit-user-select: text;
+                user-select: text;
+            }
+
+            .movie-card, .search-button, .close-button {
+                -webkit-tap-highlight-color: transparent;
+                -webkit-touch-callout: none;
+                -webkit-user-select: none;
+                user-select: none;
+                outline: none !important;
+            }
+
+            .search-input {
+                -webkit-user-select: text;
+                user-select: text;
+            }
+
+            .movie-card:active,
+            .movie-card:focus,
+            .search-button:active,
+            .search-button:focus,
+            .close-button:active,
+            .close-button:focus {
+                outline: none !important;
+                -webkit-tap-highlight-color: transparent;
+                background-color: inherit;
+            }
+
             body {
-                font-family: sans-serif;
-                margin: 20px;
+                font-family: 'Roboto', sans-serif;
+                margin: 0;
+                padding: 0;
+                background-color: #000;
+                color: #fff;
+            }
+            .container {
+                max-width: 1200px;
+                margin: 0 auto;
+                padding: 20px;
             }
-            h1 {
+            header {
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+                margin-bottom: 30px;
+                flex-wrap: wrap;
+            }
+            .logo {
+                font-size: 24px;
+                font-weight: bold;
+                white-space: nowrap;
+                flex: 1;
+                min-width: 100%;
                 text-align: center;
+                margin-bottom: 10px;
             }
-            label {
-                display: block;
-                margin-bottom: 5px;
+            .search-form {
+                display: flex;
+                border-radius: 10px;
+                overflow: hidden;
+                flex: 1;
+                min-width: 100%;
             }
-            input[type="text"] {
-                width: 100%;
+            .search-input {
                 padding: 10px;
-                margin-bottom: 10px;
-                border: 1px solid #ccc;
-                box-sizing: border-box;
+                font-size: 16px;
+                border: none;
+                background-color: #222;
+                color: #fff;
+                font-family: 'Roboto', sans-serif;
+                outline: none;
+                width: 100%;
             }
-            button {
+            .search-button {
                 padding: 10px 20px;
-                background-color: #4CAF50;
-                color: white;
+                font-size: 16px;
                 border: none;
+                background-color: #333;
+                color: #fff;
                 cursor: pointer;
+                font-family: 'Roboto', sans-serif;
+                white-space: nowrap;
             }
-            #results {
-                margin-top: 20px;
+            .movie-grid {
+                display: grid;
+                grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
+                gap: 20px;
             }
-            .movie {
-                border: 1px solid #ccc;
+            .movie-card {
+                border-radius: 10px;
+                overflow: hidden;
+                background-color: #111;
+                transition: transform 0.1s ease;
+            }
+            .movie-card:hover,
+            .movie-card:focus {
+                transform: scale(1.05);
+            }
+            .movie-info {
                 padding: 10px;
-                margin-bottom: 10px;
             }
-            .movie h3 {
-                margin-top: 0;
+            .movie-title {
+                font-size: 1.1em;
+                font-weight: bold;
+                margin-bottom: 5px;
+            }
+            .movie-year {
+                font-size: 0.9em;
+                color: #ccc;
+                margin-bottom: 5px;
+            }
+            .movie-genres {
+                font-size: 0.9em;
+                margin-bottom: 5px;
+            }
+            .movie-description {
+                font-size: 0.9em;
+                line-height: 1.4;
+                margin-bottom: 5px;
+            }
+            .relevance-score {
+                font-size: 0.8em;
+                color: #ccc;
+            }
+
+            @media (min-width: 769px) {
+                .movie-grid {
+                    grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
+                }
+                .logo {
+                    font-size: 2em;
+                    min-width: auto;
+                    text-align: left;
+                    margin-bottom: 0;
+                }
+                .search-form{
+                    min-width: 300px;
+                }
+            }
+            @media (max-width: 768px) {
+                .movie-grid {
+                    grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
+                }
+                .logo {
+                    font-size: 1.5em;
+                }
+            }
+            @media (max-width: 480px) {
+                .movie-grid {
+                    grid-template-columns: repeat(auto-fill, minmax(150px, 1fr));
+                }
+                .logo {
+                    font-size: 1.3em;
+                }
             }
         </style>
+        <link href="https://fonts.googleapis.com/css2?family=Orbitron&display=swap" rel="stylesheet">
+        <link href="https://fonts.googleapis.com/css2?family=Roboto&display=swap" rel="stylesheet">
     </head>
     <body>
-        <h1>Семантический поиск фильмов</h1>
-        <label for="query">Введите запрос:</label>
-        <input type="text" id="query" name="query" placeholder="Введите описание фильма...">
-        <button onclick="searchMovies()">Искать</button>
-        <div id="results"></div>
+        <div class="container">
+            <header>
+                <div class="logo">VooFlex</div>
+                <form class="search-form" id="searchForm">
+                    <input type="text" id="searchInput" placeholder="Поиск фильма..." class="search-input">
+                    <button type="submit" class="search-button">Поиск</button>
+                </form>
+            </header>
+
+            <main>
+                <div class="movie-grid" id="movieGrid"></div>
+            </main>
+        </div>
 
         <script>
+            document.getElementById('searchForm').addEventListener('submit', function(event) {
+                event.preventDefault();
+                searchMovies();
+            });
+
             function searchMovies() {
-                const query = document.getElementById("query").value;
-                const resultsDiv = document.getElementById("results");
-                resultsDiv.innerHTML = "<p>Поиск...</p>";
+                const query = document.getElementById('searchInput').value;
+                const movieGrid = document.getElementById('movieGrid');
+                movieGrid.innerHTML = '<p>Поиск...</p>';
 
                 fetch(`/search/?query=${encodeURIComponent(query)}`)
                     .then(response => response.json())
                     .then(data => {
-                        resultsDiv.innerHTML = "";
-                        if (data.length === 0) {
-                            resultsDiv.innerHTML = "<p>Ничего не найдено.</p>";
-                        } else {
-                            data.forEach(movie => {
-                                const movieDiv = document.createElement("div");
-                                movieDiv.classList.add("movie");
-                                movieDiv.innerHTML = `
-                                    <h3>${movie.name} (${movie.year})</h3>
-                                    <p><strong>Жанры:</strong> ${movie.genres.join(", ")}</p>
-                                    <p><strong>Описание:</strong> ${movie.description}</p>
-                                    <p><strong>Релевантность:</strong> ${movie.relevance_score.toFixed(4)}</p>
+                        movieGrid.innerHTML = '';
+                        if (data.status === 'success' && data.results.length > 0) {
+                            data.results.forEach(movie => {
+                                const movieCard = document.createElement('div');
+                                movieCard.className = 'movie-card';
+                                movieCard.innerHTML = `
+                                    <div class="movie-info">
+                                        <div class="movie-title">${movie.name}</div>
+                                        <div class="movie-year">${movie.year}</div>
+                                        <div class="movie-genres">${movie.genres.join(', ')}</div>
+                                        <div class="movie-description">${movie.description}</div>
+                                        <div class="relevance-score">Релевантность: ${movie.relevance_score.toFixed(4)}</div>
+                                    </div>
                                 `;
-                                resultsDiv.appendChild(movieDiv);
+                                movieGrid.appendChild(movieCard);
                             });
+                        } else {
+                            movieGrid.innerHTML = '<p>Ничего не найдено.</p>';
                         }
                     })
                     .catch(error => {
-                        console.error("Ошибка:", error);
-                        resultsDiv.innerHTML = "<p>Произошла ошибка при поиске.</p>";
+                        console.error('Error:', error);
+                        movieGrid.innerHTML = '<p>Произошла ошибка при поиске.</p>';
                     });
             }
         </script>
@@ -414,4 +603,4 @@ async def root():
 
 # Запускаем FastAPI
 if __name__ == "__main__":
-    uvicorn.run(app, host="0.0.0.0", port=7860)
+    uvicorn.run(app, host="0.0.0.0")