clear-skies-aws 1.10.2__py3-none-any.whl → 2.0.2__py3-none-any.whl

{clear_skies_aws-1.10.2.dist-info → clear_skies_aws-2.0.2.dist-info}/METADATA

@@ -1,46 +1,48 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: clear-skies-aws
-Version: 1.10.2
+Version: 2.0.2
 Summary: clearskies bindings for working in AWS
-License: MIT
-Author: Conor Mancone
-Author-email: cmancone@gmail.com
-Requires-Python: >=3.10,<4.0
+Project-URL: Repository, https://github.com/clearskies-py/clearskies-aws
+Project-URL: Issues, https://github.com/clearskies-py/clearskies-aws/issues
+Project-URL: Changelog, https://github.com/clearskies-py/clearskies-aws/blob/main/CHANGELOG.md
+Project-URL: Documentation, https://clearskies.info/modules/clearskies-aws/
+Author: tnijboer
+Author-email: Conor Mancone <cmancone@gmail.com>
+License-Expression: MIT
+License-File: LICENSE
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
+Requires-Python: <4.0,>=3.11
+Requires-Dist: boto3<2.0.0,>=1.26.148
+Requires-Dist: clear-skies<3.0.0,>=2.0.2
+Requires-Dist: types-boto3[dynamodb,sns,sqs]<2.0.0,>=1.38.13
 Provides-Extra: akeyless
+Requires-Dist: akeyless-cloud-id<0.5.0,>=0.2.3; extra == 'akeyless'
+Requires-Dist: akeyless<6.0.0,>=5.0.0; extra == 'akeyless'
 Provides-Extra: ses
-Requires-Dist: akeyless (>=4.0.0,<5.0.0) ; extra == "akeyless"
-Requires-Dist: akeyless-cloud-id (>=0.2.3,<0.3.0) ; extra == "akeyless"
-Requires-Dist: boto3 (>=1.26.148,<2.0.0)
-Requires-Dist: clear-skies (>=1.14.4,<2.0.0)
-Requires-Dist: jinja2 (>=3.1.2,<4.0.0) ; extra == "ses"
-Requires-Dist: types-boto3[dynamodb,sns,sqs] (>=1.38.13,<2.0.0)
-Project-URL: Repository, https://github.com/cmancone/clearskies-aws
+Requires-Dist: jinja2<4.0.0,>=3.1.2; extra == 'ses'
 Description-Content-Type: text/markdown
 
 # clearskies-aws
 
 clearskies bindings for working in AWS, which means additional:
 
- - backends (DynamoDB, SQS)
- - Secret/environment integrations (parameter store/secret manager)
- - DB connectivity via IAM auth
- - Contexts (ALB, HTTP API Gateway, Rest API Gateway, direct Lambda invocation, lambda+SQS)
+- backends (DynamoDB, SQS)
+- Secret/environment integrations (parameter store/secret manager)
+- DB connectivity via IAM auth
+- Contexts (ALB, HTTP API Gateway, Rest API Gateway, direct Lambda invocation, lambda+SQS)
 
-# Installation, Documentation, and Usage
+## Installation, Documentation, and Usage
 
 To install:
 
-```
+```shell
 pip3 install clear-skies-aws
 ```
 
-# Usage
+## Usage
 
 Anytime you use a context from `clearskies-aws`, the default dependencies are adjust to:
 
@@ -49,17 +51,17 @@ Anytime you use a context from `clearskies-aws`, the default dependencies are ad
 
 In both cases you must provide the AWS region for your resources, which you do by setting the `AWS_REGION` environment variable (either in an actual environment variable or in your `.env` file).
 
-## Paramter Store
+### Parameter Store
 
 To use the SSM parameter store you just inject the `secrets` variable into your callables:
 
-```
+```python
 import clearskies_aws
 
 def parameter_store_demo(secrets):
     return secrets.get('/path/to/parameter')
 
-execute_demo_in_elb = clearskies_aws.contexts.lambda_elb(parameter_store_demo)
+execute_demo_in_elb = clearskies_aws.contexts.lambda_alb(parameter_store_demo)
 
 def lambda_handler(event, context):
     return execute_demo_in_elb(event, context)
@@ -67,14 +69,14 @@ def lambda_handler(event, context):
 
 Also, per default behavior, clearskies can fetch things from your secret manager if specified in your environment/.env file.  For instance, if your database password is stored in parameter store, then you can reference it from your `.env` file with a standard cursor backend:
 
-```
+```env
 db_host = "path-to-aws.rds"
 db_username = "sql_username"
 db_password = "secret://path/to/password/in/parameter/store"
 db_database = "sql_database_name"
 ```
 
