Merge with main

Author: GuidoBR

.husky/pre-push

@@ -15,10 +15,11 @@ if [ -n "$FRONTEND_CHANGES" ]; then
 
   # Navigate to frontend directory
   cd frontend || exit 1
+  
+  # Remove dependency on husky.sh
+  # . "$(dirname -- "$0")/_/husky.sh"
 
-  . "$(dirname -- "$0")/_/husky.sh"
-
-  cd frontend && npm run lint && npm run test:ci
+  npm run lint && npm run test:ci
 
   # Capture the exit code
   TEST_EXIT_CODE=$?
@@ -43,7 +44,9 @@ BACKEND_CHANGES=$(git diff --name-only $RANGE | grep "^backend/" || true)
 if [ -n "$BACKEND_CHANGES" ]; then
     echo "Backend changes detected. Running backend lint..."
 
-    . "$(dirname -- "$0")/_/husky.sh"
+    # Remove dependency on husky.sh
+    # . "$(dirname -- "$0")/_/husky.sh"
+    
     cd backend && npm run lint
 else
   echo "No backend changes detected. Skipping backend tests."

backend/README.md

@@ -87,4 +87,4 @@ This script sets a resource policy that:
 1. Allows only authenticated Cognito users to access your API
 2. Denies any non-HTTPS requests to your API
 
-If you need more complex permissions, you can modify the policy object in the script.
+If you need more complex permissions, you can modify the policy object in the script.

backend/package-lock.json

