Merge pull request #2 from deepset-ai/chore/application_structure

chore: migrate to application structure

Author: mathislucka

Dockerfile

@@ -14,7 +14,7 @@ COPY pyproject.toml uv.lock .
 RUN uv sync
 
 # Copy the rest of the application code
-COPY main.py .
+COPY src .
 
 # Make port 8000 available to the world outside this container
 # Assuming FastMCP runs on port 8000 by default (common for FastAPI/Uvicorn)
@@ -27,10 +27,4 @@ ENV DEEPSET_WORKSPACE=""
 # Set PYTHONUNBUFFERED to ensure logs are output immediately
 ENV PYTHONUNBUFFERED=1
 
-# Run main.py using uv when the container launches
-# Assumes main.py calls mcp.run(host="0.0.0.0", port=8000)
-CMD ["uv", "run", "mcp", "run", "main.py"]
-
-# Alternative CMD if main.py directly runs the server using mcp.run()
-# CMD ["python", "main.py"]
-# Note: If using 'python main.py', ensure mcp.run() binds to 0.0.0.0 
+CMD ["uv", "run", "deepset-mcp"]

pyproject.toml

@@ -10,3 +10,20 @@ dependencies = [
     "requests>=2.32.3",
     "uvicorn>=0.34.2",
 ]
+
+[project.scripts]
+deepset-mcp = "deepset_mcp.main:launch_mcp"
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[dependency-groups]
+dev = [
+  "pytest"
+]
+
+[tool.pytest.ini_options]
+testpaths = ["test"]
+
+

src/deepset_mcp/__init__.py

@@ -539,7 +539,9 @@ def list_custom_component_installations() -> str:
     except Exception as e:
         return f"Error retrieving custom component installations: {str(e)}"
 
+
+def launch_mcp() -> None:
+    mcp.run()
+
 if __name__ == "__main__":
-    # Using the built-in server runner
-    # Ensure it binds to 0.0.0.0 to be accessible in Docker
-    mcp.run()
+    launch_mcp()

main.py src/deepset_mcp/main.pymain.py renamed to src/deepset_mcp/main.py

@@ -4,7 +4,7 @@
 import os
 
 # Assuming your main code is in main.py
-from main import update_pipeline_yaml, DEEPSET_API_BASE_URL
+from deepset_mcp.main import update_pipeline_yaml, DEEPSET_API_BASE_URL
 
 # --- Test Data ---
 TEST_WORKSPACE = "test-workspace"
@@ -42,7 +42,7 @@ def create_mock_response(status_code, json_data=None, text_data=None):
 # --- Test Cases ---
 
 @mock.patch.dict(os.environ, {"DEEPSET_WORKSPACE": TEST_WORKSPACE, "DEEPSET_API_KEY": TEST_API_KEY})
-@mock.patch('main.requests.put') # Mock requests.put used in update_pipeline_yaml
+@mock.patch('deepset_mcp.main.requests.put') # Mock requests.put used in update_pipeline_yaml
 def test_update_pipeline_yaml_success_json_response(mock_put):
     """Tests successful update with JSON response."""
     mock_response = create_mock_response(200, json_data={"status": "success", "message": "Updated"})
@@ -64,7 +64,7 @@ def test_update_pipeline_yaml_success_json_response(mock_put):
     assert result == {"status": "success", "message": "Updated"}
 
 @mock.patch.dict(os.environ, {"DEEPSET_WORKSPACE": TEST_WORKSPACE, "DEEPSET_API_KEY": TEST_API_KEY})
-@mock.patch('main.requests.put')
+@mock.patch('deepset_mcp.main.requests.put')
 def test_update_pipeline_yaml_success_empty_response(mock_put):
     """Tests successful update with empty response body."""
     mock_response = create_mock_response(200, text_data="") # Empty body
@@ -78,7 +78,7 @@ def test_update_pipeline_yaml_success_empty_response(mock_put):
     assert result == {"status": "success", "message": "Pipeline YAML updated successfully (empty response body)"}
 
 @mock.patch.dict(os.environ, {"DEEPSET_WORKSPACE": TEST_WORKSPACE, "DEEPSET_API_KEY": TEST_API_KEY})
-@mock.patch('main.requests.put')
+@mock.patch('deepset_mcp.main.requests.put')
 def test_update_pipeline_yaml_api_error_422_json(mock_put):
     """Tests API error (422) with JSON details."""
     error_details = {"detail": [{"type": "validation_error", "msg": "Something is wrong"}]}
@@ -94,7 +94,7 @@ def test_update_pipeline_yaml_api_error_422_json(mock_put):
     }
 
 @mock.patch.dict(os.environ, {"DEEPSET_WORKSPACE": TEST_WORKSPACE, "DEEPSET_API_KEY": TEST_API_KEY})
-@mock.patch('main.requests.put')
+@mock.patch('deepset_mcp.main.requests.put')
 def test_update_pipeline_yaml_api_error_500_text(mock_put):
     """Tests API error (500) with non-JSON text details."""
     error_text = "Internal Server Error"
@@ -110,7 +110,7 @@ def test_update_pipeline_yaml_api_error_500_text(mock_put):
     }
 
 @mock.patch.dict(os.environ, {"DEEPSET_WORKSPACE": TEST_WORKSPACE, "DEEPSET_API_KEY": TEST_API_KEY})
-@mock.patch('main.requests.put')
+@mock.patch('deepset_mcp.main.requests.put')
 def test_update_pipeline_yaml_request_exception(mock_put):
     """Tests network request failure."""
     mock_put.side_effect = requests.exceptions.RequestException("Connection timed out")
@@ -122,15 +122,15 @@ def test_update_pipeline_yaml_request_exception(mock_put):
     assert "Request failed: Connection timed out" in result["error"]
 
 @mock.patch.dict(os.environ, {"DEEPSET_WORKSPACE": TEST_WORKSPACE, "DEEPSET_API_KEY": TEST_API_KEY})
-@mock.patch('main.requests.put') # Still need to mock put, even if not called
+@mock.patch('deepset_mcp.main.requests.put') # Still need to mock put, even if not called
 def test_update_pipeline_yaml_empty_content(mock_put):
     """Tests the function's validation for empty YAML content."""
     result = update_pipeline_yaml(TEST_PIPELINE_NAME, "")
     assert result == {"error": "Empty YAML content provided"}
     mock_put.assert_not_called() # Ensure API wasn't called
 
 @mock.patch.dict(os.environ, {"DEEPSET_WORKSPACE": TEST_WORKSPACE, "DEEPSET_API_KEY": TEST_API_KEY})
-@mock.patch('main.requests.put')
+@mock.patch('deepset_mcp.main.requests.put')
 def test_update_pipeline_yaml_invalid_structure(mock_put):
     """Tests the function's validation for missing 'components:'."""
     result = update_pipeline_yaml(TEST_PIPELINE_NAME, INVALID_YAML_CONTENT_NO_COMPONENTS)