cherry-pick ffd8da51
This commit is contained in:
parent
f16de69415
commit
900c77e36c
1 changed files with 6 additions and 1 deletions
|
|
@ -329,7 +329,10 @@ async def openai_complete_if_cache(
|
||||||
|
|
||||||
# Check if choices exists and is not empty
|
# Check if choices exists and is not empty
|
||||||
if not hasattr(chunk, "choices") or not chunk.choices:
|
if not hasattr(chunk, "choices") or not chunk.choices:
|
||||||
logger.warning(f"Received chunk without choices: {chunk}")
|
# Azure OpenAI sends content filter results in first chunk without choices
|
||||||
|
logger.debug(
|
||||||
|
f"Received chunk without choices (likely Azure content filter): {chunk}"
|
||||||
|
)
|
||||||
continue
|
continue
|
||||||
|
|
||||||
# Check if delta exists
|
# Check if delta exists
|
||||||
|
|
@ -775,6 +778,7 @@ async def azure_openai_complete_if_cache(
|
||||||
api_version
|
api_version
|
||||||
or os.getenv("AZURE_OPENAI_API_VERSION")
|
or os.getenv("AZURE_OPENAI_API_VERSION")
|
||||||
or os.getenv("OPENAI_API_VERSION")
|
or os.getenv("OPENAI_API_VERSION")
|
||||||
|
or "2024-08-01-preview"
|
||||||
)
|
)
|
||||||
|
|
||||||
# Pop timeout from kwargs if present (will be handled by openai_complete_if_cache)
|
# Pop timeout from kwargs if present (will be handled by openai_complete_if_cache)
|
||||||
|
|
@ -858,6 +862,7 @@ async def azure_openai_embed(
|
||||||
api_version
|
api_version
|
||||||
or os.getenv("AZURE_EMBEDDING_API_VERSION")
|
or os.getenv("AZURE_EMBEDDING_API_VERSION")
|
||||||
or os.getenv("OPENAI_API_VERSION")
|
or os.getenv("OPENAI_API_VERSION")
|
||||||
|
or "2024-08-01-preview"
|
||||||
)
|
)
|
||||||
|
|
||||||
# Call the unified implementation with Azure-specific parameters
|
# Call the unified implementation with Azure-specific parameters
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue