prompture 0.0.25.dev2__tar.gz → 0.0.26.dev2__tar.gz

{prompture-0.0.25.dev2 → prompture-0.0.26.dev2}/.env.copy

@@ -19,6 +19,11 @@ CLAUDE_MODEL=claude-3-sonnet-20240229
 OLLAMA_URI=http://localhost:11434
 OLLAMA_MODEL=gemma:latest
 
+# LM Studio Configuration
+# Required if AI_PROVIDER=lmstudio
+LMSTUDIO_ENDPOINT=http://127.0.0.1:1234/v1/chat/completions
+LMSTUDIO_MODEL=deepseek/deepseek-r1-0528-qwen3-8b
+
 # Azure OpenAI Configuration
 AZURE_API_KEY=
 AZURE_API_ENDPOINT=
@@ -32,4 +37,24 @@ HF_TOKEN=
 
 # Local HTTP Configuration
 LOCAL_HTTP_ENDPOINT=http://localhost:8000/generate
-LOCAL_HTTP_MODEL=local-model
+LOCAL_HTTP_MODEL=local-model
+
+# Google Configuration
+# Required if AI_PROVIDER=google
+GOOGLE_API_KEY=your-api-key-here
+GOOGLE_MODEL=gemini-1.5-pro
+
+# Groq Configuration
+# Required if AI_PROVIDER=groq
+GROQ_API_KEY=your-api-key-here
+GROQ_MODEL=llama2-70b-4096
+
+# OpenRouter Configuration
+# Required if AI_PROVIDER=openrouter
+OPENROUTER_API_KEY=your-api-key-here
+OPENROUTER_MODEL=openai/gpt-3.5-turbo
+
+# Grok Configuration
+# Required if AI_PROVIDER=grok
+GROK_API_KEY=your-api-key-here
+GROK_MODEL=grok-4-fast-reasoning

{prompture-0.0.25.dev2 → prompture-0.0.26.dev2}/.github/scripts/update_wrapper_version.py

@@ -15,8 +15,12 @@ def main():
     # Update version
     data["project"]["version"] = new_version
 
-    # Optionally update dependencies here if needed
-    # Example: data["project"]["dependencies"] = ["prompture>=" + new_version]
+    # Update prompture dependency
+    if "dependencies" in data["project"]:
+        for i, dep in enumerate(data["project"]["dependencies"]):
+            if dep.startswith("prompture"):
+                data["project"]["dependencies"][i] = f"prompture>={new_version}"
+                break
 
     with open(PYPROJECT_PATH, "w", encoding="utf-8") as f:
         toml.dump(data, f)

{prompture-0.0.25.dev2 → prompture-0.0.26.dev2}/.github/workflows/publish.yml

@@ -91,10 +91,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: v${{ steps.bump_version.outputs.new_version }}
-          release_name: Release v${{ steps.bump_version.outputs.new_version }}
-          body: |
-            # ${{ steps.fetch_pr.outputs.result != 'null' && fromJSON(steps.fetch_pr.outputs.result).title || 'New Release' }}
-            
+          release_name: v${{ steps.bump_version.outputs.new_version }}
+          body: |            
             ## Changes
             ${{ steps.fetch_pr.outputs.result != 'null' && fromJSON(steps.fetch_pr.outputs.result).body || 'Version update' }}
             
@@ -148,6 +146,7 @@ jobs:
         run: |
           NEW_VERSION=${{ steps.bump_version.outputs.new_version }}
           echo "Pinning wrapper to version $NEW_VERSION"
+          pip install toml
           python .github/scripts/update_wrapper_version.py "$NEW_VERSION"
 
       # Build wrapper package --------------------------------------------------

