boto3-assist 0.1.0__tar.gz → 0.1.1__tar.gz

{boto3_assist-0.1.0 → boto3_assist-0.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: boto3_assist
-Version: 0.1.0
+Version: 0.1.1
 Summary: Additional boto3 wrappers to make your life a little easier
 Author-email: Eric Wilson <boto3-assist@geekcafe.com>
 License-File: LICENSE-EXPLAINED.txt
@@ -40,7 +40,7 @@ environment vars first and then load your session.
 
 ## DyamoDB model mapping and Key Generation
 It's a light weight mapping tool to turn your python classes / object models to DynamoDB items that are ready
-for saving.  See the examples directory for more information.
+for saving.  See the [examples](https://github.com/geekcafe/boto3-assist/tree/main/examples) directory in the repo for more information.
 
 
 ```sh

{boto3_assist-0.1.0 → boto3_assist-0.1.1}/README.md

@@ -16,7 +16,7 @@ environment vars first and then load your session.
 
 ## DyamoDB model mapping and Key Generation
 It's a light weight mapping tool to turn your python classes / object models to DynamoDB items that are ready
-for saving.  See the examples directory for more information.
+for saving.  See the [examples](https://github.com/geekcafe/boto3-assist/tree/main/examples) directory in the repo for more information.
 
 
 ```sh

{boto3_assist-0.1.0 → boto3_assist-0.1.1}/devops/build.py

@@ -69,11 +69,15 @@ def run_publish():
     """publish to code artifact"""
 
     # Set up the environment variables for the upload command
+    api_token = os.getenv("PYPI_API_TOKEN")
+
+    if not api_token:
+        raise ValueError("PYPI_API_TOKEN environment variable is not set.")
+
     env = os.environ.copy()
     env["TWINE_USERNAME"] = "__token__"
-    env["TWINE_PASSWORD"] = (
-        "pypi-AgEIcHlwaS5vcmcCJGQ0Zjk3ODRmLTgxZDMtNDViNy1iN2QwLWZkZDQzNTEyY2UwMgACKlszLCI3YzZmZTIzYS04MDVkLTQ0YjYtODlkZS04YTJiODJiNjBmMDQiXQAABiBxfnzdKtx6gff_FbuwKKV8D4b7XkUJJESxSqU1_mkCRA"
-    )
+    env["TWINE_PASSWORD"] = api_token
+
     run_commands(
         ["python", "-m", "twine", "upload", "dist/*"],
         env=env,

{boto3_assist-0.1.0 → boto3_assist-0.1.1}/devops/readme.md

@@ -20,4 +20,6 @@ twine upload --repository-url https://test.pypi.org/legacy/ dist/*
 
 pip install --index-url https://test.pypi.org/simple/ boto3-assist
 
-```
+```
+
+pypi-AgEIcHlwaS5vcmcCJGQ0Zjk3ODRmLTgxZDMtNDViNy1iN2QwLWZkZDQzNTEyY2UwMgACKlszLCI3YzZmZTIzYS04MDVkLTQ0YjYtODlkZS04YTJiODJiNjBmMDQiXQAABiBxfnzdKtx6gff_FbuwKKV8D4b7XkUJJESxSqU1_mkCRA

{boto3_assist-0.1.0 → boto3_assist-0.1.1}/pyproject.toml

@@ -7,7 +7,7 @@ packages = ["src/boto3_assist"]
 
 [project]
 name = "boto3_assist"
-version = "0.1.0"
+version = "0.1.1"
 authors = [
   { name="Eric Wilson", email="boto3-assist@geekcafe.com" }
 ]

{boto3_assist-0.1.0 → boto3_assist-0.1.1}/src/boto3_assist/dynamodb/dynamodb_helpers.py

@@ -142,24 +142,37 @@ class DynamoDBHelpers:
         Wraps Up Some usefull information when dealing with
 
         """
-        response: dict[str, List] = {"Items": [], "Batches": []}
+        response: dict[str, Any] = {"Items": [], "Batches": []}
         record_start: int = 0
+        total_count = 0
+        total_scanned_count = 0
+        record_end = 0
         for item in collection:
             record_start += 1
-            record_end = record_start + len(collection)
+            record_end = record_end + len(item["Items"])
             response["Items"].extend(item["Items"])
-            response["Batches"].append(
-                {
-                    "LastKey": item["LastKey"],
-                    "Count": item["Count"],
-                    "Scanned": item["Scanned"],
-                    "MoreRecords": item["MoreRecords"],
-                    "Records": {"start": record_start, "end": record_end},
-                }
-            )
+
+            batch: dict[str, Any] = {}
+            if "LastEvaluatedKey" in item:
+                batch["LastKey"] = item["LastEvaluatedKey"]
+
+            if "Count" in item:
+                batch["Count"] = item["Count"]
+                total_count += item["Count"]
+
+            if "ScannedCount" in item:
+                batch["ScannedCount"] = item["ScannedCount"]
+                total_scanned_count += item["ScannedCount"]
+
+            batch["Records"] = {"start": record_start, "end": record_end}
+
+            response["Batches"].append(batch)
 
             record_start = record_end
 
+        response["Count"] = total_count
+        response["ScannedCount"] = total_scanned_count
+
         return response
 
     @staticmethod

boto3_assist-0.1.1/src/boto3_assist/version.py

@@ -0,0 +1 @@
+__version__ = '0.1.1'

boto3_assist-0.1.0/setup__.py

@@ -1,38 +0,0 @@
-from setuptools import setup, find_packages
-
-
-def read_readme() -> str:
-    """Read the readme"""
-    with open("README.md", "r", encoding="utf-8") as fh:
-        long_description = fh.read()
-    return long_description
-
-
-setup(
-    name="boto3-assist",
-    version="0.1.0",
-    author="Eric Wilson",
-    author_email="boto3-assist@geekcafe.com",
-    description="Additional boto3 wrappers to make your life a little easier",
-    long_description=read_readme(),
-    long_description_content_type="text/markdown",
-    url="https://github.com/geekcafe/boto3-assist",
-    packages=find_packages(),
-    classifiers=[
-        "Programming Language :: Python :: 3",
-        "License :: OSI Approved :: MIT License",
-        "Operating System :: OS Independent",
-    ],
-    python_requires=">=3.10",
-    install_requires=[
-        "aws-lambda-powertools",
-        "aws-xray-sdk",
-        "boto3",
-        "jsons",
-        "python-dateutil",
-        "python-dotenv",
-        "pytz",
-        "requests",
-        "types-python-dateutil",
-    ],
-)

boto3_assist-0.1.0/src/boto3_assist/version.py

@@ -1 +0,0 @@
-__version__ = '0.1.0'