mcp-ticketer 0.1.21__py3-none-any.whl → 0.1.23__py3-none-any.whl

mcp_ticketer/core/env_discovery.py

@@ -8,14 +8,14 @@ environment files, including:
 - Security validation
 """
 
-import os
 import logging
-from pathlib import Path
-from typing import Dict, Any, Optional, List, Tuple
 from dataclasses import dataclass, field
+from pathlib import Path
+from typing import Any, Optional
+
 from dotenv import dotenv_values
 
-from .project_config import AdapterType, AdapterConfig
+from .project_config import AdapterType
 
 logger = logging.getLogger(__name__)
 
@@ -105,9 +105,9 @@ class DiscoveredAdapter:
     """Information about a discovered adapter configuration."""
 
     adapter_type: str
-    config: Dict[str, Any]
+    config: dict[str, Any]
     confidence: float  # 0.0-1.0 how complete the configuration is
-    missing_fields: List[str] = field(default_factory=list)
+    missing_fields: list[str] = field(default_factory=list)
     found_in: str = ".env"  # Which file it was found in
 
     def is_complete(self) -> bool:
@@ -119,9 +119,9 @@ class DiscoveredAdapter:
 class DiscoveryResult:
     """Result of environment file discovery."""
 
-    adapters: List[DiscoveredAdapter] = field(default_factory=list)
-    warnings: List[str] = field(default_factory=list)
-    env_files_found: List[str] = field(default_factory=list)
+    adapters: list[DiscoveredAdapter] = field(default_factory=list)
+    warnings: list[str] = field(default_factory=list)
+    env_files_found: list[str] = field(default_factory=list)
 
     def get_primary_adapter(self) -> Optional[DiscoveredAdapter]:
         """Get the adapter with highest confidence and completeness."""
@@ -130,9 +130,7 @@ class DiscoveryResult:
 
         # Sort by: complete configs first, then by confidence
         sorted_adapters = sorted(
-            self.adapters,
-            key=lambda a: (a.is_complete(), a.confidence),
-            reverse=True
+            self.adapters, key=lambda a: (a.is_complete(), a.confidence), reverse=True
         )
         return sorted_adapters[0]
 
@@ -160,6 +158,7 @@ class EnvDiscovery:
 
         Args:
             project_path: Path to project root (defaults to cwd)
+
         """
         self.project_path = project_path or Path.cwd()
 
@@ -168,6 +167,7 @@ class EnvDiscovery:
 
         Returns:
             DiscoveryResult with found adapters and warnings
+
         """
         result = DiscoveryResult()
 
@@ -179,19 +179,27 @@ class EnvDiscovery:
             return result
 
         # Detect adapters
-        linear_adapter = self._detect_linear(env_vars, result.env_files_found[0] if result.env_files_found else ".env")
+        linear_adapter = self._detect_linear(
+            env_vars, result.env_files_found[0] if result.env_files_found else ".env"
+        )
         if linear_adapter:
             result.adapters.append(linear_adapter)
 
-        github_adapter = self._detect_github(env_vars, result.env_files_found[0] if result.env_files_found else ".env")
+        github_adapter = self._detect_github(
+            env_vars, result.env_files_found[0] if result.env_files_found else ".env"
+        )
         if github_adapter:
             result.adapters.append(github_adapter)
 
-        jira_adapter = self._detect_jira(env_vars, result.env_files_found[0] if result.env_files_found else ".env")
+        jira_adapter = self._detect_jira(
+            env_vars, result.env_files_found[0] if result.env_files_found else ".env"
+        )
         if jira_adapter:
             result.adapters.append(jira_adapter)
 
-        aitrackdown_adapter = self._detect_aitrackdown(env_vars, result.env_files_found[0] if result.env_files_found else ".env")
+        aitrackdown_adapter = self._detect_aitrackdown(
+            env_vars, result.env_files_found[0] if result.env_files_found else ".env"
+        )
         if aitrackdown_adapter:
             result.adapters.append(aitrackdown_adapter)
 
@@ -201,7 +209,7 @@ class EnvDiscovery:
 
         return result
 
-    def _load_env_files(self, result: DiscoveryResult) -> Dict[str, str]:
+    def _load_env_files(self, result: DiscoveryResult) -> dict[str, str]:
         """Load environment variables from files.
 
         Args:
@@ -209,8 +217,9 @@ class EnvDiscovery:
 
         Returns:
             Merged dictionary of environment variables
