forked from phoenix-oss/llama-stack-mirror
9487ad8294
* API Keys passed from Client instead of distro configuration * delete distribution registry * Rename the "package" word away * Introduce a "Router" layer for providers Some providers need to be factorized and considered as thin routing layers on top of other providers. Consider two examples: - The inference API should be a routing layer over inference providers, routed using the "model" key - The memory banks API is another instance where various memory bank types will be provided by independent providers (e.g., a vector store is served by Chroma while a keyvalue memory can be served by Redis or PGVector) This commit introduces a generalized routing layer for this purpose. * update `apis_to_serve` * llama_toolchain -> llama_stack * Codemod from llama_toolchain -> llama_stack - added providers/registry - cleaned up api/ subdirectories and moved impls away - restructured api/api.py - from llama_stack.apis.<api> import foo should work now - update imports to do llama_stack.apis.<api> - update many other imports - added __init__, fixed some registry imports - updated registry imports - create_agentic_system -> create_agent - AgenticSystem -> Agent * Moved some stuff out of common/; re-generated OpenAPI spec * llama-toolchain -> llama-stack (hyphens) * add control plane API * add redis adapter + sqlite provider * move core -> distribution * Some more toolchain -> stack changes * small naming shenanigans * Removing custom tool and agent utilities and moving them client side * Move control plane to distribution server for now * Remove control plane from API list * no codeshield dependency randomly plzzzzz * Add "fire" as a dependency * add back event loggers * stack configure fixes * use brave instead of bing in the example client * add init file so it gets packaged * add init files so it gets packaged * Update MANIFEST * bug fix --------- Co-authored-by: Hardik Shah <hjshah@fb.com> Co-authored-by: Xi Yan <xiyan@meta.com> Co-authored-by: Ashwin Bharambe <ashwin@meta.com>
58 lines
1.7 KiB
Python
58 lines
1.7 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 List
|
|
|
|
from llama_stack.apis.inference import Message
|
|
from llama_stack.apis.safety import Safety, ShieldDefinition
|
|
|
|
from llama_stack.providers.impls.meta_reference.agents.safety import ShieldRunnerMixin
|
|
|
|
from .builtin import BaseTool
|
|
|
|
|
|
class SafeTool(BaseTool, ShieldRunnerMixin):
|
|
"""A tool that makes other tools safety enabled"""
|
|
|
|
def __init__(
|
|
self,
|
|
tool: BaseTool,
|
|
safety_api: Safety,
|
|
input_shields: List[ShieldDefinition] = None,
|
|
output_shields: List[ShieldDefinition] = None,
|
|
):
|
|
self._tool = tool
|
|
ShieldRunnerMixin.__init__(
|
|
self, safety_api, input_shields=input_shields, output_shields=output_shields
|
|
)
|
|
|
|
def get_name(self) -> str:
|
|
# return the name of the wrapped tool
|
|
return self._tool.get_name()
|
|
|
|
async def run(self, messages: List[Message]) -> List[Message]:
|
|
if self.input_shields:
|
|
await self.run_shields(messages, self.input_shields)
|
|
# run the underlying tool
|
|
res = await self._tool.run(messages)
|
|
if self.output_shields:
|
|
await self.run_shields(messages, self.output_shields)
|
|
|
|
return res
|
|
|
|
|
|
def with_safety(
|
|
tool: BaseTool,
|
|
safety_api: Safety,
|
|
input_shields: List[ShieldDefinition] = None,
|
|
output_shields: List[ShieldDefinition] = None,
|
|
) -> SafeTool:
|
|
return SafeTool(
|
|
tool,
|
|
safety_api,
|
|
input_shields=input_shields,
|
|
output_shields=output_shields,
|
|
)
|