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
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
"""Module for settings to connect to backend"""

from typing import ClassVar, Optional
from urllib.parse import urljoin

from aind_settings_utils.aws import (
ParameterStoreAppBaseSettings,
)
from urllib.parse import urljoin
from pydantic import Field, SecretStr
from pydantic import Field, RedisDsn, SecretStr
from pydantic_settings import SettingsConfigDict


Expand Down Expand Up @@ -52,7 +52,7 @@ class Settings(ParameterStoreAppBaseSettings):
title="Tenant ID",
description="Tenant ID for the principal account.",
)
redis_url: Optional[str] = Field(default=None)
redis_url: Optional[RedisDsn] = Field(default=None)
graph_api_url: ClassVar[str] = "https://graph.microsoft.com"

@property
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ async def lifespan(_: FastAPI) -> AsyncIterator[None]:
"""Init cache and add to lifespan of app"""
settings = get_settings()
if settings.redis_url is not None:
redis = from_url(settings.redis_url)
redis = from_url(settings.redis_url.unicode_string())
FastAPICache.init(RedisBackend(redis), prefix="fastapi-cache")
else:
FastAPICache.init(InMemoryBackend(), prefix="fastapi-cache")
Expand Down
3 changes: 2 additions & 1 deletion aind-sharepoint-service-server/tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import pytest
from fastapi.testclient import TestClient
from pydantic import RedisDsn

from aind_sharepoint_service_server.configs import Settings

Expand Down Expand Up @@ -96,7 +97,7 @@ def client_with_redis() -> Generator[TestClient, Any, None]:

settings = Settings()
settings_with_redis = settings.model_copy(
update={"redis_url": "redis"}, deep=True
update={"redis_url": RedisDsn("redis://example.com:1234")}, deep=True
)
with (
patch(
Expand Down