Skip to content

Commit d9db73a

Browse files
RAWx18RAWx18
committed
major rebase issue created causing 73 commits rebase, finally conflict solved
Signed-off-by: RAWx18 <rawx18.dev@gmail.com>
1 parent baf42fd commit d9db73a

File tree

1,040 files changed

+250660
-324277
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,040 files changed

+250660
-324277
lines changed

‎Makefile‎

Lines changed: 154 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
1+
# DevSpace Makefile
2+
# Unified commands for development and deployment
3+
4+
.PHONY: help dev dev-setup dev-backend dev-frontend dev-chat test lint format clean
5+
6+
# Default target
7+
help:
8+
@echo "DevSpace Development Commands"
9+
@echo "=============================="
10+
@echo ""
11+
@echo "Setup:"
12+
@echo " make dev-setup Install all dependencies"
13+
@echo " make chat-setup Setup chat-orchestrator Python env"
14+
@echo ""
15+
@echo "Development:"
16+
@echo " make dev Start in Community Edition (CE) mode"
17+
@echo " make dev-ee Start in Enterprise Edition (EE) mode"
18+
@echo " make dev-backend Start backend only"
19+
@echo " make dev-frontend Start frontend only"
20+
@echo " make dev-chat Start chat-orchestrator only"
21+
@echo ""
22+
@echo "Testing:"
23+
@echo " make test Run all tests"
24+
@echo " make test-backend Run backend tests"
25+
@echo " make test-chat Run chat-orchestrator tests"
26+
@echo ""
27+
@echo "Code Quality:"
28+
@echo " make lint Run linters"
29+
@echo " make format Format code"
30+
@echo ""
31+
@echo "Docker:"
32+
@echo " make docker-build Build all Docker images"
33+
@echo " make docker-up Start all services with Docker Compose"
34+
@echo " make docker-down Stop Docker Compose services"
35+
36+
# ======================
37+
# Setup Commands
38+
# ======================
39+
40+
dev-setup: backend-deps frontend-deps chat-setup
41+
@echo "✅ All dependencies installed"
42+
43+
backend-deps:
44+
@echo "📦 Installing backend dependencies..."
45+
cd backend && npm install
46+
47+
frontend-deps:
48+
@echo "📦 Installing frontend dependencies..."
49+
cd frontend && npm install
50+
51+
chat-setup:
52+
@echo "🐍 Setting up chat-orchestrator Python environment..."
53+
cd chat-orchestrator && python3 -m venv venv || python -m venv venv
54+
cd chat-orchestrator && . venv/bin/activate && pip install -r requirements.txt
55+
@echo "✅ Python environment ready"
56+
@echo "⚠️ Don't forget to set OPENAI_API_KEY in chat-orchestrator/.env"
57+
58+
# ======================
59+
# Development Commands
60+
# ======================
61+
62+
dev:
63+
@./scripts/dev.sh --ce
64+
65+
dev-ee:
66+
@./scripts/dev.sh --ee
67+
68+
dev-backend:
69+
@echo "🔧 Starting backend..."
70+
cd backend && npm run start:api:dev:local
71+
72+
dev-frontend:
73+
@echo "🌐 Starting frontend..."
74+
cd frontend && npm run dev
75+
76+
dev-chat:
77+
@echo "🤖 Starting chat-orchestrator..."
78+
cd chat-orchestrator && . venv/bin/activate && uvicorn app.main:app --host 0.0.0.0 --port 8001 --reload
79+
80+
# ======================
81+
# Testing Commands
82+
# ======================
83+
84+
test: test-backend test-chat
85+
@echo "✅ All tests passed"
86+
87+
test-backend:
88+
@echo "🧪 Running backend tests..."
89+
cd backend && npm test
90+
91+
test-chat:
92+
@echo "🧪 Running chat-orchestrator tests..."
93+
cd chat-orchestrator && . venv/bin/activate && pytest
94+
95+
# ======================
96+
# Code Quality Commands
97+
# ======================
98+
99+
lint:
100+
@echo "🔍 Linting backend..."
101+
cd backend && npm run lint
102+
@echo "🔍 Linting frontend..."
103+
cd frontend && npm run lint
104+
@echo "🔍 Linting chat-orchestrator..."
105+
cd chat-orchestrator && . venv/bin/activate && ruff check .
106+
107+
format:
108+
@echo "✨ Formatting backend..."
109+
cd backend && npm run format
110+
@echo "✨ Formatting frontend..."
111+
cd frontend && npm run format
112+
@echo "✨ Formatting chat-orchestrator..."
113+
cd chat-orchestrator && . venv/bin/activate && black .
114+
115+
# ======================
116+
# Docker Commands
117+
# ======================
118+
119+
docker-build:
120+
@echo "🐳 Building chat-orchestrator image..."
121+
docker build -t gitmesh/chat-orchestrator:latest ./chat-orchestrator
122+
123+
docker-up:
124+
@echo "🐳 Starting Docker Compose services..."
125+
docker-compose up -d
126+
127+
docker-down:
128+
@echo "🐳 Stopping Docker Compose services..."
129+
docker-compose down
130+
131+
# ======================
132+
# Cleanup Commands
133+
# ======================
134+
135+
clean:
136+
@echo "🧹 Cleaning build artifacts..."
137+
rm -rf backend/dist
138+
rm -rf frontend/dist
139+
rm -rf chat-orchestrator/__pycache__
140+
rm -rf chat-orchestrator/.pytest_cache
141+
find . -type d -name "__pycache__" -exec rm -rf {} + 2>/dev/null || true
142+
@echo "✅ Cleanup complete"
143+
144+
# ======================
145+
# Database Commands
146+
# ======================
147+
148+
db-migrate:
149+
@echo "🗄️ Running database migrations..."
150+
cd backend && npm run sequelize-cli:source db:migrate
151+
152+
db-seed:
153+
@echo "🌱 Seeding database..."
154+
cd backend && npm run db:seed:dev

