prompture 0.0.33.dev2__py3-none-any.whl → 0.0.34.dev1__py3-none-any.whl

prompture/drivers/hugging_driver.py

@@ -1,14 +1,14 @@
 import os
+from typing import Any
+
 import requests
+
 from ..driver import Driver
-from typing import Any, Dict
 
 
 class HuggingFaceDriver(Driver):
     # Hugging Face is usage-based (credits/subscription), but we set costs to 0 for now.
-    MODEL_PRICING = {
-        "default": {"prompt": 0.0, "completion": 0.0}
-    }
+    MODEL_PRICING = {"default": {"prompt": 0.0, "completion": 0.0}}
 
     def __init__(self, endpoint: str | None = None, token: str | None = None, model: str = "bert-base-uncased"):
         self.endpoint = endpoint or os.getenv("HF_ENDPOINT")
@@ -22,7 +22,7 @@ class HuggingFaceDriver(Driver):
 
         self.headers = {"Authorization": f"Bearer {self.token}"}
 
-    def generate(self, prompt: str, options: Dict[str, Any]) -> Dict[str, Any]:
+    def generate(self, prompt: str, options: dict[str, Any]) -> dict[str, Any]:
         payload = {
             "inputs": prompt,
             "parameters": options,  # HF allows temperature, max_new_tokens, etc. here
@@ -32,7 +32,7 @@ class HuggingFaceDriver(Driver):
             r.raise_for_status()
             response_data = r.json()
         except Exception as e:
-            raise RuntimeError(f"HuggingFaceDriver request failed: {e}")
+            raise RuntimeError(f"HuggingFaceDriver request failed: {e}") from e
 
         # Different HF models return slightly different response formats
         # Text-generation models usually return [{"generated_text": "..."}]

prompture/drivers/lmstudio_driver.py

@@ -1,26 +1,26 @@
-import os
 import json
-import requests
 import logging
+import os
+from typing import Any, Optional
+
+import requests
+
 from ..driver import Driver
-from typing import Any, Dict
 
 logger = logging.getLogger(__name__)
 
 
 class LMStudioDriver(Driver):
+    supports_json_mode = True
+
     # LM Studio is local – costs are always zero.
-    MODEL_PRICING = {
-        "default": {"prompt": 0.0, "completion": 0.0}
-    }
+    MODEL_PRICING = {"default": {"prompt": 0.0, "completion": 0.0}}
 
     def __init__(self, endpoint: str | None = None, model: str = "deepseek/deepseek-r1-0528-qwen3-8b"):
         # Allow override via env var
-        self.endpoint = endpoint or os.getenv(
-            "LMSTUDIO_ENDPOINT", "http://127.0.0.1:1234/v1/chat/completions"
-        )
+        self.endpoint = endpoint or os.getenv("LMSTUDIO_ENDPOINT", "http://127.0.0.1:1234/v1/chat/completions")
         self.model = model
-        self.options: Dict[str, Any] = {}
+        self.options: dict[str, Any] = {}
 
         # Validate connection to LM Studio server
         self._validate_connection()
@@ -38,17 +38,30 @@ class LMStudioDriver(Driver):
         except requests.exceptions.RequestException as e:
             logger.warning(f"Could not validate connection to LM Studio server: {e}")
 
-    def generate(self, prompt: str, options: Dict[str, Any] = None) -> Dict[str, Any]:
+    supports_messages = True
+
+    def generate(self, prompt: str, options: Optional[dict[str, Any]] = None) -> dict[str, Any]:
+        messages = [{"role": "user", "content": prompt}]
+        return self._do_generate(messages, options)
+
+    def generate_messages(self, messages: list[dict[str, str]], options: dict[str, Any]) -> dict[str, Any]:
+        return self._do_generate(messages, options)
+
+    def _do_generate(self, messages: list[dict[str, str]], options: Optional[dict[str, Any]] = None) -> dict[str, Any]:
         merged_options = self.options.copy()
         if options:
             merged_options.update(options)
 
         payload = {
             "model": merged_options.get("model", self.model),
-            "messages": [{"role": "user", "content": prompt}],
+            "messages": messages,
             "temperature": merged_options.get("temperature", 0.7),
         }
 
+        # Native JSON mode support
+        if merged_options.get("json_mode"):
+            payload["response_format"] = {"type": "json_object"}
+
         try:
             logger.debug(f"Sending request to LM Studio endpoint: {self.endpoint}")
             logger.debug(f"Request payload: {payload}")
@@ -70,7 +83,7 @@ class LMStudioDriver(Driver):
             raise
         except Exception as e:
             logger.error(f"Unexpected error in LM Studio request: {e}")
-            raise RuntimeError(f"LM Studio request failed: {e}")
+            raise RuntimeError(f"LM Studio request failed: {e}") from e
 
         # Extract text
         text = response_data["choices"][0]["message"]["content"]

prompture/drivers/local_http_driver.py

@@ -1,27 +1,27 @@
 import os
+from typing import Any
+
 import requests
+
 from ..driver import Driver
-from typing import Any, Dict
 
 
 class LocalHTTPDriver(Driver):
     # Default: no cost; extend if your local service has pricing logic
-    MODEL_PRICING = {
-        "default": {"prompt": 0.0, "completion": 0.0}
-    }
+    MODEL_PRICING = {"default": {"prompt": 0.0, "completion": 0.0}}
 
     def __init__(self, endpoint: str | None = None, model: str = "local-model"):
         self.endpoint = endpoint or os.getenv("LOCAL_HTTP_ENDPOINT", "http://localhost:8000/generate")
         self.model = model
 
-    def generate(self, prompt: str, options: Dict[str, Any]) -> Dict[str, Any]:
+    def generate(self, prompt: str, options: dict[str, Any]) -> dict[str, Any]:
         payload = {"prompt": prompt, "options": options}
         try:
             r = requests.post(self.endpoint, json=payload, timeout=options.get("timeout", 30))
             r.raise_for_status()
             response_data = r.json()
         except Exception as e:
-            raise RuntimeError(f"LocalHTTPDriver request failed: {e}")
+            raise RuntimeError(f"LocalHTTPDriver request failed: {e}") from e
 
         # If the local API already provides {"text": "...", "meta": {...}}, just return it
         if "text" in response_data and "meta" in response_data:

prompture/drivers/ollama_driver.py

@@ -1,38 +1,38 @@
-import os
 import json
-import requests
 import logging
+import os
+from typing import Any, Optional
+
+import requests
+
 from ..driver import Driver
-from typing import Any, Dict
 
 logger = logging.getLogger(__name__)
 
 
 class OllamaDriver(Driver):
+    supports_json_mode = True
+
     # Ollama is free – costs are always zero.
-    MODEL_PRICING = {
-        "default": {"prompt": 0.0, "completion": 0.0}
-    }
+    MODEL_PRICING = {"default": {"prompt": 0.0, "completion": 0.0}}
 
     def __init__(self, endpoint: str | None = None, model: str = "llama3"):
         # Allow override via env var
-        self.endpoint = endpoint or os.getenv(
-            "OLLAMA_ENDPOINT", "http://localhost:11434/api/generate"
-        )
+        self.endpoint = endpoint or os.getenv("OLLAMA_ENDPOINT", "http://localhost:11434/api/generate")
         self.model = model
         self.options = {}  # Initialize empty options dict
-        
+
         # Validate connection to Ollama server
         self._validate_connection()
-        
+
     def _validate_connection(self):
         """Validate connection to the Ollama server."""
         try:
             # Send a simple HEAD request to check if server is accessible
             # Use the base API endpoint without the specific path
-            base_url = self.endpoint.split('/api/')[0]
+            base_url = self.endpoint.split("/api/")[0]
             health_url = f"{base_url}/api/version"
-            
+
             logger.debug(f"Validating connection to Ollama server at: {health_url}")
             response = requests.head(health_url, timeout=5)
             response.raise_for_status()
@@ -42,7 +42,9 @@ class OllamaDriver(Driver):
             # We don't raise an error here to allow for delayed server startup
             # The actual error will be raised when generate() is called
 
-    def generate(self, prompt: str, options: Dict[str, Any] = None) -> Dict[str, Any]:
+    supports_messages = True
+
+    def generate(self, prompt: str, options: Optional[dict[str, Any]] = None) -> dict[str, Any]:
         # Merge instance options with call-specific options
         merged_options = self.options.copy()
         if options:
@@ -54,6 +56,10 @@ class OllamaDriver(Driver):
             "stream": False,
         }
 
