Merge pull request #44 from amazeeio/dev

Maintenance tasks and terraform updates

Author: PhiRho

.github/workflows/tests.yml

@@ -2,26 +2,11 @@ name: Tests
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, dev ]
   pull_request:
     branches: [ main, dev ]
 
 jobs:
-  frontend-tests:
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: .
-
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Set up Docker
-      uses: docker/setup-buildx-action@v3
-
-    - name: Run frontend tests
-      run: make frontend-test
-
   backend-tests:
     runs-on: ubuntu-latest
     defaults:

README.md

@@ -157,6 +157,10 @@ Access the services at:
 ### Frontend
 - `NEXT_PUBLIC_API_URL`: Backend API URL
 
+## 🌍 Terraform
+
+This project includes the default terraform details needed to set up remote AWS resources (IAM roles and users, DDB tables, etc).
+
 ## 👥 Contributing
 
 1. Create a new branch for your feature

frontend/package.json

@@ -50,7 +50,7 @@
     "@types/react-dom": "^18",
     "eslint": "^9",
     "eslint-config-next": "15.1.7",
-    "postcss": "^8",
+    "postcss": "^8.5.3",
     "tailwindcss": "^3.4.1",
     "typescript": "^5"
   }

requirements-test.txt

@@ -1,7 +1,7 @@
-pytest==8.0.0
+pytest==8.3.3
 pytest-asyncio==0.23.5
 pytest-cov==4.1.0
-httpx==0.26.0
+httpx==0.28.1
 requests-mock==1.11.0
-faker==22.6.0
-pytest-env==1.1.3
+faker==22.7.0
+pytest-env==1.1.5

requirements.txt

@@ -1,6 +1,6 @@
-fastapi==0.109.2
+fastapi==0.115.12
 uvicorn==0.27.1
-sqlalchemy==2.0.27
+sqlalchemy==2.0.40
 pydantic==2.6.1
 pydantic-settings==2.1.0
 python-jose[cryptography]==3.4.0
@@ -10,7 +10,7 @@ asyncpg==0.29.0
 psycopg2-binary==2.9.9
 requests==2.32.2
 python-dotenv==1.0.1
-alembic==1.13.1
+alembic==1.15.2
 boto3==1.35.1
 markdown==3.5.2
-email-validator==2.1.2
+email-validator==2.1.2

terraform/backend.tf

@@ -0,0 +1,9 @@
+terraform {
+  backend "s3" {
+    bucket       = "amazeeai-terraform-state-dev"
+    key          = "terraform.tfstate"
+    region       = "eu-central-2"
+    use_lockfile = true
+    encrypt      = true
+  }
+}

terraform/main.tf

@@ -157,3 +157,75 @@ resource "aws_dynamodb_table" "verification_codes" {
 
   tags = var.tags
 }
+
+resource "aws_dynamodb_table" "lite_llm_usage" {
+  name                        = "amazeeai-litellm-usage-${var.environment_suffix}"
+  billing_mode                = "PAY_PER_REQUEST"
+  deletion_protection_enabled = local.is_production_environment
+
+  hash_key  = "id"
+  range_key = "startTime"
+
+  attribute {
+    name = "id"
+    type = "S"
+  }
+
+  attribute {
+    name = "startTime"
+    type = "S"
+  }
+
+  attribute {
+    name = "model"
+    type = "S"
+  }
+
+  global_secondary_index {
+    name            = "ModelIndex"
+    hash_key        = "model"
+    range_key       = "startTime"
+    projection_type = "ALL"
+  }
+
+  tags = var.tags
+}
+
+resource "aws_iam_user" "litellm" {
+  name = "amazeeai-litellm-${var.environment_suffix}"
+  tags = var.tags
+
+  lifecycle {
+    prevent_destroy = true
+  }
+}
+
+resource "aws_iam_access_key" "litellm" {
+  user = aws_iam_user.litellm.name
+}
+
+resource "aws_iam_user_policy" "litellm" {
+  name = "amazeeai-litellm-ddb-${var.environment_suffix}"
+  user = aws_iam_user.litellm.name
+
+  policy = jsonencode({
+    Version = "2012-10-17"
+    Statement = [
+      {
+        Sid    = "DynamoDBPutItemOnly"
+        Effect = "Allow"
+        Action = [
+          "dynamodb:PutItem"
+        ]
+        Resource = [
+          aws_dynamodb_table.lite_llm_usage.arn
+        ]
+      }
+    ]
+  })
+}
+
+resource "aws_iam_user_policy_attachment" "litellm_bedrock" {
+  user       = aws_iam_user.litellm.name
+  policy_arn = "arn:aws:iam::aws:policy/AmazonBedrockFullAccess"
+}

terraform/outputs.tf

@@ -27,4 +27,16 @@ output "role_assumer_secret_key" {
   description = "Secret access key for the role assumer user"
   value       = aws_iam_access_key.role_assumer.secret
   sensitive   = true
+}
+
+output "litellm_access_key_id" {
+  description = "The access key ID for the LiteLLM IAM user"
+  value       = aws_iam_access_key.litellm.id
+  sensitive   = false
+}
+
+output "litellm_access_key_secret" {
+  description = "The access key secret for the LiteLLM IAM user"
+  value       = aws_iam_access_key.litellm.secret
+  sensitive   = true
 }

terraform/variables.tf

@@ -26,5 +26,4 @@ variable "tags" {
 variable "environment_suffix" {
   description = "Suffix to append to resource names"
   type        = string
-  default     = "dev"
 }