fix: fix tests post migration to uv, format using ruff

Author: adrianjhunter

unicorn_contracts/pyproject.toml

@@ -6,15 +6,15 @@ authors = [
     {name = "Amazon Web Services"}
 ]
 readme = "README.md"
-requires-python = ">=3.13"
+requires-python = ">=3.12"
 
 dependencies = [
     "aws-lambda-powertools[tracer]>=3.9.0",
     "aws-xray-sdk>=2.14.0",
     "boto3>=1.37.23",
 ]
 
-[dependency-groups]
+[project.optional-dependencies]
 dev = [
     "aws-lambda-powertools[all]>=3.9.0",
     "requests>=2.32.3",
@@ -24,6 +24,7 @@ dev = [
     "arnparse>=0.0.2",
     "pytest>=8.3.4",
     "ruff>=0.9.7",
+    "tomli>=2.2.1",
 ]
 
 [tool.setuptools]

unicorn_contracts/pytest.ini

@@ -0,0 +1,2 @@
+[pytest]
+pythonpath = src

unicorn_contracts/template.yaml

@@ -46,7 +46,7 @@ Globals:
   Api:
     OpenApiVersion: 3.0.1
   Function:
-    Runtime: python3.13
+    Runtime: python3.12
     MemorySize: 128
     Timeout: 3
     Tracing: Active

unicorn_contracts/tests/integration/__init__.py

@@ -11,7 +11,7 @@
 
 
 #### CONSTANTS
-DEFAULT_SAM_CONFIG_FILE = Path(__file__).parent.parent.parent.resolve() / 'samconfig.toml'
+DEFAULT_SAM_CONFIG_FILE = Path(__file__).parent.parent.parent.resolve() / "samconfig.toml"
 STACK_OUTPUTS = dict()
 EVENTS_DIR = Path(__file__).parent / "events"
 
@@ -23,9 +23,9 @@
 
 
 def get_stack_name(samconfig: Path | str = DEFAULT_SAM_CONFIG_FILE) -> str:
-    with open(samconfig, 'rb') as f:
+    with open(samconfig, "rb") as f:
         conf = tomli.load(f)
-        stack_name = conf['default']['global']['parameters']['stack_name']
+        stack_name = conf["default"]["global"]["parameters"]["stack_name"]
 
     return stack_name
 

unicorn_contracts/uv.lock

@@ -1,19 +1,20 @@
 #### Global Variables
-stackName		:= $(shell yq -ot '.default.global.parameters.stack_name' samconfig.toml)
+stackName		:= $(shell yq -r '.default.global.parameters.stack_name' samconfig.toml)
 
 
 #### Test Variables
 
 
 #### Build/Deploy Tasks
 build:
+	ruff format
 	sam validate --lint
 	cfn-lint template.yaml -a cfn_lint_serverless.rules
 	poetry export --without-hashes --format=requirements.txt --output=src/requirements.txt
 	sam build -c $(DOCKER_OPTS)
 
 deps:
-	poetry install
+	uv sync
 
 deploy: deps build
 	sam deploy
@@ -23,7 +24,7 @@ deploy: deps build
 test: unit-test
 
 unit-test:
-	poetry run pytest tests/unit/
+	uv run pytest tests/unit/
 
 
 #### Utilities
@@ -43,6 +44,6 @@ delete:
 
 # NOTE: [2023-05-09] This is a fix for installing Poetry dependencies in GitHub Actions
 ci_init:
-	poetry export --without-hashes --format=requirements.txt --output=src/requirements.txt --with dev
-	poetry run pip install -r src/requirements.txt
-	poetry install -n
+	uv export --no-hashes --format=requirements.txt --output-file=src/requirements.txt --extra=dev
+	uv run pip install -r src/requirements.txt
+	uv sync

unicorn_properties/Makefile

@@ -6,15 +6,15 @@ authors = [
     {name = "Amazon Web Services"}
 ]
 readme = "README.md"
-requires-python = ">=3.13"
+requires-python = ">=3.12"
 
 dependencies = [
     "aws-lambda-powertools[tracer]>=3.9.0",
     "aws-xray-sdk>=2.14.0",
     "boto3>=1.37.23",
 ]
 
-[dependency-groups]
+[project.optional-dependencies]
 dev = [
     "aws-lambda-powertools[all]>=3.9.0",
     "requests>=2.32.3",

unicorn_properties/pyproject.toml

@@ -0,0 +1,2 @@
+[pytest]
+pythonpath = src

unicorn_properties/pytest.ini

@@ -52,8 +52,8 @@ def lambda_handler(event, context):
         The same input event file
     """
     # Deserialize event into strongly typed object
-    awsEvent:AWSEvent = Marshaller.unmarshall(event, AWSEvent)  # type: ignore
-    detail:ContractStatusChanged = awsEvent.detail  # type: ignore
+    awsEvent: AWSEvent = Marshaller.unmarshall(event, AWSEvent)  # type: ignore
+    detail: ContractStatusChanged = awsEvent.detail  # type: ignore
 
     save_contract_status(detail)
 
@@ -77,13 +77,11 @@ def save_contract_status(contract_status_changed_event):
     logger.info("Saving contract status to contract status table. %s", contract_status_changed_event.contract_id)
 
     return table.update_item(
-                    Key={
-                        'property_id': contract_status_changed_event.property_id
-                    },
-                    UpdateExpression="set contract_status=:t, contract_last_modified_on=:m, contract_id=:c",
-                    ExpressionAttributeValues={
-                        ':c': contract_status_changed_event.contract_id,
-                        ':t': contract_status_changed_event.contract_status,
-                        ':m': contract_status_changed_event.contract_last_modified_on
-                    }
-            )
+        Key={"property_id": contract_status_changed_event.property_id},
+        UpdateExpression="set contract_status=:t, contract_last_modified_on=:m, contract_id=:c",
+        ExpressionAttributeValues={
+            ":c": contract_status_changed_event.contract_id,
+            ":t": contract_status_changed_event.contract_status,
+            ":m": contract_status_changed_event.contract_last_modified_on,
+        },
+    )

unicorn_properties/src/properties_service/contract_status_changed_event_handler.py

@@ -1,6 +1,7 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: MIT-0
 
+
 class ContractStatusNotFoundException(Exception):
     """
     Custom exception for encapsulating exceptions Contract Status for a specified property is not found