Feat aws manager (#12)

* feat: uses aws secrets manager

Author: jtyoung84

aind-smartsheet-service-server/pyproject.toml

@@ -17,7 +17,7 @@ readme = "README.md"
 dynamic = ["version"]
 
 dependencies = [
-    'aind-settings-utils>=0.0.3',
+    'aind-settings-utils>=0.1.0',
     'smartsheet-python-sdk>=3.0',
     'pydantic>=2.0',
     'pydantic-settings>=2.0',

aind-smartsheet-service-server/src/aind_smartsheet_service_server/configs.py

@@ -2,14 +2,12 @@
 
 from typing import Optional
 
-from aind_settings_utils.aws import (
-    ParameterStoreAppBaseSettings,
-)
+from aind_settings_utils.aws import SecretsManagerBaseSettings
 from pydantic import Field, RedisDsn, SecretStr
 from pydantic_settings import SettingsConfigDict
 
 
-class Settings(ParameterStoreAppBaseSettings):
+class Settings(SecretsManagerBaseSettings):
     """Smartsheet configs with client settings and sheet IDs"""
 
     access_token: SecretStr = Field(
@@ -33,11 +31,7 @@ class Settings(ParameterStoreAppBaseSettings):
         ..., description="SmartSheet ID of protocols info"
     )
     redis_url: Optional[RedisDsn] = Field(default=None)
-    model_config = SettingsConfigDict(
-        env_prefix="SMARTSHEET_", case_sensitive=False
-    )
+    model_config = SettingsConfigDict(env_prefix="SMARTSHEET_")
 
 
-def get_settings() -> Settings:
-    """Return a settings object"""
-    return Settings()
+settings = Settings()

aind-smartsheet-service-server/src/aind_smartsheet_service_server/main.py

@@ -14,7 +14,7 @@
 from redis.asyncio import from_url  # noqa
 
 from aind_smartsheet_service_server import __version__ as service_version
-from aind_smartsheet_service_server.configs import get_settings
+from aind_smartsheet_service_server.configs import settings
 from aind_smartsheet_service_server.route import router
 
 # The log level can be set by adding an environment variable before launch.
@@ -32,7 +32,6 @@
 @asynccontextmanager
 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.unicode_string())
         FastAPICache.init(RedisBackend(redis), prefix="fastapi-cache")

aind-smartsheet-service-server/src/aind_smartsheet_service_server/route.py

@@ -3,11 +3,11 @@
 from asyncio import to_thread
 from typing import List, Optional
 
-from fastapi import APIRouter, Depends, Query, status
+from fastapi import APIRouter, Query, status
 from fastapi_cache.decorator import cache
 from smartsheet import Smartsheet
 
-from aind_smartsheet_service_server.configs import Settings, get_settings
+from aind_smartsheet_service_server.configs import settings
 from aind_smartsheet_service_server.handler import SheetHandler
 from aind_smartsheet_service_server.models import (
     FundingModel,
@@ -20,12 +20,11 @@
 
 
 @cache(expire=120)
-async def get_smartsheet(settings: Settings, sheet_id: int) -> str:
+async def get_smartsheet(sheet_id: int) -> str:
     """
     Download and cache smartsheet object as a json string.
     Parameters
     ----------
-    settings : Settings
     sheet_id : int
 
     Returns
@@ -66,7 +65,6 @@ def get_health() -> HealthCheck:
     response_model=List[FundingModel],
 )
 async def get_funding(
-    settings: Settings = Depends(get_settings),
     project_name: Optional[str] = Query(
         default=None,
         openapi_examples={
@@ -95,7 +93,7 @@ async def get_funding(
     """
 
     sheet_id = settings.funding_id
-    raw_sheet = await get_smartsheet(settings=settings, sheet_id=sheet_id)
+    raw_sheet = await get_smartsheet(sheet_id=sheet_id)
     handler = SheetHandler(raw_sheet=raw_sheet)
     funding_models = handler.get_project_funding_info(
         project_name=project_name,
@@ -108,13 +106,13 @@ async def get_funding(
     "/project_names",
     response_model=List[str],
 )
-async def get_project_names(settings: Settings = Depends(get_settings)):
+async def get_project_names():
     """
     ## Project Names
     Returns a list of project names.
     """
     sheet_id = settings.funding_id
-    raw_sheet = await get_smartsheet(settings=settings, sheet_id=sheet_id)
+    raw_sheet = await get_smartsheet(sheet_id=sheet_id)
     handler = SheetHandler(raw_sheet=raw_sheet)
     content = handler.get_project_names()
     return content
@@ -137,15 +135,14 @@ async def get_protocols(
                 ),
             }
         },
-    ),
-    settings: Settings = Depends(get_settings),
+    )
 ):
     """
     ## Protocols
     Returns protocols given a name.
     """
     sheet_id = settings.protocols_id
-    raw_sheet = await get_smartsheet(settings=settings, sheet_id=sheet_id)
+    raw_sheet = await get_smartsheet(sheet_id=sheet_id)
     handler = SheetHandler(raw_sheet=raw_sheet)
     content = handler.get_protocols_info(protocol_name=protocol_name)
     return content
@@ -165,15 +162,14 @@ async def get_perfusions(
                 "value": "689418",
             }
         },
-    ),
-    settings: Settings = Depends(get_settings),
+    )
 ):
     """
     ## Perfusions
     Returns perfusions for a given subject_id.
     """
     sheet_id = settings.perfusions_id
-    raw_sheet = await get_smartsheet(settings=settings, sheet_id=sheet_id)
+    raw_sheet = await get_smartsheet(sheet_id=sheet_id)
     handler = SheetHandler(raw_sheet=raw_sheet)
     content = handler.get_perfusions_info(subject_id=subject_id)
     return content

aind-smartsheet-service-server/tests/conftest.py

@@ -10,7 +10,7 @@
 from fastapi.testclient import TestClient
 from pydantic import RedisDsn
 
-from aind_smartsheet_service_server.configs import get_settings
+from aind_smartsheet_service_server.configs import settings
 
 RESOURCES_DIR = Path(os.path.dirname(os.path.realpath(__file__))) / "resources"
 
@@ -62,13 +62,12 @@ def client_with_redis() -> Generator[TestClient, Any, None]:
     # Import moved to be able to mock cache
     from aind_smartsheet_service_server.main import app
 
-    settings = get_settings()
     settings_with_redis = settings.model_copy(
         update={"redis_url": RedisDsn("redis://example.com:1234")}, deep=True
     )
     with (
         patch(
-            "aind_smartsheet_service_server.main.get_settings",
+            "aind_smartsheet_service_server.main.settings",
             return_value=settings_with_redis,
         ),
         patch(

aind-smartsheet-service-server/tests/test_route.py

@@ -5,7 +5,6 @@
 import pytest
 from starlette.testclient import TestClient
 
-from aind_smartsheet_service_server.configs import Settings
 from aind_smartsheet_service_server.route import get_smartsheet
 
 
@@ -25,7 +24,7 @@ async def test_get_smartsheet(self, mock_get_sheet: MagicMock):
         mock_sheet = MagicMock()
         mock_sheet.to_json.return_value = '{"a": "b"}'
         mock_get_sheet.return_value = mock_sheet
-        sheet = await get_smartsheet(settings=Settings(), sheet_id=0)
+        sheet = await get_smartsheet(sheet_id=0)
         mock_get_sheet.assert_has_calls([call(0), call().to_json()])
         assert '{"a": "b"}' == sheet