herel/myice
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add webapi, lower python version requirement and add a Dockerfile

Browse Source
This commit is contained in:
Rene Luria
2025-03-12 10:52:11 +01:00
parent 75074991af
commit 4c5867c19f
7 changed files with 1194 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.pre-commit-config.yaml
View File

@@ -29,7 +29,7 @@ repos:
- id: mypy - id: mypy
exclude: ^(docs/|example-plugin/) exclude: ^(docs/|example-plugin/)
args: [--ignore-missing-imports] args: [--ignore-missing-imports]
additional_dependencies: [types-requests] additional_dependencies: [types-requests, PyPDF2]
- repo: https://github.com/adrienverge/yamllint.git - repo: https://github.com/adrienverge/yamllint.git
rev: v1.35.1 rev: v1.35.1
hooks: hooks:

20
Dockerfile Normal file
View File

@@ -0,0 +1,20 @@
FROM python:3.11
RUN install -o www-data -g www-data -d -m 0755 /var/www
USER www-data
RUN curl -sSL https://install.python-poetry.org | python3 -
ENV PATH=/var/www/.local/bin:/usr/local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
COPY README.md pyproject.toml poetry.lock docker-entrypoint.sh index.html /var/www/
COPY myice /var/www/myice
WORKDIR /var/www
RUN poetry install && . $(poetry env info -p)
EXPOSE 8000
ENTRYPOINT [ "/var/www/docker-entrypoint.sh" ]

3
docker-entrypoint.sh Executable file
View File

@@ -0,0 +1,3 @@
#!/bin/sh
exec /var/www/.local/bin/poetry run fastapi run myice/webapi.py

178
index.html Normal file
View File

@@ -0,0 +1,178 @@
<!DOCTYPE html>
<html lang="fr">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Événements - Jeux</title>
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
</head>
<body>
<div class="container mt-4">
<h1 class="mb-4">Événements - Jeux</h1>
<div id="apikeyContainer" class="mb-3"></div>
<div id="eventFilters" style="display: none;">
<div class="mb-3">
<label for="agegroup" class="form-label">Filtrer par groupe d'âge</label>
<select id="agegroup" class="form-select">
<option value="">Tous</option>
</select>
</div>
<button id="fetchEvents" class="btn btn-primary mb-3">Charger les événements</button>
</div>
<div id="eventList" class="row"></div>
<!-- Modal pour afficher les détails d'un événement -->
<div class="modal fade" id="eventDetailsModal" tabindex="-1" aria-labelledby="eventDetailsLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="eventDetailsLabel">Détails de l'événement</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body" id="eventDetailsContent">Chargement...</div>
</div>
</div>
</div>
</div>
<script>
document.addEventListener("DOMContentLoaded", function() {
const apikeyContainer = document.getElementById("apikeyContainer");
const eventFilters = document.getElementById("eventFilters");
const agegroupSelect = document.getElementById("agegroup");
const eventList = document.getElementById("eventList");
const fetchButton = document.getElementById("fetchEvents");
const eventDetailsContent = document.getElementById("eventDetailsContent");
const apiBaseUrl = window.location.origin;
let storedApiKey = localStorage.getItem("apikey");
let lastFetchedEvents = [];
function renderApiKeyInput() {
if (storedApiKey) {
apikeyContainer.innerHTML = `<button id="disconnect" class="btn btn-danger">Déconnecter</button>`;
document.getElementById("disconnect").addEventListener("click", () => {
localStorage.removeItem("apikey");
location.reload();
});
eventFilters.style.display = "block";
} else {
apikeyContainer.innerHTML = `
<label for="apikey" class="form-label">API Key</label>
<input type="text" id="apikey" class="form-control" placeholder="Entrez votre API Key">
<button id="validateApiKey" class="btn btn-success mt-2">Valider</button>
`;
eventFilters.style.display = "none";
document.getElementById("validateApiKey").addEventListener("click", saveApiKey);
document.getElementById("apikey").addEventListener("keypress", function(event) {
if (event.key === "Enter") {
saveApiKey();
}
});
}
}
function saveApiKey() {
const key = document.getElementById("apikey").value;
if (key) {
localStorage.setItem("apikey", key);
location.reload();
} else {
alert("Veuillez entrer une clé API valide.");
}
}
renderApiKeyInput();
fetchButton.addEventListener("click", () => {
if (!storedApiKey) {
alert("Veuillez entrer une clé API");
return;
}
fetchEvents(storedApiKey);
});
agegroupSelect.addEventListener("change", () => {
displayEvents(lastFetchedEvents);
});
function fetchEvents(apiKey) {
fetch(`${apiBaseUrl}/schedule`, {
headers: { "Authorization": `Bearer ${apiKey}` }
})
.then(response => response.json())
.then(data => {
lastFetchedEvents = data.filter(event => event.event === "Jeu");
updateAgeGroupOptions(lastFetchedEvents);
displayEvents(lastFetchedEvents);
})
.catch(error => console.error("Erreur lors du chargement des événements:", error));
}
function updateAgeGroupOptions(events) {
let agegroups = new Set(events.map(event => event.agegroup));
agegroupSelect.innerHTML = '<option value="">Tous</option>';
agegroups.forEach(group => {
const option = document.createElement("option");
option.value = group;
option.textContent = group;
agegroupSelect.appendChild(option);
});
}
function displayEvents(events) {
eventList.innerHTML = "";
let selectedAgegroup = agegroupSelect.value;
let filteredEvents = events.filter(event => event.event === "Jeu" && (selectedAgegroup === "" || event.agegroup === selectedAgegroup));
if (filteredEvents.length === 0) {
eventList.innerHTML = "<p class='text-muted'>Aucun événement 'Jeu' trouvé.</p>";
return;
}
filteredEvents.forEach(event => {
const eventCard = document.createElement("div");
eventCard.className = "col-md-4 mb-3";
eventCard.innerHTML = `
<div class="card" style="border-left: 5px solid ${event.color}" data-id="${event.id_event}">
<div class="card-body">
<h5 class="card-title">${event.title}</h5>
<p class="card-text"><strong>Lieu:</strong> ${event.place}</p>
<p class="card-text"><strong>Heure:</strong> ${new Date(event.start).toLocaleTimeString()} - ${new Date(event.end).toLocaleTimeString()}</p>
</div>
</div>
`;
eventCard.addEventListener("click", () => fetchEventDetails(event.id_event));
eventList.appendChild(eventCard);
});
}
function fetchEventDetails(eventId) {
fetch(`${apiBaseUrl}/game/${eventId}`, {
headers: { "Authorization": `Bearer ${storedApiKey}` }
})
.then(response => response.json())
.then(data => {
eventDetailsContent.innerHTML = `
<h5>${data.title}</h5>
<p><strong>Type:</strong> ${data.type}</p>
<p><strong>Lieu:</strong> ${data.place}</p>
<p><strong>Heure:</strong> ${data.time_start} - ${data.time_end}</p>
<h6>Joueurs convoqués:</h6>
<ul>${data.convocation.available.map(player => {
let number = player.number ? player.number : "N/A";
return `<li>${number} - ${player.fname} ${player.lname} (${player.position}, ${player.dob})</li>`;
}).join('')}</ul>
`;
new bootstrap.Modal(document.getElementById('eventDetailsModal')).show();
})
.catch(error => console.error("Erreur lors du chargement des détails de l'événement:", error));
}
});
</script>
</body>
</html>

