Fix: [AEA-0000] - refactor

.devcontainer/devcontainer.json

@@ -32,7 +32,6 @@
         "ms-python.flake8",
         "eamodio.gitlens",
         "github.vscode-pull-request-github",
-        "orta.vscode-jest",
         "42crunch.vscode-openapi",
         "mermade.openapi-lint",
         "dbaeumer.vscode-eslint",
@@ -51,10 +50,7 @@
         "python.analysis.autoSearchPaths": true,
         "python.analysis.extraPaths": [],
         "python.testing.unittestEnabled": false,
-        "python.testing.pytestEnabled": true,
-        "python.testing.pytestArgs": [
-          "packages/slackBotFunction",
-        ],
+        "python.testing.pytestEnabled": false,
         "python.linting.pylintEnabled": false,
         "python.linting.flake8Enabled": true,
         "python.linting.enabled": true, // required to format on save

.gitallowed

@@ -31,3 +31,4 @@ token = slack_event_data\["bot_token"\]
 client = WebClient\(token=token\)
 client = WebClient\(token=slack_event_data\["bot_token"\]\)
 context accountId=123456789012
+.*:sample_docs/.*

.github/workflows/cdk_package_code.yml

@@ -61,8 +61,10 @@ jobs:
 
       - name: Build Python Lambda Functions
         run: |
-          pip3 install -r packages/slackBotFunction/requirements.txt -t packages/slackBotFunction
-          pip3 install -r packages/syncKnowledgeBaseFunction/requirements.txt -t packages/syncKnowledgeBaseFunction
+          poetry export --without-hashes --format=requirements.txt --with slackBotFunction > requirements_slackBotFunction
+          poetry export --without-hashes --format=requirements.txt --with syncKnowledgeBaseFunction > requirements_syncKnowledgeBaseFunction
+          pip3 install -r requirements_slackBotFunction -t packages/slackBotFunction
+          pip3 install -r requirements_syncKnowledgeBaseFunction -t packages/syncKnowledgeBaseFunction
 
       - name: 'Tar files'
         run: |

.tool-versions

@@ -1,6 +1,6 @@
 nodejs 22.12.0
 python 3.13.3
-poetry 1.8.3
+poetry 2.1.4
 shellcheck 0.10.0
 direnv 2.32.2
 actionlint 1.7.3

.vscode/eps-assist-me.code-workspace

