refactor: remove old duplicate map resource declarations, clean generate_test_map and release version 0.2.7
This commit is contained in:
@@ -8,7 +8,6 @@ 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, EmbeddedResource
|
||||
|
||||
|
||||
class MockContext(Context):
|
||||
@@ -60,6 +59,7 @@ async def generate():
|
||||
class MockMCP:
|
||||
def __init__(self):
|
||||
self.tools = {}
|
||||
self.resources = {}
|
||||
|
||||
def tool(self):
|
||||
def decorator(func):
|
||||
@@ -68,6 +68,13 @@ async def generate():
|
||||
|
||||
return decorator
|
||||
|
||||
def resource(self, path):
|
||||
def decorator(func):
|
||||
self.resources[path] = func
|
||||
return func
|
||||
|
||||
return decorator
|
||||
|
||||
mcp = MockMCP()
|
||||
|
||||
# Mock StravaClient that returns our mock activity and streams
|
||||
@@ -106,35 +113,10 @@ async def generate():
|
||||
client = MockClient()
|
||||
register(mcp, client)
|
||||
|
||||
get_activity_map = mcp.tools["get_activity_map"]
|
||||
ctx = MockContext()
|
||||
|
||||
print("Generating mock map HTML...")
|
||||
result = await get_activity_map(ctx, 99999)
|
||||
|
||||
html_text = None
|
||||
content_list = result.content if hasattr(result, "content") else result
|
||||
for item in content_list:
|
||||
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
|
||||
print("Generating mock map HTML from resource...")
|
||||
resource_handler = mcp.resources["strava://activity/{activity_id}/map"]
|
||||
resource_result = await resource_handler(99999)
|
||||
html_text = resource_result.contents[0].text
|
||||
|
||||
if html_text:
|
||||
output_path = os.path.join(os.path.dirname(__file__), "..", "test.html")
|
||||
@@ -173,6 +155,7 @@ async def generate():
|
||||
class MockMCP:
|
||||
def __init__(self):
|
||||
self.tools = {}
|
||||
self.resources = {}
|
||||
|
||||
def tool(self):
|
||||
def decorator(func):
|
||||
@@ -181,39 +164,20 @@ async def generate():
|
||||
|
||||
return decorator
|
||||
|
||||
def resource(self, path):
|
||||
def decorator(func):
|
||||
self.resources[path] = func
|
||||
return func
|
||||
|
||||
return decorator
|
||||
|
||||
mcp = MockMCP()
|
||||
register(mcp, client)
|
||||
|
||||
get_activity_map = mcp.tools["get_activity_map"]
|
||||
ctx = MockContext()
|
||||
|
||||
print("Generating map HTML...")
|
||||
result = await get_activity_map(ctx, activity_id)
|
||||
|
||||
# Find the TextContent that holds the HTML
|
||||
html_text = None
|
||||
content_list = result.content if hasattr(result, "content") else result
|
||||
for item in content_list:
|
||||
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
|
||||
print("Generating map HTML from resource...")
|
||||
resource_handler = mcp.resources["strava://activity/{activity_id}/map"]
|
||||
resource_result = await resource_handler(activity_id)
|
||||
html_text = resource_result.contents[0].text
|
||||
|
||||
if html_text:
|
||||
output_path = os.path.join(os.path.dirname(__file__), "..", "test.html")
|
||||
@@ -223,11 +187,6 @@ async def generate():
|
||||
print(
|
||||
"👉 Double-click 'test.html' or open it in your browser to view the interactive map!"
|
||||
)
|
||||
else:
|
||||
# Maybe it returned a warning message instead of HTML
|
||||
for item in result:
|
||||
if isinstance(item, TextContent):
|
||||
print(f"Returned message: {item.text}")
|
||||
|
||||
except Exception as e:
|
||||
print(f"❌ Failed: {str(e)}")
|
||||
|
||||
Reference in New Issue
Block a user