Merge branch 'feature/sql-tokenizer' into pre-release

Author: MarcoFerreiraPerson

src/FrontEnd/.env.example

@@ -0,0 +1,25 @@
+# Server Configuration
+PORT=8000
+HOST=0.0.0.0
+
+# Logging Configuration
+# Options: prod, info, debug
+LOGGING_MODE=info
+
+# Testing Configuration
+TEST_SERVER_URL=http://localhost:8000
+
+# Backend Execution Engine (gRPC)
+BACKEND_HOST=localhost
+BACKEND_PORT=7000
+
+# Redis Cache
+REDIS_HOST=localhost
+REDIS_PORT=6379
+
+# S3/DigitalOcean Spaces
+S3_ACCESS_KEY=your-access-key
+S3_SECRET_KEY=your-secret-key
+S3_ENDPOINT_URL=https://atl1.digitaloceanspaces.com
+S3_BUCKET_NAME=your-bucket-name
+S3_REGION=us-east-1

src/FrontEnd/Dockerfile

@@ -1,17 +1,36 @@
-FROM python:3.11-slim
+FROM python:3.10-slim
 
 WORKDIR /app
 
-# Install dependencies
-COPY requirements.txt .
+# Install system dependencies for gRPC and C++ runtime
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    curl \
+    libc++1 \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install Python dependencies
+COPY FrontEnd/requirements.txt .
 RUN pip install --no-cache-dir -r requirements.txt
 
+# Copy proto files and generate gRPC code
+COPY Contract /contract
+RUN mkdir -p app/grpc_gen && \
+    python -m grpc_tools.protoc \
+        -I/contract \
+        --python_out=app/grpc_gen \
+        --grpc_python_out=app/grpc_gen \
+        /contract/operation.proto && \
+    sed -i 's/import operation_pb2/from app.grpc_gen import operation_pb2/' app/grpc_gen/operation_pb2_grpc.py && \
+    touch app/grpc_gen/__init__.py
+
 # Copy application code
-COPY . .
-COPY ../../.env
+COPY FrontEnd/app ./app
+
+# Copy pre-built C++ parser module
+COPY FrontEnd/cpp_lib/output/optisql_parser.cpython-310-x86_64-linux-gnu.so ./cpp_lib/output/
 
-# Expose port (will be read from config.yml)
+# Expose port
 EXPOSE 8000
 
-# Run the application
-CMD ["python", "-m", "app.main"]
+# Run the application with uvicorn
+CMD ["python", "-m", "uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000"]

src/FrontEnd/Makefile

@@ -0,0 +1,62 @@
+.PHONY: help setup test grpc-gen cpp-parser clean run
+
+PROTO_DIR := ../Contract
+GRPC_OUT := app/grpc_gen
+CPP_LIB := cpp_lib
+CONDA_ENV := optisql
+
+help:
+	@echo "Available targets:"
+	@echo "  make setup      - Setup conda environment and install dependencies"
+	@echo "  make test       - Run Python tests"
+	@echo "  make grpc-gen   - Generate gRPC Python code from proto files"
+	@echo "  make cpp-parser - Build the C++ parser Python module"
+	@echo "  make clean      - Clean generated files"
+	@echo "  make run        - Run the FastAPI server"
+	@echo "  make all        - Setup, build C++ parser, generate gRPC, and run tests"
+
+setup:
+	@echo "Setting up conda environment..."
+	@conda create -n $(CONDA_ENV) python=3.10 -y || true
+	@echo "Installing dependencies..."
+	conda run -n $(CONDA_ENV) pip install --upgrade pip
+	conda run -n $(CONDA_ENV) pip install -r requirements.txt
+	@echo "Setup complete! Activate with: conda activate $(CONDA_ENV)"
+
+test:
+	@echo "Running Python tests..."
+	conda run -n $(CONDA_ENV) pytest -v
+
+grpc-gen:
+	@echo "Generating gRPC Python code..."
+	@mkdir -p $(GRPC_OUT)
+	conda run -n $(CONDA_ENV) python -m grpc_tools.protoc \
+		-I$(PROTO_DIR) \
+		--python_out=$(GRPC_OUT) \
+		--grpc_python_out=$(GRPC_OUT) \
+		$(PROTO_DIR)/operation.proto
+	@echo "Fixing imports in generated files..."
+	@sed -i 's/import operation_pb2/from app.grpc_gen import operation_pb2/' $(GRPC_OUT)/operation_pb2_grpc.py 2>/dev/null || \
+		sed -i '' 's/import operation_pb2/from app.grpc_gen import operation_pb2/' $(GRPC_OUT)/operation_pb2_grpc.py
+	@echo "gRPC code generated in $(GRPC_OUT)"
+
+cpp-parser:
+	@echo "Building C++ parser Python module..."
+	$(MAKE) -C $(CPP_LIB) python
+
+cpp-test:
+	@echo "Running C++ parser tests..."
+	$(MAKE) -C $(CPP_LIB) test
+
+clean:
+	@echo "Cleaning generated files..."
+	rm -f $(GRPC_OUT)/operation_pb2.py $(GRPC_OUT)/operation_pb2_grpc.py
+	$(MAKE) -C $(CPP_LIB) clean
+	@echo "Clean complete!"
+
+run:
+	@echo "Starting FastAPI server..."
+	conda run -n $(CONDA_ENV) uvicorn app.main:app --reload --host 0.0.0.0 --port 8000
+
+all: setup cpp-parser grpc-gen test
+	@echo "All setup complete!"