+
         """
-        merged_env: Dict[str, str] = {}
+        merged_env: dict[str, str] = {}
 
         # Load files in reverse order (lowest priority first)
         for env_file in reversed(self.ENV_FILE_ORDER):
@@ -229,7 +238,9 @@ class EnvDiscovery:
 
         return merged_env
 
-    def _find_key_value(self, env_vars: Dict[str, str], patterns: List[str]) -> Optional[str]:
+    def _find_key_value(
+        self, env_vars: dict[str, str], patterns: list[str]
+    ) -> Optional[str]:
         """Find first matching key value from patterns.
 
         Args:
@@ -238,13 +249,16 @@ class EnvDiscovery:
 
         Returns:
             Value if found, None otherwise
+
         """
         for pattern in patterns:
             if pattern in env_vars and env_vars[pattern]:
                 return env_vars[pattern]
         return None
 
-    def _detect_linear(self, env_vars: Dict[str, str], found_in: str) -> Optional[DiscoveredAdapter]:
+    def _detect_linear(
+        self, env_vars: dict[str, str], found_in: str
+    ) -> Optional[DiscoveredAdapter]:
         """Detect Linear adapter configuration.
 
         Args:
@@ -253,18 +267,19 @@ class EnvDiscovery:
 
         Returns:
             DiscoveredAdapter if Linear config detected, None otherwise
+
         """
         api_key = self._find_key_value(env_vars, LINEAR_KEY_PATTERNS)
 
         if not api_key:
             return None
 
-        config: Dict[str, Any] = {
+        config: dict[str, Any] = {
             "api_key": api_key,
             "adapter": AdapterType.LINEAR.value,
         }
 
-        missing_fields: List[str] = []
+        missing_fields: list[str] = []
         confidence = 0.6  # Has API key
 
         # Extract team ID (recommended but not required)
@@ -289,7 +304,9 @@ class EnvDiscovery:
             found_in=found_in,
         )
 
-    def _detect_github(self, env_vars: Dict[str, str], found_in: str) -> Optional[DiscoveredAdapter]:
+    def _detect_github(
+        self, env_vars: dict[str, str], found_in: str
+    ) -> Optional[DiscoveredAdapter]:
         """Detect GitHub adapter configuration.
 
         Args:
@@ -298,18 +315,19 @@ class EnvDiscovery:
 
         Returns:
             DiscoveredAdapter if GitHub config detected, None otherwise
+
         """
         token = self._find_key_value(env_vars, GITHUB_TOKEN_PATTERNS)
 
         if not token:
             return None
 
-        config: Dict[str, Any] = {
+        config: dict[str, Any] = {
             "token": token,
             "adapter": AdapterType.GITHUB.value,
         }
 
-        missing_fields: List[str] = []
+        missing_fields: list[str] = []
         confidence = 0.4  # Has token
 
         # Try to extract owner/repo from combined field
@@ -345,7 +363,9 @@ class EnvDiscovery:
             found_in=found_in,
         )
 
-    def _detect_jira(self, env_vars: Dict[str, str], found_in: str) -> Optional[DiscoveredAdapter]:
+    def _detect_jira(
+        self, env_vars: dict[str, str], found_in: str
+    ) -> Optional[DiscoveredAdapter]:
         """Detect JIRA adapter configuration.
 
         Args:
@@ -354,18 +374,19 @@ class EnvDiscovery:
 
         Returns:
             DiscoveredAdapter if JIRA config detected, None otherwise
+
         """
         api_token = self._find_key_value(env_vars, JIRA_TOKEN_PATTERNS)
 
         if not api_token:
             return None
 
-        config: Dict[str, Any] = {
+        config: dict[str, Any] = {
             "api_token": api_token,
             "adapter": AdapterType.JIRA.value,
         }
 
-        missing_fields: List[str] = []
+        missing_fields: list[str] = []
         confidence = 0.3  # Has token
 
         # Extract server (required)
@@ -398,7 +419,9 @@ class EnvDiscovery:
             found_in=found_in,
         )
 
-    def _detect_aitrackdown(self, env_vars: Dict[str, str], found_in: str) -> Optional[DiscoveredAdapter]:
+    def _detect_aitrackdown(
+        self, env_vars: dict[str, str], found_in: str
+    ) -> Optional[DiscoveredAdapter]:
         """Detect AITrackdown adapter configuration.
 
         Args:
@@ -407,6 +430,7 @@ class EnvDiscovery:
 
         Returns:
             DiscoveredAdapter if AITrackdown config detected, None otherwise
