Merge pull request #96 from NHSDigital/feature/dh-MESH-1805-update-deps

MESH-1735 add ses and update deps

Author: davidhallam4-nhs

Makefile

@@ -58,13 +58,13 @@ shellcheck:
 	docker run --rm -i -v ${PWD}:/mnt:ro koalaman/shellcheck -f gcc -e SC1090,SC1091 `find . \( -path "*/.venv/*" -prune -o -path "*/build/*" -prune -o -path "*/.tox/*" -prune -o -path "*/java_client/*" -prune  \) -o -type f -name '*.sh' -print` || test $$? -eq 1
 
 ruff: black
-	poetry run ruff --fix --show-fixes .
+	poetry run ruff check --fix --show-fixes .
 
 ruff-check:
-	poetry run ruff .
+	poetry run ruff check .
 
 ruff-ci:
-	poetry run ruff --output-format=github .
+	poetry run ruff check --output-format=github .
 
 lint: ruff mypy shellcheck
 

nhs_aws_helpers/__init__.py

@@ -69,6 +69,7 @@
     ObjectVersionTypeDef,
 )
 from mypy_boto3_secretsmanager.client import SecretsManagerClient
+from mypy_boto3_ses import SESClient
 from mypy_boto3_sns.client import SNSClient
 from mypy_boto3_sqs import SQSServiceResource
 from mypy_boto3_sqs.client import SQSClient
@@ -283,6 +284,10 @@ def ddb_table(table_name: str, session: Optional[Session] = None, config: Option
     return dynamodb(session=session, config=config).Table(table_name)
 
 
+def ses_client(session: Optional[Session] = None, config: Optional[Config] = None) -> SESClient:
+    return _aws("ses", "client", session, config)  # type: ignore[no-any-return]
+
+
 def sqs_client(session: Optional[Session] = None, config: Optional[Config] = None) -> SQSClient:
     return _aws("sqs", "client", session, config)  # type: ignore[no-any-return]
 

nhs_aws_helpers/dynamodb_model_store/base_model_store.py

@@ -31,7 +31,7 @@
     QueryOutputTableTypeDef,
     TransactGetItemTypeDef,
     UpdateItemOutputTableTypeDef,
-    WriteRequestTypeDef,
+    WriteRequestOutputTypeDef,
 )
 
 from nhs_aws_helpers import dynamodb, dynamodb_retry_backoff
@@ -684,7 +684,7 @@ def __init__(self, store: BaseModelStore, flush_amount=25):
         self._store = store
         self._table_name = store.table.table_name
         self._client = store.client
-        self._items_buffer: List[WriteRequestTypeDef] = []
+        self._items_buffer: List[WriteRequestOutputTypeDef] = []
         self._flush_amount = flush_amount
         self._overwrite_by_keys = store.table_key_fields
 

poetry.lock

@@ -15,7 +15,7 @@ repository = "https://github.com/NHSDigital/nhs-aws-helpers"
 # core dependencies
 python = ">=3.8,<4.0"
 boto3 = "^1.26.159"
-boto3-stubs = {extras = ["s3", "ssm", "secretsmanager", "dynamodb", "stepfunctions", "sqs", "lambda", "logs", "sns", "events", "kms", "firehose", "athena"], version = ">=1.28.0,^1.28.36"}
+boto3-stubs = {extras = ["s3", "ssm", "secretsmanager", "dynamodb", "stepfunctions", "sqs", "lambda", "logs", "ses", "sns", "events", "kms", "firehose", "athena"], version = ">=1.28.0,^1.28.36"}
 botocore-stubs = "^1.29.159"
 
 
@@ -32,7 +32,7 @@ pytest = "^7.3.1"
 pytest-asyncio = "^0.23.4"
 tox = "^4.6.3"
 pytest-httpserver = "^1.0.8"
-ruff = "^0.2.0"
+ruff = "^0"
 
 
 [tool.poetry.group.local.dependencies]