Update app.py

app.py

@@ -1,10 +1,14 @@
-from flask import Flask, render_template, request, redirect, url_for, session
+import streamlit as st
 from flask_sqlalchemy import SQLAlchemy
 from flask_bcrypt import Bcrypt
 from flask_mail import Mail, Message
 import openai
-import streamlit
+from flask import Flask
 
+# Streamlit Configuration
+st.set_page_config(page_title="Sociocracy App")
+
+# Flask Configuration for Database and Mail
 app = Flask(__name__)
 app.secret_key = 's3cr3t'
 app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///sociocracy.db'
@@ -14,7 +18,7 @@ bcrypt = Bcrypt(app)
 # Configuring Flask-Mail
 app.config['MAIL_SERVER'] = 'smtp.freesmtpservers.com'
 app.config['MAIL_PORT'] = 25
-app.config['MAIL_USERNAME'] = 'testmail@wdwtcom'
+app.config['MAIL_USERNAME'] = 'your_email@example.com'
 app.config['MAIL_PASSWORD'] = ''
 app.config['MAIL_USE_TLS'] = False
 app.config['MAIL_USE_SSL'] = False
@@ -40,100 +44,177 @@ class Solution(db.Model):
     content = db.Column(db.Text, nullable=False)
     issue_id = db.Column(db.Integer, db.ForeignKey('issue.id'), nullable=False)
     created_by = db.Column(db.Integer, db.ForeignKey('user.id'), nullable=False)
-    
+
 # Collaborator model
 class Collaborator(db.Model):
     id = db.Column(db.Integer, primary_key=True)
     issue_id = db.Column(db.Integer, db.ForeignKey('issue.id'), nullable=False)
-    user_id = db.Column(db.Integer, db.ForeignKey('user.id'), nullable=False)    
+    user_id = db.Column(db.Integer, db.ForeignKey('user.id'), nullable=False)
+
+# Streamlit Pages
+st.sidebar.title("Navigation")
+page = st.sidebar.radio("Go to", ["Register", "Login", "Dashboard", "Create Issue", "Invite Collaborators", "Submit Solution", "Decide"])
 
-@app.route('/register', methods=['GET', 'POST'])
+# Register Page
 def register():
-    if request.method == 'POST':
-        hashed_pw = bcrypt.generate_password_hash(request.form['password']).decode('utf-8')
-        new_user = User(username=request.form['username'], email=request.form['email'], password=hashed_pw)
-        db.session.add(new_user)
-        db.session.commit()
-        return redirect(url_for('login'))
-    return render_template('register.html')
+    st.title("Register")
+    username = st.text_input("Username")
+    email = st.text_input("Email")
+    password = st.text_input("Password", type="password")
+    if st.button("Register"):
+        if username and email and password:
+            hashed_pw = bcrypt.generate_password_hash(password).decode('utf-8')
+            new_user = User(username=username, email=email, password=hashed_pw)
+            db.session.add(new_user)
+            db.session.commit()
+            st.success("Registration successful! Please check your email for further instructions.")
+
+            # Send registration email
+            msg = Message('Welcome to Sociocracy App', sender='your_email@example.com', recipients=[email])
+            msg.body = "Thank you for registering. You can now log in and start collaborating."
+            mail.send(msg)
+        else:
+            st.error("Please fill all fields.")
 
-@app.route('/login', methods=['GET', 'POST'])
+# Login Page
 def login():
-    if request.method == 'POST':
-        user = User.query.filter_by(username=request.form['username']).first()
-        if user and bcrypt.check_password_hash(user.password, request.form['password']):
-            session['user_id'] = user.id
-            return redirect(url_for('dashboard'))
-    return render_template('login.html')
-
-@app.route('/dashboard')
+    st.title("Login")
+    username = st.text_input("Username")
+    password = st.text_input("Password", type="password")
+    if st.button("Login"):
+        user = User.query.filter_by(username=username).first()
+        if user and bcrypt.check_password_hash(user.password, password):
+            st.session_state['user_id'] = user.id
+            st.success("Login successful!")
+        else:
+            st.error("Invalid username or password.")
+
+# Dashboard Page
 def dashboard():
-    user_id = session['user_id']
-    issues = Issue.query.filter_by(created_by=user_id).all()
+    if 'user_id' not in st.session_state:
+        st.warning("You need to log in first.")
+        return
+
+    st.title("Dashboard")
+    user_id = st.session_state['user_id']
+    user_issues = Issue.query.filter_by(created_by=user_id).all()
     collaboration_issues = Issue.query.join(Collaborator).filter(Collaborator.user_id == user_id).all()
-    return render_template('dashboard.html', issues=issues, collaboration_issues=collaboration_issues)
 
-@app.route('/create_issue', methods=['GET', 'POST'])
+    st.header("Your Issues")
+    for issue in user_issues:
+        st.write(f"Title: {issue.title}")
+        if st.button(f"Submit Solution for {issue.title}"):
+            submit_solution(issue.id)
+        if st.button(f"Decide on {issue.title}"):
+            decide(issue.id)
+
+    st.header("Issues You Are Collaborating On")
+    for issue in collaboration_issues:
+        st.write(f"Title: {issue.title}")
+        if st.button(f"Submit Solution for {issue.title}"):
+            submit_solution(issue.id)
+        if st.button(f"Decide on {issue.title}"):
+            decide(issue.id)
+
+# Create Issue Page
 def create_issue():
-    if request.method == 'POST':
-        new_issue = Issue(title=request.form['title'], description=request.form['description'], created_by=session['user_id'])
+    if 'user_id' not in st.session_state:
+        st.warning("You need to log in first.")
+        return
+
+    st.title("Create Issue")
+    title = st.text_input("Issue Title")
+    description = st.text_area("Issue Description")
+    if st.button("Create Issue"):
+        new_issue = Issue(title=title, description=description, created_by=st.session_state['user_id'])
         db.session.add(new_issue)
         db.session.commit()
-        return redirect(url_for('invite_collaborators', issue_id=new_issue.id))
-    return render_template('create_issue.html')
+        st.success("Issue created successfully!")
+
+# Invite Collaborators Page
+def invite_collaborators():
+    if 'user_id' not in st.session_state:
+        st.warning("You need to log in first.")
+        return
 
-@app.route('/invite_collaborators/<int:issue_id>', methods=['GET', 'POST'])
-def invite_collaborators(issue_id):
-    if request.method == 'POST':
-        emails = request.form['emails'].split(',')
+    st.title("Invite Collaborators")
+    issue_id = st.number_input("Issue ID", min_value=1, step=1)
+    emails = st.text_input("Collaborator Emails (comma-separated)")
+    if st.button("Send Invites"):
         issue = Issue.query.get(issue_id)
-        for email in emails:
-            user = User.query.filter_by(email=email.strip()).first()
-            if user:
-                new_collaborator = Collaborator(issue_id=issue_id, user_id=user.id)
-                db.session.add(new_collaborator)
-            msg = Message('Collaboration Invite', sender='your_email@example.com', recipients=[email])
-            msg.body = f"You have been invited to collaborate on the issue: {issue.title}."
-            mail.send(msg)
-        db.session.commit()
-        return redirect(url_for('dashboard'))
-    return render_template('invite_collaborators.html', issue_id=issue_id)
+        if issue:
+            for email in emails.split(','):
+                email = email.strip()
+                user = User.query.filter_by(email=email).first()
+                if user:
+                    new_collaborator = Collaborator(issue_id=issue_id, user_id=user.id)
+                    db.session.add(new_collaborator)
+                msg = Message('Collaboration Invite', sender='your_email@example.com', recipients=[email])
+                msg.body = f"You have been invited to collaborate on the issue: {issue.title}."
+                mail.send(msg)
+            db.session.commit()
+            st.success("Invitations sent successfully!")
+        else:
+            st.error("Issue not found.")
 
