awsimple 2.2.6__py3-none-any.whl → 2.3.0__py3-none-any.whl

awsimple/__version__.py

@@ -1,7 +1,7 @@
 __application_name__ = "awsimple"
 __title__ = __application_name__
 __author__ = "abel"
-__version__ = "2.2.6"
+__version__ = "2.3.0"
 __author_email__ = "j@abel.co"
 __url__ = "https://github.com/jamesabel/awsimple"
 __download_url__ = "https://github.com/jamesabel/awsimple"

awsimple/aws.py

@@ -56,7 +56,6 @@ class AWSAccess:
         self.session = boto3.session.Session(**kwargs)
 
         if is_mock():
-
             # moto mock AWS
             for aws_key in ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SECURITY_TOKEN", "AWS_SESSION_TOKEN"]:
                 self._aws_keys_save[aws_key] = os.environ.get(aws_key)  # will be None if not set
@@ -78,12 +77,15 @@ class AWSAccess:
             self._moto_mock = moto_mock()
             self._moto_mock.start()
             region = "us-east-1"
-            if self.resource_name == "logs":
-                # logs don't have resource
+            if self.resource_name == "logs" or self.resource_name is None:
+                # logs don't have a resource
                 self.resource = None
             else:
                 self.resource = boto3.resource(self.resource_name, region_name=region)  # type: ignore
-            self.client = boto3.client(self.resource_name, region_name=region)  # type: ignore
+            if self.resource_name is None:
+                self.client = None
+            else:
+                self.client = boto3.client(self.resource_name, region_name=region)  # type: ignore
             if self.resource_name == "s3":
                 assert self.resource is not None
                 self.resource.create_bucket(Bucket="testawsimple")  # todo: put this in the test code
@@ -154,9 +156,7 @@ class AWSAccess:
         return self._moto_mock is not None
 
     def __del__(self):
-
         if self._moto_mock is not None:
-
             # if mocking, put everything back
 
             for aws_key, value in self._aws_keys_save.items():

awsimple/cache.py

