Merge pull request #2951 from bluewave-labs/develop

Merge develop into master

Author: MuhammadKhalilzadeh

.dockerignore

@@ -0,0 +1,44 @@
+# Virtual environments (these caused the 1.3GB bloat)
+**/venv/
+**/.venv/
+**/ENV/
+**/env/
+
+# Python cache
+**/__pycache__/
+**/*.py[cod]
+**/*.pyo
+**/*.pyd
+**/.Python
+**/*.so
+**/*.egg-info/
+**/*.egg
+**/.eggs/
+
+# Node
+**/node_modules/
+**/.next/
+
+# Git
+.git/
+
+# IDE
+.idea/
+.vscode/
+**/*.swp
+**/*.swo
+
+# Logs and test artifacts
+**/*.log
+**/logs/
+**/.pytest_cache/
+**/.coverage
+**/htmlcov/
+**/.tox/
+
+# OS files
+**/.DS_Store
+**/Thumbs.db
+
+# Local environment files
+**/.env.local

Clients/src/presentation/pages/EvalsDashboard/NewExperimentModal.tsx

@@ -1981,8 +1981,17 @@ export default function NewExperimentModal({
       // Check conditional fields based on access method
       if (selectedModelProvider && 'needsUrl' in selectedModelProvider && selectedModelProvider.needsUrl && !config.model.endpointUrl) return false;
 
-      // Only require API key for custom_api (cloud providers use saved keys)
-      if (config.model.accessMethod === "custom_api" && !config.model.apiKey) return false;
+      // Providers that don't need API keys
+      const noApiKeyNeeded = ["ollama", "local"];
+      
+      // For all cloud providers (including custom_api), require either a saved API key OR an entered API key
+      if (!noApiKeyNeeded.includes(config.model.accessMethod)) {
+        // Map custom_api to "custom" for checking saved keys
+        const providerForKeyCheck = config.model.accessMethod === "custom_api" ? "custom" : config.model.accessMethod;
+        const hasSavedKey = hasApiKey(providerForKeyCheck);
+        const hasEnteredKey = !!config.model.apiKey;
+        if (!hasSavedKey && !hasEnteredKey) return false;
+      }
 
       return true;
     }

EvalServer/Dockerfile

@@ -6,8 +6,9 @@ WORKDIR /app
 # Copy requirements first for better caching
 COPY ./EvalServer/src/requirements.txt requirements.txt
 
-# Install CPU-only PyTorch first (much smaller, no triton/CUDA), then other deps
-RUN pip install --no-cache-dir torch --index-url https://download.pytorch.org/whl/cpu && \
+# Install CPU-only PyTorch first (forces CPU wheel, no triton/CUDA)
+# Then install remaining dependencies from PyPI
+RUN pip install --no-cache-dir torch==2.5.1 --index-url https://download.pytorch.org/whl/cpu && \
     pip install --no-cache-dir -r requirements.txt
 
 # Copy the application source

EvalServer/src/requirements.txt

@@ -17,8 +17,6 @@ deepeval==3.7.0
 distro==1.9.0
 docstring_parser==0.17.0
 eval_type_backport==0.2.2
-execnet==2.1.1
-fairlearn==0.13.0
 fastapi==0.121.0
 filelock==3.20.1
 frozenlist==1.8.0
@@ -43,11 +41,9 @@ httpx==0.28.1
 huggingface-hub==0.36.0
 idna==3.11
 importlib_metadata==8.7.0
-iniconfig==2.3.0
 invoke==2.2.1
 Jinja2==3.1.6
 jiter==0.11.1
-joblib==1.5.2
 Mako==1.3.10
 markdown-it-py==4.0.0
 MarkupSafe==3.0.3
@@ -61,18 +57,10 @@ networkx==3.4.2
 numpy==2.2.6
 ollama==0.6.0
 openai==2.7.1
-opentelemetry-api==1.38.0
-opentelemetry-exporter-otlp-proto-common==1.38.0
-opentelemetry-exporter-otlp-proto-grpc==1.38.0
-opentelemetry-proto==1.38.0
-opentelemetry-sdk==1.38.0
-opentelemetry-semantic-conventions==0.59b0
 packaging==25.0
 pandas==2.3.3
 passlib==1.7.4
-pluggy==1.6.0
 portalocker==3.2.0
-posthog==5.4.0
 propcache==0.4.1
 proto-plus==1.26.1
 protobuf==5.29.5
@@ -82,15 +70,9 @@ pyasn1_modules==0.4.2
 pydantic==2.12.3
 pydantic-settings==2.11.0
 pydantic_core==2.41.4
-pyfiglet==1.0.4
 Pygments==2.19.2
 PyJWT==2.10.1
 pyparsing==3.2.5
-pytest==8.4.2
-pytest-asyncio==1.2.0
-pytest-repeat==0.9.4
-pytest-rerunfailures==12.0
-pytest-xdist==3.8.0
 python-dateutil==2.9.0.post0
 python-dotenv==1.2.1
 python-multipart==0.0.20
@@ -102,9 +84,6 @@ requests==2.32.5
 rich==14.2.0
 rsa==4.9.1
 safetensors==0.6.2
-scikit-learn==1.7.2
-scipy==1.15.3
-sentry-sdk==2.43.0
 setuptools==80.9.0
 shellingham==1.5.4
 six==1.17.0
@@ -116,7 +95,7 @@ tabulate==0.9.0
 tenacity==9.1.2
 threadpoolctl==3.6.0
 tokenizers==0.22.1
-torch==2.9.0
+# torch installed separately in Dockerfile (CPU-only)
 tqdm==4.67.1
 transformers==4.57.1
 typer==0.20.0