Skip to content

Commit b81b4da

Browse files
committed
Refactor: UI Enhancements, Dependency Updates, and CI Fixes
1 parent a8ec134 commit b81b4da

File tree

17 files changed

+2092
-2001
lines changed

17 files changed

+2092
-2001
lines changed

Makefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,12 @@ setup: ## Setup project with examples and database
3838
fi; \
3939
done
4040
@echo "Setting up database..."
41-
@uv run python -m demo_and_setup.first_experiment
41+
@if [ "$(force)" = "true" ]; then \
42+
echo "Force option detected. Recreating database."; \
43+
uv run python -m demo_and_setup.first_experiment --force; \
44+
else \
45+
uv run python -m demo_and_setup.first_experiment; \
46+
fi
4247
@echo "$(GREEN)✅ Setup complete!$(NC)"
4348
@echo "Edit .streamlit/secrets.toml with your credentials"
4449

app.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@
5858
st.write(f"Page mode: `{app_ctx.page_mode}`")
5959
st.write(app_ctx.selected)
6060

61-
experiments_page = st.Page("src/ui/experiments/page.py", title="Experiments", url_path="experiments")
62-
observations_page = st.Page("src/ui/observations/page.py", title="Observations", url_path="observations")
63-
planner_page = st.Page("src/ui/planner/page.py", title="Planner", url_path="planner")
64-
results_page = st.Page("src/ui/results/page.py", title="Results", url_path="results")
61+
experiments_page = st.Page("src/ui/experiments/page.py", title="Experiments", url_path="experiments", icon=":material/science:")
62+
observations_page = st.Page("src/ui/observations/page.py", title="Observations", url_path="observations", icon=":material/table_chart:")
63+
planner_page = st.Page("src/ui/planner/page.py", title="Planner", url_path="planner", icon=":material/event:")
64+
results_page = st.Page("src/ui/results/page.py", title="Results", url_path="results", icon=":material/analytics:")
6565

6666
pg = st.navigation([
6767
experiments_page,

assistant/core/schemas.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from typing import Any, Literal
77

88
from pydantic import BaseModel, Field
9-
from pydantic_ai.usage import Usage
9+
from pydantic_ai.usage import RunUsage
1010

1111
from assistant.vdb import VectorDB
1212

@@ -98,7 +98,7 @@ class OrchestrationResult:
9898

9999
output: AgentsOutput
100100
message_history: list[Any]
101-
usage: Usage
101+
usage: RunUsage
102102
thinking: str | None
103103

104104

@@ -110,7 +110,7 @@ class AssistantResponse:
110110
"""
111111

112112
output: AgentsOutput
113-
usage: Usage
113+
usage: RunUsage
114114
thinking: str | None
115115

116116

@@ -123,4 +123,4 @@ class ChatHistory:
123123
"""
124124

125125
message_history: list[Any]
126-
usage: Usage
126+
usage: RunUsage

assistant/core/service.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
pass
1313

1414
from cachetools import TTLCache # type: ignore[import-untyped]
15-
from pydantic_ai.usage import Usage
15+
from pydantic_ai.usage import RunUsage
1616

1717
from assistant.core.agents import AgentOrchestrator
1818
from assistant.core.schemas import AssistantResponse, ChatHistory, Deps, UserData
@@ -46,7 +46,7 @@ async def process_request(self, data: UserData, deps: Deps) -> AssistantResponse
4646
"""
4747

4848
if data.chat_uid not in self.memory:
49-
self.memory[data.chat_uid] = ChatHistory(message_history=[], usage=Usage())
49+
self.memory[data.chat_uid] = ChatHistory(message_history=[], usage=RunUsage())
5050

5151
chat_history = self.memory[data.chat_uid]
5252

assistant/utils.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
TextPart,
1515
ThinkingPart,
1616
)
17-
from pydantic_ai.usage import Usage
17+
from pydantic_ai.usage import RequestUsage
1818

1919
from src.logger_setup import logger
2020

@@ -74,10 +74,10 @@ def drop_empty_messages(messages: list[ModelMessage]) -> list[ModelMessage]:
7474
cleaned.append(
7575
ModelResponse(
7676
parts=res_parts,
77-
usage=getattr(msg, "usage", None) or Usage(),
77+
usage=getattr(msg, "usage", None) or RequestUsage(),
7878
model_name=getattr(msg, "model_name", None),
7979
timestamp=getattr(msg, "timestamp", None) or datetime.now(),
80-
vendor_id=getattr(msg, "vendor_id", None),
80+
provider_response_id=getattr(msg, "provider_response_id", None),
8181
)
8282
)
8383

assistant/vdb.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
from typing import TYPE_CHECKING, Literal
88

99
import chromadb
10+
from chromadb.config import Settings
1011

1112
from src.logger_setup import logger
1213
from src.services.metric_register import Metrics
@@ -70,7 +71,7 @@ def __init__(
7071
self.metrics_directory: Path = Path(metrics_directory) if metrics_directory else Path(".")
7172
self.docs_directory: Path = Path(docs_directory)
7273
self.root_directory: Path = Path(root_directory)
73-
self.chroma_client: ClientAPI = chromadb.Client()
74+
self.chroma_client: ClientAPI = chromadb.Client(Settings(anonymized_telemetry=False))
7475
self.metric_collection: chromadb.Collection | None = None
7576
self.docs_collection: chromadb.Collection | None = None
7677
self.code_collection: chromadb.Collection | None = None

0 commit comments

Comments
 (0)