mirror of
https://github.com/meta-llama/llama-stack.git
synced 2025-12-27 11:38:04 +00:00
Merge upstream/main and resolve conflicts
Resolved merge conflicts in: - Documentation files: updated vector IO provider docs to include both kvstore fields and embedding model configuration - Config files: merged kvstore requirements from upstream with embedding model fields - Dependencies: updated to latest client versions while preserving llama-models dependency - Regenerated lockfiles to ensure consistency All embedding model configuration features preserved while incorporating upstream changes.
This commit is contained in:
commit
6634b21a76
92 changed files with 3069 additions and 2481 deletions
|
|
@ -13,6 +13,7 @@ annotated-types==0.7.0
|
|||
anyio==4.8.0
|
||||
# via
|
||||
# httpx
|
||||
# llama-api-client
|
||||
# llama-stack-client
|
||||
# openai
|
||||
# starlette
|
||||
|
|
@ -49,6 +50,7 @@ deprecated==1.2.18
|
|||
# opentelemetry-semantic-conventions
|
||||
distro==1.9.0
|
||||
# via
|
||||
# llama-api-client
|
||||
# llama-stack-client
|
||||
# openai
|
||||
ecdsa==0.19.1
|
||||
|
|
@ -80,6 +82,7 @@ httpcore==1.0.9
|
|||
# via httpx
|
||||
httpx==0.28.1
|
||||
# via
|
||||
# llama-api-client
|
||||
# llama-stack
|
||||
# llama-stack-client
|
||||
# openai
|
||||
|
|
@ -103,9 +106,11 @@ jsonschema==4.23.0
|
|||
# via llama-stack
|
||||
jsonschema-specifications==2024.10.1
|
||||
# via jsonschema
|
||||
llama-api-client==0.1.2
|
||||
# via llama-stack
|
||||
llama-models==0.2.0
|
||||
# via llama-stack
|
||||
llama-stack-client==0.2.14
|
||||
llama-stack-client==0.2.15
|
||||
# via llama-stack
|
||||
markdown-it-py==3.0.0
|
||||
# via rich
|
||||
|
|
@ -171,6 +176,7 @@ pycparser==2.22 ; platform_python_implementation != 'PyPy'
|
|||
pydantic==2.10.6
|
||||
# via
|
||||
# fastapi
|
||||
# llama-api-client
|
||||
# llama-models
|
||||
# llama-stack
|
||||
# llama-stack-client
|
||||
|
|
@ -224,6 +230,7 @@ six==1.17.0
|
|||
sniffio==1.3.1
|
||||
# via
|
||||
# anyio
|
||||
# llama-api-client
|
||||
# llama-stack-client
|
||||
# openai
|
||||
starlette==0.45.3
|
||||
|
|
@ -250,6 +257,7 @@ typing-extensions==4.12.2
|
|||
# anyio
|
||||
# fastapi
|
||||
# huggingface-hub
|
||||
# llama-api-client
|
||||
# llama-stack-client
|
||||
# openai
|
||||
# opentelemetry-sdk
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue