my-aws-helpers 2.2.0__tar.gz → 2.4.0__tar.gz

{my_aws_helpers-2.2.0 → my_aws_helpers-2.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: my_aws_helpers
-Version: 2.2.0
+Version: 2.4.0
 Summary: AWS Helpers
 Home-page: https://github.com/JarrodMccarthy/aws_helpers.git
 Author: Jarrod McCarthy

{my_aws_helpers-2.2.0 → my_aws_helpers-2.4.0}/my_aws_helpers/event.py

@@ -1,10 +1,11 @@
 from __future__ import annotations
-from my_aws_helpers.dynamo import BaseTableObject, DynamoSerialiser
+from typing import Optional
 from datetime import datetime
 from enum import Enum
 from uuid import uuid4
 from copy import copy
-
+from boto3.dynamodb.conditions import Key
+from my_aws_helpers.dynamo import BaseTableObject, DynamoSerialiser, BaseQueries, Dynamo
 
 class EventDynamoKeys:
     @staticmethod
@@ -71,3 +72,26 @@ class Event(BaseTableObject):
         obj['sk'] = self._get_sk()
         return DynamoSerialiser.object_serialiser(obj=obj)
 
+
+class EventQueries(BaseQueries):
+    def __init__(self, table_name, client: Optional[Dynamo] = None):
+        super().__init__(table_name, client)
+
+    def put_event(self, event: Event) -> Event:
+        response = self.client.put_item(item = event._to_dynamo_representation())
+        if response["ResponseMetadata"]["HTTPStatusCode"] == 200:
+            return event
+        raise Exception(f"Failed to put object into dynamo table")
+    
+    def get_event_by_id(self, id: str):
+        pk = EventDynamoKeys.get_event_pk(id=id)
+        sk = EventDynamoKeys.get_event_sk(id=id)
+        results = self.client.table.query(
+            KeyConditionExpression=Key("pk").eq(pk) & Key("sk").eq(sk)
+        )
+        if len(results["items"]) < 1:
+            return None
+        if len(results["Items"]) > 1:
+            raise Exception(f"Should only be 1 event with id {id}")
+        return Event._from_dynamo_representation(obj = results["Items"][0])
+

{my_aws_helpers-2.2.0 → my_aws_helpers-2.4.0}/my_aws_helpers/s3.py

@@ -45,8 +45,13 @@ class S3Location:
 class S3:
     client: boto3.client
 
-    def __init__(self, client: Optional[boto3.client] = None) -> None:
+    def __init__(
+        self,
+        client: Optional[boto3.client] = None,
+        resource: Optional[boto3.resource] = None,
+    ) -> None:
         self.client = client if client else self._get_client()
+        self.resource = resource if resource else boto3.resource('s3')
 
     def _get_client(self) -> boto3.client:
         region_name = os.environ["AWS_DEFAULT_REGION"]
@@ -114,7 +119,7 @@ class S3:
             if compress or s3_location.file_name.endswith(".gz"):
                 file_contents = gzip.compress(file_contents)
                 content_encoding = ContentEncoding.gzip.value
-            obj = self.client.Object(s3_location.bucket, s3_location.file_name)
+            obj = self.resource.Object(s3_location.bucket, s3_location.file_name)
             obj.put(
                 Body=file_contents,
                 ContentType=content_type,
@@ -127,7 +132,7 @@ class S3:
 
     def read_binary_from_s3(self, s3_location: S3Location) -> Optional[bytes]:
         try:
-            obj = self.client.Object(s3_location.bucket, s3_location.file_name)
+            obj = self.resource.Object(s3_location.bucket, s3_location.file_name)
             d_bytes = io.BytesIO()
             obj.download_fileobj(d_bytes)
             d_bytes.seek(0)

{my_aws_helpers-2.2.0 → my_aws_helpers-2.4.0}/my_aws_helpers.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: my-aws-helpers
-Version: 2.2.0
+Version: 2.4.0
 Summary: AWS Helpers
 Home-page: https://github.com/JarrodMccarthy/aws_helpers.git
 Author: Jarrod McCarthy

{my_aws_helpers-2.2.0 → my_aws_helpers-2.4.0}/setup.py

@@ -3,7 +3,7 @@ from setuptools import find_namespace_packages, setup
 
 base_path = os.path.abspath(os.path.dirname(__file__))
 
-version = "2.2.0"
+version = "2.4.0"
 
 setup(
     name="my_aws_helpers",