Virtual environment & kernel changes

Author: simonkurtz-MSFT

.devcontainer/Dockerfile

@@ -47,15 +47,11 @@ RUN /usr/local/bin/python3.12 -m venv /tmp/venv-template && \
         requests setuptools pandas matplotlib pyjwt pytest pytest-cov \
         azure.storage.blob azure.identity jupyter ipykernel notebook
 
-# Configure shell to auto-activate virtual environment
-RUN echo "# Auto-activate APIM Samples virtual environment" >> ~/.bashrc && \
-    echo "if [ -f /workspaces/Apim-Samples/.venv/bin/activate ]; then" >> ~/.bashrc && \
-    echo "    source /workspaces/Apim-Samples/.venv/bin/activate" >> ~/.bashrc && \
-    echo "fi" >> ~/.bashrc && \
-    echo "# Auto-activate APIM Samples virtual environment" >> ~/.zshrc && \
-    echo "if [ -f /workspaces/Apim-Samples/.venv/bin/activate ]; then" >> ~/.zshrc && \
-    echo "    source /workspaces/Apim-Samples/.venv/bin/activate" >> ~/.zshrc && \
-    echo "fi" >> ~/.zshrc && \
+# Configure shell environment and helpful aliases (without auto-activating venv)
+RUN echo "# Add user local bin to PATH for Jupyter and other tools" >> ~/.bashrc && \
+    echo "export PATH=\$PATH:/home/vscode/.local/bin" >> ~/.bashrc && \
+    echo "# Add user local bin to PATH for Jupyter and other tools" >> ~/.zshrc && \
+    echo "export PATH=\$PATH:/home/vscode/.local/bin" >> ~/.zshrc && \
     # Add helpful aliases
     echo "alias ll='ls -alF'" >> ~/.bashrc && \
     echo "alias la='ls -A'" >> ~/.bashrc && \
@@ -72,7 +68,8 @@ HEALTHCHECK --interval=60s --timeout=5s --start-period=10s --retries=2 \
 # Add labels for maintainability
 LABEL maintainer="APIM Samples Team" \
       description="Optimized dev container for Azure API Management samples with Codespaces prebuild support" \
-      version="2.2" \
+      version="2.3" \
       python.version="3.12" \
       debian.version="bookworm" \
-      venv.location="/workspaces/Apim-Samples/.venv"
+      venv.location="/workspaces/Apim-Samples/.venv" \
+      note="VS Code Python extension handles venv activation to avoid duplicate prompts"

.devcontainer/devcontainer.json

@@ -110,7 +110,8 @@
     }
   },
   "containerEnv": {
-    "PYTHONPATH": "/workspaces/Apim-Samples/shared/python:/workspaces/Apim-Samples"
+    "PYTHONPATH": "/workspaces/Apim-Samples/shared/python:/workspaces/Apim-Samples",
+    "PATH": "/workspaces/Apim-Samples/.venv/bin:/home/vscode/.local/bin:${PATH}"
   },
   // Container lifecycle commands for optimal Codespaces prebuild performance: https://containers.dev/implementors/features/#lifecycle-hooks
   // 1. onCreateCommand: Runs only once during initial prebuild - creates venv
@@ -122,7 +123,7 @@
   ],
   "updateContentCommand": [
     "bash", "-c",
-    "echo '📦 Installing/updating Python packages from requirements.txt...' && source /workspaces/Apim-Samples/.venv/bin/activate && pip install -r requirements.txt && pip install pytest pytest-cov coverage ipykernel && echo '✅ Python packages installed/updated' && python setup/setup_python_path.py --generate-env && echo '✅ Environment configuration updated' && echo '🔧 Registering Jupyter kernel...' && python -m ipykernel install --user --name=apim-samples --display-name='APIM Samples Python 3.12' && echo '✅ Jupyter kernel registered' && echo '⚙️ Configuring Azure CLI...' && az config set core.login_experience_v2=off 2>/dev/null || true && az extension add --name containerapp --only-show-errors 2>/dev/null || true && az extension add --name front-door --only-show-errors 2>/dev/null || true && echo '✅ Azure CLI configured for Codespaces'"
+    "echo '📦 Installing/updating Python packages from requirements.txt...' && source /workspaces/Apim-Samples/.venv/bin/activate && pip install -r requirements.txt && pip install pytest pytest-cov coverage ipykernel && echo '✅ Python packages installed/updated' && python setup/setup_python_path.py --generate-env && echo '✅ Environment configuration updated' && echo '🔧 Registering Jupyter kernel...' && python -m ipykernel install --user --name=apim-samples --display-name='APIM Samples Python 3.12' --python=$(which python) && jupyter kernelspec list | grep apim-samples && echo '✅ Jupyter kernel registered successfully' && echo '⚙️ Configuring Azure CLI...' && az config set core.login_experience_v2=off 2>/dev/null || true && az extension add --name containerapp --only-show-errors 2>/dev/null || true && az extension add --name front-door --only-show-errors 2>/dev/null || true && echo '✅ Azure CLI configured for Codespaces'"
   ],
   "postStartCommand": [
     "bash", "-c", 

.devcontainer/post-start-setup.sh

@@ -12,7 +12,7 @@ echo "==========================================================================
 echo "                    🚀 APIM SAMPLES - INSTANT VERIFICATION                "
 echo "============================================================================"
 echo ""
-echo "⚡ All heavy setup completed during prebuild - verifying environment..."
+echo "⚡ All heavy setup was completed during prebuild - verifying environment..."
 echo ""
 
 # ------------------------------
@@ -55,8 +55,14 @@ if jupyter kernelspec list 2>/dev/null | grep -q "apim-samples"; then
     echo "   ✅ Jupyter kernel"
 else
     echo "   ⚠️  Jupyter kernel missing (fallback registration...)"
-    python -m ipykernel install --user --name=apim-samples --display-name="APIM Samples Python 3.12" >/dev/null 2>&1
-    echo "   ✅ Jupyter kernel registered"
+    # Ensure we're using the right virtual environment
+    source /workspaces/Apim-Samples/.venv/bin/activate 2>/dev/null || true
+    python -m ipykernel install --user --name=apim-samples --display-name="APIM Samples Python 3.12" --python="$(which python)" >/dev/null 2>&1
+    if jupyter kernelspec list 2>/dev/null | grep -q "apim-samples"; then
+        echo "   ✅ Jupyter kernel registered"
+    else
+        echo "   ⚠️  Jupyter kernel registration failed - using default kernel"
+    fi
 fi
 
 # Calculate total duration