@@ -1,7 +1,7 @@
 {
 	"folders": [
 		{
-			"name": "eps-assist-me-monorepo",
+			"name": "eps-assist-me",
 			"path": ".."
 		},
 		{
@@ -19,7 +19,10 @@
 	],
 	"settings": {
 		"jest.disabledWorkspaceFolders": [
-			"eps-assist-me"
+			"eps-assist-me",
+			"packages/cdk",
+			"packages/slackBotFunction",
+			"packages/syncKnowledgeBaseFunction"
 		],
 		"files.exclude": {
 			"packages/": true
@@ -103,7 +106,8 @@
 		"jest.jestCommandLine": "NODE_OPTIONS=--experimental-vm-modules node_modules/.bin/jest --no-cache",
 		"jest.nodeEnv": {
 			"POWERTOOLS_DEV": true
-		}
+		},
+		"python.defaultInterpreterPath": "/workspaces/eps-assist-me/.venv/bin/python"
 	},
 	"extensions": {
 		"recommendations": [

Makefile

@@ -9,9 +9,7 @@ guard-%:
 install: install-python install-hooks install-node
 
 install-python:
-	poetry install
-	cd packages/slackBotFunction && pip install -r requirements.txt && pip install -r requirements-test.txt
-	cd packages/syncKnowledgeBaseFunction && pip install -r requirements.txt && pip install -r requirements-test.txt
+	poetry sync --all-groups
 
 install-hooks: install-python
 	poetry run pre-commit install --install-hooks --overwrite
@@ -48,8 +46,8 @@ lint-flake8:
 	poetry run flake8 .
 
 test:
-	cd packages/slackBotFunction && PYTHONPATH=. COVERAGE_FILE=coverage/.coverage python -m pytest
-	cd packages/syncKnowledgeBaseFunction && PYTHONPATH=. COVERAGE_FILE=coverage/.coverage python -m pytest
+	cd packages/slackBotFunction && PYTHONPATH=. COVERAGE_FILE=coverage/.coverage poetry run python -m pytest
+	cd packages/syncKnowledgeBaseFunction && PYTHONPATH=. COVERAGE_FILE=coverage/.coverage poetry run python -m pytest
 
 clean:
 	rm -rf packages/cdk/coverage
@@ -60,6 +58,7 @@ clean:
 	rm -rf packages/syncKnowledgeBaseFunction/.coverage
 	rm -rf cdk.out
 	rm -rf .build
+	find . -name '.pytest_cache' -type d -prune -exec rm -rf '{}' +
 
 deep-clean: clean
 	rm -rf .venv
@@ -137,3 +136,6 @@ cdk-watch: guard-STACK_NAME
 		--context logRetentionInDays=$$LOG_RETENTION_IN_DAYS \
 		--context slackBotToken=$$SLACK_BOT_TOKEN \
 		--context slackSigningSecret=$$SLACK_SIGNING_SECRET
+
+sync-docs: 
+	./scripts/sync_docs.sh

README.md

@@ -28,6 +28,7 @@ packages/
 │   │   └── RestApiGateway/     # API Gateway specific constructs
 │   ├── resources/              # AWS resource definitions
 │   └── stacks/                 # CDK stack definitions
+├── sample_docs/                # Contains sample docs for testing purposes. These should not be used for real usage
 ├── slackBotFunction/           # Lambda function for Slack bot integration
 │   ├── app/                    # Application code
 │   │   ├── config/             # Configuration and environment variables
@@ -171,6 +172,7 @@ These are used to do common commands related to cdk
 - `git-secrets-docker-setup` Sets up git-secrets Docker container.
 - `pre-commit` Runs pre-commit hooks on all files.
 - `test` Runs unit tests for Lambda functions.
+- `sync-docs` Runs a script to sync sample docs to s3 bucket for a pull request. Useful for setting up a stack for testing
 
 #### Compiling
 

packages/cdk/constructs/LambdaFunction.ts

@@ -24,7 +24,7 @@ export interface LambdaFunctionProps {
   readonly functionName: string
   readonly packageBasePath: string
   readonly handler: string
-  readonly environmentVariables: {[key: string]: string}
+  readonly environmentVariables?: {[key: string]: string}
   readonly additionalPolicies?: Array<IManagedPolicy>
   readonly logRetentionInDays: number
   readonly logLevel: string
@@ -126,7 +126,7 @@ export class LambdaFunction extends Construct {
       role,
       environment: {
         ...props.environmentVariables,
-        LOG_LEVEL: props.logLevel
+        POWERTOOLS_LOG_LEVEL: props.logLevel
       },
       logGroup,
       layers: [insightsLambdaLayer]

packages/cdk/nagSuppressions.ts

@@ -170,6 +170,7 @@ export const nagSuppressions = (stack: Stack) => {
       ]
     )
   })
+
 }
 
 const safeAddNagSuppression = (stack: Stack, path: string, suppressions: Array<NagPackSuppression>) => {

packages/cdk/resources/VectorIndex.ts

@@ -61,8 +61,6 @@ export class VectorIndex extends Construct {
       }
     })
 
-    // Ensure collection exists before creating index
-    cfnIndex.node.addDependency(props.collection)
     this.cfnIndex = cfnIndex
   }
 }

packages/cdk/stacks/EpsAssistMeStack.ts

@@ -171,6 +171,15 @@ export class EpsAssistMeStack extends Stack {
       description: "ARN of the query reformulation prompt in Bedrock"
     })
 