+
         """
         base_path = self._find_key_value(env_vars, AITRACKDOWN_PATH_PATTERNS)
 
@@ -415,7 +439,7 @@ class EnvDiscovery:
         if not base_path and not aitrackdown_dir.exists():
             return None
 
-        config: Dict[str, Any] = {
+        config: dict[str, Any] = {
             "adapter": AdapterType.AITRACKDOWN.value,
         }
 
@@ -435,13 +459,14 @@ class EnvDiscovery:
             found_in=found_in,
         )
 
-    def _validate_security(self) -> List[str]:
+    def _validate_security(self) -> list[str]:
         """Validate security of environment files.
 
         Returns:
             List of security warnings
+
         """
-        warnings: List[str] = []
+        warnings: list[str] = []
 
         # Check if .env files are tracked in git
         gitignore_path = self.project_path / ".gitignore"
@@ -460,7 +485,7 @@ class EnvDiscovery:
         # Check if .gitignore exists and has .env patterns
         if gitignore_path.exists():
             try:
-                with open(gitignore_path, 'r') as f:
+                with open(gitignore_path) as f:
                     gitignore_content = f.read()
                     if ".env" not in gitignore_content:
                         warnings.append(
@@ -479,6 +504,7 @@ class EnvDiscovery:
 
         Returns:
             True if file is tracked in git, False otherwise
+
         """
         import subprocess
 
@@ -498,7 +524,7 @@ class EnvDiscovery:
             logger.debug(f"Git check failed: {e}")
             return False
 
-    def validate_discovered_config(self, adapter: DiscoveredAdapter) -> List[str]:
+    def validate_discovered_config(self, adapter: DiscoveredAdapter) -> list[str]:
         """Validate a discovered adapter configuration.
 
         Args:
@@ -506,8 +532,9 @@ class EnvDiscovery:
 
         Returns:
             List of validation warnings
+
         """
-        warnings: List[str] = []
+        warnings: list[str] = []
 
         # Check API key/token length (basic sanity check)
         if adapter.adapter_type == AdapterType.LINEAR.value:
@@ -522,12 +549,16 @@ class EnvDiscovery:
 
             # Validate token prefix
             if token and not token.startswith(("ghp_", "gho_", "ghu_", "ghs_", "ghr_")):
-                warnings.append("⚠️  GitHub token doesn't match expected format (should start with ghp_, gho_, etc.)")
+                warnings.append(
+                    "⚠️  GitHub token doesn't match expected format (should start with ghp_, gho_, etc.)"
+                )
 
         elif adapter.adapter_type == AdapterType.JIRA.value:
             server = adapter.config.get("server", "")
             if server and not server.startswith(("http://", "https://")):
-                warnings.append("⚠️  JIRA server URL should start with http:// or https://")
+                warnings.append(
+                    "⚠️  JIRA server URL should start with http:// or https://"
+                )
 
             email = adapter.config.get("email", "")
             if email and "@" not in email:
@@ -550,6 +581,7 @@ def discover_config(project_path: Optional[Path] = None) -> DiscoveryResult:
 
     Returns:
         DiscoveryResult with found adapters and warnings
+
     """
     discovery = EnvDiscovery(project_path)
     return discovery.discover()

mcp_ticketer/core/http_client.py

@@ -2,19 +2,19 @@
 
 import asyncio
 import logging
-from typing import Dict, Any, Optional, List, Union, Callable
-from datetime import datetime, timedelta
-from enum import Enum
 import time
+from enum import Enum
+from typing import Any, Optional, Union
 
 import httpx
-from httpx import AsyncClient, HTTPStatusError, TimeoutException
+from httpx import AsyncClient, TimeoutException
 
 logger = logging.getLogger(__name__)
 
 
 class HTTPMethod(str, Enum):
     """HTTP methods."""
+
     GET = "GET"
     POST = "POST"
     PUT = "PUT"
@@ -32,8 +32,8 @@ class RetryConfig:
         max_delay: float = 60.0,
         exponential_base: float = 2.0,
         jitter: bool = True,
-        retry_on_status: Optional[List[int]] = None,
-        retry_on_exceptions: Optional[List[type]] = None
+        retry_on_status: Optional[list[int]] = None,
+        retry_on_exceptions: Optional[list[type]] = None,
     ):
         self.max_retries = max_retries
         self.initial_delay = initial_delay
@@ -41,7 +41,11 @@ class RetryConfig:
         self.exponential_base = exponential_base
         self.jitter = jitter
         self.retry_on_status = retry_on_status or [429, 502, 503, 504]
-        self.retry_on_exceptions = retry_on_exceptions or [TimeoutException, httpx.ConnectTimeout, httpx.ReadTimeout]
+        self.retry_on_exceptions = retry_on_exceptions or [
+            TimeoutException,
+            httpx.ConnectTimeout,
+            httpx.ReadTimeout,
+        ]
 
 
 class RateLimiter:
@@ -53,6 +57,7 @@ class RateLimiter:
         Args:
             max_requests: Maximum number of requests allowed
             time_window: Time window in seconds
+
         """
         self.max_requests = max_requests
         self.time_window = time_window
