mirror of
https://github.com/meta-llama/llama-stack.git
synced 2025-12-06 18:40:57 +00:00
chore(package): migrate to src/ layout (#3920)
Migrates package structure to src/ layout following Python packaging best practices. All code moved from `llama_stack/` to `src/llama_stack/`. Public API unchanged - imports remain `import llama_stack.*`. Updated build configs, pre-commit hooks, scripts, and GitHub workflows accordingly. All hooks pass, package builds cleanly. **Developer note**: Reinstall after pulling: `pip install -e .`
This commit is contained in:
parent
98a5047f9d
commit
471b1b248b
791 changed files with 2983 additions and 456 deletions
5
src/llama_stack/providers/utils/bedrock/__init__.py
Normal file
5
src/llama_stack/providers/utils/bedrock/__init__.py
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
# 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.
|
||||
74
src/llama_stack/providers/utils/bedrock/client.py
Normal file
74
src/llama_stack/providers/utils/bedrock/client.py
Normal file
|
|
@ -0,0 +1,74 @@
|
|||
# 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.
|
||||
|
||||
|
||||
import boto3
|
||||
from botocore.client import BaseClient
|
||||
from botocore.config import Config
|
||||
|
||||
from llama_stack.providers.utils.bedrock.config import BedrockBaseConfig
|
||||
from llama_stack.providers.utils.bedrock.refreshable_boto_session import (
|
||||
RefreshableBotoSession,
|
||||
)
|
||||
|
||||
|
||||
def create_bedrock_client(config: BedrockBaseConfig, service_name: str = "bedrock-runtime") -> BaseClient:
|
||||
"""Creates a boto3 client for Bedrock services with the given configuration.
|
||||
|
||||
Args:
|
||||
config: The Bedrock configuration containing AWS credentials and settings
|
||||
service_name: The AWS service name to create client for (default: "bedrock-runtime")
|
||||
|
||||
Returns:
|
||||
A configured boto3 client
|
||||
"""
|
||||
if config.aws_access_key_id and config.aws_secret_access_key:
|
||||
retries_config = {
|
||||
k: v
|
||||
for k, v in dict(
|
||||
total_max_attempts=config.total_max_attempts,
|
||||
mode=config.retry_mode,
|
||||
).items()
|
||||
if v is not None
|
||||
}
|
||||
|
||||
config_args = {
|
||||
k: v
|
||||
for k, v in dict(
|
||||
region_name=config.region_name,
|
||||
retries=retries_config if retries_config else None,
|
||||
connect_timeout=config.connect_timeout,
|
||||
read_timeout=config.read_timeout,
|
||||
).items()
|
||||
if v is not None
|
||||
}
|
||||
|
||||
boto3_config = Config(**config_args)
|
||||
|
||||
session_args = {
|
||||
"aws_access_key_id": config.aws_access_key_id,
|
||||
"aws_secret_access_key": config.aws_secret_access_key,
|
||||
"aws_session_token": config.aws_session_token,
|
||||
"region_name": config.region_name,
|
||||
"profile_name": config.profile_name,
|
||||
"session_ttl": config.session_ttl,
|
||||
}
|
||||
|
||||
# Remove None values
|
||||
session_args = {k: v for k, v in session_args.items() if v is not None}
|
||||
|
||||
boto3_session = boto3.session.Session(**session_args)
|
||||
return boto3_session.client(service_name, config=boto3_config)
|
||||
else:
|
||||
return (
|
||||
RefreshableBotoSession(
|
||||
region_name=config.region_name,
|
||||
profile_name=config.profile_name,
|
||||
session_ttl=config.session_ttl,
|
||||
)
|
||||
.refreshable_session()
|
||||
.client(service_name)
|
||||
)
|
||||
64
src/llama_stack/providers/utils/bedrock/config.py
Normal file
64
src/llama_stack/providers/utils/bedrock/config.py
Normal file
|
|
@ -0,0 +1,64 @@
|
|||
# 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.
|
||||
|
||||
import os
|
||||
|
||||
from pydantic import Field
|
||||
|
||||
from llama_stack.providers.utils.inference.model_registry import RemoteInferenceProviderConfig
|
||||
|
||||
|
||||
class BedrockBaseConfig(RemoteInferenceProviderConfig):
|
||||
auth_credential: None = Field(default=None, exclude=True)
|
||||
aws_access_key_id: str | None = Field(
|
||||
default_factory=lambda: os.getenv("AWS_ACCESS_KEY_ID"),
|
||||
description="The AWS access key to use. Default use environment variable: AWS_ACCESS_KEY_ID",
|
||||
)
|
||||
aws_secret_access_key: str | None = Field(
|
||||
default_factory=lambda: os.getenv("AWS_SECRET_ACCESS_KEY"),
|
||||
description="The AWS secret access key to use. Default use environment variable: AWS_SECRET_ACCESS_KEY",
|
||||
)
|
||||
aws_session_token: str | None = Field(
|
||||
default_factory=lambda: os.getenv("AWS_SESSION_TOKEN"),
|
||||
description="The AWS session token to use. Default use environment variable: AWS_SESSION_TOKEN",
|
||||
)
|
||||
region_name: str | None = Field(
|
||||
default_factory=lambda: os.getenv("AWS_DEFAULT_REGION"),
|
||||
description="The default AWS Region to use, for example, us-west-1 or us-west-2."
|
||||
"Default use environment variable: AWS_DEFAULT_REGION",
|
||||
)
|
||||
profile_name: str | None = Field(
|
||||
default_factory=lambda: os.getenv("AWS_PROFILE"),
|
||||
description="The profile name that contains credentials to use.Default use environment variable: AWS_PROFILE",
|
||||
)
|
||||
total_max_attempts: int | None = Field(
|
||||
default_factory=lambda: int(val) if (val := os.getenv("AWS_MAX_ATTEMPTS")) else None,
|
||||
description="An integer representing the maximum number of attempts that will be made for a single request, "
|
||||
"including the initial attempt. Default use environment variable: AWS_MAX_ATTEMPTS",
|
||||
)
|
||||
retry_mode: str | None = Field(
|
||||
default_factory=lambda: os.getenv("AWS_RETRY_MODE"),
|
||||
description="A string representing the type of retries Boto3 will perform."
|
||||
"Default use environment variable: AWS_RETRY_MODE",
|
||||
)
|
||||
connect_timeout: float | None = Field(
|
||||
default_factory=lambda: float(os.getenv("AWS_CONNECT_TIMEOUT", "60")),
|
||||
description="The time in seconds till a timeout exception is thrown when attempting to make a connection. "
|
||||
"The default is 60 seconds.",
|
||||
)
|
||||
read_timeout: float | None = Field(
|
||||
default_factory=lambda: float(os.getenv("AWS_READ_TIMEOUT", "60")),
|
||||
description="The time in seconds till a timeout exception is thrown when attempting to read from a connection."
|
||||
"The default is 60 seconds.",
|
||||
)
|
||||
session_ttl: int | None = Field(
|
||||
default_factory=lambda: int(os.getenv("AWS_SESSION_TTL", "3600")),
|
||||
description="The time in seconds till a session expires. The default is 3600 seconds (1 hour).",
|
||||
)
|
||||
|
||||
@classmethod
|
||||
def sample_run_config(cls, **kwargs):
|
||||
return {}
|
||||
|
|
@ -0,0 +1,112 @@
|
|||
# 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.
|
||||
|
||||
import datetime
|
||||
from time import time
|
||||
from uuid import uuid4
|
||||
|
||||
from boto3 import Session
|
||||
from botocore.credentials import RefreshableCredentials
|
||||
from botocore.session import get_session
|
||||
|
||||
|
||||
class RefreshableBotoSession:
|
||||
"""
|
||||
Boto Helper class which lets us create a refreshable session so that we can cache the client or resource.
|
||||
|
||||
Usage
|
||||
-----
|
||||
session = RefreshableBotoSession().refreshable_session()
|
||||
|
||||
client = session.client("s3") # we now can cache this client object without worrying about expiring credentials
|
||||
"""
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
region_name: str = None,
|
||||
profile_name: str = None,
|
||||
sts_arn: str = None,
|
||||
session_name: str = None,
|
||||
session_ttl: int = 30000,
|
||||
):
|
||||
"""
|
||||
Initialize `RefreshableBotoSession`
|
||||
|
||||
Parameters
|
||||
----------
|
||||
region_name : str (optional)
|
||||
Default region when creating a new connection.
|
||||
|
||||
profile_name : str (optional)
|
||||
The name of a profile to use.
|
||||
|
||||
sts_arn : str (optional)
|
||||
The role arn to sts before creating a session.
|
||||
|
||||
session_name : str (optional)
|
||||
An identifier for the assumed role session. (required when `sts_arn` is given)
|
||||
|
||||
session_ttl : int (optional)
|
||||
An integer number to set the TTL for each session. Beyond this session, it will renew the token.
|
||||
50 minutes by default which is before the default role expiration of 1 hour
|
||||
"""
|
||||
|
||||
self.region_name = region_name
|
||||
self.profile_name = profile_name
|
||||
self.sts_arn = sts_arn
|
||||
self.session_name = session_name or uuid4().hex
|
||||
self.session_ttl = session_ttl
|
||||
|
||||
def __get_session_credentials(self):
|
||||
"""
|
||||
Get session credentials
|
||||
"""
|
||||
session = Session(region_name=self.region_name, profile_name=self.profile_name)
|
||||
|
||||
# if sts_arn is given, get credential by assuming the given role
|
||||
if self.sts_arn:
|
||||
sts_client = session.client(service_name="sts", region_name=self.region_name)
|
||||
response = sts_client.assume_role(
|
||||
RoleArn=self.sts_arn,
|
||||
RoleSessionName=self.session_name,
|
||||
DurationSeconds=self.session_ttl,
|
||||
).get("Credentials")
|
||||
|
||||
credentials = {
|
||||
"access_key": response.get("AccessKeyId"),
|
||||
"secret_key": response.get("SecretAccessKey"),
|
||||
"token": response.get("SessionToken"),
|
||||
"expiry_time": response.get("Expiration").isoformat(),
|
||||
}
|
||||
else:
|
||||
session_credentials = session.get_credentials().get_frozen_credentials()
|
||||
credentials = {
|
||||
"access_key": session_credentials.access_key,
|
||||
"secret_key": session_credentials.secret_key,
|
||||
"token": session_credentials.token,
|
||||
"expiry_time": datetime.datetime.fromtimestamp(time() + self.session_ttl, datetime.UTC).isoformat(),
|
||||
}
|
||||
|
||||
return credentials
|
||||
|
||||
def refreshable_session(self) -> Session:
|
||||
"""
|
||||
Get refreshable boto3 session.
|
||||
"""
|
||||
# Get refreshable credentials
|
||||
refreshable_credentials = RefreshableCredentials.create_from_metadata(
|
||||
metadata=self.__get_session_credentials(),
|
||||
refresh_using=self.__get_session_credentials,
|
||||
method="sts-assume-role",
|
||||
)
|
||||
|
||||
# attach refreshable credentials current session
|
||||
session = get_session()
|
||||
session._credentials = refreshable_credentials
|
||||
session.set_config_variable("region", self.region_name)
|
||||
autorefresh_session = Session(botocore_session=session)
|
||||
|
||||
return autorefresh_session
|
||||
Loading…
Add table
Add a link
Reference in a new issue