fix(tests): Fixed multiple tests and test setup issues, settings iniitialization

Author: bashandbone

pyproject.toml

@@ -10,6 +10,7 @@ name = "code-weaver"
 description = "Extensible MCP server for semantic code search with plugin architecture supporting multiple embedding providers, vector databases, and data sources."
 readme = { file = "README.md", content-type = "text/markdown" }
 requires-python = ">=3.12"
+license = "MIT OR Apache-2.0"
 license-files = [
   "./LICENSE-Apache-2.0",
   "./LICENSE-MIT",

src/codeweaver/cli/commands/config.py

@@ -22,6 +22,7 @@
 from codeweaver.core.config.types import CodeWeaverSettingsDict
 from codeweaver.core.dependencies import ResolvedProjectPathDep, SettingsDep
 from codeweaver.core.di import INJECTED
+from codeweaver.core.types import UNSET
 from codeweaver.core.utils import detect_root_package, is_codeweaver_config_path
 from codeweaver.engine import ConfigChangeAnalyzerDep
 from codeweaver.providers import ProviderSettings, ProviderSettingsDep
@@ -125,11 +126,9 @@ def _normalize_provider_configs(
     field: Literal["vector_store", "reranking", "embedding", "sparse_embedding", "agent", "data"],
 ) -> tuple[ProviderSettings, ...]:
     """Normalize provider configs to a tuple of valid config dicts."""
-    from codeweaver.core.types import Unset
-
     if isinstance(configs, tuple):
         return configs
-    if configs is None or isinstance(configs, Unset):
+    if configs is None or configs is UNSET:
         if detect_root_package() == "core":
             return ()
         from codeweaver.providers.config.profiles import ProviderProfile
@@ -160,11 +159,9 @@ def _build_provider_details(config) -> str:
 
 def _show_provider_config(provider_settings: ProviderSettingsDep = INJECTED) -> None:
     """Display provider configuration details."""
-    from codeweaver.core import Unset
-
     display.print_section("Provider Configuration")
 
-    if not provider_settings or isinstance(provider_settings, Unset):
+    if not provider_settings or provider_settings is UNSET:
         display.print_warning("No providers configured")
         return
 
@@ -178,7 +175,7 @@ def _show_provider_config(provider_settings: ProviderSettingsDep = INJECTED) ->
     )
 
     for category, configs in provider_settings.items():
-        if category not in valid_categories or not configs or isinstance(configs, Unset):
+        if category not in valid_categories or not configs or configs is UNSET:
             continue
 
         config_list = _normalize_provider_configs(configs, field=category)  # ty:ignore[invalid-argument-type]
@@ -192,7 +189,7 @@ def _show_provider_config(provider_settings: ProviderSettingsDep = INJECTED) ->
         table.add_column("Details", style="white")
 
         for config in config_list:
-            if config is None or isinstance(config, Unset):
+            if config is None or config is UNSET:
                 continue
 
             provider = config.get("provider")

src/codeweaver/cli/commands/doctor.py

@@ -29,15 +29,14 @@
 from codeweaver.core import (
     ProviderCategory,
     SettingsMapDep,
-    Unset,
     get_codeweaver_config_paths,
     get_project_path,
     is_git_dir,
 )
 from codeweaver.core.config.settings_type import CodeWeaverSettingsType
 from codeweaver.core.config.types import CodeWeaverSettingsDict
 from codeweaver.core.di import INJECTED
-from codeweaver.core.types.dictview import DictView
+from codeweaver.core.types import UNSET, DictView
 from codeweaver.core.utils import has_package
 from codeweaver.engine import ConfigChangeAnalyzerDep
 
@@ -291,8 +290,8 @@ def check_configuration_file(settings: CodeWeaverSettingsType) -> DoctorCheck:
             check.message = f"Valid config at {found_config}"
         elif (
             settings.config_file
-            and not isinstance(settings.config_file, Unset)
-            and settings.config_file.exists()
+            and settings.config_file is not UNSET
+            and cast(Path, settings.config_file).exists()
         ):
             # Fallback to settings.config_file if set
             check.status = "✅"
