Merge branch 'main' into chatbot/llamaindex-pipeline

.gitignore

@@ -200,6 +200,7 @@ yarn-error.log*
 
 # local env files
 .env*.local
+.env*.test
 
 # vercel
 .vercel

apps/chatbot/.dockerignore

@@ -1,3 +1,4 @@
-.env
+.env*
 build-devp
 .pytest_cache
+load-test

apps/chatbot/README.md

@@ -50,6 +50,12 @@ This script reads the documentation, split it into chucks with gerarchical organ
 
 Check out the params in order to store your vector index accordingly.
 
+## test
+
+```
+pytest
+```
+
 ## Web App
 
     python src/webapp/app.py

apps/chatbot/config/params.yaml

@@ -1,6 +1,3 @@
-documentation:
-  path: build-devp/out
-
 vector_index:
   path: index
   chunk_sizes: [2816, 704, 176]
@@ -83,4 +80,4 @@ config_presidio:
     - id-pay
     - ID-Pay
     - id-Pay
-    - ID-pay
+    - ID-pay

apps/chatbot/config/prompts.yaml

@@ -41,23 +41,15 @@ qa_prompt_str: |
 
 
 refine_prompt_str: |
-  We have the opportunity to refine the original answer (only if needed).
-  Given the chat history between the user and the assistant here below:
+  Given the original answer: {existing_answer}, we have the opportunity to refine it (only if needed) with some more context here below:
   --------------------
   {context_msg}
   --------------------
-  Chatbot Policy:
-    - the refined answer must be generated using only the context information and not prior knowledge.
-    - the refined answer must synthesize than the existing answer if the latter longer than 3 sentenses.
-    - the refined answer must be clear, non-redundant, and have not repeated sentences.
-    - the refined answer must be respectful and accurate.
-    - the refined answer must not include any offensive or discriminatory content.
-    - the refined answer must be in Italian.
-  --------------------
   Task:
-    Given the User query: {query_str}
-    Given the original answer: {existing_answer}
-    Answer with either the original answer or with a refined answer to better answer the user query according to the `Chatbot Policy` listed above.
+    Given the new context, refine the original answer to better answer the query.
+    If the context isn't useful, return the original answer.
+    The answer must be in Italian.
+
     Answer: 
 
 condense_prompt_str: |

apps/chatbot/docker/app.local.Dockerfile

@@ -16,7 +16,7 @@ RUN wget https://github.com/rphrp1985/selenium_support/raw/main/chrome_114_amd64
 ENV PYTHONPATH=/app
 
 RUN pip install --upgrade pip \
-  && pip install poetry
+  && pip install poetry awscli
 
 WORKDIR /app
 COPY pyproject.toml .

apps/chatbot/docker/compose.test.yaml

@@ -0,0 +1,42 @@
+services:
+  api-test:
+    build:
+      context: ..
+      dockerfile: docker/app.local.Dockerfile
+    command: "./scripts/run.test.sh"
+    env_file: "../.env.test"
+    ports:
+      - "8080:8080"
+    volumes:
+      - ..:/app
+      - ./files/.aws:/root/.aws
+      - ./files/nextjs-website/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
+    healthcheck:
+      test: ["CMD-SHELL", '[ "$(curl -s -o /dev/null -I -w ''%{http_code}'' http://localhost:8000)" == "400" ]']
+      interval: 10s
+      timeout: 10s
+      retries: 10
+    networks:
+      - ntw
+
+  redis:
+    image: redis/redis-stack:7.2.0-v13
+    networks:
+      - ntw
+
+networks:
+  ntw:

apps/chatbot/docker/compose.yaml

@@ -3,6 +3,8 @@ services:
     build:
       context: ..
       dockerfile: docker/app.local.Dockerfile
+    env_file: ../.env.local
+    command: "./scripts/run.local.sh"
     ports:
       - "8080:8080"
     volumes:

apps/chatbot/docker/docker-compose-run-tests.sh

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

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

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

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

@@ -0,0 +1,3 @@
+#!/bin/bash
+docker compose -f docker/compose.yaml -p chatbot run api \
+  python src/modules/create_vector_index.py --params config/params.yaml

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

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

apps/chatbot/docker/files/dynamodb_schemas/queries.json

@@ -0,0 +1,51 @@
+{
+  "TableName": "chatbot-local-queries",
+  "KeySchema": [
+    {
+      "AttributeName": "sessionId",
+      "KeyType": "HASH"
+    },
+    {
+      "AttributeName": "id",
+      "KeyType": "RANGE"
+    }
+  ],
+  "AttributeDefinitions": [
+    {
+      "AttributeName": "id",
+      "AttributeType": "S"
+    },
+    {
+      "AttributeName": "sessionId",
+      "AttributeType": "S"
+    },
+    {
+      "AttributeName": "createdAt",
+      "AttributeType": "S"
+    }
+  ],
+  "LocalSecondaryIndexes": [
+    {
+      "IndexName": "QueriesByCreatedAtIndex",
+      "KeySchema": [
+        {
+          "AttributeName": "sessionId",
+          "KeyType": "HASH"
+        },
+        {
+          "AttributeName": "createdAt",
+          "KeyType": "RANGE"
+        }
+      ],
+      "Projection": {
+        "ProjectionType": "ALL"
+      }
+   }
+  ],
+  "ProvisionedThroughput": {
+    "ReadCapacityUnits": 5,
+    "WriteCapacityUnits": 5
+  },
+  "TableClass": "STANDARD",
+  "DeletionProtectionEnabled": true
+}

apps/chatbot/docker/files/dynamodb_schemas/sessions.json

@@ -0,0 +1,51 @@
+{
+  "TableName": "chatbot-local-sessions",
+  "KeySchema": [
+    {
+      "AttributeName": "userId",
+      "KeyType": "HASH"
+    },
+    {
+      "AttributeName": "id",
+      "KeyType": "RANGE"
+    }
+  ],
+  "AttributeDefinitions": [
+    {
+      "AttributeName": "id",
+      "AttributeType": "S"
+    },
+    {
+      "AttributeName": "userId",
+      "AttributeType": "S"
+    },
+    {
+      "AttributeName": "createdAt",
+      "AttributeType": "S"
+    }
+  ],
+  "LocalSecondaryIndexes": [
+    {
+      "IndexName": "SessionsByCreatedAtIndex",
+      "KeySchema": [
+        {
+          "AttributeName": "userId",
+          "KeyType": "HASH"
+        },
+        {
+          "AttributeName": "createdAt",
+          "KeyType": "RANGE"
+        }
+      ],
+      "Projection": {
+        "ProjectionType": "ALL"
+      }
+   }
+  ],
+  "ProvisionedThroughput": {
+    "ReadCapacityUnits": 5,
+    "WriteCapacityUnits": 5
+  },
+  "TableClass": "STANDARD",
+  "DeletionProtectionEnabled": true
+}

apps/chatbot/package.json

@@ -1,5 +1,8 @@
 {
-    "name": "chatbot",
-    "version": "4.0.0",
-    "private": true
-}
+  "name": "chatbot",
+  "version": "4.0.0",
+  "private": true,
+  "scripts": {
+    "test": "./docker/docker-compose-run-tests.sh"
+  }
+}