-## Secret Manager
+### Secret Manager
 
 If desired, you can swap out the parameter store integration for secret manager.  Just remember that you can configure parameter store to fetch secrets from secret manager, so you might be best off doing that and sticking with the default parameter store integration.  Still, if you want to use secret manager, you just configure it in your application or context:
 
@@ -93,7 +95,7 @@ def lambda_handler(event, context):
     return execute_demo_in_elb(event, context)
 ```
 
-## Contexts
+### Contexts
 
 clearskies_aws adds the following contexts:
 
@@ -105,7 +107,7 @@ clearskies_aws adds the following contexts:
 | `clearskies_aws.contexts.lambda_inocation`                  | Lambdas invoked directly          |
 | `clearskies_aws.contexts.lambda_sqs_standard_partial_batch` | Lambdas attached to an SQS queue  |
 
-### Lambdas+SQS
+#### Lambdas+SQS
 
 Here's a simple example of using the Lambda+SQS context:
 
@@ -125,7 +127,7 @@ See [the AWS docs](https://docs.aws.amazon.com/lambda/latest/dg/with-sqs.html).
 
 Note that, unlike other contexts, the Lambda+SQS context really only works with a simple callable.  Routing and other handlers don't make much sense here.  Keep in mind that, before invoking the Lambda, AWS may batch up records together in arbitrary ways.  The context will take care of this and will invoke your callable once **for each record in the AWS event** - not once for the event.  `request_data` will be populated with the actual message for the event.  In addition, it assumes that a JSON message was sent to the queue, so `request_data` will be an object/list/etc, rather than a string.  This is intended to be used with [partial batching](https://docs.aws.amazon.com/lambda/latest/dg/with-sqs.html#services-sqs-batchfailurereporting).  Therefore, if your function raises an error, the context will catch it, return a failure response for the cooresponding message, and then continue processing any other messages in the batch.
 
-## SQS Backend
+### SQS Backend
 
 To use the SQS backend just declare it for your model, set the table name to return the queue url, and execute a "create" operation to send data to the queue.  Note that the SQS backend is write-only: you can "create" records (resulting in a message being sent to the queue), but you can't read data back out.  The way the queue system in SQS works is just too different than a standard database for that to make sense in the context of a clearskies model.
 
@@ -164,7 +166,7 @@ if __name__ == '__main__':
     cli()
 ```
 
-## IAM DB Auth
+### IAM DB Auth
 
 For non-serverless RDS databases, AWS supports login via IAM.  You have to provide a few additional details in your environment to make this work:
 
@@ -195,7 +197,6 @@ def lambda_handler(event, context):
 
 Of course normally you wouldn't want to interact with it directly.  Adding `IAMDBAuth` to your `additional_configs` and setting up the necessary environemnt variables will be sufficient that any models that use the `cursor_backend` will connect via IAM DB Auth, rather than using hard-coded passwords.
 
-## IAM DB Auth with SSM Bastion
+### IAM DB Auth with SSM Bastion
 
 Coming shortly
-

clear_skies_aws-2.0.2.dist-info/RECORD

