Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions hindsight-api-slim/hindsight_api/api/http.py
Original file line number Diff line number Diff line change
Expand Up @@ -5642,8 +5642,12 @@ async def api_create_or_update_bank(
):
"""Create or update an agent with disposition and mission."""
try:
# Ensure bank exists by getting profile (auto-creates with defaults)
await app.state.memory.get_bank_profile(bank_id, request_context=request_context)
# Ensure bank exists, validating create_bank only when this call
# actually creates a missing bank.
await app.state.memory._ensure_bank_exists(
bank_id,
request_context,
)

# Update name if provided (stored in DB for display only, deprecated)
if request.name is not None:
Expand Down Expand Up @@ -5835,8 +5839,12 @@ async def api_import_bank_template(
dry_run=True,
)

# Ensure bank exists (auto-creates with defaults if needed)
await app.state.memory.get_bank_profile(bank_id, request_context=request_context)
# Ensure bank exists, validating create_bank only when this import
# actually creates a missing target bank.
await app.state.memory._ensure_bank_exists(
bank_id,
request_context,
)

return await apply_bank_template_manifest(
memory=app.state.memory,
Expand Down
56 changes: 44 additions & 12 deletions hindsight-api-slim/hindsight_api/engine/memory_engine.py
Original file line number Diff line number Diff line change
Expand Up @@ -3271,6 +3271,8 @@ async def retain_batch_async(
if result and result.contents is not None:
contents = cast(list[RetainContentDict], result.contents)

await self._ensure_bank_exists(bank_id, request_context)

# Engine-owned copy: the orchestrator clears per-item "content" strings
# after building the document's combined text (memory pressure
# optimization, see retain/orchestrator.py). Without an internal copy
Expand Down Expand Up @@ -3757,6 +3759,14 @@ async def import_bank_async(
# target bank's config before the restore.
parsed = parse_bank_archive(archive_bytes)
bank_id = target_bank_id or parsed.manifest.source_bank_id
if self._operation_validator and await bank_utils.get_bank_profile_if_exists(backend, bank_id) is None:
from hindsight_api.extensions import CreateBankContext

ctx = CreateBankContext(
bank_id=bank_id,
request_context=request_context,
)
await self._validate_operation(self._operation_validator.validate_create_bank(ctx))
resolved_config = await self._config_resolver.resolve_full_config(bank_id, request_context)
return await import_bank(
backend=backend,
Expand Down Expand Up @@ -8537,16 +8547,12 @@ async def get_bank_profile(
existing = await bank_utils.get_bank_profile_if_exists(backend, bank_id)
if existing is None:
return None
profile, created = existing, False
profile = existing
else:
result = await bank_utils.get_or_create_bank_profile(backend, bank_id)
profile, created = result.profile, result.created

# Apply HINDSIGHT_API_DEFAULT_BANK_TEMPLATE to freshly-created banks. Done
# before reading the resolved config below so the template's overrides
# (e.g. reflect_mission, dispositions) are visible on this very call.
if created:
await self._apply_default_bank_template(bank_id, request_context)
await self._ensure_bank_exists(bank_id, request_context)
profile = await bank_utils.get_bank_profile_if_exists(backend, bank_id)
if profile is None:
raise RuntimeError(f"Bank '{bank_id}' was not found after ensuring it exists")

# reflect_mission and disposition in config take precedence over the legacy DB columns
config_dict = await self._config_resolver.get_bank_config(bank_id, request_context)
Expand Down Expand Up @@ -8602,6 +8608,20 @@ async def _ensure_bank_exists(
True if the bank was freshly created on this call.
"""
backend = await self._get_backend()
if self._operation_validator:
if conn is not None:
exists = await conn.fetchval(f"SELECT 1 FROM {fq_table('banks')} WHERE bank_id = $1", bank_id)
else:
exists = await bank_utils.get_bank_profile_if_exists(backend, bank_id)
if not exists:
from hindsight_api.extensions import CreateBankContext

ctx = CreateBankContext(
bank_id=bank_id,
request_context=request_context,
)
await self._validate_operation(self._operation_validator.validate_create_bank(ctx))

if conn is not None:
result = await bank_utils.get_or_create_bank_profile_on_conn(conn, bank_id, ops=backend.ops)
return result.created
Expand Down Expand Up @@ -10343,7 +10363,11 @@ async def create_mental_model(
# outlives a mental-model insert that ultimately fails.
async with acquire_with_retry(backend) as conn:
async with conn.transaction():
created = await self._ensure_bank_exists(bank_id, request_context, conn=conn)
created = await self._ensure_bank_exists(
bank_id,
request_context,
conn=conn,
)
if mental_model_id:
row = await conn.fetchrow(
f"""
Expand Down Expand Up @@ -11964,7 +11988,11 @@ async def create_webhook(
# commit (or roll back) atomically.
async with acquire_with_retry(backend) as conn:
async with conn.transaction():
created = await self._ensure_bank_exists(bank_id, request_context, conn=conn)
created = await self._ensure_bank_exists(
bank_id,
request_context,
conn=conn,
)
row = await backend.ops.create_webhook(
conn,
fq_table("webhooks"),
Expand Down Expand Up @@ -12413,7 +12441,11 @@ async def submit_async_retain(
# async_operations.bank_id has a FK to banks. Create the bank
# lazily inside this same transaction so it is atomic with the
# parent + child operation rows.
created = await self._ensure_bank_exists(bank_id, request_context, conn=conn)
created = await self._ensure_bank_exists(
bank_id,
request_context,
conn=conn,
)
await conn.execute(
f"""
INSERT INTO {fq_table("async_operations")} (operation_id, bank_id, operation_type, result_metadata, status)
Expand Down
2 changes: 2 additions & 0 deletions hindsight-api-slim/hindsight_api/extensions/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
# Consolidation operation
ConsolidateContext,
ConsolidateResult,
CreateBankContext,
# File Conversion
FileConvertResult,
# Mental Model operations
Expand Down Expand Up @@ -105,6 +106,7 @@
"BankReadOperation",
"BankWriteContext",
"BankWriteOperation",
"CreateBankContext",
# Operation Validator - Consolidation
"ConsolidateContext",
"ConsolidateResult",
Expand Down
25 changes: 25 additions & 0 deletions hindsight-api-slim/hindsight_api/extensions/operation_validator.py
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,14 @@ class BankWriteContext:
request_context: "RequestContext"


@dataclass
class CreateBankContext:
"""Context for validating creation of a new bank."""

bank_id: str
request_context: "RequestContext"


@dataclass
class BankListContext:
"""Context for filtering the bank list (post-query)."""
Expand Down Expand Up @@ -881,6 +889,23 @@ async def validate_bank_write(self, ctx: BankWriteContext) -> ValidationResult:
"""
return ValidationResult.accept()

async def validate_create_bank(self, ctx: CreateBankContext) -> ValidationResult:
"""
Validate creation of a new bank before the bank row is inserted.

Override to implement custom validation logic for operations that
explicitly or implicitly create a bank.

Args:
ctx: Context containing:
- bank_id: Bank identifier
- request_context: Request context with auth info

Returns:
ValidationResult indicating whether the bank may be created.
"""
return ValidationResult.accept()

async def filter_bank_list(self, ctx: BankListContext) -> BankListResult:
"""
Filter the bank list after querying.
Expand Down
4 changes: 3 additions & 1 deletion hindsight-api-slim/hindsight_api/mcp_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -1225,7 +1225,9 @@ async def create_bank(bank_id: str, name: str | None = None, mission: str | None
"""
try:
request_context = _get_request_context(config)
# get_bank_profile auto-creates bank if it doesn't exist
# create_bank may auto-create the bank; validate that explicit
# creation permission before reading the resulting profile.
await memory._ensure_bank_exists(bank_id, request_context)
profile = await memory.get_bank_profile(bank_id, request_context=request_context)

# Update name/mission if provided
Expand Down
128 changes: 128 additions & 0 deletions hindsight-api-slim/tests/test_extensions.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
# Consolidation operation
ConsolidateContext,
ConsolidateResult,
CreateBankContext,
Extension,
HttpExtension,
OperationValidationError,
Expand Down Expand Up @@ -202,6 +203,30 @@ async def on_consolidate_complete(self, result: ConsolidateResult) -> None:
self.post_consolidate_calls.append(result)


class CreateBankRejectingValidator(OperationValidatorExtension):
"""Validator that records create-bank checks and can reject them."""

def __init__(self, *, reject: bool = True):
super().__init__({})
self.reject = reject
self.create_bank_calls: list[CreateBankContext] = []

async def validate_retain(self, ctx: RetainContext) -> ValidationResult:
return ValidationResult.accept()

async def validate_recall(self, ctx: RecallContext) -> ValidationResult:
return ValidationResult.accept()

async def validate_reflect(self, ctx: ReflectContext) -> ValidationResult:
return ValidationResult.accept()

async def validate_create_bank(self, ctx: CreateBankContext) -> ValidationResult:
self.create_bank_calls.append(ctx)
if self.reject:
return ValidationResult.reject("bank creation not allowed", status_code=402)
return ValidationResult.accept()


class TestMemoryEngineValidation:
"""Tests for validation integration with MemoryEngine.

Expand Down Expand Up @@ -297,6 +322,109 @@ async def test_reflect_validation(self, memory_with_validator):

assert "limit exceeded" in str(exc_info.value).lower()

@pytest.mark.asyncio
async def test_retain_validates_create_bank_for_missing_bank(self, memory):
"""Retain may lazily create a bank, so missing-bank retain validates create_bank."""
bank_id = "test-retain-create-bank-validation"
ctx = RequestContext()
validator = CreateBankRejectingValidator()
memory._operation_validator = validator

with pytest.raises(OperationValidationError) as exc_info:
await memory.retain_batch_async(
bank_id=bank_id,
contents=[{"content": "Should not create a bank"}],
request_context=ctx,
)

assert "bank creation not allowed" in str(exc_info.value)
assert len(validator.create_bank_calls) == 1
assert validator.create_bank_calls[0].bank_id == bank_id
assert await memory.get_bank_profile(bank_id, request_context=ctx, create_if_missing=False) is None

@pytest.mark.asyncio
async def test_async_retain_validates_create_bank_for_missing_bank(self, memory):
"""Async retain validates create_bank before creating its parent operation."""
bank_id = "test-async-retain-create-bank-validation"
ctx = RequestContext()
validator = CreateBankRejectingValidator()
memory._operation_validator = validator

with pytest.raises(OperationValidationError) as exc_info:
await memory.submit_async_retain(
bank_id=bank_id,
contents=[{"content": "Should not create a bank"}],
request_context=ctx,
)

assert "bank creation not allowed" in str(exc_info.value)
assert len(validator.create_bank_calls) == 1
assert validator.create_bank_calls[0].bank_id == bank_id
assert await memory.get_bank_profile(bank_id, request_context=ctx, create_if_missing=False) is None

@pytest.mark.asyncio
async def test_create_bank_validation_skips_existing_bank(self, memory):
"""Existing banks do not require create_bank validation."""
bank_id = "test-create-bank-existing"
ctx = RequestContext()
await memory.get_bank_profile(bank_id, request_context=ctx)

validator = CreateBankRejectingValidator()
memory._operation_validator = validator

created = await memory._ensure_bank_exists(bank_id, ctx)

assert created is False
assert validator.create_bank_calls == []

@pytest.mark.asyncio
async def test_get_bank_profile_validates_create_bank_for_missing_bank(self, memory):
"""The default auto-create profile path validates create_bank."""
bank_id = "test-profile-create-bank-validation"
ctx = RequestContext()
validator = CreateBankRejectingValidator()
memory._operation_validator = validator

with pytest.raises(OperationValidationError) as exc_info:
await memory.get_bank_profile(bank_id, request_context=ctx)

assert "bank creation not allowed" in str(exc_info.value)
assert len(validator.create_bank_calls) == 1
assert validator.create_bank_calls[0].bank_id == bank_id
assert await memory.get_bank_profile(bank_id, request_context=ctx, create_if_missing=False) is None

@pytest.mark.asyncio
async def test_http_create_or_update_validates_create_bank(self, api_client, memory):
bank_id = "test-http-put-create-bank-validation"
validator = CreateBankRejectingValidator()
memory._operation_validator = validator

resp = await api_client.put(
f"/v1/default/banks/{bank_id}",
json={"name": "Blocked Bank"},
)

assert resp.status_code == 402
assert resp.json()["detail"] == "bank creation not allowed"
assert len(validator.create_bank_calls) == 1
assert validator.create_bank_calls[0].bank_id == bank_id

@pytest.mark.asyncio
async def test_http_template_import_validates_create_bank(self, api_client, memory):
bank_id = "test-http-import-create-bank-validation"
validator = CreateBankRejectingValidator()
memory._operation_validator = validator

resp = await api_client.post(
f"/v1/default/banks/{bank_id}/import",
json={"version": "1"},
)

assert resp.status_code == 402
assert resp.json()["detail"] == "bank creation not allowed"
assert len(validator.create_bank_calls) == 1
assert validator.create_bank_calls[0].bank_id == bank_id


@pytest.fixture
def memory_with_validator(memory):
Expand Down
9 changes: 9 additions & 0 deletions hindsight-api-slim/tests/test_mcp_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ async def _get_mental_model(**kwargs):

# Tags & bank methods
memory.list_tags = AsyncMock(return_value={"items": ["tag1", "tag2"], "total": 2})
memory._ensure_bank_exists = AsyncMock(return_value=True)
memory.get_bank_profile = AsyncMock(return_value={"id": "test-bank", "name": "Test Bank", "mission": "Testing"})
memory.get_bank_stats = AsyncMock(return_value={"nodes": 100, "links": 50})
memory.update_bank = AsyncMock(return_value={"id": "test-bank", "name": "Updated"})
Expand Down Expand Up @@ -1512,6 +1513,14 @@ async def test_get_bank(self, mock_memory):
result = await _tools(mcp)["get_bank"].fn()
assert '"test-bank"' in result or "test-bank" in result

async def test_create_bank_validates_creation(self, mock_memory):
mcp = _make_mcp_server(mock_memory, {"create_bank"}, include_bank_id=True)
result = await _tools(mcp)["create_bank"].fn(bank_id="new-bank")
assert '"test-bank"' in result or "test-bank" in result
call = mock_memory._ensure_bank_exists.call_args
assert call.args[0] == "new-bank"
assert "operation" not in call.kwargs

async def test_get_bank_stats(self, mock_memory):
mcp = _make_mcp_server(mock_memory, {"get_bank_stats"}, include_bank_id=True)
result = await _tools(mcp)["get_bank_stats"].fn()
Expand Down