Merge pull request #4 from WillACosta/feature/implement-auth

[AUTOMATED-PR] - main <- feature/implement-auth

Author: WillACosta

.env-example

@@ -1,8 +1,19 @@
+PORT=3000
+IS_DOCKER=false
+
 LANGCHAIN_API_KEY=
 LANGCHAIN_TRACING_V2=true
 LANGCHAIN_CALLBACKS_BACKGROUND=true
 
-GOOGLE_GENAI_API_KEY=
+LLM_API_KEY=
+
+REDIS_URL=redis://127.0.0.1:6379
+REDIS_URL_DOCKER=redis://redis:6379
+REDIS_USER=
+REDIS_PASSWORD=
+
+DATABASE_URL=postgresql://genaiapp:password@localhost:5432/app_db?schema=public
+DATABASE_URL_DOCKER=postgresql://genaiapp:password@postgres:5432/app_db?schema=public
 
-REDIS_ENDPOINT_URI=localhost:6379
-REDIS_PASSWORD=redis@dev
+JWT_SECRET=
+JWT_EXPIRATION=1h

.vscode/settings.json

@@ -1,8 +1,11 @@
 {
   "cSpell.words": [
+    "dataprovider",
     "dataproviders",
     "gemini",
     "nodenext",
+    "predev",
+    "prestart",
     "usecases"
   ]
 }

README.md

@@ -14,6 +14,7 @@ This is an Express service written in [TypeScript](https://www.typescriptlang.or
 - [Google Gemini - API](https://ai.google.dev/)
 - [Docker](https://docs.docker.com/) Containers for setting up environment.
 - [Redis](https://redis.io/) database for storing AI messages.
+- [ZOD](https://zod.dev/) as body parameters validation.
 
 ## Project Structure
 

docker-compose.yaml

@@ -1,40 +1,48 @@
-version: '3.8'
-
 services:
   app:
+    container_name: genai_app
     build:
       context: .
       dockerfile: Dockerfile
     ports:
       - '3000:3000'
     env_file:
       - .env
+    environment:
+      IS_DOCKER: true
+      DATABASE_URL: ${DATABASE_URL_DOCKER}
+      REDIS_URL: ${REDIS_URL_DOCKER}
     volumes:
       - ./src:/usr/workspace/app/src
       - pnpm_store:/pnpm/.pnpm-store
-    command: sh -c "pnpm install && pnpm dev"
+    command: sh -c "pnpm install && node dynamic-url-config.js && npx prisma generate && pnpm dev"
+    depends_on:
+      - postgres
+      - redis
 
   postgres:
+    container_name: genai_app_postgres
     image: bitnami/postgresql:latest
+    environment:
+      POSTGRES_USER: genaiapp
+      POSTGRES_PASSWORD: password
+      POSTGRES_DB: genaiapp_db
     ports:
       - '5432:5432'
-    environment:
-      - POSTGRES_USER=docker
-      - POSTGRES_PASSWORD=docker
-      - POSTGRES_DB=rag_app
     volumes:
-      - 'rag_app_postgres_data:/bitnami/postgresql'
+      - 'genai_app_postgres_data:/bitnami/postgresql'
 
   redis:
+    container_name: genai_app_redis
     image: bitnami/redis:latest
+    environment:
+      ALLOW_EMPTY_PASSWORD: yes
     ports:
       - '6379:6379'
-    environment:
-      - ALLOW_EMPTY_PASSWORD=yes
     volumes:
-      - 'rag_app_redis_data:/bitnami/redis/data'
+      - 'genai_app_redis_data:/bitnami/redis/data'
 
 volumes:
   pnpm_store:
-  rag_app_redis_data:
-  rag_app_postgres_data:
+  genai_app_redis_data:
+  genai_app_postgres_data:

dockerfile

@@ -9,7 +9,7 @@ RUN mkdir -p $PNPM_HOME
 
 RUN pnpm config set store-dir "$PNPM_HOME/.pnpm-store" --global
 
-COPY package.json pnpm-lock.yaml* ./
+COPY package.json pnpm-lock.yaml* dynamic-url-config.js ./
 RUN pnpm install --frozen-lockfile
 COPY . .
 

dynamic-url-config.js

@@ -0,0 +1,36 @@
+const fs = require('fs')
+const dotenv = require('dotenv')
+
+if (fs.existsSync('.env')) {
+	dotenv.config()
+}
+
+const isDocker = process.env.IS_DOCKER === 'true'
+
+const databaseUrl = isDocker
+	? process.env.DATABASE_URL_DOCKER
+	: process.env.DATABASE_URL
+
+const redisUrl = isDocker ? process.env.REDIS_URL_DOCKER : process.env.REDIS_URL
+
+if (databaseUrl) {
+	process.env.DATABASE_URL = databaseUrl
+	console.log(`Using DATABASE_URL: ${databaseUrl}`)
+} else {
+	console.error(
+		'DATABASE_URL is not set. Please check your environment variables.',
+	)
+
+	process.exit(1)
+}
+
+if (redisUrl) {
+	process.env.REDIS_URL = redisUrl
+	console.log(`Using REDIS_URL: ${redisUrl}`)
+} else {
+	console.error(
+		'REDIS_URL is not set. Please check your environment variables.',
+	)
+
+	process.exit(1)
+}

package.json

@@ -3,6 +3,8 @@
   "version": "1.0.0",
   "description": "This is an Express service that provides authorization functionality and includes gen-AI features.",
   "scripts": {
+    "prestart": "node dynamic-url-config.js",
+    "predev": "node dynamic-url-config.js",
     "start": "tsx src/app.ts",
     "dev": "tsx watch src/app.ts"
   },
@@ -20,25 +22,30 @@
     "@langchain/core": "^0.3.3",
     "@langchain/google-genai": "^0.1.0",
     "@langchain/redis": "^0.1.0",
+    "@prisma/client": "5.20.0",
     "@types/redis": "^4.0.11",
-    "dotenv": "^16.4.5",
     "express": "^4.21.0",
+    "jsonwebtoken": "^9.0.2",
     "langchain": "^0.3.2",
     "multer": "1.4.5-lts.1",
     "pdf-parse": "^1.1.1",
-    "redis": "^4.7.0"
+    "redis": "^4.7.0",
+    "zod": "^3.23.8"
   },
   "devDependencies": {
     "@types/cors": "^2.8.17",
     "@types/express": "^4.17.21",
+    "@types/jsonwebtoken": "^9.0.7",
     "@types/multer": "^1.4.12",
     "@types/node": "^22.5.5",
     "cors": "^2.8.5",
+    "dotenv": "^16.4.5",
     "nodemon": "^3.1.4",
+    "prisma": "^5.20.0",
     "ts-node": "^10.9.2",
     "tslib": "^2.7.0",
     "tsx": "^4.19.1",
     "typescript": "^5.6.2"
   },
   "packageManager": "[email protected]+sha512.0a203ffaed5a3f63242cd064c8fb5892366c103e328079318f78062f24ea8c9d50bc6a47aa3567cabefd824d170e78fa2745ed1f16b132e16436146b7688f19b"
-}
+}