Restyled by black

Author: restyled-commits

metering/handlers/freecall_handler.py

@@ -7,24 +7,27 @@
 
 logger = get_logger(__name__)
 
-required_keys = ['organization_id', 'service_id']
+required_keys = ["organization_id", "service_id"]
 
 
 def main(event, context):
     logger.info("Free call request received")
     try:
-        if validate_request(required_keys, event['queryStringParameters']):
-            org_id = event['queryStringParameters']['organization_id']
-            service_id = event['queryStringParameters']['service_id']
-            username = event['queryStringParameters']['username']
-
-            logger.info(f"Fetched values from request \n"
-                        f"username: {username} \n"
-                        f"org_id: {org_id} \n"
-                        f"service_id: {service_id} \n")
+        if validate_request(required_keys, event["queryStringParameters"]):
+            org_id = event["queryStringParameters"]["organization_id"]
+            service_id = event["queryStringParameters"]["service_id"]
+            username = event["queryStringParameters"]["username"]
+
+            logger.info(
+                f"Fetched values from request \n"
+                f"username: {username} \n"
+                f"org_id: {org_id} \n"
+                f"service_id: {service_id} \n"
+            )
 
             free_call_details = usage_service.get_free_call_details(
-                username, org_id, service_id)
+                username, org_id, service_id
+            )
             response = free_call_details
             status_code = StatusCode.SUCCESS_GET_CODE
         else:
@@ -35,7 +38,7 @@ def main(event, context):
     except Exception as e:
         logger.error("Failed to get free call details")
         logger.info(event)
-        status_code = StatusCode.SERVER_ERROR_CODE,
+        status_code = (StatusCode.SERVER_ERROR_CODE,)
         response = StatusMessage.SERVER_ERROR_MSG
 
     return generate_lambda_response(status_code, response)

metering/handlers/usage_handler.py

@@ -4,24 +4,37 @@
 from constants import StatusCode, StatusMessage
 from logger import get_logger
 from services import UsageService
-from utils import validate_request, usage_record_add_verify_fields, generate_lambda_response
+from utils import (
+    validate_request,
+    usage_record_add_verify_fields,
+    generate_lambda_response,
+)
 
 usage_service = UsageService()
 
 logger = get_logger(__name__)
 
-required_keys = ["organization_id", "service_id", "username", 'usage_value', 'usage_type',
-                 'service_method', 'group_id', 'status', 'start_time', 'end_time']
+required_keys = [
+    "organization_id",
+    "service_id",
+    "username",
+    "usage_value",
+    "usage_type",
+    "service_method",
+    "group_id",
+    "status",
+    "start_time",
+    "end_time",
+]
 
 
 def main(event, context):
     logger.info("Usage record request received")
     try:
-        request_dict = json.loads(event['body'])
+        request_dict = json.loads(event["body"])
         if validate_request(required_keys, request_dict):
             usage_detail_dict = usage_record_add_verify_fields(request_dict)
-            logging.info(
-                f"usage record after modification: {usage_detail_dict}")
+            logging.info(f"usage record after modification: {usage_detail_dict}")
             usage_service.save_usage_details(usage_detail_dict)
             response = "success"
             status_code = StatusCode.SUCCESS_GET_CODE
@@ -33,7 +46,7 @@ def main(event, context):
     except Exception as e:
         logger.error("Failed to get free call details")
         logger.info(event)
-        status_code = StatusCode.SERVER_ERROR_CODE,
+        status_code = (StatusCode.SERVER_ERROR_CODE,)
         response = StatusMessage.SERVER_ERROR_MSG
 
     return generate_lambda_response(status_code, response)

metering/logger.py

@@ -1,5 +1,6 @@
 import logging
 import sys
+
 FORMATTER = logging.Formatter("%(asctime)s %(levelname)s %(name)s %(message)s")
 
 

metering/repository/base_repository.py

@@ -11,7 +11,6 @@
 
 
 class BaseRepository(object):
-
     def get_default_session(self, session=None):
         if not session:
             return default_session

metering/services.py

@@ -15,17 +15,24 @@ class UsageService(object):
 
     def get_free_call_details(self, username, org_id, service_id, group_id=None):
         total_calls, free_calls = self.storage_service.get_usage_details(
-            username, org_id, service_id, group_id)
+            username, org_id, service_id, group_id
+        )
 
         logger.info(
-            f"Free calls allowed: {free_calls}, Total calls made: {total_calls}")
+            f"Free calls allowed: {free_calls}, Total calls made: {total_calls}"
+        )
         if not free_calls:
             free_calls = 0
         if not total_calls:
             total_calls = 0
 