@@ -69,7 +74,7 @@ class RateLimiter:
             time_passed = now - self.last_update
             self.tokens = min(
                 self.max_requests,
-                self.tokens + (time_passed / self.time_window) * self.max_requests
+                self.tokens + (time_passed / self.time_window) * self.max_requests,
             )
             self.last_update = now
 
@@ -89,13 +94,13 @@ class BaseHTTPClient:
     def __init__(
         self,
         base_url: str,
-        headers: Optional[Dict[str, str]] = None,
+        headers: Optional[dict[str, str]] = None,
         auth: Optional[Union[httpx.Auth, tuple]] = None,
         timeout: float = 30.0,
         retry_config: Optional[RetryConfig] = None,
         rate_limiter: Optional[RateLimiter] = None,
         verify_ssl: bool = True,
-        follow_redirects: bool = True
+        follow_redirects: bool = True,
     ):
         """Initialize HTTP client.
 
@@ -108,6 +113,7 @@ class BaseHTTPClient:
             rate_limiter: Rate limiter instance
             verify_ssl: Whether to verify SSL certificates
             follow_redirects: Whether to follow redirects
+
         """
         self.base_url = base_url.rstrip("/")
         self.default_headers = headers or {}
@@ -137,11 +143,13 @@ class BaseHTTPClient:
                 auth=self.auth,
                 timeout=self.timeout,
                 verify=self.verify_ssl,
-                follow_redirects=self.follow_redirects
+                follow_redirects=self.follow_redirects,
             )
         return self._client
 
-    async def _calculate_delay(self, attempt: int, response: Optional[httpx.Response] = None) -> float:
+    async def _calculate_delay(
+        self, attempt: int, response: Optional[httpx.Response] = None
+    ) -> float:
         """Calculate delay for retry attempt."""
         if response and response.status_code == 429:
             # Use Retry-After header if available
@@ -162,7 +170,8 @@ class BaseHTTPClient:
         # Add jitter to prevent thundering herd
         if self.retry_config.jitter:
             import random
-            delay *= (0.5 + random.random() * 0.5)
+
+            delay *= 0.5 + random.random() * 0.5
 
         return delay
 
@@ -170,7 +179,7 @@ class BaseHTTPClient:
         self,
         exception: Exception,
         response: Optional[httpx.Response] = None,
-        attempt: int = 1
+        attempt: int = 1,
     ) -> bool:
         """Determine if request should be retried."""
         if attempt >= self.retry_config.max_retries:
@@ -191,13 +200,13 @@ class BaseHTTPClient:
         self,
         method: Union[HTTPMethod, str],
         endpoint: str,
-        data: Optional[Dict[str, Any]] = None,
-        json: Optional[Dict[str, Any]] = None,
-        params: Optional[Dict[str, Any]] = None,
-        headers: Optional[Dict[str, str]] = None,
+        data: Optional[dict[str, Any]] = None,
+        json: Optional[dict[str, Any]] = None,
+        params: Optional[dict[str, Any]] = None,
+        headers: Optional[dict[str, str]] = None,
         timeout: Optional[float] = None,
         retry_count: int = 0,
-        **kwargs
+        **kwargs,
     ) -> httpx.Response:
         """Make HTTP request with retry and rate limiting.
 
@@ -218,6 +227,7 @@ class BaseHTTPClient:
         Raises:
             HTTPStatusError: On HTTP errors
             TimeoutException: On timeout
+
         """
         # Rate limiting
         if self.rate_limiter:
@@ -243,7 +253,7 @@ class BaseHTTPClient:
                 params=params,
                 headers=request_headers,
                 timeout=timeout or self.timeout,
-                **kwargs
+                **kwargs,
             )
 
             # Update stats
@@ -258,7 +268,7 @@ class BaseHTTPClient:
             self.stats["errors"] += 1
 
             # Check if we should retry
-            response = getattr(e, 'response', None)
+            response = getattr(e, "response", None)
             if self._should_retry(e, response, retry_count + 1):
                 delay = await self._calculate_delay(retry_count + 1, response)
 
