grimoireplot 0.0.1__tar.gz → 0.0.2__tar.gz

{grimoireplot-0.0.1 → grimoireplot-0.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: grimoireplot
-Version: 0.0.1
+Version: 0.0.2
 Summary: GrimoirePlot is a live dashboard of plotly-compatible plots of remote data
 Author: William Droz
 Author-email: William Droz <william.droz@idiap.ch>
@@ -24,10 +24,10 @@ Description-Content-Type: text/markdown
 
 ![demo](media/demo_grimoire.gif)
 
-## Installation
+## Adding to your current project
 
 ```bash
-uv pip install grimoireplot  # not yet on pypi, will setup ci/cd on github later on
+uv add grimoireplot
 ```
 
 Or install from source:

{grimoireplot-0.0.1 → grimoireplot-0.0.2}/README.md

@@ -4,10 +4,10 @@
 
 ![demo](media/demo_grimoire.gif)
 
-## Installation
+## Adding to your current project
 
 ```bash
-uv pip install grimoireplot  # not yet on pypi, will setup ci/cd on github later on
+uv add grimoireplot
 ```
 
 Or install from source:

{grimoireplot-0.0.1 → grimoireplot-0.0.2}/grimoireplot/models.py

@@ -7,6 +7,7 @@ from typing import Optional
 from datetime import datetime
 from sqlmodel import Field, Relationship, SQLModel, create_engine, Session
 from sqlalchemy import ForeignKeyConstraint
+from sqlalchemy.exc import IntegrityError
 from dotenv import load_dotenv
 
 load_dotenv()
@@ -118,36 +119,56 @@ def add_plot(
         # Get or create Grimoire
         grimoire = session.get(Grimoire, grimoire_name)
         if grimoire is None:
-            grimoire = Grimoire(name=grimoire_name)
-            session.add(grimoire)
-            session.commit()
-            session.refresh(grimoire)
+            try:
+                grimoire = Grimoire(name=grimoire_name)
+                session.add(grimoire)
+                session.commit()
+                session.refresh(grimoire)
+            except IntegrityError:
+                session.rollback()
+                grimoire = session.get(Grimoire, grimoire_name)
 
         # Get or create Chapter
         chapter = session.get(Chapter, (chapter_name, grimoire_name))
         if chapter is None:
-            chapter = Chapter(name=chapter_name, grimoire_name=grimoire_name)
-            session.add(chapter)
-            session.commit()
-            session.refresh(chapter)
+            try:
+                chapter = Chapter(name=chapter_name, grimoire_name=grimoire_name)
+                session.add(chapter)
+                session.commit()
+                session.refresh(chapter)
+            except IntegrityError:
+                session.rollback()
+                chapter = session.get(Chapter, (chapter_name, grimoire_name))
 
         # Get or create/replace Plot
         plot = session.get(Plot, (plot_name, chapter_name, grimoire_name))
         if plot is None:
-            plot = Plot(
-                name=plot_name,
-                chapter_name=chapter_name,
-                grimoire_name=grimoire_name,
-                json_data=json_data,
-            )
-            session.add(plot)
+            try:
+                plot = Plot(
+                    name=plot_name,
+                    chapter_name=chapter_name,
+                    grimoire_name=grimoire_name,
+                    json_data=json_data,
+                )
+                session.add(plot)
+                session.commit()
+                session.refresh(plot)
+            except IntegrityError:
+                session.rollback()
+                plot = session.get(Plot, (plot_name, chapter_name, grimoire_name))
+                if plot is not None:
+                    plot.json_data = json_data
+                    session.add(plot)
+                    session.commit()
+                    session.refresh(plot)
         else:
             plot.json_data = json_data
             session.add(plot)
+            session.commit()
+            session.refresh(plot)
 
-        session.commit()
-        session.refresh(plot)
-
+        if plot is None:
+            raise RuntimeError("Failed to create or retrieve plot")
         return plot
 
 

{grimoireplot-0.0.1 → grimoireplot-0.0.2}/grimoireplot/server.py

@@ -2,6 +2,10 @@
 # SPDX-FileContributor: William Droz <william.droz@idiap.ch>
 # SPDX-License-Identifier: MIT
 
+import time
+import logging
+from functools import wraps
+
 from fastapi import HTTPException, Request
 from nicegui import app, ui
 from grimoireplot.common import get_grimoire_secret
@@ -19,6 +23,44 @@ from grimoireplot.ui_elements import setup_theme
 
 _GRIMOIRE_SECRET = get_grimoire_secret()
 
+logger = logging.getLogger("grimoireplot")
+
+
+def retry_on_db_error(max_retries: int = 5, base_delay: float = 0.1):
+    """Decorator that retries a function on database errors up to max_retries times."""
+
+    def decorator(func):
+        @wraps(func)
+        def wrapper(*args, **kwargs):
+            for attempt in range(1, max_retries + 1):
+                try:
+                    return func(*args, **kwargs)
+                except HTTPException:
+                    raise
+                except Exception as e:
+                    if attempt < max_retries:
+                        delay = base_delay * (2 ** (attempt - 1))
+                        logger.warning(
+                            "Database error on attempt %d/%d: %s. Retrying in %.2fs...",
+                            attempt,
+                            max_retries,
+                            str(e),
+                            delay,
+                        )
+                        time.sleep(delay)
+                    else:
+                        logger.error(
+                            "Database error on attempt %d/%d: %s. No more retries.",
+                            attempt,
+                            max_retries,
+                            str(e),
+                        )
+                        raise
+
+        return wrapper
+
+    return decorator
+
 
 def verify_secret(request: Request):
     if (secret := request.headers.get("grimoire-secret")) is None:
@@ -31,6 +73,7 @@ def my_app(host: str = "localhost", port: int = 8080):
     create_db_and_tables()
 
     @app.post("/add_plot")
+    @retry_on_db_error(max_retries=5)
     def add_plot_endpoint(add_plot_request: AddPlotRequest, request: Request):
         verify_secret(request)
         plot = add_plot(

{grimoireplot-0.0.1 → grimoireplot-0.0.2}/pyproject.toml

@@ -8,7 +8,7 @@ build-backend = "uv_build"
 
 [project]
 name = "grimoireplot"
-version = "0.0.1"
+version = "0.0.2"
 description = "GrimoirePlot is a live dashboard of plotly-compatible plots of remote data"
 readme = "README.md"
 requires-python = ">=3.11"