diff --git a/app.py b/app.py index 581bb65..3e139c2 100644 --- a/app.py +++ b/app.py @@ -153,7 +153,7 @@ def generate(): ai_output = response.choices[0].message.content except Exception as e: - flash(f"AI Service Error: {str(e)}", "error") + flash(f"Could not connect to model. Please try generating again.\n{str(e)}", "error") return redirect(url_for("dashboard")) # begynder parsing af AI svaret. Svaret skal leve op til formatkravet for at det kan indlæses pænt @@ -172,7 +172,7 @@ def generate(): reci = extract_section(ai_output, "[[RECIPES_START]]", "[[RECIPES_END]]") if not all([desc, summ, shop, reci]): - flash("The plan could not be generated. Please try generating again.", "error") + flash("The plan had major parsing errors. Please try generating again.", "error") return redirect(url_for("dashboard")) # hvis AI svaret levede op til format kravet, gemmes det i db try: @@ -220,6 +220,9 @@ def register(): new_user = User(username=username, password=generate_password_hash(password)) db.session.add(new_user) db.session.commit() + login_user(new_user) + + flash('Account created! Welcome to Madplaner.', 'success') return redirect(url_for("dashboard")) return render_template("register.html") diff --git a/compose.yml b/compose.yml index 63f6745..1834375 100644 --- a/compose.yml +++ b/compose.yml @@ -1,5 +1,5 @@ services: - madplanerRasmusBendtsen: + madplaner: image: git.rasmusbendtsen.dk/rasmus/madplaner:latest container_name: madplaner restart: always @@ -11,6 +11,6 @@ services: environment: - FLASK_ENV=production - OPENROUTER_API_KEY=${OPENROUTER_API_KEY} - - OPENROUTER_MODEL= ${OPENROUTER_MODEL} + - OPENROUTER_MODEL=${OPENROUTER_MODEL} - SECRET_KEY=${SECRET_KEY} - SOURCECODE_LINK=${SOURCECODE_LINK} diff --git a/readme.md b/readme.md index 39cfb5d..5ec5694 100644 --- a/readme.md +++ b/readme.md @@ -39,12 +39,12 @@ services: ports: - "${HOST_PORT:-80}:5000" volumes: - # sqlite DB lives here + # sqlite DB bor her - ./instance:/app/instance environment: - FLASK_ENV=production - OPENROUTER_API_KEY=${OPENROUTER_API_KEY} - - OPENROUTER_MODEL= ${OPENROUTER_MODEL} + - OPENROUTER_MODEL=${OPENROUTER_MODEL} - SECRET_KEY=${SECRET_KEY} # Udfyldes kun hvis der skal vises link til klidekode på forsiden - SOURCECODE_LINK=${SOURCECODE_LINK} diff --git a/templates/dashboard.html b/templates/dashboard.html index 0c21630..260e040 100644 --- a/templates/dashboard.html +++ b/templates/dashboard.html @@ -104,7 +104,7 @@