@@ -269,7 +279,15 @@ class BaseHTTPClient:
 
                 await asyncio.sleep(delay)
                 return await self.request(
-                    method, endpoint, data, json, params, headers, timeout, retry_count + 1, **kwargs
+                    method,
+                    endpoint,
+                    data,
+                    json,
+                    params,
+                    headers,
+                    timeout,
+                    retry_count + 1,
+                    **kwargs,
                 )
 
             # No more retries, re-raise the exception
@@ -295,7 +313,7 @@ class BaseHTTPClient:
         """Make DELETE request."""
         return await self.request(HTTPMethod.DELETE, endpoint, **kwargs)
 
-    async def get_json(self, endpoint: str, **kwargs) -> Dict[str, Any]:
+    async def get_json(self, endpoint: str, **kwargs) -> dict[str, Any]:
         """Make GET request and return JSON response."""
         response = await self.get(endpoint, **kwargs)
 
@@ -305,7 +323,7 @@ class BaseHTTPClient:
 
         return response.json()
 
-    async def post_json(self, endpoint: str, **kwargs) -> Dict[str, Any]:
+    async def post_json(self, endpoint: str, **kwargs) -> dict[str, Any]:
         """Make POST request and return JSON response."""
         response = await self.post(endpoint, **kwargs)
 
@@ -315,7 +333,7 @@ class BaseHTTPClient:
 
         return response.json()
 
-    async def put_json(self, endpoint: str, **kwargs) -> Dict[str, Any]:
+    async def put_json(self, endpoint: str, **kwargs) -> dict[str, Any]:
         """Make PUT request and return JSON response."""
         response = await self.put(endpoint, **kwargs)
 
@@ -325,7 +343,7 @@ class BaseHTTPClient:
 
         return response.json()
 
-    async def patch_json(self, endpoint: str, **kwargs) -> Dict[str, Any]:
+    async def patch_json(self, endpoint: str, **kwargs) -> dict[str, Any]:
         """Make PATCH request and return JSON response."""
         response = await self.patch(endpoint, **kwargs)
 
@@ -335,7 +353,7 @@ class BaseHTTPClient:
 
         return response.json()
 
-    def get_stats(self) -> Dict[str, Any]:
+    def get_stats(self) -> dict[str, Any]:
         """Get client statistics."""
         return self.stats.copy()
 
@@ -364,6 +382,7 @@ class GitHubHTTPClient(BaseHTTPClient):
         Args:
             token: GitHub API token
             api_url: GitHub API URL
+
         """
         headers = {
             "Authorization": f"Bearer {token}",
@@ -379,9 +398,8 @@ class GitHubHTTPClient(BaseHTTPClient):
             headers=headers,
             rate_limiter=rate_limiter,
             retry_config=RetryConfig(
-                max_retries=3,
-                retry_on_status=[429, 502, 503, 504, 522, 524]
-            )
+                max_retries=3, retry_on_status=[429, 502, 503, 504, 522, 524]
+            ),
         )
 
 
@@ -394,7 +412,7 @@ class JiraHTTPClient(BaseHTTPClient):
         api_token: str,
         server_url: str,
         is_cloud: bool = True,
-        verify_ssl: bool = True
+        verify_ssl: bool = True,
     ):
         """Initialize JIRA HTTP client.
 
@@ -404,13 +422,13 @@ class JiraHTTPClient(BaseHTTPClient):
             server_url: JIRA server URL
             is_cloud: Whether this is JIRA Cloud
             verify_ssl: Whether to verify SSL certificates
+
         """
-        api_base = f"{server_url}/rest/api/3" if is_cloud else f"{server_url}/rest/api/2"
+        api_base = (
+            f"{server_url}/rest/api/3" if is_cloud else f"{server_url}/rest/api/2"
+        )
 
-        headers = {
-            "Accept": "application/json",
-            "Content-Type": "application/json"
-        }
+        headers = {"Accept": "application/json", "Content-Type": "application/json"}
 
         auth = httpx.BasicAuth(email, api_token)
 
@@ -424,7 +442,6 @@ class JiraHTTPClient(BaseHTTPClient):
             rate_limiter=rate_limiter,
             verify_ssl=verify_ssl,
             retry_config=RetryConfig(
-                max_retries=3,
-                retry_on_status=[429, 502, 503, 504]
-            )
-        )
+                max_retries=3, retry_on_status=[429, 502, 503, 504]
+            ),
+        )