Fix lint errors

Author: keyurva

packages/datacommons-mcp/datacommons_mcp/app.py

@@ -36,8 +36,6 @@
 SERVER_INSTRUCTION_FILE = "server.md"
 
 
-
-
 class DCApp:
     """Core application wrapper for Data Commons MCP."""
 
@@ -95,17 +93,20 @@ def _load_instruction(self, filename: str) -> str:
         # Fallback to package resources
         return read_package_content(DEFAULT_INSTRUCTIONS_PACKAGE, filename)
 
-
     def register_tool(self, func: Callable[..., Any], instruction_file: str) -> None:
         """Register a tool with instructions loaded from a file.
-        
+
         Args:
             func: The tool function to register.
             instruction_file: Path to instruction file relative to instructions dir.
         """
         description = self._load_instruction(instruction_file)
         if not description:
-             logger.warning("No description found for tool %s from file %s", func.__name__, instruction_file)
+            logger.warning(
+                "No description found for tool %s from file %s",
+                func.__name__,
+                instruction_file,
+            )
 
         # Create tool from function and add description
         tool = Tool.from_function(func, description=description)

packages/datacommons-mcp/datacommons_mcp/server.py

@@ -17,11 +17,9 @@
 
 import logging
 
-from fastmcp import FastMCP
 from starlette.requests import Request
 from starlette.responses import JSONResponse
 
-import datacommons_mcp.settings as settings
 import datacommons_mcp.tools as tools
 from datacommons_mcp.app import app
 from datacommons_mcp.version import __version__

packages/datacommons-mcp/datacommons_mcp/utils.py

@@ -108,7 +108,7 @@ def read_external_content(base_path: str, filename: str) -> str | None:
     Example:
         >>> content = read_external_content("/path/to/instructions", "server.md")
     """
-    # TODO: Add support for GCS if needed. This is useful for Custom DCs deployed in the cloud.
+    # TODO(keyurs): Add support for GCS if needed. This is useful for Custom DCs deployed in the cloud.
     try:
         path = Path(base_path) / filename
         if path.exists() and path.is_file():
@@ -146,9 +146,8 @@ def read_package_content(package: str, filename: str) -> str:
 
         if resource.is_file():
             return resource.read_text(encoding="utf-8")
-        else:
-            logger.warning("Instruction resource %s not found in package", filename)
-            return ""
+        logger.warning("Instruction resource %s not found in package", filename)
+        return ""
 
     except Exception as e:
         logger.warning("Failed to load instruction %s: %s", filename, e)

packages/datacommons-mcp/tests/test_app.py

@@ -18,14 +18,16 @@
 from unittest.mock import MagicMock, patch
 
 import pytest
-
 from datacommons_mcp.app import DCApp
 
 
 @pytest.fixture
 def mock_settings():
+    from datacommons_mcp.data_models.settings import BaseDCSettings
+
     with patch("datacommons_mcp.app.settings.get_dc_settings") as mock:
-        mock.return_value = MagicMock(instructions_dir=None, api_key="test-key")
+        # Return a real BaseDCSettings object
+        mock.return_value = BaseDCSettings(api_key="test-key")
         yield mock
 
 
@@ -44,7 +46,7 @@ def mock_fastmcp():
         yield mock
 
 
-def test_app_initialization_default(mock_settings, mock_client, mock_fastmcp):
+def test_app_initialization_default(mock_settings, mock_fastmcp):  # noqa: ARG001
     """Test that DCApp initializes with default instructions."""
     _ = DCApp()
 
@@ -56,7 +58,7 @@ def test_app_initialization_default(mock_settings, mock_client, mock_fastmcp):
 
 
 def test_app_initialization_override(
-    mock_settings, mock_client, mock_fastmcp, tmp_path, create_test_file
+    mock_settings, mock_fastmcp, tmp_path, create_test_file
 ):
     """Test that DCApp loads instructions from DC_INSTRUCTIONS_DIR."""
     # Create custom instructions
@@ -74,9 +76,7 @@ def test_app_initialization_override(
     assert instructions == "Custom Server Instructions"
 
 
-def test_load_instruction_tool_override(
-    mock_settings, mock_client, mock_fastmcp, tmp_path, create_test_file
-):
+def test_load_instruction_tool_override(mock_settings, tmp_path, create_test_file):
     """Test loading tool instructions with override."""
     # Create custom instructions
     custom_dir = tmp_path / "instructions"
@@ -90,7 +90,7 @@ def test_load_instruction_tool_override(
     assert content == "Custom Tool Instructions"
 
 
-def test_load_instruction_fallback(mock_settings, mock_client, mock_fastmcp, tmp_path):
+def test_load_instruction_fallback(mock_settings, tmp_path):
     """Test that override falls back to default if file likely doesn't exist."""
     # Create custom dir but empty
     custom_dir = tmp_path / "instructions"
@@ -100,15 +100,13 @@ def test_load_instruction_fallback(mock_settings, mock_client, mock_fastmcp, tmp
     mock_settings.return_value.instructions_dir = str(custom_dir)
 
     app = DCApp()
-    
+
     # Should fall back to default package resource (server.md exists in package)
     content = app._load_instruction("server.md")
     assert "Data Commons" in content
 
 
-def test_register_tool(
-    mock_settings, mock_client, mock_fastmcp, tmp_path, create_test_file
-):
+def test_register_tool(mock_settings, mock_fastmcp, tmp_path, create_test_file):
     """Test tool registration with instruction loading."""
     # Create custom instructions
     create_test_file("instructions/tools/sample.md", "Sample Tool Description")
@@ -124,7 +122,7 @@ def sample_tool():
 
     # Verify add_tool was called
     mock_mcp_instance.add_tool.assert_called_once()
-    
+
     # Verify the description was loaded correctly
     tool_arg = mock_mcp_instance.add_tool.call_args[0][0]
     assert tool_arg.description == "Sample Tool Description"

packages/datacommons-mcp/tests/test_utils.py

@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
 import pytest
 import requests
-from unittest.mock import MagicMock, mock_open, patch
 from datacommons_client.models.observation import Observation
 from datacommons_mcp.data_models.observations import DateRange
 from datacommons_mcp.exceptions import APIKeyValidationError, InvalidAPIKeyError
@@ -97,13 +97,14 @@ def test_read_external_content_subdir(self, tmp_path, create_test_file):
     def test_read_external_content_missing(self, tmp_path):
         assert read_external_content(str(tmp_path), "missing.md") is None
 
-
     def test_read_package_content_success(self):
         # Read actual content from the package
         content = read_package_content("datacommons_mcp.instructions", "server.md")
         assert "Data Commons" in content
 
     def test_read_package_content_missing(self):
         # Read a file that definitely doesn't exist in the package
-        content = read_package_content("datacommons_mcp.instructions", "non_existent_file.md")
+        content = read_package_content(
+            "datacommons_mcp.instructions", "non_existent_file.md"
+        )
         assert content == ""