mirror of
https://github.com/meta-llama/llama-stack.git
synced 2025-12-12 12:06:04 +00:00
7605631df7
Remove invalid default parameters from KVStoreConfig and SqlStoreConfig Annotated types which were causing UnsupportedFieldAttributeWarning and producing incorrect string values instead of proper config objects. Add proper default_factory to all KVStoreConfig and SqlStoreConfig fields across core datatypes and provider configs, ensuring they instantiate SqliteKVStoreConfig or SqliteSqlStoreConfig objects with correct defaults. This improves usability by allowing configs to be instantiated without explicitly providing storage configuration while maintaining type safety and discriminated union functionality. Signed-off-by: Charlie Doern <cdoern@redhat.com>
44 lines
2 KiB
Python
44 lines
2 KiB
Python
# Copyright (c) Meta Platforms, Inc. and affiliates.
|
|
# All rights reserved.
|
|
#
|
|
# This source code is licensed under the terms described in the LICENSE file in
|
|
# the root directory of this source tree.
|
|
|
|
from typing import Any
|
|
|
|
from pydantic import BaseModel, Field
|
|
|
|
from llama_stack.providers.utils.sqlstore.sqlstore import SqliteSqlStoreConfig, SqlStoreConfig
|
|
|
|
|
|
class S3FilesImplConfig(BaseModel):
|
|
"""Configuration for S3-based files provider."""
|
|
|
|
bucket_name: str = Field(description="S3 bucket name to store files")
|
|
region: str = Field(default="us-east-1", description="AWS region where the bucket is located")
|
|
aws_access_key_id: str | None = Field(default=None, description="AWS access key ID (optional if using IAM roles)")
|
|
aws_secret_access_key: str | None = Field(
|
|
default=None, description="AWS secret access key (optional if using IAM roles)"
|
|
)
|
|
endpoint_url: str | None = Field(default=None, description="Custom S3 endpoint URL (for MinIO, LocalStack, etc.)")
|
|
auto_create_bucket: bool = Field(
|
|
default=False, description="Automatically create the S3 bucket if it doesn't exist"
|
|
)
|
|
metadata_store: SqlStoreConfig = Field(
|
|
default_factory=SqliteSqlStoreConfig, description="SQL store configuration for file metadata"
|
|
)
|
|
|
|
@classmethod
|
|
def sample_run_config(cls, __distro_dir__: str) -> dict[str, Any]:
|
|
return {
|
|
"bucket_name": "${env.S3_BUCKET_NAME}", # no default, buckets must be globally unique
|
|
"region": "${env.AWS_REGION:=us-east-1}",
|
|
"aws_access_key_id": "${env.AWS_ACCESS_KEY_ID:=}",
|
|
"aws_secret_access_key": "${env.AWS_SECRET_ACCESS_KEY:=}",
|
|
"endpoint_url": "${env.S3_ENDPOINT_URL:=}",
|
|
"auto_create_bucket": "${env.S3_AUTO_CREATE_BUCKET:=false}",
|
|
"metadata_store": SqliteSqlStoreConfig.sample_run_config(
|
|
__distro_dir__=__distro_dir__,
|
|
db_name="s3_files_metadata.db",
|
|
),
|
|
}
|