Revamped API handling

app.py

@@ -1,12 +1,13 @@
 import streamlit as st
-from dotenv import load_dotenv, set_key
 import os
+from dotenv import load_dotenv, set_key
 
 # Load environment variables from .env file
 load_dotenv()
 
 st.set_page_config(layout='wide', page_icon='✨')
 
+# Create pages
 scriptgen = st.Page("scriptgen.py", title="Script Generator", icon='📃')
 imggen = st.Page("imggen.py", title="Thumbnail Generator", icon='🖼️')
 tweaker = st.Page("tweaker.py", title="Creative Consultant", icon='🎬')
@@ -14,27 +15,30 @@ jsonbase = st.Page("secretary.py", title="Script Secretary", icon='📚')
 manual = st.Page("manual.py", title="Manual", icon="👓", default=True)
 docs = st.Page("docs.py", title="Documentation", icon='📑')
 
-# Check if OPENAI_API_KEY exists in the environment
-api_key = os.getenv('OPENAI_API_KEY', None)  # Fallback to None if not found
-
 # Sidebar for API Key input and options
 with st.sidebar:
     api_key_input = st.text_input('Enter your OpenAI API token:', type='password')
 
     if st.button("Save API Key"):
         if api_key_input.startswith("sk-"):  # Basic validation
+            # Save API key to session state
+            st.session_state["OPENAI_API_KEY"] = api_key_input
+            # Optionally, save it to .env file or any persistent storage
             env_file = ".env"
-            set_key(env_file, "OPENAI_API_KEY", api_key_input)  # Save to .env
+            set_key(env_file, "OPENAI_API_KEY", api_key_input)
             st.success("API Key saved successfully!")
         else:
             st.error("Invalid API Key format!")
 
-    # Check and display the status of the API key
-    if api_key:
-        st.success("API Key loaded from environment!")
-    else:
-        st.warning("No API Key found. Please enter one.")
+# Check if API Key is available
+api_key = st.session_state.get("OPENAI_API_KEY", None)
+
+if api_key:
+    st.success("API Key loaded from session!")
+else:
+    st.warning("No API Key found. Please enter one.")
 
