merge in http pool changes; add escaping for rich markup in import error messages

Author: bashandbone

.github/workflows/copilot-setup-steps.yml

@@ -36,9 +36,6 @@ jobs:
       CODEQL_EXTRACTOR_PYTHON_RAM: 2048
       CODEQL_EVALUATOR_RAM: 2048
     runs-on: ubuntu-latest
-    # Alternative: Use ubuntu-latest-4-cores (16GB RAM) if OOM issues persist
-    # Requires GitHub Team/Enterprise plan
-    # runs-on: ubuntu-latest-4-cores
     # Add an overall job timeout so we don't let runaway installs exhaust the runner indefinitely
     timeout-minutes: 50
     # Set the permissions to the lowest permissions possible needed for your steps.
@@ -72,7 +69,5 @@ jobs:
           MISE_YES: 1
           MISE_EXPERIMENTAL: 1
           MISE_PATH: ${{ steps.setup-mise.outputs.MISE_PATH }}
-          NEWPATH: ${{ steps.setup-mise.outputs.NEWPATH }}
         run: |
-          export PATH="$NEWPATH"
           mise --version || { echo "Mise not in path"; "$MISE_PATH" --version; }

docs-site/src/content/docs/index.mdx

@@ -40,7 +40,7 @@ import { Card, CardGrid } from '@astrojs/starlight/components';
 
 ```bash
 # Install CodeWeaver
-uv pip install codeweaver
+uv pip install code-weaver
 
 # Start the daemon
 cw start --project /path/to/your/codebase

mise-tasks/validate-lazy-imports.py

@@ -75,6 +75,8 @@
     "codeweaver.mcp.middleware.McpMiddleware",
     "codeweaver.providers.agent.AgentProfile",
     "codeweaver.providers.agent.AgentProfileSpec",
+    "providers.reranking.providers.sentence_transformers",
+    "providers.embedding.providers.sentence_transformers",
     "codeweaver.providers.reranking.KnownRerankModelName",
     "codeweaver.providers.reranking.capabilities.dependency_map",
     "codeweaver.providers.reranking.capabilities.load_default_capabilities",
@@ -85,7 +87,15 @@
     "codeweaver.providers.embedding.capabilities.load_sparse_capabilities",
 )
 
-PROBLEM_CHILDREN = ("codeweaver.providers.embedding.providers.bedrock", "BedrockEmbeddingProvider")
+PROBLEM_CHILDREN = (
+    "codeweaver.providers.embedding.providers.bedrock",
+    "BedrockEmbeddingProvider",
+    "codeweaver.providers.embedding.providers.sentence_transformers",
+    "SentenceTransformersEmbeddingProvider",
+    "SentenceTransformersSparseProvider",
+    "codeweaver.providers.reranking.providers.sentence_transformers",
+    "SentenceTransformersRerankingProvider",
+)
 
 """Tuple of modules and types with known problematic lazy imports to skip during validation."""
 

resolve-rebase-conflicts.sh

@@ -199,7 +199,7 @@ gh run list --workflow=publish.yml --limit=1
 python -m venv /tmp/test-pypi
 source /tmp/test-pypi/bin/activate
 
-pip install codeweaver==0.1.0
+pip install code-weaver==0.1.0
 
 python -c "import codeweaver; print(codeweaver.__version__)"
 
@@ -214,7 +214,7 @@ rm -rf /tmp/test-pypi
 **Success Criteria**:
 - ✅ GitHub Actions workflow succeeds
 - ✅ Package published to PyPI
-- ✅ Package installable via `pip install codeweaver`
+- ✅ Package installable via `pip install code-weaver`
 - ✅ Smoke tests pass
 - ✅ Version matches tag (e.g., `0.1.0`)
 

specs/004-we-re-preparing/quickstart.md

@@ -34,8 +34,9 @@
 import asyncio
 import logging
 import threading
+
 from dataclasses import dataclass, field
-from typing import Any, ClassVar
+from typing import Any, ClassVar, Self
 
 import httpx
 
@@ -112,9 +113,7 @@ class HttpClientPool:
 
     @classmethod
     def get_instance(
-        cls,
-        limits: PoolLimits | None = None,
-        timeouts: PoolTimeouts | None = None,
+        cls, limits: PoolLimits | None = None, timeouts: PoolTimeouts | None = None
     ) -> HttpClientPool:
         """Get or create the singleton HttpClientPool instance.
 
@@ -135,8 +134,7 @@ def get_instance(
         with _instance_lock:
             if cls._instance is None:
                 cls._instance = cls(
-                    limits=limits or PoolLimits(),
-                    timeouts=timeouts or PoolTimeouts(),
+                    limits=limits or PoolLimits(), timeouts=timeouts or PoolTimeouts()
                 )
                 logger.debug(
                     "Created HttpClientPool singleton with limits=%s, timeouts=%s",
@@ -205,8 +203,7 @@ async def get_client(self, name: str, **overrides: Any) -> httpx.AsyncClient:
             limits = httpx.Limits(
                 max_connections=overrides.get("max_connections", self.limits.max_connections),
                 max_keepalive_connections=overrides.get(
-                    "max_keepalive_connections",
-                    self.limits.max_keepalive_connections,
+                    "max_keepalive_connections", self.limits.max_keepalive_connections
                 ),
                 keepalive_expiry=overrides.get("keepalive_expiry", self.limits.keepalive_expiry),
             )
@@ -275,10 +272,11 @@ def get_client_sync(self, name: str, **overrides: Any) -> httpx.AsyncClient:
                 limits = httpx.Limits(
                     max_connections=overrides.get("max_connections", self.limits.max_connections),
                     max_keepalive_connections=overrides.get(
-                        "max_keepalive_connections",
-                        self.limits.max_keepalive_connections,
+                        "max_keepalive_connections", self.limits.max_keepalive_connections
+                    ),
+                    keepalive_expiry=overrides.get(
+                        "keepalive_expiry", self.limits.keepalive_expiry
                     ),
-                    keepalive_expiry=overrides.get("keepalive_expiry", self.limits.keepalive_expiry),
                 )
 
                 timeout = httpx.Timeout(
@@ -289,9 +287,7 @@ def get_client_sync(self, name: str, **overrides: Any) -> httpx.AsyncClient:
                 )
 
                 self._clients[name] = httpx.AsyncClient(
-                    limits=limits,
-                    timeout=timeout,
-                    http2=overrides.get("http2", True),
+                    limits=limits, timeout=timeout, http2=overrides.get("http2", True)
                 )
 
                 logger.debug(
@@ -341,10 +337,11 @@ async def close_client(self, name: str) -> bool:
                 try:
                     await client.aclose()
                     logger.debug("Closed HTTP client pool for %s", name)
-                    return True
                 except (httpx.HTTPError, OSError) as e:
                     logger.warning("Error closing HTTP client pool for %s: %s", name, e)
                     # Client already removed from dict above
+                else:
+                    return True
             return False
 
     async def close_all(self) -> None:
@@ -372,11 +369,11 @@ async def close_all(self) -> None:
             if client_names:
                 logger.debug("Closed %d HTTP client pool(s)", len(client_names))
 
-    async def __aenter__(self) -> HttpClientPool:
+    async def __aenter__(self) -> Self:
         """Async context manager entry."""
         return self
 
-    async def __aexit__(self, *args: Any) -> None:
+    async def __aexit__(self, *args: object) -> None:
         """Async context manager exit - closes all clients."""
         await self.close_all()
 

src/codeweaver/common/http_pool.py

@@ -434,7 +434,7 @@ def from_boto3_response(cls, response: Any) -> BedrockInvokeEmbeddingResponse:
         exc_info=True,
     )
     raise ConfigurationError(
-        "Failed to import boto3. You need to install the boto3 package, you can do this by running 'pip install code-weaver[bedrock]'"
+        r"Failed to import boto3. You need to install the boto3 package, you can do this by running 'pip install code-weaver\[bedrock]'"
     ) from e
 
 

src/codeweaver/providers/embedding/providers/bedrock.py

@@ -89,7 +89,7 @@ def try_for_azure_endpoint(kwargs: Any) -> str:
 
 except ImportError as e:
     raise ConfigurationError(
-        'Please install the `cohere` package to use the Cohere provider, \nyou can use the `cohere` optional group -- `pip install "code-weaver[cohere]"`'
+        r'Please install the `cohere` package to use the Cohere provider, \nyou can use the `cohere` optional group -- `pip install "code-weaver\[cohere]"`'
     ) from e
 
 

src/codeweaver/providers/embedding/providers/cohere.py

@@ -49,7 +49,7 @@
     )
 except ImportError as e:
     raise ConfigurationError(
-        "FastEmbed is not installed. Please install it with `pip install code-weaver[fastembed]` or `codeweaver[fastembed-gpu]`."
+        r"FastEmbed is not installed. Please install it with `pip install code-weaver\[fastembed]` or `code-weaver\[fastembed-gpu]`."
     ) from e
 
 _TextEmbedding = get_text_embedder()

src/codeweaver/providers/embedding/providers/fastembed.py

@@ -83,7 +83,7 @@ def __str__(
 
 except ImportError as e:
     raise ConfigurationError(
-        "The 'google-genai' package is required to use the Google embedding provider. Please install it with 'pip install code-weaver[google]'."
+        r"The 'google-genai' package is required to use the Google embedding provider. Please install it with 'pip install code-weaver\[google]'."
     ) from e