Update app.py

app.py

@@ -96,14 +96,69 @@ def write_next_step(wound_type: str):
 # -----------------------
 DEFAULT_MODEL = os.environ.get("OPENAI_MODEL", "gpt-4o-mini")
 
-# Prefer secure sources for API key:
-# 1) Environment variable OPENAI_API_KEY
-# 2) Streamlit secrets (if deployed to Streamlit sharing / Hugging Face etc)
-# 3) Temporary UI key stored in session_state (not persisted to disk)
-
+# Initialize session state for temporary UI key
 if "ui_api_key" not in st.session_state:
     st.session_state.ui_api_key = None
 
+def get_effective_api_key():
+    # Prefer env var
+    env_key = os.environ.get("OPENAI_API_KEY")
+    if env_key:
+        return env_key
+    
+    # Try Streamlit secrets (handle nested or flat)
+    secret_key = None
+    if hasattr(st, "secrets"):
+        try:
+            # Nested under [openai]
+            secret_key = st.secrets["openai"]["OPENAI_API_KEY"]
+        except KeyError:
+            # Flat key
+            secret_key = st.secrets.get("OPENAI_API_KEY")
+    
+    # Fallback to UI temp key
+    return secret_key or st.session_state.ui_api_key
+
+def get_effective_model():
+    # Prefer env var
+    env_model = os.environ.get("OPENAI_MODEL")
+    if env_model:
+        return env_model
+    
+    # Try Streamlit secrets (handle nested or flat)
+    secret_model = None
+    if hasattr(st, "secrets"):
+        try:
+            # Nested under [openai]
+            secret_model = st.secrets["openai"]["OPENAI_MODEL"]
+        except KeyError:
+            # Flat key
+            secret_model = st.secrets.get("OPENAI_MODEL")
+    
+    # Fallback to default
+    return secret_model or DEFAULT_MODEL
+
+def make_openai_client(api_key):
+    if not api_key:
+        return None, "OpenAI API key not set. Provide OPENAI_API_KEY env var, set in secrets, or paste a temporary key in the UI (not recommended for production)."
+    
+    try:
+        # Prefer modern OpenAI client
+        from openai import OpenAI
+        client = OpenAI(api_key=api_key)
+        return client, None
+    except ImportError:
+        try:
+            # Fallback to legacy openai
+            import openai
+            openai.api_key = api_key
+            # Return the module as 'client' (downstream code must adapt calls)
+            return openai, None
+        except ImportError:
+            return None, "openai package not installed. Add 'openai' to requirements.txt and rebuild/deploy."
+    except Exception as e:
+        return None, f"Failed to create OpenAI client: {str(e)}"
+
 
 def get_effective_api_key():
     env_key = os.environ.get("OPENAI_API_KEY")