chore(types): add pyright strict config and fix resulting errors
Adds pyrightconfig.json (strict, Python 3.11) covering cli.py, claude_bottle/, and tests/. Fixes the 49 strict-mode errors: - Type DockerBottle.teardown as Callable[[], None]. - ResolvedEnv default_factory uses parameterized list[str] / dict[str, str]. - Erase BottleBackend generics at the registry boundary (BottleBackend[Any, Any]) since selection is runtime-driven and callers use the unparameterized interface. - DockerBottleBackend.launch returns Generator[DockerBottle, None, None]; @contextmanager now flags Iterator returns as deprecated. - Sidestep cli.list submodule shadowing builtins.list in main()'s argv annotation via an aliased re-import in cli/__init__.py. - Cast cfg[...] results in test_pipelock_yaml at the dict[str, object] boundary. - Annotate write_fixture's fn parameter and _manifest_with_runtime's return type.
This commit is contained in:
@@ -5,12 +5,13 @@ the legacy 'runtime' field must fail, regardless of value, rather than
|
||||
silently ignoring."""
|
||||
|
||||
import unittest
|
||||
from typing import Any
|
||||
|
||||
from claude_bottle.log import Die
|
||||
from claude_bottle.manifest import Bottle, Manifest
|
||||
|
||||
|
||||
def _manifest_with_runtime(value: object) -> dict:
|
||||
def _manifest_with_runtime(value: object) -> dict[str, Any]:
|
||||
return {
|
||||
"bottles": {"dev": {"runtime": value}},
|
||||
"agents": {"demo": {"skills": [], "prompt": "", "bottle": "dev"}},
|
||||
|
||||
@@ -10,6 +10,7 @@ import os
|
||||
import tempfile
|
||||
import unittest
|
||||
from pathlib import Path
|
||||
from typing import Any, cast
|
||||
|
||||
from claude_bottle.backend.docker.pipelock import DockerPipelockProxy
|
||||
from claude_bottle.manifest import Manifest
|
||||
@@ -27,19 +28,22 @@ class TestBuildConfig(unittest.TestCase):
|
||||
{"include_defaults": True, "scan_env": True}, cfg["dlp"]
|
||||
)
|
||||
# Baked defaults always present.
|
||||
self.assertIn("api.anthropic.com", cfg["api_allowlist"])
|
||||
self.assertIn("raw.githubusercontent.com", cfg["api_allowlist"])
|
||||
self.assertIn("api.anthropic.com", cast(list[str], cfg["api_allowlist"]))
|
||||
self.assertIn("raw.githubusercontent.com", cast(list[str], cfg["api_allowlist"]))
|
||||
# No SSH entries → no trusted_domains, no ssrf.
|
||||
self.assertNotIn("trusted_domains", cfg)
|
||||
self.assertNotIn("ssrf", cfg)
|
||||
|
||||
def test_ssh_shape(self):
|
||||
cfg = pipelock_build_config(fixture_with_ssh().bottles["dev"])
|
||||
self.assertIn("github.com", cfg["trusted_domains"])
|
||||
self.assertNotIn("100.78.141.42", cfg["trusted_domains"])
|
||||
self.assertIn("100.78.141.42/32", cfg["ssrf"]["ip_allowlist"])
|
||||
self.assertIn("github.com", cast(list[str], cfg["trusted_domains"]))
|
||||
self.assertNotIn("100.78.141.42", cast(list[str], cfg["trusted_domains"]))
|
||||
self.assertIn(
|
||||
"100.78.141.42/32",
|
||||
cast(dict[str, Any], cfg["ssrf"])["ip_allowlist"],
|
||||
)
|
||||
# Strict mode: IPv4 host is also in the api_allowlist union.
|
||||
self.assertIn("100.78.141.42", cfg["api_allowlist"])
|
||||
self.assertIn("100.78.141.42", cast(list[str], cfg["api_allowlist"]))
|
||||
|
||||
|
||||
class TestRenderAndWrite(unittest.TestCase):
|
||||
|
||||
Reference in New Issue
Block a user