Resolve merge conflicts

.gitattributes

@@ -2,4 +2,4 @@
 *.md linguist-language=Markdown
 *.txt linguist-language=Text
 *.yml linguist-language=YAML
-*.yaml linguist-language=YAML 
+*.yaml linguist-language=YAML

.github/workflows/test.yml

@@ -1,31 +0,0 @@
-name: Python Tests
-
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: [3.9, 3.10]
-
-    steps:
-    - uses: actions/checkout@v3
-    
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
-      with:
-        python-version: ${{ matrix.python-version }}
-    
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install -r requirements.txt
-    
-    - name: Run tests
-      run: |
-        pytest test_calculator.py -v 

README.md

@@ -85,4 +85,4 @@ The application handles various error cases:
 Feel free to submit issues and enhancement requests!
 
 ## License
-This project is licensed under the MIT License - see the LICENSE file for details. 
+This project is licensed under the MIT License - see the LICENSE file for details.

backend.py

@@ -1,37 +0,0 @@
-from fastapi import FastAPI
-from pydantic import BaseModel
-from typing import Union
-
-app = FastAPI()
-
-class CalculatorInput(BaseModel):
-    num1: float
-    num2: float
-    operation: str
-
-class CalculatorResponse(BaseModel):
-    result: float
-    operation: str
-
-@app.post("/calculate", response_model=CalculatorResponse)
-async def calculate(input_data: CalculatorInput):
-    result = 0.0
-    
-    if input_data.operation == "add":
-        result = input_data.num1 + input_data.num2
-    elif input_data.operation == "subtract":
-        result = input_data.num1 - input_data.num2
-    elif input_data.operation == "multiply":
-        result = input_data.num1 * input_data.num2
-    elif input_data.operation == "divide":
-        if input_data.num2 == 0:
-            raise ValueError("Cannot divide by zero")
-        result = input_data.num1 / input_data.num2
-    else:
-        raise ValueError("Invalid operation")
-    
-    return CalculatorResponse(result=result, operation=input_data.operation)
-
-if __name__ == "__main__":
-    import uvicorn
-    uvicorn.run(app, host="0.0.0.0", port=8000) 

test_calculator.py

@@ -1,48 +0,0 @@
-import pytest
-from fastapi.testclient import TestClient
-from backend import app
-
-client = TestClient(app)
-
-def test_addition():
-    response = client.post(
-        "/calculate",
-        json={"num1": 5, "num2": 3, "operation": "add"}
-    )
-    assert response.status_code == 200
-    assert response.json()["result"] == 8
-    assert response.json()["operation"] == "add"
-
-def test_subtraction():
-    response = client.post(
-        "/calculate",
-        json={"num1": 5, "num2": 3, "operation": "subtract"}
-    )
-    assert response.status_code == 200
-    assert response.json()["result"] == 2
-    assert response.json()["operation"] == "subtract"
-
-def test_multiplication():
-    response = client.post(
-        "/calculate",
-        json={"num1": 5, "num2": 3, "operation": "multiply"}
-    )
-    assert response.status_code == 200
-    assert response.json()["result"] == 15
-    assert response.json()["operation"] == "multiply"
-
-def test_division():
-    response = client.post(
-        "/calculate",
-        json={"num1": 6, "num2": 2, "operation": "divide"}
-    )
-    assert response.status_code == 200
-    assert response.json()["result"] == 3
-    assert response.json()["operation"] == "divide"
-
-def test_division_by_zero():
-    response = client.post(
-        "/calculate",
-        json={"num1": 5, "num2": 0, "operation": "divide"}
-    )
-    assert response.status_code == 422  # FastAPI returns 422 for validation errors