@@ -69,7 +69,6 @@ def lru_cache_write(new_data: Union[Path, bytes], cache_dir: Path, cache_file_na
             log.info(f"{new_data=} {new_size=} is larger than the cache itself {max_cache_size=}")
             is_room = False  # new file will never fit so don't try to evict to make room for it
         else:
-
             cache_size = get_directory_size(cache_dir)
             overage = (cache_size + new_size) - max_cache_size
 

awsimple/dynamodb.py

@@ -193,6 +193,13 @@ class DBItemNotFound(AWSimpleException):
         return f"{self.key=} {self.message}"
 
 
+class TableNotFound(AWSimpleException):
+    def __init__(self, table_name: str):
+        self.table_name = table_name
+        self.message = f'Table "{self.table_name}" not found'
+        super().__init__(self.message)
+
+
 @typechecked()
 def _is_valid_db_pickled_file(file_path: Path, cache_life: Union[float, int, None]) -> bool:
     is_valid = file_path.exists() and getsize(str(file_path)) > 0
@@ -513,13 +520,22 @@ class DynamoDBAccess(CacheAccess):
     @lru_cache()
     def get_primary_keys_dict(self) -> Dict[KeyType, str]:
         """
-        Get the table's primary keys.
+        Get the table's primary keys. Raise TableNotFound if table does not exist.
 
         :return: a dict with the primary key partition key and (optionally) sort key
         """
 
         assert self.resource is not None
-        return self._get_keys_from_schema(self.resource.Table(self.table_name).key_schema)
+        try:
+            table = self.resource.Table(self.table_name)
+        except ClientError as e:
+            if e.response["Error"]["Code"] == "ResourceNotFoundException":
+                raise TableNotFound(self.table_name)
+            else:
+                raise
+        key_schema = table.key_schema
+        keys = self._get_keys_from_schema(key_schema)
+        return keys
 
     @lru_cache()
     def get_primary_partition_key(self) -> str:
@@ -768,7 +784,6 @@ class DynamoDBAccess(CacheAccess):
     def upsert_item(
         self, partition_key: str = None, partition_value: Union[str, int] = None, sort_key: Union[str, None] = None, sort_value: Union[str, int, None] = None, item: Union[dict, None] = None
     ):
-
         """
         Upsert (update or insert) table item
 

awsimple/dynamodb_miv.py

@@ -66,7 +66,6 @@ class DynamoDBMIVUI(DynamoDBAccess):
 
         # Determine new miv. The miv is an int to avoid comparison or specification problems that can arise with floats. For example, when it comes time to delete an item.
         if time_us is None:
-
             # get the miv for the existing entries
             partition_key = self.get_primary_partition_key()
             partition_value = item[partition_key]

awsimple/s3.py

@@ -445,7 +445,6 @@ class S3Access(CacheAccess):
         assert self.resource is not None
         bucket_resource = self.resource.Bucket(self.bucket_name)
         if self.object_exists(s3_key):
-
             bucket_object = bucket_resource.Object(s3_key)
             assert isinstance(self.bucket_name, str)  # mainly for mypy
             s3_object_metadata = S3ObjectMetadata(

awsimple/sqs.py

@@ -136,7 +136,6 @@ class SQSAccess(AWSAccess):
         return nominal_work_time
 
     def calculate_visibility_timeout(self) -> int:
-
         if self.user_provided_timeout is None:
             if self.immediate_delete:
                 visibility_timeout = self.immediate_delete_timeout  # we immediately delete the message so this doesn't need to be very long
@@ -155,7 +154,6 @@ class SQSAccess(AWSAccess):
 
     @typechecked()
     def _receive(self, max_number_of_messages_parameter: int = None) -> List[SQSMessage]:
-
         if self.user_provided_timeout is None and not self.immediate_delete:
             # read in response history (and initialize it if it doesn't exist)
             try:
@@ -177,7 +175,6 @@ class SQSAccess(AWSAccess):
         call_wait_time = self.sqs_call_wait_time  # first time through may be long poll, but after that it's a short poll
 
         while continue_to_receive:
-
             aws_messages = None
 
             if max_number_of_messages_parameter is None:
@@ -186,7 +183,6 @@ class SQSAccess(AWSAccess):
                 max_number_of_messages = max_number_of_messages_parameter - len(messages)  # how many left to do
 
             try:
-
                 aws_messages = self._get_queue().receive_messages(
                     MaxNumberOfMessages=min(max_number_of_messages, aws_sqs_max_messages), VisibilityTimeout=self.calculate_visibility_timeout(), WaitTimeSeconds=call_wait_time
                 )
@@ -195,7 +191,6 @@ class SQSAccess(AWSAccess):
                     if self.immediate_delete:
                         m.delete()
                     elif self.user_provided_timeout is None:
-
                         #  keep history of message processing times for user deletes, by AWS's message id
                         self.response_history[m.message_id] = [time.time(), None]  # start (finish will be filled in upon delete)
 

{awsimple-2.2.6.dist-info → awsimple-2.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: awsimple
-Version: 2.2.6
+Version: 2.3.0
 Summary: Simple AWS API for S3, DynamoDB, SNS, and SQS
 Home-page: https://github.com/jamesabel/awsimple
 Download-URL: https://github.com/jamesabel/awsimple
@@ -13,7 +13,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: LICENSE.txt
 Requires-Dist: boto3
-Requires-Dist: typeguard
+Requires-Dist: typeguard (<3)
 Requires-Dist: hashy (>=0.1.1)
 Requires-Dist: dictim
 Requires-Dist: appdirs

awsimple-2.3.0.dist-info/RECORD

@@ -0,0 +1,18 @@
+awsimple/__init__.py,sha256=8NChv83C13WICTMbi89I78fAKSE3UQtcGq4YwXAl3OU,826
+awsimple/__version__.py,sha256=ou_bUclq3bwRO56DBjSReyO_DcrTw2lpPq15hmhVUQw,323
+awsimple/aws.py,sha256=006liY2mXwbPu5kl3-nCgmkpMN7pBqEDetqM1eNbXWU,6365
+awsimple/cache.py,sha256=5dYf7bh1Dr_pFbkHck4Ym8zrffctv0ERhGJwieRHQH8,7137
+awsimple/dynamodb.py,sha256=zCinM2oE26Rtl8Vb9kp8UmgDV1HiVXzSfMiJO-XS8aA,35424
+awsimple/dynamodb_miv.py,sha256=FcbEn2VbrYxQcgQKqFoWFqVwAkoqJpwZ4Nr5guXgGXM,4619
+awsimple/logs.py,sha256=A2RmTT90pfFTthfENd7GSsEHSIBJXO8ICHPdA7sEsHY,4278
+awsimple/mock.py,sha256=32CNU656uC3PBhjCJ4R-WBTtHbSl6VNVkpN8G8XDvsQ,199
+awsimple/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+awsimple/s3.py,sha256=uMEz6NN9hXOfsQNUNJ2YOuKGKlT2xqZ5btJ9zsCHBrY,23243
+awsimple/sns.py,sha256=LjKj-UxPdfRDQfN10jU_ULjnlEqLmHcuqfRIKX9lkZo,3266
+awsimple/sqs.py,sha256=yf8a9jGbYzdajeDU3rARFFYoMb3jQ-YJAVNvw4WscW8,13007
+awsimple-2.3.0.dist-info/LICENSE,sha256=d956YAgtDaxgxQmccyUk__EfhORZyBjvmJ8pq6zYTxk,1093
+awsimple-2.3.0.dist-info/LICENSE.txt,sha256=d956YAgtDaxgxQmccyUk__EfhORZyBjvmJ8pq6zYTxk,1093
+awsimple-2.3.0.dist-info/METADATA,sha256=SQAOmvSYRqftTUXxK05S4BaUPKnpJmfragonG5oUfmM,4815
+awsimple-2.3.0.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+awsimple-2.3.0.dist-info/top_level.txt,sha256=mwqCoH_8vAaK6iYioiRbasXmVCQM7AK3grNWOKp2VHE,9
+awsimple-2.3.0.dist-info/RECORD,,

{awsimple-2.2.6.dist-info → awsimple-2.3.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.38.4)
+Generator: bdist_wheel (0.40.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

awsimple-2.2.6.dist-info/RECORD

@@ -1,18 +0,0 @@
-awsimple/__init__.py,sha256=8NChv83C13WICTMbi89I78fAKSE3UQtcGq4YwXAl3OU,826
-awsimple/__version__.py,sha256=MsxrZZ4ZyLep26haDLvH1Fb2CwyaV8ebc2v0DBheVbc,323
-awsimple/aws.py,sha256=YuHs_AzsQEgGS-MnDacrLLy6Q4z3XlQ-bfeNZ4nGfNo,6236
-awsimple/cache.py,sha256=6CvpQufG7CHi4E3pkn3W9XCic_wM-WzhvDRzncNWWhI,7139
-awsimple/dynamodb.py,sha256=qB9EqTGyb0CmS1VmNcKL28HGI08iQxq7mnp4Ic1sajE,34852
-awsimple/dynamodb_miv.py,sha256=q2C-PYEwmLdU0qQVDPui4XZ_podrEUSt6gxkPxl09YQ,4621
-awsimple/logs.py,sha256=A2RmTT90pfFTthfENd7GSsEHSIBJXO8ICHPdA7sEsHY,4278
-awsimple/mock.py,sha256=32CNU656uC3PBhjCJ4R-WBTtHbSl6VNVkpN8G8XDvsQ,199
-awsimple/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-awsimple/s3.py,sha256=cDLz3X1SvU2KOUPp1WUIrPJsSue7HIqyAqn7q0seKIE,23245
-awsimple/sns.py,sha256=LjKj-UxPdfRDQfN10jU_ULjnlEqLmHcuqfRIKX9lkZo,3266
-awsimple/sqs.py,sha256=iTbKiM80V5f3gy6Rej3CdU7qCFNJQfFjz0uAI7BaNDk,13017
-awsimple-2.2.6.dist-info/LICENSE,sha256=d956YAgtDaxgxQmccyUk__EfhORZyBjvmJ8pq6zYTxk,1093
-awsimple-2.2.6.dist-info/LICENSE.txt,sha256=d956YAgtDaxgxQmccyUk__EfhORZyBjvmJ8pq6zYTxk,1093
-awsimple-2.2.6.dist-info/METADATA,sha256=9BTI2gbINrxmxf21UpK7V8luv9deI_fRCnCIdbTWKsE,4810
-awsimple-2.2.6.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-awsimple-2.2.6.dist-info/top_level.txt,sha256=mwqCoH_8vAaK6iYioiRbasXmVCQM7AK3grNWOKp2VHE,9
-awsimple-2.2.6.dist-info/RECORD,,