Fix tools visibility - revert to v0.1.6 authentication approach
- Disable issuer validation in BearerAuthProvider (issuer=None) - Simplify authentication condition (remove auth_enabled check) - Revert CORS middleware to simple configuration - Fix OAuth metadata endpoint to match v0.1.6 - Apply conditional auth only to MCP server creation Critical fixes for Claude AI tools discovery
This commit is contained in:
saidsurucu
@@ -0,0 +1,182 @@
|
||||
# yargitay_mcp_module/client.py
|
||||
|
||||
import httpx
|
||||
from bs4 import BeautifulSoup # Still needed for pre-processing HTML before markitdown
|
||||
from typing import Dict, Any, List, Optional
|
||||
import logging
|
||||
import html
|
||||
import re
|
||||
import io
|
||||
from markitdown import MarkItDown
|
||||
|
||||
from .models import (
|
||||
YargitayDetailedSearchRequest,
|
||||
YargitayApiSearchResponse,
|
||||
YargitayApiDecisionEntry,
|
||||
YargitayDocumentMarkdown,
|
||||
CompactYargitaySearchResult
|
||||
)
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
# Basic logging configuration if no handlers are configured
|
||||
if not logger.hasHandlers():
|
||||
logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
|
||||
|
||||
class YargitayOfficialApiClient:
|
||||
"""
|
||||
API Client for Yargitay's official decision search system.
|
||||
Targets the detailed search endpoint (e.g., /aramadetaylist) based on user-provided payload.
|
||||
"""
|
||||
BASE_URL = "https://karararama.yargitay.gov.tr"
|
||||
# The form action was "/detayliArama". This often maps to an API endpoint like "/aramadetaylist".
|
||||
# This should be confirmed with the actual API.
|
||||
DETAILED_SEARCH_ENDPOINT = "/aramadetaylist"
|
||||
DOCUMENT_ENDPOINT = "/getDokuman"
|
||||
|
||||
def __init__(self, request_timeout: float = 60.0):
|
||||
self.http_client = httpx.AsyncClient(
|
||||
base_url=self.BASE_URL,
|
||||
headers={
|
||||
"Content-Type": "application/json; charset=UTF-8",
|
||||
"Accept": "application/json, text/plain, */*",
|
||||
"X-Requested-With": "XMLHttpRequest",
|
||||
"X-KL-KIS-Ajax-Request": "Ajax_Request", # Seen in a Yargitay client example
|
||||
"Referer": f"{self.BASE_URL}/" # Some APIs might check referer
|
||||
},
|
||||
timeout=request_timeout,
|
||||
verify=False # SSL verification disabled as per original user code - use with caution
|
||||
)
|
||||
|
||||
async def search_detailed_decisions(
|
||||
self,
|
||||
search_params: YargitayDetailedSearchRequest
|
||||
) -> YargitayApiSearchResponse:
|
||||
"""
|
||||
Performs a detailed search for decisions in Yargitay
|
||||
using the structured search_params.
|
||||
"""
|
||||
# Create the main payload structure with the 'data' key
|
||||
request_payload = {"data": search_params.model_dump(exclude_none=True, by_alias=True)}
|
||||
|
||||
logger.info(f"YargitayOfficialApiClient: Performing detailed search with payload: {request_payload}")
|
||||
|
||||
try:
|
||||
response = await self.http_client.post(self.DETAILED_SEARCH_ENDPOINT, json=request_payload)
|
||||
response.raise_for_status() # Raise an exception for HTTP 4xx or 5xx status codes
|
||||
response_json_data = response.json()
|
||||
|
||||
logger.debug(f"YargitayOfficialApiClient: Raw API response: {response_json_data}")
|
||||
|
||||
# Handle None or empty data response from API
|
||||
if response_json_data is None:
|
||||
logger.warning("YargitayOfficialApiClient: API returned None response")
|
||||
response_json_data = {"data": {"data": [], "recordsTotal": 0, "recordsFiltered": 0}}
|
||||
elif not isinstance(response_json_data, dict):
|
||||
logger.warning(f"YargitayOfficialApiClient: API returned unexpected response type: {type(response_json_data)}")
|
||||
response_json_data = {"data": {"data": [], "recordsTotal": 0, "recordsFiltered": 0}}
|
||||
elif response_json_data.get("data") is None:
|
||||
logger.warning("YargitayOfficialApiClient: API response data field is None")
|
||||
response_json_data["data"] = {"data": [], "recordsTotal": 0, "recordsFiltered": 0}
|
||||
|
||||
# Validate and parse the response using Pydantic models
|
||||
api_response = YargitayApiSearchResponse(**response_json_data)
|
||||
|
||||
# Populate the document_url for each decision entry
|
||||
if api_response.data and api_response.data.data:
|
||||
for decision_item in api_response.data.data:
|
||||
decision_item.document_url = f"{self.BASE_URL}{self.DOCUMENT_ENDPOINT}?id={decision_item.id}"
|
||||
|
||||
return api_response
|
||||
|
||||
except httpx.RequestError as e:
|
||||
logger.error(f"YargitayOfficialApiClient: HTTP request error during detailed search: {e}")
|
||||
raise # Re-raise to be handled by the calling MCP tool
|
||||
except Exception as e: # Catches Pydantic ValidationErrors as well
|
||||
logger.error(f"YargitayOfficialApiClient: Error processing or validating detailed search response: {e}")
|
||||
raise
|
||||
|
||||
def _convert_html_to_markdown(self, html_from_api_data_field: str) -> Optional[str]:
|
||||
"""
|
||||
Takes raw HTML string (from Yargitay API 'data' field for a document),
|
||||
pre-processes it, and converts it to Markdown using MarkItDown.
|
||||
Returns only the Markdown string or None if conversion fails.
|
||||
"""
|
||||
if not html_from_api_data_field:
|
||||
return None
|
||||
|
||||
# Pre-process HTML: unescape entities and fix common escaped sequences
|
||||
# Based on user's original fix_html_content
|
||||
processed_html = html.unescape(html_from_api_data_field)
|
||||
processed_html = processed_html.replace('\\"', '"')
|
||||
processed_html = processed_html.replace('\\r\\n', '\n')
|
||||
processed_html = processed_html.replace('\\n', '\n')
|
||||
processed_html = processed_html.replace('\\t', '\t')
|
||||
|
||||
# MarkItDown often works best with a full HTML document structure.
|
||||
# The Yargitay /getDokuman response already provides a full <html>...</html> string.
|
||||
# If it were just a fragment, we might wrap it like:
|
||||
# html_to_convert = f"<html><head><meta charset=\"UTF-8\"></head><body>{processed_html}</body></html>"
|
||||
# But since it's already a full HTML string in "data":
|
||||
html_to_convert = processed_html
|
||||
|
||||
markdown_output = None
|
||||
try:
|
||||
# Convert HTML string to bytes and create BytesIO stream
|
||||
html_bytes = html_to_convert.encode('utf-8')
|
||||
html_stream = io.BytesIO(html_bytes)
|
||||
|
||||
# Pass BytesIO stream to MarkItDown to avoid temp file creation
|
||||
md_converter = MarkItDown()
|
||||
conversion_result = md_converter.convert(html_stream)
|
||||
markdown_output = conversion_result.text_content
|
||||
|
||||
logger.info("Successfully converted HTML to Markdown.")
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"Error during MarkItDown HTML to Markdown conversion: {e}")
|
||||
|
||||
return markdown_output
|
||||
|
||||
async def get_decision_document_as_markdown(self, id: str) -> YargitayDocumentMarkdown:
|
||||
"""
|
||||
Retrieves a specific Yargitay decision by its ID and returns its content
|
||||
as Markdown.
|
||||
Based on user-provided /getDokuman response structure.
|
||||
"""
|
||||
document_api_url = f"{self.DOCUMENT_ENDPOINT}?id={id}"
|
||||
source_url = f"{self.BASE_URL}{document_api_url}" # The original URL of the document
|
||||
logger.info(f"YargitayOfficialApiClient: Fetching document for Markdown conversion (ID: {id})")
|
||||
|
||||
try:
|
||||
response = await self.http_client.get(document_api_url)
|
||||
response.raise_for_status()
|
||||
|
||||
# Expecting JSON response with HTML content in the 'data' field
|
||||
response_json = response.json()
|
||||
html_content_from_api = response_json.get("data")
|
||||
|
||||
if not isinstance(html_content_from_api, str):
|
||||
logger.error(f"YargitayOfficialApiClient: 'data' field in API response is not a string or not found (ID: {id}).")
|
||||
raise ValueError("Expected HTML content not found in API response's 'data' field.")
|
||||
|
||||
markdown_content = self._convert_html_to_markdown(html_content_from_api)
|
||||
|
||||
return YargitayDocumentMarkdown(
|
||||
id=id,
|
||||
markdown_content=markdown_content,
|
||||
source_url=source_url
|
||||
)
|
||||
except httpx.RequestError as e:
|
||||
logger.error(f"YargitayOfficialApiClient: HTTP error fetching document for Markdown (ID: {id}): {e}")
|
||||
raise
|
||||
except ValueError as e: # For JSON parsing errors or missing 'data' field
|
||||
logger.error(f"YargitayOfficialApiClient: Error processing document response for Markdown (ID: {id}): {e}")
|
||||
raise
|
||||
except Exception as e: # For other unexpected errors
|
||||
logger.error(f"YargitayOfficialApiClient: General error fetching/processing document for Markdown (ID: {id}): {e}")
|
||||
raise
|
||||
|
||||
async def close_client_session(self):
|
||||
"""Closes the HTTPX client session."""
|
||||
await self.http_client.aclose()
|
||||
logger.info("YargitayOfficialApiClient: HTTP client session closed.")
|
||||
@@ -0,0 +1,103 @@
|
||||
# yargitay_mcp_module/models.py
|
||||
|
||||
from pydantic import BaseModel, Field, HttpUrl, ConfigDict
|
||||
from typing import List, Optional, Dict, Any, Literal
|
||||
|
||||
# Yargıtay Chamber/Board Options
|
||||
YargitayBirimEnum = Literal[
|
||||
"ALL", # "ALL" for all chambers
|
||||
# Hukuk (Civil) Chambers
|
||||
"Hukuk Genel Kurulu",
|
||||
"1. Hukuk Dairesi", "2. Hukuk Dairesi", "3. Hukuk Dairesi", "4. Hukuk Dairesi",
|
||||
"5. Hukuk Dairesi", "6. Hukuk Dairesi", "7. Hukuk Dairesi", "8. Hukuk Dairesi",
|
||||
"9. Hukuk Dairesi", "10. Hukuk Dairesi", "11. Hukuk Dairesi", "12. Hukuk Dairesi",
|
||||
"13. Hukuk Dairesi", "14. Hukuk Dairesi", "15. Hukuk Dairesi", "16. Hukuk Dairesi",
|
||||
"17. Hukuk Dairesi", "18. Hukuk Dairesi", "19. Hukuk Dairesi", "20. Hukuk Dairesi",
|
||||
"21. Hukuk Dairesi", "22. Hukuk Dairesi", "23. Hukuk Dairesi",
|
||||
"Hukuk Daireleri Başkanlar Kurulu",
|
||||
# Ceza (Criminal) Chambers
|
||||
"Ceza Genel Kurulu",
|
||||
"1. Ceza Dairesi", "2. Ceza Dairesi", "3. Ceza Dairesi", "4. Ceza Dairesi",
|
||||
"5. Ceza Dairesi", "6. Ceza Dairesi", "7. Ceza Dairesi", "8. Ceza Dairesi",
|
||||
"9. Ceza Dairesi", "10. Ceza Dairesi", "11. Ceza Dairesi", "12. Ceza Dairesi",
|
||||
"13. Ceza Dairesi", "14. Ceza Dairesi", "15. Ceza Dairesi", "16. Ceza Dairesi",
|
||||
"17. Ceza Dairesi", "18. Ceza Dairesi", "19. Ceza Dairesi", "20. Ceza Dairesi",
|
||||
"21. Ceza Dairesi", "22. Ceza Dairesi", "23. Ceza Dairesi",
|
||||
"Ceza Daireleri Başkanlar Kurulu",
|
||||
# General Assembly
|
||||
"Büyük Genel Kurulu"
|
||||
]
|
||||
|
||||
class YargitayDetailedSearchRequest(BaseModel):
|
||||
"""
|
||||
Model for the 'data' object sent in the request payload
|
||||
to Yargitay's detailed search endpoint (e.g., /aramadetaylist).
|
||||
Based on the payload provided by the user.
|
||||
"""
|
||||
arananKelime: Optional[str] = Field("", description="Turkish keywords (supports +word -word \"phrase\" operators)")
|
||||
# Department/Board selection - Complete Court of Cassation chamber hierarchy
|
||||
birimYrgKurulDaire: Optional[str] = Field("ALL", description="Chamber (ALL or specific chamber name)")
|
||||
|
||||
esasYil: Optional[str] = Field("", description="Case year (YYYY)")
|
||||
esasIlkSiraNo: Optional[str] = Field("", description="Start case no")
|
||||
esasSonSiraNo: Optional[str] = Field("", description="End case no")
|
||||
|
||||
kararYil: Optional[str] = Field("", description="Decision year (YYYY)")
|
||||
kararIlkSiraNo: Optional[str] = Field("", description="Start decision no")
|
||||
kararSonSiraNo: Optional[str] = Field("", description="End decision no")
|
||||
|
||||
baslangicTarihi: Optional[str] = Field("", description="Start date (DD.MM.YYYY)")
|
||||
bitisTarihi: Optional[str] = Field("", description="End date (DD.MM.YYYY)")
|
||||
|
||||
|
||||
pageSize: int = Field(10, ge=1, le=10, description="Results per page (1-100)")
|
||||
pageNumber: int = Field(1, ge=1, description="Page number (1-indexed)")
|
||||
|
||||
class YargitayApiDecisionEntry(BaseModel):
|
||||
"""Model for an individual decision entry from the Yargitay API search response."""
|
||||
id: str # Unique system ID of the decision
|
||||
daire: Optional[str] = Field(None, description="Chamber")
|
||||
esasNo: Optional[str] = Field(None, alias="esasNo", description="Case no")
|
||||
kararNo: Optional[str] = Field(None, alias="kararNo", description="Decision no")
|
||||
kararTarihi: Optional[str] = Field(None, alias="kararTarihi", description="Date")
|
||||
# 'index' and 'siraNo' from API response are not critical for MCP tool, so omitted for brevity
|
||||
|
||||
# This field will be populated by the client after fetching the search list
|
||||
document_url: Optional[HttpUrl] = Field(None, description="Document URL")
|
||||
|
||||
model_config = ConfigDict(populate_by_name=True) # To allow populating by alias from API response
|
||||
|
||||
|
||||
class YargitayApiResponseInnerData(BaseModel):
|
||||
"""Model for the inner 'data' object in the Yargitay API search response."""
|
||||
data: List[YargitayApiDecisionEntry] = Field(default_factory=list)
|
||||
# draw: Optional[int] = None # Typically used by DataTables, not essential for MCP
|
||||
recordsTotal: int = Field(default=0) # Total number of records matching the query
|
||||
recordsFiltered: int = Field(default=0) # Total number of records after filtering (usually same as recordsTotal)
|
||||
|
||||
class YargitayApiSearchResponse(BaseModel):
|
||||
"""Model for the complete search response from the Yargitay API."""
|
||||
data: Optional[YargitayApiResponseInnerData] = Field(default_factory=lambda: YargitayApiResponseInnerData())
|
||||
# metadata: Optional[Dict[str, Any]] = None # Optional metadata from API
|
||||
|
||||
class YargitayDocumentMarkdown(BaseModel):
|
||||
"""Model for a Yargitay decision document, containing only Markdown content."""
|
||||
id: str = Field(..., description="Document ID")
|
||||
markdown_content: Optional[str] = Field(None, description="Content")
|
||||
source_url: HttpUrl = Field(..., description="Source URL")
|
||||
|
||||
class CleanYargitayDecisionEntry(BaseModel):
|
||||
"""Clean decision entry without arananKelime field to reduce token usage."""
|
||||
id: str
|
||||
daire: Optional[str] = Field(None, description="Chamber")
|
||||
esasNo: Optional[str] = Field(None, description="Case no")
|
||||
kararNo: Optional[str] = Field(None, description="Decision no")
|
||||
kararTarihi: Optional[str] = Field(None, description="Date")
|
||||
document_url: Optional[HttpUrl] = Field(None, description="Document URL")
|
||||
|
||||
class CompactYargitaySearchResult(BaseModel):
|
||||
"""A more compact search result model for the MCP tool to return."""
|
||||
decisions: List[CleanYargitayDecisionEntry]
|
||||
total_records: int
|
||||
requested_page: int
|
||||
page_size: int
|
||||
Reference in New Issue
Block a user