mirror of
https://github.com/meta-llama/llama-stack.git
synced 2025-06-28 02:53:30 +00:00
chore: move all Llama Stack types from llama-models to llama-stack (#1098)
llama-models should have extremely minimal cruft. Its sole purpose should be didactic -- show the simplest implementation of the llama models and document the prompt formats, etc. This PR is the complement to https://github.com/meta-llama/llama-models/pull/279 ## Test Plan Ensure all `llama` CLI `model` sub-commands work: ```bash llama model list llama model download --model-id ... llama model prompt-format -m ... ``` Ran tests: ```bash cd tests/client-sdk LLAMA_STACK_CONFIG=fireworks pytest -s -v inference/ LLAMA_STACK_CONFIG=fireworks pytest -s -v vector_io/ LLAMA_STACK_CONFIG=fireworks pytest -s -v agents/ ``` Create a fresh venv `uv venv && source .venv/bin/activate` and run `llama stack build --template fireworks --image-type venv` followed by `llama stack run together --image-type venv` <-- the server runs Also checked that the OpenAPI generator can run and there is no change in the generated files as a result. ```bash cd docs/openapi_generator sh run_openapi_generator.sh ```
This commit is contained in:
parent
c0ee512980
commit
314ee09ae3
138 changed files with 8491 additions and 465 deletions
89
llama_stack/strong_typing/topological.py
Normal file
89
llama_stack/strong_typing/topological.py
Normal file
|
@ -0,0 +1,89 @@
|
|||
# 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.
|
||||
|
||||
"""
|
||||
Type-safe data interchange for Python data classes.
|
||||
|
||||
:see: https://github.com/hunyadi/strong_typing
|
||||
"""
|
||||
|
||||
from typing import Callable, Dict, Iterable, List, Optional, Set, TypeVar
|
||||
|
||||
from .inspection import TypeCollector
|
||||
|
||||
T = TypeVar("T")
|
||||
|
||||
|
||||
def topological_sort(graph: Dict[T, Set[T]]) -> List[T]:
|
||||
"""
|
||||
Performs a topological sort of a graph.
|
||||
|
||||
Nodes with no outgoing edges are first. Nodes with no incoming edges are last.
|
||||
The topological ordering is not unique.
|
||||
|
||||
:param graph: A dictionary of mappings from nodes to adjacent nodes. Keys and set members must be hashable.
|
||||
:returns: The list of nodes in topological order.
|
||||
"""
|
||||
|
||||
# empty list that will contain the sorted nodes (in reverse order)
|
||||
ordered: List[T] = []
|
||||
|
||||
seen: Dict[T, bool] = {}
|
||||
|
||||
def _visit(n: T) -> None:
|
||||
status = seen.get(n)
|
||||
if status is not None:
|
||||
if status: # node has a permanent mark
|
||||
return
|
||||
else: # node has a temporary mark
|
||||
raise RuntimeError(f"cycle detected in graph for node {n}")
|
||||
|
||||
seen[n] = False # apply temporary mark
|
||||
for m in graph[n]: # visit all adjacent nodes
|
||||
if m != n: # ignore self-referencing nodes
|
||||
_visit(m)
|
||||
|
||||
seen[n] = True # apply permanent mark
|
||||
ordered.append(n)
|
||||
|
||||
for n in graph.keys():
|
||||
_visit(n)
|
||||
|
||||
return ordered
|
||||
|
||||
|
||||
def type_topological_sort(
|
||||
types: Iterable[type],
|
||||
dependency_fn: Optional[Callable[[type], Iterable[type]]] = None,
|
||||
) -> List[type]:
|
||||
"""
|
||||
Performs a topological sort of a list of types.
|
||||
|
||||
Types that don't depend on other types (i.e. fundamental types) are first. Types on which no other types depend
|
||||
are last. The topological ordering is not unique.
|
||||
|
||||
:param types: A list of types (simple or composite).
|
||||
:param dependency_fn: Returns a list of additional dependencies for a class (e.g. classes referenced by a foreign key).
|
||||
:returns: The list of types in topological order.
|
||||
"""
|
||||
|
||||
if not all(isinstance(typ, type) for typ in types):
|
||||
raise TypeError("expected a list of types")
|
||||
|
||||
collector = TypeCollector()
|
||||
collector.traverse_all(types)
|
||||
graph = collector.graph
|
||||
|
||||
if dependency_fn:
|
||||
new_types: Set[type] = set()
|
||||
for source_type, references in graph.items():
|
||||
dependent_types = dependency_fn(source_type)
|
||||
references.update(dependent_types)
|
||||
new_types.update(dependent_types)
|
||||
for new_type in new_types:
|
||||
graph[new_type] = set()
|
||||
|
||||
return topological_sort(graph)
|
Loading…
Add table
Add a link
Reference in a new issue