{prompture-0.0.25.dev2 → prompture-0.0.26.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: prompture
-Version: 0.0.25.dev2
+Version: 0.0.26.dev2
 Summary: Ask LLMs to return structured JSON and run cross-model tests. API-first.
 Home-page: https://github.com/jhd3197/prompture
 Author: Juan Denis
@@ -13,6 +13,8 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: anthropic>=0.8.0
 Requires-Dist: click>=8.0
+Requires-Dist: google-generativeai>=0.3.0
+Requires-Dist: groq>=0.4.0
 Requires-Dist: httpx>=0.25.0
 Requires-Dist: jsonschema>=4.0
 Requires-Dist: openai>=1.0.0
@@ -44,7 +46,7 @@ Dynamic: summary
 
 - ✅ **Structured output** → JSON schema enforcement, or direct **Pydantic** instances
 - ✅ **Stepwise extraction** → Per-field prompts, with smart type conversion (incl. shorthand numbers)
-- ✅ **Multi-driver** → OpenAI, Azure, Claude, Ollama, HTTP, Mock, HuggingFace (via `get_driver()`)
+- ✅ **Multi-driver** → OpenAI, Azure, Claude, Ollama, LM Studio, Google, Groq, OpenRouter, Grok, HTTP, Mock, HuggingFace (via `get_driver()`)
 - ✅ **Usage & cost** → Token + $ tracking on every call (`usage` from driver meta)
 - ✅ **AI cleanup** → Optional LLM pass to fix malformed JSON
 - ✅ **Batch testing** → Define suites and compare models (spec-driven)
@@ -72,27 +74,39 @@ pip install prompture
 
 ## Configure a Provider
 
-`get_driver()` (used by high-level helpers) selects a driver from env:
+Model names now support provider prefixes (e.g., "ollama/llama3.1:8b"). The `get_driver_for_model()` function automatically selects the appropriate driver based on the provider prefix.
+
+You can configure providers either through environment variables or by using provider-prefixed model names:
 
 ```bash
-# One of: ollama | openai | azure | claude | http | huggingface
-export AI_PROVIDER=ollama
+# Environment variable approach:
+export AI_PROVIDER=ollama  # One of: ollama | openai | azure | claude | google | groq | openrouter | grok | lmstudio | http | huggingface
 
 # Only if the provider needs them:
 export OPENAI_API_KEY=...
 export AZURE_OPENAI_ENDPOINT=...
 export AZURE_OPENAI_API_KEY=...
 export ANTHROPIC_API_KEY=...
+export GOOGLE_API_KEY=...
+export GROQ_API_KEY=...
+export OPENROUTER_API_KEY=...
+export GROK_API_KEY=...
+export LMSTUDIO_ENDPOINT=...
 ```
 
-| Provider (AI_PROVIDER) | Example models              | Cost calc       |
-| ---------------------- | --------------------------- | --------------- |
-| `ollama`               | `llama3.1:8b`, `qwen2.5:3b` | `$0.00` (local) |
-| `openai`               | `gpt-*`                     | Automatic       |
-| `azure`                | Deployed names              | Automatic       |
-| `claude`               | `claude-*`                  | Automatic       |
-| `huggingface`          | local/endpoint              | `$0.00` (local) |
-| `http`                 | self-hosted                 | `$0.00`         |
+| Provider | Example models                        | Cost calc       |
+| -------- | ------------------------------------- | --------------- |
+| `ollama` | `ollama/llama3.1:8b`, `ollama/qwen2.5:3b` | `$0.00` (local) |
+| `openai` | `openai/gpt-4`, `openai/gpt-3.5-turbo` | Automatic       |
+| `azure`  | `azure/deployed-name`                  | Automatic       |
+| `claude` | `claude/claude-3`                      | Automatic       |
+| `google` | `google/gemini-1.5-pro`, `google/gemini-1.5-flash` | Automatic |
+| `groq` | `groq/llama2-70b-4096`, `groq/mixtral-8x7b-32768` | Automatic |
+| `openrouter` | `openrouter/openai/gpt-3.5-turbo`, `openrouter/anthropic/claude-2` | Automatic |
+| `grok` | `grok/grok-4-fast-reasoning`, `grok/grok-3-mini` | Automatic |
+| `lmstudio` | `lmstudio/local-model` | `$0.00` (local) |
+| `huggingface` | `hf/local-or-endpoint`            | `$0.00` (local) |
+| `http`   | `http/self-hosted`                     | `$0.00`         |
 
 ---
 
@@ -115,8 +129,8 @@ class Person(BaseModel):
 
 text = "Maria is 32, a software developer in New York. She loves hiking and photography."
 
-# Uses get_driver() internally (AI_PROVIDER). You can still pass driver/model_name.
-person = extract_with_model(Person, text, model_name="gpt-oss:20b")
+# Uses get_driver_for_model() internally based on model name prefix
+person = extract_with_model(Person, text, model_name="ollama/gpt-oss:20b")
 print(person.dict())
 ```
 
@@ -127,14 +141,11 @@ print(person.dict())
 ## JSON-first (low-level primitives)
 
 When you want raw JSON with a schema and full control, use `ask_for_json` or `extract_and_jsonify`.
-**Note:** these require an explicit `driver`.
 
 ```python
 from prompture.drivers import get_driver
 from prompture import ask_for_json, extract_and_jsonify
 
-driver = get_driver("ollama")  # or "openai", "azure", etc.
-
 schema = {
     "type": "object",
     "required": ["name", "age"],
@@ -146,19 +157,17 @@ schema = {
 
 # 1) ask_for_json: you provide the full content prompt
 resp1 = ask_for_json(
-    driver=driver,
     content_prompt="Extract the person's info from: John is 28 and lives in Miami.",
     json_schema=schema,
-    options={"model": "llama3.1:8b"}
+    model_name="google/gemini-1.5-pro"
 )
 print(resp1["json_object"], resp1["usage"])
 
 # 2) extract_and_jsonify: you provide text & an instruction template; it builds the prompt
 resp2 = extract_and_jsonify(
-    driver=driver,
     text="John is 28 and lives in Miami.",
     json_schema=schema,
-    model_name="llama3.1:8b",
+    model_name="groq/mixtral-8x7b-32768",
     instruction_template="Extract the person's information:"
 )
 print(resp2["json_object"], resp2["usage"])
@@ -204,10 +213,10 @@ Prompture supports two Pydantic extraction modes:
 ```python
 from prompture import extract_with_model, stepwise_extract_with_model
 
-person1 = extract_with_model(Person, text, model_name="gpt-oss:20b")
+person1 = extract_with_model(Person, text, model_name="openrouter/anthropic/claude-2")
 print(person1.dict())
 
-res = stepwise_extract_with_model(Person, text, model_name="gpt-oss:20b")
+res = stepwise_extract_with_model(Person, text, model_name="grok/grok-4-fast-reasoning")
 print(res["model"].dict())
 print(res["usage"])  # includes per-field usage and totals
 ```

{prompture-0.0.25.dev2 → prompture-0.0.26.dev2}/README.md

@@ -6,7 +6,7 @@
 
 - ✅ **Structured output** → JSON schema enforcement, or direct **Pydantic** instances
 - ✅ **Stepwise extraction** → Per-field prompts, with smart type conversion (incl. shorthand numbers)
-- ✅ **Multi-driver** → OpenAI, Azure, Claude, Ollama, HTTP, Mock, HuggingFace (via `get_driver()`)
+- ✅ **Multi-driver** → OpenAI, Azure, Claude, Ollama, LM Studio, Google, Groq, OpenRouter, Grok, HTTP, Mock, HuggingFace (via `get_driver()`)
 - ✅ **Usage & cost** → Token + $ tracking on every call (`usage` from driver meta)
 - ✅ **AI cleanup** → Optional LLM pass to fix malformed JSON
 - ✅ **Batch testing** → Define suites and compare models (spec-driven)
@@ -34,27 +34,39 @@ pip install prompture
 
 ## Configure a Provider
 
-`get_driver()` (used by high-level helpers) selects a driver from env:
+Model names now support provider prefixes (e.g., "ollama/llama3.1:8b"). The `get_driver_for_model()` function automatically selects the appropriate driver based on the provider prefix.
+
+You can configure providers either through environment variables or by using provider-prefixed model names:
 
 ```bash
-# One of: ollama | openai | azure | claude | http | huggingface
-export AI_PROVIDER=ollama
+# Environment variable approach:
+export AI_PROVIDER=ollama  # One of: ollama | openai | azure | claude | google | groq | openrouter | grok | lmstudio | http | huggingface
 
 # Only if the provider needs them:
 export OPENAI_API_KEY=...
 export AZURE_OPENAI_ENDPOINT=...
 export AZURE_OPENAI_API_KEY=...
 export ANTHROPIC_API_KEY=...
+export GOOGLE_API_KEY=...
+export GROQ_API_KEY=...
+export OPENROUTER_API_KEY=...
+export GROK_API_KEY=...
+export LMSTUDIO_ENDPOINT=...
 ```
 
-| Provider (AI_PROVIDER) | Example models              | Cost calc       |
-| ---------------------- | --------------------------- | --------------- |
-| `ollama`               | `llama3.1:8b`, `qwen2.5:3b` | `$0.00` (local) |
-| `openai`               | `gpt-*`                     | Automatic       |
-| `azure`                | Deployed names              | Automatic       |
-| `claude`               | `claude-*`                  | Automatic       |
-| `huggingface`          | local/endpoint              | `$0.00` (local) |
-| `http`                 | self-hosted                 | `$0.00`         |
+| Provider | Example models                        | Cost calc       |
+| -------- | ------------------------------------- | --------------- |
+| `ollama` | `ollama/llama3.1:8b`, `ollama/qwen2.5:3b` | `$0.00` (local) |
+| `openai` | `openai/gpt-4`, `openai/gpt-3.5-turbo` | Automatic       |
+| `azure`  | `azure/deployed-name`                  | Automatic       |
+| `claude` | `claude/claude-3`                      | Automatic       |
+| `google` | `google/gemini-1.5-pro`, `google/gemini-1.5-flash` | Automatic |
+| `groq` | `groq/llama2-70b-4096`, `groq/mixtral-8x7b-32768` | Automatic |
+| `openrouter` | `openrouter/openai/gpt-3.5-turbo`, `openrouter/anthropic/claude-2` | Automatic |
+| `grok` | `grok/grok-4-fast-reasoning`, `grok/grok-3-mini` | Automatic |
+| `lmstudio` | `lmstudio/local-model` | `$0.00` (local) |
+| `huggingface` | `hf/local-or-endpoint`            | `$0.00` (local) |
+| `http`   | `http/self-hosted`                     | `$0.00`         |
 
 ---
 
@@ -77,8 +89,8 @@ class Person(BaseModel):
 
 text = "Maria is 32, a software developer in New York. She loves hiking and photography."
 
-# Uses get_driver() internally (AI_PROVIDER). You can still pass driver/model_name.
-person = extract_with_model(Person, text, model_name="gpt-oss:20b")
+# Uses get_driver_for_model() internally based on model name prefix
+person = extract_with_model(Person, text, model_name="ollama/gpt-oss:20b")
 print(person.dict())
 ```
 
@@ -89,14 +101,11 @@ print(person.dict())
 ## JSON-first (low-level primitives)
 
 When you want raw JSON with a schema and full control, use `ask_for_json` or `extract_and_jsonify`.
-**Note:** these require an explicit `driver`.
 
 ```python
 from prompture.drivers import get_driver
 from prompture import ask_for_json, extract_and_jsonify
 
-driver = get_driver("ollama")  # or "openai", "azure", etc.
-
 schema = {
     "type": "object",
     "required": ["name", "age"],
@@ -108,19 +117,17 @@ schema = {
 
 # 1) ask_for_json: you provide the full content prompt
 resp1 = ask_for_json(
-    driver=driver,
     content_prompt="Extract the person's info from: John is 28 and lives in Miami.",
     json_schema=schema,
-    options={"model": "llama3.1:8b"}
+    model_name="google/gemini-1.5-pro"
 )
 print(resp1["json_object"], resp1["usage"])
 
 # 2) extract_and_jsonify: you provide text & an instruction template; it builds the prompt
 resp2 = extract_and_jsonify(
-    driver=driver,
     text="John is 28 and lives in Miami.",
     json_schema=schema,
-    model_name="llama3.1:8b",
+    model_name="groq/mixtral-8x7b-32768",
     instruction_template="Extract the person's information:"
 )
 print(resp2["json_object"], resp2["usage"])
@@ -166,10 +173,10 @@ Prompture supports two Pydantic extraction modes:
 ```python
 from prompture import extract_with_model, stepwise_extract_with_model
 
-person1 = extract_with_model(Person, text, model_name="gpt-oss:20b")
+person1 = extract_with_model(Person, text, model_name="openrouter/anthropic/claude-2")
 print(person1.dict())
 
-res = stepwise_extract_with_model(Person, text, model_name="gpt-oss:20b")
+res = stepwise_extract_with_model(Person, text, model_name="grok/grok-4-fast-reasoning")
 print(res["model"].dict())
 print(res["usage"])  # includes per-field usage and totals
 ```
@@ -253,4 +260,4 @@ This example script compares multiple Ollama models on a complex task of extract
 
 ## Contributing
 
-PRs welcome! Add tests and—if adding drivers or patterns—drop an example under `examples/`.
+PRs welcome! Add tests and—if adding drivers or patterns—drop an example under `examples/`.