+        # Native JSON mode support
+        if merged_options.get("json_mode"):
+            payload["format"] = "json"
+
         # Add any Ollama-specific options from merged_options
         if "temperature" in merged_options:
             payload["temperature"] = merged_options["temperature"]
@@ -65,21 +71,21 @@ class OllamaDriver(Driver):
         try:
             logger.debug(f"Sending request to Ollama endpoint: {self.endpoint}")
             logger.debug(f"Request payload: {payload}")
-            
+
             r = requests.post(self.endpoint, json=payload, timeout=120)
             logger.debug(f"Response status code: {r.status_code}")
-            
+
             r.raise_for_status()
-            
+
             response_text = r.text
             logger.debug(f"Raw response text: {response_text}")
-            
+
             response_data = r.json()
             logger.debug(f"Parsed response data: {response_data}")
-            
+
             if not isinstance(response_data, dict):
                 raise ValueError(f"Expected dict response, got {type(response_data)}")
-                
+
         except requests.exceptions.ConnectionError as e:
             logger.error(f"Connection error to Ollama endpoint: {e}")
             # Preserve original exception
@@ -91,11 +97,11 @@ class OllamaDriver(Driver):
         except json.JSONDecodeError as e:
             logger.error(f"Failed to decode JSON response: {e}")
             # Re-raise JSONDecodeError with more context
