f

Author: codelion

.github/workflows/test.yml

@@ -7,7 +7,7 @@ on:
     branches: [ main ]
 
 jobs:
-  test:
+  unit-tests:
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -35,77 +35,82 @@ jobs:
         pip install -r requirements.txt
         pip install -r tests/requirements.txt
     
-    - name: Run unit tests
+    - name: Run unit tests (no server required)
       run: |
         # Set up local inference environment
         export OPTILLM_API_KEY=optillm
         
-        # Run quick CI tests
+        # Run tests that don't need server - fast feedback!
         python tests/test_ci_quick.py
-        
-        # Run plugin tests with pytest if available
         python -m pytest tests/test_plugins.py -v --tb=short || python tests/test_plugins.py
-        
-        # Run approach tests
         python tests/test_approaches.py
-        
-        # Run reasoning token tests (unit tests only - no MLX)
         python tests/test_reasoning_simple.py
-        python tests/test_reasoning_tokens.py
-        python tests/test_reasoning_integration.py
-        
-        # Run batching tests (MLX tests auto-skipped on Ubuntu)
         python tests/test_batching.py
-        
-        # Run JSON plugin tests
-        python tests/test_json_plugin.py
-        
-        # Run n-parameter tests
-        python tests/test_n_parameter.py
-        
-        # Run API compatibility tests with pytest if available
-        python -m pytest tests/test_api_compatibility.py -v --tb=short || echo "API compatibility tests require pytest"
-        
-        # Run main test framework with basic tests
-        python tests/test.py --approaches none --single-test "Simple Math Problem"
       env:
         OPTILLM_API_KEY: optillm
 
-  integration-test:
+  integration-tests:
     runs-on: ubuntu-latest
-    needs: test
-    if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository
-    # Only run integration tests on PRs from the same repository (not forks)
-    # This ensures secrets are available
+    needs: unit-tests  # Only run if unit tests pass
+    strategy:
+      matrix:
+        python-version: ['3.12']
 
     steps:
     - uses: actions/checkout@v4
 
-    - name: Set up Python
+    - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4
       with:
-        python-version: '3.12'
+        python-version: ${{ matrix.python-version }}
+    
+    - name: Cache pip packages
+      uses: actions/cache@v3
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+        restore-keys: |
+          ${{ runner.os }}-pip-
     
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
         pip install -r requirements.txt
+        pip install -r tests/requirements.txt
     
-    - name: Run integration test with OpenAI
-      if: env.OPENAI_API_KEY != ''
+    - name: Start optillm server
       run: |
-        # Start OptILLM server
-        python optillm.py &
-        SERVER_PID=$!
-        
-        # Wait for server
-        sleep 5
+        echo "Starting optillm server for integration tests..."
+        OPTILLM_API_KEY=optillm python optillm.py --model google/gemma-3-270m-it --port 8000 &
+        echo $! > server.pid
         
-        # Run simple integration test
-        python tests/test.py --approaches none --single-test "Simple Math Problem" --base-url http://localhost:8000/v1 --model gpt-4o-mini || true
+        # Wait for server to be ready
+        echo "Waiting for server to start..."
+        sleep 15
         
-        # Stop server
-        kill $SERVER_PID || true
+        # Test server health
+        curl -s http://localhost:8000/health || echo "Server health check failed"
       env:
-        OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
-      continue-on-error: true
+        OPTILLM_API_KEY: optillm
+    
+    - name: Run integration tests (server required)
+      run: |
+        # Run tests that need the server
+        echo "Running tests that require optillm server..."
+        OPTILLM_API_KEY=optillm python tests/test_reasoning_tokens.py
+        OPTILLM_API_KEY=optillm python tests/test_reasoning_integration.py
+        OPTILLM_API_KEY=optillm python tests/test_json_plugin.py
+        OPTILLM_API_KEY=optillm python tests/test_n_parameter.py
+        OPTILLM_API_KEY=optillm python -m pytest tests/test_api_compatibility.py -v --tb=short || echo "API compatibility tests require pytest"
+        OPTILLM_API_KEY=optillm python tests/test.py --approaches none --single-test "Simple Math Problem"
+      env:
+        OPTILLM_API_KEY: optillm
+    
+    - name: Stop optillm server
+      if: always()
+      run: |
+        echo "Stopping optillm server..."
+        if [ -f server.pid ]; then
+          kill $(cat server.pid) || true
+        fi
+        sleep 2

tests/test_batching.py

@@ -348,14 +348,6 @@ def test_cli_arguments(self):
             self.assertTrue(args.batch_mode)
             self.assertEqual(args.batch_size, 8)
             self.assertEqual(args.batch_wait_ms, 25)
-    
-    @unittest.skipIf(not os.path.exists("/Users/asankhaya/Documents/GitHub/optillm/test_models"), 
-                     "Test models not available")
-    def test_end_to_end_batching(self):
-        """Test complete batching workflow"""
-        # This would test the full pipeline with actual models
-        # For now, we'll skip unless test models are available
-        pass
 
 
 class TestErrorHandling(unittest.TestCase):