@@ -27,10 +27,13 @@
     "cdk:synth": "dotenv -- npx cdk synth"
   },
   "dependencies": {
+    "@aws-sdk/client-bedrock": "^3.782.0",
+    "@aws-sdk/client-bedrock-runtime": "^3.782.0",
     "@aws-sdk/client-dynamodb": "^3.758.0",
     "@aws-sdk/client-s3": "^3.782.0",
     "@aws-sdk/client-secrets-manager": "^3.758.0",
     "@aws-sdk/s3-request-presigner": "^3.782.0",
+    "@aws-sdk/client-textract": "^3.782.0",
     "@aws-sdk/util-dynamodb": "^3.758.0",
     "@nestjs/common": "^10.0.0",
     "@nestjs/config": "^3.1.1",
@@ -75,7 +78,7 @@
     "@types/node": "^20.12.7",
     "@typescript-eslint/eslint-plugin": "^7.9.0",
     "@typescript-eslint/parser": "^7.9.0",
-    "@vitest/coverage-c8": "^0.33.0",
+    "@vitest/coverage-v8": "^3.1.1",
     "aws-cdk": "2.139.0",
     "aws-cdk-lib": "^2.185.0",
     "dotenv-cli": "^8.0.0",
@@ -92,7 +95,7 @@
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5.4.5",
     "vite-tsconfig-paths": "^4.2.0",
-    "vitest": "^0.33.0"
+    "vitest": "^3.1.1"
   },
   "peerDependencies": {
     "aws-cdk-lib": "^2.185.0"

backend/package.json

@@ -4,13 +4,19 @@ import { ConfigModule } from '@nestjs/config';
 import { JwtModule } from '@nestjs/jwt';
 import { ReportsService } from './reports/reports.service';
 import { vi, describe, it, expect } from 'vitest';
+import configuration from './config/configuration';
+import { PerplexityService } from './services/perplexity.service';
+import { AwsSecretsService } from './services/aws-secrets.service';
+import { AwsTextractService } from './document-processor/services/aws-textract.service';
+import { AwsBedrockService } from './document-processor/services/aws-bedrock.service';
 
 describe('AppModule', () => {
   it('should compile the module', async () => {
     const module = await Test.createTestingModule({
       imports: [
         ConfigModule.forRoot({
           isGlobal: true,
+          load: [configuration],
         }),
         JwtModule.register({
           secret: 'test-secret',
@@ -26,6 +32,33 @@ describe('AppModule', () => {
         findOne: vi.fn().mockResolvedValue({}),
         updateStatus: vi.fn().mockResolvedValue({}),
       })
+      .overrideProvider(PerplexityService)
+      .useValue({
+        askQuestion: vi.fn().mockResolvedValue({}),
+      })
+      .overrideProvider(AwsSecretsService)
+      .useValue({
+        getPerplexityApiKey: vi.fn().mockResolvedValue('test-api-key'),
+      })
+      .overrideProvider(AwsTextractService)
+      .useValue({
+        extractText: vi.fn().mockResolvedValue({}),
+        processBatch: vi.fn().mockResolvedValue([]),
+      })
+      .overrideProvider(AwsBedrockService)
+      .useValue({
+        generateResponse: vi.fn().mockResolvedValue('test response'),
+        analyzeMedicalDocument: vi.fn().mockResolvedValue({
+          keyMedicalTerms: [],
+          labValues: [],
+          diagnoses: [],
+          metadata: {
+            isMedicalReport: true,
+            confidence: 0.9,
+            missingInformation: [],
+          },
+        }),
+      })
       .compile();
 
     expect(module).toBeDefined();

backend/src/app.module.spec.ts

@@ -10,6 +10,7 @@ import { UserController } from './user/user.controller';
 import { ReportsModule } from './reports/reports.module';
 import { HealthController } from './health/health.controller';
 import { AuthMiddleware } from './auth/auth.middleware';
+import { DocumentProcessorModule } from './document-processor/document-processor.module';
 
 @Module({
   imports: [
@@ -18,6 +19,7 @@ import { AuthMiddleware } from './auth/auth.middleware';
       load: [configuration],
     }),
     ReportsModule,
+    DocumentProcessorModule,
   ],
   controllers: [AppController, HealthController, PerplexityController, UserController],
   providers: [AppService, AwsSecretsService, PerplexityService],

backend/src/app.module.ts

@@ -4,11 +4,11 @@ import configuration from './configuration';
 describe('Configuration', () => {
   // Save original environment
   const originalEnv = { ...process.env };
-  
+
   beforeEach(() => {
     // Clear environment variables before each test
     process.env = {};
-    
+
     // Set NODE_ENV to test for the first test
     process.env.NODE_ENV = 'test';
   });
@@ -20,7 +20,7 @@ describe('Configuration', () => {
 
   it('should return default values when no env variables are set', () => {
     const config = configuration();
-    
+
     expect(config.port).toBe(3000);
     expect(config.environment).toBe('test');
     expect(config.aws.region).toBe('us-east-1'); // Default value in configuration.ts
@@ -50,4 +50,4 @@ describe('Configuration', () => {
     delete process.env.AWS_COGNITO_USER_POOL_ID;
     delete process.env.AWS_COGNITO_CLIENT_ID;
   });
-}); 
+});

backend/src/config/configuration.spec.ts

@@ -8,12 +8,27 @@ export default () => ({
       clientId: process.env.AWS_COGNITO_CLIENT_ID,
     },
     secretsManager: {
-      perplexityApiKeySecret: process.env.PERPLEXITY_API_KEY_SECRET_NAME || 'medical-reports-explainer/perplexity-api-key',
+      perplexityApiKeySecret:
+        process.env.PERPLEXITY_API_KEY_SECRET_NAME ||
+        'medical-reports-explainer/perplexity-api-key',
     },
     aws: {
       accessKeyId: process.env.AWS_ACCESS_KEY_ID,
       secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
-    }
+      sessionToken: process.env.AWS_SESSION_TOKEN,
+    },
+    bedrock: {
+      model: process.env.AWS_BEDROCK_MODEL || 'us.anthropic.claude-3-7-sonnet-20250219-v1:0',
+      maxTokens: parseInt(process.env.AWS_BEDROCK_MAX_TOKENS || '2048', 10),
+      inferenceProfileArn:
+        process.env.AWS_BEDROCK_INFERENCE_PROFILE_ARN ||
+        'arn:aws:bedrock:us-east-1:841162674562:inference-profile/us.anthropic.claude-3-7-sonnet-20250219-v1:0',
+      requestsPerMinute: parseInt(process.env.AWS_BEDROCK_REQUESTS_PER_MINUTE || '20', 20),
+    },
+    textract: {
+      maxBatchSize: parseInt(process.env.AWS_TEXTRACT_MAX_BATCH_SIZE || '10', 10),
+      documentRequestsPerMinute: parseInt(process.env.AWS_TEXTRACT_DOCS_PER_MINUTE || '20', 20),
+    },
   },
   perplexity: {
     apiBaseUrl: 'https://api.perplexity.ai',