‎backend/.env.dist.local‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ SQS_ENDPOINT=http://localhost:9324
2121
SQS_NODEJS_WORKER_QUEUE=http://localhost:9324/000000000000/nodejs-worker.fifo
2222
SQS_NODEJS_WORKER_DELAYABLE_QUEUE=http://localhost:9324/000000000000/nodejs-worker
2323
SQS_PYTHON_WORKER_QUEUE=http://localhost:9324/000000000000/python-worker.fifo
24+
SQS_INTEGRATION_RUN_WORKER_QUEUE=http://localhost:9324/000000000000/integration-run-worker.fifo
25+
SQS_INTEGRATION_STREAM_WORKER_QUEUE=http://localhost:9324/000000000000/integration-stream-worker.fifo
26+
SQS_INTEGRATION_DATA_WORKER_QUEUE=http://localhost:9324/000000000000/integration-data-worker.fifo
27+
SQS_INTEGRATION_SYNC_WORKER_QUEUE=http://localhost:9324/000000000000/integration-sync-worker.fifo
28+
SQS_DATA_SINK_WORKER_QUEUE=http://localhost:9324/000000000000/data-sink-worker.fifo
29+
SQS_SEARCH_SYNC_WORKER_QUEUE=http://localhost:9324/000000000000/search-sync-worker.fifo
2430
SQS_AWS_ACCOUNT_ID=000000000000
2531
SQS_AWS_ACCESS_KEY_ID=x
2632
SQS_AWS_SECRET_ACCESS_KEY=x

‎backend/config/custom-environment-variables.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@
1919
"nodejsWorkerQueue": "SQS_NODEJS_WORKER_QUEUE",
2020
"nodejsWorkerDelayableQueue": "SQS_NODEJS_WORKER_DELAYABLE_QUEUE",
2121
"integrationRunWorkerQueue": "SQS_INTEGRATION_RUN_WORKER_QUEUE",
22+
"integrationStreamWorkerQueue": "SQS_INTEGRATION_STREAM_WORKER_QUEUE",
23+
"integrationDataWorkerQueue": "SQS_INTEGRATION_DATA_WORKER_QUEUE",
24+
"integrationSyncWorkerQueue": "SQS_INTEGRATION_SYNC_WORKER_QUEUE",
25+
"dataSinkWorkerQueue": "SQS_DATA_SINK_WORKER_QUEUE",
26+
"searchSyncWorkerQueue": "SQS_SEARCH_SYNC_WORKER_QUEUE",
2227
"pythonWorkerQueue": "SQS_PYTHON_WORKER_QUEUE",
2328
"aws": {
2429
"accountId": "SQS_AWS_ACCOUNT_ID",

0 commit comments

Comments
 (0)