diff --git a/datasette_enrichments/__init__.py b/datasette_enrichments/__init__.py index 37ec479..c8ad53b 100644 --- a/datasette_enrichments/__init__.py +++ b/datasette_enrichments/__init__.py @@ -383,3 +383,134 @@ def actor_from_request(datasette, request): secret_token, datasette._secret_enrichments_token ): return {"_datasette_enrichments": True} + + +PROGRESS_JS = """ +const endpoint = 'ENDPOINT'; +const pollInterval = 2000; + +let lastPolledTime = Date.now(); +let lastDone = 0; +let intervalId; + +// Function to create and insert progress bar elements +function setupProgressBar() { + // Create elements + const progressBarWrapper = document.createElement('div'); + const progressBar = document.createElement('div'); + const etaText = document.createElement('p'); + const etaSpan = document.createElement('span'); + + // Set attributes and styles + progressBarWrapper.id = 'progressBarWrapper'; + progressBar.id = 'progressBar'; + progressBar.style.width = '0%'; + progressBar.style.height = '20px'; + progressBar.style.backgroundColor = 'green'; + etaSpan.id = 'eta'; + etaText.innerText = 'ETA: '; + etaText.appendChild(etaSpan); + + // Append elements + progressBarWrapper.appendChild(progressBar); + progressBarWrapper.appendChild(etaText); + + // Insert elements into the DOM + const table = document.querySelector('table.rows-and-columns'); + if (table) { + table.parentNode.insertBefore(progressBarWrapper, table); + } else { + console.error('Table not found.'); + } +} + +function updateProgress() { + fetch(endpoint) + .then(response => response.json()) + .then(data => { + const row = data.rows[0] + const todo = row.row_count; + const done = row.done_count; + const total = todo + done; + const progressPercent = (done / total) * 100; + + // Update progress bar + document.getElementById('progressBar').style.width = `${progressPercent}%`; + + // Check if there are remaining tasks + const tasksRemaining = total - done; + if (tasksRemaining <= 0) { + // Stop polling when no tasks remain and update ETA to "Completed" + clearInterval(intervalId); + document.getElementById('eta').innerText = 'Completed'; + return; + } + + // Calculate ETA + const currentTime = Date.now(); + const timeElapsed = currentTime - lastPolledTime; + const tasksCompleted = done - lastDone; + + if (tasksCompleted > 0) { + const rate = tasksCompleted / timeElapsed; // tasks per millisecond + const timeRemaining = tasksRemaining / rate; + const eta = new Date(currentTime + timeRemaining); + + // Update ETA display + document.getElementById('eta').innerText = eta.toLocaleTimeString(); + } + + lastPolledTime = currentTime; + lastDone = done; + }) + .catch(error => console.error('Error fetching data:', error)); +} + +// Setup progress bar and initiate polling +setupProgressBar(); +updateProgress(); +intervalId = setInterval(updateProgress, pollInterval); +""".strip() + + +@hookimpl +def extra_body_script(request, view_name, table, database, datasette): + if view_name != "table": + return + job_id = request.args.get("_enrichment_job_id") + if not job_id: + return + + async def inner(): + # Are there any incomplete jobs for this table? + db = datasette.get_database(database) + try: + jobs = await db.execute( + """ + select id, status, done_count, row_count + from _enrichment_jobs + where table_name = ? + """, + (table,), + ) + row = jobs.first() + if not row: + return + except Exception: + return + if row["done_count"] < row["row_count"]: + return PROGRESS_JS.replace( + "ENDPOINT", + datasette.urls.path( + datasette.urls.table(database, "_enrichment_jobs") + + "?" + + urllib.parse.urlencode( + { + "database_name": database, + "table_name": table, + } + ) + ), + ) + + return inner diff --git a/datasette_enrichments/templates/enrichment_picker.html b/datasette_enrichments/templates/enrichment_picker.html index 9854739..5c29c91 100644 --- a/datasette_enrichments/templates/enrichment_picker.html +++ b/datasette_enrichments/templates/enrichment_picker.html @@ -39,4 +39,32 @@

Select an enrichment

{% endif %} +{% if previous_runs %} +

Previous runs against this table

+ +{% endif %} + {% endblock %} diff --git a/datasette_enrichments/views.py b/datasette_enrichments/views.py index a435d67..3d9cee7 100644 --- a/datasette_enrichments/views.py +++ b/datasette_enrichments/views.py @@ -133,6 +133,16 @@ async def enrichment_picker(datasette, request): } ) + previous_runs = [] + sql = """ + select * from _enrichment_jobs + where database_name = :database and table_name = :table + order by started_at desc + """ + db = datasette.get_database(database) + for job in (await db.execute(sql, {"database": database, "table": table})).rows: + previous_runs.append(dict(job)) + return Response.html( await datasette.render_template( "enrichment_picker.html", @@ -141,6 +151,7 @@ async def enrichment_picker(datasette, request): "table": table, "filtered_data": filtered_data, "enrichments_and_paths": enrichments_and_paths, + "previous_runs": previous_runs, }, request, )