@@ -0,0 +1,63 @@
+clearskies_aws/__init__.py,sha256=LAzXoPm5wVRdxUoQIWuBS_c71t9IT_iq-mIh338154o,297
+clearskies_aws/actions/__init__.py,sha256=YsIi3ZTdByu4R7I77uOAXDE5hzB31J_tRrIoTxe_bjo,371
+clearskies_aws/actions/action_aws.py,sha256=JMogBFIrN72h5oBQLbyMy0LmfVLrqvWCYLQDml1qO4M,4674
+clearskies_aws/actions/assume_role.py,sha256=XNxbVju460aBMS8NQhY80eoNVQgZRJ6-OydsNOx3neA,4319
+clearskies_aws/actions/ses.py,sha256=Cu8USID8vy2IZC6sFOIQRzv8a0LCMvYG15yn0l-fl5g,8431
+clearskies_aws/actions/sns.py,sha256=YS1TbEwtU-0lDbjG2HyTBs2J-ML5OL3ModAiGTMeK-c,2205
+clearskies_aws/actions/sqs.py,sha256=r0z8njU87n09UgAq3l34JuNIbaBE85D_z8IE6ciIs9Q,3359
+clearskies_aws/actions/step_function.py,sha256=Y6tGbQJIAD_IwV9ohwYfuv3vqtryTwpFTNGUFgdj_DQ,2689
+clearskies_aws/backends/__init__.py,sha256=LgMNrf2yD9_PZBGbfs3yQGWM0NelSwk9GO73NfGwc44,587
+clearskies_aws/backends/backend.py,sha256=WpsoT0pZOdilvtOkbiNtk6DoOEzmjyWcCDfUCWOlToc,4316
+clearskies_aws/backends/dynamo_db_backend.py,sha256=cTlbSpMiJ-0YILeHRrMZ6u4blRl_76hmemZZO9BwNN4,29396
+clearskies_aws/backends/dynamo_db_condition_parser.py,sha256=OipIlFpcfS2GQiGpge6ZFX4NZNfNtHF87qi9g3yZgIU,12622
+clearskies_aws/backends/dynamo_db_parti_ql_backend.py,sha256=x1pLNTUsTjCxi1SDryr9_uhL-AQJS7ksP5bvQpnhaC8,46081
+clearskies_aws/backends/sqs_backend.py,sha256=kHTzgBwpYzV31UcGaoSUcC_7eZEwm-GsCHvXFM1OLT0,2152
+clearskies_aws/configs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+clearskies_aws/contexts/__init__.py,sha256=sdcIT85OXqwwo8CcBYuyNcN6kvkwv1Ph8MTwuSi4Bnk,767
+clearskies_aws/contexts/cli_web_socket_mock.py,sha256=ZjOhOtQHJ4Vf9V1Bkole6JiGyP1CLTzPqwTrLiiOi0A,660
+clearskies_aws/contexts/lambda_alb.py,sha256=9eLemimudZ4WsWGarONIhoiFnlk_fBygQ6XwJb7NrbY,3237
+clearskies_aws/contexts/lambda_api_gateway.py,sha256=K8sKDV2JtXbzcDy9SOd7kMveuD6t5VGxls2iDMiVhXY,2787
+clearskies_aws/contexts/lambda_api_gateway_web_socket.py,sha256=t3dLRT3s37xHazMa-KVOSWF-0OaUpGQ4an-olbeeJUw,3238
+clearskies_aws/contexts/lambda_invocation.py,sha256=j3AhSXMHRwKufOSTUjhMyeFk4sO_Y4BlX4ECCFvMudw,538
+clearskies_aws/contexts/lambda_sns.py,sha256=FFOIyyCQFKvYsolpf8zlVitdceRkgvEjds3GCXSJjdk,719
+clearskies_aws/contexts/lambda_sqs_standard_partial_batch.py,sha256=kWl3rFtsAbSkadRLZunN20oXvCQpZJFcDhv3VMMWrCg,1093
+clearskies_aws/di/__init__.py,sha256=pLHSIKxS1oELOgttRuwM0yXdJRxjZKXQ6tPxme2db0U,222
+clearskies_aws/di/aws_additional_config_auto_import.py,sha256=qc9AUlFdF9jhAzS99esyvgY1MiW7mLz45fATK7Yp0rg,1271
+clearskies_aws/di/inject/__init__.py,sha256=5_x5_BBQwC6J4k5YLdTm1DfIDM-95zXz1L5a1nMrlrY,186
+clearskies_aws/di/inject/boto3.py,sha256=7qcn5N-RnUKiCd1U31JAjQHF6NDudS4KyBLT0krUD-Y,404
+clearskies_aws/di/inject/boto3_session.py,sha256=11UYHz5kgrrx5lawoYaOFBm-QIoa45YUCMAOn4gT8Jo,383
+clearskies_aws/di/inject/parameter_store.py,sha256=g0uAVwQEywLO9bCcYLbDKuyYnYgVyrfcYsOBJWYGads,475
+clearskies_aws/endpoints/__init__.py,sha256=A2e3zCI8Ywg95WcTk1f92fpmlJ6eD4mTfcR43yX9sow,112
+clearskies_aws/endpoints/secrets_manager_rotation.py,sha256=CqtE7pJ1FiPStRjMI1WsflcYXgcr-miRUE-IU1UKmnk,7764
+clearskies_aws/endpoints/simple_body_routing.py,sha256=B3fnfxUEMuNpzc26Pzly6618DFU9fpaCk8KhTGSaptE,1181
+clearskies_aws/input_outputs/__init__.py,sha256=83rhCp7knun2WB4Pd53H8KvVgM_4_Lt0YuD2Gvo2UPk,755
+clearskies_aws/input_outputs/cli_web_socket_mock.py,sha256=a96M1vnUfpe0YL04iSFpV_oXG6IkygRd710CDo72wc4,496
+clearskies_aws/input_outputs/lambda_alb.py,sha256=iYooG5AlkrQQgzSt304A5_u_UhuqYh-9PeLvFdGM_Eg,2013
+clearskies_aws/input_outputs/lambda_api_gateway.py,sha256=n5XiaxmaFKJ9wMQcNQwizpjcA-L_bdLk1aUk-QyO58w,4672
+clearskies_aws/input_outputs/lambda_api_gateway_web_socket.py,sha256=P9cMrOxRlezUh7OIqGrV_34amksI6n_1ZPYujSLY_so,2702
+clearskies_aws/input_outputs/lambda_input_output.py,sha256=71sW2vQi-yCf0wE8DGso0Zy1G7cn5D-gnEELIvEnbiw,2743
+clearskies_aws/input_outputs/lambda_invocation.py,sha256=y8dPkjt9rvSJd2tkctdtM1-q_SnRPR_bXc9aySjRgdE,2800
+clearskies_aws/input_outputs/lambda_sns.py,sha256=n04gS8bgo3sX8EZTkBvdCykm5dlV4lloc7IoPv71_T8,2657
+clearskies_aws/input_outputs/lambda_sqs_standard.py,sha256=ubrSdU0RTHIURLk_kgKs3Gt7LcxaUlRBdA67169qHlA,2880
+clearskies_aws/mocks/__init__.py,sha256=mn764gINN667tYoJfnsM6HjAAhCsO_kZ6E-fUwdLY50,22
+clearskies_aws/mocks/actions/__init__.py,sha256=to1r8B365Et2PRVfUWWnJGt7Hdr8vwwQuNyZvTSTP6g,152
+clearskies_aws/mocks/actions/ses.py,sha256=KsII9ggU364BQoxgHfO2rxi6tjVsdnwJyMhtclOhWLQ,998
+clearskies_aws/mocks/actions/sns.py,sha256=yGY3V0_htOZ3y8VTLdznoMSUQZvnjulQbrR5z_-0fXQ,706
+clearskies_aws/mocks/actions/sqs.py,sha256=y0Vq7IMbjlfT5JMNHfbPsq9XVZhUF-G0kdXzQnPzyUA,710
+clearskies_aws/mocks/actions/step_function.py,sha256=ENEVy8Ai3vPymbQre5aWa5z2McBjlnopfsLxdO7oEbc,937
+clearskies_aws/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+clearskies_aws/models/web_socket_connection_model.py,sha256=5M1qfQHKuWMYPUDkwT48QPo2ROey7koizvWLfapsfow,7492
+clearskies_aws/secrets/__init__.py,sha256=0mqYja2ETBHJh4b3jgRhhJV1uGdZc9S7cUvcV5QByPs,445
+clearskies_aws/secrets/akeyless_with_ssm_cache.py,sha256=32HUS1KQ5F6Fu70HDtojqDL7VZvP_YDgbWLTTmNJvPA,2073
+clearskies_aws/secrets/parameter_store.py,sha256=nMpkbUnxHGcCoMD5T-weCS13f1RZA7ZHl24O7qXaZLE,1882
+clearskies_aws/secrets/secrets.py,sha256=aDMPj-tuXdRhh8YKMnsJe9V_VLrD8Cru-xUKs8cyDIY,485
+clearskies_aws/secrets/secrets_manager.py,sha256=hK10lVmEFJltTv7h2AkYR3ySCVXx1JVy56jWU1hyYso,3708
+clearskies_aws/secrets/additional_configs/__init__.py,sha256=0NFOMVod8tte_K0Jq1Qf7_DDBvp6aEE4wF4hddQaW8w,1927
+clearskies_aws/secrets/additional_configs/iam_db_auth.py,sha256=PwyiLaacpRfhBKzQBdvGWHUYf5Ymth1sG2ly7Z6RoR0,1238
+clearskies_aws/secrets/additional_configs/iam_db_auth_with_ssm.py,sha256=ABY29X-YvrE6vvNo6kVdf4DqyRNq5cFR5SfK7MNkltE,3463
+clearskies_aws/secrets/additional_configs/mysql_connection_dynamic_producer_via_ssh_cert_bastion.py,sha256=mLaplwvJLSbGh6oXgdOKL9Mv-6hLv5OUYCfEwHbHvLE,3700
+clearskies_aws/secrets/additional_configs/mysql_connection_dynamic_producer_via_ssm_bastion.py,sha256=2VHOwto4I9gBwrpd2HGpL-Wr0T2S-jFjUhe2Ib8hNJ8,6596
+clear_skies_aws-2.0.2.dist-info/METADATA,sha256=BcwJmkUhC-KD2QwepuW2kAeU6IRITpMOKrKCgAO2_b4,8972
+clear_skies_aws-2.0.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+clear_skies_aws-2.0.2.dist-info/licenses/LICENSE,sha256=MkEX8JF8kZxdyBpTTcB0YTd-xZpWnHvbRlw-pQh8u58,1069
+clear_skies_aws-2.0.2.dist-info/RECORD,,

