Merge branch 'main' into multiLang

Author: pamelafox

app/backend/approaches/chatreadretrieveread.py

@@ -196,7 +196,7 @@ async def run_until_final_call(
             "thoughts": [
                 ThoughtStep(
                     "Prompt to generate search query",
-                    [str(message) for message in query_messages],
+                    query_messages,
                     (
                         {"model": self.chatgpt_model, "deployment": self.chatgpt_deployment}
                         if self.chatgpt_deployment
@@ -221,7 +221,7 @@ async def run_until_final_call(
                 ),
                 ThoughtStep(
                     "Prompt to generate answer",
-                    [str(message) for message in messages],
+                    messages,
                     (
                         {"model": self.chatgpt_model, "deployment": self.chatgpt_deployment}
                         if self.chatgpt_deployment

app/backend/approaches/chatreadretrievereadvision.py

@@ -200,7 +200,7 @@ async def run_until_final_call(
             "thoughts": [
                 ThoughtStep(
                     "Prompt to generate search query",
-                    [str(message) for message in query_messages],
+                    query_messages,
                     (
                         {"model": query_model, "deployment": query_deployment}
                         if query_deployment
@@ -225,7 +225,7 @@ async def run_until_final_call(
                 ),
                 ThoughtStep(
                     "Prompt to generate answer",
-                    [str(message) for message in messages],
+                    messages,
                     (
                         {"model": self.gpt4v_model, "deployment": self.gpt4v_deployment}
                         if self.gpt4v_deployment

app/backend/approaches/retrievethenread.py

@@ -155,7 +155,7 @@ async def run(
                 ),
                 ThoughtStep(
                     "Prompt to generate answer",
-                    [str(message) for message in updated_messages],
+                    updated_messages,
                     (
                         {"model": self.chatgpt_model, "deployment": self.chatgpt_deployment}
                         if self.chatgpt_deployment

app/backend/approaches/retrievethenreadvision.py

@@ -177,7 +177,7 @@ async def run(
                 ),
                 ThoughtStep(
                     "Prompt to generate answer",
-                    [str(message) for message in updated_messages],
+                    updated_messages,
                     (
                         {"model": self.gpt4v_model, "deployment": self.gpt4v_deployment}
                         if self.gpt4v_deployment

app/backend/requirements.in

@@ -2,7 +2,7 @@ azure-identity
 quart
 quart-cors
 openai>=1.3.7
-numpy>=1 # Used by openai embeddings.create to optimize embeddings (but not required)
+numpy>=1,<2.1.0 # Used by openai embeddings.create to optimize embeddings (but not required)
 tiktoken
 tenacity
 azure-ai-documentintelligence

app/backend/requirements.txt

@@ -6,9 +6,9 @@
 #
 aiofiles==24.1.0
     # via quart
-aiohappyeyeballs==2.3.5
+aiohappyeyeballs==2.4.0
     # via aiohttp
-aiohttp==3.10.2
+aiohttp==3.10.5
     # via
     #   -r requirements.in
     #   microsoft-kiota-authentication-azure
@@ -26,7 +26,7 @@ attrs==24.2.0
     # via aiohttp
 azure-ai-documentintelligence==1.0.0b3
     # via -r requirements.in
-azure-cognitiveservices-speech==1.38.0
+azure-cognitiveservices-speech==1.40.0
     # via -r requirements.in
 azure-common==1.1.28
     # via azure-search-documents
@@ -125,7 +125,7 @@ hypercorn==0.17.3
     # via quart
 hyperframe==6.0.1
     # via h2
-idna==3.7
+idna==3.8
     # via
     #   anyio
     #   httpx
@@ -165,11 +165,11 @@ microsoft-kiota-abstractions==1.3.3
     #   microsoft-kiota-serialization-text
     #   msgraph-core
     #   msgraph-sdk
-microsoft-kiota-authentication-azure==1.0.0
+microsoft-kiota-authentication-azure==1.1.0
     # via
     #   msgraph-core
     #   msgraph-sdk
-microsoft-kiota-http==1.3.2
+microsoft-kiota-http==1.3.3
     # via
     #   msgraph-core
     #   msgraph-sdk
@@ -198,11 +198,11 @@ numpy==2.0.1
     # via -r requirements.in
 oauthlib==3.2.2
     # via requests-oauthlib
-openai==1.40.1
+openai==1.42.0
     # via
     #   -r requirements.in
     #   openai-messages-token-helper
-openai-messages-token-helper==0.1.9
+openai-messages-token-helper==0.1.10
     # via -r requirements.in
 opentelemetry-api==1.26.0
     # via
@@ -258,7 +258,7 @@ opentelemetry-instrumentation-flask==0.47b0
     # via azure-monitor-opentelemetry
 opentelemetry-instrumentation-httpx==0.47b0
     # via -r requirements.in
-opentelemetry-instrumentation-openai==0.26.5
+opentelemetry-instrumentation-openai==0.27.0
     # via -r requirements.in
 opentelemetry-instrumentation-psycopg2==0.47b0
     # via azure-monitor-opentelemetry
@@ -375,7 +375,7 @@ sniffio==1.3.1
     #   anyio
     #   httpx
     #   openai
-soupsieve==2.5
+soupsieve==2.6
     # via beautifulsoup4
 std-uritemplate==1.0.5
     # via microsoft-kiota-abstractions
@@ -394,7 +394,7 @@ types-beautifulsoup4==4.12.0.20240511
     # via -r requirements.in
 types-html5lib==1.1.11.20240806
     # via types-beautifulsoup4
-types-pillow==10.2.0.20240520
+types-pillow==10.2.0.20240822
     # via -r requirements.in
 typing-extensions==4.12.2
     # via
@@ -411,9 +411,9 @@ tzdata==2024.1
     # via pendulum
 urllib3==2.2.2
     # via requests
-uvicorn==0.30.5
+uvicorn==0.30.6
     # via -r requirements.in
-werkzeug==3.0.3
+werkzeug==3.0.4
     # via
     #   flask
     #   quart
@@ -428,7 +428,7 @@ wsproto==1.2.0
     # via hypercorn
 yarl==1.9.4
     # via aiohttp
-zipp==3.19.2
+zipp==3.20.0
     # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file: