fix time server

Author: dsp-ant

src/time/pyproject.toml

@@ -4,7 +4,9 @@ version = "0.5.1"
 description = "A Model Context Protocol server providing tools for time queries and timezone conversions for LLMs"
 readme = "README.md"
 requires-python = ">=3.10"
-authors = [{ name = "Mariusz 'maledorak' Korzekwa", email = "[email protected]" }]
+authors = [
+    { name = "Mariusz 'maledorak' Korzekwa", email = "[email protected]" },
+]
 keywords = ["time", "timezone", "mcp", "llm"]
 license = { text = "MIT" }
 classifiers = [
@@ -17,8 +19,7 @@ classifiers = [
 dependencies = [
     "mcp>=1.0.0",
     "pydantic>=2.0.0",
-    "pytz>=2024.2",
-    "tzlocal>=5.2",
+    "tzdata>=2024.2",
 ]
 
 [project.scripts]
@@ -33,4 +34,5 @@ dev-dependencies = [
     "freezegun>=1.5.1",
     "pyright>=1.1.389",
     "pytest>=8.3.3",
+    "ruff>=0.8.1",
 ]

src/time/src/mcp_server_time/__init__.py

@@ -1,5 +1,6 @@
 from .server import serve
 
+
 def main():
     """MCP Time Server - Time and timezone conversion functionality for MCP"""
     import argparse

src/time/src/mcp_server_time/server.py

@@ -1,13 +1,13 @@
-from datetime import datetime
+from datetime import datetime, timedelta
 from enum import Enum
 import json
 from typing import Sequence
 
-import pytz
-from tzlocal import get_localzone
+from zoneinfo import ZoneInfo
 from mcp.server import Server
 from mcp.server.stdio import stdio_server
 from mcp.types import Tool, TextContent, ImageContent, EmbeddedResource
+from mcp.shared.exceptions import McpError
 
 from pydantic import BaseModel
 
@@ -34,17 +34,29 @@ class TimeConversionInput(BaseModel):
     time: str
     target_tz_list: list[str]
 
-def get_local_tz(local_tz_override: str | None = None) -> pytz.timezone:
-    return pytz.timezone(local_tz_override) if local_tz_override else get_localzone()
+
+def get_local_tz(local_tz_override: str | None = None) -> ZoneInfo:
+    if local_tz_override:
+        return ZoneInfo(local_tz_override)
+
+    # Get local timezone from datetime.now()
+    tzinfo = datetime.now().astimezone(tz=None).tzinfo
+    if tzinfo is not None:
+        return ZoneInfo(str(tzinfo))
+    raise McpError("Could not determine local timezone - tzinfo is None")
+
+
+def get_zoneinfo(timezone_name: str) -> ZoneInfo:
+    try:
+        return ZoneInfo(timezone_name)
+    except Exception as e:
+        raise McpError(f"Invalid timezone: {str(e)}")
+
 
 class TimeServer:
     def get_current_time(self, timezone_name: str) -> TimeResult:
         """Get current time in specified timezone"""
-        try:
-            timezone = pytz.timezone(timezone_name)
-        except pytz.exceptions.UnknownTimeZoneError as e:
-            raise ValueError(f"Unknown timezone: {str(e)}")
-
+        timezone = get_zoneinfo(timezone_name)
         current_time = datetime.now(timezone)
 
         return TimeResult(
@@ -57,30 +69,28 @@ def convert_time(
         self, source_tz: str, time_str: str, target_tz: str
     ) -> TimeConversionResult:
         """Convert time between timezones"""
-        try:
-            source_timezone = pytz.timezone(source_tz)
-        except pytz.exceptions.UnknownTimeZoneError as e:
-            raise ValueError(f"Unknown source timezone: {str(e)}")
-
-        try:
-            target_timezone = pytz.timezone(target_tz)
-        except pytz.exceptions.UnknownTimeZoneError as e:
-            raise ValueError(f"Unknown target timezone: {str(e)}")
+        source_timezone = get_zoneinfo(source_tz)
+        target_timezone = get_zoneinfo(target_tz)
 
         try:
             parsed_time = datetime.strptime(time_str, "%H:%M").time()
         except ValueError:
             raise ValueError("Invalid time format. Expected HH:MM [24-hour format]")
 
         now = datetime.now(source_timezone)
-        source_time = source_timezone.localize(
-            datetime(now.year, now.month, now.day, parsed_time.hour, parsed_time.minute)
+        source_time = datetime(
+            now.year,
+            now.month,
+            now.day,
+            parsed_time.hour,
+            parsed_time.minute,
+            tzinfo=source_timezone,
         )
 
         target_time = source_time.astimezone(target_timezone)
-        hours_difference = (
-            target_time.utcoffset() - source_time.utcoffset()
-        ).total_seconds() / 3600
+        source_offset = source_time.utcoffset() or timedelta()
+        target_offset = target_time.utcoffset() or timedelta()
+        hours_difference = (target_offset - source_offset).total_seconds() / 3600
 
         if hours_difference.is_integer():
             time_diff_str = f"{hours_difference:+.1f}h"
@@ -114,7 +124,7 @@ async def list_tools() -> list[Tool]:
         return [
             Tool(
                 name=TimeTools.GET_CURRENT_TIME.value,
-                description=f"Get current time in a specific timezones",
+                description="Get current time in a specific timezones",
                 inputSchema={
                     "type": "object",
                     "properties": {
@@ -128,7 +138,7 @@ async def list_tools() -> list[Tool]:
             ),
             Tool(
                 name=TimeTools.CONVERT_TIME.value,
-                description=f"Convert time between timezones",
+                description="Convert time between timezones",
                 inputSchema={
                     "type": "object",
                     "properties": {
@@ -179,7 +189,9 @@ async def call_tool(
                 case _:
                     raise ValueError(f"Unknown tool: {name}")
 
-            return [TextContent(type="text", text=json.dumps(result.model_dump(), indent=2))]
+            return [
+                TextContent(type="text", text=json.dumps(result.model_dump(), indent=2))
+            ]
 
         except Exception as e:
             raise ValueError(f"Error processing mcp-server-time query: {str(e)}")

src/time/test/time_server_test.py

@@ -1,9 +1,9 @@
-import os
 
 from freezegun import freeze_time
+from mcp.shared.exceptions import McpError
 import pytest
 
-from mcp_server_time.server import TimeServer, serve
+from mcp_server_time.server import TimeServer
 
 
 @pytest.mark.parametrize(
@@ -82,7 +82,10 @@ def test_get_current_time(test_time, timezone, expected):
 
 def test_get_current_time_with_invalid_timezone():
     time_server = TimeServer()
-    with pytest.raises(ValueError, match=r"Unknown timezone: 'Invalid/Timezone'"):
+    with pytest.raises(
+        McpError,
+        match=r"Invalid timezone: 'No time zone found with key Invalid/Timezone'",
+    ):
         time_server.get_current_time("Invalid/Timezone")
 
 
@@ -93,13 +96,13 @@ def test_get_current_time_with_invalid_timezone():
             "invalid_tz",
             "12:00",
             "Europe/London",
-            "Unknown source timezone: 'invalid_tz'",
+            "Invalid timezone: 'No time zone found with key invalid_tz'",
         ),
         (
             "Europe/Warsaw",
             "12:00",
             "invalid_tz",
-            "Unknown target timezone: 'invalid_tz'",
+            "Invalid timezone: 'No time zone found with key invalid_tz'",
         ),
         (
             "Europe/Warsaw",
@@ -111,7 +114,7 @@ def test_get_current_time_with_invalid_timezone():
 )
 def test_convert_time_errors(source_tz, time_str, target_tz, expected_error):
     time_server = TimeServer()
-    with pytest.raises(ValueError, match=expected_error):
+    with pytest.raises((McpError, ValueError), match=expected_error):
         time_server.convert_time(source_tz, time_str, target_tz)