Merge pull request #1 from nim444/tests

Tests case

Author: nim444

.github/workflows/ci.yml

@@ -0,0 +1,62 @@
+name: CI Pipeline
+
+on:
+    push:
+        branches: [ "main", "tests"]
+    pull_request:
+        branches: [ "main" ]
+    workflow_dispatch: # Allows manual triggering
+
+
+
+jobs:
+  lint:
+    name: Lint & Format Check
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Set up Python 3.13
+      uses: actions/setup-python@v5
+      with:
+        python-version: "3.13"
+
+    - name: Install uv
+      run: curl -LsSf https://astral.sh/uv/install.sh | sh
+      # Add uv to the PATH
+    - name: Add uv to PATH
+      run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
+
+    - name: Install dependencies (including dev)
+      run: uv pip install --system .
+
+    - name: Lint with Ruff
+      run: uv run ruff check server.py
+
+
+  test:
+    name: Run Tests
+    runs-on: ubuntu-latest
+    needs: lint # Ensure linting passes before testing
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Set up Python 3.13
+      uses: actions/setup-python@v5
+      with:
+        python-version: "3.13"
+
+    - name: Install uv
+      run: curl -LsSf https://astral.sh/uv/install.sh | sh
+      # Add uv to the PATH
+    - name: Add uv to PATH
+      run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
+
+
+    - name: Install dependencies (including test)
+      run: uv pip install --system .
+
+    - name: Run tests with pytest
+      run: uv run pytest -v 

pyproject.toml

@@ -1,12 +1,23 @@
 [project]
 name = "mcp-adb"
 version = "0.1.0"
-description = "Add your description here"
+description = "An MCP server for Android automation using UIAutomator2"
 readme = "README.md"
 requires-python = ">=3.13"
 dependencies = [
     "asyncio>=3.4.3",
     "mcp[cli]>=1.7.0",
-    "uiautodev>=0.6.0",
+    "uiautodev>=0.6.0", # This likely pins fastapi, which pins starlette < 0.38.0
     "uiautomator2>=3.2.9",
+    "python-multipart>=0.0.9", # Already added
+    # "starlette>=0.38.0", # This caused conflicts, so we revert this change
+    "ruff>=0.11.8",
+    "pytest>=8.3.5",
+    "pytest-cov>=6.1.1",
+    "pytest-asyncio>=0.26.0",
+]
+
+[tool.pytest.ini_options]
+filterwarnings = [
+    "ignore:Please use \\`import python_multipart\\` instead.:PendingDeprecationWarning:starlette\\.formparsers",
 ]

readme.md

@@ -1,7 +1,6 @@
 [![Python 3.13](https://img.shields.io/badge/python-3.13-blue.svg)](https://www.python.org/downloads/)
-[![PyPI](https://img.shields.io/pypi/v/uiautomator2.svg?label=uiautomator2)](https://pypi.python.org/pypi/uiautomator2)
-[![PyPI](https://img.shields.io/pypi/v/adbutils.svg?label=adbutils)](https://github.com/openatx/adbutils)
-[![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/openatx/android-uiautomator-server.svg?label=android-uiautomator-server)](https://github.com/openatx/android-uiautomator-server)
+[![CI Pipeline](https://github.com/nim444/fastapi-auth-multi-db/actions/workflows/ci.yml/badge.svg)](https://github.com/nim444/mcp-android-server-python/actions/workflows/ci.yml)
+[![Tests passing](https://img.shields.io/badge/Tests-passing-brightgreen.svg)](#running-tests) [![Code style: ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
 # MCP Android Agent

server.py

@@ -1,11 +1,10 @@
 # server.py
 from mcp.server.fastmcp import FastMCP
 import uiautomator2 as u2
-from typing import List, Optional, Dict, Any, Tuple
+from typing import List, Optional, Dict, Any
 import shutil
 import subprocess
 import asyncio
-from dataclasses import dataclass
 from typing import TypedDict
 
 # Create an MCP server
@@ -358,7 +357,7 @@ def click(
         else:
             raise ValueError(f"Invalid selector_type: {selector_type}")
 
-        if el:
+        if el and el.exists:
             el.click()
             return True
         return False
@@ -423,7 +422,7 @@ def get_element_info(
         else:
             raise ValueError(f"Invalid selector_type: {selector_type}")
 
-        if el:
+        if el and el.exists:
             info = el.info
             return {
                 "text": info.get("text", ""),
@@ -500,7 +499,8 @@ def wait_for_element(
         elif selector_type == "resourceId":
             return d(resourceId=selector).wait(timeout=timeout)
         elif selector_type == "description":
-            return d(description=selector).wait(timeout=timeout)
+            el = d(description=selector).wait(timeout=timeout)
+            return el is not None and el.exists
         else:
             raise ValueError(f"Invalid selector_type: {selector_type}")
     except Exception as e:
@@ -559,7 +559,7 @@ def long_click(
         else:
             raise ValueError(f"Invalid selector_type: {selector_type}")
 
-        if el.exists:
+        if el and el.exists:
             el.long_click(duration=duration)
             return True
         return False
@@ -589,7 +589,8 @@ def scroll_to(
         elif selector_type == "resourceId":
             return d(scrollable=True).scroll.to(resourceId=selector)
         elif selector_type == "description":
-            return d(scrollable=True).scroll.to(description=selector)
+            el = d(scrollable=True).scroll.to(description=selector)
+            return el is not None and el.exists
         else:
             raise ValueError(f"Invalid selector_type: {selector_type}")
     except Exception as e:
@@ -628,7 +629,7 @@ def drag(
         else:
             raise ValueError(f"Invalid selector_type: {selector_type}")
 
-        if el.exists:
+        if el and el.exists:
             el.drag_to(to_x, to_y)
             return True
         return False