From 9c8e88ea9ca756dd10b2db0e68a4166e35c6e5ff Mon Sep 17 00:00:00 2001 From: Sarthak Deshpande <60317842+cheesecake100201@users.noreply.github.com> Date: Wed, 19 Mar 2025 03:30:48 +0530 Subject: [PATCH] fix: Fixed import errors for UI and playground (#1666) # What does this PR do? Fixed import errors for playground and ui --------- Co-authored-by: sarthakdeshpande --- .../distribution/ui/page/distribution/datasets.py | 3 ++- .../distribution/ui/page/distribution/eval_tasks.py | 3 ++- .../distribution/ui/page/distribution/models.py | 3 ++- .../distribution/ui/page/distribution/providers.py | 3 ++- .../distribution/ui/page/distribution/resources.py | 13 +++++++------ .../ui/page/distribution/scoring_functions.py | 3 ++- .../distribution/ui/page/distribution/shields.py | 3 ++- .../distribution/ui/page/distribution/vector_dbs.py | 3 ++- .../distribution/ui/page/evaluations/app_eval.py | 5 +++-- .../distribution/ui/page/evaluations/native_eval.py | 3 ++- llama_stack/distribution/ui/page/playground/chat.py | 3 ++- llama_stack/distribution/ui/page/playground/rag.py | 7 ++++--- 12 files changed, 32 insertions(+), 20 deletions(-) diff --git a/llama_stack/distribution/ui/page/distribution/datasets.py b/llama_stack/distribution/ui/page/distribution/datasets.py index b583c93fd..6842b29a7 100644 --- a/llama_stack/distribution/ui/page/distribution/datasets.py +++ b/llama_stack/distribution/ui/page/distribution/datasets.py @@ -5,7 +5,8 @@ # the root directory of this source tree. import streamlit as st -from modules.api import llama_stack_api + +from llama_stack.distribution.ui.modules.api import llama_stack_api def datasets(): diff --git a/llama_stack/distribution/ui/page/distribution/eval_tasks.py b/llama_stack/distribution/ui/page/distribution/eval_tasks.py index 1428ae9ab..492be4700 100644 --- a/llama_stack/distribution/ui/page/distribution/eval_tasks.py +++ b/llama_stack/distribution/ui/page/distribution/eval_tasks.py @@ -5,7 +5,8 @@ # the root directory of this source tree. import streamlit as st -from modules.api import llama_stack_api + +from llama_stack.distribution.ui.modules.api import llama_stack_api def benchmarks(): diff --git a/llama_stack/distribution/ui/page/distribution/models.py b/llama_stack/distribution/ui/page/distribution/models.py index 3141c1627..f29459098 100644 --- a/llama_stack/distribution/ui/page/distribution/models.py +++ b/llama_stack/distribution/ui/page/distribution/models.py @@ -5,7 +5,8 @@ # the root directory of this source tree. import streamlit as st -from modules.api import llama_stack_api + +from llama_stack.distribution.ui.modules.api import llama_stack_api def models(): diff --git a/llama_stack/distribution/ui/page/distribution/providers.py b/llama_stack/distribution/ui/page/distribution/providers.py index 9aeb7f2a5..c660cb986 100644 --- a/llama_stack/distribution/ui/page/distribution/providers.py +++ b/llama_stack/distribution/ui/page/distribution/providers.py @@ -5,7 +5,8 @@ # the root directory of this source tree. import streamlit as st -from modules.api import llama_stack_api + +from llama_stack.distribution.ui.modules.api import llama_stack_api def providers(): diff --git a/llama_stack/distribution/ui/page/distribution/resources.py b/llama_stack/distribution/ui/page/distribution/resources.py index 684270d4d..5e10e6e80 100644 --- a/llama_stack/distribution/ui/page/distribution/resources.py +++ b/llama_stack/distribution/ui/page/distribution/resources.py @@ -4,14 +4,15 @@ # This source code is licensed under the terms described in the LICENSE file in # the root directory of this source tree. -from page.distribution.benchmarks import benchmarks -from page.distribution.datasets import datasets -from page.distribution.models import models -from page.distribution.scoring_functions import scoring_functions -from page.distribution.shields import shields -from page.distribution.vector_dbs import vector_dbs from streamlit_option_menu import option_menu +from llama_stack.distribution.ui.page.distribution.datasets import datasets +from llama_stack.distribution.ui.page.distribution.eval_tasks import benchmarks +from llama_stack.distribution.ui.page.distribution.models import models +from llama_stack.distribution.ui.page.distribution.scoring_functions import scoring_functions +from llama_stack.distribution.ui.page.distribution.shields import shields +from llama_stack.distribution.ui.page.distribution.vector_dbs import vector_dbs + def resources_page(): options = [ diff --git a/llama_stack/distribution/ui/page/distribution/scoring_functions.py b/llama_stack/distribution/ui/page/distribution/scoring_functions.py index 6a2a08c6d..193146356 100644 --- a/llama_stack/distribution/ui/page/distribution/scoring_functions.py +++ b/llama_stack/distribution/ui/page/distribution/scoring_functions.py @@ -5,7 +5,8 @@ # the root directory of this source tree. import streamlit as st -from modules.api import llama_stack_api + +from llama_stack.distribution.ui.modules.api import llama_stack_api def scoring_functions(): diff --git a/llama_stack/distribution/ui/page/distribution/shields.py b/llama_stack/distribution/ui/page/distribution/shields.py index b5ed27ef9..67d66d64f 100644 --- a/llama_stack/distribution/ui/page/distribution/shields.py +++ b/llama_stack/distribution/ui/page/distribution/shields.py @@ -5,7 +5,8 @@ # the root directory of this source tree. import streamlit as st -from modules.api import llama_stack_api + +from llama_stack.distribution.ui.modules.api import llama_stack_api def shields(): diff --git a/llama_stack/distribution/ui/page/distribution/vector_dbs.py b/llama_stack/distribution/ui/page/distribution/vector_dbs.py index 1c9d06e8d..49a4f25bb 100644 --- a/llama_stack/distribution/ui/page/distribution/vector_dbs.py +++ b/llama_stack/distribution/ui/page/distribution/vector_dbs.py @@ -5,7 +5,8 @@ # the root directory of this source tree. import streamlit as st -from modules.api import llama_stack_api + +from llama_stack.distribution.ui.modules.api import llama_stack_api def vector_dbs(): diff --git a/llama_stack/distribution/ui/page/evaluations/app_eval.py b/llama_stack/distribution/ui/page/evaluations/app_eval.py index 26bc28451..d7bc6388c 100644 --- a/llama_stack/distribution/ui/page/evaluations/app_eval.py +++ b/llama_stack/distribution/ui/page/evaluations/app_eval.py @@ -8,8 +8,9 @@ import json import pandas as pd import streamlit as st -from modules.api import llama_stack_api -from modules.utils import process_dataset + +from llama_stack.distribution.ui.modules.api import llama_stack_api +from llama_stack.distribution.ui.modules.utils import process_dataset def application_evaluation_page(): diff --git a/llama_stack/distribution/ui/page/evaluations/native_eval.py b/llama_stack/distribution/ui/page/evaluations/native_eval.py index 7c39adc4a..97f875e17 100644 --- a/llama_stack/distribution/ui/page/evaluations/native_eval.py +++ b/llama_stack/distribution/ui/page/evaluations/native_eval.py @@ -8,7 +8,8 @@ import json import pandas as pd import streamlit as st -from modules.api import llama_stack_api + +from llama_stack.distribution.ui.modules.api import llama_stack_api def select_benchmark_1(): diff --git a/llama_stack/distribution/ui/page/playground/chat.py b/llama_stack/distribution/ui/page/playground/chat.py index e69f559db..8e7345169 100644 --- a/llama_stack/distribution/ui/page/playground/chat.py +++ b/llama_stack/distribution/ui/page/playground/chat.py @@ -5,7 +5,8 @@ # the root directory of this source tree. import streamlit as st -from modules.api import llama_stack_api + +from llama_stack.distribution.ui.modules.api import llama_stack_api # Sidebar configurations with st.sidebar: diff --git a/llama_stack/distribution/ui/page/playground/rag.py b/llama_stack/distribution/ui/page/playground/rag.py index 7ee934fb7..e2f451668 100644 --- a/llama_stack/distribution/ui/page/playground/rag.py +++ b/llama_stack/distribution/ui/page/playground/rag.py @@ -7,9 +7,10 @@ import streamlit as st from llama_stack_client.lib.agents.agent import Agent from llama_stack_client.lib.agents.event_logger import EventLogger -from llama_stack_client.types.memory_insert_params import Document -from modules.api import llama_stack_api -from modules.utils import data_url_from_file +from llama_stack_client.types.shared.document import Document + +from llama_stack.distribution.ui.modules.api import llama_stack_api +from llama_stack.distribution.ui.modules.utils import data_url_from_file def rag_chat_page():