+    new CfnOutput(this, "kbDocsBucketArn", {
+      value: storage.kbDocsBucket.bucket.bucketArn,
+      exportName: `${props.stackName}:kbDocsBucket:Arn`
+    })
+    new CfnOutput(this, "kbDocsBucketName", {
+      value: storage.kbDocsBucket.bucket.bucketName,
+      exportName: `${props.stackName}:kbDocsBucket:Name`
+    })
+
     // Final CDK Nag Suppressions
     nagSuppressions(this)
   }

packages/slackBotFunction/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "python.testing.pytestEnabled": true
+}

packages/slackBotFunction/app/core/config.py

@@ -3,65 +3,86 @@
 Sets up all the AWS and Slack connections we need.
 """
 
+from functools import lru_cache
 import os
 import json
+import traceback
 import boto3
-from slack_bolt import App
 from aws_lambda_powertools import Logger
 from aws_lambda_powertools.utilities.parameters import get_parameter
 
 
-# set up logging
-logger = Logger(service="slackBotFunction")
+@lru_cache()
+def get_logger():
+    return Logger(service="slackBotFunction")
 
-# DynamoDB table for deduplication and session storage
-dynamodb = boto3.resource("dynamodb")
-table = dynamodb.Table(os.environ["SLACK_BOT_STATE_TABLE"])
 
-# get Slack credentials from Parameter Store
-bot_token_parameter = os.environ["SLACK_BOT_TOKEN_PARAMETER"]
-signing_secret_parameter = os.environ["SLACK_SIGNING_SECRET_PARAMETER"]
+logger = get_logger()
 
-try:
-    bot_token_raw = get_parameter(bot_token_parameter, decrypt=True)
-    signing_secret_raw = get_parameter(signing_secret_parameter, decrypt=True)
 
-    if not bot_token_raw or not signing_secret_raw:
-        raise ValueError("Missing required parameters from Parameter Store")
+@lru_cache()
+def get_slack_bot_state_table():
+    # DynamoDB table for deduplication and session storage
+    dynamodb = boto3.resource("dynamodb")
+    return dynamodb.Table(os.environ["SLACK_BOT_STATE_TABLE"])
 
-    bot_token_data = json.loads(bot_token_raw)
-    signing_secret_data = json.loads(signing_secret_raw)
 
-    bot_token = bot_token_data.get("token")
-    signing_secret = signing_secret_data.get("secret")
+@lru_cache()
+def get_ssm_params():
+    bot_token_parameter = os.environ["SLACK_BOT_TOKEN_PARAMETER"]
+    signing_secret_parameter = os.environ["SLACK_SIGNING_SECRET_PARAMETER"]
+    try:
+        bot_token_raw = get_parameter(bot_token_parameter, decrypt=True)
+        signing_secret_raw = get_parameter(signing_secret_parameter, decrypt=True)
 
-    if not bot_token or not signing_secret:
-        raise ValueError("Missing required parameters: token or secret in Parameter Store values")
+        if not bot_token_raw or not signing_secret_raw:
+            raise ValueError("Missing required parameters from Parameter Store")
 
-except json.JSONDecodeError as e:
-    raise ValueError(f"Invalid JSON in Parameter Store: {e}")
-except Exception as e:
-    logger.error("Configuration error", extra={"error": str(e)})
-    raise
+        bot_token_data = json.loads(bot_token_raw)
+        signing_secret_data = json.loads(signing_secret_raw)
 
-# initialise the Slack app
-app = App(
-    process_before_response=True,
-    token=bot_token,
-    signing_secret=signing_secret,
-)
+        bot_token = bot_token_data.get("token")
+        signing_secret = signing_secret_data.get("secret")
 
-# Bedrock configuration from environment
-KNOWLEDGEBASE_ID = os.environ["KNOWLEDGEBASE_ID"]
-RAG_MODEL_ID = os.environ["RAG_MODEL_ID"]
-AWS_REGION = os.environ["AWS_REGION"]
-GUARD_RAIL_ID = os.environ["GUARD_RAIL_ID"]
-GUARD_VERSION = os.environ["GUARD_RAIL_VERSION"]
+        if not bot_token or not signing_secret:
+            raise ValueError("Missing required parameters: token or secret in Parameter Store values")
 
-logger.info("Guardrail configuration loaded", extra={"guardrail_id": GUARD_RAIL_ID, "guardrail_version": GUARD_VERSION})
+    except json.JSONDecodeError as e:
+        raise ValueError(f"Invalid JSON in Parameter Store: {e}")
+    except Exception:
+        logger.error("Configuration error", extra={"error": traceback.format_exc()})
+        raise
+    return bot_token, signing_secret
 
-# Bot response messages
-BOT_MESSAGES = {
-    "empty_query": "Hi there! Please ask me a question and I'll help you find information from our knowledge base.",
-    "error_response": "Sorry, an error occurred while processing your request. Please try again later.",
-}
+
+@lru_cache
+def get_bot_token():
+    bot_token, _ = get_ssm_params()
+    return bot_token
+
+
+@lru_cache()
+def get_bot_messages():
+
+    # Bot response messages
+    BOT_MESSAGES = {
+        "empty_query": "Hi there! Please ask me a question and I'll help you find information from our knowledge base.",
+        "error_response": "Sorry, an error occurred while processing your request. Please try again later.",
+    }
+
+    return BOT_MESSAGES
+
+
+@lru_cache
+def get_guardrail_config():
+    # Bedrock configuration from environment
+    KNOWLEDGEBASE_ID = os.environ["KNOWLEDGEBASE_ID"]
+    RAG_MODEL_ID = os.environ["RAG_MODEL_ID"]
+    AWS_REGION = os.environ["AWS_REGION"]
+    GUARD_RAIL_ID = os.environ["GUARD_RAIL_ID"]
+    GUARD_VERSION = os.environ["GUARD_RAIL_VERSION"]
+
+    logger.info(
+        "Guardrail configuration loaded", extra={"guardrail_id": GUARD_RAIL_ID, "guardrail_version": GUARD_VERSION}
+    )
+    return KNOWLEDGEBASE_ID, RAG_MODEL_ID, AWS_REGION, GUARD_RAIL_ID, GUARD_VERSION

packages/slackBotFunction/app/handler.py

@@ -9,14 +9,14 @@
 from slack_bolt.adapter.aws_lambda import SlackRequestHandler
 from aws_lambda_powertools.utilities.typing import LambdaContext
 
-from app.core.config import app, logger
+from app.core.config import get_logger
+from app.services.app import get_app
 from app.slack.slack_events import process_async_slack_event
-from app.slack.slack_handlers import setup_handlers
 
-# register event handlers with the app
-setup_handlers(app)
+logger = get_logger()
 
 
+@logger.inject_lambda_context(log_event=True, clear_state=True)
 def handler(event: dict, context: LambdaContext) -> dict:
     """
     Main Lambda entry point - routes between Slack webhook and async processing
@@ -26,6 +26,9 @@ def handler(event: dict, context: LambdaContext) -> dict:
     2. Lambda acknowledges immediately and triggers async self-invocation
     3. Async invocation processes Bedrock query and responds to Slack
     """
+    # register event handlers with the app
+    app = get_app()
+
     logger.info("Lambda invoked", extra={"is_async": event.get("async_processing", False)})
 
     # handle async processing requests

packages/slackBotFunction/app/services/app.py

@@ -0,0 +1,23 @@
+from functools import lru_cache
+
+from slack_bolt import App
+from app.core.config import get_ssm_params
+from app.core.config import get_logger
+from app.slack.slack_handlers import setup_handlers
+
+logger = get_logger()
+
+
+@lru_cache()
+def get_app():
+    bot_token, signing_secret = get_ssm_params()
+
+    # initialise the Slack app
+    app = App(
+        process_before_response=True,
+        token=bot_token,
+        signing_secret=signing_secret,
+        logger=logger,
+    )
+    setup_handlers(app)
+    return app