llama_toolchain/distribution -> llama_toolchain/core

MANIFEST.in

@@ -1,4 +1,4 @@
 include requirements.txt
 include llama_toolchain/data/*.yaml
-include llama_toolchain/distribution/*.sh
+include llama_toolchain/core/*.sh
 include llama_toolchain/cli/scripts/*.sh

llama_toolchain/agentic_system/client.py

@@ -16,7 +16,7 @@ from pydantic import BaseModel
 from termcolor import cprint
 
 from llama_models.llama3.api.datatypes import *  # noqa: F403
-from llama_toolchain.distribution.datatypes import RemoteProviderConfig
+from llama_toolchain.core.datatypes import RemoteProviderConfig
 
 from .api import *  # noqa: F403
 from .event_logger import EventLogger

llama_toolchain/agentic_system/meta_reference/__init__.py

@@ -6,7 +6,7 @@
 
 from typing import Dict
 
-from llama_toolchain.distribution.datatypes import Api, ProviderSpec
+from llama_toolchain.core.datatypes import Api, ProviderSpec
 
 from .config import MetaReferenceImplConfig
 

llama_toolchain/agentic_system/providers.py

@@ -6,7 +6,7 @@
 
 from typing import List
 
-from llama_toolchain.distribution.datatypes import Api, InlineProviderSpec, ProviderSpec
+from llama_toolchain.core.datatypes import Api, InlineProviderSpec, ProviderSpec
 
 
 def available_agentic_system_providers() -> List[ProviderSpec]:

llama_toolchain/cli/api/build.py

@@ -8,13 +8,13 @@ import argparse
 from typing import Dict
 
 from llama_toolchain.cli.subcommand import Subcommand
-from llama_toolchain.distribution.datatypes import *  # noqa: F403
+from llama_toolchain.core.datatypes import *  # noqa: F403
 
 
 def parse_dependencies(
     dependencies: str, parser: argparse.ArgumentParser
 ) -> Dict[str, ProviderSpec]:
-    from llama_toolchain.distribution.distribution import api_providers
+    from llama_toolchain.core.distribution import api_providers
 
     all_providers = api_providers()
 
@@ -48,8 +48,8 @@ class ApiBuild(Subcommand):
         self.parser.set_defaults(func=self._run_api_build_command)
 
     def _add_arguments(self):
-        from llama_toolchain.distribution.distribution import stack_apis
-        from llama_toolchain.distribution.package import (
+        from llama_toolchain.core.distribution import stack_apis
+        from llama_toolchain.core.package import (
             BuildType,
         )
 
@@ -86,7 +86,7 @@ class ApiBuild(Subcommand):
         )
 
     def _run_api_build_command(self, args: argparse.Namespace) -> None:
-        from llama_toolchain.distribution.package import (
+        from llama_toolchain.core.package import (
             ApiInput,
             BuildType,
             build_package,

llama_toolchain/cli/api/configure.py

@@ -13,7 +13,7 @@ import yaml
 
 from llama_toolchain.cli.subcommand import Subcommand
 from llama_toolchain.common.config_dirs import BUILDS_BASE_DIR
-from llama_toolchain.distribution.datatypes import *  # noqa: F403
+from llama_toolchain.core.datatypes import *  # noqa: F403
 
 
 class ApiConfigure(Subcommand):
@@ -31,8 +31,8 @@ class ApiConfigure(Subcommand):
         self.parser.set_defaults(func=self._run_api_configure_cmd)
 
     def _add_arguments(self):
-        from llama_toolchain.distribution.distribution import stack_apis
-        from llama_toolchain.distribution.package import BuildType
+        from llama_toolchain.core.distribution import stack_apis
+        from llama_toolchain.core.package import BuildType
 
         allowed_args = [a.name for a in stack_apis()]
         self.parser.add_argument(
@@ -67,7 +67,7 @@ class ApiConfigure(Subcommand):
         )
 
     def _run_api_configure_cmd(self, args: argparse.Namespace) -> None:
-        from llama_toolchain.distribution.package import BuildType
+        from llama_toolchain.core.package import BuildType
 
         if args.build_name:
             name = args.build_name
@@ -89,7 +89,7 @@ class ApiConfigure(Subcommand):
 
 def configure_llama_provider(config_file: Path) -> None:
     from llama_toolchain.common.serialize import EnumEncoder
-    from llama_toolchain.distribution.configure import configure_api_providers
+    from llama_toolchain.core.configure import configure_api_providers
 
     with open(config_file, "r") as f:
         config = PackageConfig(**yaml.safe_load(f))

llama_toolchain/cli/api/start.py

@@ -12,7 +12,7 @@ import pkg_resources
 import yaml
 
 from llama_toolchain.cli.subcommand import Subcommand
-from llama_toolchain.distribution.datatypes import *  # noqa: F403
+from llama_toolchain.core.datatypes import *  # noqa: F403
 
 
 class ApiStart(Subcommand):

llama_toolchain/cli/stack/build.py

@@ -7,7 +7,7 @@
 import argparse
 
 from llama_toolchain.cli.subcommand import Subcommand
-from llama_toolchain.distribution.datatypes import *  # noqa: F403
+from llama_toolchain.core.datatypes import *  # noqa: F403
 
 
 class StackBuild(Subcommand):
@@ -23,8 +23,8 @@ class StackBuild(Subcommand):
         self.parser.set_defaults(func=self._run_stack_build_command)
 
     def _add_arguments(self):
-        from llama_toolchain.distribution.registry import available_distribution_specs
-        from llama_toolchain.distribution.package import (
+        from llama_toolchain.core.distribution_registry import available_distribution_specs
+        from llama_toolchain.core.package import (
             BuildType,
         )
 
@@ -50,8 +50,8 @@ class StackBuild(Subcommand):
         )
 
     def _run_stack_build_command(self, args: argparse.Namespace) -> None:
-        from llama_toolchain.distribution.registry import resolve_distribution_spec
-        from llama_toolchain.distribution.package import (
+        from llama_toolchain.core.distribution_registry import resolve_distribution_spec
+        from llama_toolchain.core.package import (
             ApiInput,
             BuildType,
             build_package,

llama_toolchain/cli/stack/configure.py

@@ -13,7 +13,7 @@ from termcolor import cprint
 
 from llama_toolchain.cli.subcommand import Subcommand
 from llama_toolchain.common.config_dirs import BUILDS_BASE_DIR
-from llama_toolchain.distribution.datatypes import *  # noqa: F403
+from llama_toolchain.core.datatypes import *  # noqa: F403
 
 
 class StackConfigure(Subcommand):
@@ -31,8 +31,10 @@ class StackConfigure(Subcommand):
         self.parser.set_defaults(func=self._run_stack_configure_cmd)
 
     def _add_arguments(self):
-        from llama_toolchain.distribution.package import BuildType
-        from llama_toolchain.distribution.registry import available_distribution_specs
+        from llama_toolchain.core.distribution_registry import (
+            available_distribution_specs,
+        )
+        from llama_toolchain.core.package import BuildType
 
         self.parser.add_argument(
             "--build-name",
@@ -62,7 +64,7 @@ class StackConfigure(Subcommand):
         )
 
     def _run_stack_configure_cmd(self, args: argparse.Namespace) -> None:
-        from llama_toolchain.distribution.package import BuildType
+        from llama_toolchain.core.package import BuildType
 
         if args.build_name:
             name = args.build_name
@@ -84,8 +86,8 @@ class StackConfigure(Subcommand):
 
 def configure_llama_distribution(config_file: Path) -> None:
     from llama_toolchain.common.serialize import EnumEncoder
-    from llama_toolchain.distribution.configure import configure_api_providers
-    from llama_toolchain.distribution.registry import resolve_distribution_spec
+    from llama_toolchain.core.configure import configure_api_providers
+    from llama_toolchain.core.distribution_registry import resolve_distribution_spec
 
     with open(config_file, "r") as f:
         config = PackageConfig(**yaml.safe_load(f))

llama_toolchain/cli/stack/list.py

@@ -27,7 +27,9 @@ class StackList(Subcommand):
 
     def _run_distribution_list_cmd(self, args: argparse.Namespace) -> None:
         from llama_toolchain.cli.table import print_table
-        from llama_toolchain.distribution.registry import available_distribution_specs
+        from llama_toolchain.core.distribution_registry import (
+            available_distribution_specs,
+        )
 
         # eventually, this should query a registry at llama.meta.com/llamastack/distributions
         headers = [

llama_toolchain/cli/stack/start.py

@@ -12,7 +12,7 @@ import pkg_resources
 import yaml
 
 from llama_toolchain.cli.subcommand import Subcommand
-from llama_toolchain.distribution.datatypes import *  # noqa: F403
+from llama_toolchain.core.datatypes import *  # noqa: F403
 
 
 class StackStart(Subcommand):

llama_toolchain/core/build_container.sh

@@ -88,7 +88,7 @@ add_to_docker <<EOF
 # This would be good in production but for debugging flexibility lets not add it right now
 # We need a more solid production ready entrypoint.sh anyway
 #
-# ENTRYPOINT ["python", "-m", "llama_toolchain.distribution.server"]
+# ENTRYPOINT ["python", "-m", "llama_toolchain.core.server"]
 
 EOF
 

llama_toolchain/core/configure.py

@@ -6,12 +6,12 @@
 
 from typing import Any, Dict
 
-from llama_toolchain.distribution.datatypes import *  # noqa: F403
+from llama_toolchain.core.datatypes import *  # noqa: F403
 from termcolor import cprint
 
 from llama_toolchain.common.prompt_for_config import prompt_for_config
-from llama_toolchain.distribution.distribution import api_providers
-from llama_toolchain.distribution.dynamic import instantiate_class_type
+from llama_toolchain.core.distribution import api_providers
+from llama_toolchain.core.dynamic import instantiate_class_type
 
 
 def configure_api_providers(existing_configs: Dict[str, Any]) -> None:

llama_toolchain/core/datatypes.py

@@ -139,7 +139,7 @@ def remote_provider_spec(
     config_class = (
         adapter.config_class
         if adapter and adapter.config_class
-        else "llama_toolchain.distribution.datatypes.RemoteProviderConfig"
+        else "llama_toolchain.core.datatypes.RemoteProviderConfig"
     )
     provider_id = remote_provider_id(adapter.adapter_id) if adapter else "remote"
 

llama_toolchain/core/package.py

@@ -17,11 +17,11 @@ from pydantic import BaseModel
 from termcolor import cprint
 
 from llama_toolchain.common.config_dirs import BUILDS_BASE_DIR
-from llama_toolchain.distribution.datatypes import *  # noqa: F403
+from llama_toolchain.core.datatypes import *  # noqa: F403
 
 from llama_toolchain.common.exec import run_with_pty
 from llama_toolchain.common.serialize import EnumEncoder
-from llama_toolchain.distribution.distribution import api_providers
+from llama_toolchain.core.distribution import api_providers
 
 
 class BuildType(Enum):
@@ -40,7 +40,7 @@ class Dependencies(BaseModel):
 def get_dependencies(
     provider: ProviderSpec, dependencies: Dict[str, ProviderSpec]
 ) -> Dependencies:
-    from llama_toolchain.distribution.distribution import SERVER_DEPENDENCIES
+    from llama_toolchain.core.distribution import SERVER_DEPENDENCIES
 
     pip_packages = provider.pip_packages
     for dep in dependencies.values():

llama_toolchain/core/start_conda_env.sh

@@ -36,6 +36,6 @@ eval "$(conda shell.bash hook)"
 conda deactivate && conda activate "$env_name"
 
 $CONDA_PREFIX/bin/python \
-  -m llama_toolchain.distribution.server \
+  -m llama_toolchain.core.server \
   --yaml_config "$yaml_config" \
   --port "$port" "$@"

llama_toolchain/core/start_container.sh

@@ -37,6 +37,6 @@ podman run -it \
   -p $port:$port \
   -v "$yaml_config:/app/config.yaml" \
   $docker_image \
-  python -m llama_toolchain.distribution.server \
+  python -m llama_toolchain.core.server \
   --yaml_config /app/config.yaml \
   --port $port "$@"

llama_toolchain/inference/adapters/ollama/__init__.py

@@ -4,7 +4,7 @@
 # This source code is licensed under the terms described in the LICENSE file in
 # the root directory of this source tree.
 
-from llama_toolchain.distribution.datatypes import RemoteProviderConfig
+from llama_toolchain.core.datatypes import RemoteProviderConfig
 
 
 async def get_adapter_impl(config: RemoteProviderConfig, _deps):

llama_toolchain/inference/client.py

@@ -13,7 +13,7 @@ import httpx
 from pydantic import BaseModel
 from termcolor import cprint
 
-from llama_toolchain.distribution.datatypes import RemoteProviderConfig
+from llama_toolchain.core.datatypes import RemoteProviderConfig
 
 from .api import (
     ChatCompletionRequest,

llama_toolchain/inference/providers.py

@@ -6,7 +6,7 @@
 
 from typing import List
 
-from llama_toolchain.distribution.datatypes import *  # noqa: F403
+from llama_toolchain.core.datatypes import *  # noqa: F403
 
 
 def available_inference_providers() -> List[ProviderSpec]:

llama_toolchain/memory/client.py

@@ -11,7 +11,7 @@ from typing import Any, Dict, List, Optional
 import fire
 import httpx
 
-from llama_toolchain.distribution.datatypes import RemoteProviderConfig
+from llama_toolchain.core.datatypes import RemoteProviderConfig
 
 from .api import *  # noqa: F403
 

llama_toolchain/memory/providers.py

@@ -6,7 +6,7 @@
 
 from typing import List
 
-from llama_toolchain.distribution.datatypes import Api, InlineProviderSpec, ProviderSpec
+from llama_toolchain.core.datatypes import Api, InlineProviderSpec, ProviderSpec
 
 
 def available_memory_providers() -> List[ProviderSpec]:

llama_toolchain/safety/client.py

@@ -15,7 +15,7 @@ from llama_models.llama3.api.datatypes import UserMessage
 from pydantic import BaseModel
 from termcolor import cprint
 
-from llama_toolchain.distribution.datatypes import RemoteProviderConfig
+from llama_toolchain.core.datatypes import RemoteProviderConfig
 
 from .api import *  # noqa: F403
 

llama_toolchain/safety/providers.py

@@ -6,7 +6,7 @@
 
 from typing import List
 
-from llama_toolchain.distribution.datatypes import Api, InlineProviderSpec, ProviderSpec
+from llama_toolchain.core.datatypes import Api, InlineProviderSpec, ProviderSpec
 
 
 def available_safety_providers() -> List[ProviderSpec]: