Fixes docker files and updates typer dep. (#39)

Author: iAviPro

.dockerignore

@@ -26,27 +26,32 @@ htmlcov/
 coverage.xml
 *.cover
 .hypothesis/
-.pytest_cache/
+tests/
+pytest.ini
+requirements-test.txt
 
 # Build artifacts
 build/
 dist/
 *.egg-info/
 .eggs/
 
-# Temporary files
+# Temporary files and data
 temp_cloned_repos/
 chroma_data/
+chroma_data_prod/
+testteller_generated_tests/
+testteller_automated_tests/
+sample-outputs/
 *.tmp
 *.log
 
-# Documentation (keep essential docs)
+# Documentation (keep only essential)
 docs/
+iavipro/
 *.md
-\!README.md
-\!CHANGELOG.md
-\!high-level-design-diagram.md
-\!TESTING.md
+!README.md
+!MANIFEST.in
 
 # OS files
 .DS_Store
@@ -57,22 +62,16 @@ Thumbs.db
 .vscode/
 .idea/
 
-# Node modules (if any)
-node_modules/
-
-# Generated outputs (keep samples for reference)
-testteller_generated_tests/
-testteller_automated_tests/
-test_*/
-
-# Development and configuration files
+# Development files
 .pre-commit-config.yaml
 .github/
-.git/
-.gitignore
 tox.ini
 setup.cfg
+test.env
+docker-compose.test.yml
+docker-test.sh
+DOCKER_TEST_CHECKLIST.md
 
-# Keep essential architecture documentation in container
-\!iavipro/ARCHITECTURE.md
-\!iavipro/FEEDBACK_LOOP_ARCHITECTURE.md
+# Optimization files
+Dockerfile.optimized
+docker/

.env.example

@@ -38,7 +38,13 @@ CLAUDE_GENERATION_MODEL=claude-3-5-haiku-20241022
 # No API key required - runs locally
 LLAMA_EMBEDDING_MODEL=llama3.2:1b
 LLAMA_GENERATION_MODEL=llama3.2:3b
-OLLAMA_BASE_URL=http://localhost:11434
+
+# OLLAMA_BASE_URL configuration depends on where Ollama is running:
+# 1. Ollama on Docker host machine (default): http://host.docker.internal:11434
+# 2. Ollama in docker-compose.yml service: http://ollama:11434
+# 3. Ollama on remote network: http://<IP_OR_HOSTNAME>:11434
+# 4. For local development (not Docker): http://localhost:11434
+OLLAMA_BASE_URL=http://host.docker.internal:11434
 
 # =============================================================================
 # OPTIONAL CONFIGURATIONS
@@ -183,3 +189,21 @@ API_RETRY_WAIT_SECONDS=2
 #   ollama serve
 #   ollama pull llama3.2:3b
 #   ollama pull llama3.2:1b
+#
+# OLLAMA DEPLOYMENT OPTIONS:
+# 
+# Option 1: Ollama on host machine (recommended for development)
+#   - Install Ollama on your host machine
+#   - Set OLLAMA_BASE_URL=http://host.docker.internal:11434
+#
+# Option 2: Ollama in Docker Compose (recommended for production)
+#   - Uncomment the ollama service in docker-compose.yml
+#   - Set OLLAMA_BASE_URL=http://ollama:11434
+#   - Run: docker-compose up -d
+#
+# Option 3: Ollama on remote server
+#   - Set OLLAMA_BASE_URL=http://your-ollama-server.com:11434
+#   - Ensure the remote server is accessible from Docker network
+#
+# Option 4: Local development without Docker
+#   - Set OLLAMA_BASE_URL=http://localhost:11434

Dockerfile

@@ -1,206 +1,112 @@
-# TestTeller Agent - Dual-Feedback RAG Architecture
-# Multi-stage Docker build for next-generation AI-powered test automation platform
-# Build stage
-FROM ubuntu:22.04 AS builder
+# TestTeller Agent - Optimized Docker Build
+# Multi-stage build optimized for minimal size
+FROM python:3.11-slim AS builder
 
-# Set environment variables
+# Build-time environment variables
 ENV PYTHONDONTWRITEBYTECODE=1 \
     PYTHONUNBUFFERED=1 \
-    PYTHONPATH=/app \
     PIP_NO_CACHE_DIR=1 \
-    DEBIAN_FRONTEND=noninteractive
+    PIP_DISABLE_PIP_VERSION_CHECK=1
 
-# Set the working directory
 WORKDIR /app
 
-# Install Python and build dependencies
-RUN apt-get update && apt-get upgrade -y && \
-    apt-get install -y --no-install-recommends \
-    python3.11 \
-    python3.11-venv \
-    python3.11-dev \
-    python3-pip \
+# Install only essential build dependencies
+RUN apt-get update && apt-get install -y --no-install-recommends \
     gcc \
+    g++ \
     libpoppler-cpp-dev \
     pkg-config \
-    sqlite3 \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* \
-    && sqlite3 --version
-
-# Create and activate virtual environment
-RUN python3.11 -m venv /opt/venv
-ENV PATH="/opt/venv/bin:$PATH"
-
-# Copy only requirements first for better caching
-COPY requirements.txt .
-COPY setup.py .
-COPY README.md .
-COPY MANIFEST.in .
-COPY pyproject.toml .
-COPY testteller/ testteller/
+    && rm -rf /var/lib/apt/lists/*
+
+# Copy requirements and install Python dependencies
+COPY requirements.txt pyproject.toml README.md MANIFEST.in ./
+RUN pip install --no-cache-dir --user -r requirements.txt
 
-# Install dependencies and package in development mode
-RUN pip install --no-cache-dir -r requirements.txt && \
-    pip install -e .
+# Copy source and install package
+COPY testteller/ testteller/
+RUN pip install --no-cache-dir --user -e .
 
-# Final stage
-FROM ubuntu:22.04
+# Final stage - minimal runtime image
+FROM python:3.11-slim
 
-# Set environment variables
+# Runtime environment variables
 ENV PYTHONDONTWRITEBYTECODE=1 \
     PYTHONUNBUFFERED=1 \
     PYTHONPATH=/app \
-    PATH="/opt/venv/bin:$PATH" \
-    DEBIAN_FRONTEND=noninteractive
+    PATH="/home/testteller/.local/bin:$PATH"
 
 WORKDIR /app
 
-# Install runtime dependencies
-RUN apt-get update && apt-get upgrade -y && \
-    apt-get install -y --no-install-recommends \
-    python3.11 \
-    libpoppler-cpp-dev \
+# Install only essential runtime dependencies
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    libpoppler-cpp0v5 \
     tesseract-ocr \
-    git \
-    wget \
-    curl \
     sqlite3 \
-    && apt-get clean \
+    curl \
+    git \
     && rm -rf /var/lib/apt/lists/* \
-    && sqlite3 --version
-
-# Copy virtual environment from builder
-COPY --from=builder /opt/venv /opt/venv
-
-# Create necessary directories with proper permissions
-RUN mkdir -p /app/chroma_data \
-    /app/temp_cloned_repos \
-    /app/testteller_generated_tests \
-    /app/testteller_automated_tests \
-    && chmod -R 777 /app/chroma_data \
-    && chmod -R 777 /app/temp_cloned_repos \
-    && chmod -R 777 /app/testteller_generated_tests \
-    && chmod -R 777 /app/testteller_automated_tests
-
-# Create entrypoint script with multi-LLM support and improved error handling
+    && apt-get autoremove -y \
+    && apt-get autoclean
+
+# Create non-root user
+RUN useradd -m -u 1000 testteller
+
+# Copy Python packages from builder
+COPY --from=builder --chown=testteller:testteller /root/.local /home/testteller/.local
+
+# Copy application files
+COPY --from=builder --chown=testteller:testteller /app/testteller /app/testteller
+COPY --from=builder --chown=testteller:testteller /app/pyproject.toml /app/
+
+# Create necessary directories
+RUN mkdir -p /app/{chroma_data,temp_cloned_repos,testteller_generated_tests,testteller_automated_tests} \
+    && chown -R testteller:testteller /app
+
+# Create optimized entrypoint script inline
 RUN echo '#!/bin/bash\n\
-    set -e\n\
-    \n\
-    # Function to check ChromaDB health\n\
-    check_chromadb_health() {\n\
-    for i in {1..30}; do\n\
-    if curl -s -f http://chromadb:8000/api/v1/heartbeat > /dev/null; then\n\
-    return 0\n\
-    fi\n\
-    echo "Waiting for ChromaDB to be ready... ($i/30)"\n\
-    sleep 2\n\
+set -e\n\
+\n\
+check_chromadb_health() {\n\
+    for i in {1..15}; do\n\
+        if curl -s -f http://chromadb:8000/api/v1/heartbeat > /dev/null 2>&1; then\n\
+            return 0\n\
+        fi\n\
+        echo "Waiting for ChromaDB... ($i/15)"\n\
+        sleep 2\n\
     done\n\
-    echo "ChromaDB is not ready after 60 seconds"\n\
+    echo "ChromaDB unavailable after 30s"\n\
     return 1\n\
-    }\n\
-    \n\
-    # Function to validate environment based on LLM provider\n\
-    validate_environment() {\n\
+}\n\
+\n\
+validate_environment() {\n\
     local provider=${LLM_PROVIDER:-gemini}\n\
-    echo "Validating environment for LLM provider: $provider"\n\
-    \n\
     case "$provider" in\n\
-    "gemini")\n\
-    if [ -z "$GOOGLE_API_KEY" ]; then\n\
-    echo "Error: GOOGLE_API_KEY is required for Gemini provider"\n\
-    return 1\n\
-    fi\n\
-    ;;\n\
-    "openai")\n\
-    if [ -z "$OPENAI_API_KEY" ]; then\n\
-    echo "Error: OPENAI_API_KEY is required for OpenAI provider"\n\
-    return 1\n\
-    fi\n\
-    ;;\n\
-    "claude")\n\
-    if [ -z "$CLAUDE_API_KEY" ]; then\n\
-    echo "Error: CLAUDE_API_KEY is required for Claude provider"\n\
-    return 1\n\
-    fi\n\
-    if [ -z "$OPENAI_API_KEY" ]; then\n\
-    echo "Error: OPENAI_API_KEY is also required for Claude provider (for embeddings)"\n\
-    return 1\n\
-    fi\n\
-    ;;\n\
-    "llama")\n\
-    echo "Note: Llama provider uses local Ollama - no API key required"\n\
-    echo "Make sure OLLAMA_BASE_URL is properly configured: ${OLLAMA_BASE_URL:-http://localhost:11434}"\n\
-    ;;\n\
-    *)\n\
-    echo "Error: Unsupported LLM provider: $provider"\n\
-    echo "Supported providers: gemini, openai, claude, llama"\n\
-    return 1\n\
-    ;;\n\
+        "gemini") [ -n "$GOOGLE_API_KEY" ] || { echo "Error: GOOGLE_API_KEY required"; return 1; };;\n\
+        "openai") [ -n "$OPENAI_API_KEY" ] || { echo "Error: OPENAI_API_KEY required"; return 1; };;\n\
+        "claude") \n\
+            [ -n "$CLAUDE_API_KEY" ] || { echo "Error: CLAUDE_API_KEY required"; return 1; }\n\
+            [ -n "$OPENAI_API_KEY" ] || { echo "Error: OPENAI_API_KEY also required"; return 1; };;\n\
+        "llama") echo "Using Ollama at ${OLLAMA_BASE_URL:-http://host.docker.internal:11434}";;\n\
+        *) echo "Error: Unsupported provider: $provider"; return 1;;\n\
     esac\n\
-    echo "Environment validation passed for $provider provider"\n\
-    }\n\
-    \n\
-    # Function to display configuration info\n\
-    display_config_info() {\n\
-    echo "=== TestTeller Configuration ==="\n\
-    echo "LLM Provider: ${LLM_PROVIDER:-gemini}"\n\
-    echo "ChromaDB Host: ${CHROMA_DB_HOST:-chromadb}"\n\
-    echo "Default Collection: ${DEFAULT_COLLECTION_NAME:-test_documents}"\n\
-    echo "Log Level: ${LOG_LEVEL:-INFO}"\n\
-    echo "================================"\n\
-    }\n\
-    \n\
-    if [ "$1" = "serve" ]; then\n\
-    display_config_info\n\
-    echo "🤖 TestTeller Agent - Dual-Feedback RAG Architecture"\n\
-    echo "Next-generation self-improving test automation platform"\n\
-    echo ""\n\
-    echo "Container is running. Use one of the following commands:"\n\
-    echo "  docker-compose exec app testteller --help"\n\
-    echo "  docker-compose exec app testteller configure"\n\
-    echo ""\n\
-    echo "📚 RAG-Enhanced Workflows:"\n\
-    echo "  # Ingest with enhanced parsing"\n\
-    echo "  docker-compose exec app testteller ingest-docs doc.pdf -c collection -e"\n\
-    echo "  # Generate with self-learning feedback"\n\
-    echo "  docker-compose exec app testteller generate \"API tests\" -c collection"\n\
-    echo "  # Automate with context discovery"\n\
-    echo "  docker-compose exec app testteller automate tests.md -c collection -l python -F pytest"\n\
-    echo ""\n\
-    echo "🔧 Multi-LLM Support:"\n\
-    echo "  Set LLM_PROVIDER: gemini (default), openai, claude, llama"\n\
-    echo "  Configure API keys based on your chosen provider"\n\
-    echo ""\n\
-    echo "🔄 Feedback Loop: ${ENABLE_TEST_CASE_FEEDBACK:-true} | Quality Threshold: ${MIN_QUALITY_SCORE_FOR_STORAGE:-0.7}"\n\
-    # Keep container running\n\
+}\n\
+\n\
+if [ "$1" = "serve" ]; then\n\
+    echo "🤖 TestTeller Agent - Optimized Container"\n\
+    echo "Provider: ${LLM_PROVIDER:-gemini} | ChromaDB: ${CHROMA_DB_HOST:-chromadb}"\n\
     tail -f /dev/null\n\
-    else\n\
-    # Validate environment\n\
+else\n\
     validate_environment\n\
-    # Check ChromaDB health before running commands\n\
     check_chromadb_health\n\
-    # Unset GITHUB_TOKEN if empty to avoid validation errors\n\
-    if [ -z "$GITHUB_TOKEN" ]; then\n\
-    unset GITHUB_TOKEN\n\
-    fi\n\
-    # Run the command\n\
+    [ -z "$GITHUB_TOKEN" ] && unset GITHUB_TOKEN\n\
     python -m testteller.main "$@"\n\
-    fi' > /app/entrypoint.sh && \
-    chmod +x /app/entrypoint.sh
-
-# Copy the application code
-COPY . .
+fi' > /app/entrypoint.sh && chmod +x /app/entrypoint.sh
 
-# Create a non-root user and switch to it
-RUN useradd -m -u 1000 testteller && \
-    chown -R testteller:testteller /app
 USER testteller
 
-# Add healthcheck
-HEALTHCHECK --interval=30s --timeout=10s --start-period=30s --retries=3 \
+# Minimal healthcheck
+HEALTHCHECK --interval=60s --timeout=10s --start-period=30s --retries=2 \
     CMD curl -f http://chromadb:8000/api/v1/heartbeat || exit 1
 
-# Set the entrypoint
 ENTRYPOINT ["/app/entrypoint.sh"]
 CMD ["serve"]