mirror of
https://github.com/dograh-hq/dograh.git
synced 2026-07-10 11:12:13 +02:00
* fix: fix org scoped access for resources * Fix auth and config validation regressions * fix: track org config validation timestamp * fix: backfill org model configuration v2 from legacy user rows Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * test: align config tests with org-level v2 resolution Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * chore: helm example values tweaks Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
99 lines
2.9 KiB
Python
99 lines
2.9 KiB
Python
from datetime import UTC, datetime, timedelta
|
|
from types import SimpleNamespace
|
|
from unittest.mock import AsyncMock
|
|
|
|
import pytest
|
|
|
|
from api.routes import user as user_routes
|
|
from api.schemas.ai_model_configuration import EffectiveAIModelConfiguration
|
|
from api.services.configuration.ai_model_configuration import (
|
|
ResolvedAIModelConfiguration,
|
|
)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_validate_user_configurations_marks_stale_org_v2_config_validated(
|
|
monkeypatch,
|
|
):
|
|
stale_config = EffectiveAIModelConfiguration(
|
|
last_validated_at=datetime.now(UTC) - timedelta(seconds=120)
|
|
)
|
|
resolved = ResolvedAIModelConfiguration(
|
|
effective=stale_config,
|
|
source="organization_v2",
|
|
)
|
|
validate = AsyncMock(return_value={"status": [{"model": "all", "message": "ok"}]})
|
|
touch_validation_cache = AsyncMock()
|
|
|
|
class FakeValidator:
|
|
def __init__(self):
|
|
self.validate = validate
|
|
|
|
monkeypatch.setattr(
|
|
user_routes,
|
|
"get_resolved_ai_model_configuration",
|
|
AsyncMock(return_value=resolved),
|
|
)
|
|
monkeypatch.setattr(user_routes, "UserConfigurationValidator", FakeValidator)
|
|
monkeypatch.setattr(
|
|
user_routes,
|
|
"update_organization_ai_model_configuration_last_validated_at",
|
|
touch_validation_cache,
|
|
)
|
|
|
|
response = await user_routes.validate_user_configurations(
|
|
validity_ttl_seconds=60,
|
|
user=SimpleNamespace(
|
|
provider_id="provider-123",
|
|
selected_organization_id=42,
|
|
),
|
|
)
|
|
|
|
assert response == {"status": [{"model": "all", "message": "ok"}]}
|
|
validate.assert_awaited_once_with(
|
|
stale_config,
|
|
organization_id=42,
|
|
created_by="provider-123",
|
|
)
|
|
touch_validation_cache.assert_awaited_once_with(42)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_validate_user_configurations_uses_fresh_org_v2_validation_cache(
|
|
monkeypatch,
|
|
):
|
|
fresh_config = EffectiveAIModelConfiguration(last_validated_at=datetime.now(UTC))
|
|
resolved = ResolvedAIModelConfiguration(
|
|
effective=fresh_config,
|
|
source="organization_v2",
|
|
)
|
|
validate = AsyncMock()
|
|
touch_validation_cache = AsyncMock()
|
|
|
|
class FakeValidator:
|
|
def __init__(self):
|
|
self.validate = validate
|
|
|
|
monkeypatch.setattr(
|
|
user_routes,
|
|
"get_resolved_ai_model_configuration",
|
|
AsyncMock(return_value=resolved),
|
|
)
|
|
monkeypatch.setattr(user_routes, "UserConfigurationValidator", FakeValidator)
|
|
monkeypatch.setattr(
|
|
user_routes,
|
|
"update_organization_ai_model_configuration_last_validated_at",
|
|
touch_validation_cache,
|
|
)
|
|
|
|
response = await user_routes.validate_user_configurations(
|
|
validity_ttl_seconds=60,
|
|
user=SimpleNamespace(
|
|
provider_id="provider-123",
|
|
selected_organization_id=42,
|
|
),
|
|
)
|
|
|
|
assert response == {"status": []}
|
|
validate.assert_not_awaited()
|
|
touch_validation_cache.assert_not_awaited()
|