fix linting

Author: renardeinside

.github/workflows/unit_tests.yml

@@ -1,44 +1,25 @@
 name: Unit Tests
 
 on:
-  push:
-    paths:
-      - "servers/**"
-      - ".github/workflows/unit_tests.yml"
   pull_request:
-    paths:
-      - "servers/**"
-      - ".github/workflows/unit_tests.yml"
+    types: [opened, synchronize]
+  merge_group:
+    types: [checks_requested]
+  push:
+    # Always run on push to main. The build cache can only be reused
+    # if it was saved by a run from the repository's default branch.
+    # The run result will be identical to that from the merge queue
+    # because the commit is identical, yet we need to perform it to
+    # seed the build cache.
+    branches:
+      - master
 
 jobs:
-  discover:
-    runs-on:
-      group: databrickslabs-protected-runner-group
-      labels: linux-ubuntu-latest
-    outputs:
-      server_dirs: ${{ steps.set-matrix.outputs.server_dirs }}
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Discover server dirs with tests
-        id: set-matrix
-        run: |
-          dirs=$(find servers -mindepth 1 -maxdepth 1 -type d -exec test -d "{}/tests" \; -print | sed 's|servers/||' | jq -R . | jq -cs .)
-          echo "Found directories: $dirs"
-          echo "server_dirs=$dirs" >> "$GITHUB_OUTPUT"
-
-
 
   test:
-    needs: discover
     runs-on:
       group: databrickslabs-protected-runner-group
       labels: linux-ubuntu-latest
-    strategy:
-      matrix:
-        server-dir: ${{ fromJson(needs.discover.outputs.server_dirs) }}
 
     steps:
       - name: Checkout code
@@ -53,14 +34,12 @@ jobs:
         uses: astral-sh/setup-uv@v5
 
       - name: Install dependencies with uv
-        working-directory: servers/${{ matrix.server-dir }}
         run: |
-          uv sync
-          uv pip install --group dev
+          uv sync 
 
       - name: Run tests
-        working-directory: servers/${{ matrix.server-dir }}
         run: uv run pytest tests
+
   lint:
     runs-on:
       group: databrickslabs-protected-runner-group
@@ -80,4 +59,4 @@ jobs:
           echo "$HOME/.cargo/bin" >> $GITHUB_PATH
 
       - name: Run lint checks
-        run: ./dev/lint.sh
+        run: make lint

.gitignore

@@ -122,4 +122,6 @@ a.md
 gunicorn.conf.py
 
 # ignore version file
-src/databricks/labs/mcp/_version.py
+src/databricks/labs/mcp/_version.py
+
+.ruff_cache/

Makefile

@@ -1,9 +1,7 @@
 fmt:
-	uv run isort .
 	uv run black .
 	uv run ruff check . --fix
 
-verify:
-	uv run isort . --check
+lint:
 	uv run black . --check
 	uv run ruff check .

dev/lint.sh

@@ -23,6 +23,7 @@ dev-dependencies = [
     "pyright>=1.1.393",
     "ruff>=0.9.4",
     "pytest>=8.3.4",
+    "isort>=6.0.1",
 ]
 
 [project.scripts]
@@ -66,4 +67,4 @@ replacement = '<img \1src="https://raw.githubusercontent.com/databrickslabs/mcp/
 testpaths = ["tests"]
 python_files = "test_*.py"
 python_classes = "Test*"
-python_functions = "test_*"
+python_functions = "test_*"

pyproject.toml

@@ -1,3 +1,3 @@
 # DO NOT ADD ANYTHING ELSE TO THIS FILE FOR COMPATIBILITY WITH OTHER databricks.labs.* PACKAGES
 # SEE https://packaging.python.org/guides/packaging-namespace-packages/#pkgutil-style-namespace-packages
-__path__ = __import__("pkgutil").extend_path(__path__, __name__)
+__path__ = __import__("pkgutil").extend_path(__path__, __name__)

src/databricks/__init__.py

@@ -1,3 +1,3 @@
 # DO NOT ADD ANYTHING ELSE TO THIS FILE FOR COMPATIBILITY WITH OTHER databricks.labs.* PACKAGES
 # SEE https://packaging.python.org/guides/packaging-namespace-packages/#pkgutil-style-namespace-packages
-__path__ = __import__("pkgutil").extend_path(__path__, __name__)
+__path__ = __import__("pkgutil").extend_path(__path__, __name__)

src/databricks/labs/__init__.py

@@ -6,8 +6,12 @@
 )
 
 from databricks.labs.mcp.servers.unity_catalog.tools.genie import list_genie_tools
-from databricks.labs.mcp.servers.unity_catalog.tools.functions import list_uc_function_tools
-from databricks.labs.mcp.servers.unity_catalog.tools.vector_search import list_vector_search_tools
+from databricks.labs.mcp.servers.unity_catalog.tools.functions import (
+    list_uc_function_tools,
+)
+from databricks.labs.mcp.servers.unity_catalog.tools.vector_search import (
+    list_vector_search_tools,
+)
 
 Content: TypeAlias = Union[TextContent, ImageContent, EmbeddedResource]
 

src/databricks/labs/mcp/servers/unity_catalog/tools/__init__.py

@@ -54,9 +54,13 @@ class DummySettings:
 
 
 @mock.patch(
-    "databricks.labs.mcp.servers.unity_catalog.tools.functions.DatabricksFunctionClient", new=DummyClient
+    "databricks.labs.mcp.servers.unity_catalog.tools.functions.DatabricksFunctionClient",
+    new=DummyClient,
+)
+@mock.patch(
+    "databricks.labs.mcp.servers.unity_catalog.tools.functions.UCFunctionToolkit",
+    new=DummyToolkit,
 )
-@mock.patch("databricks.labs.mcp.servers.unity_catalog.tools.functions.UCFunctionToolkit", new=DummyToolkit)
 def test_list_uc_function_tools():
     settings = DummySettings()
     tools = list_uc_function_tools(settings)

tests/test_functions.py

@@ -63,7 +63,10 @@ class DummyWorkspaceClient:
     pass
 
 
-@mock.patch("databricks.labs.mcp.servers.unity_catalog.tools.genie.WorkspaceClient", new=DummyWorkspaceClient)
+@mock.patch(
+    "databricks.labs.mcp.servers.unity_catalog.tools.genie.WorkspaceClient",
+    new=DummyWorkspaceClient,
+)
 def test_genie_tool_execute():
     mock_func = mock.Mock()
     mock_func.return_value = [mock.Mock(text="hello world")]