velocity-python 0.0.15__py3-none-any.whl → 0.0.17__py3-none-any.whl

velocity/__init__.py

@@ -1,4 +1,4 @@
-__version__ = version = "0.0.15"
+__version__ = version = "0.0.17"
 
 from . import aws
 from . import db

velocity/aws/handlers/context.py

@@ -2,9 +2,11 @@ import support.app
 
 engine = support.app.postgres()
 
+
 @engine.transaction
 class Context:
-    def __init__(self, args, postdata, response, aws_event, session, aws_context):
+
+    def __init__(self, aws_event, aws_context, args, postdata, response, session):
         self.__args = args
         self.__postdata = postdata
         self.__response = response
@@ -12,10 +14,9 @@ class Context:
         self.__aws_event = aws_event
         self.__aws_context = aws_context
 
-    
     def postdata(self, keys=-1, default=None):
         if keys == -1:
-            return self.__postdata 
+            return self.__postdata
         if not isinstance(keys, list):
             keys = [keys]
         data = self.__postdata
@@ -25,22 +26,30 @@ class Context:
             else:
                 return default
         return data
-    
-    
+
     def payload(self, keys=-1, default={}):
-        if 'payload' not in self.__postdata:
-              return default
+        if "payload" not in self.__postdata:
+            return default
         if keys == -1:
-            return self.__postdata['payload']
+            return self.__postdata["payload"]
         if not isinstance(keys, list):
             keys = [keys]
-        data = self.__postdata['payload']
+        data = self.__postdata["payload"]
         for key in keys:
             if key in data:
                 data = data[key]
             else:
                 return default
         return data
-    
+
     def action(self):
-        return self.__postdata('action', self.__args('action', ''))
+        return self.__postdata.get("action", self.__args.get("action", ""))
+
+    def args(self):
+        return self.__args
+
+    def response(self):
+        return self.__response
+
+    def session(self):
+        return self.__session

velocity/aws/handlers/lambda_handler.py

@@ -5,16 +5,18 @@ import os
 import traceback
 from velocity.aws import DEBUG
 from support.app import helpers, AlertError, enqueue
-import velocity.aws.handlers
-print(velocity.aws.handlers)
-from response import Response
+
+from velocity.aws.handlers import Response
+
+from . import context
+
 
 class LambdaHandler:
     def __init__(self, aws_event, aws_context):
         self.aws_event = aws_event
         self.aws_context = aws_context
-        self.serve_action_default = True # Set to False to disable OnActionDefault
-        self.skip_action = False # Set to True to skip all actions
+        self.serve_action_default = True  # Set to False to disable OnActionDefault
+        self.skip_action = False  # Set to True to skip all actions
 
         requestContext = aws_event.get("requestContext") or {}
         identity = requestContext.get("identity") or {}
@@ -76,7 +78,7 @@ class LambdaHandler:
 
     def serve(self, tx):
         response = Response()
-        body = self.event.get("body")
+        body = self.aws_event.get("body")
         postdata = {}
         if isinstance(body, str) and len(body) > 0:
             try:
@@ -92,17 +94,18 @@ class LambdaHandler:
             except:
                 postdata = {"raw_body": body}
 
-        req_params = self.event.get("queryStringParameters") or {}
-        context = Context(
-            args=req_params, 
-            postdata=postdata, 
-            response=response, 
-            event=self.aws_event, 
-            session=self.session, 
-            aws_context=self.aws_context)
+        req_params = self.aws_event.get("queryStringParameters") or {}
+        local_context = context.Context(
+            aws_event=self.aws_event,
+            aws_context=self.aws_context,
+            args=req_params,
+            postdata=postdata,
+            response=response,
+            session=self.session,
+        )
         try:
             if hasattr(self, "beforeAction"):
-                self.beforeAction(context)
+                self.beforeAction(local_context)
             actions = []
             action = postdata.get("action", req_params.get("action"))
             if action:
@@ -117,19 +120,19 @@ class LambdaHandler:
                 if self.skip_action:
                     break
                 if hasattr(self, action):
