phoenix-oss/llama-stack-mirror
0
0
Fork 1
mirror of https://github.com/meta-llama/llama-stack.git synced 2025-10-04 04:04:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/main' into resp_branching

Browse source
This commit is contained in:
Ashwin Bharambe 2025-10-02 14:33:19 -07:00
commit b14a7c1b0f
4 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
llama_stack/log.py
View file

@ -31,7 +31,14 @@ CATEGORIES = [
"client", "client",
"telemetry", "telemetry",
"openai_responses", "openai_responses",
"testing",
"providers",
"models",
"files",
"vector_io",
"tool_runtime",
] ]
UNCATEGORIZED = "uncategorized"
# Initialize category levels with default level # Initialize category levels with default level
_category_levels: dict[str, int] = dict.fromkeys(CATEGORIES, DEFAULT_LOG_LEVEL) _category_levels: dict[str, int] = dict.fromkeys(CATEGORIES, DEFAULT_LOG_LEVEL)
@ -165,7 +172,7 @@ def setup_logging(category_levels: dict[str, int], log_file: str | None) -> None
def filter(self, record): def filter(self, record):
if not hasattr(record, "category"): if not hasattr(record, "category"):
record.category = "uncategorized" # Default to 'uncategorized' if no category found record.category = UNCATEGORIZED # Default to 'uncategorized' if no category found
return True return True
# Determine the root logger's level (default to WARNING if not specified) # Determine the root logger's level (default to WARNING if not specified)
@ -255,7 +262,10 @@ def get_logger(
log_level = _category_levels[root_category] log_level = _category_levels[root_category]
else: else:
log_level = _category_levels.get("root", DEFAULT_LOG_LEVEL) log_level = _category_levels.get("root", DEFAULT_LOG_LEVEL)
logging.warning(f"Unknown logging category: {category}. Falling back to default 'root' level: {log_level}") if category != UNCATEGORIZED:
logging.warning(
f"Unknown logging category: {category}. Falling back to default 'root' level: {log_level}"
)
logger.setLevel(log_level) logger.setLevel(log_level)
return logging.LoggerAdapter(logger, {"category": category}) return logging.LoggerAdapter(logger, {"category": category})

2
llama_stack/providers/inline/agents/meta_reference/responses/openai_responses.py
View file

@ -41,7 +41,7 @@ from .utils import (
convert_response_text_to_chat_response_format, convert_response_text_to_chat_response_format,
) )
logger = get_logger(name=__name__, category="openai::responses") logger = get_logger(name=__name__, category="openai_responses")
class OpenAIResponsePreviousResponseWithInputItems(BaseModel): class OpenAIResponsePreviousResponseWithInputItems(BaseModel):

2
llama_stack/providers/utils/inference/inference_store.py
View file

@ -22,7 +22,7 @@ from ..sqlstore.api import ColumnDefinition, ColumnType
from ..sqlstore.authorized_sqlstore import AuthorizedSqlStore from ..sqlstore.authorized_sqlstore import AuthorizedSqlStore
from ..sqlstore.sqlstore import SqlStoreConfig, SqlStoreType, sqlstore_impl from ..sqlstore.sqlstore import SqlStoreConfig, SqlStoreType, sqlstore_impl
logger = get_logger(name=__name__, category="inference_store") logger = get_logger(name=__name__, category="inference")
class InferenceStore: class InferenceStore:

2
llama_stack/providers/utils/responses/responses_store.py
View file

@ -25,7 +25,7 @@ from ..sqlstore.api import ColumnDefinition, ColumnType
from ..sqlstore.authorized_sqlstore import AuthorizedSqlStore from ..sqlstore.authorized_sqlstore import AuthorizedSqlStore
from ..sqlstore.sqlstore import SqliteSqlStoreConfig, SqlStoreConfig, SqlStoreType, sqlstore_impl from ..sqlstore.sqlstore import SqliteSqlStoreConfig, SqlStoreConfig, SqlStoreType, sqlstore_impl
logger = get_logger(name=__name__, category="responses_store") logger = get_logger(name=__name__, category="openai_responses")
class ResponsesStore: class ResponsesStore: