ApiSurface -> Api

This commit is contained in:
Ashwin Bharambe 2024-08-05 12:44:56 -07:00
parent 7890921e5c
commit 125fdb1b2a
13 changed files with 76 additions and 87 deletions

View file

@ -6,13 +6,13 @@
from typing import List
from llama_toolchain.distribution.datatypes import Adapter, ApiSurface, SourceAdapter
from llama_toolchain.distribution.datatypes import Adapter, Api, SourceAdapter
def available_inference_adapters() -> List[Adapter]:
return [
SourceAdapter(
api_surface=ApiSurface.inference,
api=Api.inference,
adapter_id="meta-reference",
pip_packages=[
"torch",
@ -22,7 +22,7 @@ def available_inference_adapters() -> List[Adapter]:
config_class="llama_toolchain.inference.inference.MetaReferenceImplConfig",
),
SourceAdapter(
api_surface=ApiSurface.inference,
api=Api.inference,
adapter_id="meta-ollama",
pip_packages=[
"ollama",

View file

@ -11,7 +11,7 @@ from typing import AsyncIterator, Dict, Union
from llama_models.llama3_1.api.datatypes import StopReason
from llama_models.sku_list import resolve_model
from llama_toolchain.distribution.datatypes import Adapter, ApiSurface
from llama_toolchain.distribution.datatypes import Adapter, Api
from .api.config import MetaReferenceImplConfig
from .api.datatypes import (
@ -29,9 +29,7 @@ from .api.endpoints import (
from .model_parallel import LlamaModelParallelGenerator
async def get_adapter_impl(
config: MetaReferenceImplConfig, _deps: Dict[ApiSurface, Adapter]
):
async def get_adapter_impl(config: MetaReferenceImplConfig, _deps: Dict[Api, Adapter]):
assert isinstance(
config, MetaReferenceImplConfig
), f"Unexpected config type: {type(config)}"