Merge pull request #2 from sotaog/bugfix/table_initialization_for_put_batch

Fix issue with table initialization when put_batch is used in multipr…

Author: zacharyfox

dynamodb_timeseries/__init__.py

@@ -1,5 +1,4 @@
 import os
 
-from .constants import *
 from .tableresolver import DAILY, HOURLY, MONTHLY, WEEKLY, YEARLY, TableResolver
 from .timeseries import TimeSeries

dynamodb_timeseries/constants.py

@@ -6,8 +6,8 @@
 from multiprocessing import Pool
 from typing import List, Union
 
-from dynamodb_timeseries import exceptions, DEFAULT_REGIONS
-from dynamodb_timeseries.dynamodb import create_table, list_tables, put, put_batch, query
+from dynamodb_timeseries import exceptions
+from dynamodb_timeseries.dynamodb import CLIENT, create_table, list_tables, put, put_batch, query
 from dynamodb_timeseries.tableresolver import MONTHLY, TableResolver
 
 logger = logging.getLogger(__name__)
@@ -30,13 +30,13 @@ def __get_regions():
         regions = os.getenv('DYNAMODB_TIMESERIES_REGIONS')
         if regions:
             return [r for r in regions.split(',')]
-        return DEFAULT_REGIONS
+        return [CLIENT.meta.region_name]
 
-    def __init__(self, table_name_prefix: str, interval: int = MONTHLY, regions: List[str] = None):
+    def __init__(self, table_name_prefix: str, interval: int = MONTHLY, regions: List[str] = []):
         self.table_name_prefix = table_name_prefix
         self.__tables = list_tables(table_name_prefix)
         self.tr = TableResolver(table_name_prefix, interval=interval)
-        if regions is None:
+        if not regions:
             regions = self.__get_regions()
         self.regions = regions
 
@@ -106,8 +106,6 @@ def put_batch(self, records):
                 tables[table_name] = []
             tables[table_name].append(r)
         for table_name, records in tables.items():
-            try:
-                put_batch(table_name, records)
-            except exceptions.TableDoesNotExistException:
+            if table_name not in self.__tables:
                 self.__create_table(table_name)
-                put_batch(table_name, records)
+            put_batch(table_name, records)

dynamodb_timeseries/timeseries.py

@@ -9,7 +9,7 @@
 
 setup(
     name='python-dynamodb-timeseries',
-    version='0.2.0',
+    version='0.2.1',
     description='Library for working with timeseries data on dynamodb',
     long_description=README,
     long_description_content_type="text/markdown",

setup.py

@@ -2,15 +2,16 @@
 import unittest
 from unittest.mock import Mock, patch
 
-from dynamodb_timeseries import TimeSeries, DEFAULT_REGIONS, MONTHLY, HOURLY
+from dynamodb_timeseries import TimeSeries, MONTHLY, HOURLY
 
 
 class TestTimeseries(unittest.TestCase):
     @patch('dynamodb_timeseries.dynamodb.CLIENT')
-    def test_init(self, _client):
+    def test_init(self, client):
       ts = TimeSeries('testing')
+      client.meta.region_name.return_value = 'us-west-2'
       self.assertEqual(ts.table_name_prefix, 'testing')
-      self.assertEqual(ts.regions, DEFAULT_REGIONS)
+      self.assertEqual(ts.regions, ['us-west-2'])
       self.assertEqual(ts.tr.interval, MONTHLY)
 
     @patch('dynamodb_timeseries.dynamodb.CLIENT')