-        response = {"username": username, "org_id": org_id, "service_id": service_id, "total_calls_made": total_calls,
-                    "free_calls_allowed": free_calls}
+        response = {
+            "username": username,
+            "org_id": org_id,
+            "service_id": service_id,
+            "total_calls_made": total_calls,
+            "free_calls_allowed": free_calls,
+        }
 
         logger.info(response)
         return response
@@ -34,40 +41,36 @@ def save_usage_details(self, usage_details_dict):
         # nedd to introduce entities when we enhance  feature to this service right now directly using dicts
         if not is_free_call(usage_details_dict):
             logger.info("Received usage record request for paid call")
-            channel_id = usage_details_dict['channel_id']
-            group_id = usage_details_dict['group_id']
+            channel_id = usage_details_dict["channel_id"]
+            group_id = usage_details_dict["group_id"]
 
             user_address = APIUtilityService().get_user_address(group_id, channel_id)
-            usage_details_dict['user_address'] = user_address
-            logger.info(
-                f"fetched user address from contract api: {user_address}")
+            usage_details_dict["user_address"] = user_address
+            logger.info(f"fetched user address from contract api: {user_address}")
 
         self.storage_service.add_usage_data(usage_details_dict)
         return
 
 
 class APIUtilityService:
-
     def __init__(self):
-        self.lambda_client = boto3.client('lambda')
+        self.lambda_client = boto3.client("lambda")
 
     def get_user_address(self, group_id, channel_id):
         lambda_payload = {
             "httpMethod": "GET",
             "requestContext": {"stage": CONTRACT_API_STAGE},
-            "path": f"/contract-api/group/{group_id}/channel/{channel_id}"
+            "path": f"/contract-api/group/{group_id}/channel/{channel_id}",
         }
 
         try:
             logger.info(f"Calling contract api for user_address")
             response = self.lambda_client.invoke(
-                FunctionName=CONTRACT_API_ARN,
-                Payload=json.dumps(lambda_payload)
+                FunctionName=CONTRACT_API_ARN, Payload=json.dumps(lambda_payload)
             )
-            response_body_raw = json.loads(
-                response.get('Payload').read())['body']
+            response_body_raw = json.loads(response.get("Payload").read())["body"]
             response_body = json.loads(response_body_raw)
-            user_address = response_body['data'][0]['sender']
+            user_address = response_body["data"][0]["sender"]
         except Exception as e:
             print(e)
             raise Exception("Failed to get user address from marketplace")

metering/storage.py

@@ -22,28 +22,27 @@ def get_usage_details(self, username, org_id, service_id, group_id=None):
 
 
 class DatabaseStorage(Storage):
-
     def __init__(self):
         self.usage_repo = UsageRepository()
         self.org_service_config_repo = OrgServiceRepo()
         self.user_org_group_repo = UserOrgGroupRepository()
 
     def get_user_org_group_id(self, usage_details):
 
-        if usage_details['payment_mode'] == PAYMENT_MODE_FREECALL_VALUE:
+        if usage_details["payment_mode"] == PAYMENT_MODE_FREECALL_VALUE:
             user_org_group_id = self.user_org_group_repo.get_user_org_group_id_by_username(
-                usage_details['username'],
-                usage_details['organization_id'],
-                usage_details['service_id'],
-                usage_details['service_method']
+                usage_details["username"],
+                usage_details["organization_id"],
+                usage_details["service_id"],
+                usage_details["service_method"],
             )
-        elif usage_details['payment_mode'] == PAYMENT_MODE_ESCROW_VALUE:
+        elif usage_details["payment_mode"] == PAYMENT_MODE_ESCROW_VALUE:
             user_org_group_id = self.user_org_group_repo.get_user_org_group_id_by_user_address(
-                usage_details['user_address'],
-                usage_details['organization_id'],
-                usage_details['service_id'],
-                usage_details['service_method'],
-                usage_details['group_id']
+                usage_details["user_address"],
+                usage_details["organization_id"],
+                usage_details["service_id"],
+                usage_details["service_method"],
+                usage_details["group_id"],
             )
         else:
             raise Exception("Invalid payment mode")
@@ -56,69 +55,74 @@ def add_usage_data(self, usage_details):
         user_org_group_id = self.get_user_org_group_id(usage_details)
 
         if user_org_group_id is None:
-            logger.info(f"No user org group data found for "
-                        f"group_id: {usage_details['group_id']}, "
-                        f"org_id: {usage_details['organization_id']}, "
-                        f"user_name: {usage_details['username']}, "
-                        f"user_address: {usage_details['user_address']}, "
-                        f"service_id: {usage_details['service_id']}, "
-                        f"resource {usage_details['service_method']}")
+            logger.info(
+                f"No user org group data found for "
+                f"group_id: {usage_details['group_id']}, "
+                f"org_id: {usage_details['organization_id']}, "
+                f"user_name: {usage_details['username']}, "
+                f"user_address: {usage_details['user_address']}, "
+                f"service_id: {usage_details['service_id']}, "
+                f"resource {usage_details['service_method']}"
+            )
             new_user_org_record = UserOrgGroupModel(
                 payment_group_id=usage_details["group_id"],
                 org_id=usage_details["organization_id"],
                 user_name=usage_details["username"],
                 user_address=usage_details["user_address"],
                 service_id=usage_details["service_id"],
-                resource=usage_details["service_method"]
+                resource=usage_details["service_method"],
             )
             self.user_org_group_repo.create_item(new_user_org_record)
-        logger.info(f"Added user org group data\ngroup_id: {usage_details['group_id']}, "
-                    f"org_id: {usage_details['organization_id']}, "
-                    f"user_name: {usage_details['username']}, "
-                    f"user_address: {usage_details['user_address']}, "
-                    f"service_id: {usage_details['service_id']}, "
-                    f"resource {usage_details['service_method']}")
+        logger.info(
+            f"Added user org group data\ngroup_id: {usage_details['group_id']}, "
+            f"org_id: {usage_details['organization_id']}, "
+            f"user_name: {usage_details['username']}, "
+            f"user_address: {usage_details['user_address']}, "
+            f"service_id: {usage_details['service_id']}, "
+            f"resource {usage_details['service_method']}"
+        )
         user_org_group_id = self.get_user_org_group_id(usage_details)
 
         usage_record = UsageModel(
-            client_type=usage_details['client_type'],
-            ethereum_json_rpc_endpoint=usage_details['ethereum_json_rpc_endpoint'],
-            registry_address_key=usage_details['registry_address_key'],
+            client_type=usage_details["client_type"],
+            ethereum_json_rpc_endpoint=usage_details["ethereum_json_rpc_endpoint"],
+            registry_address_key=usage_details["registry_address_key"],
             user_org_group_id=user_org_group_id,
-            status=usage_details['status'],
-            start_time=usage_details['start_time'],
-            end_time=usage_details['end_time'],
-            response_time=usage_details['response_time'],
-            response_code=usage_details['response_code'],
-            error_message=usage_details['error_message'],
-            version=usage_details['version'],
-            channel_id=usage_details['channel_id'],
-            operation=usage_details['operation'],
+            status=usage_details["status"],
+            start_time=usage_details["start_time"],
+            end_time=usage_details["end_time"],
+            response_time=usage_details["response_time"],
+            response_code=usage_details["response_code"],
+            error_message=usage_details["error_message"],
+            version=usage_details["version"],
+            channel_id=usage_details["channel_id"],
+            operation=usage_details["operation"],
             group_id=usage_details["group_id"],
             org_id=usage_details["organization_id"],
-            usage_type=usage_details['usage_type'],
-            usage_value=usage_details['usage_value'],
-            user_details=usage_details['user_details'],
+            usage_type=usage_details["usage_type"],
+            usage_value=usage_details["usage_value"],
+            user_details=usage_details["user_details"],
             user_name=usage_details["username"],
             service_id=usage_details["service_id"],
             resource=usage_details["service_method"],
             request_id=usage_details["request_id"],
-            payment_mode=usage_details["payment_mode"]
+            payment_mode=usage_details["payment_mode"],
         )
         self.usage_repo.create_item(usage_record)
         logger.info(f"added usage data for {usage_details}")
 
     def get_usage_details(self, user_name, org_id, service_id, group_id=None):
-        optin_time = self.usage_repo.get_optin_time(
-            user_name, org_id, service_id)
-        logger.info(f"opt in for the user{user_name}, \n"
-                    f"org_id: {org_id}, service_id: {service_id} \n"
-                    f"{optin_time.strftime('%Y-%m-%d %H:%M:%S')}")
+        optin_time = self.usage_repo.get_optin_time(user_name, org_id, service_id)
+        logger.info(
+            f"opt in for the user{user_name}, \n"
+            f"org_id: {org_id}, service_id: {service_id} \n"
+            f"{optin_time.strftime('%Y-%m-%d %H:%M:%S')}"
+        )
 
         free_calls = self.org_service_config_repo.get_service_config(
-            org_id, service_id, optin_time)
+            org_id, service_id, optin_time
+        )
 
-        total_calls = self.usage_repo.get_total_calls(
-            user_name, org_id, service_id)
+        total_calls = self.usage_repo.get_total_calls(user_name, org_id, service_id)
 
         return total_calls, free_calls