{clear_skies_aws-1.10.2.dist-info → clear_skies_aws-2.0.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.2
+Generator: hatchling 1.27.0
 Root-Is-Purelib: true
 Tag: py3-none-any

clear_skies_aws-2.0.2.dist-info/licenses/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025, Tom Nijboer
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

clearskies_aws/__init__.py

@@ -1,2 +1,15 @@
-from . import actions, backends, contexts, handlers, mocks, secrets
-from .web_socket_connection_model import WebSocketConnectionModel
+from __future__ import annotations
+
+from clearskies_aws import actions, backends, contexts, di, endpoints, input_outputs, mocks, models, secrets
+
+__all__ = [
+    "models",
+    "actions",
+    "backends",
+    "contexts",
+    "di",
+    "endpoints",
+    "input_outputs",
+    "mocks",
+    "secrets",
+]

clearskies_aws/actions/__init__.py

@@ -1,108 +1,15 @@
-import clearskies
+from __future__ import annotations
 
-from typing import Optional, Callable, Union
+from clearskies_aws.actions.assume_role import AssumeRole
+from clearskies_aws.actions.ses import SES
+from clearskies_aws.actions.sns import SNS
+from clearskies_aws.actions.sqs import SQS
+from clearskies_aws.actions.step_function import StepFunction
 
-from .assume_role import AssumeRole
-from .ses import SES
-from .sns import SNS
-from .sqs import SQS
-from .step_function import StepFunction
-def ses(
-    sender,
-    to=None,
-    cc=None,
-    bcc=None,
-    subject=None,
-    message=None,
-    subject_template=None,
-    message_template=None,
-    subject_template_file=None,
-    message_template_file=None,
-    assume_role=None,
-    dependencies_for_template=None,
-    when=None,
-):
-    return clearskies.BindingConfig(
-        SES,
-        sender,
-        to=to,
-        cc=cc,
-        bcc=bcc,
-        subject=subject,
-        subject_template=subject_template,
-        subject_template_file=subject_template_file,
-        message=message,
-        message_template=message_template,
-        message_template_file=message_template_file,
-        assume_role=assume_role,
-        dependencies_for_template=dependencies_for_template,
-        when=when,
-    )
-def sns(
-    topic=None,
-    topic_environment_key=None,
-    topic_callable=None,
-    message_callable=None,
-    when=None,
-):
-    return clearskies.BindingConfig(
-        SNS,
-        topic=topic,
-        topic_environment_key=topic_environment_key,
-        topic_callable=topic_callable,
-        message_callable=message_callable,
-        when=when,
-    )
-def sqs(
-    queue_url: str = '',
-    queue_url_environment_key: str = '',
-    queue_url_callable: Callable = '',
-    message_callable: Callable = None,
-    when: Callable = None,
-    assume_role=None,
-    message_group_id: Optional[Union[Callable, str]]=None,
-):
-    return clearskies.BindingConfig(
-        SQS,
-        queue_url=queue_url,
-        queue_url_environment_key=queue_url_environment_key,
-        queue_url_callable=queue_url_callable,
-        message_callable=message_callable,
-        when=when,
-        assume_role=assume_role,
-        message_group_id=message_group_id,
-    )
-def step_function(
-    arn: str = "",
-    arn_environment_key: str = "",
-    arn_callable: Optional[Callable] = None,
-    message_callable: Optional[Callable] = None,
-    when: Optional[Callable] = None,
-    assume_role: Optional[AssumeRole] = None,
-    column_to_store_execution_arn: Optional[str] = None,
-):
-    return clearskies.BindingConfig(
-        StepFunction,
-        arn=arn,
-        arn_environment_key=arn_environment_key,
-        arn_callable=arn_callable,
-        message_callable=message_callable,
-        when=when,
-        assume_role=assume_role,
-        column_to_store_execution_arn=column_to_store_execution_arn,
-    )
-def assume_role(
-    role_arn: str,
-    external_id: str = "",
-    role_session_name: str = "",
-    duration: int = 3600,
-    source: Optional[AssumeRole] = None,
-):
-    return AssumeRole(
-        role_arn,
-        external_id=external_id,
-        role_session_name=role_session_name,
-        duration=duration,
-        source=source,
-    )
-__all__ = [assume_role, AssumeRole, ses, SES, sns, SNS, step_function, StepFunction, sqs, SQS]
+__all__ = [
+    "AssumeRole",
+    "SES",
+    "SNS",
+    "SQS",
+    "StepFunction",
+]

clearskies_aws/actions/action_aws.py

@@ -1,117 +1,134 @@
-import boto3
+from __future__ import annotations
+
 import json
 import logging
-
 from abc import ABC
-from boto3 import client
+from collections import OrderedDict
+from types import ModuleType
+from typing import Callable, Generic, TypeVar
+
+from botocore.client import BaseClient
 from botocore.exceptions import ClientError
-from clearskies.environment import Environment
-from clearskies.models import Models
+from clearskies.action import Action
+from clearskies.configs import Boolean, String
+from clearskies.configs import Callable as CallableConfig
+from clearskies.configurable import Configurable
+from clearskies.decorators import parameters_to_properties
+from clearskies.di.inject import Di, Environment
+from clearskies.di.injectable_properties import InjectableProperties
 from clearskies.functional import string
-from collections import OrderedDict
-from typing import Callable, Optional
+from clearskies.model import Model
+
+from clearskies_aws.di import inject
 
-from ..di import StandardDependencies
 from .assume_role import AssumeRole
-class ActionAws(ABC):
 
-    _logging = logging.getLogger(__name__)
-    _client: Optional[boto3.client] = None
-    _name: Optional[str] = None
+ClientType = TypeVar("ClientType", bound=BaseClient)
 
-    def __init__(self, environment: Environment, boto3: boto3, di: StandardDependencies) -> None:
-        """Setup action."""
-        self.environment = environment
-        self.boto3 = boto3
-        self.di = di
 
-    def configure(
-        self,
-        message_callable: Optional[Callable] = None,
-        when: Optional[Callable] = None,
-        assume_role: Optional[AssumeRole] = None,
-    ) -> None:
-        """Configues the Action."""
-        self.when = when
-        self.message_callable = message_callable
-        self.assume_role = assume_role
+class ActionAws(Generic[ClientType], Action, Configurable, InjectableProperties):
+    logging = logging.getLogger(__name__)
+    boto3 = inject.Boto3()
+    environment = Environment()
+    di = Di()
+
+    client: ClientType
 
-        if self.message_callable and not callable(self.message_callable):
-            raise ValueError(
-                "'message_callable' should be a callable that returns the message for the queue, but a callable was not passed."
-            )
+    service_name = String(required=True)
 
-        if when and not callable(when):
-            raise ValueError("'when' must be a callable but something else was found")
+    message_callable = CallableConfig(required=False, default=None)
 
-        if not self._name:
-            raise ValueError(f"Name of client not set.")
+    when = CallableConfig(required=False, default=None)
 
-        if not self.environment.get('AWS_REGION', True) and not self.environment.get('AWS_DEFAULT_REGION', True):
-            raise ValueError("You must set either the AWS_REGION or AWS_DEFAULT_REGION environment variable when using AWS actions")
+    assume_role: AssumeRole | None = None
 
-    def __call__(self, model: Models) -> None:
+    region = String(required=False)
+
+    can_cache = Boolean(default=True)
+
+    @parameters_to_properties
+    def __init__(
+        self,
+        service_name: str,
+        message_callable: Callable | None = None,
+        when: Callable | None = None,
+        assume_role: AssumeRole | None = None,
+        region: str | None = None,
+    ) -> None:
+        """Set up the AWS action."""
+
+    # def configure(self, **kwargs):
+    #     """Configure the action with additional parameters."""
+    #     # Finalize configuration properties from Configurable
+    #     Configurable.finalize_and_validate_configuration(self)
+
+    #     # Handle any additional kwargs by setting them as attributes
+    #     for key, value in kwargs.items():
+    #         if hasattr(self, key):
+    #             setattr(self, key, value)
+
+    def __call__(self, model: Model) -> None:
         """Send a notification as configured."""
         if self.when and not self.di.call_function(self.when, model=model):
             return
 
         try:
-            client = self._getClient()
+            client = self._get_client()
             self._execute_action(client, model)
         except ClientError as e:
-            self._logging.exception(f"Failed to retrieve client for {self._name}")
+            self.logging.exception(f"Failed to retrieve client for {self.__class__.__name__} action.")
             raise e
 
-    def _getClient(self, region=None) -> boto3.client:
+    def _get_client(self) -> ClientType:
         """Retrieve the boto3 client."""
-        can_cache = not region
-        if self._client and can_cache:
-            return self._client
+        if hasattr(self, "client") and self.client and self.can_cache:
+            return self.client
 
         if self.assume_role:
             boto3 = self.assume_role(self.boto3)
         else:
             boto3 = self.boto3
 
-        if not region:
-            region = self.default_region()
-        if region:
-            client = boto3.client(self._name, region_name=region)
+        if not self.region:
+            self.region = self.default_region()
+        if self.region:
+            client = boto3.client(self.service_name, region_name=self.region)
         else:
-            client = boto3.client(self._name)
+            client = boto3.client(self.service_name)
 
-        if can_cache:
-            self._client = client
+        if self.can_cache:
+            self.client = client
         return client
 
     def default_region(self):
-        region = self.environment.get('AWS_REGION', silent=True)
+        region = self.environment.get("AWS_REGION", silent=True)
         if region:
             return region
-        region = self.environment.get('DEFAULT_AWS_REGION', silent=True)
+        region = self.environment.get("DEFAULT_AWS_REGION", silent=True)
         if region:
             return region
         return None
 
-    def _execute_action(self, client: boto3.client, model: Models) -> None:
+    def _execute_action(self, client: ClientType, model: Model) -> None:
         """Run the action."""
         pass
 
-    def get_message_body(self, model: Models) -> str:
+    def get_message_body(self, model: Model) -> str:
         """Retrieve the message for the action."""
         if self.message_callable:
             result = self.di.call_function(self.message_callable, model=model)
             if isinstance(result, dict) or isinstance(result, list):
                 return json.dumps(result, default=string.datetime_to_iso)
             if not isinstance(result, str):
+                callable_name = getattr(self.message_callable, "__name__", str(self.message_callable))
                 raise TypeError(
                     f"The return value from the message callable for the {__name__} action must be a string, dictionary, or list. I received a "
-                    + f"{type(result)} after calling '{self.message_callable.__name__}'"
+                    + f"{type(result)} after calling '{callable_name}'"
                 )
             return result
 
         model_data = OrderedDict()
-        for (column_name, column) in model.columns().items():
+        for column_name, column in model.get_columns().items():
             if not column.is_readable:
                 continue
             model_data.update(column.to_json(model))