-                    result = getattr(self, action)(context)
+                    result = getattr(self, action)(local_context)
                     if result and result != response:
                         response.set_body(result)
                     break
             if hasattr(self, "afterAction"):
-                self.afterAction(context)
+                self.afterAction(local_context)
         except AlertError as e:
             response.alert(e.get_payload())
         except Exception as e:
             response.exception()
             if hasattr(self, "onError"):
                 self.onError(
-                    context,
+                    local_context,
                     exc=e.__class__.__name__,
                     tb=traceback.format_exc(),
                 )
@@ -156,4 +159,4 @@ class LambdaHandler:
         self.track(tx, postdata.get("payload", {}).get("data", {}))
 
     def enqueue(self, tx, action, payload={}):
-        return enqueue(tx, action, payload, self.session["email_address"])
+        return enqueue(tx, action, payload, self.session["email_address"])

velocity/aws/handlers/sqs_handler.py

@@ -5,9 +5,10 @@ import os
 import traceback
 from velocity.aws import DEBUG
 
+
 class SqsHandler:
-    def __init__(self, event, aws_context):
-        self.event = event
+    def __init__(self, aws_event, aws_context):
+        self.aws_event = aws_event
         self.aws_context = aws_context
         self.serve_action_default = True
         self.skip_action = False
@@ -39,7 +40,7 @@ class SqsHandler:
         tx.table("sys_log").insert(data)
 
     def serve(self, tx):
-        records = self.event.get("Records", [])
+        records = self.aws_event.get("Records", [])
         for record in records:
             attrs = record.get("attributes")
             try:
