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

rebase fixes

Browse source
This commit is contained in:
Dinesh Yeduguru 2024-12-30 13:03:39 -08:00
parent b7ae86ae03
commit 9a3d7fa33c
6 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
llama_stack/providers/inline/agents/meta_reference/agent_instance.py
View file

@ -13,11 +13,11 @@ import secrets
import string
import uuid
from datetime import datetime
from typing import AsyncGenerator, List
from typing import AsyncGenerator, List, Optional
from urllib.parse import urlparse
import httpx
from llama_models.llama3.api.datatypes import BuiltinTool
from llama_models.llama3.api.datatypes import BuiltinTool, ToolCall, ToolParamDefinition
from llama_stack.apis.agents import (
AgentConfig,
@ -37,10 +37,7 @@ from llama_stack.apis.agents import (
ToolExecutionStep,
Turn,
)
from llama_stack.apis.common.content_types import (
URL,
TextContentItem,
)
from llama_stack.apis.common.content_types import TextContentItem, URL
from llama_stack.apis.inference import (
ChatCompletionResponseEventType,
CompletionMessage,
@ -59,6 +56,7 @@ from llama_stack.apis.inference import (
from llama_stack.apis.memory import Memory
from llama_stack.apis.memory_banks import MemoryBanks
from llama_stack.apis.safety import Safety
from llama_stack.apis.tools import ToolGroups, ToolRuntime
from llama_stack.providers.utils.kvstore import KVStore
from llama_stack.providers.utils.telemetry import tracing

2
llama_stack/providers/tests/tools/fixtures.py
View file

@ -8,6 +8,7 @@ import os
import pytest
import pytest_asyncio
from llama_models.llama3.api.datatypes import BuiltinTool
from llama_stack.apis.models import ModelInput, ModelType
from llama_stack.apis.tools import (
@ -17,7 +18,6 @@ from llama_stack.apis.tools import (
ToolParameter,
UserDefinedToolGroupDef,
)
from llama_stack.apis.tools.tools import BuiltinTool
from llama_stack.distribution.datatypes import Api, Provider
from llama_stack.providers.tests.resolver import construct_stack_for_test

2
llama_stack/providers/tests/tools/test_tools.py
View file

@ -14,7 +14,7 @@ from llama_stack.apis.memory_banks import VectorMemoryBankParams
from llama_stack.apis.tools import ToolInvocationResult
from llama_stack.providers.datatypes import Api
from .fixtures import tool_runtime_memory_and_search # noqa: F401
from .fixtures import tools_stack as _tools_stack # noqa: F401, F811
@pytest.fixture