Update app.py

app.py

@@ -152,7 +152,7 @@ def get_embedding_from_db(conn, table_name, crc32_column, crc32_value, model_nam
 
 def get_movie_data_from_db(conn, movie_ids):
     """
-    Получает данные фильмов из таблицы Movies по списку ID, 
+    Получает данные фильмов из таблицы Movies по списку ID,
     включая предположительно URL-адрес постера и рейтинг.
     """
     movie_data_dict = {}
@@ -290,29 +290,40 @@ def search_movies_internal(query: str, top_k: int = 25, rerank_top_k: Optional[i
         # Определяем количество фильмов для запроса из БД
         db_limit = rerank_top_k or top_k * 2
 
-        # Используем косинусное расстояние для поиска
+        # Модифицируем запрос для поддержки поиска по числовому идентификатору
         try:
             with conn.cursor() as cur:
-                cur.execute(f"""
-                    WITH query_embedding AS (
-                        SELECT embedding
-                        FROM "{query_cache_table}"
-                        WHERE query_crc32 = %s
-                    )
-                    SELECT m.movie_id, 1 - (m.embedding <=> (SELECT embedding FROM query_embedding)) as similarity
-                    FROM "{embeddings_table}" m, query_embedding
-                    ORDER BY similarity DESC
-                    LIMIT %s
-                """, (query_crc32, int(db_limit)))
-
-                results = cur.fetchall()
-            logging.info(f"Найдено {len(results)} предварительных результатов поиска.")
+                if query.isdigit():
+                    # Если запрос является числом, ищем по ID
+                    cur.execute(f"""
+                        SELECT m.movie_id, 1.0 as similarity
+                        FROM "{embeddings_table}" m
+                        WHERE m.movie_id = %s
+                        LIMIT 1
+                    """, (int(query),))
+                    results = cur.fetchall()
+                    logging.info(f"Найдено {len(results)} результатов по ID.")
+                else:
+                    cur.execute(f"""
+                        WITH query_embedding AS (
+                            SELECT embedding
+                            FROM "{query_cache_table}"
+                            WHERE query_crc32 = %s
+                        )
+                        SELECT m.movie_id, 1 - (m.embedding <=> (SELECT embedding FROM query_embedding)) as similarity
+                        FROM "{embeddings_table}" m, query_embedding
+                        ORDER BY similarity DESC
+                        LIMIT %s
+                    """, (query_crc32, int(db_limit)))
+
+                    results = cur.fetchall()
+                    logging.info(f"Найдено {len(results)} предварительных результатов поиска по тексту.")
         except Exception as e:
             logging.error(f"Ошибка при выполнении поискового запроса: {e}")
             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)
@@ -353,7 +364,6 @@ 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))
             if movie_data:
                 formatted_results.append({
@@ -365,7 +375,7 @@ def search_movies_internal(query: str, top_k: int = 25, rerank_top_k: Optional[i
                     "poster_preview_url": prepared_json['Постер'],
                     "rating_kp": prepared_json['Рейтинг'],
                     "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, если нет реранжировки
+                        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)
                 })
             else:
                 logging.warning(f"Данные для фильма с ID {movie_id} не найдены в БД.")
@@ -381,9 +391,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  # Остаток баланса Jina AI
+            "returned_movies": len(formatted_results),
+            "reranked_movies": reranked_count,
+            "jina_balance": jina_balance
         }, search_time
 
     except Exception as e:
@@ -555,6 +565,7 @@ async def root():
                 background-color: #111;
                 transition: transform 0.1s ease;
                 cursor: pointer;
+                aspect-ratio: 6 / 9;
             }
             .movie-card:hover,
             .movie-card:focus {
@@ -562,7 +573,7 @@ async def root():
             }
             .movie-poster {
                 width: 100%;
-                height: 350px;
+                height: 100%;
                 object-fit: cover;
             }
             .movie-info {
@@ -577,21 +588,38 @@ async def root():
             }
             .movie-title {
                 width: 100%;
-                background-color: #111;
+                background-color: rgba(17, 17, 17, 0.8);
                 font-size: 1.1em;
                 font-weight: bold;
                 text-align: center;
                 padding: 10px;
                 box-sizing: border-box;
+                z-index: 10;
             }
+
+            .movie-title-bg {
+                position: absolute;
+                bottom: 0;
+                left: 0;
+                width: 100%;
+                height: 50%;
+                background: linear-gradient(to top, rgba(17, 17, 17, 0.8), rgba(17, 17, 17, 0));
+                z-index: 1;
+            }
+
             .top-info {
                 display: flex;
                 justify-content: space-between;
                 padding: 10px;
+                width: calc(100% - 20px);
+                z-index: 10;
             }
             .movie-year, .movie-rating {
                 font-size: 0.8em;
                 color: #ccc;
+                padding: 5px 10px;
+                background-color: rgba(17, 17, 17, 0.8);
+                border-radius: 5px;
             }
             .movie-details {
                 display: none;
@@ -643,9 +671,6 @@ async def root():
                 .movie-grid {
                     grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
                 }
-                .movie-poster {
-                    height: 225px;
-                }
                 .logo {
                     font-size: 1.5em;
                 }
@@ -654,9 +679,6 @@ async def root():
                 .movie-grid {
                     grid-template-columns: repeat(auto-fill, minmax(150px, 1fr));
                 }
-                .movie-poster {
-                    height: 180px;
-                }
                 .logo {
                     font-size: 1.3em;
                 }
@@ -706,14 +728,15 @@ async def root():
                                 movieCard.className = 'movie-card';
                                 const ratingColor = getRatingColor(movie.rating_kp);
                                 movieCard.innerHTML = `
-                                <img src="${movie.poster_preview_url}" alt="${movie.name}" class="movie-poster">
-                                <div class="movie-info">
-                                    <div class="top-info">
-                                        <span class="movie-year">${movie.year}</span>
-                                        <span class="movie-rating" style="color: ${ratingColor};">${movie.rating_kp}</span>
+                                    <img src="${movie.poster_preview_url}" alt="${movie.name}" class="movie-poster">
+                                    <div class="movie-info">
+                                        <div class="top-info">
+                                            <span class="movie-year">${movie.year}</span>
+                                            <span class="movie-rating" style="color: ${ratingColor};">${movie.rating_kp}</span>
+                                        </div>
+                                        <div class="movie-title-bg"></div>
+                                        <div class="movie-title">${movie.name}</div>
                                     </div>
-                                    <div class="movie-title">${movie.name}</div>
-                                </div>
                                 `;
                                 movieCard.addEventListener('click', () => {
                                     openMovieDetails(movie.description);
@@ -760,4 +783,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")