@@ -82,4 +83,4 @@ class SqsHandler:
             attrs: {str(attrs)}
             postdata: {str(postdata)}
             """
-        )
+        )

velocity/misc/conv/__init__.py

@@ -1,2 +1,2 @@
-import iconv
-import oconv
+from . import iconv
+from . import oconv

velocity/misc/conv/iconv.py

@@ -2,7 +2,7 @@ import re
 import codecs
 import decimal
 from email.utils import parseaddr
-from datetime import datetime, date, time
+from datetime import datetime
 
 
 def none(data):

velocity/misc/conv/oconv.py

@@ -1,7 +1,6 @@
 import re
 import codecs
 import decimal
-from email.utils import parseaddr
 from datetime import datetime, date, time
 from pprint import pformat
 
@@ -29,7 +28,7 @@ def day_of_week(data, abbrev=False):
     if isinstance(data, list):
         new = []
         for day in data:
-            new.append(oconv.day_of_week(day, abbrev=abbrev))
+            new.append(day_of_week(day, abbrev=abbrev))
         return ','.join(new)
     if data == None:
         return ''

{velocity_python-0.0.15.dist-info → velocity_python-0.0.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: velocity-python
-Version: 0.0.15
+Version: 0.0.17
 Summary: A rapid application development library for interfacing with data storage
 Author-email: Paul Perez <pperez@codeclubs.org>
 Project-URL: Homepage, https://codeclubs.org/projects/velocity

{velocity_python-0.0.15.dist-info → velocity_python-0.0.17.dist-info}/RECORD

@@ -1,10 +1,10 @@
-velocity/__init__.py,sha256=dS3F-P5z7oQRT9ZCnPWehiGh--JKf7DaecuiTg6ixFQ,91
+velocity/__init__.py,sha256=_wSZTf8oi9YjNisjKV8-cfMfkKyqXEBfHbQ3cQrejjk,91
 velocity/aws/__init__.py,sha256=ukvGrS0R8p6HtYajexOAJ7Kn9CJNlx6yb58W7o-JrAg,620
 velocity/aws/handlers/__init__.py,sha256=xnpFZJVlC2uoeeFW4zuPST8wA8ajaQDky5Y6iXZzi3A,172
-velocity/aws/handlers/context.py,sha256=fxEGsF-hs7W2VI5IJ8hhrY79zTxDC43xtkauSZjnQto,1295
-velocity/aws/handlers/lambda_handler.py,sha256=NWkzy32HrJfnM1qVcIgwlbqZ60en7iX6uQamGBX-DQw,6147
+velocity/aws/handlers/context.py,sha256=b4WPTUekKDCcUi5oqJRkS3idmJWwnceQjUbtMG2XW30,1443
+velocity/aws/handlers/lambda_handler.py,sha256=B-58EIkJnyajni-wZd4faGir_ClzR5-lB1VnYlI96IA,6185
 velocity/aws/handlers/response.py,sha256=VN4uFI_wtHiqAyBLX-eeQlmCwj1hdIvokvZLjsOyCnw,3915
-velocity/aws/handlers/sqs_handler.py,sha256=LmAuvwvlk3YJg1_ivODLCoaekWsn6MaCWtPgpkXU-O4,3026
+velocity/aws/handlers/sqs_handler.py,sha256=pPXUaKSWoC-gy6rRfB8Gt9m2qCt2_XdO3FDnksXRBHk,3044
 velocity/db/__init__.py,sha256=vrn2AFNAKaqTdnPwLFS0OcREcCtzUCOodlmH54U7ADg,200
 velocity/db/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 velocity/db/core/column.py,sha256=vB7dCrcIWFvRG1fgyzDQnEu7j_0KYxUuDSTCWVCYlPc,6153
@@ -30,11 +30,11 @@ velocity/misc/format.py,sha256=2GwdWOpUqmQjtLJKrHjQjTMFrATF6G1IXkLI1xVPB7U,2301
 velocity/misc/mail.py,sha256=fKfJtEkRKO3f_JbHNw9ThxKHJnChlBMsQwmEDFgj264,2096
 velocity/misc/merge.py,sha256=hBYPJy6lGL8lzb0wK1i1oEAyzragTWKF1rW9_PGHm6s,918
 velocity/misc/timer.py,sha256=wMbV-1yNXeCJo_UPi5sTSslu9hPzokLaIKgd98tyG_4,536
-velocity/misc/conv/__init__.py,sha256=yFPQtFxihlyQWYhOb25eeJmWj0IxvwOeG5lyNHVjzDA,25
-velocity/misc/conv/iconv.py,sha256=JQZzm_xTjHt4R9Hj5rV20eaaWT70sPXjtvtWav8dEsQ,4297
-velocity/misc/conv/oconv.py,sha256=b9sKmO16tEZA0ijLwVOGIht58qPHhf0zGBMSewXuLQo,4161
-velocity_python-0.0.15.dist-info/LICENSE,sha256=aoN245GG8s9oRUU89KNiGTU4_4OtnNmVi4hQeChg6rM,1076
-velocity_python-0.0.15.dist-info/METADATA,sha256=HgK4HcL_eecJRWWUvu9tPhLmvbd4wkDT28qeh8X5uoQ,8522
-velocity_python-0.0.15.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-velocity_python-0.0.15.dist-info/top_level.txt,sha256=JW2vJPmodgdgSz7H6yoZvnxF8S3fTMIv-YJWCT1sNW0,9
-velocity_python-0.0.15.dist-info/RECORD,,
+velocity/misc/conv/__init__.py,sha256=-caOuiqo0mzjP30Rh-3T0bSlt4M-SzJ4SPr2COk9wmg,39
+velocity/misc/conv/iconv.py,sha256=48cXXeDpGPnOixB4CJoS_Ejf5fljzryaRgzwdGZBtcU,4285
+velocity/misc/conv/oconv.py,sha256=TGC6vTcOACtwp_Gpce33ZiVmgqBYQnwBcMNQ1MP6Qdc,4121
+velocity_python-0.0.17.dist-info/LICENSE,sha256=aoN245GG8s9oRUU89KNiGTU4_4OtnNmVi4hQeChg6rM,1076
+velocity_python-0.0.17.dist-info/METADATA,sha256=dc41-gReA3C2oVFef-VhDjUn5aXLCbRm4CnokELQQZA,8522
+velocity_python-0.0.17.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+velocity_python-0.0.17.dist-info/top_level.txt,sha256=JW2vJPmodgdgSz7H6yoZvnxF8S3fTMIv-YJWCT1sNW0,9
+velocity_python-0.0.17.dist-info/RECORD,,