Skip to content

Fix handling of empty OpenAI API key #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
quinneydavid wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix handling of empty OpenAI API key #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
118 changes: 86 additions & 32 deletions app/services/llm_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import json
import logging
import os
import re
from typing import List

Expand Down Expand Up @@ -49,17 +50,35 @@ def get_artist_recommendations(self, prompt: str, artists: List[Artist], model:
Do not add any explanations or other text - just the JSON object.
Select 10-15 artists that match the mood/theme, only from the provided list."""

response = completion(
model=model,
messages=[
{"role": "system", "content": system_prompt},
{
"role": "user",
"content": f"Context: {artist_context}\n\nCreate a playlist for: {prompt}",
},
],
temperature=0.7,
)
# Check if OpenAI API key has a value and use it, otherwise fall back to Anthropic
if ("gpt" in model or "openai" in model) and os.getenv("OPENAI_API_KEY"):
response = completion(
model=model,
messages=[
{"role": "system", "content": system_prompt},
{
"role": "user",
"content": f"Context: {artist_context}\n\nCreate a playlist for: {prompt}",
},
],
temperature=0.7,
)
else:
if "gpt" in model or "openai" in model:
logger.warning("OpenAI API key is empty or not set, falling back to Anthropic")
model = "claude-3-opus-20240229"

response = completion(
model=model,
messages=[
{"role": "system", "content": system_prompt},
{
"role": "user",
"content": f"Context: {artist_context}\n\nCreate a playlist for: {prompt}",
},
],
temperature=0.7,
)

content = clean_llm_response(response.choices[0].message.content)
logger.debug("Raw LLM response: %s", content)
Expand Down Expand Up @@ -111,19 +130,39 @@ def get_track_recommendations(
Select between {min_tracks} and {max_tracks} tracks total.
Do not add any explanations or additional text."""

response = completion(
model=model,
messages=[
{"role": "system", "content": system_prompt},
{
"role": "user",
"content": f"""Context: {albums_context}\n\n
Create a playlist with {min_tracks}-{max_tracks} tracks for: {prompt}
""",
},
],
temperature=0.7,
)
# Check if OpenAI API key has a value and use it, otherwise fall back to Anthropic
if ("gpt" in model or "openai" in model) and os.getenv("OPENAI_API_KEY"):
response = completion(
model=model,
messages=[
{"role": "system", "content": system_prompt},
{
"role": "user",
"content": f"""Context: {albums_context}\n\n
Create a playlist with {min_tracks}-{max_tracks} tracks for: {prompt}
""",
},
],
temperature=0.7,
)
else:
if "gpt" in model or "openai" in model:
logger.warning("OpenAI API key is empty or not set, falling back to Anthropic")
model = "claude-3-opus-20240229"

response = completion(
model=model,
messages=[
{"role": "system", "content": system_prompt},
{
"role": "user",
"content": f"""Context: {albums_context}\n\n
Create a playlist with {min_tracks}-{max_tracks} tracks for: {prompt}
""",
},
],
temperature=0.7,
)

content = clean_llm_response(response.choices[0].message.content)
result = json.loads(content)
Expand All @@ -147,14 +186,29 @@ def generate_playlist_name(self, prompt: str, model: str = "gpt-4") -> str:
Generate a SINGLE catchy and relevant playlist name based on the following prompt. Do not wrap in quotes.
"""

response = completion(
model=model,
messages=[
{"role": "system", "content": system_prompt},
{"role": "user", "content": prompt},
],
temperature=0.7,
)
# Check if OpenAI API key has a value and use it, otherwise fall back to Anthropic
if ("gpt" in model or "openai" in model) and os.getenv("OPENAI_API_KEY"):
response = completion(
model=model,
messages=[
{"role": "system", "content": system_prompt},
{"role": "user", "content": prompt},
],
temperature=0.7,
)
else:
if "gpt" in model or "openai" in model:
logger.warning("OpenAI API key is empty or not set, falling back to Anthropic")
model = "claude-3-opus-20240229"

response = completion(
model=model,
messages=[
{"role": "system", "content": system_prompt},
{"role": "user", "content": prompt},
],
temperature=0.7,
)

name = response.choices[0].message.content.strip()
logger.info("Generated playlist name: %s", name)
Expand Down