Merge pull request #726 from microsoft/joshuakr/7653-Comparison-Fix

Joshuakr/7653 comparison fix

Author: dayland

Diff for: Makefile

@@ -87,4 +87,4 @@ run-data-migration: ## Run the data migration moving data from one resource grou
 	python ./scripts/extract-content.py
 
 manual-inf-destroy: ## A command triggered by a user to destroy a resource group, associated resources, and related Entra items
-	@./scripts/inf-manual-destroy.sh 
+	@./scripts/inf-manual-destroy.sh 

Diff for: app/backend/approaches/comparewebwithwork.py

@@ -136,7 +136,7 @@ async def run(self, history: Sequence[dict[str, str]], overrides: dict[str, Any]
             eventJson = json.loads(event)
             if "work_citation_lookup" in eventJson:
                 work_citations = eventJson["work_citation_lookup"]
-            elif "content" in eventJson:
+            elif "content" in eventJson and eventJson["content"] != None:
                 content += eventJson["content"]
 
         thought_chain["work_response"] = content
@@ -167,12 +167,10 @@ async def run(self, history: Sequence[dict[str, str]], overrides: dict[str, Any]
         msg_to_display = '\n\n'.join([str(message) for message in messages])
         try:
             # Step 3: Final comparative analysis using OpenAI Chat Completion
-            chat_completion = await openai.ChatCompletion.acreate(
-                deployment_id=self.chatgpt_deployment,
-                model=self.model_name,
+            chat_completion = await self.client.chat.completions.create(
+                model=self.chatgpt_deployment,
                 messages=messages,
                 temperature=float(overrides.get("response_temp")) or 0.6,
-                max_tokens=1024,
                 n=1,
                 stream=True)
 

Diff for: app/backend/approaches/compareworkwithweb.py

@@ -89,7 +89,7 @@ async def run(self, history: Sequence[dict[str, str]], overrides: dict[str, Any]
             eventJson = json.loads(event)
             if "web_citation_lookup" in eventJson:
                 self.web_citations = eventJson["web_citation_lookup"]
-            elif "content" in eventJson:
+            elif "content" in eventJson and eventJson["content"] != None:
                 content += eventJson["content"]
 
         thought_chain["web_response"] = content
@@ -120,12 +120,10 @@ async def run(self, history: Sequence[dict[str, str]], overrides: dict[str, Any]
         msg_to_display = '\n\n'.join([str(message) for message in messages])
         try:
             # Step 3: Final comparative analysis using OpenAI Chat Completion
-            chat_completion = await openai.ChatCompletion.acreate(
-                deployment_id=self.chatgpt_deployment,
-                model=self.model_name,
+            chat_completion = await self.client.chat.completions.create(
+                model=self.chatgpt_deployment,
                 messages=messages,
                 temperature=float(overrides.get("response_temp")) or 0.6,
-                max_tokens=1024,
                 n=1,
                 stream=True)