-            raise json.JSONDecodeError(f"Invalid JSON response from Ollama: {e.msg}", e.doc, e.pos)
+            raise json.JSONDecodeError(f"Invalid JSON response from Ollama: {e.msg}", e.doc, e.pos) from e
         except Exception as e:
             logger.error(f"Unexpected error in Ollama request: {e}")
             # Only wrap unknown exceptions in RuntimeError
-            raise RuntimeError(f"Ollama request failed: {e}")
+            raise RuntimeError(f"Ollama request failed: {e}") from e
 
         # Extract token counts
         prompt_tokens = response_data.get("prompt_eval_count", 0)
@@ -113,4 +119,65 @@ class OllamaDriver(Driver):
         }
 
         # Ollama returns text in "response"
-        return {"text": response_data.get("response", ""), "meta": meta}
+        return {"text": response_data.get("response", ""), "meta": meta}
+
+    def generate_messages(self, messages: list[dict[str, str]], options: dict[str, Any]) -> dict[str, Any]:
+        """Use Ollama's /api/chat endpoint for multi-turn conversations."""
+        merged_options = self.options.copy()
+        if options:
+            merged_options.update(options)
+
+        # Derive the chat endpoint from the generate endpoint
+        chat_endpoint = self.endpoint.replace("/api/generate", "/api/chat")
+
+        payload: dict[str, Any] = {
+            "model": merged_options.get("model", self.model),
+            "messages": messages,
+            "stream": False,
+        }
+
+        # Native JSON mode support
+        if merged_options.get("json_mode"):
+            payload["format"] = "json"
+
+        if "temperature" in merged_options:
+            payload["temperature"] = merged_options["temperature"]
+        if "top_p" in merged_options:
+            payload["top_p"] = merged_options["top_p"]
+        if "top_k" in merged_options:
+            payload["top_k"] = merged_options["top_k"]
+
+        try:
+            logger.debug(f"Sending chat request to Ollama endpoint: {chat_endpoint}")
+            r = requests.post(chat_endpoint, json=payload, timeout=120)
+            r.raise_for_status()
+            response_data = r.json()
+
+            if not isinstance(response_data, dict):
+                raise ValueError(f"Expected dict response, got {type(response_data)}")
+        except requests.exceptions.ConnectionError:
+            raise
+        except requests.exceptions.HTTPError:
+            raise
+        except json.JSONDecodeError as e:
+            raise json.JSONDecodeError(f"Invalid JSON response from Ollama: {e.msg}", e.doc, e.pos) from e
+        except Exception as e:
+            raise RuntimeError(f"Ollama chat request failed: {e}") from e
+
+        prompt_tokens = response_data.get("prompt_eval_count", 0)
+        completion_tokens = response_data.get("eval_count", 0)
+        total_tokens = prompt_tokens + completion_tokens
+
+        meta = {
+            "prompt_tokens": prompt_tokens,
+            "completion_tokens": completion_tokens,
+            "total_tokens": total_tokens,
+            "cost": 0.0,
+            "raw_response": response_data,
+            "model_name": merged_options.get("model", self.model),
+        }
+
+        # Chat endpoint returns response in message.content
+        message = response_data.get("message", {})
+        text = message.get("content", "")
+        return {"text": text, "meta": meta}

prompture/drivers/openai_driver.py

