From b11fcab5cac08b8183148963e6ecc42aa60f0f3b Mon Sep 17 00:00:00 2001 From: onmete Date: Tue, 22 Jul 2025 13:49:24 +0200 Subject: [PATCH 1/3] Change double negative in user data collection config --- README.md | 12 +++---- docs/config.puml | 4 +-- docs/openapi.json | 8 ++--- docs/openapi.md | 4 +-- lightspeed-stack.yaml | 4 +-- src/app/endpoints/config.py | 4 +-- src/app/endpoints/feedback.py | 2 +- src/app/endpoints/query.py | 2 +- src/models/config.py | 8 ++--- src/services/data_collector.py | 6 ++-- tests/configuration/lightspeed-stack.yaml | 2 +- tests/integration/test_configuration.py | 2 +- tests/unit/__init__.py | 2 +- tests/unit/app/endpoints/test_config.py | 2 +- .../unit/app/endpoints/test_conversations.py | 2 +- tests/unit/app/endpoints/test_feedback.py | 6 ++-- tests/unit/app/endpoints/test_info.py | 2 +- tests/unit/app/endpoints/test_models.py | 6 ++-- tests/unit/app/endpoints/test_query.py | 14 ++++---- .../app/endpoints/test_streaming_query.py | 2 +- tests/unit/models/test_config.py | 34 +++++++++---------- tests/unit/services/test_data_collector.py | 22 ++++++------ tests/unit/test_configuration.py | 18 +++++----- tests/unit/utils/test_common.py | 12 +++---- 24 files changed, 90 insertions(+), 90 deletions(-) diff --git a/README.md b/README.md index 7259c1ef..3729d6ae 100644 --- a/README.md +++ b/README.md @@ -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" ``` @@ -185,9 +185,9 @@ llama_stack: use_as_library_client: true library_client_config_path: 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" ``` @@ -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 diff --git a/docs/config.puml b/docs/config.puml index 4e60727d..d96c9693 100644 --- a/docs/config.puml +++ b/docs/config.puml @@ -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 } diff --git a/docs/openapi.json b/docs/openapi.json index c2b44844..a663dc28 100644 --- a/docs/openapi.json +++ b/docs/openapi.json @@ -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": [ { @@ -1521,7 +1521,7 @@ }, "UserDataCollection": { "properties": { - "feedback_disabled": { + "feedback_enabled": { "type": "boolean", "title": "Feedback Disabled", "default": true @@ -1537,7 +1537,7 @@ ], "title": "Feedback Storage" }, - "transcripts_disabled": { + "transcripts_enabled": { "type": "boolean", "title": "Transcripts Disabled", "default": true diff --git a/docs/openapi.md b/docs/openapi.md index e361ebb8..dd3999e4 100644 --- a/docs/openapi.md +++ b/docs/openapi.md @@ -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 | | | diff --git a/lightspeed-stack.yaml b/lightspeed-stack.yaml index 39c81436..01a36205 100644 --- a/lightspeed-stack.yaml +++ b/lightspeed-stack.yaml @@ -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 diff --git a/src/app/endpoints/config.py b/src/app/endpoints/config.py index 8cedc74d..df4d3be1 100644 --- a/src/app/endpoints/config.py +++ b/src/app/endpoints/config.py @@ -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": [ diff --git a/src/app/endpoints/feedback.py b/src/app/endpoints/feedback.py index 66ecefad..1fcbe656 100644 --- a/src/app/endpoints/feedback.py +++ b/src/app/endpoints/feedback.py @@ -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: diff --git a/src/app/endpoints/query.py b/src/app/endpoints/query.py index a10ed4f4..cb829a95 100644 --- a/src/app/endpoints/query.py +++ b/src/app/endpoints/query.py @@ -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 diff --git a/src/models/config.py b/src/models/config.py index 31cd1551..57799777 100644 --- a/src/models/config.py +++ b/src/models/config.py @@ -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" ) diff --git a/src/services/data_collector.py b/src/services/data_collector.py index 75ca74a7..f87d2503 100644 --- a/src/services/data_collector.py +++ b/src/services/data_collector.py @@ -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) @@ -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) @@ -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) diff --git a/tests/configuration/lightspeed-stack.yaml b/tests/configuration/lightspeed-stack.yaml index a1a2d173..1cf9565c 100644 --- a/tests/configuration/lightspeed-stack.yaml +++ b/tests/configuration/lightspeed-stack.yaml @@ -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" diff --git a/tests/integration/test_configuration.py b/tests/integration/test_configuration.py index 1f27211c..54b1f0cd 100644 --- a/tests/integration/test_configuration.py +++ b/tests/integration/test_configuration.py @@ -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 diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py index 92a33d78..ec6b3577 100644 --- a/tests/unit/__init__.py +++ b/tests/unit/__init__.py @@ -18,7 +18,7 @@ "use_as_library_client": False, }, "user_data_collection": { - "transcripts_disabled": True, + "transcripts_enabled": False, }, "mcp_servers": [], "authentication": { diff --git a/tests/unit/app/endpoints/test_config.py b/tests/unit/app/endpoints/test_config.py index 2c9ac77f..040eedbf 100644 --- a/tests/unit/app/endpoints/test_config.py +++ b/tests/unit/app/endpoints/test_config.py @@ -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", diff --git a/tests/unit/app/endpoints/test_conversations.py b/tests/unit/app/endpoints/test_conversations.py index 01acee4d..0f5456b7 100644 --- a/tests/unit/app/endpoints/test_conversations.py +++ b/tests/unit/app/endpoints/test_conversations.py @@ -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, diff --git a/tests/unit/app/endpoints/test_feedback.py b/tests/unit/app/endpoints/test_feedback.py index 945d7a88..1e2e5df2 100644 --- a/tests/unit/app/endpoints/test_feedback.py +++ b/tests/unit/app/endpoints/test_feedback.py @@ -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" @@ -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" diff --git a/tests/unit/app/endpoints/test_info.py b/tests/unit/app/endpoints/test_info.py index a563c16d..ee45d3fa 100644 --- a/tests/unit/app/endpoints/test_info.py +++ b/tests/unit/app/endpoints/test_info.py @@ -22,7 +22,7 @@ def test_info_endpoint(): "use_as_library_client": False, }, "user_data_collection": { - "feedback_disabled": True, + "feedback_enabled": False, }, "customization": None, } diff --git a/tests/unit/app/endpoints/test_models.py b/tests/unit/app/endpoints/test_models.py index cd5c3150..9b97dee0 100644 --- a/tests/unit/app/endpoints/test_models.py +++ b/tests/unit/app/endpoints/test_models.py @@ -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, @@ -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, } @@ -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, } diff --git a/tests/unit/app/endpoints/test_query.py b/tests/unit/app/endpoints/test_query.py index 3a768440..e634aedc 100644 --- a/tests/unit/app/endpoints/test_query.py +++ b/tests/unit/app/endpoints/test_query.py @@ -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, @@ -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) @@ -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=True from setup mocker.patch("app.endpoints.query.configuration", setup_configuration) assert is_transcripts_enabled() is False, "Transcripts should be disabled" @@ -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) diff --git a/tests/unit/app/endpoints/test_streaming_query.py b/tests/unit/app/endpoints/test_streaming_query.py index 305a2861..f4006ddc 100644 --- a/tests/unit/app/endpoints/test_streaming_query.py +++ b/tests/unit/app/endpoints/test_streaming_query.py @@ -94,7 +94,7 @@ def setup_configuration_fixture(): "use_as_library_client": False, }, "user_data_collection": { - "transcripts_disabled": True, + "transcripts_enabled": False, }, "mcp_servers": [], } diff --git a/tests/unit/models/test_config.py b/tests/unit/models/test_config.py index 1f25d38f..3fa407fe 100644 --- a/tests/unit/models/test_config.py +++ b/tests/unit/models/test_config.py @@ -119,9 +119,9 @@ def test_llama_stack_wrong_configuration_no_config_file() -> None: def test_user_data_collection_feedback_enabled() -> None: """Test the UserDataCollection constructor for feedback.""" # correct configuration - cfg = UserDataCollection(feedback_disabled=True, feedback_storage=None) + cfg = UserDataCollection(feedback_enabled=False, feedback_storage=None) assert cfg is not None - assert cfg.feedback_disabled is True + assert cfg.feedback_enabled is False assert cfg.feedback_storage is None @@ -132,13 +132,13 @@ def test_user_data_collection_feedback_disabled() -> None: ValueError, match="feedback_storage is required when feedback is enabled", ): - UserDataCollection(feedback_disabled=False, feedback_storage=None) + UserDataCollection(feedback_enabled=True, feedback_storage=None) def test_user_data_collection_transcripts_enabled() -> None: """Test the UserDataCollection constructor for transcripts.""" # correct configuration - cfg = UserDataCollection(transcripts_disabled=True, transcripts_storage=None) + cfg = UserDataCollection(transcripts_enabled=False, transcripts_storage=None) assert cfg is not None @@ -149,7 +149,7 @@ def test_user_data_collection_transcripts_disabled() -> None: ValueError, match="transcripts_storage is required when transcripts is enabled", ): - UserDataCollection(transcripts_disabled=False, transcripts_storage=None) + UserDataCollection(transcripts_enabled=True, transcripts_storage=None) def test_user_data_collection_data_collector_enabled() -> None: @@ -317,7 +317,7 @@ def test_configuration_empty_mcp_servers() -> None: library_client_config_path="tests/configuration/run.yaml", ), user_data_collection=UserDataCollection( - feedback_disabled=True, feedback_storage=None + feedback_enabled=False, feedback_storage=None ), mcp_servers=[], customization=None, @@ -339,7 +339,7 @@ def test_configuration_single_mcp_server() -> None: library_client_config_path="tests/configuration/run.yaml", ), user_data_collection=UserDataCollection( - feedback_disabled=True, feedback_storage=None + feedback_enabled=False, feedback_storage=None ), mcp_servers=[mcp_server], customization=None, @@ -367,7 +367,7 @@ def test_configuration_multiple_mcp_servers() -> None: library_client_config_path="tests/configuration/run.yaml", ), user_data_collection=UserDataCollection( - feedback_disabled=True, feedback_storage=None + feedback_enabled=False, feedback_storage=None ), mcp_servers=mcp_servers, customization=None, @@ -390,7 +390,7 @@ def test_dump_configuration(tmp_path) -> None: library_client_config_path="tests/configuration/run.yaml", ), user_data_collection=UserDataCollection( - feedback_disabled=True, feedback_storage=None + feedback_enabled=False, feedback_storage=None ), mcp_servers=[], customization=None, @@ -435,9 +435,9 @@ def test_dump_configuration(tmp_path) -> None: "library_client_config_path": "tests/configuration/run.yaml", }, "user_data_collection": { - "feedback_disabled": True, + "feedback_enabled": False, "feedback_storage": None, - "transcripts_disabled": True, + "transcripts_enabled": False, "transcripts_storage": None, "data_collector": { "enabled": False, @@ -473,7 +473,7 @@ def test_dump_configuration_with_one_mcp_server(tmp_path) -> None: library_client_config_path="tests/configuration/run.yaml", ), user_data_collection=UserDataCollection( - feedback_disabled=True, feedback_storage=None + feedback_enabled=False, feedback_storage=None ), mcp_servers=mcp_servers, customization=None, @@ -513,9 +513,9 @@ def test_dump_configuration_with_one_mcp_server(tmp_path) -> None: "library_client_config_path": "tests/configuration/run.yaml", }, "user_data_collection": { - "feedback_disabled": True, + "feedback_enabled": False, "feedback_storage": None, - "transcripts_disabled": True, + "transcripts_enabled": False, "transcripts_storage": None, "data_collector": { "enabled": False, @@ -559,7 +559,7 @@ def test_dump_configuration_with_more_mcp_servers(tmp_path) -> None: library_client_config_path="tests/configuration/run.yaml", ), user_data_collection=UserDataCollection( - feedback_disabled=True, feedback_storage=None + feedback_enabled=False, feedback_storage=None ), mcp_servers=mcp_servers, customization=None, @@ -605,9 +605,9 @@ def test_dump_configuration_with_more_mcp_servers(tmp_path) -> None: "library_client_config_path": "tests/configuration/run.yaml", }, "user_data_collection": { - "feedback_disabled": True, + "feedback_enabled": False, "feedback_storage": None, - "transcripts_disabled": True, + "transcripts_enabled": False, "transcripts_storage": None, "data_collector": { "enabled": False, diff --git a/tests/unit/services/test_data_collector.py b/tests/unit/services/test_data_collector.py index 03448c4a..d41302ea 100644 --- a/tests/unit/services/test_data_collector.py +++ b/tests/unit/services/test_data_collector.py @@ -51,7 +51,7 @@ def test_run_with_exception(mock_config, mock_sleep) -> None: def test_collect_feedback_files_disabled(mock_config) -> None: """Test collecting feedback files when disabled.""" service = DataCollectorService() - mock_config.user_data_collection_configuration.feedback_disabled = True + mock_config.user_data_collection_configuration.feedback_enabled = False result = service._collect_feedback_files() assert result == [] @@ -61,7 +61,7 @@ def test_collect_feedback_files_disabled(mock_config) -> None: def test_collect_feedback_files_no_storage(mock_config) -> None: """Test collecting feedback files when no storage configured.""" service = DataCollectorService() - mock_config.user_data_collection_configuration.feedback_disabled = False + mock_config.user_data_collection_configuration.feedback_enabled = True mock_config.user_data_collection_configuration.feedback_storage = None result = service._collect_feedback_files() @@ -72,7 +72,7 @@ def test_collect_feedback_files_no_storage(mock_config) -> None: def test_collect_feedback_files_directory_not_exists(mock_config) -> None: """Test collecting feedback files when directory doesn't exist.""" service = DataCollectorService() - mock_config.user_data_collection_configuration.feedback_disabled = False + mock_config.user_data_collection_configuration.feedback_enabled = False mock_config.user_data_collection_configuration.feedback_storage = "/tmp/feedback" with patch("services.data_collector.Path") as mock_path: @@ -86,7 +86,7 @@ def test_collect_feedback_files_directory_not_exists(mock_config) -> None: def test_collect_feedback_files_success(mock_config) -> None: """Test collecting feedback files successfully.""" service = DataCollectorService() - mock_config.user_data_collection_configuration.feedback_disabled = False + mock_config.user_data_collection_configuration.feedback_enabled = True mock_config.user_data_collection_configuration.feedback_storage = "/tmp/feedback" mock_files = [Path("/tmp/feedback/file1.json")] @@ -103,7 +103,7 @@ def test_collect_feedback_files_success(mock_config) -> None: def test_collect_transcript_files_disabled(mock_config) -> None: """Test collecting transcript files when disabled.""" service = DataCollectorService() - mock_config.user_data_collection_configuration.transcripts_disabled = True + mock_config.user_data_collection_configuration.transcripts_enabled = False result = service._collect_transcript_files() assert result == [] @@ -113,7 +113,7 @@ def test_collect_transcript_files_disabled(mock_config) -> None: def test_collect_transcript_files_directory_not_exists(mock_config) -> None: """Test collecting transcript files when directory doesn't exist.""" service = DataCollectorService() - mock_config.user_data_collection_configuration.transcripts_disabled = False + mock_config.user_data_collection_configuration.transcripts_enabled = True mock_config.user_data_collection_configuration.transcripts_storage = ( "/tmp/transcripts" ) @@ -129,7 +129,7 @@ def test_collect_transcript_files_directory_not_exists(mock_config) -> None: def test_collect_transcript_files_success(mock_config) -> None: """Test collecting transcript files successfully.""" service = DataCollectorService() - mock_config.user_data_collection_configuration.transcripts_disabled = False + mock_config.user_data_collection_configuration.transcripts_enabled = True mock_config.user_data_collection_configuration.transcripts_storage = ( "/tmp/transcripts" ) @@ -488,7 +488,7 @@ def test_cleanup_tarball_with_error() -> None: def test_cleanup_empty_directories_disabled(mock_config) -> None: """Test directory cleanup when transcripts disabled.""" service = DataCollectorService() - mock_config.user_data_collection_configuration.transcripts_disabled = True + mock_config.user_data_collection_configuration.transcripts_enabled = False service._cleanup_empty_directories() @@ -497,7 +497,7 @@ def test_cleanup_empty_directories_disabled(mock_config) -> None: def test_cleanup_empty_directories_success(mock_config) -> None: """Test successful directory cleanup.""" service = DataCollectorService() - mock_config.user_data_collection_configuration.transcripts_disabled = False + mock_config.user_data_collection_configuration.transcripts_enabled = True mock_config.user_data_collection_configuration.transcripts_storage = ( "/tmp/transcripts" ) @@ -527,7 +527,7 @@ def test_cleanup_empty_directories_success(mock_config) -> None: def test_cleanup_empty_directories_with_errors(mock_config) -> None: """Test directory cleanup when rmdir operations fail.""" service = DataCollectorService() - mock_config.user_data_collection_configuration.transcripts_disabled = False + mock_config.user_data_collection_configuration.transcripts_enabled = True mock_config.user_data_collection_configuration.transcripts_storage = ( "/tmp/transcripts" ) @@ -559,7 +559,7 @@ def test_cleanup_empty_directories_with_errors(mock_config) -> None: def test_cleanup_empty_directories_directory_not_exists(mock_config) -> None: """Test directory cleanup when transcripts directory doesn't exist.""" service = DataCollectorService() - mock_config.user_data_collection_configuration.transcripts_disabled = False + mock_config.user_data_collection_configuration.transcripts_enabled = True mock_config.user_data_collection_configuration.transcripts_storage = ( "/tmp/transcripts" ) diff --git a/tests/unit/test_configuration.py b/tests/unit/test_configuration.py index cd097e94..22d84783 100644 --- a/tests/unit/test_configuration.py +++ b/tests/unit/test_configuration.py @@ -65,7 +65,7 @@ def test_init_from_dict() -> None: "use_as_library_client": False, }, "user_data_collection": { - "feedback_disabled": True, + "feedback_enabled": False, }, "mcp_servers": [], "customization": None, @@ -96,7 +96,7 @@ def test_init_from_dict() -> None: assert cfg.service_configuration.access_log is True # check for user data collection subsection - assert cfg.user_data_collection_configuration.feedback_disabled is True + assert cfg.user_data_collection_configuration.feedback_enabled is False def test_init_from_dict_with_mcp_servers() -> None: @@ -117,7 +117,7 @@ def test_init_from_dict_with_mcp_servers() -> None: "use_as_library_client": False, }, "user_data_collection": { - "feedback_disabled": True, + "feedback_enabled": False, }, "mcp_servers": [ { @@ -163,7 +163,7 @@ def test_load_proper_configuration(tmpdir) -> None: url: http://localhost:8321 api_key: xyzzy user_data_collection: - feedback_disabled: true + feedback_enabled: false mcp_servers: [] """ ) @@ -195,7 +195,7 @@ def test_load_configuration_with_mcp_servers(tmpdir) -> None: url: http://localhost:8321 api_key: test-key user_data_collection: - feedback_disabled: true + feedback_enabled: false mcp_servers: - name: filesystem-server url: http://localhost:3000 @@ -235,7 +235,7 @@ def test_mcp_servers_property_empty() -> None: "use_as_library_client": False, }, "user_data_collection": { - "feedback_disabled": True, + "feedback_enabled": False, }, "mcp_servers": [], "customization": None, @@ -266,7 +266,7 @@ def test_mcp_servers_property_with_servers() -> None: "use_as_library_client": False, }, "user_data_collection": { - "feedback_disabled": True, + "feedback_enabled": False, }, "mcp_servers": [ { @@ -373,7 +373,7 @@ def test_load_configuration_with_customization_system_prompt_path(tmpdir) -> Non url: http://localhost:8321 api_key: test-key user_data_collection: - feedback_disabled: true + feedback_enabled: false mcp_servers: - name: filesystem-server url: http://localhost:3000 @@ -413,7 +413,7 @@ def test_load_configuration_with_customization_system_prompt(tmpdir) -> None: url: http://localhost:8321 api_key: test-key user_data_collection: - feedback_disabled: true + feedback_enabled: false mcp_servers: - name: filesystem-server url: http://localhost:3000 diff --git a/tests/unit/utils/test_common.py b/tests/unit/utils/test_common.py index 145e4314..e73694a9 100644 --- a/tests/unit/utils/test_common.py +++ b/tests/unit/utils/test_common.py @@ -41,7 +41,7 @@ async def test_register_mcp_servers_empty_list(mocker): llama_stack=LlamaStackConfiguration( use_as_library_client=False, url="http://localhost:8321" ), - user_data_collection=UserDataCollection(feedback_disabled=True), + user_data_collection=UserDataCollection(feedback_enabled=False), mcp_servers=[], customization=None, ) @@ -81,7 +81,7 @@ async def test_register_mcp_servers_single_server_not_registered(mocker): llama_stack=LlamaStackConfiguration( use_as_library_client=False, url="http://localhost:8321" ), - user_data_collection=UserDataCollection(feedback_disabled=True), + user_data_collection=UserDataCollection(feedback_enabled=False), mcp_servers=[mcp_server], customization=None, ) @@ -125,7 +125,7 @@ async def test_register_mcp_servers_single_server_already_registered(mocker): llama_stack=LlamaStackConfiguration( use_as_library_client=False, url="http://localhost:8321" ), - user_data_collection=UserDataCollection(feedback_disabled=True), + user_data_collection=UserDataCollection(feedback_enabled=False), mcp_servers=[mcp_server], customization=None, ) @@ -172,7 +172,7 @@ async def test_register_mcp_servers_multiple_servers_mixed_registration(mocker): llama_stack=LlamaStackConfiguration( use_as_library_client=False, url="http://localhost:8321" ), - user_data_collection=UserDataCollection(feedback_disabled=True), + user_data_collection=UserDataCollection(feedback_enabled=False), mcp_servers=mcp_servers, customization=None, ) @@ -226,7 +226,7 @@ async def test_register_mcp_servers_with_custom_provider(mocker): llama_stack=LlamaStackConfiguration( use_as_library_client=False, url="http://localhost:8321" ), - user_data_collection=UserDataCollection(feedback_disabled=True), + user_data_collection=UserDataCollection(feedback_enabled=False), mcp_servers=[mcp_server], customization=None, ) @@ -271,7 +271,7 @@ async def test_register_mcp_servers_async_with_library_client(mocker): use_as_library_client=True, library_client_config_path="tests/configuration/run.yaml", ), - user_data_collection=UserDataCollection(feedback_disabled=True), + user_data_collection=UserDataCollection(feedback_enabled=False), mcp_servers=[mcp_server], customization=None, ) From 2d62be9423a6988bf958445fa1ad4ed5dd7d3494 Mon Sep 17 00:00:00 2001 From: Ondrej Metelka Date: Tue, 22 Jul 2025 14:08:24 +0200 Subject: [PATCH 2/3] Update tests/unit/services/test_data_collector.py Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- tests/unit/services/test_data_collector.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/services/test_data_collector.py b/tests/unit/services/test_data_collector.py index d41302ea..b2103ad5 100644 --- a/tests/unit/services/test_data_collector.py +++ b/tests/unit/services/test_data_collector.py @@ -72,7 +72,7 @@ def test_collect_feedback_files_no_storage(mock_config) -> None: def test_collect_feedback_files_directory_not_exists(mock_config) -> None: """Test collecting feedback files when directory doesn't exist.""" service = DataCollectorService() - mock_config.user_data_collection_configuration.feedback_enabled = False + mock_config.user_data_collection_configuration.feedback_enabled = True mock_config.user_data_collection_configuration.feedback_storage = "/tmp/feedback" with patch("services.data_collector.Path") as mock_path: From d40883fcca654001defe2d6be7b1550685461b6f Mon Sep 17 00:00:00 2001 From: Ondrej Metelka Date: Tue, 22 Jul 2025 14:08:49 +0200 Subject: [PATCH 3/3] Update tests/unit/app/endpoints/test_query.py Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- tests/unit/app/endpoints/test_query.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/app/endpoints/test_query.py b/tests/unit/app/endpoints/test_query.py index e634aedc..d099a6c7 100644 --- a/tests/unit/app/endpoints/test_query.py +++ b/tests/unit/app/endpoints/test_query.py @@ -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_enabled=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"