update README to new structure

aws-solutions-library-samples · Jul 13, 2020 · 987c03e · 987c03e
1 parent b39f4f2
commit 987c03e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 63 deletions.
diff --git a/README.md b/README.md
@@ -44,10 +44,15 @@ In order to encapsulate the project as a stand-alone microservice, Amazon API Ga
 * `deployment/`
   * `fraud-detection-using-machine-learning.yaml`: Creates AWS CloudFormation Stack for solution
 * `source/`
-  * `fraud-detection/`
+  * `lambda`
+    * `model-invocation/`
       * `index.py`: Lambda function script for invoking SageMaker endpoints for inference
   * `notebooks/`
-    * `generate_endpoint_traffic.py`: Custom script to show how to send transaction traffic to REST API for inference
+    * `src`
+      * `package`
+        * `config.py`: Read in the environment variables set by cloudformation stack creation
+        * `generate_endpoint_traffic.py`: Custom script to show how to send transaction traffic to REST API for inference
+        * `util.py`: Helper function and utilities
     * `sagemaker_fraud_detection.ipynb`: Orchestrates the solution. Trains the models and deploys the trained model
   * `setup/`
     * `on-start.sh`: Bash script to setup sagemaker notebook environment with necessary dependencies

diff --git a/deployment/fraud-detection-using-machine-learning.yaml b/deployment/fraud-detection-using-machine-learning.yaml
@@ -45,17 +45,7 @@ Metadata:
 Mappings:
   Function:
     FraudDetection:
-      S3Key: fraud-detection-using-machine-learning/build/model_invocation.zip
-  Notebook:
-    FraudDetection:
-      S3Key: >-
-        /fraud-detection-using-machine-learning/notebooks/sagemaker_fraud_detection.ipynb
-  Script:
-    GenerateTraffic:
-      S3Key: >-
-        /fraud-detection-using-machine-learning/notebooks/generate_endpoint_traffic.py
-    KibanaDashboard:
-      S3Key: /fraud-detection-using-machine-learning/notebooks/dashboard.json
+      S3Key: Fraud-detection-using-machine-learning/build/model_invocation.zip
 Resources:
   ModelDataBucket:
     Type: 'AWS::S3::Bucket'

diff --git a/source/notebooks/generate_endpoint_traffic.py b/source/notebooks/generate_endpoint_traffic.py
diff --git a/source/notebooks/sagemaker_fraud_detection.ipynb b/source/notebooks/sagemaker_fraud_detection.ipynb
@@ -157,9 +157,10 @@
     "import os\n",
     "import sagemaker\n",
     "from sagemaker import get_execution_role\n",
+    "from package import config\n",
     "\n",
     "session = sagemaker.Session()\n",
-    "bucket = \"fraud-detection-end-to-end-demo\"\n",
+    "bucket = config.MODEL_DATA_S3_BUCKET\n",
     "prefix = 'fraud-classifier'"
    ]
   },

diff --git a/source/notebooks/src/package/config.py b/source/notebooks/src/package/config.py
@@ -14,7 +14,6 @@
 AWS_ACCOUNT_ID = os.environ['AWS_ACCOUNT_ID']
 AWS_REGION = os.environ['AWS_REGION']
 SAGEMAKER_IAM_ROLE = os.environ['SAGEMAKER_IAM_ROLE']
-STACK_NAME = os.environ['STACK_NAME']
 SOLUTIONS_S3_BUCKET = os.environ['SOLUTIONS_S3_BUCKET']
 
 MODEL_DATA_S3_BUCKET = os.environ['MODEL_DATA_S3_BUCKET']