Fix dynamodb bug

.example.env

@@ -6,6 +6,5 @@ MISTRAL_API_KEY=votre-clé-mistral
 
 # TELEGRAM BOT
 TELEGRAM_BOT_TOKEN=votre-token-bot-telegram
-TELEGRAM_CHAT_ID=votre-id-chat-telegram
-TELEGRAM_API_URL=https://api.telegram.org/bot${TELEGRAM_BOT_TOKEN}
+TELEGRAM_API_URL=https://api.telegram.org/bot
 WEBHOOK_URL=https://6cc5-102-64-223-197.ngrok-free.app/webhook

.gitignore

@@ -139,6 +139,8 @@ celerybeat.pid
 
 # Environments
 .env
+.prod.env
+.dev.env
 .venv
 env/
 venv/

Jenkinsfile

@@ -8,7 +8,8 @@ pipeline {
     environment {
         // Define environment variables here
         BOT_NAME = 'awesome-bot'
-        // BOT_TOKEN = credentials('telegram-bot-token')
+        TELEGRAM_BOT_TOKEN = credentials('telegram-bot-token')
+        MISTRAL_API_KEY = credentials('mistral-api-key')
     }
 
     stages {
@@ -22,7 +23,7 @@ pipeline {
         stage('Environment variable injection') {
             steps {
                 script {
-                    withCredentials([file(credentialsId: 'matbradiouf-chatbot-env-file', variable: 'ENV_FILE')]) {
+                    withCredentials([file(credentialsId: 'bradlab-chatbot-env-file', variable: 'ENV_FILE')]) {
                         // Load the environment variables from the file
                         echo "Loading environment variables from ${ENV_FILE}"
                         sh "cat ${ENV_FILE} > .env"
@@ -53,16 +54,77 @@ pipeline {
         }
 
         stage('Deploy') {
+            when {
+                anyOf {
+                    branch 'bradlab'
+                    branch 'dev'
+                    branch 'preprod'
+                    branch 'prod'
+                }
+            }
             steps {
                 script {
                     // Add your deployment commands here
                     echo "Deploying the project..."
-                    sh "make deploy env=${BRANCH_NAME}"
+                    withCredentials([
+                        string(credentialsId: 'telegram-bot-token', variable: 'TELEGRAM_BOT_TOKEN'),
+                        string(credentialsId: 'mistral-api-key', variable: 'MISTRAL_API_KEY')
+                    ]) {
+                        sh """
+                            make deploy env=${BRANCH_NAME} \
+                            TELEGRAM_BOT_TOKEN=${TELEGRAM_BOT_TOKEN} \
+                            MISTRAL_API_KEY=${MISTRAL_API_KEY}
+                        """
+                    }
+                }
+            }
+        }
+
+        stage('Configure Webhook') {
+            when {
+                anyOf {
+                    branch 'bradlab'
+                    branch 'dev'
+                    branch 'preprod'
+                    branch 'prod'
+                }
+            }
+            steps {
+                script {
+                    // Get the API URL from CloudFormation outputs
+                    def apiUrl = sh(
+                        script: """
+                            aws cloudformation describe-stacks \
+                            --stack-name multi-stack-${BRANCH_NAME} \
+                            --region eu-west-3 \
+                            --query "Stacks[0].Outputs[?OutputKey=='ApiUrl'].OutputValue" \
+                            --output text
+                        """,
+                        returnStdout: true
+                    ).trim()
+
+                    // Configure the webhook
+                    withCredentials([string(credentialsId: 'telegram-bot-token', variable: 'TELEGRAM_BOT_TOKEN')]) {
+                        sh """
+                            curl -X POST "${apiUrl}set-webhook" \\
+                                -H "Authorization: Bearer ${TELEGRAM_BOT_TOKEN}" \\
+                                -H "Content-Type: application/json" \\
+                                -d '{ "url": "${apiUrl}webhook" }'
+                        """
+                    }
                 }
             }
         }
 
         stage('Test endpoint'){
+            when {
+                anyOf {
+                    branch 'bradlab'
+                    branch 'dev'
+                    branch 'preprod'
+                    branch 'prod'
+                }
+            }
             steps {
                 script {
                     // Add your endpoint testing commands here

Makefile

@@ -1,7 +1,6 @@
 
 # by default, we settle down in this region
 AWS_REGION ?= eu-west-3
-AWS_PROFILE ?= "esgis_profile"
 
 clean:
 	rm -rf venv

README.md

@@ -78,6 +78,9 @@ Une API de chatbot développée avec FastAPI, conçue pour être déployée sur
    DYNAMO_TABLE=votre-table-dynamo
    AWS_PROFILE=votre-profil-aws
    MISTRAL_API_KEY=votre-clé-mistral
+   TELEGRAM_BOT_TOKEN=votre-token-bot-telegram
+   TELEGRAM_API_URL=https://api.telegram.org/bot
+   WEBHOOK_URL=votre-api-url/webhook
    ```
 
 ## ▶️ Exécution

infrastructure/template.yaml

@@ -9,11 +9,42 @@ Parameters:
     Description: Environment name for the application dev/staging/production
     Type: String
     AllowedValues:
-      - matbradiouf
+      - bradlab
       - dev
       - preprod
       - prod
-    Default: matbradiouf
+    Default: bradlab
+###############################################################################
+
+  AWSRegionName:
+    Description: AWS region where resources will be deployed (e.g. eu-west-3)
+    Type: String
+    Default: eu-west-3
+  DynamoTable:
+    Description: Name of the DynamoDB table used to persist chatbot conversations
+    Type: String
+    Default: ""
+    NoEcho: true
+  AwsProfile:
+    Description: AWS CLI profile name used for deployment (for local/devops usage)
+    Type: String
+    Default: esgis_profile
+  MistralApiKey:
+    Description: API key for accessing the Mistral AI service
+    Type: String
+    Default: ""
+    NoEcho: true
+  TelegramBotToken:
+    Description: Telegram bot token for authenticating with the Telegram API
+    Type: String
+    Default: ""
+    NoEcho: true
+  ApiWehookUrl:
+    Type: String
+    Default: ""
+  TelegramApiBotUrl:
+    Type: String
+    Default: https://api.telegram.org/bot
 ###############################################################################
 Resources:
 ###############################################################################
@@ -23,15 +54,15 @@ Resources:
       TableName: !Sub "chatbot-dbtable-${EnvironmentName}"
       # Définition des attributs utilisés comme clés pour la table principale et les GSI
       AttributeDefinitions:
-        - AttributeName: "id"
+        - AttributeName: "chat_id"
           AttributeType: "S"
         - AttributeName: "timestamp"
           AttributeType: "S"
         - AttributeName: "user_id" # Attribut nécessaire pour UserIndex
           AttributeType: "S"
       # Schéma de la clé primaire de la table principale
       KeySchema:
-        - AttributeName: "id"
+        - AttributeName: "chat_id"
           KeyType: "HASH"
         - AttributeName: "timestamp"
           KeyType: "RANGE"
@@ -51,7 +82,7 @@ Resources:
           Projection:
             ProjectionType: "INCLUDE"
             NonKeyAttributes: # Attributs à projeter en plus des clés de l'index et de la table
-              - "id"
+              - "chat_id"
               - "message_id"
               - "role"
               - "text"
@@ -67,6 +98,33 @@ Resources:
       CodeUri: ../
       Handler: src/main.handler
       Runtime: python3.12
+      Environment:
+        Variables:
+          ENV_NAME: !Ref EnvironmentName
+          AWS_REGION_NAME: !Ref AWSRegionName
+          DYNAMO_TABLE: !Ref DynamoDBTable
+          MISTRAL_API_KEY: !Ref MistralApiKey
+          TELEGRAM_BOT_TOKEN: !Ref TelegramBotToken
+          TELEGRAM_API_URL: !Ref TelegramApiBotUrl
+          WEBHOOK_URL:  !Ref ApiWehookUrl
+      Policies:
+        - DynamoDBCrudPolicy:
+            TableName: !Ref DynamoDBTable
+        - Statement:
+            - Effect: Allow
+              Action:
+                - dynamodb:GetItem
+                - dynamodb:DeleteItem
+                - dynamodb:PutItem
+                - dynamodb:Query
+                - dynamodb:UpdateItem
+                - dynamodb:BatchWriteItem
+                - dynamodb:BatchGetItem
+                - dynamodb:DescribeTable
+                - dynamodb:ConditionCheckItem
+                - apigateway:POST
+                - apigateway:GET
+              Resource: "*"
       Events:
         Api:
           Type: HttpApi
@@ -83,6 +141,6 @@ Outputs:
   DynamoDBTableName:
     Value: !Ref DynamoDBTable
   ApiUrl:
-    Description: URL of your API
+    Description: URL of our API
     Value:
-      Fn::Sub: 'https://${Api}.execute-api.${AWS::Region}.${AWS::URLSuffix}/'
+      Fn::Sub: 'https://${Api}.execute-api.${AWS::Region}.${AWS::URLSuffix}/'

requirements.txt

@@ -6,3 +6,4 @@ mangum
 httpx
 mistralai
 python-telegram-bot
+slowapi

src/dynamodb_repository.py

@@ -1,6 +1,5 @@
 import boto3
-import datetime
-import asyncio
+import datetime, asyncio, uuid
 
 from botocore.exceptions import ClientError
 from boto3.dynamodb.conditions import Key, Attr
@@ -44,9 +43,20 @@ async def save_message(
         Sauvegarde un message (utilisateur ou bot) dans la table DynamoDB.
         """
         try:
-
+            id = str(uuid.uuid4())  # Génère un UUID
+            # item = {
+            #     "id": {"S": str(id)},
+            #     "chat_id": {"S": str(chat_id)},
+            #     "timestamp": {"S": datetime.datetime.now(datetime.timezone.utc).isoformat()},
+            #     "message_id": {"S": str(message_id)},
+            #     "user_id": {"S": str(user_id)},
+            #     "user_name": {"S": user_name},
+            #     "text": {"S": text},
+            #     "role": {"S": role},
+            # }
             item = {
-                'id': str(chat_id),
+                'id': id,
+                'chat_id': str(chat_id),
                 'timestamp': datetime.datetime.now(datetime.timezone.utc).isoformat(),
                 'message_id': str(message_id),
                 'user_id': str(user_id),
@@ -55,29 +65,34 @@ async def save_message(
                 'role': role,
             }
             if ai_model:
-                item['ai_model'] = ai_model
+                item["ai_model"] = str(ai_model)
+                # item["ai_model"] = {"S": ai_model}
+
+            # Utils.insert_data(item)
 
             # Exécute l'opération put_item (synchrone) dans un thread séparé
-            await asyncio.to_thread(self.table.put_item, Item=item)
-            Utils.log_info(f"Message enregistré dans DynamoDB: chat_id={chat_id}, role={role}")
+            # await asyncio.to_thread(self.table.put_item, Item=item)
+            return True
         except Exception as e:
             Utils.log_error(f"Erreur lors de l'enregistrement dans DynamoDB: {e}")
             # L'erreur n'est pas levée pour ne pas interrompre le flux du bot
+            raise e
 
     async def get_chat_history(self, chat_id: int, limit: int = 100) -> list[dict]:
         """
         Récupère l'historique d'une discussion donnée par chat_id, trié par timestamp.
         Retourne une liste de dictionnaires représentant les messages.
         """
         try:
+            # return Utils.get_chat_history(chat_id=chat_id, limit=limit)
             response = await asyncio.to_thread(
                 self.table.query,
-                KeyConditionExpression=Key('id').eq(str(chat_id)),
+                KeyConditionExpression=Key('chat_id').eq(str(chat_id)),
                 Limit=limit,
                 ScanIndexForward=True # True pour tri ascendant (du plus ancien au plus récent)
             )
             Utils.log_info(f"Historique du chat {chat_id} récupéré. Messages trouvés: {len(response.get('Items', []))}")
-            return response.get('Items', [])
+            # return response.get('Items', [])
         except ClientError as e:
             error_code = e.response['Error']['Code']
             Utils.log_error(f"Erreur DynamoDB lors de la récupération de l'historique: {error_code} - {e}")
@@ -94,6 +109,7 @@ async def get_user_messages_by_date_range(self, user_id: int, start_timestamp: s
         """
         gsi_name = "UserIndex"
         try:
+            # return Utils.get_user_chats(user_id, start_timestamp, end_timestamp, limit)
             query_params = {
                 'IndexName': gsi_name,
                 'KeyConditionExpression': Key('user_id').eq(str(user_id)) & Key('timestamp').between(start_timestamp, end_timestamp),