diff --git a/.aws/task_definition.json b/.aws/task_definition.json index 1135305ee..a18e843ce 100644 --- a/.aws/task_definition.json +++ b/.aws/task_definition.json @@ -1,105 +1,100 @@ { - "taskDefinitionArn": "arn:aws:ecs:eu-west-3:253053805092:task-definition/quivr:160", - "containerDefinitions": [ + "taskDefinitionArn": "arn:aws:ecs:eu-west-3:253053805092:task-definition/quivr:160", + "containerDefinitions": [ + { + "name": "quivr", + "image": "253053805092.dkr.ecr.eu-west-3.amazonaws.com/quivr:bada136312ad3497664c3562a36b263d43c89c53", + "cpu": "2048", + "memory": "4096", + "portMappings": [ { - "name": "quivr", - "image": "253053805092.dkr.ecr.eu-west-3.amazonaws.com/quivr:bada136312ad3497664c3562a36b263d43c89c53", - "cpu": "1024", - "memory": "2048", - "portMappings": [ - { - "name": "quivr-5050-tcp", - "containerPort": 5050, - "hostPort": 5050, - "protocol": "tcp", - "appProtocol": "http" - } - ], - "essential": true, - "command": [ - "uvicorn", - "main:app", - "--host", - "0.0.0.0", - "--port", - "5050", - "--workers", - "6" - ], - "environment": [], - "environmentFiles": [ - { - "value": "arn:aws:s3:::quivr-env-variables/production.env", - "type": "s3" - } - ], - "mountPoints": [], - "volumesFrom": [], - "logConfiguration": { - "logDriver": "awslogs", - "options": { - "awslogs-create-group": "true", - "awslogs-group": "/ecs/quivr", - "awslogs-region": "eu-west-3", - "awslogs-stream-prefix": "ecs" - } - } + "name": "quivr-5050-tcp", + "containerPort": 5050, + "hostPort": 5050, + "protocol": "tcp", + "appProtocol": "http" } - ], - "family": "quivr", - "taskRoleArn": "arn:aws:iam::253053805092:role/ecsTaskExecutionRole", - "executionRoleArn": "arn:aws:iam::253053805092:role/ecsTaskExecutionRole", - "networkMode": "awsvpc", - "revision": 160, - "volumes": [], - "status": "ACTIVE", - "requiresAttributes": [ + ], + "essential": true, + "command": [ + "uvicorn", + "main:app", + "--host", + "0.0.0.0", + "--port", + "5050", + "--workers", + "6" + ], + "environment": [], + "environmentFiles": [ { - "name": "com.amazonaws.ecs.capability.logging-driver.awslogs" - }, - { - "name": "ecs.capability.execution-role-awslogs" - }, - { - "name": "com.amazonaws.ecs.capability.ecr-auth" - }, - { - "name": "com.amazonaws.ecs.capability.docker-remote-api.1.19" - }, - { - "name": "ecs.capability.env-files.s3" - }, - { - "name": "com.amazonaws.ecs.capability.task-iam-role" - }, - { - "name": "ecs.capability.execution-role-ecr-pull" - }, - { - "name": "com.amazonaws.ecs.capability.docker-remote-api.1.18" - }, - { - "name": "ecs.capability.task-eni" - }, - { - "name": "com.amazonaws.ecs.capability.docker-remote-api.1.29" + "value": "arn:aws:s3:::quivr-env-variables/production.env", + "type": "s3" } - ], - "placementConstraints": [], - "compatibilities": [ - "EC2", - "FARGATE" - ], - "requiresCompatibilities": [ - "FARGATE" - ], - "cpu": "1024", - "memory": "2048", - "runtimePlatform": { - "cpuArchitecture": "X86_64", - "operatingSystemFamily": "LINUX" + ], + "mountPoints": [], + "volumesFrom": [], + "logConfiguration": { + "logDriver": "awslogs", + "options": { + "awslogs-create-group": "true", + "awslogs-group": "/ecs/quivr", + "awslogs-region": "eu-west-3", + "awslogs-stream-prefix": "ecs" + } + } + } + ], + "family": "quivr", + "taskRoleArn": "arn:aws:iam::253053805092:role/ecsTaskExecutionRole", + "executionRoleArn": "arn:aws:iam::253053805092:role/ecsTaskExecutionRole", + "networkMode": "awsvpc", + "revision": 160, + "volumes": [], + "status": "ACTIVE", + "requiresAttributes": [ + { + "name": "com.amazonaws.ecs.capability.logging-driver.awslogs" }, - "registeredAt": "2023-07-27T13:27:07.192Z", - "registeredBy": "arn:aws:iam::253053805092:root", - "tags": [] -} \ No newline at end of file + { + "name": "ecs.capability.execution-role-awslogs" + }, + { + "name": "com.amazonaws.ecs.capability.ecr-auth" + }, + { + "name": "com.amazonaws.ecs.capability.docker-remote-api.1.19" + }, + { + "name": "ecs.capability.env-files.s3" + }, + { + "name": "com.amazonaws.ecs.capability.task-iam-role" + }, + { + "name": "ecs.capability.execution-role-ecr-pull" + }, + { + "name": "com.amazonaws.ecs.capability.docker-remote-api.1.18" + }, + { + "name": "ecs.capability.task-eni" + }, + { + "name": "com.amazonaws.ecs.capability.docker-remote-api.1.29" + } + ], + "placementConstraints": [], + "compatibilities": ["EC2", "FARGATE"], + "requiresCompatibilities": ["FARGATE"], + "cpu": "2048", + "memory": "4096", + "runtimePlatform": { + "cpuArchitecture": "X86_64", + "operatingSystemFamily": "LINUX" + }, + "registeredAt": "2023-07-27T13:27:07.192Z", + "registeredBy": "arn:aws:iam::253053805092:root", + "tags": [] +} diff --git a/.aws/task_definition_preview.json b/.aws/task_definition_preview.json index c031bda46..76686cb94 100644 --- a/.aws/task_definition_preview.json +++ b/.aws/task_definition_preview.json @@ -1,106 +1,101 @@ { - "taskDefinitionArn": "arn:aws:ecs:eu-west-3:253053805092:task-definition/quivr-preview:4", - "containerDefinitions": [ + "taskDefinitionArn": "arn:aws:ecs:eu-west-3:253053805092:task-definition/quivr-preview:4", + "containerDefinitions": [ + { + "name": "quivr", + "image": "253053805092.dkr.ecr.eu-west-3.amazonaws.com/quivr:c0ff0301002fe6d043270b26dabcfda797437afc", + "cpu": "2048", + "memory": "4096", + "portMappings": [ { - "name": "quivr", - "image": "253053805092.dkr.ecr.eu-west-3.amazonaws.com/quivr:c0ff0301002fe6d043270b26dabcfda797437afc", - "cpu": "1024", - "memory": "2048", - "portMappings": [ - { - "name": "quivr-5050-tcp", - "containerPort": 5050, - "hostPort": 5050, - "protocol": "tcp", - "appProtocol": "http" - } - ], - "command": [ - "uvicorn", - "main:app", - "--host", - "0.0.0.0", - "--port", - "5050", - "--workers", - "6" - ], - "essential": true, - "environment": [], - "environmentFiles": [ - { - "value": "arn:aws:s3:::quivr-env-variables/preview.env", - "type": "s3" - } - ], - "mountPoints": [], - "volumesFrom": [], - "ulimits": [], - "logConfiguration": { - "logDriver": "awslogs", - "options": { - "awslogs-create-group": "true", - "awslogs-group": "/ecs/quivr-preview", - "awslogs-region": "eu-west-3", - "awslogs-stream-prefix": "ecs" - } - } + "name": "quivr-5050-tcp", + "containerPort": 5050, + "hostPort": 5050, + "protocol": "tcp", + "appProtocol": "http" } - ], - "family": "quivr-preview", - "taskRoleArn": "arn:aws:iam::253053805092:role/ecsTaskExecutionRole", - "executionRoleArn": "arn:aws:iam::253053805092:role/ecsTaskExecutionRole", - "networkMode": "awsvpc", - "revision": 4, - "volumes": [], - "status": "ACTIVE", - "requiresAttributes": [ + ], + "command": [ + "uvicorn", + "main:app", + "--host", + "0.0.0.0", + "--port", + "5050", + "--workers", + "6" + ], + "essential": true, + "environment": [], + "environmentFiles": [ { - "name": "com.amazonaws.ecs.capability.logging-driver.awslogs" - }, - { - "name": "ecs.capability.execution-role-awslogs" - }, - { - "name": "com.amazonaws.ecs.capability.ecr-auth" - }, - { - "name": "com.amazonaws.ecs.capability.docker-remote-api.1.19" - }, - { - "name": "ecs.capability.env-files.s3" - }, - { - "name": "com.amazonaws.ecs.capability.task-iam-role" - }, - { - "name": "ecs.capability.execution-role-ecr-pull" - }, - { - "name": "com.amazonaws.ecs.capability.docker-remote-api.1.18" - }, - { - "name": "ecs.capability.task-eni" - }, - { - "name": "com.amazonaws.ecs.capability.docker-remote-api.1.29" + "value": "arn:aws:s3:::quivr-env-variables/preview.env", + "type": "s3" } - ], - "placementConstraints": [], - "compatibilities": [ - "EC2", - "FARGATE" - ], - "requiresCompatibilities": [ - "FARGATE" - ], - "cpu": "1024", - "memory": "2048", - "runtimePlatform": { - "cpuArchitecture": "X86_64", - "operatingSystemFamily": "LINUX" + ], + "mountPoints": [], + "volumesFrom": [], + "ulimits": [], + "logConfiguration": { + "logDriver": "awslogs", + "options": { + "awslogs-create-group": "true", + "awslogs-group": "/ecs/quivr-preview", + "awslogs-region": "eu-west-3", + "awslogs-stream-prefix": "ecs" + } + } + } + ], + "family": "quivr-preview", + "taskRoleArn": "arn:aws:iam::253053805092:role/ecsTaskExecutionRole", + "executionRoleArn": "arn:aws:iam::253053805092:role/ecsTaskExecutionRole", + "networkMode": "awsvpc", + "revision": 4, + "volumes": [], + "status": "ACTIVE", + "requiresAttributes": [ + { + "name": "com.amazonaws.ecs.capability.logging-driver.awslogs" }, - "registeredAt": "2023-06-29T07:33:39.537Z", - "registeredBy": "arn:aws:iam::253053805092:root", - "tags": [] -} \ No newline at end of file + { + "name": "ecs.capability.execution-role-awslogs" + }, + { + "name": "com.amazonaws.ecs.capability.ecr-auth" + }, + { + "name": "com.amazonaws.ecs.capability.docker-remote-api.1.19" + }, + { + "name": "ecs.capability.env-files.s3" + }, + { + "name": "com.amazonaws.ecs.capability.task-iam-role" + }, + { + "name": "ecs.capability.execution-role-ecr-pull" + }, + { + "name": "com.amazonaws.ecs.capability.docker-remote-api.1.18" + }, + { + "name": "ecs.capability.task-eni" + }, + { + "name": "com.amazonaws.ecs.capability.docker-remote-api.1.29" + } + ], + "placementConstraints": [], + "compatibilities": ["EC2", "FARGATE"], + "requiresCompatibilities": ["FARGATE"], + "cpu": "2048", + "memory": "4096", + "runtimePlatform": { + "cpuArchitecture": "X86_64", + "operatingSystemFamily": "LINUX" + }, + "registeredAt": "2023-06-29T07:33:39.537Z", + "registeredBy": "arn:aws:iam::253053805092:root", + "tags": [] +} diff --git a/.aws/task_definition_preview_worker.json b/.aws/task_definition_preview_worker.json index 6f46e6179..6705e07f5 100644 --- a/.aws/task_definition_preview_worker.json +++ b/.aws/task_definition_preview_worker.json @@ -1,94 +1,82 @@ { - "taskDefinitionArn": "arn:aws:ecs:eu-west-3:253053805092:task-definition/quivr-preview-chat:1", - "containerDefinitions": [ + "taskDefinitionArn": "arn:aws:ecs:eu-west-3:253053805092:task-definition/quivr-preview-chat:1", + "containerDefinitions": [ + { + "name": "quivr-chat", + "image": "253053805092.dkr.ecr.eu-west-3.amazonaws.com/quivr:600ff1ede02741c66853cc3e4e7f5001aaba3bc2", + "cpu": "1024", + "memory": "2048", + "essential": true, + "command": ["celery", "-A", "celery_worker", "worker", "-l", "info"], + "environment": [], + "environmentFiles": [ { - "name": "quivr-chat", - "image": "253053805092.dkr.ecr.eu-west-3.amazonaws.com/quivr:600ff1ede02741c66853cc3e4e7f5001aaba3bc2", - "cpu": "256", - "memory": "1024", - "essential": true, - "command": [ - "celery", - "-A", - "celery_worker", - "worker", - "-l", - "info" - ], - "environment": [], - "environmentFiles": [ - { - "value": "arn:aws:s3:::quivr-env-variables/preview.env", - "type": "s3" - } - ], - "mountPoints": [], - "volumesFrom": [], - "logConfiguration": { - "logDriver": "awslogs", - "options": { - "awslogs-create-group": "true", - "awslogs-group": "/ecs/quivr-preview-chat", - "awslogs-region": "eu-west-3", - "awslogs-stream-prefix": "ecs" - } - } + "value": "arn:aws:s3:::quivr-env-variables/preview.env", + "type": "s3" } - ], - "family": "quivr-preview-chat", - "taskRoleArn": "arn:aws:iam::253053805092:role/ecsTaskExecutionRole", - "executionRoleArn": "arn:aws:iam::253053805092:role/ecsTaskExecutionRole", - "networkMode": "awsvpc", - "revision": 1, - "volumes": [], - "status": "ACTIVE", - "requiresAttributes": [ - { - "name": "com.amazonaws.ecs.capability.logging-driver.awslogs" - }, - { - "name": "ecs.capability.execution-role-awslogs" - }, - { - "name": "com.amazonaws.ecs.capability.ecr-auth" - }, - { - "name": "com.amazonaws.ecs.capability.docker-remote-api.1.19" - }, - { - "name": "ecs.capability.env-files.s3" - }, - { - "name": "com.amazonaws.ecs.capability.task-iam-role" - }, - { - "name": "ecs.capability.execution-role-ecr-pull" - }, - { - "name": "com.amazonaws.ecs.capability.docker-remote-api.1.18" - }, - { - "name": "ecs.capability.task-eni" - }, - { - "name": "com.amazonaws.ecs.capability.docker-remote-api.1.29" + ], + "mountPoints": [], + "volumesFrom": [], + "logConfiguration": { + "logDriver": "awslogs", + "options": { + "awslogs-create-group": "true", + "awslogs-group": "/ecs/quivr-preview-chat", + "awslogs-region": "eu-west-3", + "awslogs-stream-prefix": "ecs" } - ], - "placementConstraints": [], - "compatibilities": [ - "EC2", - "FARGATE" - ], - "requiresCompatibilities": [ - "FARGATE" - ], - "cpu": "256", - "memory": "1024", - "runtimePlatform": { - "cpuArchitecture": "X86_64", - "operatingSystemFamily": "LINUX" + } + } + ], + "family": "quivr-preview-chat", + "taskRoleArn": "arn:aws:iam::253053805092:role/ecsTaskExecutionRole", + "executionRoleArn": "arn:aws:iam::253053805092:role/ecsTaskExecutionRole", + "networkMode": "awsvpc", + "revision": 1, + "volumes": [], + "status": "ACTIVE", + "requiresAttributes": [ + { + "name": "com.amazonaws.ecs.capability.logging-driver.awslogs" }, - "registeredAt": "2023-08-18T09:01:56.187Z", - "registeredBy": "arn:aws:iam::253053805092:root", - "tags": [] -} \ No newline at end of file + { + "name": "ecs.capability.execution-role-awslogs" + }, + { + "name": "com.amazonaws.ecs.capability.ecr-auth" + }, + { + "name": "com.amazonaws.ecs.capability.docker-remote-api.1.19" + }, + { + "name": "ecs.capability.env-files.s3" + }, + { + "name": "com.amazonaws.ecs.capability.task-iam-role" + }, + { + "name": "ecs.capability.execution-role-ecr-pull" + }, + { + "name": "com.amazonaws.ecs.capability.docker-remote-api.1.18" + }, + { + "name": "ecs.capability.task-eni" + }, + { + "name": "com.amazonaws.ecs.capability.docker-remote-api.1.29" + } + ], + "placementConstraints": [], + "compatibilities": ["EC2", "FARGATE"], + "requiresCompatibilities": ["FARGATE"], + "cpu": "1024", + "memory": "2048", + "runtimePlatform": { + "cpuArchitecture": "X86_64", + "operatingSystemFamily": "LINUX" + }, + "registeredAt": "2023-08-18T09:01:56.187Z", + "registeredBy": "arn:aws:iam::253053805092:root", + "tags": [] +} diff --git a/.aws/task_definition_prod_worker.json b/.aws/task_definition_prod_worker.json index 97bbdbe85..00308d053 100644 --- a/.aws/task_definition_prod_worker.json +++ b/.aws/task_definition_prod_worker.json @@ -1,100 +1,88 @@ { - "taskDefinitionArn": "arn:aws:ecs:eu-west-3:253053805092:task-definition/quivr-prod-chat:71", - "containerDefinitions": [ + "taskDefinitionArn": "arn:aws:ecs:eu-west-3:253053805092:task-definition/quivr-prod-chat:71", + "containerDefinitions": [ + { + "name": "quivr-chat", + "image": "253053805092.dkr.ecr.eu-west-3.amazonaws.com/quivr:35bd4727c67790d295a474dd81dfbef8469365e8", + "cpu": 2048, + "memory": 4096, + "memoryReservation": 4096, + "portMappings": [], + "essential": true, + "command": ["celery", "-A", "celery_worker", "worker", "-l", "info"], + "environment": [], + "environmentFiles": [ { - "name": "quivr-chat", - "image": "253053805092.dkr.ecr.eu-west-3.amazonaws.com/quivr:35bd4727c67790d295a474dd81dfbef8469365e8", - "cpu": 1024, - "memory": 2048, - "memoryReservation": 2048, - "portMappings": [], - "essential": true, - "command": [ - "celery", - "-A", - "celery_worker", - "worker", - "-l", - "info" - ], - "environment": [], - "environmentFiles": [ - { - "value": "arn:aws:s3:::quivr-env-variables/production.env", - "type": "s3" - } - ], - "mountPoints": [], - "volumesFrom": [], - "logConfiguration": { - "logDriver": "awslogs", - "options": { - "awslogs-create-group": "true", - "awslogs-group": "/ecs/quivr-production-chat", - "awslogs-region": "eu-west-3", - "awslogs-stream-prefix": "ecs" - }, - "secretOptions": [] - } + "value": "arn:aws:s3:::quivr-env-variables/production.env", + "type": "s3" } - ], - "family": "quivr-prod-chat", - "taskRoleArn": "arn:aws:iam::253053805092:role/ecsTaskExecutionRole", - "executionRoleArn": "arn:aws:iam::253053805092:role/ecsTaskExecutionRole", - "networkMode": "awsvpc", - "revision": 71, - "volumes": [], - "status": "ACTIVE", - "requiresAttributes": [ - { - "name": "com.amazonaws.ecs.capability.logging-driver.awslogs" + ], + "mountPoints": [], + "volumesFrom": [], + "logConfiguration": { + "logDriver": "awslogs", + "options": { + "awslogs-create-group": "true", + "awslogs-group": "/ecs/quivr-production-chat", + "awslogs-region": "eu-west-3", + "awslogs-stream-prefix": "ecs" }, - { - "name": "ecs.capability.execution-role-awslogs" - }, - { - "name": "com.amazonaws.ecs.capability.ecr-auth" - }, - { - "name": "com.amazonaws.ecs.capability.docker-remote-api.1.19" - }, - { - "name": "ecs.capability.env-files.s3" - }, - { - "name": "com.amazonaws.ecs.capability.docker-remote-api.1.21" - }, - { - "name": "com.amazonaws.ecs.capability.task-iam-role" - }, - { - "name": "ecs.capability.execution-role-ecr-pull" - }, - { - "name": "com.amazonaws.ecs.capability.docker-remote-api.1.18" - }, - { - "name": "ecs.capability.task-eni" - }, - { - "name": "com.amazonaws.ecs.capability.docker-remote-api.1.29" - } - ], - "placementConstraints": [], - "compatibilities": [ - "EC2", - "FARGATE" - ], - "requiresCompatibilities": [ - "FARGATE" - ], - "cpu": "1024", - "memory": "2048", - "runtimePlatform": { - "cpuArchitecture": "X86_64", - "operatingSystemFamily": "LINUX" + "secretOptions": [] + } + } + ], + "family": "quivr-prod-chat", + "taskRoleArn": "arn:aws:iam::253053805092:role/ecsTaskExecutionRole", + "executionRoleArn": "arn:aws:iam::253053805092:role/ecsTaskExecutionRole", + "networkMode": "awsvpc", + "revision": 71, + "volumes": [], + "status": "ACTIVE", + "requiresAttributes": [ + { + "name": "com.amazonaws.ecs.capability.logging-driver.awslogs" }, - "registeredAt": "2023-12-03T15:54:51.921Z", - "registeredBy": "arn:aws:iam::253053805092:root", - "tags": [] -} \ No newline at end of file + { + "name": "ecs.capability.execution-role-awslogs" + }, + { + "name": "com.amazonaws.ecs.capability.ecr-auth" + }, + { + "name": "com.amazonaws.ecs.capability.docker-remote-api.1.19" + }, + { + "name": "ecs.capability.env-files.s3" + }, + { + "name": "com.amazonaws.ecs.capability.docker-remote-api.1.21" + }, + { + "name": "com.amazonaws.ecs.capability.task-iam-role" + }, + { + "name": "ecs.capability.execution-role-ecr-pull" + }, + { + "name": "com.amazonaws.ecs.capability.docker-remote-api.1.18" + }, + { + "name": "ecs.capability.task-eni" + }, + { + "name": "com.amazonaws.ecs.capability.docker-remote-api.1.29" + } + ], + "placementConstraints": [], + "compatibilities": ["EC2", "FARGATE"], + "requiresCompatibilities": ["FARGATE"], + "cpu": "2048", + "memory": "4096", + "runtimePlatform": { + "cpuArchitecture": "X86_64", + "operatingSystemFamily": "LINUX" + }, + "registeredAt": "2023-12-03T15:54:51.921Z", + "registeredBy": "arn:aws:iam::253053805092:root", + "tags": [] +} diff --git a/.aws/task_definition_strapi.json b/.aws/task_definition_strapi.json index e49d00e5d..40a02bc64 100644 --- a/.aws/task_definition_strapi.json +++ b/.aws/task_definition_strapi.json @@ -1,97 +1,92 @@ { - "taskDefinitionArn": "arn:aws:ecs:eu-west-3:253053805092:task-definition/Strapi:1", - "containerDefinitions": [ + "taskDefinitionArn": "arn:aws:ecs:eu-west-3:253053805092:task-definition/Strapi:1", + "containerDefinitions": [ + { + "name": "strapi", + "image": "253053805092.dkr.ecr.eu-west-3.amazonaws.com/quivr-strapi", + "cpu": 1024, + "memory": 2048, + "portMappings": [ { - "name": "strapi", - "image": "253053805092.dkr.ecr.eu-west-3.amazonaws.com/quivr-strapi", - "cpu": 512, - "memory": 2048, - "portMappings": [ - { - "name": "strapi-1337-tcp", - "containerPort": 1337, - "hostPort": 1337, - "protocol": "tcp", - "appProtocol": "http" - } - ], - "essential": true, - "environment": [], - "environmentFiles": [ - { - "value": "arn:aws:s3:::quivr-env-variables/strapi.env", - "type": "s3" - } - ], - "mountPoints": [], - "volumesFrom": [], - "ulimits": [], - "logConfiguration": { - "logDriver": "awslogs", - "options": { - "awslogs-create-group": "true", - "awslogs-group": "/ecs/Strapi", - "awslogs-region": "eu-west-3", - "awslogs-stream-prefix": "ecs" - }, - "secretOptions": [] - } + "name": "strapi-1337-tcp", + "containerPort": 1337, + "hostPort": 1337, + "protocol": "tcp", + "appProtocol": "http" } - ], - "family": "Strapi", - "taskRoleArn": "arn:aws:iam::253053805092:role/ecsTaskExecutionRole", - "executionRoleArn": "arn:aws:iam::253053805092:role/ecsTaskExecutionRole", - "networkMode": "awsvpc", - "revision": 1, - "volumes": [], - "status": "ACTIVE", - "requiresAttributes": [ + ], + "essential": true, + "environment": [], + "environmentFiles": [ { - "name": "com.amazonaws.ecs.capability.logging-driver.awslogs" - }, - { - "name": "ecs.capability.execution-role-awslogs" - }, - { - "name": "com.amazonaws.ecs.capability.ecr-auth" - }, - { - "name": "com.amazonaws.ecs.capability.docker-remote-api.1.19" - }, - { - "name": "ecs.capability.env-files.s3" - }, - { - "name": "com.amazonaws.ecs.capability.task-iam-role" - }, - { - "name": "ecs.capability.execution-role-ecr-pull" - }, - { - "name": "com.amazonaws.ecs.capability.docker-remote-api.1.18" - }, - { - "name": "ecs.capability.task-eni" - }, - { - "name": "com.amazonaws.ecs.capability.docker-remote-api.1.29" + "value": "arn:aws:s3:::quivr-env-variables/strapi.env", + "type": "s3" } - ], - "placementConstraints": [], - "compatibilities": [ - "EC2", - "FARGATE" - ], - "requiresCompatibilities": [ - "FARGATE" - ], - "cpu": "1024", - "memory": "2048", - "runtimePlatform": { - "cpuArchitecture": "X86_64", - "operatingSystemFamily": "LINUX" + ], + "mountPoints": [], + "volumesFrom": [], + "ulimits": [], + "logConfiguration": { + "logDriver": "awslogs", + "options": { + "awslogs-create-group": "true", + "awslogs-group": "/ecs/Strapi", + "awslogs-region": "eu-west-3", + "awslogs-stream-prefix": "ecs" + }, + "secretOptions": [] + } + } + ], + "family": "Strapi", + "taskRoleArn": "arn:aws:iam::253053805092:role/ecsTaskExecutionRole", + "executionRoleArn": "arn:aws:iam::253053805092:role/ecsTaskExecutionRole", + "networkMode": "awsvpc", + "revision": 1, + "volumes": [], + "status": "ACTIVE", + "requiresAttributes": [ + { + "name": "com.amazonaws.ecs.capability.logging-driver.awslogs" }, - "registeredAt": "2023-09-21T07:48:32.167Z", - "registeredBy": "arn:aws:iam::253053805092:root", - "tags": [] -} \ No newline at end of file + { + "name": "ecs.capability.execution-role-awslogs" + }, + { + "name": "com.amazonaws.ecs.capability.ecr-auth" + }, + { + "name": "com.amazonaws.ecs.capability.docker-remote-api.1.19" + }, + { + "name": "ecs.capability.env-files.s3" + }, + { + "name": "com.amazonaws.ecs.capability.task-iam-role" + }, + { + "name": "ecs.capability.execution-role-ecr-pull" + }, + { + "name": "com.amazonaws.ecs.capability.docker-remote-api.1.18" + }, + { + "name": "ecs.capability.task-eni" + }, + { + "name": "com.amazonaws.ecs.capability.docker-remote-api.1.29" + } + ], + "placementConstraints": [], + "compatibilities": ["EC2", "FARGATE"], + "requiresCompatibilities": ["FARGATE"], + "cpu": "1024", + "memory": "2048", + "runtimePlatform": { + "cpuArchitecture": "X86_64", + "operatingSystemFamily": "LINUX" + }, + "registeredAt": "2023-09-21T07:48:32.167Z", + "registeredBy": "arn:aws:iam::253053805092:root", + "tags": [] +} diff --git a/backend/models/user_usage.py b/backend/models/user_usage.py index b700d5fe5..af4f34f3d 100644 --- a/backend/models/user_usage.py +++ b/backend/models/user_usage.py @@ -71,7 +71,6 @@ class UserUsage(UserIdentity): current_requests_count = self.supabase_db.get_user_requests_count_for_month( self.id, date ) - logger.info("🔥🔥🔥🔥🔥🔥🔥🔥") logger.info(current_requests_count) if current_requests_count == 0: logger.info("Request count is 0, creating new record") diff --git a/backend/modules/chat/controller/chat/utils.py b/backend/modules/chat/controller/chat/utils.py index 0e0978a84..c449368db 100644 --- a/backend/modules/chat/controller/chat/utils.py +++ b/backend/modules/chat/controller/chat/utils.py @@ -36,11 +36,6 @@ def check_user_requests_limit(user: UserIdentity, model: str): models_price = userDailyUsage.get_model_settings() user_choosen_model_price = 1000 - # Log all info - logger.info( - f"User {user.id} with email {user.email} has {monthly_chat_credit} monthly chat credit and has used {daily_user_count} requests today." - ) - logger.info("🔥🔥") for model_setting in models_price: if model_setting["name"] == model: user_choosen_model_price = model_setting["price"] diff --git a/backend/repository/files/list_files.py b/backend/repository/files/list_files.py index fbd3e9af9..405d10e2a 100644 --- a/backend/repository/files/list_files.py +++ b/backend/repository/files/list_files.py @@ -11,7 +11,6 @@ def list_files_from_storage(path): try: response = supabase_client.storage.from_("quivr").list(path) - logger.info("RESPONSE", response) return response except Exception as e: logger.error(e) diff --git a/backend/vectorstore/supabase.py b/backend/vectorstore/supabase.py index d77230a6e..e303cbc2a 100644 --- a/backend/vectorstore/supabase.py +++ b/backend/vectorstore/supabase.py @@ -37,7 +37,6 @@ class CustomSupabaseVectorStore(SupabaseVectorStore): ) -> [dict]: vectors = self._embedding.embed_documents([query]) query_embedding = vectors[0] - logger.info("🤯🤯") res = self._client.rpc( table,