Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 16 additions & 6 deletions backend/score.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,11 @@ class MessageData(BaseModel):
filter_properties: Optional[Dict[str, Any]] = None
requireGrounding: bool = True
document_names: Optional[List[str]] = []
uri: Optional[str] = None
userName: Optional[str] = None
password: Optional[str] = None
database: Optional[str] = None
model: Optional[str] = None
# tools: List[str]

logger = CustomLogger()
Expand Down Expand Up @@ -474,9 +479,17 @@ async def magic_trek_chat_bot(
messages = messageData.messages
question = messageData.question
filter_properties = messageData.filter_properties
model = messageData.model if hasattr(messageData, 'model') else "openai_gpt_4o_mini"
requireGrounding = messageData.requireGrounding if hasattr(messageData, 'requireGrounding') else True
document_names = messageData.document_names if hasattr(messageData, 'document_names') else []
document_names = json.dumps(document_names)

# Get connection parameters from API params, fallback to environment variables
uri = messageData.uri if messageData.uri else os.getenv('MAGIC_TREK_NEO4J_URI')
userName = messageData.userName if messageData.userName else os.getenv('MAGIC_TREK_NEO4J_USERNAME')
password = messageData.password if messageData.password else os.getenv('MAGIC_TREK_NEO4J_PASSWORD')
database = messageData.database if messageData.database else os.getenv('MAGIC_TREK_NEO4J_DATABASE')

print(f'question = {question}')
print(messages)
print(len(messages))
Expand All @@ -485,17 +498,13 @@ async def magic_trek_chat_bot(
logging.info(f"requireGrounding = {requireGrounding}")
logging.info(f"IAN-TEST called at {datetime.now()}")
qa_rag_start_time = time.time()
logging.info(f"model = {model}")

# model = "openai_gpt_3.5" # changed from this model by ian friday mar 21, 2025
model = "openai_gpt_4o_mini"
# model = "openai_gpt_4o_mini"
# model = "gpt-4-turbo-preview"
mode = os.getenv('MAGIC_TREK_RAG_MODE') ## changed by ian from graph_vector_fulltext to graph_vector april 1, 2025
uri = os.getenv('MAGIC_TREK_NEO4J_URI')
# uri = "neo4j+s://bf80b146.databases.neo4j.io"
userName = os.getenv('MAGIC_TREK_NEO4J_USERNAME')
password = os.getenv('MAGIC_TREK_NEO4J_PASSWORD')
# password = "xE8XDsy7ZRMasKSj4sVN6lgbV9kGbI_MX5WSZ7quvxM"
database = os.getenv('MAGIC_TREK_NEO4J_DATABASE')

print(f"MAGIC_TREK_NEO4J_URI: {uri}")
print(f"MAGIC_TREK_RAG_MODE: {mode}")
Expand Down Expand Up @@ -605,6 +614,7 @@ async def chat_bot_grounding(
logging.info(f"QA_RAG (grounding) called at {datetime.now()}")
logging.info(f"document_names = {document_names}")
logging.info(f"filterProperties = {filterProperties}")
logging.info(f"model = {model}")
qa_rag_start_time = time.time()

# Parse filterProperties JSON if provided
Expand Down
7 changes: 5 additions & 2 deletions backend/src/llm.py
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ def get_llm(model: str, add_tools=False):
)
elif "openai" in model:
model_name, api_key = env_value.split(",")
if "o3-mini" in model:
if "o3-mini" in model or "gpt-5" in model_name:
llm= ChatOpenAI(
api_key=api_key,
model=model_name)
Expand Down Expand Up @@ -678,9 +678,12 @@ def create_chat_completion_sync(
completion_params = {
"model": model_name,
"messages": messages,
"temperature": temperature,
# "temperature": temperature, # commented out so only add if not gpt-5
}

if not "gpt-5" in model_name:
completion_params["temperature"] = temperature

# Add tools if requested
if add_tools:
logging.info("Adding tool_choice = auto")
Expand Down
1 change: 1 addition & 0 deletions terraform/modules/alb/alb.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ resource "aws_lb" "main" {
load_balancer_type = "application"
security_groups = [aws_security_group.alb.id]
subnets = var.subnet_ids
idle_timeout = 360 # 6 minutes

enable_deletion_protection = false

Expand Down