Skip to content

Commit f9a17ea

Browse files
OLS-1946: Change double negative in user data collection config (#271)
* Change double negative in user data collection config * Update tests/unit/services/test_data_collector.py Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * Update tests/unit/app/endpoints/test_query.py Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
1 parent e2be77d commit f9a17ea

24 files changed

+90
-90
lines changed

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@ llama_stack:
106106
use_as_library_client: false
107107
url: http://localhost:8321
108108
user_data_collection:
109-
feedback_disabled: false
109+
feedback_enabled: true
110110
feedback_storage: "/tmp/data/feedback"
111-
transcripts_disabled: false
111+
transcripts_enabled: true
112112
transcripts_storage: "/tmp/data/transcripts"
113113
```
114114
@@ -185,9 +185,9 @@ llama_stack:
185185
use_as_library_client: true
186186
library_client_config_path: <path-to-llama-stack-run.yaml-file>
187187
user_data_collection:
188-
feedback_disabled: false
188+
feedback_enabled: true
189189
feedback_storage: "/tmp/data/feedback"
190-
transcripts_disabled: false
190+
transcripts_enabled: true
191191
transcripts_storage: "/tmp/data/transcripts"
192192
```
193193

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

438438
```yaml
439439
user_data_collection:
440-
feedback_disabled: false
440+
feedback_enabled: true
441441
feedback_storage: "/tmp/data/feedback"
442-
transcripts_disabled: false
442+
transcripts_enabled: true
443443
transcripts_storage: "/tmp/data/transcripts"
444444
data_collector:
445445
enabled: true

docs/config.puml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ class "TLSConfiguration" as src.models.config.TLSConfiguration {
6363
}
6464
class "UserDataCollection" as src.models.config.UserDataCollection {
6565
data_collector
66-
feedback_disabled : bool
66+
feedback_enabled : bool
6767
feedback_storage : Optional[str]
68-
transcripts_disabled : bool
68+
transcripts_enabled : bool
6969
transcripts_storage : Optional[str]
7070
check_storage_location_is_set_when_needed() -> Self
7171
}

docs/openapi.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,9 @@
251251
"use_as_library_client": false
252252
},
253253
"user_data_collection": {
254-
"feedback_disabled": false,
254+
"feedback_enabled": false,
255255
"feedback_storage": "/tmp/data/feedback",
256-
"transcripts_disabled": true
256+
"transcripts_enabled": true
257257
},
258258
"mcp_servers": [
259259
{
@@ -1543,7 +1543,7 @@
15431543
},
15441544
"UserDataCollection": {
15451545
"properties": {
1546-
"feedback_disabled": {
1546+
"feedback_enabled": {
15471547
"type": "boolean",
15481548
"title": "Feedback Disabled",
15491549
"default": true
@@ -1559,7 +1559,7 @@
15591559
],
15601560
"title": "Feedback Storage"
15611561
},
1562-
"transcripts_disabled": {
1562+
"transcripts_enabled": {
15631563
"type": "boolean",
15641564
"title": "Transcripts Disabled",
15651565
"default": true

docs/openapi.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -780,9 +780,9 @@ User data collection configuration.
780780

781781
| Field | Type | Description |
782782
|-------|------|-------------|
783-
| feedback_disabled | boolean | |
783+
| feedback_enabled | boolean | |
784784
| feedback_storage | | |
785-
| transcripts_disabled | boolean | |
785+
| transcripts_enabled | boolean | |
786786
| transcripts_storage | | |
787787
| data_collector | | |
788788

lightspeed-stack.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ llama_stack:
1616
url: http://localhost:8321
1717
api_key: xyzzy
1818
user_data_collection:
19-
feedback_disabled: false
19+
feedback_enabled: true
2020
feedback_storage: "/tmp/data/feedback"
21-
transcripts_disabled: false
21+
transcripts_enabled: true
2222
transcripts_storage: "/tmp/data/transcripts"
2323
data_collector:
2424
enabled: false

src/app/endpoints/config.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
"library_client_config_path": None,
3737
},
3838
"user_data_collection": {
39-
"feedback_disabled": False,
39+
"feedback_enabled": True,
4040
"feedback_storage": "/tmp/data/feedback",
41-
"transcripts_disabled": True,
41+
"transcripts_enabled": False,
4242
"transcripts_storage": None,
4343
},
4444
"mcp_servers": [

src/app/endpoints/feedback.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def is_feedback_enabled() -> bool:
4444
Returns:
4545
bool: True if feedback is enabled, False otherwise.
4646
"""
47-
return not configuration.user_data_collection_configuration.feedback_disabled
47+
return configuration.user_data_collection_configuration.feedback_enabled
4848

4949

5050
async def assert_feedback_enabled(_request: Request) -> None:

src/app/endpoints/query.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def is_transcripts_enabled() -> bool:
7070
Returns:
7171
bool: True if transcripts is enabled, False otherwise.
7272
"""
73-
return not configuration.user_data_collection_configuration.transcripts_disabled
73+
return configuration.user_data_collection_configuration.transcripts_enabled
7474

7575

7676
def get_agent( # pylint: disable=too-many-arguments,too-many-positional-arguments

src/models/config.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,18 +129,18 @@ def check_data_collector_configuration(self) -> Self:
129129
class UserDataCollection(BaseModel):
130130
"""User data collection configuration."""
131131

132-
feedback_disabled: bool = True
132+
feedback_enabled: bool = False
133133
feedback_storage: Optional[str] = None
134-
transcripts_disabled: bool = True
134+
transcripts_enabled: bool = False
135135
transcripts_storage: Optional[str] = None
136136
data_collector: DataCollectorConfiguration = DataCollectorConfiguration()
137137

138138
@model_validator(mode="after")
139139
def check_storage_location_is_set_when_needed(self) -> Self:
140140
"""Check that storage_location is set when enabled."""
141-
if not self.feedback_disabled and self.feedback_storage is None:
141+
if self.feedback_enabled and self.feedback_storage is None:
142142
raise ValueError("feedback_storage is required when feedback is enabled")
143-
if not self.transcripts_disabled and self.transcripts_storage is None:
143+
if self.transcripts_enabled and self.transcripts_storage is None:
144144
raise ValueError(
145145
"transcripts_storage is required when transcripts is enabled"
146146
)

src/services/data_collector.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def _collect_feedback_files(self) -> List[Path]:
9595
"""Collect all feedback files that need to be collected."""
9696
udc_config = configuration.user_data_collection_configuration
9797

98-
if udc_config.feedback_disabled or not udc_config.feedback_storage:
98+
if not udc_config.feedback_enabled or not udc_config.feedback_storage:
9999
return []
100100

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

111-
if udc_config.transcripts_disabled or not udc_config.transcripts_storage:
111+
if not udc_config.transcripts_enabled or not udc_config.transcripts_storage:
112112
return []
113113

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

226-
if udc_config.transcripts_disabled or not udc_config.transcripts_storage:
226+
if not udc_config.transcripts_enabled or not udc_config.transcripts_storage:
227227
return
228228

229229
transcripts_dir = Path(udc_config.transcripts_storage)

0 commit comments

Comments
 (0)