Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 matthias
|
62ab00bb23 | ||
|
matthias
|
f231535f8e | ||
|
matthias
|
badc2f870e |
@@ -28,3 +28,4 @@ build/
|
||||
.Trashes
|
||||
ehthumbs.db
|
||||
Thumbs.db
|
||||
test.html
|
||||
|
||||
@@ -8,7 +8,7 @@ sys.path.append(os.path.join(os.path.dirname(__file__), "..", "src"))
|
||||
|
||||
from strava_mcp_server.strava_client import StravaClient
|
||||
from mcp.server.fastmcp import Context
|
||||
from mcp.types import TextContent
|
||||
from mcp.types import TextContent, EmbeddedResource
|
||||
|
||||
|
||||
class MockContext(Context):
|
||||
@@ -114,8 +114,25 @@ async def generate():
|
||||
|
||||
html_text = None
|
||||
for item in result:
|
||||
if isinstance(item, TextContent) and "<!DOCTYPE html>" in item.text:
|
||||
html_text = item.text
|
||||
if isinstance(item, TextContent):
|
||||
if "<!DOCTYPE html>" in item.text:
|
||||
html_text = item.text
|
||||
break
|
||||
elif '<iframe srcdoc="' in item.text:
|
||||
prefix = '<iframe srcdoc="'
|
||||
suffix = '" style="'
|
||||
start = item.text.find(prefix)
|
||||
if start != -1:
|
||||
start += len(prefix)
|
||||
end = item.text.find(suffix, start)
|
||||
if end != -1:
|
||||
html_text = item.text[start:end].replace(""", '"')
|
||||
break
|
||||
elif (
|
||||
isinstance(item, EmbeddedResource)
|
||||
and item.resource.mimeType == "text/html"
|
||||
):
|
||||
html_text = item.resource.text
|
||||
break
|
||||
|
||||
if html_text:
|
||||
@@ -175,8 +192,25 @@ async def generate():
|
||||
# Find the TextContent that holds the HTML
|
||||
html_text = None
|
||||
for item in result:
|
||||
if isinstance(item, TextContent) and "<!DOCTYPE html>" in item.text:
|
||||
html_text = item.text
|
||||
if isinstance(item, TextContent):
|
||||
if "<!DOCTYPE html>" in item.text:
|
||||
html_text = item.text
|
||||
break
|
||||
elif '<iframe srcdoc="' in item.text:
|
||||
prefix = '<iframe srcdoc="'
|
||||
suffix = '" style="'
|
||||
start = item.text.find(prefix)
|
||||
if start != -1:
|
||||
start += len(prefix)
|
||||
end = item.text.find(suffix, start)
|
||||
if end != -1:
|
||||
html_text = item.text[start:end].replace(""", '"')
|
||||
break
|
||||
elif (
|
||||
isinstance(item, EmbeddedResource)
|
||||
and item.resource.mimeType == "text/html"
|
||||
):
|
||||
html_text = item.resource.text
|
||||
break
|
||||
|
||||
if html_text:
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
"""Strava MCP Server"""
|
||||
|
||||
__version__ = "0.1.0"
|
||||
__version__ = "0.2.2"
|
||||
|
||||
@@ -32,6 +32,19 @@ def _user_text(text: str) -> TextContent:
|
||||
)
|
||||
|
||||
|
||||
def _user_html_resource(uri: str, html: str) -> EmbeddedResource:
|
||||
"""Helper: return a user-facing EmbeddedResource with text/html."""
|
||||
return EmbeddedResource(
|
||||
type="resource",
|
||||
resource=TextResourceContents(
|
||||
uri=uri,
|
||||
mimeType="text/html",
|
||||
text=html,
|
||||
),
|
||||
annotations=Annotations(audience=["user"]),
|
||||
)
|
||||
|
||||
|
||||
def register(mcp: FastMCP, strava: StravaClient) -> None:
|
||||
@mcp.tool()
|
||||
async def list_activities(
|
||||
@@ -458,14 +471,16 @@ def register(mcp: FastMCP, strava: StravaClient) -> None:
|
||||
<script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"></script>
|
||||
<script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
|
||||
<style>
|
||||
body {{
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
height: 100vh;
|
||||
html, body {{
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;
|
||||
background-color: #f8f9fa;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
overflow: hidden;
|
||||
}}
|
||||
.map-container {{
|
||||
position: relative;
|
||||
@@ -606,39 +621,31 @@ def register(mcp: FastMCP, strava: StravaClient) -> None:
|
||||
|
||||
L.control.layers(baseMaps, null, {{ position: 'topleft' }}).addTo(map);
|
||||
|
||||
function decodePolyline(encoded) {{
|
||||
var points = [];
|
||||
var index = 0, len = encoded.length;
|
||||
var lat = 0, lng = 0;
|
||||
while (index < len) {{
|
||||
var b, shift = 0, result = 0;
|
||||
do {{
|
||||
b = encoded.charCodeAt(index++) - 63;
|
||||
result |= (b & 0x1f) << shift;
|
||||
shift += 5;
|
||||
}} while (b >= 0x20);
|
||||
var dlat = ((result & 1) ? ~(result >> 1) : (result >> 1));
|
||||
lat += dlat;
|
||||
shift = 0;
|
||||
result = 0;
|
||||
do {{
|
||||
b = encoded.charCodeAt(index++) - 63;
|
||||
result |= (b & 0x1f) << shift;
|
||||
shift += 5;
|
||||
}} while (b >= 0x20);
|
||||
var dlng = ((result & 1) ? ~(result >> 1) : (result >> 1));
|
||||
lng += dlng;
|
||||
points.push([lat / 1e5, lng / 1e5]);
|
||||
}}
|
||||
return points;
|
||||
}}
|
||||
var distanceData = {json.dumps(distance_data)};
|
||||
var altitudeData = {json.dumps(altitude_data)};
|
||||
var latlngData = {json.dumps(latlng_data)};
|
||||
|
||||
var encodedPolyline = {json.dumps(polyline)};
|
||||
var coordinates = decodePolyline(encodedPolyline);
|
||||
var track;
|
||||
if (coordinates.length > 0) {{
|
||||
track = L.polyline(coordinates, {{color: '#fc4c02', weight: 5, opacity: 0.8}}).addTo(map);
|
||||
if (latlngData.length > 0) {{
|
||||
track = L.polyline(latlngData, {{color: '#fc4c02', weight: 5, opacity: 0.8}}).addTo(map);
|
||||
map.fitBounds(track.getBounds());
|
||||
|
||||
// Start- und End-Marker zeichnen
|
||||
var startIcon = L.divIcon({{
|
||||
html: '<span style="font-size: 18px; filter: drop-shadow(0 2px 4px rgba(0,0,0,0.3)); line-height: 18px; display: block; text-align: center;">🟢</span>',
|
||||
iconSize: [18, 18],
|
||||
iconAnchor: [9, 9],
|
||||
className: 'start-marker-emoji'
|
||||
}});
|
||||
L.marker(latlngData[0], {{ icon: startIcon, zIndexOffset: 500 }}).addTo(map);
|
||||
|
||||
var endIcon = L.divIcon({{
|
||||
html: '<span style="font-size: 22px; filter: drop-shadow(0 2px 4px rgba(0,0,0,0.3)); line-height: 22px; display: block; text-align: center;">🏁</span>',
|
||||
iconSize: [22, 22],
|
||||
iconAnchor: [11, 20],
|
||||
className: 'end-marker-emoji'
|
||||
}});
|
||||
L.marker(latlngData[latlngData.length - 1], {{ icon: endIcon, zIndexOffset: 500 }}).addTo(map);
|
||||
}} else {{
|
||||
map.setView([0, 0], 2);
|
||||
}}
|
||||
@@ -652,9 +659,6 @@ def register(mcp: FastMCP, strava: StravaClient) -> None:
|
||||
// Render Elevation Chart if data is available
|
||||
if ({has_elevation_chart}) {{
|
||||
var ctx = document.getElementById('elevationChart').getContext('2d');
|
||||
var distanceData = {json.dumps(distance_data)};
|
||||
var altitudeData = {json.dumps(altitude_data)};
|
||||
var latlngData = {json.dumps(latlng_data)};
|
||||
|
||||
var sportEmoji = "{sport_emoji}";
|
||||
var hoverIcon = L.divIcon({{
|
||||
@@ -840,13 +844,9 @@ def register(mcp: FastMCP, strava: StravaClient) -> None:
|
||||
</script>
|
||||
</body>
|
||||
</html>"""
|
||||
return [
|
||||
TextContent(type="text", text=html_content.strip()),
|
||||
_resource(
|
||||
f"internal://activities/{activity_id}/map",
|
||||
{"polyline": polyline},
|
||||
),
|
||||
]
|
||||
escaped_html = html_content.strip().replace('"', """)
|
||||
iframe_content = f'<iframe srcdoc="{escaped_html}" style="width: 100%; height: 600px; border: none; border-radius: 12px;"></iframe>'
|
||||
return [TextContent(type="text", text=iframe_content)]
|
||||
except Exception as e:
|
||||
error_msg = f"Error rendering activity map: {str(e)}"
|
||||
await ctx.error(error_msg)
|
||||
|
||||
+14
-13
@@ -46,21 +46,22 @@ async def test_get_activity_map_success():
|
||||
get_activity_map = mcp.tools["get_activity_map"]
|
||||
result = await get_activity_map(ctx, 12345)
|
||||
|
||||
assert len(result) == 2
|
||||
# First block is the HTML text content
|
||||
assert len(result) == 1
|
||||
assert result[0].type == "text"
|
||||
assert "<!DOCTYPE html>" in result[0].text
|
||||
assert "a~l~FqzbwOq}@it@..." in result[0].text
|
||||
assert "unpkg.com/leaflet" in result[0].text
|
||||
assert "latlngData" in result[0].text
|
||||
assert "[47.1, 9.1]" in result[0].text
|
||||
assert 'sportEmoji = "🚴"' in result[0].text
|
||||
assert "L.control.layers" in result[0].text
|
||||
assert "satellite" in result[0].text
|
||||
iframe_text = result[0].text
|
||||
assert iframe_text.startswith('<iframe srcdoc="')
|
||||
assert iframe_text.endswith('"></iframe>')
|
||||
|
||||
# Second block is the internal resource
|
||||
assert result[1].type == "resource"
|
||||
assert "internal://activities/12345/map" in str(result[1].resource.uri)
|
||||
decoded_html = iframe_text.replace(""", '"')
|
||||
assert "<!DOCTYPE html>" in decoded_html
|
||||
assert "unpkg.com/leaflet" in decoded_html
|
||||
assert "latlngData" in decoded_html
|
||||
assert "[47.1, 9.1]" in decoded_html
|
||||
assert 'sportEmoji = "🚴"' in decoded_html
|
||||
assert "L.control.layers" in decoded_html
|
||||
assert "satellite" in decoded_html
|
||||
assert "🟢" in decoded_html
|
||||
assert "🏁" in decoded_html
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
|
||||
Reference in New Issue
Block a user