[CAI-185] Chatbot/docker compose with Redis and DynamoDB for local development

apps/chatbot/.env.example

@@ -21,3 +21,6 @@ CHB_ENGINE_SIMILARITY_CUTOFF=...
 CHB_ENGINE_USE_ASYNC=...
 CHB_ENGINE_USE_STREAMING=...
 CHB_QUERY_TABLE_PREFIX=chatbot-local
+GOOGLE_AND_REDIS_AWS_DEFAULT_REGION=eu-west-3
+CHB_REDIS_INDEX_NAME=zero
+CHB_DYNAMODB_URL=http://locahost:8080

apps/chatbot/docker/app.local.Dockerfile

@@ -1,6 +1,10 @@
 FROM python:3.12.4-slim-bullseye
 ARG DEBIAN_FRONTEND=noninteractive
 
+RUN apt-get update && \
+  apt-get install -y \
+  curl
+
 ENV PYTHONPATH=/app
 
 RUN pip install --upgrade pip \
@@ -14,4 +18,4 @@ RUN poetry install
 
 COPY . .
 
-CMD ["fastapi", "dev", "src/app/main.py", "--port", "8080"]
+CMD ["fastapi", "dev", "src/app/main.py", "--port", "8080", "--host", "0.0.0.0"]

apps/chatbot/docker/compose.yaml

@@ -0,0 +1,55 @@
+services:
+  api:
+    build:
+      context: ..
+      dockerfile: docker/app.local.Dockerfile
+    ports:
+      - "8080:8080"
+    volumes:
+      - ..:/app
+      - ./files/.aws:/root/.aws
+      - ./build-devp/out:/app/build-devp/out
+    depends_on:
+      redis:
+        condition: service_started
+      dynamodb:
+        condition: service_started
+    networks:
+      - ntw
+
+  dynamodb:
+    image: amazon/dynamodb-local:2.5.2
+    environment:
+      - AWS_ACCESS_KEY_ID=dummy
+      - AWS_SECRET_ACCESS_KEY=dummy
+      - AWS_DEFAULT_REGION=local
+    ports:
+      - "8000:8000"
+    networks:
+      - ntw
+
+  redis:
+    image: redis/redis-stack:7.2.0-v13
+    ports:
+      - "6379:6379"
+    networks:
+      - ntw
+
+  create_index:
+    build:
+      context: ..
+      dockerfile: docker/app.local.Dockerfile
+    ports:
+      - "8080:8080"
+    volumes:
+      - ..:/app
+    command: "python src/modules/create_vector_index.py --params config/params.yaml"
+    tty: true
+    depends_on:
+      redis:
+        condition: service_started
+    networks:
+      - ntw
+
+networks:
+  ntw:

apps/chatbot/docker/docker-compose-up-api.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+docker compose -f docker/compose.yaml -p chatbot up api

apps/chatbot/docker/docker-run-create-index.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+docker compose -f docker/compose.yaml -p chatbot up create_index

apps/chatbot/docker/docker-run-local-bash.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+docker run -it --env-file ./.env fastapi-local bash

apps/chatbot/docker/files/.aws/config

@@ -0,0 +1,2 @@
+[profile default]
+region = eu-south-1

apps/chatbot/docker/files/.aws/credentials

@@ -0,0 +1,3 @@
+[default]
+aws_access_key_id = 123
+aws_secret_access_key = xyz

apps/chatbot/pyproject.toml

@@ -37,6 +37,7 @@ llama-index-llms-gemini = "^0.3.4"
 google-generativeai = "^0.5.2"
 llama-index-embeddings-gemini = "^0.2.0"
 llama-index-llms-bedrock-converse = "^0.3.0"
+chromedriver-py = "^129.0.6668.91"
 
 
 [build-system]

apps/chatbot/src/app/main.py

@@ -18,30 +18,30 @@
 
 params = yaml.safe_load(open("config/params.yaml", "r"))
 prompts = yaml.safe_load(open("config/prompts.yaml", "r"))
-chatbot = Chatbot(params, prompts)
-
 AWS_DEFAULT_REGION = os.getenv('CHB_AWS_DEFAULT_REGION', os.getenv('AWS_DEFAULT_REGION', None))
 
+chatbot = Chatbot(params, prompts)
+
 
 class Query(BaseModel):
   question: str
   queriedAt: str | None = None
 
