Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@ llama_stack:
use_as_library_client: false
url: http://localhost:8321
user_data_collection:
feedback_disabled: false
feedback_enabled: true
feedback_storage: "/tmp/data/feedback"
transcripts_disabled: false
transcripts_enabled: true
transcripts_storage: "/tmp/data/transcripts"
```

Expand Down Expand Up @@ -185,9 +185,9 @@ llama_stack:
use_as_library_client: true
library_client_config_path: <path-to-llama-stack-run.yaml-file>
user_data_collection:
feedback_disabled: false
feedback_enabled: true
feedback_storage: "/tmp/data/feedback"
transcripts_disabled: false
transcripts_enabled: true
transcripts_storage: "/tmp/data/transcripts"
```

Expand Down Expand Up @@ -437,9 +437,9 @@ The data collector service is configured through the `user_data_collection.data_

```yaml
user_data_collection:
feedback_disabled: false
feedback_enabled: true
feedback_storage: "/tmp/data/feedback"
transcripts_disabled: false
transcripts_enabled: true
transcripts_storage: "/tmp/data/transcripts"
data_collector:
enabled: true
Expand Down
4 changes: 2 additions & 2 deletions docs/config.puml
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ class "TLSConfiguration" as src.models.config.TLSConfiguration {
}
class "UserDataCollection" as src.models.config.UserDataCollection {
data_collector
feedback_disabled : bool
feedback_enabled : bool
feedback_storage : Optional[str]
transcripts_disabled : bool
transcripts_enabled : bool
transcripts_storage : Optional[str]
check_storage_location_is_set_when_needed() -> Self
}
Expand Down
8 changes: 4 additions & 4 deletions docs/openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -251,9 +251,9 @@
"use_as_library_client": false
},
"user_data_collection": {
"feedback_disabled": false,
"feedback_enabled": false,
"feedback_storage": "/tmp/data/feedback",
"transcripts_disabled": true
"transcripts_enabled": true
},
"mcp_servers": [
{
Expand Down Expand Up @@ -1521,7 +1521,7 @@
},
"UserDataCollection": {
"properties": {
"feedback_disabled": {
"feedback_enabled": {
"type": "boolean",
"title": "Feedback Disabled",
"default": true
Expand All @@ -1537,7 +1537,7 @@
],
"title": "Feedback Storage"
},
"transcripts_disabled": {
"transcripts_enabled": {
"type": "boolean",
"title": "Transcripts Disabled",
"default": true
Expand Down
4 changes: 2 additions & 2 deletions docs/openapi.md
Original file line number Diff line number Diff line change
Expand Up @@ -780,9 +780,9 @@ User data collection configuration.

| Field | Type | Description |
|-------|------|-------------|
| feedback_disabled | boolean | |
| feedback_enabled | boolean | |
| feedback_storage | | |
| transcripts_disabled | boolean | |
| transcripts_enabled | boolean | |
| transcripts_storage | | |
| data_collector | | |

Expand Down
4 changes: 2 additions & 2 deletions lightspeed-stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ llama_stack:
url: http://localhost:8321
api_key: xyzzy
user_data_collection:
feedback_disabled: false
feedback_enabled: true
feedback_storage: "/tmp/data/feedback"
transcripts_disabled: false
transcripts_enabled: true
transcripts_storage: "/tmp/data/transcripts"
data_collector:
enabled: false
Expand Down
4 changes: 2 additions & 2 deletions src/app/endpoints/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
"library_client_config_path": None,
},
"user_data_collection": {
"feedback_disabled": False,
"feedback_enabled": True,
"feedback_storage": "/tmp/data/feedback",
"transcripts_disabled": True,
"transcripts_enabled": False,
"transcripts_storage": None,
},
"mcp_servers": [
Expand Down
2 changes: 1 addition & 1 deletion src/app/endpoints/feedback.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def is_feedback_enabled() -> bool:
Returns:
bool: True if feedback is enabled, False otherwise.
"""
return not configuration.user_data_collection_configuration.feedback_disabled
return configuration.user_data_collection_configuration.feedback_enabled


async def assert_feedback_enabled(_request: Request) -> None:
Expand Down
2 changes: 1 addition & 1 deletion src/app/endpoints/query.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def is_transcripts_enabled() -> bool:
Returns:
bool: True if transcripts is enabled, False otherwise.
"""
return not configuration.user_data_collection_configuration.transcripts_disabled
return configuration.user_data_collection_configuration.transcripts_enabled


def get_agent( # pylint: disable=too-many-arguments,too-many-positional-arguments
Expand Down
8 changes: 4 additions & 4 deletions src/models/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,18 +118,18 @@ def check_data_collector_configuration(self) -> Self:
class UserDataCollection(BaseModel):
"""User data collection configuration."""

feedback_disabled: bool = True
feedback_enabled: bool = False
feedback_storage: Optional[str] = None
transcripts_disabled: bool = True
transcripts_enabled: bool = False
transcripts_storage: Optional[str] = None
data_collector: DataCollectorConfiguration = DataCollectorConfiguration()

@model_validator(mode="after")
def check_storage_location_is_set_when_needed(self) -> Self:
"""Check that storage_location is set when enabled."""
if not self.feedback_disabled and self.feedback_storage is None:
if self.feedback_enabled and self.feedback_storage is None:
raise ValueError("feedback_storage is required when feedback is enabled")
if not self.transcripts_disabled and self.transcripts_storage is None:
if self.transcripts_enabled and self.transcripts_storage is None:
raise ValueError(
"transcripts_storage is required when transcripts is enabled"
)
Expand Down
6 changes: 3 additions & 3 deletions src/services/data_collector.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ def _collect_feedback_files(self) -> List[Path]:
"""Collect all feedback files that need to be collected."""
udc_config = configuration.user_data_collection_configuration

if udc_config.feedback_disabled or not udc_config.feedback_storage:
if not udc_config.feedback_enabled or not udc_config.feedback_storage:
return []

feedback_dir = Path(udc_config.feedback_storage)
Expand All @@ -108,7 +108,7 @@ def _collect_transcript_files(self) -> List[Path]:
"""Collect all transcript files that need to be collected."""
udc_config = configuration.user_data_collection_configuration

if udc_config.transcripts_disabled or not udc_config.transcripts_storage:
if not udc_config.transcripts_enabled or not udc_config.transcripts_storage:
return []

transcripts_dir = Path(udc_config.transcripts_storage)
Expand Down Expand Up @@ -223,7 +223,7 @@ def _cleanup_empty_directories(self) -> None:
"""Remove empty directories from transcript storage."""
udc_config = configuration.user_data_collection_configuration

if udc_config.transcripts_disabled or not udc_config.transcripts_storage:
if not udc_config.transcripts_enabled or not udc_config.transcripts_storage:
return

transcripts_dir = Path(udc_config.transcripts_storage)
Expand Down
2 changes: 1 addition & 1 deletion tests/configuration/lightspeed-stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ llama_stack:
url: http://localhost:8321
api_key: xyzzy
user_data_collection:
feedback_disabled: false
feedback_enabled: true
feedback_storage: "/tmp/data/feedback"
mcp_servers:
- name: "server1"
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/test_configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def test_loading_proper_configuration(configuration_filename: str) -> None:

# check 'user_data_collection' section
udc_config = cfg.user_data_collection_configuration
assert udc_config.feedback_disabled is False
assert udc_config.feedback_enabled is True
assert udc_config.feedback_storage == "/tmp/data/feedback"

# check MCP servers section
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"use_as_library_client": False,
},
"user_data_collection": {
"transcripts_disabled": True,
"transcripts_enabled": False,
},
"mcp_servers": [],
"authentication": {
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/app/endpoints/test_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def test_config_endpoint_handler_configuration_loaded():
"use_as_library_client": False,
},
"user_data_collection": {
"feedback_disabled": True,
"feedback_enabled": False,
},
"authentication": {
"module": "noop",
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/app/endpoints/test_conversations.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def setup_configuration_fixture():
"use_as_library_client": False,
},
"user_data_collection": {
"transcripts_disabled": True,
"transcripts_enabled": False,
},
"mcp_servers": [],
"customization": None,
Expand Down
6 changes: 3 additions & 3 deletions tests/unit/app/endpoints/test_feedback.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@

def test_is_feedback_enabled():
"""Test that is_feedback_enabled returns True when feedback is not disabled."""
configuration.user_data_collection_configuration.feedback_disabled = False
configuration.user_data_collection_configuration.feedback_enabled = True
assert is_feedback_enabled() is True, "Feedback should be enabled"


def test_is_feedback_disabled():
"""Test that is_feedback_enabled returns False when feedback is disabled."""
configuration.user_data_collection_configuration.feedback_disabled = True
configuration.user_data_collection_configuration.feedback_enabled = False
assert is_feedback_enabled() is False, "Feedback should be disabled"


Expand Down Expand Up @@ -127,7 +127,7 @@ def test_store_feedback(mocker):

def test_feedback_status():
"""Test that feedback_status returns the correct status response."""
configuration.user_data_collection_configuration.feedback_disabled = False
configuration.user_data_collection_configuration.feedback_enabled = True

response = feedback_status()
assert response.functionality == "feedback"
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/app/endpoints/test_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def test_info_endpoint():
"use_as_library_client": False,
},
"user_data_collection": {
"feedback_disabled": True,
"feedback_enabled": False,
},
"customization": None,
}
Expand Down
6 changes: 3 additions & 3 deletions tests/unit/app/endpoints/test_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def test_models_endpoint_handler_improper_llama_stack_configuration(mocker):
"use_as_library_client": False,
},
"user_data_collection": {
"transcripts_disabled": True,
"transcripts_enabled": False,
},
"mcp_servers": [],
"customization": None,
Expand Down Expand Up @@ -95,7 +95,7 @@ def test_models_endpoint_handler_configuration_loaded():
"use_as_library_client": False,
},
"user_data_collection": {
"feedback_disabled": True,
"feedback_enabled": False,
},
"customization": None,
}
Expand Down Expand Up @@ -134,7 +134,7 @@ def test_models_endpoint_handler_unable_to_retrieve_models_list(mocker):
"use_as_library_client": False,
},
"user_data_collection": {
"feedback_disabled": True,
"feedback_enabled": False,
},
"customization": None,
}
Expand Down
14 changes: 7 additions & 7 deletions tests/unit/app/endpoints/test_query.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def setup_configuration_fixture():
"use_as_library_client": False,
},
"user_data_collection": {
"transcripts_disabled": True,
"transcripts_enabled": False,
},
"mcp_servers": [],
"customization": None,
Expand Down Expand Up @@ -86,11 +86,11 @@ def test_query_endpoint_handler_configuration_not_loaded(mocker):