-@app.route('/submit_solution/<int:issue_id>', methods=['GET', 'POST'])
+# Submit Solution Page
 def submit_solution(issue_id):
-    if request.method == 'POST':
-        new_solution = Solution(content=request.form['solution'], issue_id=issue_id, created_by=session['user_id'])
+    if 'user_id' not in st.session_state:
+        st.warning("You need to log in first.")
+        return
+
+    st.title(f"Submit Solution for Issue {issue_id}")
+    solution_content = st.text_area("Your Solution")
+    if st.button("Submit Solution"):
+        new_solution = Solution(content=solution_content, issue_id=issue_id, created_by=st.session_state['user_id'])
         db.session.add(new_solution)
         db.session.commit()
-        return redirect(url_for('dashboard'))
-    return render_template('submit_solution.html', issue_id=issue_id)
+        st.success("Solution submitted successfully!")
 
-@app.route('/decide/<int:issue_id>', methods=['GET', 'POST'])
+# Decide Page
 def decide(issue_id):
     issue = Issue.query.get(issue_id)
     solutions = Solution.query.filter_by(issue_id=issue_id).all()
-    if request.method == 'POST':
-        # AI Prompt to get the optimal decision suggestion
-        openai.api_key = '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'
-        prompt = f"Given the following solutions for the issue '{issue.title}', which one is the most socio-democratic decision? Do not mention socio-democratic in your response.\n"
+    if issue:
+        st.title(f"Decide on Issue: {issue.title}")
         for solution in solutions:
-            prompt += f"- {solution.content}\n"
-        prompt += "Please consider socio-democratic values and provide a summary on the best decision. Do not mention socio-democratic in your response."
-
-        # Use gpt-3.5-turbo
-        response = openai.ChatCompletion.create(
-            model="gpt-3.5-turbo",
-            messages=[
-                {"role": "system", "content": "You are an assistant helping to make socio-democratic decisions. Do not mention socio-democratic in your response"},
-                {"role": "user", "content": prompt}
-            ],
-            max_tokens=150
-        )
-        decision = response.choices[0].message['content'].strip()
-        return render_template('decision.html', decision=decision)
-    return render_template('decide.html', issue=issue, solutions=solutions)
-
-if __name__ == '__main__':
-    with app.app_context():
-        db.create_all()
-    app.run(port=8501, debug=False)
+            st.write(f"- {solution.content}")
+
+        if st.button("Get AI Decision"):
+            openai.api_key = 'st.secrets["OpenAI"]'
+            prompt = f"Given the following solutions for the issue '{issue.title}', which one is the most socio-democratic decision?\n"
+            for solution in solutions:
+                prompt += f"- {solution.content}\n"
+            prompt += "Please consider socio-democratic values and provide a summary on the best decision."
+
+            response = openai.ChatCompletion.create(
+                model="gpt-3.5-turbo",
+                messages=[
+                    {"role": "system", "content": "You are an assistant helping to make socio-democratic decisions."},
+                    {"role": "user", "content": prompt}
+                ],
+                max_tokens=150
+            )
+            decision = response.choices[0].message['content'].strip()
+            st.write(f"AI Decision: {decision}")
+
+# Main Flow
+if 'user_id' not in st.session_state:
+    st.session_state['user_id'] = None
+
+if page == "Register":
+    register()
+elif page == "Login":
+    login()
+elif page == "Dashboard":
+    dashboard()
+elif page == "Create Issue":
+    create_issue()
+elif page == "Invite Collaborators":
+    invite_collaborators()
+elif page == "Submit Solution":
+    issue_id = st.number_input("Issue ID", min_value=1, step=1)
+    submit_solution(issue_id)
+elif page == "Decide":
+    issue_id = st.number_input("Issue ID", min_value=1, step=1)
+    decide(issue_id)