Clean time server implementation

Author: maledorak

src/time/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mcp-server-time"
-version = "0.5.1"
+version = "0.5.1.pre3"
 description = "A Model Context Protocol server providing tools for time queries and timezone conversions for LLMs"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -29,4 +29,9 @@ requires = ["hatchling"]
 build-backend = "hatchling.build"
 
 [tool.uv]
-dev-dependencies = ["pyright>=1.1.389", "ruff>=0.7.3"]
+dev-dependencies = [
+    "freezegun>=1.5.1",
+    "pyright>=1.1.389",
+    "pytest>=8.3.3",
+    "ruff>=0.7.3",
+]

src/time/src/mcp_server_time/server.py

@@ -1,76 +1,113 @@
-from datetime import datetime
+from dataclasses import dataclass
+from datetime import datetime, timedelta
+from enum import Enum
 import json
-from typing import Dict, Any, Optional, Sequence
+from typing import Sequence
 
 import pytz
 from tzlocal import get_localzone
 from mcp.server import Server
 from mcp.server.stdio import stdio_server
 from mcp.types import Tool, TextContent, ImageContent, EmbeddedResource
 
+from pydantic import BaseModel
+
+
+class TimeTools(str, Enum):
+    GET_CURRENT_TIME = "get_current_time"
+    CONVERT_TIME = "convert_time"
+
+
+class TimeResult(BaseModel):
+    timezone: str
+    datetime: str
+    is_dst: bool
+
+
+class TimeConversionResult(BaseModel):
+    source: TimeResult
+    target: TimeResult
+    time_difference: str
+
+
+class TimeConversionInput(BaseModel):
+    source_tz: str
+    time: str
+    target_tz_list: list[str]
+
 
 class TimeServer:
-    def __init__(self, local_tz_override: Optional[str] = None):
-        self.local_tz = pytz.timezone(local_tz_override) if local_tz_override else get_localzone()
+    def __init__(self, local_tz_override: str | None = None):
+        self.local_tz = (
+            pytz.timezone(local_tz_override) if local_tz_override else get_localzone()
+        )
+
+    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)}")
 
-    def get_current_time(self, timezone_name: str | None = None) -> Dict[str, Any]:
-        """Get current time in specified timezone or local timezone if none specified"""
-        timezone = pytz.timezone(timezone_name) if timezone_name else self.local_tz
         current_time = datetime.now(timezone)
-        
-        return {
-            "timezone": timezone_name or str(self.local_tz),
-            "time": current_time.strftime("%H:%M %Z"),
-            "date": current_time.strftime("%Y-%m-%d"),
-            "full_datetime": current_time.strftime("%Y-%m-%d %H:%M:%S %Z"),
-            "is_dst": bool(current_time.dst())
-        }
-
-    def convert_time(self, source_tz: str, time_str: str, target_tz: str) -> Dict[str, Any]:
+
+        return TimeResult(
+            timezone=timezone_name,
+            datetime=current_time.isoformat(timespec="seconds"),
+            is_dst=bool(current_time.dst()),
+        )
+
+    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)
-            
-            # Parse time
-            hour, minute = map(int, time_str.split(":"))
-            if not (0 <= hour <= 23 and 0 <= minute <= 59):
-                raise ValueError
         except pytz.exceptions.UnknownTimeZoneError as e:
-            raise ValueError(f"Unknown timezone: {str(e)}")
-        except:
-            raise ValueError("Invalid time format. Expected HH:MM (24-hour format)")
-        
-        # Create time in source timezone
+            raise ValueError(f"Unknown target timezone: {str(e)}")
+
+        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, hour, minute)
+            datetime(now.year, now.month, now.day, parsed_time.hour, parsed_time.minute)
         )
-        
-        # Convert to target timezone
+
         target_time = source_time.astimezone(target_timezone)
-        date_changed = source_time.date() != target_time.date()
-        
-        return {
-            "source": {
-                "timezone": str(source_timezone),
-                "time": source_time.strftime("%H:%M %Z"),
-                "date": source_time.strftime("%Y-%m-%d"),
-                "full_datetime": source_time.strftime("%Y-%m-%d %H:%M:%S %Z")
-            },
-            "target": {
-                "timezone": str(target_timezone),
-                "time": target_time.strftime("%H:%M %Z"),
-                "date": target_time.strftime("%Y-%m-%d"),
-                "full_datetime": target_time.strftime("%Y-%m-%d %H:%M:%S %Z")
-            },
-            "time_difference": f"{(target_time.utcoffset() - source_time.utcoffset()).total_seconds() / 3600:+.1f}h",
-            "date_changed": date_changed,
-            "day_relation": "next day" if date_changed and target_time.date() > source_time.date() else "previous day" if date_changed else "same day"
-        }
-
-
-async def serve(local_timezone: Optional[str] = None) -> None:
+        hours_difference = (
+            target_time.utcoffset() - source_time.utcoffset()
+        ).total_seconds() / 3600
+
+        if hours_difference.is_integer():
+            time_diff_str = f"{hours_difference:+.1f}h"
+        else:
+            # For fractional hours like Nepal's UTC+5:45
+            time_diff_str = f"{hours_difference:+.2f}".rstrip("0").rstrip(".") + "h"
+
+        return TimeConversionResult(
+            source=TimeResult(
+                timezone=source_tz,
+                datetime=source_time.isoformat(timespec="seconds"),
+                is_dst=bool(source_time.dst()),
+            ),
+            target=TimeResult(
+                timezone=target_tz,
+                datetime=target_time.isoformat(timespec="seconds"),
+                is_dst=bool(target_time.dst()),
+            ),
+            time_difference=time_diff_str,
+        )
+
+
+async def serve(local_timezone: str | None = None) -> None:
     server = Server("mcp-time")
     time_server = TimeServer(local_timezone)
     local_tz = str(time_server.local_tz)
@@ -80,65 +117,76 @@ async def list_tools() -> list[Tool]:
         """List available time tools."""
         return [
             Tool(
-                name="get_current_time",
-                description=f"Get current time in a specific timezone (current system timezone is {local_tz})",
+                name=TimeTools.GET_CURRENT_TIME.value,
+                description=f"Get current time in a specific timezones",
                 inputSchema={
                     "type": "object",
                     "properties": {
                         "timezone": {
                             "type": "string",
-                            "description": "IANA timezone name (e.g., 'America/New_York', 'Europe/London', etc). If not provided, uses system timezone"
+                            "description": f"IANA timezone name (e.g., 'America/New_York', 'Europe/London'). Use '{local_tz}' as local timezone if no timezone provided by the user.",
                         }
-                    }
-                }
+                    },
+                    "required": ["timezone"],
+                },
             ),
             Tool(
-                name="convert_time",
-                description=f"Convert time between timezones using IANA timezone names (system timezone is {local_tz}, can be used as source or target)",
+                name=TimeTools.CONVERT_TIME.value,
+                description=f"Convert time between timezones",
                 inputSchema={
                     "type": "object",
                     "properties": {
                         "source_timezone": {
                             "type": "string",
-                            "description": f"Source IANA timezone name (e.g., '{local_tz}', 'America/New_York')"
+                            "description": f"Source IANA timezone name (e.g., 'America/New_York', 'Europe/London'). Use '{local_tz}' as local timezone if no source timezone provided by the user.",
                         },
                         "time": {
                             "type": "string",
-                            "description": "Time in 24-hour format (HH:MM)"
+                            "description": "Time to convert in 24-hour format (HH:MM)",
                         },
                         "target_timezone": {
                             "type": "string",
-                            "description": f"Target IANA timezone name (e.g., '{local_tz}', 'Asia/Tokyo')"
-                        }
+                            "description": f"Target IANA timezone name (e.g., 'Asia/Tokyo', 'America/San_Francisco'). Use '{local_tz}' as local timezone if no target timezone provided by the user.",
+                        },
                     },
-                    "required": ["source_timezone", "time", "target_timezone"]
-                }
-            )
+                    "required": ["source_timezone", "time", "target_timezone"],
+                },
+            ),
         ]
 
     @server.call_tool()
-    async def call_tool(name: str, arguments: dict) -> Sequence[TextContent | ImageContent | EmbeddedResource]:
+    async def call_tool(
+        name: str, arguments: dict
+    ) -> Sequence[TextContent | ImageContent | EmbeddedResource]:
         """Handle tool calls for time queries."""
         try:
-            if name == "get_current_time":
-                timezone = arguments.get("timezone")
-                result = time_server.get_current_time(timezone)
-            elif name == "convert_time":
-                if not all(k in arguments for k in ["source_timezone", "time", "target_timezone"]):
-                    raise ValueError("Missing required arguments")
-                    
-                result = time_server.convert_time(
-                    arguments["source_timezone"],
-                    arguments["time"],
-                    arguments["target_timezone"]
-                )
-            else:
-                raise ValueError(f"Unknown tool: {name}")
+            match name:
+                case TimeTools.GET_CURRENT_TIME.value:
+                    timezone = arguments.get("timezone")
+                    if not timezone:
+                        raise ValueError("Missing required argument: timezone")
+
+                    result = time_server.get_current_time(timezone)
+
+                case TimeTools.CONVERT_TIME.value:
+                    if not all(
+                        k in arguments
+                        for k in ["source_timezone", "time", "target_timezone"]
+                    ):
+                        raise ValueError("Missing required arguments")
+
+                    result = time_server.convert_time(
+                        arguments["source_timezone"],
+                        arguments["time"],
+                        arguments["target_timezone"],
+                    )
+                case _:
+                    raise ValueError(f"Unknown tool: {name}")
 
             return [TextContent(type="text", text=json.dumps(result, indent=2))]
-            
+
         except Exception as e:
-            raise ValueError(f"Error processing time query: {str(e)}")
+            raise ValueError(f"Error processing mcp-server-time query: {str(e)}")
 
     options = server.create_initialization_options()
     async with stdio_server() as (read_stream, write_stream):