@@ -373,7 +372,7 @@ async def check_vector_store_config(settings: ProviderSettings) -> DoctorCheck:
     check = DoctorCheck("Vector Store Configuration")
 
     # Check if vector store is configured in provider settings
-    if isinstance(settings.vector_store, Unset):
+    if settings.vector_store is UNSET:
         return DoctorCheck.set_check(
             check.name,
             "warn",
@@ -902,13 +901,13 @@ async def process_checks(
                 ["Check logs for details", "Report issue if this persists"],
             )
         )
-    if config_failed or settings is None or isinstance(settings, Unset):
+    if config_failed or settings is None or settings is UNSET:
         return checks
     checks.extend((check_project_path(settings), check_indexer_config(settings)))
     if (
         not hasattr(settings, "provider")
         or not (provider_settings := settings.provider)
-        or isinstance(provider_settings, Unset)
+        or provider_settings is UNSET
     ):
         checks.append(
             DoctorCheck.set_check(
@@ -941,7 +940,7 @@ async def process_checks(
     if (
         not hasattr(settings, "provider")
         or not (provider_settings := settings.provider)
-        or isinstance(provider_settings, Unset)
+        or provider_settings is UNSET
     ):
         return checks
     if remote_providers := {

src/codeweaver/cli/commands/index.py

@@ -19,11 +19,11 @@
 
 from codeweaver.cli.dependencies import setup_cli_di
 from codeweaver.cli.ui import CLIErrorHandler, IndexingProgress, StatusDisplay, get_display
-from codeweaver.core import CodeWeaverError, SettingsMapDep, Unset
+from codeweaver.core import CodeWeaverError, SettingsMapDep
 from codeweaver.core.config.types import CodeWeaverSettingsDict
 from codeweaver.core.constants import ONE_MINUTE
 from codeweaver.core.di.depends import INJECTED
-from codeweaver.core.types.dictview import DictView
+from codeweaver.core.types import UNSET, DictView
 from codeweaver.engine import CheckpointManager, FileManifestManager
 from codeweaver.engine.services.indexing_service import IndexingService
 from codeweaver.providers import VectorStoreProvider
@@ -87,7 +87,7 @@ async def _derive_collection_name(
         (provider_settings := settings.provider)
         and isinstance(provider_settings, ProviderSettings)
         and (vector_settings := provider_settings.vector_store)
-        and vector_settings is not Unset
+        and vector_settings is not UNSET
     ):
         return (
             vector_settings[0].collection.collection_name

src/codeweaver/cli/commands/init.py

@@ -135,17 +135,18 @@ def _create_codeweaver_config(
     config_path.parent.mkdir(parents=True, exist_ok=True)
 
     # Create settings from profile (don't use DI since container isn't initialized yet)
-    from codeweaver.providers.config.providers import ProviderSettings
     from codeweaver.server.config.settings import CodeWeaverSettings
 
-    settings = CodeWeaverSettings(
-        project_path=project_path,
-        project_name=project_path.name,
-        config_file=config_path,
-        provider=ProviderSettings.model_construct(**(profile.as_provider_settings())),
-    )
+    # Use model_validate to ensure all fields are correctly marked as "set"
+    # and not just passed through the constructor which might ignore them.
+    settings = CodeWeaverSettings.model_validate({
+        "project_path": project_path,
+        "project_name": project_path.name,
+        "config_file": config_path,
+        "provider": profile.as_provider_settings(),
+    })
 
-    # Save to TOML file
+    # Save to TOML file using the robust settings method
     settings.save_to_file(config_path)
 
     display.print_success(f"Created configuration file: {config_path}")

src/codeweaver/cli/commands/start.py

@@ -26,6 +26,7 @@
 
 from codeweaver.cli.ui import CLIErrorHandler, StatusDisplay, get_display
 from codeweaver.core import (
+    UNSET,
     CodeWeaverSettingsType,
     ProgressReporter,
     ProgressReporterDep,
@@ -264,19 +265,17 @@ async def wait_for_shutdown() -> None:
 
 def get_network_settings() -> NetworkConfig:
     """Get network configuration from settings."""
-    from codeweaver.core import Unset
-
     settings_map = _get_settings_map()
 
     management_host = (
         settings_map["management_host"]
-        if settings_map["management_host"] is not Unset
+        if settings_map["management_host"] is not UNSET
         else "127.0.0.1"
     )
     management_port = (
-        settings_map["management_port"] if settings_map["management_port"] is not Unset else 9329
+        settings_map["management_port"] if settings_map["management_port"] is not UNSET else 9329
     )
-    if (mcp_http_server := settings_map["mcp_server"]) is not Unset:
+    if (mcp_http_server := settings_map["mcp_server"]) is not UNSET:
         mcp_host = mcp_http_server.get("host", "127.0.0.1")
         mcp_port = mcp_http_server.get("port", 9328)
     else:
@@ -392,11 +391,10 @@ async def start(
         display.print_error("Invalid host or port provided. Please check your inputs.")
         return
     get_project_path = lateimport("codeweaver.core", "get_project_path")
-    from codeweaver.core import Unset
 
     project = (
         project or project_path
-        if (project_path := settings_map.get("project_path")) is not Unset
+        if (project_path := settings_map.get("project_path")) is not UNSET
         else get_project_path._resolve()()
     )
     if not project and isinstance(project, Path) and project.exists():

src/codeweaver/cli/commands/status.py

@@ -19,7 +19,7 @@
 from rich.table import Table
 
 from codeweaver.cli.ui import CLIErrorHandler, StatusDisplay, get_display
-from codeweaver.core import SettingsMapDep, Unset
+from codeweaver.core import UNSET, SettingsMapDep
 from codeweaver.core.config.types import CodeWeaverSettingsDict
 from codeweaver.core.di.depends import INJECTED
 from codeweaver.core.types.dictview import DictView
@@ -41,7 +41,7 @@ def get_url() -> str:
     mcp_server_settings = settings_map["mcp_server"]
     run_args = (
         DefaultFastMcpHttpRunArgs
-        if mcp_server_settings["run_args"] is Unset
+        if mcp_server_settings["run_args"] is UNSET
         else mcp_server_settings["run_args"]
     )
     host = run_args["host"] or "127.0.0.1"
@@ -54,11 +54,11 @@ def get_management_url() -> str:
     settings_map = _settings_map()
     mgmt_host = (
         settings_map["management_host"]
-        if settings_map["management_host"] is not Unset
+        if settings_map["management_host"] is not UNSET
         else "127.0.0.1"
     )
     mgmt_port = (
-        settings_map["management_port"] if settings_map["management_port"] is not Unset else 9329
+        settings_map["management_port"] if settings_map["management_port"] is not UNSET else 9329
     )
     return f"http://{mgmt_host}:{mgmt_port}"
 

src/codeweaver/cli/commands/stop.py

@@ -16,10 +16,10 @@
 from pydantic import PositiveInt
 
 from codeweaver.cli.ui import CLIErrorHandler, StatusDisplay, get_display
-from codeweaver.core import SettingsMapDep, Unset
+from codeweaver.core import SettingsMapDep
 from codeweaver.core.config.types import CodeWeaverSettingsDict
 from codeweaver.core.di import INJECTED
-from codeweaver.core.types.dictview import DictView
+from codeweaver.core.types import UNSET, DictView
 
 
 def _settings_map(settings: SettingsMapDep = INJECTED) -> DictView[CodeWeaverSettingsDict]:
@@ -36,11 +36,11 @@ def _get_default_host_port() -> tuple[str, int]:
     settings_map = _settings_map()
     mgmt_host = (
         settings_map["management_host"]
-        if settings_map["management_host"] is not Unset
+        if settings_map["management_host"] is not UNSET
         else "127.0.0.1"
     )
     mgmt_port = (
-        settings_map["management_port"] if settings_map["management_port"] is not Unset else 9329
+        settings_map["management_port"] if settings_map["management_port"] is not UNSET else 9329
     )
     return mgmt_host, mgmt_port