84
myice/webapi.py Normal file
View File

@@ -0,0 +1,84 @@
import json
import requests
from typing import Annotated
from fastapi import FastAPI, Header, HTTPException
from fastapi.middleware.cors import CORSMiddleware
from fastapi.responses import HTMLResponse
from pydantic import BaseModel
from . import myice
origins = ["*"]
app = FastAPI()
app.add_middleware(
CORSMiddleware,
allow_origins=origins,
allow_credentials=True,
allow_methods=["*"],
allow_headers=["*"],
)
class AuthHeaders(BaseModel):
Authorization: str
def token(self) -> str:
return self.Authorization.split(" ")[1]
def authorized(self) -> bool:
if self.token() == "abc":
return True
return False
@app.get("/", response_class=HTMLResponse)
async def home():
with open("index.html") as f:
return f.read()
@app.get("/schedule")
async def schedule(
headers: Annotated[AuthHeaders, Header()],
num_days: int = 7,
):
if not headers.authorized():
raise HTTPException(401, detail="get out")
return json.loads(myice.get_schedule(num_days))
@app.get("/game/{game_id}")
async def game(
headers: Annotated[AuthHeaders, Header()],
game_id: int,
):
username, password, userid, existing_token = myice.get_login()
if existing_token:
myice.userdata = {
"id": userid,
"id_club": 186,
"token": existing_token,
}
else:
myice.userdata = myice.mobile_login()
# data = refresh_data()
with requests.post(
"https://app.myice.hockey/api/mobilerest/getevent",
headers=myice.mobile_headers,
data="&".join(
[
f"token={myice.userdata['token']}",
f"id_event={game_id}",
"type=games",
f"id_player={myice.userdata['id']}",
f"id_club={myice.userdata['id_club']}",
"language=FR",
]
),
# verify=False,
) as r:
data = r.json()["eventData"]
return data

909
poetry.lock generated
View File

File diff suppressed because it is too large Load Diff

4
pyproject.toml
View File

@@ -7,13 +7,14 @@ authors = [
] ]
license = "MIT" license = "MIT"
readme = "README.md" readme = "README.md"
requires-python = ">=3.12" requires-python = ">=3.11"
dependencies = [ dependencies = [
"requests (>=2.32.3,<2.33.0)", "requests (>=2.32.3,<2.33.0)",
"typer (>=0.15.1,<0.16.0)", "typer (>=0.15.1,<0.16.0)",
"pypdf2 (>=3.0.1)", "pypdf2 (>=3.0.1)",
"rl-ai-tools >=1.9.0", "rl-ai-tools >=1.9.0",
"fastapi[standard] (>=0.115.11,<0.116.0)",
] ]
[tool.poetry.dependencies] [tool.poetry.dependencies]
@@ -22,6 +23,7 @@ rl-ai-tools = { source = "infomaniak" }
[tool.poetry.group.dev.dependencies] [tool.poetry.group.dev.dependencies]
ipykernel = "^6.29.5" ipykernel = "^6.29.5"
types-requests = "^2.32.0.20241016" types-requests = "^2.32.0.20241016"
mypy = "^1.15.0"
[[tool.poetry.source]] [[tool.poetry.source]]