+# Example navigation setup for your pages
 pg = st.navigation(
     {
         "Others": [manual, docs],

imggen.py

@@ -1,40 +1,35 @@
 import streamlit as st
 from openai import OpenAI
 import time
-from dotenv import load_dotenv
+from dotenv import load_dotenv, set_key
 import os
 import requests
 from io import BytesIO
 from PIL import Image
 import json
 
-# Load environment variables
-load_dotenv()
-
 # Initialize OpenAI client
 client = OpenAI()
 
+# Get the API key from session state (which is set in app.py)
+api_key = st.session_state.get("OPENAI_API_KEY", None)
+
+if not api_key:
+    st.error("API Key not provided! Please enter it in the main app.")
+else:
+    os.environ['OPENAI_API_KEY'] = api_key  # Set the API key for OpenAI
+
 # Load script history
 history_file = "script_history.json"
 
-
 def load_script_history():
     if os.path.exists(history_file):
         with open(history_file, "r") as file:
             return json.load(file)
     return []
 
-
 script_history = load_script_history()
 
-# Retrieve the API key
-api_key = os.getenv("OPENAI_API_KEY")
-
-if not api_key:
-    st.error("API Key not provided! Please add it to Streamlit secrets or the .env file.")
-else:
-    os.environ['OPENAI_API_KEY'] = api_key  # Set the API key for OpenAI
-
 # Initialize session state for image history
 if "image_history" not in st.session_state:
     st.session_state.image_history = []
@@ -71,7 +66,7 @@ with left_col:
     styles = st.multiselect(
         "Image artstyle",
         [
-            'Realism', 'Impressionism','Cubism', 'Surrealism', 'Baroque', 'Art Noveau', 'Cyberpunk',
+            'Realism', 'Impressionism', 'Cubism', 'Surrealism', 'Baroque', 'Art Noveau', 'Cyberpunk',
             'Synthwave', 'Anime', 'Pixel Art', 'Low Poly', 'Dark Fantasy', 'Space Opera',
             'Steampunk', 'Fantasy', 'Abstract', 'Glitch Art', 'Kawaii', 'Pop Art'
         ],

manual.py

@@ -5,7 +5,7 @@ st.write('''Powered with OpenAI, this toolkit helps you create scripts and thumb
          ''')
 
 st.subheader("1. Things you need before you begin")
-st.markdown("Please make sure you have your **OpenAI API Key** ready to be able to use this toolkit. If none provided, you may be prompted to enter the **API Key**. You may visit the OpenAI for you to retrieve your **API Key**." )
+st.markdown("Please make sure you have your **OpenAI API Key** ready to be able to use this toolkit. If none provided, you may be prompted to enter the **API Key**. You may visit the OpenAI for you to retrieve your **API Key**. After entering, click the **Save API Key** to begin")
 st.info("Please take note that using the API also requires additional payment")
 
 st.subheader('2. Script Generator')

scriptgen.py

@@ -1,27 +1,25 @@
 import streamlit as st
-from dotenv import load_dotenv
+from dotenv import load_dotenv, set_key
 from generate_script import generate_script
 import os
 import json
 
-# File to store script history
-history_file = "script_history.json"
-
-# Load environment variables from .env file
+# Load environment variables
 load_dotenv()
 
-st.title("Script Generator 📃")
-st.subheader("Create your script with just a single prompt!")
-
-# Retrieve API key from secrets or environment variables
-api_key = os.getenv("OPENAI_API_KEY")
-serper_api_key = os.getenv("SERPER_API_KEY")
+# Initialize the API key
+api_key = st.session_state.get("OPENAI_API_KEY", None)
+serper_api_key = st.secrets.get("SERPER_API_KEY")
 
+# Check if API keys are available
 if not api_key:
-    st.error("Please provide a valid API Key in Streamlit secrets or .env file.")
+    st.error("API Key not provided! Please enter it in the main app.")
 else:
     os.environ["OPENAI_API_KEY"] = api_key
 
+# File to store script history
+history_file = "script_history.json"
+
 # Function to load history from file
 def load_history():
     if os.path.exists(history_file):

tweaker.py

@@ -6,6 +6,14 @@ from langchain.chains import ConversationChain
 from langchain.memory import ConversationSummaryMemory
 from langchain.prompts import ChatPromptTemplate
 
+# Get the API key from session state (which was set in app.py)
+api_key = st.session_state.get("OPENAI_API_KEY", None)
+
+if not api_key:
+    st.error("API Key not provided! Please enter it in the main app.")
+else:
+    os.environ['OPENAI_API_KEY'] = api_key  # Set the API key for OpenAI
+
 st.title('Creative Consultant 🎬')
 st.subheader('Ask content creation tips or help tweak your premade script!')
 
@@ -25,34 +33,27 @@ if "messages" not in st.session_state:
     ]
 if "conversation" not in st.session_state:
     st.session_state["conversation"] = None
-if "OPENAI_API_KEY" not in st.session_state:
-    st.session_state["OPENAI_API_KEY"] = ""
 
 def clear_chat_history():
     st.session_state.messages = [{"role": "assistant", "content": "Chat history cleared. What would you like help with next?"}]
 
-
-
 # Load generated scripts from history
 script_history = load_script_history()
 
 # Sidebar for script selection
+selected_script = None
 if script_history:
     st.sidebar.header("Previously Generated Scripts")
-    
-    # Add "Other" option to the list of scripts
     script_titles = [f"Script {idx + 1}: {item['title']}" for idx, item in enumerate(script_history)]
     script_titles.append("Other")  # Add "Other" as an option
-    
-    # Let the user select a script or "Other"
     selected_script_idx = st.sidebar.selectbox(
         "Choose a script to tweak:",
         range(len(script_titles)),
         format_func=lambda x: script_titles[x]
     )
 
-    # If "Other" is chosen
-    if selected_script_idx == len(script_titles) - 1:  
+    if selected_script_idx == len(script_titles) - 1:  # Free Conversation selected
+        selected_script = None  # No specific script is selected
         st.sidebar.text_area(
             "Free Conversation or Custom Tweaking",
             placeholder="Write your thoughts or tweaks here...",
@@ -60,8 +61,7 @@ if script_history:
             key="free_conversation"
         )
     else:
-        # Display the selected script
-        selected_script = script_history[selected_script_idx]
+        selected_script = script_history[selected_script_idx]  # Fetch the selected script
         st.sidebar.text_area(
             "Script Content",
             value=selected_script["script"],
@@ -71,7 +71,6 @@ if script_history:
 else:
     st.sidebar.info("No scripts available. Please generate scripts using the Script Generator.")
 
-
 st.sidebar.button('Clear Chat History', on_click=clear_chat_history)
 
 # Prompt template for the Creative Consultant
@@ -96,7 +95,7 @@ def get_response(user_input):
         llm = ChatOpenAI(
             model='gpt-4o-mini',
             temperature=0.1,
-            max_tokens=512,
+            max_tokens=None,
             timeout=None,
             max_retries=2
         )
@@ -125,7 +124,7 @@ if user_input:
 
     try:
         # Use the selected script as context for the assistant's response
-        if script_history:
+        if selected_script:
             user_input_with_context = f"""
             The user selected the following script for feedback:
             Title: {selected_script['title']}
@@ -134,7 +133,11 @@ if user_input:
             User's query: {user_input}
             """
         else:
-            user_input_with_context = user_input
+            user_input_with_context = f"""
+            Free conversation mode. The user has not selected a script.
+            
+            User's query: {user_input}
+            """
 
         # Generate the assistant's response
         with st.spinner():