@@ -1,17 +1,23 @@
 """Minimal OpenAI driver (migrated to openai>=1.0.0).
 Requires the `openai` package. Uses OPENAI_API_KEY env var.
 """
+
 import os
-from typing import Any, Dict
+from typing import Any
+
 try:
     from openai import OpenAI
 except Exception:
     OpenAI = None
 
+from ..cost_mixin import CostMixin
 from ..driver import Driver
 
 
-class OpenAIDriver(Driver):
+class OpenAIDriver(CostMixin, Driver):
+    supports_json_mode = True
+    supports_json_schema = True
+
     # Approximate pricing per 1K tokens (keep updated with OpenAI's official pricing)
     # Each model entry also defines which token parameter it supports and
     # whether it accepts temperature.
@@ -62,7 +68,16 @@ class OpenAIDriver(Driver):
         else:
             self.client = None
 
-    def generate(self, prompt: str, options: Dict[str, Any]) -> Dict[str, Any]:
+    supports_messages = True
+
+    def generate(self, prompt: str, options: dict[str, Any]) -> dict[str, Any]:
+        messages = [{"role": "user", "content": prompt}]
+        return self._do_generate(messages, options)
+
+    def generate_messages(self, messages: list[dict[str, str]], options: dict[str, Any]) -> dict[str, Any]:
+        return self._do_generate(messages, options)
+
+    def _do_generate(self, messages: list[dict[str, str]], options: dict[str, Any]) -> dict[str, Any]:
         if self.client is None:
             raise RuntimeError("openai package (>=1.0.0) is not installed")
 
@@ -79,7 +94,7 @@ class OpenAIDriver(Driver):
         # Base kwargs
         kwargs = {
             "model": model,
-            "messages": [{"role": "user", "content": prompt}],
+            "messages": messages,
         }
 
         # Assign token limit with the correct parameter name
@@ -89,6 +104,21 @@ class OpenAIDriver(Driver):
         if supports_temperature and "temperature" in opts:
             kwargs["temperature"] = opts["temperature"]
 
+        # Native JSON mode support
+        if options.get("json_mode"):
+            json_schema = options.get("json_schema")
+            if json_schema:
+                kwargs["response_format"] = {
+                    "type": "json_schema",
+                    "json_schema": {
+                        "name": "extraction",
+                        "strict": True,
+                        "schema": json_schema,
+                    },
+                }
+            else:
+                kwargs["response_format"] = {"type": "json_object"}
+
         resp = self.client.chat.completions.create(**kwargs)
 
         # Extract usage info
@@ -97,17 +127,8 @@ class OpenAIDriver(Driver):
         completion_tokens = getattr(usage, "completion_tokens", 0)
         total_tokens = getattr(usage, "total_tokens", 0)
 
