Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
512729398b | ||
|
|
3f7b6d10f9 | ||
|
|
c404582c03 | ||
|
|
e1c3f6e7c5 | ||
|
|
4fcd168a85 | ||
|
|
f6c6d96c02 | ||
|
|
0733965540 | ||
|
|
028e8dd9f3 | ||
|
|
97f891132b | ||
|
|
61af47d651 | ||
|
|
c3b63a61cc | ||
|
|
b6a1d4aeaf | ||
|
|
6c512c78aa | ||
|
|
0aee5ca021 | ||
|
|
e863a8a088 | ||
|
|
58632e29cb | ||
|
|
e560809c25 | ||
|
|
a0344903ec | ||
|
|
9ecdc1b040 | ||
|
|
4a480a312e | ||
|
|
f00bff5f64 | ||
|
|
25f528c86d | ||
|
|
21e30b0fb2 | ||
|
|
07d8e15925 | ||
|
|
7609159f60 | ||
|
|
c2884ac9ce | ||
|
|
40010c9860 | ||
|
|
d97a665a9c | ||
|
|
39da976ef3 |
@@ -2,3 +2,6 @@
|
|||||||
*.duckdb
|
*.duckdb
|
||||||
.env
|
.env
|
||||||
__pycache__
|
__pycache__
|
||||||
|
|
||||||
|
|
||||||
|
src/data/
|
||||||
@@ -16,4 +16,6 @@ wheels/
|
|||||||
*.log
|
*.log
|
||||||
*.gz
|
*.gz
|
||||||
|
|
||||||
|
data
|
||||||
|
|
||||||
.vscode/*
|
.vscode/*
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
# Changelog
|
|
||||||
|
|
||||||
All notable changes to the Eurovision-25 backend will be documented in this file.
|
|
||||||
|
|
||||||
## [1.0rc1] - 2025-05-10
|
|
||||||
|
|
||||||
### First Release Candidate
|
|
||||||
|
|
||||||
This is the first release candidate for Eurovision-25 backend, featuring all core functionality:
|
|
||||||
|
|
||||||
- Authentication and user management
|
|
||||||
- Song management and reviews
|
|
||||||
- Results calculation and display
|
|
||||||
- Admin functionality
|
|
||||||
- Static file serving for avatars and country flags
|
|
||||||
|
|
||||||
The application is now feature complete, but may still contain bugs that will be addressed before the final 1.0.0 release.
|
|
||||||
@@ -0,0 +1,69 @@
|
|||||||
|
# Eurovision 25 Backend Changelog
|
||||||
|
|
||||||
|
## 1.0rc5 (2025-05-16)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
- Added vote weighting system for jury scores
|
||||||
|
- Improved performance for results calculation
|
||||||
|
|
||||||
|
### Fixes
|
||||||
|
- Fixed inconsistent sorting in results view
|
||||||
|
- Fixed avatar upload size validation
|
||||||
|
|
||||||
|
### Changes
|
||||||
|
- Updated dependencies to latest versions
|
||||||
|
- Enhanced API documentation
|
||||||
|
|
||||||
|
## 1.0rc4 (2025-05-16)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
- Added user profile update functionality allowing users to edit their personal information
|
||||||
|
|
||||||
|
### Changes
|
||||||
|
- Changed song seed values to use official and verified data
|
||||||
|
|
||||||
|
## 1.0rc3 (2025-05-16)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
- Added contest table and routes
|
||||||
|
- Added result endpoints with artist information
|
||||||
|
- Created result views in database schema
|
||||||
|
- Added avatar images for users
|
||||||
|
|
||||||
|
### Fixes
|
||||||
|
- Fixed data directory copied from dev environment causing build errors
|
||||||
|
- Fixed error when no reviews exist
|
||||||
|
- Fixed container not starting if data directory did not exist
|
||||||
|
- Fixed review PUT failing when no previous review exists
|
||||||
|
|
||||||
|
### Changes
|
||||||
|
- Updated application version to 1.0rc3
|
||||||
|
- Merged changelog files for better version tracking
|
||||||
|
- Added more comprehensive logging
|
||||||
|
- Added gitignore entries
|
||||||
|
|
||||||
|
## 1.0rc2 (2025-05-10)
|
||||||
|
|
||||||
|
### Changes
|
||||||
|
- Updated application version to 1.0rc2
|
||||||
|
- Added more comprehensive logging throughout the application
|
||||||
|
|
||||||
|
## 1.0rc1 (2025-05-01)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
- Initial release candidate
|
||||||
|
- Eurovision 25 Homereview API implementation
|
||||||
|
- Authentication and authorization system
|
||||||
|
- User management features
|
||||||
|
- Song management and reviews
|
||||||
|
- Review system
|
||||||
|
- Results calculation and display
|
||||||
|
- Admin functionality
|
||||||
|
- Static file serving for avatars and country flags
|
||||||
|
|
||||||
|
The application is feature complete, but may still contain bugs that will be addressed before the final 1.0.0 release.
|
||||||
|
|
||||||
|
## Planned for 1.0.0 (Final Release)
|
||||||
|
|
||||||
|
### Features
|
||||||
|
- Additional security improvements and bug fixes
|
||||||
@@ -6,10 +6,13 @@ WORKDIR /app
|
|||||||
COPY pyproject.toml uv.lock /app/
|
COPY pyproject.toml uv.lock /app/
|
||||||
RUN uv sync --frozen --no-install-project --no-dev
|
RUN uv sync --frozen --no-install-project --no-dev
|
||||||
COPY src /app
|
COPY src /app
|
||||||
|
# Ensure data directory exists but don't copy from host
|
||||||
RUN uv sync --frozen --no-dev
|
RUN uv sync --frozen --no-dev
|
||||||
|
|
||||||
FROM base
|
FROM base
|
||||||
COPY --from=builder /app /app
|
COPY --from=builder /app /app
|
||||||
ENV PATH="/app/.venv/bin:$PATH"
|
ENV PATH="/app/.venv/bin:$PATH"
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
# Create data directory
|
||||||
|
RUN mkdir -p /app/data && chmod 755 /app/data
|
||||||
CMD ["uvicorn", "app:app", "--host", "0.0.0.0", "--port", "8000"]
|
CMD ["uvicorn", "app:app", "--host", "0.0.0.0", "--port", "8000"]
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
# Eurovision 25 Homereview Backend
|
# Eurovision 25 Homereview Backend
|
||||||
|
|
||||||
|
**Version: 1.0rc5**
|
||||||
|
|
||||||
## Description
|
## Description
|
||||||
|
|
||||||
This project provides the backend API for the "Eurovision 25 Homereview" application. It allows a small, known group of users, organized into households/groups, to collaboratively review and score Eurovision Song Contest entries during the live show. Users submit numerical scores (1-100) for stage show, wardrobe, and song quality, along with optional text comments. Users can update their scores until the contest is marked as finished by an admin. Afterward, users can view aggregated results within their group or across all participants, including basic statistics.
|
This project provides the backend API for the "Eurovision 25 Homereview" application. It allows a small, known group of users, organized into households/groups, to collaboratively review and score Eurovision Song Contest entries during the live show. Users submit numerical scores (1-100) for stage show, wardrobe, and song quality, along with optional text comments. Users can update their scores until the contest is marked as finished by an admin. Afterward, users can view aggregated results within their group or across all participants, including basic statistics.
|
||||||
@@ -220,6 +222,12 @@ Automated tests are not implemented at this time. Manual testing via the API doc
|
|||||||
## TODOs
|
## TODOs
|
||||||
|
|
||||||
* [ ] Replace password hashing with passlib
|
* [ ] Replace password hashing with passlib
|
||||||
|
* [ ] Switch to PostgreSQL from DuckDB
|
||||||
|
* [x] Implement more comprehensive logging
|
||||||
|
* [x] Implement user disabling functionality
|
||||||
|
* [x] Implement user profile update functionality (name, email, password, avatar, etc.)
|
||||||
|
* [x] Add vote weighting system for jury scores
|
||||||
|
* [x] Fix avatar upload size validation
|
||||||
|
|
||||||
## Contributing
|
## Contributing
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,14 @@
|
|||||||
version: '3.8'
|
version: '3.8'
|
||||||
|
|
||||||
|
# This compose file can be used with either Docker or Podman
|
||||||
|
# For Podman: podman-compose up -d
|
||||||
|
|
||||||
services:
|
services:
|
||||||
backend:
|
backend:
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
|
image: eurovision-25-backend:1.0rc5
|
||||||
ports:
|
ports:
|
||||||
- "8000:8000"
|
- "8000:8000"
|
||||||
volumes:
|
volumes:
|
||||||
|
|||||||
@@ -0,0 +1,10 @@
|
|||||||
|
# Version update
|
||||||
|
|
||||||
|
1. Update version in `pyproject.toml`
|
||||||
|
2. Update version in `uv.lock`
|
||||||
|
3. Update version in `src/app.py`
|
||||||
|
4. Update `CHANGES.md`. Take info from git log
|
||||||
|
5. Update `README.md`
|
||||||
|
6. Commit changes
|
||||||
|
7. Tag release
|
||||||
|
8. Push changes
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
[project]
|
[project]
|
||||||
name = "Eurovision-25-backend"
|
name = "Eurovision-25-backend"
|
||||||
version = "1.0rc1"
|
version = "1.0rc5"
|
||||||
description = "Backend for Eurovision 25"
|
description = "Backend for Eurovision 25"
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
requires-python = ">=3.12"
|
requires-python = ">=3.12"
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ from fastapi.middleware.cors import CORSMiddleware
|
|||||||
from fastapi.staticfiles import StaticFiles
|
from fastapi.staticfiles import StaticFiles
|
||||||
|
|
||||||
# Import routers
|
# Import routers
|
||||||
from routes import auth, admin, users, songs, reviews, results
|
from routes import auth, admin, users, songs, reviews, results, contest
|
||||||
|
|
||||||
from lib.logger import logger
|
from lib.logger import logger
|
||||||
from lib.db import init_db
|
from lib.db import init_db
|
||||||
@@ -12,9 +12,21 @@ from lib.db import init_db
|
|||||||
app = FastAPI(
|
app = FastAPI(
|
||||||
title="Eurovision 25 Homereview API",
|
title="Eurovision 25 Homereview API",
|
||||||
description="Backend API for Eurovision 25 Homereview application",
|
description="Backend API for Eurovision 25 Homereview application",
|
||||||
version="1.0rc1",
|
version="1.0rc5",
|
||||||
|
openapi_url="/sec_schema.json",
|
||||||
|
docs_url="/docut",
|
||||||
|
redoc_url=None,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@app.middleware("http")
|
||||||
|
async def log_requests(request, call_next):
|
||||||
|
body = await request.body()
|
||||||
|
logger.debug(f"Request body: {body.decode('utf-8')}")
|
||||||
|
response = await call_next(request)
|
||||||
|
return response
|
||||||
|
|
||||||
|
|
||||||
# Add CORS middleware
|
# Add CORS middleware
|
||||||
app.add_middleware(
|
app.add_middleware(
|
||||||
CORSMiddleware,
|
CORSMiddleware,
|
||||||
@@ -51,3 +63,4 @@ app.include_router(users.router)
|
|||||||
app.include_router(songs.router)
|
app.include_router(songs.router)
|
||||||
app.include_router(reviews.router)
|
app.include_router(reviews.router)
|
||||||
app.include_router(results.router)
|
app.include_router(results.router)
|
||||||
|
app.include_router(contest.router)
|
||||||
|
|||||||
@@ -9,12 +9,16 @@ DROP TABLE IF EXISTS Review;
|
|||||||
DROP TABLE IF EXISTS Song;
|
DROP TABLE IF EXISTS Song;
|
||||||
DROP TABLE IF EXISTS "User"; -- Quoted because USER is a reserved keyword
|
DROP TABLE IF EXISTS "User"; -- Quoted because USER is a reserved keyword
|
||||||
DROP TABLE IF EXISTS Team;
|
DROP TABLE IF EXISTS Team;
|
||||||
|
DROP TABLE IF EXISTS Contest;
|
||||||
DROP TABLE IF EXISTS CountryCodes;
|
DROP TABLE IF EXISTS CountryCodes;
|
||||||
|
DROP VIEW IF EXISTS ReviewSummary;
|
||||||
|
DROP VIEW IF EXISTS ReviewSummaryByTeam;
|
||||||
|
|
||||||
DROP SEQUENCE IF EXISTS group_id_seq;
|
DROP SEQUENCE IF EXISTS group_id_seq;
|
||||||
DROP SEQUENCE IF EXISTS user_id_seq;
|
DROP SEQUENCE IF EXISTS user_id_seq;
|
||||||
DROP SEQUENCE IF EXISTS song_id_seq;
|
DROP SEQUENCE IF EXISTS song_id_seq;
|
||||||
DROP SEQUENCE IF EXISTS review_id_seq;
|
DROP SEQUENCE IF EXISTS review_id_seq;
|
||||||
|
DROP SEQUENCE IF EXISTS contest_id_seq;
|
||||||
|
|
||||||
-- =============================================================================
|
-- =============================================================================
|
||||||
-- Sequences for Primary Keys
|
-- Sequences for Primary Keys
|
||||||
@@ -23,6 +27,23 @@ CREATE SEQUENCE group_id_seq START 1;
|
|||||||
CREATE SEQUENCE user_id_seq START 1;
|
CREATE SEQUENCE user_id_seq START 1;
|
||||||
CREATE SEQUENCE song_id_seq START 1;
|
CREATE SEQUENCE song_id_seq START 1;
|
||||||
CREATE SEQUENCE review_id_seq START 1;
|
CREATE SEQUENCE review_id_seq START 1;
|
||||||
|
CREATE SEQUENCE contest_id_seq START 1;
|
||||||
|
|
||||||
|
-- =============================================================================
|
||||||
|
-- Table: Contest
|
||||||
|
-- Stores information about Eurovision contests by year.
|
||||||
|
-- =============================================================================
|
||||||
|
CREATE TABLE Contest (
|
||||||
|
id INTEGER PRIMARY KEY DEFAULT nextval('contest_id_seq'), -- Use sequence for auto-increment
|
||||||
|
year INTEGER DEFAULT EXTRACT(YEAR FROM CURRENT_DATE) NOT NULL, -- The year of the Eurovision contest
|
||||||
|
is_active BOOLEAN DEFAULT TRUE NOT NULL, -- Flag indicating if this is the active contest
|
||||||
|
finals_date DATE NOT NULL, -- Date of the finals
|
||||||
|
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, -- Timestamp when the contest was created
|
||||||
|
updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP -- Timestamp when the contest was last updated
|
||||||
|
);
|
||||||
|
|
||||||
|
-- Add index for faster lookups by year
|
||||||
|
CREATE INDEX idx_contest_year ON Contest (year);
|
||||||
|
|
||||||
-- =============================================================================
|
-- =============================================================================
|
||||||
-- Table: Group
|
-- Table: Group
|
||||||
@@ -42,6 +63,8 @@ CREATE TABLE "Team" (
|
|||||||
CREATE TABLE "User" (
|
CREATE TABLE "User" (
|
||||||
id INTEGER PRIMARY KEY DEFAULT nextval('user_id_seq'), -- Use sequence for auto-increment
|
id INTEGER PRIMARY KEY DEFAULT nextval('user_id_seq'), -- Use sequence for auto-increment
|
||||||
username VARCHAR UNIQUE NOT NULL, -- The user's login name
|
username VARCHAR UNIQUE NOT NULL, -- The user's login name
|
||||||
|
first_name VARCHAR DEFAULT '',
|
||||||
|
last_name VARCHAR DEFAULT '',
|
||||||
hashed_password VARCHAR NOT NULL, -- The securely hashed password
|
hashed_password VARCHAR NOT NULL, -- The securely hashed password
|
||||||
email VARCHAR UNIQUE, -- User's email address (nullable)
|
email VARCHAR UNIQUE, -- User's email address (nullable)
|
||||||
team_id INTEGER NOT NULL, -- Foreign Key -> Group.id
|
team_id INTEGER NOT NULL, -- Foreign Key -> Group.id
|
||||||
@@ -115,6 +138,44 @@ CREATE TABLE CountryCodes (
|
|||||||
name_sv VARCHAR NOT NULL
|
name_sv VARCHAR NOT NULL
|
||||||
);
|
);
|
||||||
|
|
||||||
|
CREATE VIEW ReviewSummaryGlobal AS
|
||||||
|
SELECT
|
||||||
|
song_id,
|
||||||
|
cc.name_fi AS country_fi,
|
||||||
|
cc.name_sv AS country_sv,
|
||||||
|
s.artist,
|
||||||
|
s.title,
|
||||||
|
COUNT(*) AS total_reviews,
|
||||||
|
AVG(score_song) AS avg_score_song,
|
||||||
|
AVG(score_show) AS avg_score_show,
|
||||||
|
AVG(score_costume) AS avg_score_costume,
|
||||||
|
AVG((score_song + score_show + score_costume)/3) AS avg_total_score
|
||||||
|
FROM Review r
|
||||||
|
JOIN Song s ON r.song_id = s.id
|
||||||
|
JOIN CountryCodes cc ON s.country = cc.code
|
||||||
|
GROUP BY song_id, cc.name_fi, cc.name_sv, s.artist, s.title
|
||||||
|
ORDER BY avg_total_score DESC;
|
||||||
|
|
||||||
|
CREATE VIEW ReviewSummaryByTeam AS
|
||||||
|
SELECT
|
||||||
|
r.song_id,
|
||||||
|
cc.name_fi AS country_fi,
|
||||||
|
cc.name_sv AS country_sv,
|
||||||
|
s.artist,
|
||||||
|
s.title,
|
||||||
|
u.team_id,
|
||||||
|
COUNT(*) AS total_reviews,
|
||||||
|
AVG(r.score_song) AS avg_score_song,
|
||||||
|
AVG(r.score_show) AS avg_score_show,
|
||||||
|
AVG(r.score_costume) AS avg_score_costume,
|
||||||
|
AVG((r.score_song + r.score_show + r.score_costume)/3) AS avg_total_score
|
||||||
|
FROM Review r
|
||||||
|
JOIN "User" u ON r.user_id = u.id
|
||||||
|
JOIN Song s ON r.song_id = s.id
|
||||||
|
JOIN CountryCodes cc ON s.country = cc.code
|
||||||
|
GROUP BY r.song_id, u.team_id, cc.name_fi, cc.name_sv, s.artist, s.title
|
||||||
|
ORDER BY avg_total_score DESC;
|
||||||
|
|
||||||
-- Insert country codes data
|
-- Insert country codes data
|
||||||
INSERT INTO CountryCodes (code, name_en, name_fi, name_sv) VALUES ('ALB', 'Albania', 'Albania', 'Albanien');
|
INSERT INTO CountryCodes (code, name_en, name_fi, name_sv) VALUES ('ALB', 'Albania', 'Albania', 'Albanien');
|
||||||
INSERT INTO CountryCodes (code, name_en, name_fi, name_sv) VALUES ('ARM', 'Armenia', 'Armenia', 'Armenien');
|
INSERT INTO CountryCodes (code, name_en, name_fi, name_sv) VALUES ('ARM', 'Armenia', 'Armenia', 'Armenien');
|
||||||
@@ -154,6 +215,9 @@ INSERT INTO CountryCodes (code, name_en, name_fi, name_sv) VALUES ('CHE', 'Switz
|
|||||||
INSERT INTO CountryCodes (code, name_en, name_fi, name_sv) VALUES ('UKR', 'Ukraine', 'Ukraina', 'Ukraina');
|
INSERT INTO CountryCodes (code, name_en, name_fi, name_sv) VALUES ('UKR', 'Ukraine', 'Ukraina', 'Ukraina');
|
||||||
INSERT INTO CountryCodes (code, name_en, name_fi, name_sv) VALUES ('GBR', 'United Kingdom', 'Englanti', 'Storbritannien');
|
INSERT INTO CountryCodes (code, name_en, name_fi, name_sv) VALUES ('GBR', 'United Kingdom', 'Englanti', 'Storbritannien');
|
||||||
|
|
||||||
|
|
||||||
|
-- TODO: Clean this next year. Its now here just to get the show running
|
||||||
|
INSERT INTO Contest (year, finals_date) VALUES (2025, '2025-05-16');
|
||||||
-- =============================================================================
|
-- =============================================================================
|
||||||
-- Views (Optional - Not Created Here Based on Documentation Decision)
|
-- Views (Optional - Not Created Here Based on Documentation Decision)
|
||||||
-- =============================================================================
|
-- =============================================================================
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ from dotenv import load_dotenv
|
|||||||
import os
|
import os
|
||||||
|
|
||||||
from lib.helpers import hash_password
|
from lib.helpers import hash_password
|
||||||
|
from lib.logger import logger
|
||||||
|
|
||||||
load_dotenv()
|
load_dotenv()
|
||||||
|
|
||||||
@@ -32,8 +33,8 @@ def seed_db() -> None:
|
|||||||
return
|
return
|
||||||
|
|
||||||
for idx, item in enumerate(data):
|
for idx, item in enumerate(data):
|
||||||
item["running_order"] = idx + 1
|
|
||||||
with get_connection() as conn:
|
with get_connection() as conn:
|
||||||
|
logger.debug(f"Inserting song {idx + 1} of {len(data)}", item)
|
||||||
conn.execute(
|
conn.execute(
|
||||||
"INSERT INTO Song (year, artist, country, title, lyrics_url, artist_url, flag_url, running_order, lyrics_original, lyrics_translation_fi, tags, confidence, language) VALUES (2025, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
|
"INSERT INTO Song (year, artist, country, title, lyrics_url, artist_url, flag_url, running_order, lyrics_original, lyrics_translation_fi, tags, confidence, language) VALUES (2025, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
|
||||||
(
|
(
|
||||||
@@ -61,6 +62,9 @@ def seed_db() -> None:
|
|||||||
# Seed Admin users
|
# Seed Admin users
|
||||||
admin_username = os.getenv("ADMIN_USERNAME")
|
admin_username = os.getenv("ADMIN_USERNAME")
|
||||||
hashed_admin_password = hash_password(os.getenv("ADMIN_PASSWORD", "password"))
|
hashed_admin_password = hash_password(os.getenv("ADMIN_PASSWORD", "password"))
|
||||||
|
logger.debug(
|
||||||
|
f"Admin user: {admin_username}, hashed password: {hashed_admin_password}"
|
||||||
|
)
|
||||||
with get_connection() as conn:
|
with get_connection() as conn:
|
||||||
conn.execute(
|
conn.execute(
|
||||||
'INSERT INTO "User" (username, hashed_password, team_id, is_active, is_admin) VALUES (?, ?, ?, ?, ?)',
|
'INSERT INTO "User" (username, hashed_password, team_id, is_active, is_admin) VALUES (?, ?, ?, ?, ?)',
|
||||||
@@ -75,8 +79,12 @@ def seed_db() -> None:
|
|||||||
|
|
||||||
|
|
||||||
def init_db():
|
def init_db():
|
||||||
|
logger.info("Initializing database...")
|
||||||
if Path(DB_PATH).exists():
|
if Path(DB_PATH).exists():
|
||||||
return
|
return
|
||||||
|
logger.info("Database does not exist, creating...")
|
||||||
|
if not Path(DB_PATH).parent.exists():
|
||||||
|
Path(DB_PATH).parent.mkdir(parents=True, exist_ok=True)
|
||||||
with open(SQL_PATH, "r") as f:
|
with open(SQL_PATH, "r") as f:
|
||||||
sql = f.read()
|
sql = f.read()
|
||||||
with get_connection() as conn:
|
with get_connection() as conn:
|
||||||
|
|||||||
@@ -1,16 +1,26 @@
|
|||||||
from loguru import logger
|
from loguru import logger
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
import sys
|
import sys
|
||||||
|
from dotenv import load_dotenv
|
||||||
|
import os
|
||||||
|
|
||||||
LOG_PATH = Path("./data/logs/logs.log").absolute()
|
load_dotenv()
|
||||||
ERROR_PATH = Path("./data/logs/errors.log").absolute()
|
|
||||||
|
LOG_PATH = Path(os.getenv("LOG_PATH", "./data/logs/logs.log")).absolute()
|
||||||
|
ERROR_PATH = Path(os.getenv("ERROR_PATH", "./data/logs/errors.log")).absolute()
|
||||||
|
|
||||||
logger.remove()
|
logger.remove()
|
||||||
logger.add(LOG_PATH, rotation="10 MB", compression="gz", level="INFO")
|
logger.add(
|
||||||
logger.add(sys.stdout, level="INFO")
|
LOG_PATH, rotation="10 MB", compression="gz", level=os.getenv("LOG_LEVEL", "INFO")
|
||||||
|
)
|
||||||
|
logger.add(sys.stdout, level=os.getenv("LOG_LEVEL", "INFO"))
|
||||||
|
|
||||||
logger.add(ERROR_PATH, rotation="10 MB", compression="gz", level="ERROR")
|
logger.add(
|
||||||
logger.add(sys.stderr, level="ERROR")
|
ERROR_PATH,
|
||||||
logger.add(sys.stdout, level="DEBUG")
|
rotation="10 MB",
|
||||||
|
compression="gz",
|
||||||
|
level=os.getenv("LOG_LEVEL_ERROR", "ERROR"),
|
||||||
|
)
|
||||||
|
logger.add(sys.stderr, level=os.getenv("LOG_LEVEL_ERROR", "ERROR"))
|
||||||
|
|
||||||
logger = logger
|
logger = logger
|
||||||
|
|||||||
@@ -1,26 +1,4 @@
|
|||||||
[
|
[
|
||||||
{
|
|
||||||
"id": 1,
|
|
||||||
"year": 2025,
|
|
||||||
"country": "ALB",
|
|
||||||
"artist": "Shkodra Elektronike",
|
|
||||||
"title": "Zjerm",
|
|
||||||
"running_order": 1,
|
|
||||||
"lyrics_url": "https://genius.com/Shkodra-elektronike-zjerm-lyrics",
|
|
||||||
"artist_url": "https://eurovision.tv/participant/shkodra_elektronike-2025",
|
|
||||||
"flag_url": "https://eurovision.tv/sites/default/files/media/image/2023-08/ESC-HEART-ALBANIA-WHITE%402000px.png",
|
|
||||||
"lyrics_original": "[Teksti i \"Zjerm\"]\n\n[Strofa 1: Beatriçe Gjergji]\nN'këtë minutë, n'këtë çast, no paranoja (Ah)\nPas shiut, ylber të duket bota (Ua)\nNëpër rrugë, asnjë ambulancë, kurrkush s'flet me arrogancë\nEdhe sot na thanë që s'prishet koha\nPërfundova nën ujë, kurrë s'm'u tha goja (No)\nImagjino një minutë pa ushtarë, pa jetima\nAsnjë shishe n'oqean, naftës i vjen era jargavan\nLirinë e fjalës ta mëson shkolla (Hopa)\n\n[Pararefreni: Beatriçe Gjergji]\nKrijo në mua një zemër t'pastër\nNë natën time, të dërgoj dritën\nAman, miserere\nAman, miserere\n\n[Refreni: Beatriçe Gjergji]\nNë zemrën time, n'zemrën teme\nKy minutë do të vazhdojë\nNjerëz't e mirë e njerëz't pa emër\nKërcejnë valle n'shpirt\nJarnane ti toka ime\nKu kam lindë, s'do të harroj\nJarnane ti bota ime\nVazhdo me shndritë, shndritë, shndritë, shndritë\n\n[Pasrefreni: Beatriçe Gjergji]\n(Shndritë, shndritë, shndritë)\n(Shndritë, shndritë, shndritë, shndritë)\n(Shndritë, shndritë, shndritë)\n(Shndritë, shndritë)\n(Shndritë, shndritë, shndritë, shndritë)\n(Shndritë, shndritë, shndritë, shndritë)\n\n[Strofa 2: Kolë Laca, Kolë Laca & Beatriçe Gjergji]\nZjerm bjer mbi vallet tona tribale\nQë ushtrojnë sa orteku kur bjen n'male\nZjerm, njerz't pa emën e njerz't e dëlirë\nNjësoj këputen e bijnë si shtatë thika që t'ngulen n'shpirt\nZjerm, këtu flen deti, rana e hana\nE yjet s'i shofim se yjet na i shkel kamba kur ecim n'jerm\nZjerm, jena t'untë për flakë e dritë\nE t'kërkojmë n'kyt terr që s'pran' tuej shndritë\n\n[Pararefreni: Beatriçe Gjergji]\nKrijo në mua një zemër t'pastër\nNë natën time, të dërgoj dritën\nAman, miserere\nAman, miserere\n\n[Refreni: Beatriçe Gjergji]\nNë zemrën time, n'zemrën teme\nKy minutë do të vazhdojë\nNjerëz't e mirë e njerëz't pa emër\nKërcejnë valle n'shpirt\nJarnane ti toka ime\nKu kam lindë, s'do të harroj\nJarnane ti bota ime\nVazhdo me shndritë, shndritë, shndritë, shndritë\n\n[Mbyllja: Beatriçe Gjergji]\n(Shndritë, shndritë, shndritë, shndritë)\n(Shndritë, shndritë, shndritë, shndritë)\n(Shndritë, shndritë, shndritë, shndritë)\n(Shndritë, shndritë, shndritë, shndritë)\n(Shndritë, shndritë, shndritë, shndritë)\n(Shndritë, shndritë, shndritë, shndritë)\n(Shndritë, shndritë, shndritë, shndritë)\n(Shndritë, shndritë, shndritë, shndritë)",
|
|
||||||
"lyrics_translation_fi": "[Säkeistö 1: Beatriçe Gjergji]\nTässä hetkessä, tässä hetkessä, ei vainoharjoja (Ah)\nSateen jälkeen maailma näyttää sateenkaarelta (Ua)\nKadulla ei ole ambulansseja, kukaan ei puhu ylimielisesti\nJopa tänään he sanoivat meille, että sää ei ole pilalla\nPäädyin veden alle, suuni ei koskaan kuivunut (Ei)\nKuvittele hetki ilman sotilaita, ilman orpoja\nEi pulloa valtameressä, öljy tuoksuu syreeniltä\nSananvapauden opettaa koulu (Hopa)\n\n[Esikertosäe: Beatriçe Gjergji]\nLuo minussa puhdas sydän\nLähetän valon yössäni\nOle hyvä, miserere\nOle hyvä, miserere\n\n[Kertosäe: Beatriçe Gjergji]\nSydämessäni, sydämessäni\nTämä hetki jatkuu\nHyvät ihmiset ja nimettömät\nIhmiset tanssivat tansseja sielussa\nJarnane sinä minun maani\nMissä synnyin, en unohda\nJarnane sinä minun maailmani\nJatka loistamista, loistamista, loistamista, loistamista\n\n[Jälkikertosäe: Beatriçe Gjergji]\n(Loista, loista, loista)\n(Loista, loista, loista, loista)\n(Loista, loista, loista)\n(Loista, loista)\n(Loista, loista, loista, loista)\n(Loista, loista, loista, loista)\n\n[Säkeistö 2: Kolë Laca, Kolë Laca & Beatriçe Gjergji]\nZjerm putoaa heimotanssiemme päälle\nJotka harjoittelevat kuin lumivyöry putoaa vuorille\nZjerm, nimettömät ihmiset ja puhtaat\nIhmiset katkeavat ja putoavat kuin seitsemän veistä, jotka on juurtunut sieluun\nZjerm, tässä meri, hiekka ja kuu nukkuvat\nEmme näe tähtiä, koska jalat polkevat niitä, kun kävelemme aavikolla\nZjerm, me olemme nälkäisiä liekeille ja valolle\nJa etsimme siitä pimeydestä, joka ei salli sinun loistaa\n\n[Esikertosäe: Beatriçe Gjergji]\nLuo minussa puhdas sydän\nLähetän valon yössäni\nOle hyvä, miserere\nOle hyvä, miserere\n\n[Kertosäe: Beatriçe Gjergji]\nSydämessäni, sydämessäni\nTämä hetki jatkuu\nHyvät ihmiset ja nimettömät\nIhmiset tanssivat tansseja sielussa\nJarnane sinä minun maani\nMissä synnyin, en unohda\nJarnane sinä minun maailmani\nJatka loistamista, loistamista, loistamista, loistamista\n\n[Loppu: Beatriçe Gjergji]\n(Loista, loista, loista, loista)\n(Loista, loista, loista, loista)\n(Loista, loista, loista, loista)\n(Loista, loista, loista, loista)\n(Loista, loista, loista, loista)\n(Loista, loista, loista, loista)\n(Loista, loista, loista, loista)\n(Loista, loista, loista, loista)",
|
|
||||||
"tags": [
|
|
||||||
"toivo",
|
|
||||||
"rauha",
|
|
||||||
"sisu"
|
|
||||||
],
|
|
||||||
"confidence": 0.949999988079071,
|
|
||||||
"language": "Albania",
|
|
||||||
"created_at": "2025-05-04T18:49:03.381000",
|
|
||||||
"updated_at": "2025-05-04T18:49:03.381000"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"artist": "PARG",
|
"artist": "PARG",
|
||||||
"country": "ARM",
|
"country": "ARM",
|
||||||
@@ -38,26 +16,45 @@
|
|||||||
],
|
],
|
||||||
"confidence": 0.95,
|
"confidence": 0.95,
|
||||||
"language": "Englanti",
|
"language": "Englanti",
|
||||||
"running_order": 2
|
"running_order": 18
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"artist": "Go-Jo",
|
"year": 2025,
|
||||||
"country": "AUS",
|
"country": "ALB",
|
||||||
"title": "Milkshake Man",
|
"artist": "Shkodra Elektronike",
|
||||||
"lyrics_url": "https://genius.com/Go-jo-aus-milkshake-man-lyrics",
|
"title": "Zjerm",
|
||||||
"artist_url": "https://eurovision.tv/participant/go-jo-2025",
|
"running_order": 26,
|
||||||
"flag_url": "https://eurovision.tv/sites/default/files/media/image/2023-08/ESC-HEART-AUSTRALIA-WHITE.png",
|
"lyrics_url": "https://genius.com/Shkodra-elektronike-zjerm-lyrics",
|
||||||
"lyrics_original": "[Verse 1]\nCome and take a sip from my special cup\nI heard that you could use a little pick-me-up\nWhat can get you high when you're oh-so sad?\nIt's the milk from the milkshake man\n\n[Pre-Chorus]\n(Ah) Well, I got chocolate, vanilla and lactose-free\n(Ah) And a caramel banana that you have got to see\n\n[Chorus]\nYou can call me the milkshake man\nI wanna shake and make the whole world dance\nThey drink my milk all across the land\nI can tell you want a taste of the milkshake man\n\n[Post-Chorus]\nSh-sh-shake me good, sh-sh-shake me good\nI can tell you want a taste of the milkshake man\nSh-sh-shake me good, sh-sh-shakе me good\nI can tell you want a taste of thе milkshake man\n\n[Verse 2]\nThe shake is not a drink, it's a state of mind\nIt's a secret superpower you were born to find\nDrink it every day and, before you know\nYou'll be bigger and stronger with harder bones (Woo)\n\n[Pre-Chorus]\n(Ah) Well, I got mango, mojito, a fruit ballet\n(Ah) And did you see the naughty special on my crême brûlée?\n\n[Chorus]\nYou can call me the milkshake man\nI wanna shake up all the milk I can\nThey know my name all across the land\nI can tell you want a taste of the milkshake man\n\n[Post-Chorus]\nSh-sh-shake me good, sh-sh-shake me good\nI can tell you want a taste of the milkshake man\nSh-sh-shake me good, sh-sh-shake me good\nI can tell you want a taste of the milkshake man\n\n[Bridge]\nExcusez-moi, monsieur, avez-vous du lait pour moi?\nWhen I say, \"Sweet, sweet\", you say, \"Yum, yum\"\nSweet, sweet (Yum, yum)\nSweet, sweet (Yum, yum)\nWhen I say, \"Sweet, sweet\", you say, \"Yum, yum\"\nSweet, sweet (Yum, yum)\nSweet, sweet (Yum, yum)\n\n[Outro]\nSh-sh-shake me good, sh-sh-shake me good\nI can tell you want a taste of the milkshake man\nSh-sh-shake me good, sh-sh-shake me good\nI can tell you want a taste of the milkshake man\nSh-sh-shake me good, sh-sh-shake me good\nI can tell you want a taste of the milkshake man\nSh-sh-shake me good, sh-sh-shake me good\nI can tell you want a taste of the milkshake man",
|
"artist_url": "https://eurovision.tv/participant/shkodra_elektronike-2025",
|
||||||
"lyrics_translation_fi": "[Verse 1]\nTule ja ota siemaus erikoiskupistani\nKuulin, että voisit tarvita pientä piristystä\nMikä voi saada sinut hyvälle tuulelle, kun olet niin surullinen?\nSe on pirtelömiehen maitoa\n\n[Pre-Chorus]\n(Ah) No, minulla on suklaata, vaniljaa ja laktoositonta\n(Ah) Ja karamellibanaanin, joka sinun on nähtävä\n\n[Chorus]\nVoit kutsua minua pirtelömieheksi\nHaluan ravistaa ja saada koko maailman tanssimaan\nHe juovat maitoni ympäri maan\nNäen, että haluat maistaa pirtelömiestä\n\n[Post-Chorus]\nP-p-ravista minua hyvin, p-p-ravista minua hyvin\nNäen, että haluat maistaa pirtelömiestä\nP-p-ravista minua hyvin, p-p-ravista minua hyvin\nNäen, että haluat maistaa pirtelömiestä\n\n[Verse 2]\nPirtelö ei ole juoma, se on mielentila\nSe on salainen supervoima, joka sinun oli tarkoitus löytää\nJuo sitä joka päivä ja ennen kuin huomaatkaan\nSinusta tulee isompi ja vahvempi kovemmilla luilla (Woo)\n\n[Pre-Chorus]\n(Ah) No, minulla on mango, mojito, hedelmäbaletti\n(Ah) Ja näitkö tuhman erikoisen crême brûléessani?\n\n[Chorus]\nVoit kutsua minua pirtelömieheksi\nHaluan ravistaa kaiken maidon mitä voin\nHe tuntevat nimeni ympäri maan\nNäen, että haluat maistaa pirtelömiestä\n\n[Post-Chorus]\nP-p-ravista minua hyvin, p-p-ravista minua hyvin\nNäen, että haluat maistaa pirtelömiestä\nP-p-ravista minua hyvin, p-p-ravista minua hyvin\nNäen, että haluat maistaa pirtelömiestä\n\n[Bridge]\nExcusez-moi, monsieur, avez-vous du lait pour moi?\nKun sanon: \"Sweet, sweet\", sanot: \"Yum, yum\"\nSweet, sweet (Yum, yum)\nSweet, sweet (Yum, yum)\nKun sanon: \"Sweet, sweet\", sanot: \"Yum, yum\"\nSweet, sweet (Yum, yum)\nSweet, sweet (Yum, yum)\n\n[Outro]\nP-p-ravista minua hyvin, p-p-ravista minua hyvin\nNäen, että haluat maistaa pirtelömiestä\nP-p-ravista minua hyvin, p-p-ravista minua hyvin\nNäen, että haluat maistaa pirtelömiestä\nP-p-ravista minua hyvin, p-p-ravista minua hyvin\nNäen, että haluat maistaa pirtelömiestä\nP-p-ravista minua hyvin, p-p-ravista minua hyvin\nNäen, että haluat maistaa pirtelömiestä",
|
"flag_url": "https://eurovision.tv/sites/default/files/media/image/2023-08/ESC-HEART-ALBANIA-WHITE%402000px.png",
|
||||||
|
"lyrics_original": "[Teksti i \"Zjerm\"]\n\n[Strofa 1: Beatriçe Gjergji]\nN'këtë minutë, n'këtë çast, no paranoja (Ah)\nPas shiut, ylber të duket bota (Ua)\nNëpër rrugë, asnjë ambulancë, kurrkush s'flet me arrogancë\nEdhe sot na thanë që s'prishet koha\nPërfundova nën ujë, kurrë s'm'u tha goja (No)\nImagjino një minutë pa ushtarë, pa jetima\nAsnjë shishe n'oqean, naftës i vjen era jargavan\nLirinë e fjalës ta mëson shkolla (Hopa)\n\n[Pararefreni: Beatriçe Gjergji]\nKrijo në mua një zemër t'pastër\nNë natën time, të dërgoj dritën\nAman, miserere\nAman, miserere\n\n[Refreni: Beatriçe Gjergji]\nNë zemrën time, n'zemrën teme\nKy minutë do të vazhdojë\nNjerëz't e mirë e njerëz't pa emër\nKërcejnë valle n'shpirt\nJarnane ti toka ime\nKu kam lindë, s'do të harroj\nJarnane ti bota ime\nVazhdo me shndritë, shndritë, shndritë, shndritë\n\n[Pasrefreni: Beatriçe Gjergji]\n(Shndritë, shndritë, shndritë)\n(Shndritë, shndritë, shndritë, shndritë)\n(Shndritë, shndritë, shndritë)\n(Shndritë, shndritë)\n(Shndritë, shndritë, shndritë, shndritë)\n(Shndritë, shndritë, shndritë, shndritë)\n\n[Strofa 2: Kolë Laca, Kolë Laca & Beatriçe Gjergji]\nZjerm bjer mbi vallet tona tribale\nQë ushtrojnë sa orteku kur bjen n'male\nZjerm, njerz't pa emën e njerz't e dëlirë\nNjësoj këputen e bijnë si shtatë thika që t'ngulen n'shpirt\nZjerm, këtu flen deti, rana e hana\nE yjet s'i shofim se yjet na i shkel kamba kur ecim n'jerm\nZjerm, jena t'untë për flakë e dritë\nE t'kërkojmë n'kyt terr që s'pran' tuej shndritë\n\n[Pararefreni: Beatriçe Gjergji]\nKrijo në mua një zemër t'pastër\nNë natën time, të dërgoj dritën\nAman, miserere\nAman, miserere\n\n[Refreni: Beatriçe Gjergji]\nNë zemrën time, n'zemrën teme\nKy minutë do të vazhdojë\nNjerëz't e mirë e njerëz't pa emër\nKërcejnë valle n'shpirt\nJarnane ti toka ime\nKu kam lindë, s'do të harroj\nJarnane ti bota ime\nVazhdo me shndritë, shndritë, shndritë, shndritë\n\n[Mbyllja: Beatriçe Gjergji]\n(Shndritë, shndritë, shndritë, shndritë)\n(Shndritë, shndritë, shndritë, shndritë)\n(Shndritë, shndritë, shndritë, shndritë)\n(Shndritë, shndritë, shndritë, shndritë)\n(Shndritë, shndritë, shndritë, shndritë)\n(Shndritë, shndritë, shndritë, shndritë)\n(Shndritë, shndritë, shndritë, shndritë)\n(Shndritë, shndritë, shndritë, shndritë)",
|
||||||
|
"lyrics_translation_fi": "[Säkeistö 1: Beatriçe Gjergji]\nTässä hetkessä, tässä hetkessä, ei vainoharjoja (Ah)\nSateen jälkeen maailma näyttää sateenkaarelta (Ua)\nKadulla ei ole ambulansseja, kukaan ei puhu ylimielisesti\nJopa tänään he sanoivat meille, että sää ei ole pilalla\nPäädyin veden alle, suuni ei koskaan kuivunut (Ei)\nKuvittele hetki ilman sotilaita, ilman orpoja\nEi pulloa valtameressä, öljy tuoksuu syreeniltä\nSananvapauden opettaa koulu (Hopa)\n\n[Esikertosäe: Beatriçe Gjergji]\nLuo minussa puhdas sydän\nLähetän valon yössäni\nOle hyvä, miserere\nOle hyvä, miserere\n\n[Kertosäe: Beatriçe Gjergji]\nSydämessäni, sydämessäni\nTämä hetki jatkuu\nHyvät ihmiset ja nimettömät\nIhmiset tanssivat tansseja sielussa\nJarnane sinä minun maani\nMissä synnyin, en unohda\nJarnane sinä minun maailmani\nJatka loistamista, loistamista, loistamista, loistamista\n\n[Jälkikertosäe: Beatriçe Gjergji]\n(Loista, loista, loista)\n(Loista, loista, loista, loista)\n(Loista, loista, loista)\n(Loista, loista)\n(Loista, loista, loista, loista)\n(Loista, loista, loista, loista)\n\n[Säkeistö 2: Kolë Laca, Kolë Laca & Beatriçe Gjergji]\nZjerm putoaa heimotanssiemme päälle\nJotka harjoittelevat kuin lumivyöry putoaa vuorille\nZjerm, nimettömät ihmiset ja puhtaat\nIhmiset katkeavat ja putoavat kuin seitsemän veistä, jotka on juurtunut sieluun\nZjerm, tässä meri, hiekka ja kuu nukkuvat\nEmme näe tähtiä, koska jalat polkevat niitä, kun kävelemme aavikolla\nZjerm, me olemme nälkäisiä liekeille ja valolle\nJa etsimme siitä pimeydestä, joka ei salli sinun loistaa\n\n[Esikertosäe: Beatriçe Gjergji]\nLuo minussa puhdas sydän\nLähetän valon yössäni\nOle hyvä, miserere\nOle hyvä, miserere\n\n[Kertosäe: Beatriçe Gjergji]\nSydämessäni, sydämessäni\nTämä hetki jatkuu\nHyvät ihmiset ja nimettömät\nIhmiset tanssivat tansseja sielussa\nJarnane sinä minun maani\nMissä synnyin, en unohda\nJarnane sinä minun maailmani\nJatka loistamista, loistamista, loistamista, loistamista\n\n[Loppu: Beatriçe Gjergji]\n(Loista, loista, loista, loista)\n(Loista, loista, loista, loista)\n(Loista, loista, loista, loista)\n(Loista, loista, loista, loista)\n(Loista, loista, loista, loista)\n(Loista, loista, loista, loista)\n(Loista, loista, loista, loista)\n(Loista, loista, loista, loista)",
|
||||||
"tags": [
|
"tags": [
|
||||||
"juoma",
|
"toivo",
|
||||||
"energia",
|
"rauha",
|
||||||
"hauska",
|
"sisu"
|
||||||
"makea"
|
|
||||||
],
|
],
|
||||||
"confidence": 0.9,
|
"confidence": 0.949999988079071,
|
||||||
"language": "Englanti",
|
"language": "Albania"
|
||||||
"running_order": 3
|
},
|
||||||
|
{
|
||||||
|
"artist": "VÆB",
|
||||||
|
"country": "ISL",
|
||||||
|
"title": "RÓA",
|
||||||
|
"lyrics_url": "https://genius.com/Vb-isl-roa-lyrics",
|
||||||
|
"artist_url": "https://eurovision.tv/participant/V%C3%86B-2025",
|
||||||
|
"flag_url": "https://eurovision.tv/sites/default/files/media/image/2023-08/ESC-HEART-ICELAND-WHITE-v2.png",
|
||||||
|
"lyrics_original": "[Söngtextar fyrir „RÓA“]\n\n[Byrjun: Matthías]\nLet's go!\n\n[Viðlag: Hálfdán]\nRóandi hér, róandi þar\nRóa í gegnum öldurnar\nÞað getur ekkert stoppað mig af, ooh-ooh\nRóandi hér, róandi þar\nRóa í gegnum öldurnar\nÞað getur ekkert stoppað mig af\n\n[Vísa 1: Matthías, Hálfdán, VÆB]\nÉg set spítu ofan á spítu og kalla það bát\nEf ég sekk í dag er það ekkert mál\nMeð árar úr stáli sem duga í ár\nStefni á Færeyjar, já, eg er klár\nÉg er með vesti fyrir belti og vatnshelda skó\nÞví að veðrið það er erfitt ég er kominn með nóg\n\n[Fyrir-Viðlag: Matthías]\nEr sjórinn opnast koma öldurnar\nÉg er einn á bát að leita af betri stað\nÉg er ekki ennþá búin að missa allt\nEn við setjum seglin upp og höldum aftur af stað\n\n[Viðlag: Hálfdán]\nRóandi hér, róandi þar\nRóa í gegnum öldurnar\nÞað getur ekkеrt stoppað mig af, ooh-ooh\nRóandi hér, róandi þar\nRóa í gegnum öldurnar\nÞað getur ekkеrt stoppað mig af, ooh-ooh\n\n[Vísa 2: Matthías, Hálfdán]\nÉg er enþá á bát, sjáðu þetta, vá\nStoppa í Grænlandi? Já, ég er down! God damn!\nStýri á sjó ég er kapteinn (Ey!)\nKallaðu mig Gísli Marteinn\nMargir mánuðir síðan ég sá síðast sól\nVil eiða restinni af lífinu hér út á sjó\n\n[Fyrir-Viðlag: Matthías]\nEr sjórinn opnast koma öldurnar\nÉg er en á bát að leita af betri stað\nÉg er ekki ennþá búin að missa allt\nEn við setjum seglin upp og höldum aftur af stað\n\n[Viðlag: Hálfdán, Matthías]\nRóandi hér, róandi þar\nRóa í gegnum öldurnar\nÞað getur ekkert stoppað mig af, ooh-ooh\nRóandi hér, róandi þar\nRóa í gegnum öldurnar\nÞað getur ekkert stoppað mig af, ooh-ooh\n\n[Brú]\n(Hey, hey, hey, hey)\n(Hey, hey)\n\n[Viðlag: Hálfdán, Matthías]\nRóandi hér, róandi þar\nRóa í gegnum öldurnar\nÞað getur ekkert stoppað mig af, ooh-ooh\nRóandi hér, róandi þar\nRóa í gegnum öldurnar\nÞað getur ekkert stoppað mig af, ooh-ooh (Það getur ekkert stoppað mig af)\n\n[Endir: VÆB]\nÞað getur ekkert stoppað mig af\nÞað getur ekkert stoppað mig af, ooh-ooh",
|
||||||
|
"lyrics_translation_fi": "[Sanoitukset kappaleelle \"RÓA\"]\n\n[Alku: Matthías]\nLet's go!\n\n[Kertosäe: Hálfdán]\nMelomista täällä, melomista tuolla\nMelomista aaltojen läpi\nMikään ei voi pysäyttää minua, ooh-ooh\nMelomista täällä, melomista tuolla\nMelomista aaltojen läpi\nMikään ei voi pysäyttää minua\n\n[Säkeistö 1: Matthías, Hálfdán, VÆB]\nLaitan riman riman päälle ja kutsun sitä veneeksi\nJos uppoan tänään, ei se ole ongelma\nMeloilla teräksestä, jotka kestävät vuoden\nSuuntaan Färsaarille, kyllä, olen valmis\nMinulla on liivi vyötäröllä ja vedenpitävät kengät\nKoska sää on vaikea, olen saanut tarpeekseni\n\n[Esikertosäe: Matthías]\nKun meri avautuu, aallot tulevat\nOlen yksin veneessä etsimässä parempaa paikkaa\nEn ole vielä menettänyt kaikkea\nMutta nostamme purjeet ja lähdemme taas\n\n[Kertosäe: Hálfdán]\nMelomista täällä, melomista tuolla\nMelomista aaltojen läpi\nMikään ei voi pysäyttää minua, ooh-ooh\nMelomista täällä, melomista tuolla\nMelomista aaltojen läpi\nMikään ei voi pysäyttää minua, ooh-ooh\n\n[Säkeistö 2: Matthías, Hálfdán]\nOlen yhä veneessä, katso tätä, vau\nPysähdytäänkö Grönlantiin? Kyllä, olen mukana! God damn!\nOhjaan merellä, olen kapteeni (Ey!)\nKutsu minua Gísli Marteinniksi\nMeni monta kuukautta siitä kun näin viimeksi aurinkoa\nHaluan viettää loppuelämäni täällä merellä\n\n[Esikertosäe: Matthías]\nKun meri avautuu, aallot tulevat\nOlen yhä veneessä etsimässä parempaa paikkaa\nEn ole vielä menettänyt kaikkea\nMutta nostamme purjeet ja lähdemme taas\n\n[Kertosäe: Hálfdán, Matthías]\nMelomista täällä, melomista tuolla\nMelomista aaltojen läpi\nMikään ei voi pysäyttää minua, ooh-ooh\nMelomista täällä, melomista tuolla\nMelomista aaltojen läpi\nMikään ei voi pysäyttää minua, ooh-ooh\n\n[Silta]\n(Hey, hey, hey, hey)\n(Hey, hey)\n\n[Kertosäe: Hálfdán, Matthías]\nMelomista täällä, melomista tuolla\nMelomista aaltojen läpi\nMikään ei voi pysäyttää minua, ooh-ooh\nMelomista täällä, melomista tuolla\nMelomista aaltojen läpi\nMikään ei voi pysäyttää minua, ooh-ooh (Mikään ei voi pysäyttää minua)\n\n[Loppu: VÆB]\nMikään ei voi pysäyttää minua\nMikään ei voi pysäyttää minua, ooh-ooh",
|
||||||
|
"tags": [
|
||||||
|
"veneily",
|
||||||
|
"matka",
|
||||||
|
"äärimmäisyys",
|
||||||
|
"hauska"
|
||||||
|
],
|
||||||
|
"confidence": 0.95,
|
||||||
|
"language": "Islanti",
|
||||||
|
"running_order": 10
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"artist": "JJ",
|
"artist": "JJ",
|
||||||
@@ -77,102 +74,6 @@
|
|||||||
],
|
],
|
||||||
"confidence": 0.95,
|
"confidence": 0.95,
|
||||||
"language": "Englanti",
|
"language": "Englanti",
|
||||||
"running_order": 4
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"artist": "Mamagama",
|
|
||||||
"country": "AZE",
|
|
||||||
"title": "Run With U",
|
|
||||||
"lyrics_url": "https://genius.com/Mamagama-run-with-u-lyrics",
|
|
||||||
"artist_url": "https://eurovision.tv/participant/mamagama-2025",
|
|
||||||
"flag_url": "https://eurovision.tv/sites/default/files/media/image/2023-08/ESC-HEART-AZERBAIJAN-WHITE-v2.png",
|
|
||||||
"lyrics_original": "[Verse 1]\nRhythm pulls me out, don't know where to start\nYou electrify, never felt so high\nEvery glance you’re giving, every move I'm feeling\nI cannot resist, pure in every twist\n\n[Refrain]\nShall we dim the lights, leave our fears behind\nPlay wrong 'til it’s right, give it all tonight?\nHeartbeat takes control, moves my body and soul\nJust one look at me and I can't stand the heat\n\n[Pre-Chorus]\nShadows in the neon light, the night is young, the beat is tight\nSomethin' in the air that makes me fall for you\nThе way I do, uh-huh, the way I do, uh-huh\nThe way I do, uh-huh, the way I do, uh-huh\n\n[Chorus]\nNo mattеr what you do tonight\nI wanna run with you, I wanna run with you\nNo matter what you do tonight\nI wanna run with you, I wanna run with you\n\n[Interlude]\n(Running with me)\n(Running, let's go)\n\n[Verse 2]\nShooting to the stars, can't get enough, so far\nYou make me feel brand-new, never felt this true\nEvery laugh you're giving, every touch I'm living\nAnd I can't pull away, caught up in the play\n\n[Refrain]\nShall we dim the lights, leave our fears behind\nPlay wrong ’til it’s right, give it all?\n\n[Pre-Chorus]\nThe way I do, uh-huh, the way I do, uh-huh\nThe way I do, uh-huh, the way I do, uh-huh\n\n[Chorus]\nNo matter what you do tonight\nI wanna run with you, I wanna run with you\nNo matter what you do tonight\nI wanna run with you, I wanna run with you",
|
|
||||||
"lyrics_translation_fi": "[Verse 1]\nRytmi vetää minua ulos, en tiedä mistä aloittaa\nSinä sähköistät, en ole koskaan tuntenut oloani näin korkeaksi\nJokainen katse jonka annat, jokainen liike jonka tunnen\nEn voi vastustaa, puhdasta jokaisessa käänteessä\n\n[Refrain]\nLasketaanko valoja, jätetäänkö pelkomme taakse\nPelataan väärin, kunnes se on oikein, annetaan kaikki tänä iltana?\nSydämenlyönti ottaa vallan, liikuttaa kehoani ja sieluani\nYksi silmäys minuun ja en kestä kuumuutta\n\n[Pre-Chorus]\nVarjoja neonvalossa, yö on nuori, rytmi on tiukka\nJotain ilmassa saa minut lankeamaan sinuun\nNiin kuin teen, uh-huh, niin kuin teen, uh-huh\nNiin kuin teen, uh-huh, niin kuin teen, uh-huh\n\n[Chorus]\nEi väliä mitä teet tänä iltana\nHaluan juosta kanssasi, haluan juosta kanssasi\nEi väliä mitä teet tänä iltana\nHaluan juosta kanssasi, haluan juosta kanssasi\n\n[Interlude]\n(Juokse kanssani)\n(Juokse, mennään)\n\n[Verse 2]\nAmmu tähtien joukkoon, en saa tarpeekseni, niin kaukana\nSaat minut tuntemaan upouuden, en ole koskaan tuntenut tätä näin todeksi\nJokainen nauru jonka annat, jokainen kosketus jonka elän\nJa en pääse pois, olen jäänyt leikkiin\n\n[Refrain]\nLasketaanko valoja, jätetäänkö pelkomme taakse\nPelataan väärin, kunnes se on oikein, annetaanko kaikki?\n\n[Pre-Chorus]\nNiin kuin teen, uh-huh, niin kuin teen, uh-huh\nNiin kuin teen, uh-huh, niin kuin teen, uh-huh\n\n[Chorus]\nEi väliä mitä teet tänä iltana\nHaluan juosta kanssasi, haluan juosta kanssasi\nEi väliä mitä teet tänä iltana\nHaluan juosta kanssasi, haluan juosta kanssasi",
|
|
||||||
"tags": [
|
|
||||||
"tanssi",
|
|
||||||
"rakkaus",
|
|
||||||
"vapaa",
|
|
||||||
"intohimo"
|
|
||||||
],
|
|
||||||
"confidence": 0.95,
|
|
||||||
"language": "Englanti",
|
|
||||||
"running_order": 5
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"artist": "Red Sebastian",
|
|
||||||
"country": "BEL",
|
|
||||||
"title": "Strobe Lights",
|
|
||||||
"lyrics_url": "https://genius.com/Red-sebastian-strobe-lights-lyrics",
|
|
||||||
"artist_url": "https://eurovision.tv/participant/red-sebastian-2025",
|
|
||||||
"flag_url": "https://eurovision.tv/sites/default/files/media/image/2023-08/ESC-HEART-BELGIUM-WHITE.png",
|
|
||||||
"lyrics_original": "[Intro]\nStrobe lights\nGettin' lost in your eyes\nCotton Candy haze\nFloatin' up in space\n\n[Verse 1]\nFallin' where up is down\nScreamin', but won't make a sound\nAlice, show me your hand\nTake it to Wonderland\n\n[Pre-Chorus]\nStep into the mirror to bright new dimensions\nWhere no words are needed to feel the connection\nWhere clocks never tick and where love is the ending\nCome down through the looking glass\n\n[Chorus]\nStrobe lights\nGettin' lost in your eyes\nCotton Candy haze\nWe're floatin' 'round in spacе\nSkintight\nNever felt so alivе\nCaught up in this maze\nIt's where I wanna stay\n\n[Verse 2]\nFlyin' deep underground\nSilence never felt so loud\n\n[Pre-Chorus]\nStep into the mirror to bright new dimensions\nWhere no words are needed to feel the connection\nWhere clocks never tick and where love is the ending\nCome down through the looking glass\n\n[Chorus]\nStrobe lights\nGettin' lost in your eyes\nCotton Candy haze\nWe're floatin' 'round in space\nSkintight\nI feel so alive\nCaught up in this maze\nIt's where I wanna stay\n\n[Outro]\nThat's where I wanna stay\nThat's where I will stay",
|
|
||||||
"lyrics_translation_fi": "[Intro]\nHuumaavat valot\nEksyn silmiisi\nHattarapilvi\nLeijumme avaruudessa\n\n[Verse 1]\nPutoon sinne missä ylös on alas\nHuudan, mutta ääntä ei kuulu\nAlice, näytä minulle kätesi\nViemme sen Ihmemaahan\n\n[Pre-Chorus]\nAstun peiliin kirkkaisiin uusiin ulottuvuuksiin\nMissä sanoja ei tarvita tuntemaan yhteyttä\nMissä kellot eivät koskaan tikitä ja missä rakkaus on loppu\nTule alas peilin läpi\n\n[Chorus]\nHuumaavat valot\nEksyn silmiisi\nHattarapilvi\nLeijumme avaruudessa\nIhonmyötäinen\nEn ole koskaan tuntenut olevani niin elossa\nJumissa tässä sokkelossa\nTäällä haluan olla\n\n[Verse 2]\nLennän syvälle maan alle\nHiljaisuus ei ole koskaan tuntunut niin kovalta\n\n[Pre-Chorus]\nAstun peiliin kirkkaisiin uusiin ulottuvuuksiin\nMissä sanoja ei tarvita tuntemaan yhteyttä\nMissä kellot eivät koskaan tikitä ja missä rakkaus on loppu\nTule alas peilin läpi\n\n[Chorus]\nHuumaavat valot\nEksyn silmiisi\nHattarapilvi\nLeijumme avaruudessa\nIhonmyötäinen\nTuntuu niin elossa\nJumissa tässä sokkelossa\nTäällä haluan olla\n\n[Outro]\nTäällä haluan olla\nTäällä aion pysyä",
|
|
||||||
"tags": [
|
|
||||||
"rakkaus",
|
|
||||||
"huuma",
|
|
||||||
"pakomatka",
|
|
||||||
"ihmeellinen"
|
|
||||||
],
|
|
||||||
"confidence": 0.95,
|
|
||||||
"language": "Englanti",
|
|
||||||
"running_order": 6
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"artist": "Marko Bošnjak",
|
|
||||||
"country": "HRV",
|
|
||||||
"title": "Poison Cake",
|
|
||||||
"lyrics_url": "https://genius.com/Marko-bosnjak-poison-cake-lyrics",
|
|
||||||
"artist_url": "https://eurovision.tv/participant/marko-bosnjak-2025",
|
|
||||||
"flag_url": "https://eurovision.tv/sites/default/files/media/image/2023-08/ESC-HEART-CROATIA-WHITE.png",
|
|
||||||
"lyrics_original": "[Verse 1]\nIt's cool now in the kitchen\nThat happens when you're bitten\nI'm stirring and stirring, deliciously pouring\nAnd I know you're gonna love this\nA better kind of justice\nI don't want it burning\n\n[Break]\nOne last thing\nA sprinkle of my sweet revenge\nOne last thing\nA sprinkle of my sweet revenge\n\n[Pre-Chorus]\nMade you something that I know you'll like\nChocolate covered, sugar and spice\nTasty, tasty, yum-yum, tasty\nCandy colours, oh, so nice\n\n[Chorus]\nTake a bite of my poison cake (Yum)\nPoison cake\nPoison cake\nPoison cake\nPoison cake\n\n[Verse 2]\nTake a bite of my poison cake\nBeen cooking in my cauldron late\nYou're nеver ever gonna stay awakе\nYou're going down, down, down\nYou thought I was a servant slave\nBut I'm just a serpent snake\nYou better genuflect and pray\n(You better genuflect and pray)\n\n[Bridge]\nTingles of poison are hitting your veins\n\"What have you done?\" your words are slurring\nAs you fall down\n\n[Break]\nOne last thing\nA sprinkle of my sweet revenge\nOne last thing\nA sprinkle of my sweet revenge\n\n[Pre-Chorus]\nMade you something that I know you'll like\nChocolate covered, sugar and spice\nTasty, tasty, yum-yum, tasty\nCandy colors, oh, so nice\n\n[Chorus]\nTake a bite of my—\nPoison cake\nPoison cake\nPoison cake\nPoison cake\n\n[Post-Chorus]\nIt's not my fault I got carried away\nI lost control when I started to bake\nA dash of death is better to swallow\nDon't be scared, you'll be buried tomorrow\n\n[Outro]\n(Poison)\nPoison cake\nPoison cake\nPoison cake\nPoison cake\nPoison cake\nPoison cake\nPoison cake\nPoison cake",
|
|
||||||
"lyrics_translation_fi": "[Verse 1]\nKeittiössä on nyt viileää\nNiin käy, kun tulee purruksi\nSekoitan ja sekoitan, herkullisesti kaadan\nJa tiedän, että tulet tästä pitämään\nParempi oikeuden muoto\nEn halua sen palavan\n\n[Break]\nYksi asia vielä\nRipaus suloista kostoani\nYksi asia vielä\nRipaus suloista kostoani\n\n[Pre-Chorus]\nTein sinulle jotain, mistä tiedän sinun pitävän\nSuklaapäällysteinen, sokeria ja mausteita\nHerkullista, herkullista, nam-nam, herkullista\nKarkkivärit, oi, niin ihanat\n\n[Chorus]\nOta puraisu myrkkypiirakastani (Nam)\nMyrkkypiirakka\nMyrkkypiirakka\nMyrkkypiirakka\nMyrkkypiirakka\n\n[Verse 2]\nOta puraisu myrkkypiirakastani\nOlen keittänyt padassa myöhään\nEt tule koskaan enää pysymään hereillä\nOlet menossa alas, alas, alas\nHuittelet, että olin palvelijaorja\nMutta olenkin vain käärmekäärme\nParempi tehdä polvityö ja rukoilla\n(Parempi tehdä polvityö ja rukoilla)\n\n[Bridge]\nMyrkyn kihelmöinnit osuvat suoniisi\n\"Mitä olet tehnyt?\" sanasi puuroutuvat\nKun kaadut alas\n\n[Break]\nYksi asia vielä\nRipaus suloista kostoani\nYksi asia vielä\nRipaus suloista kostoani\n\n[Pre-Chorus]\nTein sinulle jotain, mistä tiedän sinun pitävän\nSuklaapäällysteinen, sokeria ja mausteita\nHerkullista, herkullista, nam-nam, herkullista\nKarkkivärit, oi, niin ihanat\n\n[Chorus]\nOta puraisu minun—\nMyrkkypiirakka\nMyrkkypiirakka\nMyrkkypiirakka\nMyrkkypiirakka\n\n[Post-Chorus]\nEi ole minun vikani, että innostuin liikaa\nMenetin kontrollin, kun aloin leipoa\nHipaus kuolemaa on parempi niellä\nÄlä pelkää, sinut haudataan huomenna\n\n[Outro]\n(Myrkky)\nMyrkkypiirakka\nMyrkkypiirakka\nMyrkkypiirakka\nMyrkkypiirakka\nMyrkkypiirakka\nMyrkkypiirakka\nMyrkkypiirakka\nMyrkkypiirakka",
|
|
||||||
"tags": [
|
|
||||||
"myrkky",
|
|
||||||
"kosto",
|
|
||||||
"makea",
|
|
||||||
"petos"
|
|
||||||
],
|
|
||||||
"confidence": 0.95,
|
|
||||||
"language": "Englanti",
|
|
||||||
"running_order": 7
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"artist": "Theo Evan",
|
|
||||||
"country": "CYP",
|
|
||||||
"title": "Shh",
|
|
||||||
"lyrics_url": "https://genius.com/Theo-evan-shh-lyrics",
|
|
||||||
"artist_url": "https://eurovision.tv/participant/theo-evan-2025",
|
|
||||||
"flag_url": "https://eurovision.tv/sites/default/files/media/image/2023-08/ESC-HEART-CYPRUS-WHITE.png",
|
|
||||||
"lyrics_original": "[Verse 1]\nI've got golden locks and eyes so captivating\nI am famous for my beauty, who am I? (Shh)\nI've been told I am a little overconfident\nAnd this will be my downfall, who am I? (Shh)\n\n[Pre-Chorus]\nI fell in deep, I lost my heartbeat\nStuck in between, heaven and hell in me\nI fell in deep, I lost my heartbeat\nFollow the bloodstream\n\n[Chorus]\nHush, hush\nIf you know my name, then please don't repeat it\nHush, hush\nIf you know my name, then keep it a secret\nIn the ground, in the sky, in the afterlife\nIn the dark, in the light, in the sweet divine\nHush, hush\nHush, hush, hush\n\n[Verse 2]\nMy dеsire and my love got me in troublе\nI'm decay and I'm revival, who am I? (Shh)\nRobbed by jealousy and cheated by my enemy\nFrom tears and blood to flowers, who am I? (Shh)\n\n[Pre-Chorus]\nI fell in deep, I lost my heartbeat\nStuck in between, heaven and hell in me\nI fell in deep, I lost my heartbeat\nFollow the bloodstream\n\n[Chorus]\nHush, hush\nIf you know my name, then please don't repeat it\nHush, hush\nIf you know my name, then keep it a secret\nIn the ground, in the sky, in the afterlife\nIn the dark, in the light, in the sweet divine\nHush, hush\nHush, hush, hush\n\n[Bridge]\n(If you know my name, if you know my name, if you know my name)\nIf you know my name, if you know my name, if you know my name\nShh\nAh (If you know my name, if you know my name)\n\n[Chorus]\nIn the ground, in the sky, in the afterlife\nIn the dark, in the light, in the sweet divine\nHush, hush\nHush, hush, hush\n\n[Outro]\nShh",
|
|
||||||
"lyrics_translation_fi": "[Verse 1]\nMinulla on kultaiset kiharat ja silmät niin vangitsevat\nOlen kuuluisa kauneudestani, kuka minä olen? (Shh)\nMinulle on sanottu, että olen hieman liian itsevarma\nJa tämä on minun lankeemukseni, kuka minä olen? (Shh)\n\n[Pre-Chorus]\nPutoin syvälle, menetin sydämeni sykkeen\nJuuttunut väliin, taivas ja helvetti minussa\nPutoin syvälle, menetin sydämeni sykkeen\nSeuraa verenkiertoa\n\n[Chorus]\nHys, hys\nJos tiedät nimeni, älä toista sitä\nHys, hys\nJos tiedät nimeni, pidä se salassa\nMaassa, taivaalla, tuonpuoleisessa elämässä\nPimeässä, valossa, suloisessa jumalallisessa\nHys, hys\nHys, hys, hys\n\n[Verse 2]\nMinun haluni ja rakkauteni saivat minut vaikeuksiin\nOlen rappeutuminen ja olen elpyminen, kuka minä olen? (Shh)\nRyöstetty mustasukkaisuudella ja petetty viholliseni toimesta\nKyynelistä ja verestä kukkiin, kuka minä olen? (Shh)\n\n[Pre-Chorus]\nPutoin syvälle, menetin sydämeni sykkeen\nJuuttunut väliin, taivas ja helvetti minussa\nPutoin syvälle, menetin sydämeni sykkeen\nSeuraa verenkiertoa\n\n[Chorus]\nHys, hys\nJos tiedät nimeni, älä toista sitä\nHys, hys\nJos tiedät nimeni, pidä se salassa\nMaassa, taivaalla, tuonpuoleisessa elämässä\nPimeässä, valossa, suloisessa jumalallisessa\nHys, hys\nHys, hys, hys\n\n[Bridge]\n(Jos tiedät nimeni, jos tiedät nimeni, jos tiedät nimeni)\nJos tiedät nimeni, jos tiedät nimeni, jos tiedät nimeni\nShh\nAh (Jos tiedät nimeni, jos tiedät nimeni)\n\n[Chorus]\nMaassa, taivaalla, tuonpuoleisessa elämässä\nPimeässä, valossa, suloisessa jumalallisessa\nHys, hys\nHys, hys, hys\n\n[Outro]\nShh",
|
|
||||||
"tags": [
|
|
||||||
"kauneus",
|
|
||||||
"salaisuus",
|
|
||||||
"identiteetti",
|
|
||||||
"varjo",
|
|
||||||
"kuolema"
|
|
||||||
],
|
|
||||||
"confidence": 0.95,
|
|
||||||
"language": "Englanti",
|
|
||||||
"running_order": 8
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"artist": "ADONXS",
|
|
||||||
"country": "CZE",
|
|
||||||
"title": "Kiss Kiss Goodbye",
|
|
||||||
"lyrics_url": "https://genius.com/Adonxs-kiss-kiss-goodbye-lyrics",
|
|
||||||
"artist_url": "https://eurovision.tv/participant/adonxs-2025",
|
|
||||||
"flag_url": "https://eurovision.tv/sites/default/files/media/image/2023-08/ESC-HEART-CZECHIA-WHITE.png",
|
|
||||||
"lyrics_original": "[Verse 1]\nBlow me a kiss goodbye, no more tears to dry\nOne kiss of love, one kiss of desperation\nIn a moment two of us collide\nThere's no other place to hide\nOnly one survives, when the night arrives\nWill you be my ride or die?\n\n[Pre-Chorus]\nOh, you seemed so holy, it almost fooled me\nTruly, when you said you love me, it almost moved me\n\n[Chorus]\nKiss, kiss goodbye (Kiss, kiss goodbye)\nKiss, kiss goodbye (Kiss, kiss goodbye)\nNow keep your half apologies, drunken apathy\nOver and over again\nKiss, kiss\n\n[Verse 2]\nCaught in a motion, you’re wearing mе out\nTainted devotion, heart on thе ground\nOnly one survives, when the night arrives\nWill you be my ride or die?\n\n[Pre-Chorus]\nTell me why is there you–\nYou seemed so holy, it almost fooled me\nTruly, when you said you love me, it almost moved me\n\n[Chorus]\nKiss, kiss goodbye (Kiss, kiss goodbye)\nKiss, kiss goodbye (Kiss, kiss goodbye)\nNow keep your half apologies, drunken apathy\nOver and over again\nKiss, kiss\n\n[Instrumental Break]\n\n[Pre-Chorus]\nBlow me a kiss goodbye, see how my tears run dry\nOne kiss of love won't feel the same tonight\n\n[Chorus]\n(Kiss, kiss goodbye)\n(Kiss, kiss goodbye)\n(Kiss, kiss goodbye)\n(Kiss, kiss goodbye)\n(Kiss, kiss goodbye)\nDon't give me your half apologies (Kiss, kiss goodbye), drunken apathy\nOver and over again\nKiss, kiss",
|
|
||||||
"lyrics_translation_fi": "[Verse 1]\nLähetä minulle hyvästelysuudelma, ei enää kyyneleitä kuivattavaksi\nYksi rakkauden suudelma, yksi epätoivon suudelma\nYhdessä hetkessä me kaksi törmäämme\nEi ole muuta paikkaa piiloutua\nVain yksi selviää, kun yö saapuu\nOletko valmis kulkemaan kanssani loppuun asti?\n\n[Pre-Chorus]\nVoi, vaikutit niin pyhältä, että melkein huijasit minua\nOikeasti, kun sanoit rakastavasi minua, se melkein liikutti minua\n\n[Chorus]\nSuudelma, hyvästi (Suudelma, hyvästi)\nSuudelma, hyvästi (Suudelma, hyvästi)\nNyt pidä puolinaiset anteeksipyyntösi, humalainen apatia\nYhä uudestaan\nSuudelma, suudelma\n\n[Verse 2]\nLiikkeessä kiinni, kulutat minua loppuun\nTurmeltunut antaumus, sydän maassa\nVain yksi selviää, kun yö saapuu\nOletko valmis kulkemaan kanssani loppuun asti?\n\n[Pre-Chorus]\nKerro minulle, miksi sinä olet olemassa–\nVaikutit niin pyhältä, että melkein huijasit minua\nOikeasti, kun sanoit rakastavasi minua, se melkein liikutti minua\n\n[Chorus]\nSuudelma, hyvästi (Suudelma, hyvästi)\nSuudelma, hyvästi (Suudelma, hyvästi)\nNyt pidä puolinaiset anteeksipyyntösi, humalainen apatia\nYhä uudestaan\nSuudelma, suudelma\n\n[Instrumental Break]\n\n[Pre-Chorus]\nLähetä minulle hyvästelysuudelma, katso kuinka kyyneleeni kuivuvat\nYksi rakkauden suudelma ei tunnu samalta tänä yönä\n\n[Chorus]\n(Suudelma, hyvästi)\n(Suudelma, hyvästi)\n(Suudelma, hyvästi)\n(Suudelma, hyvästi)\n(Suudelma, hyvästi)\nÄlä anna minulle puolinaisia anteeksipyyntöjäsi (Suudelma, hyvästi), humalaista apatiaa\nYhä uudestaan\nSuudelma, suudelma",
|
|
||||||
"tags": [
|
|
||||||
"suhde",
|
|
||||||
"pettymys",
|
|
||||||
"jäähyväiset",
|
|
||||||
"katumus"
|
|
||||||
],
|
|
||||||
"confidence": 0.95,
|
|
||||||
"language": "Englanti",
|
|
||||||
"running_order": 9
|
"running_order": 9
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -192,7 +93,7 @@
|
|||||||
],
|
],
|
||||||
"confidence": 0.95,
|
"confidence": 0.95,
|
||||||
"language": "Englanti",
|
"language": "Englanti",
|
||||||
"running_order": 10
|
"running_order": 22
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"artist": "Tommy Cash",
|
"artist": "Tommy Cash",
|
||||||
@@ -211,7 +112,7 @@
|
|||||||
],
|
],
|
||||||
"confidence": 0.95,
|
"confidence": 0.95,
|
||||||
"language": "Italia Ja Englanti",
|
"language": "Italia Ja Englanti",
|
||||||
"running_order": 11
|
"running_order": 3
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"artist": "Erika Vikman",
|
"artist": "Erika Vikman",
|
||||||
@@ -230,7 +131,7 @@
|
|||||||
],
|
],
|
||||||
"confidence": 0.95,
|
"confidence": 0.95,
|
||||||
"language": "Englanti",
|
"language": "Englanti",
|
||||||
"running_order": 12
|
"running_order": 13
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"artist": "Louane",
|
"artist": "Louane",
|
||||||
@@ -250,27 +151,7 @@
|
|||||||
],
|
],
|
||||||
"confidence": 0.95,
|
"confidence": 0.95,
|
||||||
"language": "Englanti",
|
"language": "Englanti",
|
||||||
"running_order": 13
|
"running_order": 24
|
||||||
},
|
|
||||||
{
|
|
||||||
"artist": "Mariam Shengelia",
|
|
||||||
"country": "GEO",
|
|
||||||
"title": "Freedom",
|
|
||||||
"lyrics_url": "https://genius.com/Genius-english-translations-mariam-shengelia-freedom-english-translation-lyrics",
|
|
||||||
"artist_url": "https://eurovision.tv/participant/mariam-shengelia-2025",
|
|
||||||
"flag_url": "https://eurovision.tv/sites/default/files/media/image/2023-08/ESC-HEART-GEORGIA-WHITE.png",
|
|
||||||
"lyrics_original": "[Verse]\nFreedom\n(A and B, G and D\nYears pass, times pass\nE and V, Z and T\nLet us never give up this sky and mountain)\nLike the scent of grass\nThe dew of the spring, Ankara\nThe thirst for freedom\nThe homeland carried with its heart\n\n[Pre-Chorus]\nAnd as this heart in my chest\nFreedom is in me\nAnd as our life\nThe homeland is the only one\n\n[Chorus]\nThis Sun warms and illuminates the roads\nThe mountains and seas of the homeland\nWe will follow the roads with hope\nAnd, blue and cloudless sky\nA calm and turbulent sea\nI do not want other treasures\n\n[Bridge]\nFreedom is a heavеn's gift we share\nFreedom is a human wealth to carе\nFreedom is a mountain spring for share\nPeople let it be here and there everywhere\n\n[Chorus]\nI'm living my life with my smile\nKindness resists of my style\nFreedom that makes life so mild\nMy home, my sweet apparel a song\nMeadows and mountains to roam\nThis is my wealth and my throne\n\n[Outro]\nFreedom, freedom, A and B",
|
|
||||||
"lyrics_translation_fi": "[Säkeistö]\nVapaus\n(A ja B, G ja D\nVuodet kuluvat, ajat kuluvat\nE ja V, Z ja T\nÄlkäämme koskaan luopuko tästä taivaasta ja vuoresta)\nKuin ruohon tuoksu\nKevään kaste, Ankara\nVapauden jano\nKotimaa sydämessään kannettuna\n\n[Esikertosäe]\nJa kun tämä sydän rinnassani\nVapaus on minussa\nJa kun elämämme\nKotimaa on ainoa\n\n[Kertosäe]\nTämä aurinko lämmittää ja valaisee tiet\nKotimaan vuoret ja meret\nSeuraamme teitä toivolla\nJa, sininen ja pilvetön taivas\nTyyni ja myrskyisä meri\nEn halua muita aarteita\n\n[Silta]\nVapaus on taivaan lahja, jonka jaamme\nVapaus on ihmisen rikkaus, josta välitämme\nVapaus on vuoristolähde jaettavaksi\nIhmiset, antakaa sen olla täällä ja kaikkialla\n\n[Kertosäe]\nElän elämääni hymyillen\nYstävällisyys vastustaa tyyliäni\nVapaus, joka tekee elämästä niin lempeää\nKotini, suloinen asuni, laulu\nNiityt ja vuoret vaeltaa\nTämä on rikkauteni ja valtaistuimeni\n\n[Outro]\nVapaus, vapaus, A ja B",
|
|
||||||
"tags": [
|
|
||||||
"vapaus",
|
|
||||||
"kotimaa",
|
|
||||||
"toivo",
|
|
||||||
"luonto",
|
|
||||||
"rauha"
|
|
||||||
],
|
|
||||||
"confidence": 0.95,
|
|
||||||
"language": "Turkki",
|
|
||||||
"running_order": 14
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"artist": "Abor & Tynna",
|
"artist": "Abor & Tynna",
|
||||||
@@ -289,7 +170,7 @@
|
|||||||
],
|
],
|
||||||
"confidence": 0.95,
|
"confidence": 0.95,
|
||||||
"language": "Saksa",
|
"language": "Saksa",
|
||||||
"running_order": 15
|
"running_order": 16
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"artist": "Klavdia",
|
"artist": "Klavdia",
|
||||||
@@ -309,47 +190,8 @@
|
|||||||
],
|
],
|
||||||
"confidence": 0.95,
|
"confidence": 0.95,
|
||||||
"language": "Kreikka",
|
"language": "Kreikka",
|
||||||
"running_order": 16
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"artist": "VÆB",
|
|
||||||
"country": "ISL",
|
|
||||||
"title": "RÓA",
|
|
||||||
"lyrics_url": "https://genius.com/Vb-isl-roa-lyrics",
|
|
||||||
"artist_url": "https://eurovision.tv/participant/V%C3%86B-2025",
|
|
||||||
"flag_url": "https://eurovision.tv/sites/default/files/media/image/2023-08/ESC-HEART-ICELAND-WHITE-v2.png",
|
|
||||||
"lyrics_original": "[Söngtextar fyrir „RÓA“]\n\n[Byrjun: Matthías]\nLet's go!\n\n[Viðlag: Hálfdán]\nRóandi hér, róandi þar\nRóa í gegnum öldurnar\nÞað getur ekkert stoppað mig af, ooh-ooh\nRóandi hér, róandi þar\nRóa í gegnum öldurnar\nÞað getur ekkert stoppað mig af\n\n[Vísa 1: Matthías, Hálfdán, VÆB]\nÉg set spítu ofan á spítu og kalla það bát\nEf ég sekk í dag er það ekkert mál\nMeð árar úr stáli sem duga í ár\nStefni á Færeyjar, já, eg er klár\nÉg er með vesti fyrir belti og vatnshelda skó\nÞví að veðrið það er erfitt ég er kominn með nóg\n\n[Fyrir-Viðlag: Matthías]\nEr sjórinn opnast koma öldurnar\nÉg er einn á bát að leita af betri stað\nÉg er ekki ennþá búin að missa allt\nEn við setjum seglin upp og höldum aftur af stað\n\n[Viðlag: Hálfdán]\nRóandi hér, róandi þar\nRóa í gegnum öldurnar\nÞað getur ekkеrt stoppað mig af, ooh-ooh\nRóandi hér, róandi þar\nRóa í gegnum öldurnar\nÞað getur ekkеrt stoppað mig af, ooh-ooh\n\n[Vísa 2: Matthías, Hálfdán]\nÉg er enþá á bát, sjáðu þetta, vá\nStoppa í Grænlandi? Já, ég er down! God damn!\nStýri á sjó ég er kapteinn (Ey!)\nKallaðu mig Gísli Marteinn\nMargir mánuðir síðan ég sá síðast sól\nVil eiða restinni af lífinu hér út á sjó\n\n[Fyrir-Viðlag: Matthías]\nEr sjórinn opnast koma öldurnar\nÉg er en á bát að leita af betri stað\nÉg er ekki ennþá búin að missa allt\nEn við setjum seglin upp og höldum aftur af stað\n\n[Viðlag: Hálfdán, Matthías]\nRóandi hér, róandi þar\nRóa í gegnum öldurnar\nÞað getur ekkert stoppað mig af, ooh-ooh\nRóandi hér, róandi þar\nRóa í gegnum öldurnar\nÞað getur ekkert stoppað mig af, ooh-ooh\n\n[Brú]\n(Hey, hey, hey, hey)\n(Hey, hey)\n\n[Viðlag: Hálfdán, Matthías]\nRóandi hér, róandi þar\nRóa í gegnum öldurnar\nÞað getur ekkert stoppað mig af, ooh-ooh\nRóandi hér, róandi þar\nRóa í gegnum öldurnar\nÞað getur ekkert stoppað mig af, ooh-ooh (Það getur ekkert stoppað mig af)\n\n[Endir: VÆB]\nÞað getur ekkert stoppað mig af\nÞað getur ekkert stoppað mig af, ooh-ooh",
|
|
||||||
"lyrics_translation_fi": "[Sanoitukset kappaleelle \"RÓA\"]\n\n[Alku: Matthías]\nLet's go!\n\n[Kertosäe: Hálfdán]\nMelomista täällä, melomista tuolla\nMelomista aaltojen läpi\nMikään ei voi pysäyttää minua, ooh-ooh\nMelomista täällä, melomista tuolla\nMelomista aaltojen läpi\nMikään ei voi pysäyttää minua\n\n[Säkeistö 1: Matthías, Hálfdán, VÆB]\nLaitan riman riman päälle ja kutsun sitä veneeksi\nJos uppoan tänään, ei se ole ongelma\nMeloilla teräksestä, jotka kestävät vuoden\nSuuntaan Färsaarille, kyllä, olen valmis\nMinulla on liivi vyötäröllä ja vedenpitävät kengät\nKoska sää on vaikea, olen saanut tarpeekseni\n\n[Esikertosäe: Matthías]\nKun meri avautuu, aallot tulevat\nOlen yksin veneessä etsimässä parempaa paikkaa\nEn ole vielä menettänyt kaikkea\nMutta nostamme purjeet ja lähdemme taas\n\n[Kertosäe: Hálfdán]\nMelomista täällä, melomista tuolla\nMelomista aaltojen läpi\nMikään ei voi pysäyttää minua, ooh-ooh\nMelomista täällä, melomista tuolla\nMelomista aaltojen läpi\nMikään ei voi pysäyttää minua, ooh-ooh\n\n[Säkeistö 2: Matthías, Hálfdán]\nOlen yhä veneessä, katso tätä, vau\nPysähdytäänkö Grönlantiin? Kyllä, olen mukana! God damn!\nOhjaan merellä, olen kapteeni (Ey!)\nKutsu minua Gísli Marteinniksi\nMeni monta kuukautta siitä kun näin viimeksi aurinkoa\nHaluan viettää loppuelämäni täällä merellä\n\n[Esikertosäe: Matthías]\nKun meri avautuu, aallot tulevat\nOlen yhä veneessä etsimässä parempaa paikkaa\nEn ole vielä menettänyt kaikkea\nMutta nostamme purjeet ja lähdemme taas\n\n[Kertosäe: Hálfdán, Matthías]\nMelomista täällä, melomista tuolla\nMelomista aaltojen läpi\nMikään ei voi pysäyttää minua, ooh-ooh\nMelomista täällä, melomista tuolla\nMelomista aaltojen läpi\nMikään ei voi pysäyttää minua, ooh-ooh\n\n[Silta]\n(Hey, hey, hey, hey)\n(Hey, hey)\n\n[Kertosäe: Hálfdán, Matthías]\nMelomista täällä, melomista tuolla\nMelomista aaltojen läpi\nMikään ei voi pysäyttää minua, ooh-ooh\nMelomista täällä, melomista tuolla\nMelomista aaltojen läpi\nMikään ei voi pysäyttää minua, ooh-ooh (Mikään ei voi pysäyttää minua)\n\n[Loppu: VÆB]\nMikään ei voi pysäyttää minua\nMikään ei voi pysäyttää minua, ooh-ooh",
|
|
||||||
"tags": [
|
|
||||||
"veneily",
|
|
||||||
"matka",
|
|
||||||
"äärimmäisyys",
|
|
||||||
"hauska"
|
|
||||||
],
|
|
||||||
"confidence": 0.95,
|
|
||||||
"language": "Islanti",
|
|
||||||
"running_order": 17
|
"running_order": 17
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"artist": "EMMY",
|
|
||||||
"country": "IRL",
|
|
||||||
"title": "Laika Party",
|
|
||||||
"lyrics_url": "https://genius.com/Emmy-laika-party-lyrics",
|
|
||||||
"artist_url": "https://eurovision.tv/participant/emmy-2025",
|
|
||||||
"flag_url": "https://eurovision.tv/sites/default/files/media/image/2023-08/ESC-HEART-IRELAND-WHITE.png",
|
|
||||||
"lyrics_original": "[Intro]\n(Ready for takeoff)\n\n[Verse 1]\nYou have probably heard 'bout this brave little girl\nAll we know is that she saved the world\nShe got sent away, but she wasn't afraid\nThough she was alone in the dark big space\n\n[Pre-Chorus]\nLeft the cheering crowd, went above the clouds\nRocket goin' high, then they said goodbye\nShe still wonders why, but she loves to fly\n\n[Chorus]\nI hope Laika never died and that she spins around us still\nAnd that she has a party in the air and always will\nI hope that she is dancin' every night among the stars\nI hopе Laika is alive\n\n[Build]\nLaika party in the sky\nLaika party in the sky\n\n[Drop]\nBam-bam, ba-da-dam-bam-bam-bam-bam-bam\nBa-da-dam-bam-bam-bam-bam-bam\nBa-da-dam-bam-bam-bam-bam-bam\nBa-da-dam-bam-bam-bam-bam-bam\nBa-da-dam-bam-bam-bam-bam-bam\nBa-da-dam-bam-bam-bam-bam-bam\nBa-da-dam-bam-bam-bam-bam-bam\n\n[Verse 2]\nThrough thе comets and the stones\nShe is howling for her bones\nSingin' alone to the stars and sun\nAnd if she didn't fly, nor would you and I\nA forever hero for humankind\n\n[Pre-Chorus]\nLeft the cheering crowd, went above the clouds\nRocket goin' high, then they said goodbye\nShe still wonders why, but she loves to fly\n\n[Chorus]\nI hope Laika never died and that she spins around us still\nAnd that she has a party in the air and always will\nI hope that she is dancin' every night among the stars\nI hope Laika is alive\n\n[Build]\nLaika party in the sky\nLaika party in the sky\n\n[Drop]\nBam-bam, ba-da-dam-bam-bam-bam-bam-bam\nBa-da-dam-bam-bam-bam-bam-bam\nBa-da-dam-bam-bam-bam-bam-bam\nBa-da-dam-bam-bam-bam-bam-bam\nBa-da-dam-bam-bam-bam-bam-bam\nBa-da-dam-bam-bam-bam-bam-bam\nBa-da-dam-bam-bam-bam-bam-bam\n\n[Outro]\nLaika party in the sky, oh\nLaika party in the sky, oh\nBam-bam, ba-da-dam-bam-bam-bam-bam-bam\nBa-da-dam-bam-bam-bam-bam-bam\nBa-da-dam-bam-bam-bam-bam-bam\nLaika party in the sky (Ba-da-dam-bam-bam-bam—)",
|
|
||||||
"lyrics_translation_fi": "[Intro]\n(Valmiina lentoonlähtöön)\n\n[Verse 1]\nOlet luultavasti kuullut tästä urheasta pienestä tytöstä\nTiedämme vain, että hän pelasti maailman\nHänet lähetettiin pois, mutta hän ei pelännyt\nVaikka hän oli yksin pimeässä suuressa avaruudessa\n\n[Pre-Chorus]\nJätti hurraavan yleisön, meni pilvien yläpuolelle\nRaketti menee korkealle, sitten he sanoivat hyvästit\nHän miettii yhä miksi, mutta hän rakastaa lentämistä\n\n[Chorus]\nToivon, että Laika ei koskaan kuollut ja että hän pyörii yhä ympärillämme\nJa että hänellä on juhlat ilmassa ja tulee aina olemaan\nToivon, että hän tanssii joka ilta tähtien joukossa\nToivon, että Laika on elossa\n\n[Build]\nLaikan juhlat taivaalla\nLaikan juhlat taivaalla\n\n[Drop]\nBam-bam, ba-da-dam-bam-bam-bam-bam-bam\nBa-da-dam-bam-bam-bam-bam-bam\nBa-da-dam-bam-bam-bam-bam-bam\nBa-da-dam-bam-bam-bam-bam-bam\nBa-da-dam-bam-bam-bam-bam-bam\nBa-da-dam-bam-bam-bam-bam-bam\nBa-da-dam-bam-bam-bam-bam-bam\n\n[Verse 2]\nKomeettojen ja kivien läpi\nHän ulvoo luidensa perään\nLaulaa yksin tähdille ja auringolle\nJa jos hän ei olisi lentänyt, emme myöskään sinä ja minä\nIkuinen sankari ihmiskunnalle\n\n[Pre-Chorus]\nJätti hurraavan yleisön, meni pilvien yläpuolelle\nRaketti menee korkealle, sitten he sanoivat hyvästit\nHän miettii yhä miksi, mutta hän rakastaa lentämistä\n\n[Chorus]\nToivon, että Laika ei koskaan kuollut ja että hän pyörii yhä ympärillämme\nJa että hänellä on juhlat ilmassa ja tulee aina olemaan\nToivon, että hän tanssii joka ilta tähtien joukossa\nToivon, että Laika on elossa\n\n[Build]\nLaikan juhlat taivaalla\nLaikan juhlat taivaalla\n\n[Drop]\nBam-bam, ba-da-dam-bam-bam-bam-bam-bam\nBa-da-dam-bam-bam-bam-bam-bam\nBa-da-dam-bam-bam-bam-bam-bam\nBa-da-dam-bam-bam-bam-bam-bam\nBa-da-dam-bam-bam-bam-bam-bam\nBa-da-dam-bam-bam-bam-bam-bam\nBa-da-dam-bam-bam-bam-bam-bam\n\n[Outro]\nLaikan juhlat taivaalla, oh\nLaikan juhlat taivaalla, oh\nBam-bam, ba-da-dam-bam-bam-bam-bam-bam\nBa-da-dam-bam-bam-bam-bam-bam\nBa-da-dam-bam-bam-bam-bam-bam\nLaikan juhlat taivaalla (Ba-da-dam-bam-bam-bam—)",
|
|
||||||
"tags": [
|
|
||||||
"Laika",
|
|
||||||
"avaruus",
|
|
||||||
"uhraus",
|
|
||||||
"toivo",
|
|
||||||
"tanssi"
|
|
||||||
],
|
|
||||||
"confidence": 0.95,
|
|
||||||
"language": "Englanti",
|
|
||||||
"running_order": 18
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"artist": "Yuval Raphael",
|
"artist": "Yuval Raphael",
|
||||||
"country": "ISR",
|
"country": "ISR",
|
||||||
@@ -367,7 +209,7 @@
|
|||||||
],
|
],
|
||||||
"confidence": 0.95,
|
"confidence": 0.95,
|
||||||
"language": "Englanti, Ranska, Heprea",
|
"language": "Englanti, Ranska, Heprea",
|
||||||
"running_order": 19
|
"running_order": 4
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"artist": "Lucio Corsi",
|
"artist": "Lucio Corsi",
|
||||||
@@ -387,7 +229,7 @@
|
|||||||
],
|
],
|
||||||
"confidence": 0.95,
|
"confidence": 0.95,
|
||||||
"language": "Italia",
|
"language": "Italia",
|
||||||
"running_order": 20
|
"running_order": 14
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"artist": "Tautumeitas",
|
"artist": "Tautumeitas",
|
||||||
@@ -407,7 +249,7 @@
|
|||||||
],
|
],
|
||||||
"confidence": 0.95,
|
"confidence": 0.95,
|
||||||
"language": "Latvia",
|
"language": "Latvia",
|
||||||
"running_order": 21
|
"running_order": 11
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"artist": "Katarsis",
|
"artist": "Katarsis",
|
||||||
@@ -426,7 +268,7 @@
|
|||||||
],
|
],
|
||||||
"confidence": 0.95,
|
"confidence": 0.95,
|
||||||
"language": "Liettua",
|
"language": "Liettua",
|
||||||
"running_order": 22
|
"running_order": 5
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"artist": "Laura Thorn",
|
"artist": "Laura Thorn",
|
||||||
@@ -445,7 +287,7 @@
|
|||||||
],
|
],
|
||||||
"confidence": 0.95,
|
"confidence": 0.95,
|
||||||
"language": "Ranska",
|
"language": "Ranska",
|
||||||
"running_order": 23
|
"running_order": 2
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"artist": "Miriana Conte",
|
"artist": "Miriana Conte",
|
||||||
@@ -464,26 +306,7 @@
|
|||||||
],
|
],
|
||||||
"confidence": 0.95,
|
"confidence": 0.95,
|
||||||
"language": "Englanti",
|
"language": "Englanti",
|
||||||
"running_order": 24
|
"running_order": 20
|
||||||
},
|
|
||||||
{
|
|
||||||
"artist": "Nina Žižić",
|
|
||||||
"country": "MNE",
|
|
||||||
"title": "Dobrodošli",
|
|
||||||
"lyrics_url": "https://genius.com/Genius-english-translations-nina-zizic-dobrodosli-english-translation-lyrics",
|
|
||||||
"artist_url": "https://eurovision.tv/participant/nina-zizic-2025",
|
|
||||||
"flag_url": "https://eurovision.tv/sites/default/files/media/image/2023-08/ESC-HEART-MONTENEGRO-WHITE.png",
|
|
||||||
"lyrics_original": "[Verse 1]\nThe night which is to blame, wakes up\nShamelessly rubs its tired eyes\nWill it come or will it sleep?\nRed dawn comes to heal the wounds\n\n[Pre-Chorus]\nWhere is everyone now? Behind the border\nKnitting a wreath of flowers\n\n[Chorus]\nSmile, endure everything, it will pass\nEndure everything, it will pass, smile\nIt will pass, smile, endure everything\nIt will disappear, it will stop, but when will it?\nI bid you welcome\nTo the play about lovе\n\n[Verse 2]\nHow are you? Are you okay?\nWherе are now all those pure before God?\nAs if they are mute, they stand speechless\nThose who are there in good times and bad\n\n[Pre-Chorus]\nTheir faces are red, patched with sadness\nAnd who's to blame? Woah\n\n[Chorus]\nSmile, endure everything, it will pass\nEndure everything, it will pass, smile\nIt will pass, smile, endure everything\nIt will disappear, it will stop, but when will it?\nI bid you welcome\nTo the hotel of my weaknesses\nI bid you all welcome\nTo the play about love\n\n[Bridge: Vocalization]\n\n[Chorus]\nEndure everything, it will pass, smile\nIt will pass, smile, endure everything\nIt will disappear, it will stop, but when will it?\n\n[Outro]\n(It will stop, but when will it?)",
|
|
||||||
"lyrics_translation_fi": "[Verse 1]\nYö, joka on syypää, herää\nHäpeilemättömästi hieroo väsyneitä silmiään\nTuleeko se vai nukkuuko se?\nPunainen aamunkoitto tulee parantamaan haavat\n\n[Pre-Chorus]\nMissä kaikki ovat nyt? Rajan takana\nKudotaan kukkaseppelettä\n\n[Chorus]\nHymyile, kestä kaikki, se menee ohi\nKestä kaikki, se menee ohi, hymyile\nSe menee ohi, hymyile, kestä kaikki\nSe katoaa, se loppuu, mutta milloin?\nToivotan sinut tervetulleeksi\nNäytelmään rakkaudesta\n\n[Verse 2]\nMitä kuuluu? Oletko kunnossa?\nMissä ovat nyt kaikki ne puhtaat ennen Jumalaa?\nIkuin he ovat mykkiä, he seisovat sanattomina\nNe, jotka ovat siellä hyvinä ja huonoina aikoina\n\n[Pre-Chorus]\nHeidän kasvonsa ovat punaiset, surun paikkaamat\nJa kuka on syypää? Vau\n\n[Chorus]\nHymyile, kestä kaikki, se menee ohi\nKestä kaikki, se menee ohi, hymyile\nSe menee ohi, hymyile, kestä kaikki\nSe katoaa, se loppuu, mutta milloin?\nToivotan sinut tervetulleeksi\nHeikkouksieni hotelliin\nToivotan teidät kaikki tervetulleiksi\nNäytelmään rakkaudesta\n\n[Bridge: Vocalization]\n\n[Chorus]\nKestä kaikki, se menee ohi, hymyile\nSe menee ohi, hymyile, kestä kaikki\nSe katoaa, se loppuu, mutta milloin?\n\n[Outro]\n(Se loppuu, mutta milloin?)",
|
|
||||||
"tags": [
|
|
||||||
"kestävyys",
|
|
||||||
"rakkaus",
|
|
||||||
"vaikeudet",
|
|
||||||
"toivo"
|
|
||||||
],
|
|
||||||
"confidence": 0.95,
|
|
||||||
"language": "Venäjä",
|
|
||||||
"running_order": 25
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"artist": "Claude",
|
"artist": "Claude",
|
||||||
@@ -503,7 +326,7 @@
|
|||||||
],
|
],
|
||||||
"confidence": 0.95,
|
"confidence": 0.95,
|
||||||
"language": "Ranska",
|
"language": "Ranska",
|
||||||
"running_order": 26
|
"running_order": 12
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"artist": "Kyle Alessandro",
|
"artist": "Kyle Alessandro",
|
||||||
@@ -523,7 +346,7 @@
|
|||||||
],
|
],
|
||||||
"confidence": 0.95,
|
"confidence": 0.95,
|
||||||
"language": "Englanti",
|
"language": "Englanti",
|
||||||
"running_order": 27
|
"running_order": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"artist": "Justyna Steczkowska",
|
"artist": "Justyna Steczkowska",
|
||||||
@@ -543,7 +366,7 @@
|
|||||||
],
|
],
|
||||||
"confidence": 0.95,
|
"confidence": 0.95,
|
||||||
"language": "Puola",
|
"language": "Puola",
|
||||||
"running_order": 28
|
"running_order": 15
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"artist": "NAPA",
|
"artist": "NAPA",
|
||||||
@@ -563,7 +386,7 @@
|
|||||||
],
|
],
|
||||||
"confidence": 0.95,
|
"confidence": 0.95,
|
||||||
"language": "Portugali",
|
"language": "Portugali",
|
||||||
"running_order": 29
|
"running_order": 21
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"artist": "Gabry Ponte",
|
"artist": "Gabry Ponte",
|
||||||
@@ -583,47 +406,7 @@
|
|||||||
],
|
],
|
||||||
"confidence": 0.95,
|
"confidence": 0.95,
|
||||||
"language": "Italia",
|
"language": "Italia",
|
||||||
"running_order": 30
|
"running_order": 25
|
||||||
},
|
|
||||||
{
|
|
||||||
"artist": "Princ",
|
|
||||||
"country": "SRB",
|
|
||||||
"title": "Mila",
|
|
||||||
"lyrics_url": "https://genius.com/Princ-mila-lyrics",
|
|
||||||
"artist_url": "https://eurovision.tv/participant/princ-2025",
|
|
||||||
"flag_url": "https://eurovision.tv/sites/default/files/media/image/2023-08/ESC-HEART-SERBIA-WHITE.png",
|
|
||||||
"lyrics_original": "[Tekst pesme \"Mila\"]\n\n[Strofa 1]\nNeka bude mi to zadnja večera\nNek oko Kerbera u noć me potera\nNek te probudi taj miris sećanja\nI moja muzika od tvoga imena\n\n[Refren]\nMila, ti si platila što volim te ja\nMila, život vratila sa ruba\nIma mnogo razloga da ipak voliš drugoga\nAl' tako mi je stalo da te čuvam\n\n[Strofa 2]\nNek te poljubi ko bolje slaže te\nA nek te dobije ko rizikuje sve\n\n[Refren]\nMila, ti si platila što volim te ja\nMila, život vratila sa ruba\nIma mnogo razloga da ipak voliš drugoga\nAl' tako mi je stalo da te čuvam\n\n[Instrumentalna pauza]\n\n[Refren]\nMila, ti si platila što volim te ja\nMila, život vratila sa ruba\nIma mnogo razloga da ipak voliš drugoga\nAl' tako mi je stalo da te čuvam\n(Mila, ti si platila što volim te ja)\nTi si platila mila\n(Mila, život vratila sa ruba)\nIma mnogo razloga da ipak voliš drugoga\nAl' tako mi je stalo da te čuvam",
|
|
||||||
"lyrics_translation_fi": "[Säkeistö 1]\nOlkoon se minulle viimeinen ehtoollinen\nKerberoksen ympäröimänä yö minut ajaa takaa\nHerättäköön sinut muistojen tuoksu\nJa minun musiikkini sinun nimestäsi\n\n[Kertosäe]\nMila, sinä olet maksanut siitä, että minä rakastan sinua\nMila, palautit elämän reunalta\nOn monia syitä, miksi rakastaisit jotakuta toista\nMutta minulle on niin tärkeää suojella sinua\n\n[Säkeistö 2]\nSuudelkoon sinua se, joka paremmin sopii sinulle\nJa saakoon sinut se, joka riskeeraa kaiken\n\n[Kertosäe]\nMila, sinä olet maksanut siitä, että minä rakastan sinua\nMila, palautit elämän reunalta\nOn monia syitä, miksi rakastaisit jotakuta toista\nMutta minulle on niin tärkeää suojella sinua\n\n[Instrumentaalinen välisoitto]\n\n[Kertosäe]\nMila, sinä olet maksanut siitä, että minä rakastan sinua\nMila, palautit elämän reunalta\nOn monia syitä, miksi rakastaisit jotakuta toista\nMutta minulle on niin tärkeää suojella sinua\n(Mila, sinä olet maksanut siitä, että minä rakastan sinua)\nSinä olet maksanut, Mila\n(Mila, palautit elämän reunalta)\nOn monia syitä, miksi rakastaisit jotakuta toista\nMutta minulle on niin tärkeää suojella sinua",
|
|
||||||
"tags": [
|
|
||||||
"rakkaus",
|
|
||||||
"uhrautuminen",
|
|
||||||
" kaipaus",
|
|
||||||
"suojelu"
|
|
||||||
],
|
|
||||||
"confidence": 0.95,
|
|
||||||
"language": "Serbia",
|
|
||||||
"running_order": 31
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"artist": "Klemen",
|
|
||||||
"country": "SVN",
|
|
||||||
"title": "How Much Time Do We Have Left",
|
|
||||||
"lyrics_url": "https://genius.com/Klemen-how-much-time-do-we-have-left-lyrics",
|
|
||||||
"artist_url": "https://eurovision.tv/participant/klemen-2025",
|
|
||||||
"flag_url": "https://eurovision.tv/sites/default/files/media/image/2023-08/ESC-HEART-SLOVENIA-WHITE.png",
|
|
||||||
"lyrics_original": "[Verse 1]\nOur baby boy was crawlin' in the livin' room\nYou read a diagnosis, it said that you'd be dyin' soon\nIt was a sunny day\nThrough the window, there were people goin' on their ways\nOur little child had the biggest smile\nWhile we couldn't do nothin' but cry\n\n[Chorus]\nHow much time do we have left together?\nWe never know\nAll I know is I don't wanna be here\nWithout your love\nHow much time do we have left together?\nWe never know, we never know\nWish wе could take it slow\n\n[Verse 2]\nA man in white\nWith a room full of diplomas, tryin' to get it right\nCould put you undеr hypnosis\nBy sayin' to give up the fight\nBut you were always determined to try\n\n[Chorus]\nHow much time do we have left together?\nWe never know\nAll I know is I don't wanna be here\nWithout your love\nHow much time do we have left together?\nWe never know, we never know\nBut we keep standin' strong\n\n[Bridge]\nI admire your power, I admire your will\nYou made me question the world\nMade me question what's real\nI admire your power, I admire your will\nYour ability to heal\nOh, I admire your power, I admire your will\nThe way you never gave up until you grew wings\nAnd you learned how to fly, made a loop in the sky\nYou landed right into my arms\n\n[Chorus]\nHow much time do we have left together?\nWe never know\nAll I know is I don't wanna be here\nWithout your love\nHow much time do we have left together?\nWe never know, we never know\nWish we could take it slow",
|
|
||||||
"lyrics_translation_fi": "[Verse 1]\nMeidän poikavauvamme ryömi olohuoneessa\nLuit diagnoosin, jossa sanottiin, että kuolisit pian\nOli aurinkoinen päivä\nIkkunan läpi ihmiset menivät omilla teillään\nPienellä lapsellamme oli suurin hymy\nVaikka emme voineet muuta kuin itkeä\n\n[Chorus]\nKuinka paljon aikaa meillä on jäljellä yhdessä?\nEmme koskaan tiedä\nTiedän vain, että en halua olla täällä\nIlman rakkauttasi\nKuinka paljon aikaa meillä on jäljellä yhdessä?\nEmme koskaan tiedä, emme koskaan tiedä\nToivon, että voisimme ottaa sen hitaasti\n\n[Verse 2]\nMies valkoisissa\nHuone täynnä tutkintoja, yrittää saada sen oikein\nVoi saada sinut hypnoosiin\nSanomalla, että luovutat taistelun\nMutta olit aina päättänyt yrittää\n\n[Chorus]\nKuinka paljon aikaa meillä on jäljellä yhdessä?\nEmme koskaan tiedä\nTiedän vain, että en halua olla täällä\nIlman rakkauttasi\nKuinka paljon aikaa meillä on jäljellä yhdessä?\nEmme koskaan tiedä, emme koskaan tiedä\nMutta pysymme vahvoina\n\n[Bridge]\nI admire your power, I admire your will\nYou made me question the world\nMade me question what's real\nI admire your power, I admire your will\nYour ability to heal\nOh, I admire your power, I admire your will\nThe way you never gave up until you grew wings\nAnd you learned how to fly, made a loop in the sky\nYou landed right into my arms\n\n[Chorus]\nKuinka paljon aikaa meillä on jäljellä yhdessä?\nEmme koskaan tiedä\nTiedän vain, että en halua olla täällä\nIlman rakkauttasi\nKuinka paljon aikaa meillä on jäljellä yhdessä?\nEmme koskaan tiedä, emme koskaan tiedä\nToivon, että voisimme ottaa sen hitaasti",
|
|
||||||
"tags": [
|
|
||||||
"Suru",
|
|
||||||
"Menetys",
|
|
||||||
"Rakkaus",
|
|
||||||
"Toivo",
|
|
||||||
"Resilienssi",
|
|
||||||
"Perhe"
|
|
||||||
],
|
|
||||||
"confidence": 0.95,
|
|
||||||
"language": "Englanti",
|
|
||||||
"running_order": 32
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"artist": "Melody",
|
"artist": "Melody",
|
||||||
@@ -643,7 +426,7 @@
|
|||||||
],
|
],
|
||||||
"confidence": 0.95,
|
"confidence": 0.95,
|
||||||
"language": "Espanja",
|
"language": "Espanja",
|
||||||
"running_order": 33
|
"running_order": 6
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"artist": "KAJ",
|
"artist": "KAJ",
|
||||||
@@ -662,7 +445,7 @@
|
|||||||
],
|
],
|
||||||
"confidence": 0.95,
|
"confidence": 0.95,
|
||||||
"language": "Ruotsi",
|
"language": "Ruotsi",
|
||||||
"running_order": 34
|
"running_order": 23
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"artist": "Zoë Më",
|
"artist": "Zoë Më",
|
||||||
@@ -681,7 +464,7 @@
|
|||||||
],
|
],
|
||||||
"confidence": 0.95,
|
"confidence": 0.95,
|
||||||
"language": "Ranska",
|
"language": "Ranska",
|
||||||
"running_order": 35
|
"running_order": 19
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"artist": "Ziferblat",
|
"artist": "Ziferblat",
|
||||||
@@ -700,7 +483,7 @@
|
|||||||
],
|
],
|
||||||
"confidence": 0.95,
|
"confidence": 0.95,
|
||||||
"language": "Ukraina",
|
"language": "Ukraina",
|
||||||
"running_order": 36
|
"running_order": 7
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"artist": "Remember Monday",
|
"artist": "Remember Monday",
|
||||||
@@ -720,6 +503,6 @@
|
|||||||
],
|
],
|
||||||
"confidence": 0.95,
|
"confidence": 0.95,
|
||||||
"language": "Englanti",
|
"language": "Englanti",
|
||||||
"running_order": 37
|
"running_order": 8
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -0,0 +1,25 @@
|
|||||||
|
from pydantic import BaseModel, Field
|
||||||
|
from datetime import date, datetime
|
||||||
|
|
||||||
|
|
||||||
|
class Contest(BaseModel):
|
||||||
|
id: int
|
||||||
|
year: int = Field(
|
||||||
|
default_factory=lambda: datetime.now().year,
|
||||||
|
description="The year of the contest",
|
||||||
|
examples=[2025],
|
||||||
|
)
|
||||||
|
is_active: bool = Field(
|
||||||
|
default=True, description="Is this the active contest?", examples=[True, False]
|
||||||
|
)
|
||||||
|
finals_date: date = Field(
|
||||||
|
description="The date of the finals", examples=["2025-05-15"]
|
||||||
|
)
|
||||||
|
created_at: datetime = Field(
|
||||||
|
description="The date and time when the contest was created",
|
||||||
|
examples=["2025-05-15T17:40:42.000Z"],
|
||||||
|
)
|
||||||
|
updated_at: datetime = Field(
|
||||||
|
description="The date and time when the contest was last updated",
|
||||||
|
examples=["2025-05-15T17:40:42.000Z"],
|
||||||
|
)
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
from pydantic import BaseModel, Field
|
||||||
|
from datetime import datetime
|
||||||
|
|
||||||
|
|
||||||
|
class Message(BaseModel):
|
||||||
|
type: str | None = None
|
||||||
|
message: str
|
||||||
|
timestamp: datetime = Field(default_factory=datetime.now)
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
from pydantic import BaseModel, Field
|
||||||
|
|
||||||
|
|
||||||
|
class Result(BaseModel):
|
||||||
|
song_id: int = Field(description="ID of the song", examples=[1])
|
||||||
|
country_fi: str = Field(
|
||||||
|
description="Country of the song in Finnish", examples=["Suomi"]
|
||||||
|
)
|
||||||
|
country_sv: str = Field(
|
||||||
|
description="Country of the song in Swedish", examples=["Sverige"]
|
||||||
|
)
|
||||||
|
artist: str = Field(description="Artist of the song", examples=["Käärijä"])
|
||||||
|
title: str = Field(description="Title of the song", examples=["Cha cha cha"])
|
||||||
|
total_reviews: int = Field(0, description="Total number of reviews", examples=[10])
|
||||||
|
avg_score_song: float = Field(
|
||||||
|
description="Average score for song quality", examples=[85.5]
|
||||||
|
)
|
||||||
|
avg_score_show: float = Field(
|
||||||
|
description="Average score for stage show", examples=[82.3]
|
||||||
|
)
|
||||||
|
avg_score_costume: float = Field(
|
||||||
|
description="Average score for wardrobe/costumes", examples=[88.1]
|
||||||
|
)
|
||||||
|
avg_total_score: float = Field(description="Average total score", examples=[85.5])
|
||||||
|
|
||||||
|
|
||||||
|
class TeamResult(Result):
|
||||||
|
team_id: int = Field(description="ID of the team", examples=[1])
|
||||||
@@ -46,9 +46,12 @@ class UserLogin(UserBase):
|
|||||||
password: str = Field(description="Password of the user", examples=["sn1rbul4"])
|
password: str = Field(description="Password of the user", examples=["sn1rbul4"])
|
||||||
|
|
||||||
|
|
||||||
class UserChangePassword(BaseModel):
|
class UpdateUser(BaseModel):
|
||||||
id: int = Field(description="ID of the user", examples=[1])
|
id: int = Field(description="ID of the user", examples=[1])
|
||||||
old_password: str = Field(
|
avatar_id: int | None = Field(None, description="ID of the avatar", examples=[1])
|
||||||
description="Old password of the user", examples=["sn1rbul4"]
|
email: str | None = Field(
|
||||||
|
None, description="Email of the user", examples=["[email protected]"]
|
||||||
|
)
|
||||||
|
password: str | None = Field(
|
||||||
|
None, description="Password of the user", examples=["p1p4l1"]
|
||||||
)
|
)
|
||||||
password: str = Field(description="Password of the user", examples=["p1p4l1"])
|
|
||||||
|
|||||||
@@ -1,9 +1,10 @@
|
|||||||
from fastapi import APIRouter, Body, HTTPException
|
from fastapi import APIRouter, Body, HTTPException, Request
|
||||||
|
|
||||||
from models.user import CreateUser
|
from models.user import CreateUser
|
||||||
from models.team import TeamBase, Team
|
from models.team import TeamBase, Team
|
||||||
from lib.db import get_connection
|
from lib.db import get_connection
|
||||||
from lib.helpers import hash_password
|
from lib.helpers import hash_password
|
||||||
|
from lib.logger import logger
|
||||||
|
|
||||||
router = APIRouter(prefix="/admin", tags=["Admin"])
|
router = APIRouter(prefix="/admin", tags=["Admin"])
|
||||||
|
|
||||||
@@ -19,36 +20,73 @@ router = APIRouter(prefix="/admin", tags=["Admin"])
|
|||||||
|
|
||||||
|
|
||||||
@router.post("/teams")
|
@router.post("/teams")
|
||||||
async def create_team(team: TeamBase):
|
async def create_team(team: TeamBase, request: Request):
|
||||||
with get_connection() as conn:
|
logger.info(
|
||||||
conn.execute("INSERT INTO Team (name) VALUES (?)", (team.name,))
|
f"Admin action: Creating new team '{team.name}' from IP: {request.client.host}"
|
||||||
return {"message": "Team created successfully"}
|
)
|
||||||
|
try:
|
||||||
|
with get_connection() as conn:
|
||||||
|
conn.execute("INSERT INTO Team (name) VALUES (?)", (team.name,))
|
||||||
|
logger.info(f"Team '{team.name}' created successfully")
|
||||||
|
return {"message": "Team created successfully"}
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Failed to create team '{team.name}': {str(e)}")
|
||||||
|
raise HTTPException(status_code=500, detail="Failed to create team")
|
||||||
|
|
||||||
|
|
||||||
@router.get("/teams", response_model=list[Team])
|
@router.get("/teams", response_model=list[Team])
|
||||||
async def list_teams():
|
async def list_teams(request: Request):
|
||||||
|
logger.debug(f"Admin action: Listing all teams from IP: {request.client.host}")
|
||||||
with get_connection() as conn:
|
with get_connection() as conn:
|
||||||
teams = conn.execute("SELECT * FROM Team").fetchdf()
|
teams = conn.execute("SELECT * FROM Team").fetchdf()
|
||||||
return teams.to_dict(orient="records")
|
return teams.to_dict(orient="records")
|
||||||
|
|
||||||
|
|
||||||
@router.post("/users")
|
@router.post("/users")
|
||||||
async def create_user(user: CreateUser):
|
async def create_user(user: CreateUser, request: Request):
|
||||||
with get_connection() as conn:
|
logger.info(
|
||||||
conn.execute(
|
f"Admin action: Creating new user '{user.username}' from IP: {request.client.host}"
|
||||||
"INSERT INTO User (username, hashed_password, team_id, is_admin) VALUES (?, ?, ?, ?)",
|
)
|
||||||
(
|
try:
|
||||||
user.username,
|
with get_connection() as conn:
|
||||||
hash_password(user.password),
|
# Check if username already exists
|
||||||
user.team_id,
|
existing = conn.execute(
|
||||||
user.is_admin,
|
"SELECT COUNT(*) as count FROM User WHERE username = ?",
|
||||||
),
|
(user.username,),
|
||||||
|
).fetchdf()
|
||||||
|
if existing["count"][0] > 0:
|
||||||
|
logger.warning(
|
||||||
|
f"Failed to create user: Username '{user.username}' already exists"
|
||||||
|
)
|
||||||
|
raise HTTPException(status_code=400, detail="Username already exists")
|
||||||
|
|
||||||
|
conn.execute(
|
||||||
|
"INSERT INTO User (username, hashed_password, team_id, is_admin) VALUES (?, ?, ?, ?)",
|
||||||
|
(
|
||||||
|
user.username,
|
||||||
|
hash_password(user.password),
|
||||||
|
user.team_id,
|
||||||
|
user.is_admin,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
logger.info(
|
||||||
|
f"User '{user.username}' created successfully with team_id: {user.team_id}, admin status: {user.is_admin}"
|
||||||
)
|
)
|
||||||
return {"message": "User created successfully"}
|
return {"message": "User created successfully"}
|
||||||
|
except HTTPException:
|
||||||
|
# Re-raise HTTP exceptions
|
||||||
|
raise
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Failed to create user '{user.username}': {str(e)}")
|
||||||
|
raise HTTPException(status_code=500, detail="Failed to create user")
|
||||||
|
|
||||||
|
|
||||||
@router.post("/users/")
|
@router.post("/users/disable")
|
||||||
async def disable_user(user_id: int = Body(..., embed=True)):
|
async def disable_user(user_id: int = Body(..., embed=True), request: Request = None):
|
||||||
|
logger.info(
|
||||||
|
f"Admin action: Attempting to disable user with ID: {user_id} from IP: {request.client.host}"
|
||||||
|
)
|
||||||
|
logger.warning(f"Disable user functionality not implemented for user_id: {user_id}")
|
||||||
raise HTTPException(status_code=405, detail="Method not yet implemented")
|
raise HTTPException(status_code=405, detail="Method not yet implemented")
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,24 +1,34 @@
|
|||||||
from fastapi import APIRouter, HTTPException
|
from fastapi import APIRouter, HTTPException, Request
|
||||||
|
|
||||||
from lib.db import get_connection
|
from lib.db import get_connection
|
||||||
from models.user import User, UserLogin
|
from models.user import User, UserLogin
|
||||||
from lib.helpers import verify_password
|
from lib.helpers import verify_password
|
||||||
|
from lib.logger import logger
|
||||||
|
|
||||||
router = APIRouter(prefix="/auth", tags=["auth"])
|
router = APIRouter(prefix="/auth", tags=["auth"])
|
||||||
|
|
||||||
|
|
||||||
@router.post("/token", response_model=User)
|
@router.post("/token", response_model=User)
|
||||||
async def login(user_login: UserLogin):
|
async def login(user_login: UserLogin, request: Request):
|
||||||
|
logger.debug(
|
||||||
|
f"Login attempt for user: {user_login.username} from IP: {request.client.host}"
|
||||||
|
)
|
||||||
with get_connection() as conn:
|
with get_connection() as conn:
|
||||||
user_df = conn.execute(
|
user_df = conn.execute(
|
||||||
'SELECT * FROM "User" WHERE username = ?', (user_login.username,)
|
'SELECT * FROM "User" WHERE username = ?', (user_login.username,)
|
||||||
).fetchdf()
|
).fetchdf()
|
||||||
|
|
||||||
if user_df.empty:
|
if user_df.empty:
|
||||||
|
logger.warning(
|
||||||
|
f"Failed login: Username {user_login.username} not found - IP: {request.client.host}"
|
||||||
|
)
|
||||||
raise HTTPException(status_code=401, detail="Invalid username or password")
|
raise HTTPException(status_code=401, detail="Invalid username or password")
|
||||||
|
|
||||||
user_data = user_df.to_dict(orient="records")[0]
|
user_data = user_df.to_dict(orient="records")[0]
|
||||||
if not verify_password(user_login.password, user_data["hashed_password"]):
|
if not verify_password(user_login.password, user_data["hashed_password"]):
|
||||||
|
logger.warning(
|
||||||
|
f"Failed login: Incorrect password for user {user_login.username} - IP: {request.client.host}"
|
||||||
|
)
|
||||||
raise HTTPException(status_code=401, detail="Invalid username or password")
|
raise HTTPException(status_code=401, detail="Invalid username or password")
|
||||||
|
|
||||||
# Update the login timestamp in the database
|
# Update the login timestamp in the database
|
||||||
@@ -29,9 +39,14 @@ async def login(user_login: UserLogin):
|
|||||||
)
|
)
|
||||||
|
|
||||||
# Fetch the updated user data with the new last_login timestamp
|
# Fetch the updated user data with the new last_login timestamp
|
||||||
updated_user = conn.execute(
|
updated_user = (
|
||||||
'SELECT * FROM "User" WHERE id = ?',
|
conn.execute('SELECT * FROM "User" WHERE id = ?', (user_data["id"],))
|
||||||
(user_data["id"],)
|
.fetchdf()
|
||||||
).fetchdf().to_dict(orient="records")[0]
|
.to_dict(orient="records")[0]
|
||||||
|
)
|
||||||
|
|
||||||
|
logger.info(
|
||||||
|
f"Successful login: User {user_login.username} (ID: {user_data['id']}) logged in from {request.client.host}"
|
||||||
|
)
|
||||||
|
|
||||||
return User(**updated_user)
|
return User(**updated_user)
|
||||||
|
|||||||
@@ -0,0 +1,39 @@
|
|||||||
|
from fastapi import APIRouter, HTTPException
|
||||||
|
|
||||||
|
from lib.db import get_connection
|
||||||
|
from lib.logger import logger
|
||||||
|
from models.contest import Contest
|
||||||
|
from models.msg import Message
|
||||||
|
|
||||||
|
router = APIRouter(prefix="/contest", tags=["contest"])
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/", response_model=list[Contest])
|
||||||
|
async def list_contests():
|
||||||
|
with get_connection() as conn:
|
||||||
|
logger.debug("Listing all contests")
|
||||||
|
df = conn.execute("SELECT * FROM Contest").fetchdf()
|
||||||
|
logger.debug(f"Contests: {df}")
|
||||||
|
contests = [Contest(**row) for row in df.to_dict(orient="records")]
|
||||||
|
return contests
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/{year}", response_model=Contest)
|
||||||
|
async def get_contest(year: int):
|
||||||
|
with get_connection() as conn:
|
||||||
|
df = conn.execute("SELECT * FROM Contest WHERE year = ?", (year,)).fetchdf()
|
||||||
|
if df.empty:
|
||||||
|
raise HTTPException(status_code=404, detail="Contest not found")
|
||||||
|
contest = Contest(**df.to_dict(orient="records")[0])
|
||||||
|
return contest
|
||||||
|
|
||||||
|
|
||||||
|
@router.put("/", response_model=Message)
|
||||||
|
async def update_contest(year: int, is_active: bool):
|
||||||
|
with get_connection() as conn:
|
||||||
|
logger.debug(f"Updating contest {year} to active: {is_active}")
|
||||||
|
conn.execute(
|
||||||
|
"UPDATE Contest SET is_active = ? WHERE year = ?",
|
||||||
|
(is_active, year),
|
||||||
|
)
|
||||||
|
return Message(message="Contest updated successfully")
|
||||||
@@ -1,3 +1,28 @@
|
|||||||
from fastapi import APIRouter
|
from fastapi import APIRouter
|
||||||
|
|
||||||
|
from models.result import Result, TeamResult
|
||||||
|
from lib.db import get_connection
|
||||||
|
|
||||||
router = APIRouter(prefix="/results", tags=["results"])
|
router = APIRouter(prefix="/results", tags=["results"])
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/", response_model=list[Result])
|
||||||
|
async def list_results():
|
||||||
|
with get_connection() as conn:
|
||||||
|
df = conn.execute("SELECT * FROM ReviewSummaryGlobal").fetchdf()
|
||||||
|
if df.empty:
|
||||||
|
return []
|
||||||
|
results = [Result(**row) for row in df.to_dict(orient="records")]
|
||||||
|
return results
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/team/{team_id}", response_model=list[TeamResult])
|
||||||
|
async def list_team_results(team_id: int):
|
||||||
|
with get_connection() as conn:
|
||||||
|
df = conn.execute(
|
||||||
|
"SELECT * FROM ReviewSummaryByTeam WHERE team_id = ?", (team_id,)
|
||||||
|
).fetchdf()
|
||||||
|
if df.empty:
|
||||||
|
return []
|
||||||
|
results = [TeamResult(**row) for row in df.to_dict(orient="records")]
|
||||||
|
return results
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
from fastapi import APIRouter, HTTPException
|
from fastapi import APIRouter, HTTPException
|
||||||
|
|
||||||
from models.review import ReviewOut, ReviewSearch, ReviewIn
|
from models.review import ReviewOut, ReviewIn
|
||||||
|
from models.msg import Message
|
||||||
from lib.db import get_connection
|
from lib.db import get_connection
|
||||||
|
from lib.logger import logger
|
||||||
|
|
||||||
router = APIRouter(prefix="/reviews", tags=["reviews"])
|
router = APIRouter(prefix="/reviews", tags=["reviews"])
|
||||||
|
|
||||||
@@ -11,57 +13,139 @@ async def list_reviews():
|
|||||||
with get_connection() as conn:
|
with get_connection() as conn:
|
||||||
reviews = conn.execute("SELECT * FROM Review").fetchdf()
|
reviews = conn.execute("SELECT * FROM Review").fetchdf()
|
||||||
if reviews.empty:
|
if reviews.empty:
|
||||||
raise HTTPException(status_code=404, detail="Reviews not found")
|
return []
|
||||||
return reviews.to_dict(orient="records")
|
return reviews.to_dict(orient="records")
|
||||||
|
|
||||||
|
|
||||||
@router.get("/", response_model=ReviewOut)
|
@router.get("/", response_model=ReviewOut)
|
||||||
async def get_review(review_id: ReviewSearch):
|
async def get_review(song_id: int, user_id: int):
|
||||||
with get_connection() as conn:
|
with get_connection() as conn:
|
||||||
review = conn.execute(
|
review = conn.execute(
|
||||||
"SELECT * FROM Review WHERE song_id = ? AND user_id = ?",
|
"SELECT * FROM Review WHERE song_id = ? AND user_id = ?",
|
||||||
(review_id.song_id, review_id.user_id),
|
(song_id, user_id),
|
||||||
).fetchdf()
|
).fetchdf()
|
||||||
if review.empty:
|
if review.empty:
|
||||||
raise HTTPException(status_code=404, detail="Review not found")
|
return []
|
||||||
return review.to_dict(orient="records")[0]
|
return review.to_dict(orient="records")[0]
|
||||||
|
|
||||||
|
|
||||||
@router.post("/", response_model=ReviewOut)
|
@router.post("/", response_model=Message)
|
||||||
async def create_review(review: ReviewIn):
|
async def create_review(review: ReviewIn):
|
||||||
with get_connection() as conn:
|
logger.debug(f"Received create review request with data: {review.dict()}")
|
||||||
review = conn.execute(
|
try:
|
||||||
"INSERT INTO Review (user_id, song_id, score_song, score_show, score_costume, text_review) VALUES (?, ?, ?, ?, ?, ?)",
|
with get_connection() as conn:
|
||||||
(
|
# Log the SQL query and parameters
|
||||||
review.user_id,
|
logger.debug(
|
||||||
review.song_id,
|
f"Executing INSERT INTO Review (user_id, song_id, score_song, score_show, score_costume, text_review) "
|
||||||
review.score_song,
|
f"VALUES ({review.user_id}, {review.song_id}, {review.score_song}, "
|
||||||
review.score_show,
|
f"{review.score_show}, {review.score_costume}, '{review.text_review}')"
|
||||||
review.score_costume,
|
)
|
||||||
review.text_review,
|
|
||||||
),
|
# Insert the review
|
||||||
).fetchdf()
|
conn.execute(
|
||||||
if review.empty:
|
"INSERT INTO Review (user_id, song_id, score_song, score_show, score_costume, text_review) VALUES (?, ?, ?, ?, ?, ?)",
|
||||||
raise HTTPException(status_code=404, detail="Review not found")
|
(
|
||||||
return review.to_dict(orient="records")[0]
|
review.user_id,
|
||||||
|
review.song_id,
|
||||||
|
review.score_song,
|
||||||
|
review.score_show,
|
||||||
|
review.score_costume,
|
||||||
|
review.text_review,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
|
||||||
|
# Fetch the newly created review
|
||||||
|
logger.debug(
|
||||||
|
f"Checking if review was created for song_id={review.song_id}, user_id={review.user_id}"
|
||||||
|
)
|
||||||
|
result = conn.execute(
|
||||||
|
"SELECT * FROM Review WHERE song_id = ? AND user_id = ?",
|
||||||
|
(review.song_id, review.user_id),
|
||||||
|
).fetchdf()
|
||||||
|
logger.debug(f"Database result for newly created review: {result}")
|
||||||
|
|
||||||
|
if result.empty:
|
||||||
|
logger.warning(
|
||||||
|
f"Review not found after insert attempt: song_id={review.song_id}, user_id={review.user_id}"
|
||||||
|
)
|
||||||
|
raise HTTPException(status_code=404, detail="Review not found")
|
||||||
|
|
||||||
|
logger.info(
|
||||||
|
f"Review created successfully for song_id={review.song_id}, user_id={review.user_id}"
|
||||||
|
)
|
||||||
|
return Message(type="success", message="Review created successfully")
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Error creating review: {str(e)}")
|
||||||
|
raise
|
||||||
|
|
||||||
|
|
||||||
@router.put("/", response_model=ReviewOut)
|
@router.put("/", response_model=Message)
|
||||||
async def update_review(review: ReviewIn):
|
async def update_review(review: ReviewIn):
|
||||||
with get_connection() as conn:
|
print("update_review")
|
||||||
review = conn.execute(
|
logger.debug(f"Received update review request with data: {review.dict()}")
|
||||||
"UPDATE Review SET user_id = ?, song_id = ?, score_song = ?, score_show = ?, score_costume = ?, text_review = ? WHERE song_id = ? AND user_id = ?",
|
try:
|
||||||
(
|
with get_connection() as conn:
|
||||||
review.user_id,
|
# Log the SQL query and parameters
|
||||||
review.song_id,
|
logger.debug(
|
||||||
review.score_song,
|
f"Executing UPDATE Review SET score_song = {review.score_song}, "
|
||||||
review.score_show,
|
f"score_show = {review.score_show}, score_costume = {review.score_costume}, "
|
||||||
review.score_costume,
|
f"text_review = '{review.text_review}' WHERE song_id = {review.song_id} "
|
||||||
review.text_review,
|
f"AND user_id = {review.user_id}"
|
||||||
review.song_id,
|
)
|
||||||
review.user_id,
|
|
||||||
),
|
# Check if the review exists
|
||||||
).fetchdf()
|
review_df = conn.execute(
|
||||||
if review.empty:
|
"SELECT * FROM Review WHERE song_id = ? AND user_id = ?",
|
||||||
raise HTTPException(status_code=404, detail="Review not found")
|
(review.song_id, review.user_id),
|
||||||
return review.to_dict(orient="records")[0]
|
).fetchdf()
|
||||||
|
|
||||||
|
if not review_df.empty:
|
||||||
|
# Update the review
|
||||||
|
conn.execute(
|
||||||
|
"UPDATE Review SET score_song = ?, score_show = ?, score_costume = ?, text_review = ? WHERE song_id = ? AND user_id = ?",
|
||||||
|
(
|
||||||
|
review.score_song,
|
||||||
|
review.score_show,
|
||||||
|
review.score_costume,
|
||||||
|
review.text_review,
|
||||||
|
review.song_id,
|
||||||
|
review.user_id,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
# Insert the review
|
||||||
|
conn.execute(
|
||||||
|
"INSERT INTO Review (user_id, song_id, score_song, score_show, score_costume, text_review) VALUES (?, ?, ?, ?, ?, ?)",
|
||||||
|
(
|
||||||
|
review.user_id,
|
||||||
|
review.song_id,
|
||||||
|
review.score_song,
|
||||||
|
review.score_show,
|
||||||
|
review.score_costume,
|
||||||
|
review.text_review,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
|
||||||
|
# Fetch the updated review
|
||||||
|
logger.debug(
|
||||||
|
f"Checking if review was updated for song_id={review.song_id}, user_id={review.user_id}"
|
||||||
|
)
|
||||||
|
result = conn.execute(
|
||||||
|
"SELECT * FROM Review WHERE song_id = ? AND user_id = ?",
|
||||||
|
(review.song_id, review.user_id),
|
||||||
|
).fetchdf()
|
||||||
|
logger.debug(f"Database result: {result}")
|
||||||
|
|
||||||
|
if result.empty:
|
||||||
|
logger.warning(
|
||||||
|
f"Review not found after update attempt: song_id={review.song_id}, user_id={review.user_id}"
|
||||||
|
)
|
||||||
|
raise HTTPException(status_code=404, detail="Review not found")
|
||||||
|
|
||||||
|
logger.info(
|
||||||
|
f"Review updated successfully for song_id={review.song_id}, user_id={review.user_id}"
|
||||||
|
)
|
||||||
|
return Message(type="success", message="Review updated successfully")
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Error updating review: {str(e)}")
|
||||||
|
raise
|
||||||
|
|||||||
@@ -1,14 +1,18 @@
|
|||||||
from fastapi import APIRouter
|
from fastapi import APIRouter, HTTPException, Request
|
||||||
from fastapi import HTTPException
|
|
||||||
|
|
||||||
from models.user import User, UserChangePassword
|
from models.user import User, UpdateUser
|
||||||
|
from models.msg import Message
|
||||||
from lib.db import get_connection
|
from lib.db import get_connection
|
||||||
|
from lib.logger import logger
|
||||||
|
from lib.helpers import hash_password
|
||||||
|
from datetime import datetime
|
||||||
|
|
||||||
router = APIRouter(prefix="/users", tags=["users"])
|
router = APIRouter(prefix="/users", tags=["users"])
|
||||||
|
|
||||||
|
|
||||||
@router.get("/", response_model=list[User])
|
@router.get("/", response_model=list[User])
|
||||||
async def list_users():
|
async def list_users(request: Request):
|
||||||
|
logger.info(f"User list requested from {request.client.host}")
|
||||||
with get_connection() as conn:
|
with get_connection() as conn:
|
||||||
users = conn.execute('SELECT * FROM "User"').fetchdf()
|
users = conn.execute('SELECT * FROM "User"').fetchdf()
|
||||||
|
|
||||||
@@ -18,19 +22,58 @@ async def list_users():
|
|||||||
|
|
||||||
|
|
||||||
@router.get("/{user_id}", response_model=User)
|
@router.get("/{user_id}", response_model=User)
|
||||||
async def get_user(user_id: int):
|
async def get_user(user_id: int, request: Request):
|
||||||
|
logger.debug(
|
||||||
|
f"User details requested for user_id: {user_id} from {request.client.host}"
|
||||||
|
)
|
||||||
with get_connection() as conn:
|
with get_connection() as conn:
|
||||||
user_df = conn.execute(
|
user_df = conn.execute(
|
||||||
'SELECT * FROM "User" WHERE id = ?', (user_id,)
|
'SELECT * FROM "User" WHERE id = ?', (user_id,)
|
||||||
).fetchdf()
|
).fetchdf()
|
||||||
|
|
||||||
if user_df.empty:
|
if user_df.empty:
|
||||||
|
logger.warning(f"Failed user lookup: user_id {user_id} not found")
|
||||||
raise HTTPException(status_code=404, detail="User not found")
|
raise HTTPException(status_code=404, detail="User not found")
|
||||||
|
|
||||||
user_data = user_df.to_dict(orient="records")[0]
|
user_data = user_df.to_dict(orient="records")[0]
|
||||||
|
logger.debug(f"User details retrieved: {user_data}")
|
||||||
return User(**user_data)
|
return User(**user_data)
|
||||||
|
|
||||||
|
|
||||||
@router.patch("/{user_id}")
|
@router.patch("/", response_model=Message)
|
||||||
async def change_password(user: UserChangePassword):
|
async def update_user(user: UpdateUser, request: Request):
|
||||||
raise HTTPException(status_code=401, detail="Not implemented")
|
logger.info(f"Update attempt for user_id: {user.id} from {request.client.host}")
|
||||||
|
user_id = user.id
|
||||||
|
avatar_id = user.avatar_id if user.avatar_id else None
|
||||||
|
email = user.email if user.email else None
|
||||||
|
password = hash_password(user.password) if user.password else None
|
||||||
|
updated_at = datetime.now()
|
||||||
|
|
||||||
|
with get_connection() as conn:
|
||||||
|
# Build query dynamically based on non-None values
|
||||||
|
update_fields = []
|
||||||
|
params = []
|
||||||
|
|
||||||
|
if avatar_id is not None:
|
||||||
|
update_fields.append("avatar_id = ?")
|
||||||
|
params.append(avatar_id)
|
||||||
|
|
||||||
|
if email is not None:
|
||||||
|
update_fields.append("email = ?")
|
||||||
|
params.append(email)
|
||||||
|
|
||||||
|
if password is not None:
|
||||||
|
update_fields.append("password = ?")
|
||||||
|
params.append(password)
|
||||||
|
|
||||||
|
# Only proceed if there are fields to update
|
||||||
|
if update_fields:
|
||||||
|
query = f'UPDATE "User" SET {", ".join(update_fields)}, updated_at = ? WHERE id = ?'
|
||||||
|
params.append(updated_at)
|
||||||
|
params.append(user_id)
|
||||||
|
conn.execute(query, params)
|
||||||
|
|
||||||
|
logger.debug(
|
||||||
|
f"User updated successfully: {user_id}, avatar_id: {avatar_id}, email: {email}, password: {password}"
|
||||||
|
)
|
||||||
|
return Message(type="success", message="User updated successfully")
|
||||||
|
|||||||
|
After Width: | Height: | Size: 6.8 KiB |
|
After Width: | Height: | Size: 4.3 KiB |
|
After Width: | Height: | Size: 4.6 KiB |
|
After Width: | Height: | Size: 3.3 KiB |
|
After Width: | Height: | Size: 3.5 KiB |
|
After Width: | Height: | Size: 4.2 KiB |
|
After Width: | Height: | Size: 2.9 KiB |
|
After Width: | Height: | Size: 3.8 KiB |
|
After Width: | Height: | Size: 6.3 KiB |
|
After Width: | Height: | Size: 4.7 KiB |
|
After Width: | Height: | Size: 10 KiB |
|
After Width: | Height: | Size: 10 KiB |
|
After Width: | Height: | Size: 2.8 KiB |
|
After Width: | Height: | Size: 6.9 KiB |
|
After Width: | Height: | Size: 14 KiB |
|
After Width: | Height: | Size: 5.8 KiB |
|
After Width: | Height: | Size: 6.8 KiB |
|
After Width: | Height: | Size: 4.5 KiB |
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 3.3 KiB |
|
After Width: | Height: | Size: 2.1 KiB |
|
After Width: | Height: | Size: 5.7 KiB |
|
After Width: | Height: | Size: 1.4 KiB |
|
After Width: | Height: | Size: 3.1 KiB |
|
After Width: | Height: | Size: 5.3 KiB |
|
After Width: | Height: | Size: 2.6 KiB |
|
After Width: | Height: | Size: 2.5 KiB |
@@ -86,14 +86,14 @@ wheels = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "click"
|
name = "click"
|
||||||
version = "8.1.8"
|
version = "8.2.0"
|
||||||
source = { registry = "https://pypi.org/simple" }
|
source = { registry = "https://pypi.org/simple" }
|
||||||
dependencies = [
|
dependencies = [
|
||||||
{ name = "colorama", marker = "sys_platform == 'win32'" },
|
{ name = "colorama", marker = "sys_platform == 'win32'" },
|
||||||
]
|
]
|
||||||
sdist = { url = "https://files.pythonhosted.org/packages/b9/2e/0090cbf739cee7d23781ad4b89a9894a41538e4fcf4c31dcdd705b78eb8b/click-8.1.8.tar.gz", hash = "sha256:ed53c9d8990d83c2a27deae68e4ee337473f6330c040a31d4225c9574d16096a", size = 226593, upload-time = "2024-12-21T18:38:44.339Z" }
|
sdist = { url = "https://files.pythonhosted.org/packages/cd/0f/62ca20172d4f87d93cf89665fbaedcd560ac48b465bd1d92bfc7ea6b0a41/click-8.2.0.tar.gz", hash = "sha256:f5452aeddd9988eefa20f90f05ab66f17fce1ee2a36907fd30b05bbb5953814d", size = 235857, upload-time = "2025-05-10T22:21:03.111Z" }
|
||||||
wheels = [
|
wheels = [
|
||||||
{ url = "https://files.pythonhosted.org/packages/7e/d4/7ebdbd03970677812aac39c869717059dbb71a4cfc033ca6e5221787892c/click-8.1.8-py3-none-any.whl", hash = "sha256:63c132bbbed01578a06712a2d1f497bb62d9c1c0d329b7903a866228027263b2", size = 98188, upload-time = "2024-12-21T18:38:41.666Z" },
|
{ url = "https://files.pythonhosted.org/packages/a2/58/1f37bf81e3c689cc74ffa42102fa8915b59085f54a6e4a80bc6265c0f6bf/click-8.2.0-py3-none-any.whl", hash = "sha256:6b303f0b2aa85f1cb4e5303078fadcbcd4e476f114fab9b5007005711839325c", size = 102156, upload-time = "2025-05-10T22:21:01.352Z" },
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -131,7 +131,7 @@ wheels = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "eurovision-25-backend"
|
name = "eurovision-25-backend"
|
||||||
version = "0.1.0"
|
version = "1.0rc5"
|
||||||
source = { virtual = "." }
|
source = { virtual = "." }
|
||||||
dependencies = [
|
dependencies = [
|
||||||
{ name = "aiofiles" },
|
{ name = "aiofiles" },
|
||||||
|
|||||||