def test_is_transcripts_enabled(setup_configuration, mocker):
"""Test that is_transcripts_enabled returns True when transcripts is not disabled."""
# Override the transcripts_disabled setting
# Override the transcripts_enabled setting
mocker.patch.object(
setup_configuration.user_data_collection_configuration,
"transcripts_disabled",
False,
"transcripts_enabled",
True,
)
mocker.patch("app.endpoints.query.configuration", setup_configuration)

Expand All @@ -99,7 +99,7 @@ def test_is_transcripts_enabled(setup_configuration, mocker):

def test_is_transcripts_disabled(setup_configuration, mocker):
"""Test that is_transcripts_enabled returns False when transcripts is disabled."""
# Use default transcripts_disabled=True from setup
# Use default transcripts_enabled=False from setup
mocker.patch("app.endpoints.query.configuration", setup_configuration)

assert is_transcripts_enabled() is False, "Transcripts should be disabled"
Expand All @@ -116,8 +116,8 @@ def _test_query_endpoint_handler(mocker, store_transcript_to_file=False):
]

mock_config = mocker.Mock()
mock_config.user_data_collection_configuration.transcripts_disabled = (
not store_transcript_to_file
mock_config.user_data_collection_configuration.transcripts_enabled = (
store_transcript_to_file
)
mocker.patch("app.endpoints.query.configuration", mock_config)

Expand Down
2 changes: 1 addition & 1 deletion tests/unit/app/endpoints/test_streaming_query.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def setup_configuration_fixture():
"use_as_library_client": False,
},
"user_data_collection": {
"transcripts_disabled": True,
"transcripts_enabled": False,
},
"mcp_servers": [],
}
Expand Down
Loading