-        # Calculate cost — try live rates first (per 1M tokens), fall back to hardcoded (per 1K tokens)
-        from ..model_rates import get_model_rates
-        live_rates = get_model_rates("openai", model)
-        if live_rates:
-            prompt_cost = (prompt_tokens / 1_000_000) * live_rates["input"]
-            completion_cost = (completion_tokens / 1_000_000) * live_rates["output"]
-        else:
-            model_pricing = self.MODEL_PRICING.get(model, {"prompt": 0, "completion": 0})
-            prompt_cost = (prompt_tokens / 1000) * model_pricing["prompt"]
-            completion_cost = (completion_tokens / 1000) * model_pricing["completion"]
-        total_cost = prompt_cost + completion_cost
+        # Calculate cost via shared mixin
+        total_cost = self._calculate_cost("openai", model, prompt_tokens, completion_tokens)
 
         # Standardized meta object
         meta = {

prompture/drivers/openrouter_driver.py

@@ -1,14 +1,19 @@
 """OpenRouter driver implementation.
 Requires the `requests` package. Uses OPENROUTER_API_KEY env var.
 """
+
 import os
-from typing import Any, Dict
+from typing import Any
+
 import requests
 
+from ..cost_mixin import CostMixin
 from ..driver import Driver
 
 
-class OpenRouterDriver(Driver):
+class OpenRouterDriver(CostMixin, Driver):
+    supports_json_mode = True
+
     # Approximate pricing per 1K tokens based on OpenRouter's pricing
     # https://openrouter.ai/docs#pricing
     MODEL_PRICING = {
@@ -40,7 +45,7 @@ class OpenRouterDriver(Driver):
 
     def __init__(self, api_key: str | None = None, model: str = "openai/gpt-3.5-turbo"):
         """Initialize OpenRouter driver.
-        
+
         Args:
             api_key: OpenRouter API key. If not provided, will look for OPENROUTER_API_KEY env var
             model: Model to use. Defaults to openai/gpt-3.5-turbo
@@ -48,10 +53,10 @@ class OpenRouterDriver(Driver):
         self.api_key = api_key or os.getenv("OPENROUTER_API_KEY")
         if not self.api_key:
             raise ValueError("OpenRouter API key not found. Set OPENROUTER_API_KEY env var.")
-        
+
         self.model = model
         self.base_url = "https://openrouter.ai/api/v1"
-        
+
         # Required headers for OpenRouter
         self.headers = {
             "Authorization": f"Bearer {self.api_key}",
@@ -59,21 +64,21 @@ class OpenRouterDriver(Driver):
             "Content-Type": "application/json",
         }
 
-    def generate(self, prompt: str, options: Dict[str, Any]) -> Dict[str, Any]:
-        """Generate completion using OpenRouter API.
-        
-        Args:
-            prompt: The prompt text
-            options: Generation options
-            
-        Returns:
-            Dict containing generated text and metadata
-        """
+    supports_messages = True
+
+    def generate(self, prompt: str, options: dict[str, Any]) -> dict[str, Any]:
+        messages = [{"role": "user", "content": prompt}]
+        return self._do_generate(messages, options)
+
+    def generate_messages(self, messages: list[dict[str, str]], options: dict[str, Any]) -> dict[str, Any]:
+        return self._do_generate(messages, options)
+
+    def _do_generate(self, messages: list[dict[str, str]], options: dict[str, Any]) -> dict[str, Any]:
         if not self.api_key:
             raise RuntimeError("OpenRouter API key not found")
 
         model = options.get("model", self.model)
-        
+
         # Lookup model-specific config
         model_info = self.MODEL_PRICING.get(model, {})
         tokens_param = model_info.get("tokens_param", "max_tokens")
@@ -85,7 +90,7 @@ class OpenRouterDriver(Driver):
         # Base request data
         data = {
             "model": model,
-            "messages": [{"role": "user", "content": prompt}],
+            "messages": messages,
         }
 
         # Add token limit with correct parameter name
@@ -95,6 +100,10 @@ class OpenRouterDriver(Driver):
         if supports_temperature and "temperature" in opts:
             data["temperature"] = opts["temperature"]
 
+        # Native JSON mode support
+        if options.get("json_mode"):
+            data["response_format"] = {"type": "json_object"}
+
         try:
             response = requests.post(
                 f"{self.base_url}/chat/completions",
@@ -110,17 +119,8 @@ class OpenRouterDriver(Driver):
             completion_tokens = usage.get("completion_tokens", 0)
             total_tokens = usage.get("total_tokens", 0)
 
-            # Calculate cost — try live rates first (per 1M tokens), fall back to hardcoded (per 1K tokens)
-            from ..model_rates import get_model_rates
-            live_rates = get_model_rates("openrouter", model)
-            if live_rates:
-                prompt_cost = (prompt_tokens / 1_000_000) * live_rates["input"]
-                completion_cost = (completion_tokens / 1_000_000) * live_rates["output"]
-            else:
-                model_pricing = self.MODEL_PRICING.get(model, {"prompt": 0, "completion": 0})
-                prompt_cost = (prompt_tokens / 1000) * model_pricing["prompt"]
-                completion_cost = (completion_tokens / 1000) * model_pricing["completion"]
-            total_cost = prompt_cost + completion_cost
+            # Calculate cost via shared mixin
+            total_cost = self._calculate_cost("openrouter", model, prompt_tokens, completion_tokens)
 
             # Standardized meta object
             meta = {
@@ -136,11 +136,11 @@ class OpenRouterDriver(Driver):
             return {"text": text, "meta": meta}
 
         except requests.exceptions.RequestException as e:
-            error_msg = f"OpenRouter API request failed: {str(e)}"
-            if hasattr(e.response, 'json'):
+            error_msg = f"OpenRouter API request failed: {e!s}"
+            if hasattr(e.response, "json"):
                 try:
                     error_details = e.response.json()
                     error_msg = f"{error_msg} - {error_details.get('error', {}).get('message', '')}"
                 except Exception:
                     pass
-            raise RuntimeError(error_msg) from e
+            raise RuntimeError(error_msg) from e