From fa1d29cfdc12654e8195fe1c7229a12b493a64fb Mon Sep 17 00:00:00 2001 From: Ashwin Bharambe Date: Sun, 17 Nov 2024 20:42:11 -0800 Subject: [PATCH] kill built_at field in run config --- distributions/bedrock/run.yaml | 1 - distributions/dell-tgi/run.yaml | 1 - distributions/fireworks/run.yaml | 1 - distributions/inline-vllm/run.yaml | 1 - distributions/meta-reference-gpu/run.yaml | 1 - distributions/meta-reference-quantized-gpu/run.yaml | 1 - distributions/ollama-gpu/run.yaml | 1 - distributions/ollama/run.yaml | 1 - distributions/remote-vllm/run.yaml | 1 - distributions/tgi/run.yaml | 1 - distributions/together/run.yaml | 1 - llama_stack/cli/stack/build.py | 1 - llama_stack/distribution/datatypes.py | 3 --- llama_stack/providers/tests/resolver.py | 2 -- llama_stack/templates/template.py | 3 --- 15 files changed, 20 deletions(-) diff --git a/distributions/bedrock/run.yaml b/distributions/bedrock/run.yaml index 45e8aa7b5..2f7cb36ef 100644 --- a/distributions/bedrock/run.yaml +++ b/distributions/bedrock/run.yaml @@ -1,5 +1,4 @@ version: '2' -built_at: '2024-11-01T17:40:45.325529' image_name: local name: bedrock docker_image: null diff --git a/distributions/dell-tgi/run.yaml b/distributions/dell-tgi/run.yaml index 4b7b331fe..3f8a98779 100644 --- a/distributions/dell-tgi/run.yaml +++ b/distributions/dell-tgi/run.yaml @@ -1,5 +1,4 @@ version: '2' -built_at: '2024-10-08T17:40:45.325529' image_name: local docker_image: null conda_env: local diff --git a/distributions/fireworks/run.yaml b/distributions/fireworks/run.yaml index d2903aabb..f289cee72 100644 --- a/distributions/fireworks/run.yaml +++ b/distributions/fireworks/run.yaml @@ -1,5 +1,4 @@ version: '2' -built_at: '2024-10-08T17:40:45.325529' image_name: local docker_image: null conda_env: local diff --git a/distributions/inline-vllm/run.yaml b/distributions/inline-vllm/run.yaml index b998727c0..f42c942a3 100644 --- a/distributions/inline-vllm/run.yaml +++ b/distributions/inline-vllm/run.yaml @@ -1,5 +1,4 @@ version: '2' -built_at: '2024-10-08T17:40:45.325529' image_name: local docker_image: null conda_env: local diff --git a/distributions/meta-reference-gpu/run.yaml b/distributions/meta-reference-gpu/run.yaml index 13d3787e1..3645cb75b 100644 --- a/distributions/meta-reference-gpu/run.yaml +++ b/distributions/meta-reference-gpu/run.yaml @@ -1,5 +1,4 @@ version: '2' -built_at: '2024-10-08T17:40:45.325529' image_name: local docker_image: null conda_env: local diff --git a/distributions/meta-reference-quantized-gpu/run.yaml b/distributions/meta-reference-quantized-gpu/run.yaml index d5012852d..19c726b09 100644 --- a/distributions/meta-reference-quantized-gpu/run.yaml +++ b/distributions/meta-reference-quantized-gpu/run.yaml @@ -1,5 +1,4 @@ version: '2' -built_at: '2024-10-08T17:40:45.325529' image_name: local docker_image: null conda_env: local diff --git a/distributions/ollama-gpu/run.yaml b/distributions/ollama-gpu/run.yaml index 1d928ec25..25471c69f 100644 --- a/distributions/ollama-gpu/run.yaml +++ b/distributions/ollama-gpu/run.yaml @@ -1,5 +1,4 @@ version: '2' -built_at: '2024-10-08T17:40:45.325529' image_name: local docker_image: null conda_env: local diff --git a/distributions/ollama/run.yaml b/distributions/ollama/run.yaml index 110b63b0c..5d5e474e5 100644 --- a/distributions/ollama/run.yaml +++ b/distributions/ollama/run.yaml @@ -1,5 +1,4 @@ version: '2' -built_at: 2024-11-17 19:33:00 image_name: ollama docker_image: null conda_env: null diff --git a/distributions/remote-vllm/run.yaml b/distributions/remote-vllm/run.yaml index 4617a48d2..fbda1dae8 100644 --- a/distributions/remote-vllm/run.yaml +++ b/distributions/remote-vllm/run.yaml @@ -1,5 +1,4 @@ version: '2' -built_at: 2024-11-17 19:33:00 image_name: remote-vllm docker_image: llamastack/distribution-remote-vllm:test-0.0.52rc3 conda_env: null diff --git a/distributions/tgi/run.yaml b/distributions/tgi/run.yaml index fea2f5da8..ca462d6b1 100644 --- a/distributions/tgi/run.yaml +++ b/distributions/tgi/run.yaml @@ -1,5 +1,4 @@ version: '2' -built_at: 2024-11-17 19:33:00 image_name: tgi docker_image: llamastack/distribution-tgi:test-0.0.52rc3 conda_env: null diff --git a/distributions/together/run.yaml b/distributions/together/run.yaml index 142316a8d..de7ae3c53 100644 --- a/distributions/together/run.yaml +++ b/distributions/together/run.yaml @@ -1,5 +1,4 @@ version: '2' -built_at: '2024-10-08T17:40:45.325529' image_name: local docker_image: null conda_env: local diff --git a/llama_stack/cli/stack/build.py b/llama_stack/cli/stack/build.py index f7631bca3..56d0151f3 100644 --- a/llama_stack/cli/stack/build.py +++ b/llama_stack/cli/stack/build.py @@ -193,7 +193,6 @@ class StackBuild(Subcommand): apis = list(build_config.distribution_spec.providers.keys()) run_config = StackRunConfig( - built_at=datetime.now(), docker_image=( build_config.name if build_config.image_type == ImageType.docker.value diff --git a/llama_stack/distribution/datatypes.py b/llama_stack/distribution/datatypes.py index 4aaf9c38a..c2bff4eed 100644 --- a/llama_stack/distribution/datatypes.py +++ b/llama_stack/distribution/datatypes.py @@ -4,8 +4,6 @@ # This source code is licensed under the terms described in the LICENSE file in # the root directory of this source tree. -from datetime import datetime - from typing import Dict, List, Optional, Union from pydantic import BaseModel, Field @@ -115,7 +113,6 @@ class Provider(BaseModel): class StackRunConfig(BaseModel): version: str = LLAMA_STACK_RUN_CONFIG_VERSION - built_at: datetime image_name: str = Field( ..., diff --git a/llama_stack/providers/tests/resolver.py b/llama_stack/providers/tests/resolver.py index df927926e..8bbb902cd 100644 --- a/llama_stack/providers/tests/resolver.py +++ b/llama_stack/providers/tests/resolver.py @@ -6,7 +6,6 @@ import json import tempfile -from datetime import datetime from typing import Any, Dict, List, Optional from llama_stack.distribution.datatypes import * # noqa: F403 @@ -37,7 +36,6 @@ async def construct_stack_for_test( ) -> TestStack: sqlite_file = tempfile.NamedTemporaryFile(delete=False, suffix=".db") run_config = dict( - built_at=datetime.now(), image_name="test-fixture", apis=apis, providers=providers, diff --git a/llama_stack/templates/template.py b/llama_stack/templates/template.py index feddadb9a..50d24b256 100644 --- a/llama_stack/templates/template.py +++ b/llama_stack/templates/template.py @@ -4,8 +4,6 @@ # This source code is licensed under the terms described in the LICENSE file in # the root directory of this source tree. -from datetime import datetime - from io import StringIO from pathlib import Path @@ -87,7 +85,6 @@ class RunConfigSettings(BaseModel): return StackRunConfig( image_name=name, docker_image=docker_image, - built_at=datetime.now().strftime("%Y-%m-%d %H:%M"), apis=list(apis), providers=provider_configs, metadata_store=SqliteKVStoreConfig.sample_run_config(