fix(bda): updated bda construct with schema file upload changes (#1061)

* fix(bda): updated bda construct with schema file upload changes

---------

Co-authored-by: dinsajwa <[email protected]>

Author: dineshSajwan

lambda/aws-bedrock-data-automation/bda_blueprint/lambda.py

@@ -16,7 +16,7 @@
 from aws_lambda_powertools import Logger, Tracer, Metrics
 from aws_lambda_powertools.utilities.typing import LambdaContext
 from aws_lambda_powertools.utilities.data_classes import EventBridgeEvent, APIGatewayProxyEvent
-from manage_blueprint import create_blueprint,delete_blueprint,list_blueprints,get_blueprint,update_blueprint
+from manage_blueprint import create_blueprint,delete_blueprint,list_blueprints,get_blueprint,update_blueprint,DateTimeEncoder
 from create_schema import create_schema
 
 
@@ -98,11 +98,7 @@ def get_schema(bucket_name: str, schema_key: str) -> Dict[str, Any]:
             Key=schema_key
         )
         schema_content = json.loads(response['Body'].read().decode('utf-8'))
-        logger.info("Successfully retrieved and parsed schema", extra={
-            "schema_size": len(json.dumps(schema_content)),
-            "bucket": bucket_name,
-            "key": schema_key
-        })
+        logger.info(f"Successfully retrieved and parsed schema {schema_content}")
 
         return schema_content
 
@@ -180,12 +176,9 @@ def handler(event, context: LambdaContext):
                         if not all(key in field for key in ['name', 'description', 'alias']):
                             raise ValueError("Each field must contain 'name', 'description', and 'alias'")
 
-                    # Create schema using the fields
+                    # Create schema using AWS BDA format
                     try:
-                        DynamicSchema = create_schema(schema_fields)
-                        schema_instance = DynamicSchema()
-                        schema_content = json.dumps(schema_instance.model_json_schema())
-
+                        schema_content = create_schema(schema_fields)
                     except Exception as e:
                         print("Error creating schema")
                         return {
@@ -196,8 +189,6 @@ def handler(event, context: LambdaContext):
                             })
                         }
 
-                if not schema_content or not schema_content.strip():
-                    logger.warning("No Schema provided , creating a custom blueprint with no schema")
 
                 response= create_blueprint(schema_content,blueprint_details)
                 response_msg='Blueprint created successfully'
@@ -214,7 +205,7 @@ def handler(event, context: LambdaContext):
                   'body': json.dumps({
                       'message': response_msg,
                       'response': response
-                  })
+                  }, cls=DateTimeEncoder)
               }
 
 
@@ -226,6 +217,5 @@ def handler(event, context: LambdaContext):
             'body': json.dumps({
                 'message': 'Unexpected error occurred',
                 'error': str(e)
-            })
+            }, cls=DateTimeEncoder)
         }
-

lambda/aws-bedrock-data-automation/bda_blueprint/manage_blueprint.py

@@ -65,14 +65,19 @@ def create_blueprint(schema_content,blueprint_details):
         client_token = blueprint_details.get('client_token', '')
         tags = blueprint_details.get('tags', [])
 
+        logger.info(" collecting request params...")
         # Prepare request parameters
         request_params = {
             'blueprintName': blueprint_name,
             'type': blueprint_type,
             'blueprintStage': blueprint_stage,
-            'schema': schema_content,
         }
 
+        # Add schema if provided and not empty
+        #schema_json = json.loads(schema_content)
+        request_params['schema'] = json.dumps(schema_content) if isinstance(schema_content, dict) else schema_content
+        
+        logger.info("Added schema_json...")
         # Add client token if provided
         if client_token:
             request_params['clientToken'] = client_token
@@ -81,11 +86,6 @@ def create_blueprint(schema_content,blueprint_details):
         if tags:
             request_params['tags'] = tags
 
-        logger.info("Creating blueprint", extra={
-            "blueprint_name": blueprint_name,
-            "blueprint_type": blueprint_type,
-            "blueprint_stage": blueprint_stage,
-        })
 
         # Add encryption configuration if provided
         encryption_config = blueprint_details.get('encryption_config')
@@ -108,7 +108,9 @@ def create_blueprint(schema_content,blueprint_details):
                 valid_encryption_config['kmsEncryptionContext'] = encryption_config['kmsEncryptionContext']
 
             request_params['encryptionConfiguration'] = valid_encryption_config
-            
+        
+        logger.info(f"Creating blueprint with request params: {request_params}" )
+
         # Create blueprint
         response = bda_client.create_blueprint(**request_params)
         blueprint_arn = response["blueprint"]["blueprintArn"]
@@ -477,4 +479,3 @@ def delete_blueprint(blueprint_arn: str, blueprint_version: str = None) -> Dict[
             'error': str(e)
         })
         raise e
-        

lambda/aws-bedrock-data-automation/bda_project/lambda.py

@@ -45,7 +45,8 @@ def process_api_gateway_event(event: Dict[str, Any]) -> Dict[str, Any]:
     api_event = APIGatewayProxyEvent(event)
     logger.info("Received API Gateway event", extra={
         "http_method": api_event.http_method,
-        "path": api_event.path
+        "path": api_event.path,
+        "body": api_event.body
     })
 
     if not api_event.body:
@@ -65,6 +66,8 @@ def handler(event: Dict[str, Any], context: LambdaContext) -> Dict[str, Any]:
     """
     try:
         # Determine event source and process accordingly
+        logger.info(f"Received event: {json.dumps(event)}")
+
         if event.get("source") and event.get("detail-type"):
             project_config = process_event_bridge_event(event)
         else: