Merge pull request #3 from CHRISCARLON/version-0.1.4

V0.1.4 PR

Author: CHRISCARLON

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "os-mcp"
-version = "0.1.3"
+version = "0.1.4"
 description = "A Python MCP server that provides access to Ordnance Survey's DataHub APIs."
 readme = "README.md"
 requires-python = ">=3.11"

src/api_service/os_api.py

@@ -1,4 +1,10 @@
 from typing import Protocol, Dict, List, Any, Optional, runtime_checkable
+from models import (
+    OpenAPISpecification,
+    CollectionsCache,
+    WorkflowContextCache,
+    CollectionQueryables,
+)
 
 
 @runtime_checkable
@@ -35,10 +41,20 @@ async def make_request_no_auth(
         """Make a request without authentication"""
         ...
 
-    async def cache_openapi_spec(self):
+    async def cache_openapi_spec(self) -> OpenAPISpecification:
         """Cache the OpenAPI spec"""
         ...
 
-    async def cache_collections(self):
+    async def cache_collections(self) -> CollectionsCache:
         """Cache the collections data"""
         ...
+
+    async def cache_workflow_context(self) -> WorkflowContextCache:
+        """Cache the workflow context data"""
+        ...
+
+    async def fetch_collections_queryables(
+        self, collection_ids: List[str]
+    ) -> Dict[str, CollectionQueryables]:
+        """Fetch detailed queryables for specific collections only"""
+        ...

src/api_service/protocols.py

@@ -8,65 +8,69 @@
 
 class OSWorkflowPrompts:
     """Handles registration of OS NGD workflow prompts"""
-    
+
     def __init__(self, mcp_service):
         self.mcp = mcp_service
-    
+
     def register_all(self) -> None:
         """Register all workflow prompts"""
         self._register_analysis_prompts()
         self._register_general_prompts()
-    
+
     def _register_analysis_prompts(self) -> None:
         """Register analysis workflow prompts"""
-        
+
         @self.mcp.prompt()
         def usrn_breakdown_analysis(usrn: str) -> List[PromptMessage]:
             """Generate a step-by-step USRN breakdown workflow"""
             template = PROMPT_TEMPLATES["usrn_breakdown"].format(usrn=usrn)
-            
+
             return [
                 PromptMessage(
                     role="user",
                     content=TextContent(
                         type="text",
-                        text=f"As an expert in OS NGD API workflows and transport network analysis, {template}"
-                    )
+                        text=f"As an expert in OS NGD API workflows and transport network analysis, {template}",
+                    ),
                 )
             ]
-    
+
     def _register_general_prompts(self) -> None:
         """Register general OS NGD guidance prompts"""
-        
+
         @self.mcp.prompt()
-        def collection_query_guidance(collection_id: str, query_type: str = "features") -> List[PromptMessage]:
+        def collection_query_guidance(
+            collection_id: str, query_type: str = "features"
+        ) -> List[PromptMessage]:
             """Generate guidance for querying OS NGD collections"""
             return [
                 PromptMessage(
                     role="user",
                     content=TextContent(
                         type="text",
                         text=f"As an OS NGD API expert, guide me through querying the '{collection_id}' collection for {query_type}. "
-                              f"Include: 1) Available filters, 2) Best practices for bbox queries, "
-                              f"3) CRS considerations, 4) Example queries with proper syntax."
-                    )
+                        f"Include: 1) Available filters, 2) Best practices for bbox queries, "
+                        f"3) CRS considerations, 4) Example queries with proper syntax.",
+                    ),
                 )
             ]
-        
+
         @self.mcp.prompt()
-        def workflow_planning(user_request: str, data_theme: str = "transport") -> List[PromptMessage]:
+        def workflow_planning(
+            user_request: str, data_theme: str = "transport"
+        ) -> List[PromptMessage]:
             """Generate a workflow plan for complex OS NGD queries"""
             return [
                 PromptMessage(
                     role="user",
                     content=TextContent(
                         type="text",
                         text=f"As a geospatial workflow planner, create a detailed workflow plan for: '{user_request}'. "
-                              f"Focus on {data_theme} theme data. Include: "
-                              f"1) Collection selection rationale, "
-                              f"2) Query sequence with dependencies, "
-                              f"3) Filter strategies, "
-                              f"4) Error handling considerations."
-                    )
+                        f"Focus on {data_theme} theme data. Include: "
+                        f"1) Collection selection rationale, "
+                        f"2) Query sequence with dependencies, "
+                        f"3) Filter strategies, "
+                        f"4) Error handling considerations.",
+                    ),
                 )
-            ] 
+            ]

src/mcp_service/os_service.py

@@ -42,11 +42,11 @@ async def list_collections(self) -> str:
         """List all available feature collections"""
         ...
 
-    async def get_collection_info(self, collection_id: str) -> str:
+    async def get_single_collection(self, collection_id: str) -> str:
         """Get detailed information about a specific collection"""
         ...
 
-    async def get_collection_queryables(self, collection_id: str) -> str:
+    async def get_single_collection_queryables(self, collection_id: str) -> str:
         """Get queryable properties for a collection"""
         ...
 
@@ -96,3 +96,7 @@ async def get_bulk_linked_features(
     ) -> str:
         """Get linked features for multiple identifiers"""
         ...
+
+    async def fetch_detailed_collections(self, collection_ids: List[str]) -> str:
+        """Get detailed information about specific collections for workflow planning"""
+        ...

src/mcp_service/prompts.py

@@ -7,7 +7,8 @@
 
 logger = get_logger(__name__)
 
-# TODO: Do this for 
+
+# TODO: Do this for
 class OSDocumentationResources:
     """Handles registration of OS NGD documentation resources"""