PR fixes, etc

Author: spompea-cfa

.gitignore

@@ -150,7 +150,6 @@ celerybeat-schedule
 *.sage.py
 
 # Environments
-.env
 .venv
 env/
 venv/

Dockerfile.consumer

@@ -1,4 +1,4 @@
-FROM senzing/senzingsdk-runtime:latest
+FROM senzing/senzingsdk-runtime:4.0.0
 
 USER root
 

README.md

@@ -60,7 +60,9 @@ and run the consumer service on our local machine. This setup includes:
 1. Spinning up a consumer service:
 
    ```bash
-   docker compose run --env AWS_PROFILE_NAME="some-profile-name" --env Q_URL="https://some-sqs-queue-url" consumer
+   docker compose run --env AWS_PROFILE_NAME="some-profile-name" --env \
+   Q_URL="http://sqs.us-east-1.localhost.localstack.cloud:4566/000000000000/sqs-senzing-local-ingest" \
+   consumer
    ```
 
 ### Using the services

docker-compose.yaml

@@ -24,7 +24,7 @@ services:
     depends_on:
       - db
     environment:
-      SENZING_TOOLS_DATASOURCES: PEOPLE
+      SENZING_TOOLS_DATASOURCES: PEOPLE, CUSTOMERS
       SENZING_TOOLS_ENGINE_CONFIGURATION_JSON: >-
         {
           "PIPELINE": {

middleware/consumer.py

@@ -15,7 +15,6 @@
 
 # TODO add DLQ logic (needs jira ticket probably).
 
-AWS_PROFILE_NAME = os.environ['AWS_PROFILE_NAME']
 Q_URL = os.environ['Q_URL']
 SZ_CONFIG = json.loads(os.environ['SENZING_ENGINE_CONFIGURATION_JSON'])
 
@@ -25,7 +24,11 @@
 #-------------------------------------------------------------------------------
 
 def _make_boto_session(fpath=None):
-    '''fpath is path to json file with keys:
+    '''
+    If `AWS_PROFILE` environment variable is set, then `Session()` can be
+    called with no arguments.
+
+    fpath is path to json file with keys:
         - aws_access_key_id
         - aws_secret_access_key
         - aws_session_token
@@ -35,7 +38,7 @@ def _make_boto_session(fpath=None):
     if fpath:
         return boto3.Session(**json.load(open(fpath)))
     else:
-        return boto3.Session(profile_name=AWS_PROFILE_NAME)
+        return boto3.Session()
 
 def _make_sqs_client(boto_session):
     return boto_session.client('sqs')
@@ -87,15 +90,6 @@ def go():
     try:
         sz_factory = sz_core.SzAbstractFactoryCore("ERS", SZ_CONFIG)
 
-        # Init data source list.
-        # TODO data source registry logic should be set up as a one-time task
-        # outside of this app somewhere else.
-        sz_config_mgr = sz_factory.create_configmanager()
-        sz_config = sz_config_mgr.create_config_from_config_id(
-            sz_config_mgr.get_default_config_id())
-        sz_config.register_data_source("CUSTOMERS")
-        sz_config_mgr.set_default_config(sz_config.export(), 'default')
-
         # Init senzing engine object.
         # Senzing engine object cannot be passed around between functions,
         # else it will be eagerly cleaned up / destroyed and no longer usable. 
@@ -108,7 +102,11 @@ def go():
     # TODO log ReceiptHandle, other *generic* debug-facing information as appropriate.
     while 1:
         print('Starting primary loop iteration . . .')
+
+        # Get next message.
         msg = next(msgs)
+
+        # Process and send to Senzing.
         receipt_handle, body = msg['ReceiptHandle'], msg['Body']
         rcd = json.loads(body)
         try:
@@ -121,6 +119,8 @@ def go():
         except sz.SzError as err:
             # TODO log / handle
             print(err)
+
+        # Delete msg from queue.
         del_msg(sqs, Q_URL, receipt_handle)
 
 def main():