Resolve merge conflicts

Author: sahilds1

server/api/views/conversations/views.py

@@ -146,21 +146,12 @@ def update_title(self, request, pk=None):
         )
 
     def get_chatgpt_response(self, conversation, user_message, page_context=None):
-<<<<<<< HEAD
         messages = [
             {
                 "role": "system",
                 "content": PromptTemplates.get_conversation_system_prompt(),
             }
         ]
-=======
-        client = OpenAI(api_key=os.environ["OPENAI_API_KEY"])
-        messages = [{
-            "role": "system",
-            "content": "You are a knowledgeable assistant. Balancer is a powerful tool for selecting bipolar medication for patients. We are open-source and available for free use. Your primary role is to assist licensed clinical professionals with information related to Balancer and bipolar medication selection. If applicable, use the supplied tools to assist the professional."
-        }]
->>>>>>> listOfMed
-
         if page_context:
             context_message = PromptTemplates.get_conversation_page_context_prompt(
                 page_context
@@ -181,7 +172,6 @@ def get_chatgpt_response(self, conversation, user_message, page_context=None):
             )
 
             response_message = response.choices[0].message
-<<<<<<< HEAD
             tool_calls = response_message.get("tool_calls", [])
 
             if not tool_calls:
@@ -204,35 +194,10 @@ def get_chatgpt_response(self, conversation, user_message, page_context=None):
                 tool_arguments = json.loads(
                     tool_call["function"].get("arguments", "{}")
                 )
-=======
-            tool_calls = getattr(response_message, "tool_calls", [])
-
-            tool_calls = response_message.model_dump().get("tool_calls", [])
-
-            if not tool_calls:
-                return response_message['content']
-
-            # Handle tool calls
-            # Add the assistant's message with tool calls to the conversation
-            messages.append({
-                "role": "assistant",
-                "content": response_message.content or "",
-                "tool_calls": tool_calls
-            })
-
-            # Process each tool call
-            for tool_call in tool_calls:
-                tool_call_id = tool_call['id']
-                tool_function_name = tool_call['function']['name']
-                tool_arguments = json.loads(
-                    tool_call['function'].get('arguments', '{}'))
->>>>>>> listOfMed
-
                 # Execute the tool
                 results = execute_tool(tool_function_name, tool_arguments)
 
                 # Add the tool response message
-<<<<<<< HEAD
                 messages.append(
                     {
                         "role": "tool",
@@ -247,21 +212,6 @@ def get_chatgpt_response(self, conversation, user_message, page_context=None):
             )
             return final_response.choices[0].message["content"]
         except openai.error.OpenAIError as e:
-=======
-                messages.append({
-                    "role": "tool",
-                    "content": str(results),  # Convert results to string
-                    "tool_call_id": tool_call_id
-                })
-
-            # Final API call with tool results
-            final_response = client.chat.completions.create(
-                model="gpt-3.5-turbo",
-                messages=messages
-            )
-            return final_response.choices[0].message.content
-        except OpenAI.error.OpenAIError as e:
->>>>>>> listOfMed
             logging.error("OpenAI API Error: %s", str(e))
             raise OpenAIAPIException(detail=str(e))
         except Exception as e:
@@ -285,8 +235,4 @@ def generate_title(self, conversation):
             ],
         )
 
-<<<<<<< HEAD
         return response.choices[0].message["content"].strip()
-=======
-        return response.choices[0].message.content.strip()
->>>>>>> listOfMed