-if (os.getenv('environment', 'dev') == 'local'):
-  profile_name='dummy'
-  endpoint_url='http://localhost:8000'
-  region_name = AWS_DEFAULT_REGION
-
 boto3_session = boto3.session.Session(
-  profile_name = locals().get('profile_name', None),
-  region_name=locals().get('region_name', None)
+  region_name=AWS_DEFAULT_REGION
 )
 
-dynamodb = boto3_session.resource(    
-  'dynamodb',
-  endpoint_url=locals().get('endpoint_url', None),
-  region_name=locals().get('region_name', None),
-)
+if (os.getenv('environment', 'dev') == 'local'):
+  dynamodb = boto3_session.resource(    
+    'dynamodb',
+    endpoint_url=os.getenv('CHB_DYNAMODB_URL', 'http://localhost:8000'),
+    region_name=AWS_DEFAULT_REGION
+  )
+else:
+  dynamodb = boto3_session.resource(    
+    'dynamodb',
+    region_name=AWS_DEFAULT_REGION
+  )
 
 table_queries = dynamodb.Table(
   f"{os.getenv('CHB_QUERY_TABLE_PREFIX', 'chatbot')}-queries"
@@ -160,12 +160,13 @@ async def sessions_fetching(
     raise HTTPException(status_code=422, detail=f"[sessions_fetching] userId: {userId}, error: {e}")
 
   # TODO: pagination
+  items = db_response.get('Items', [])
   result = {
-    "items": db_response['Items'],
+    "items": items,
     "page": 1,
     "pages": 1,
-    "size": len(db_response['Items']),
-    "total": len(db_response['Items']),
+    "size": len(items),
+    "total": len(items),
   }
   return result
 
@@ -214,20 +215,26 @@ async def queries_fetching(
     sessionId = last_session_id(userId)
 
   try:
-    # TODO: add userId filter
     db_response = table_queries.query(
-      KeyConditionExpression=Key("sessionId").eq(sessionId)
+      KeyConditionExpression=Key("sessionId").eq(sessionId) &
+        Key("id").eq(userId)
     )
   except (BotoCoreError, ClientError) as e:
     raise HTTPException(status_code=422, detail=f"[queries_fetching] sessionId: {sessionId}, error: {e}")
 
-  result = db_response['Items']
+  result = db_response.get('Items', [])
   return result
 
 
 def last_session_id(userId: str):
-  # TODO: retrieve last user session
-  return '1'
+  db_response = table_sessions.query(
+    IndexName='SessionsByCreatedAtIndex',
+    KeyConditionExpression=Key('userId').eq(userId),
+    ScanIndexForward=False,
+    Limit=1
+  )
+  items = db_response.get('Items', [])
+  return items[0] if items else None
 
 @app.patch("/queries/{id}")
 async def query_feedback (badAnswer: bool):

apps/chatbot/src/modules/utils.py

@@ -8,7 +8,7 @@
 
 AWS_ACCESS_KEY_ID = os.getenv("CHB_AWS_ACCESS_KEY_ID")
 AWS_SECRET_ACCESS_KEY = os.getenv("CHB_AWS_SECRET_ACCESS_KEY")
-AWS_DEFAUL_REGION = os.getenv("GOOGLE_AND_REDIS_AWS_DEFAULT_REGION")
+AWS_DEFAULT_REGION = os.getenv("CHB_AWS_DEFAULT_REGION")
 
 
 def get_ssm_parameter(name: str, default: str | None = None) -> str | None:
@@ -19,11 +19,12 @@ def get_ssm_parameter(name: str, default: str | None = None) -> str | None:
     :param default: The default value to return if the parameter is not found.
     :return: The value of the requested parameter.
     """
+
     ssm = boto3.client(
         "ssm",
         aws_access_key_id=AWS_ACCESS_KEY_ID,
         aws_secret_access_key=AWS_SECRET_ACCESS_KEY,
-        region_name=AWS_DEFAUL_REGION
+        region_name=AWS_DEFAULT_REGION
     )
     logging.debug(f"Getting parameter {name} from SSM")
     try: 
@@ -37,4 +38,4 @@ def get_ssm_parameter(name: str, default: str | None = None) -> str | None:
         return default
 
     logging.debug(f"Parameter {name} retrieved from SSM")
-    return response["Parameter"]["Value"]
+    return response["Parameter"]["Value"]