prompture 0.0.42.dev1__tar.gz → 0.0.45.dev1__tar.gz

{prompture-0.0.42.dev1/prompture.egg-info → prompture-0.0.45.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: prompture
-Version: 0.0.42.dev1
+Version: 0.0.45.dev1
 Summary: Ask LLMs to return structured JSON and run cross-model tests. API-first.
 Author-email: Juan Denis <juan@vene.co>
 License-Expression: MIT

{prompture-0.0.42.dev1 → prompture-0.0.45.dev1}/prompture/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.0.42.dev1'
-__version_tuple__ = version_tuple = (0, 0, 42, 'dev1')
+__version__ = version = '0.0.45.dev1'
+__version_tuple__ = version_tuple = (0, 0, 45, 'dev1')
 
 __commit_id__ = commit_id = None

{prompture-0.0.42.dev1 → prompture-0.0.45.dev1}/prompture/async_groups.py

@@ -70,6 +70,27 @@ class ParallelGroup:
         """Request graceful shutdown."""
         self._stop_requested = True
 
+    @property
+    def shared_state(self) -> dict[str, Any]:
+        """Return a copy of the current shared execution state."""
+        return dict(self._state)
+
+    def inject_state(self, state: dict[str, Any], *, recursive: bool = False) -> None:
+        """Merge external key-value pairs into this group's shared state.
+
+        Existing keys are NOT overwritten (uses setdefault semantics).
+
+        Args:
+            state: Key-value pairs to inject.
+            recursive: If True, also inject into nested sub-groups.
+        """
+        for k, v in state.items():
+            self._state.setdefault(k, v)
+        if recursive:
+            for agent, _ in self._agents:
+                if hasattr(agent, "inject_state"):
+                    agent.inject_state(state, recursive=True)
+
     async def run_async(self, prompt: str = "") -> GroupResult:
         """Execute all agents concurrently."""
         self._stop_requested = False
@@ -213,6 +234,27 @@ class AsyncSequentialGroup:
     def stop(self) -> None:
         self._stop_requested = True
 
+    @property
+    def shared_state(self) -> dict[str, Any]:
+        """Return a copy of the current shared execution state."""
+        return dict(self._state)
+
+    def inject_state(self, state: dict[str, Any], *, recursive: bool = False) -> None:
+        """Merge external key-value pairs into this group's shared state.
+
+        Existing keys are NOT overwritten (uses setdefault semantics).
+
+        Args:
+            state: Key-value pairs to inject.
+            recursive: If True, also inject into nested sub-groups.
+        """
+        for k, v in state.items():
+            self._state.setdefault(k, v)
+        if recursive:
+            for agent, _ in self._agents:
+                if hasattr(agent, "inject_state"):
+                    agent.inject_state(state, recursive=True)
+
     async def run(self, prompt: str = "") -> GroupResult:
         """Execute all agents in sequence (async)."""
         self._stop_requested = False
@@ -351,6 +393,27 @@ class AsyncLoopGroup:
     def stop(self) -> None:
         self._stop_requested = True
 
+    @property
+    def shared_state(self) -> dict[str, Any]:
+        """Return a copy of the current shared execution state."""
+        return dict(self._state)
+
+    def inject_state(self, state: dict[str, Any], *, recursive: bool = False) -> None:
+        """Merge external key-value pairs into this group's shared state.
+
+        Existing keys are NOT overwritten (uses setdefault semantics).
+
+        Args:
+            state: Key-value pairs to inject.
+            recursive: If True, also inject into nested sub-groups.
+        """
+        for k, v in state.items():
+            self._state.setdefault(k, v)
+        if recursive:
+            for agent, _ in self._agents:
+                if hasattr(agent, "inject_state"):
+                    agent.inject_state(state, recursive=True)
+
     async def run(self, prompt: str = "") -> GroupResult:
         """Execute the loop (async)."""
         self._stop_requested = False

{prompture-0.0.42.dev1 → prompture-0.0.45.dev1}/prompture/discovery.py

@@ -10,6 +10,7 @@ from typing import Any, overload
 import requests
 
 from .drivers import (
+    AirLLMDriver,
     AzureDriver,
     ClaudeDriver,
     GoogleDriver,
@@ -17,9 +18,12 @@ from .drivers import (
     GroqDriver,
     LMStudioDriver,
     LocalHTTPDriver,
+    ModelScopeDriver,
+    MoonshotDriver,
     OllamaDriver,
     OpenAIDriver,
     OpenRouterDriver,
+    ZaiDriver,
 )
 from .settings import settings
 
@@ -71,6 +75,10 @@ def get_available_models(
         "ollama": OllamaDriver,
         "lmstudio": LMStudioDriver,
         "local_http": LocalHTTPDriver,
+        "moonshot": MoonshotDriver,
+        "zai": ZaiDriver,
+        "modelscope": ModelScopeDriver,
+        "airllm": AirLLMDriver,
     }
 
     for provider, driver_cls in provider_classes.items():
@@ -102,6 +110,18 @@ def get_available_models(
             elif provider == "grok":
                 if settings.grok_api_key or os.getenv("GROK_API_KEY"):
                     is_configured = True
+            elif provider == "moonshot":
+                if settings.moonshot_api_key or os.getenv("MOONSHOT_API_KEY"):
+                    is_configured = True
+            elif provider == "zai":
+                if settings.zhipu_api_key or os.getenv("ZHIPU_API_KEY"):
+                    is_configured = True
+            elif provider == "modelscope":
+                if settings.modelscope_api_key or os.getenv("MODELSCOPE_API_KEY"):
+                    is_configured = True
+            elif provider == "airllm":
+                # AirLLM runs locally, always considered configured
+                is_configured = True
             elif (
                 provider == "ollama"
                 or provider == "lmstudio"

{prompture-0.0.42.dev1 → prompture-0.0.45.dev1}/prompture/drivers/async_moonshot_driver.py

@@ -85,20 +85,31 @@ class AsyncMoonshotDriver(CostMixin, AsyncDriver):
         if supports_temperature and "temperature" in opts:
             data["temperature"] = opts["temperature"]
 
+        # Native JSON mode support — skip for reasoning models where
+        # Moonshot's API does not reliably support response_format.
         if options.get("json_mode"):
-            json_schema = options.get("json_schema")
-            if json_schema:
-                schema_copy = prepare_strict_schema(json_schema)
-                data["response_format"] = {
-                    "type": "json_schema",
-                    "json_schema": {
-                        "name": "extraction",
-                        "strict": True,
-                        "schema": schema_copy,
-                    },
-                }
-            else:
-                data["response_format"] = {"type": "json_object"}
+            from ..model_rates import get_model_capabilities
+
+            caps = get_model_capabilities("moonshot", model)
+            is_reasoning = caps is not None and caps.is_reasoning is True
+            model_supports_structured = (
+                caps is None or caps.supports_structured_output is not False
+            ) and not is_reasoning
+
+            if model_supports_structured:
+                json_schema = options.get("json_schema")
+                if json_schema:
+                    schema_copy = prepare_strict_schema(json_schema)
+                    data["response_format"] = {
+                        "type": "json_schema",
+                        "json_schema": {
+                            "name": "extraction",
+                            "strict": True,
+                            "schema": schema_copy,
+                        },
+                    }
+                else:
+                    data["response_format"] = {"type": "json_object"}
 
         async with httpx.AsyncClient() as client:
             try:
@@ -132,7 +143,13 @@ class AsyncMoonshotDriver(CostMixin, AsyncDriver):
             "model_name": model,
         }
 
-        text = resp["choices"][0]["message"]["content"]
+        message = resp["choices"][0]["message"]
+        text = message.get("content") or ""
+
+        # Reasoning models may return content in reasoning_content when content is empty
+        if not text and message.get("reasoning_content"):
+            text = message["reasoning_content"]
+
         return {"text": text, "meta": meta}
 
     # ------------------------------------------------------------------
@@ -290,7 +307,10 @@ class AsyncMoonshotDriver(CostMixin, AsyncDriver):
                 choices = chunk.get("choices", [])
                 if choices:
                     delta = choices[0].get("delta", {})
-                    content = delta.get("content", "")
+                    content = delta.get("content") or ""
+                    # Reasoning models stream thinking via reasoning_content
+                    if not content:
+                        content = delta.get("reasoning_content") or ""
                     if content:
                         full_text += content
                         yield {"type": "delta", "text": content}

{prompture-0.0.42.dev1 → prompture-0.0.45.dev1}/prompture/drivers/moonshot_driver.py

@@ -112,21 +112,31 @@ class MoonshotDriver(CostMixin, Driver):
         if supports_temperature and "temperature" in opts:
             data["temperature"] = opts["temperature"]
 
-        # Native JSON mode support
+        # Native JSON mode support — skip for reasoning models where
+        # Moonshot's API does not reliably support response_format.
         if options.get("json_mode"):
-            json_schema = options.get("json_schema")
-            if json_schema:
-                schema_copy = prepare_strict_schema(json_schema)
-                data["response_format"] = {
-                    "type": "json_schema",
-                    "json_schema": {
-                        "name": "extraction",
-                        "strict": True,
-                        "schema": schema_copy,
-                    },
-                }
-            else:
-                data["response_format"] = {"type": "json_object"}
+            from ..model_rates import get_model_capabilities
+
+            caps = get_model_capabilities("moonshot", model)
+            is_reasoning = caps is not None and caps.is_reasoning is True
+            model_supports_structured = (
+                caps is None or caps.supports_structured_output is not False
+            ) and not is_reasoning
+
+            if model_supports_structured:
+                json_schema = options.get("json_schema")
+                if json_schema:
+                    schema_copy = prepare_strict_schema(json_schema)
+                    data["response_format"] = {
+                        "type": "json_schema",
+                        "json_schema": {
+                            "name": "extraction",
+                            "strict": True,
+                            "schema": schema_copy,
+                        },
+                    }
+                else:
+                    data["response_format"] = {"type": "json_object"}
 
         try:
             response = requests.post(
@@ -159,7 +169,13 @@ class MoonshotDriver(CostMixin, Driver):
             "model_name": model,
         }
 
-        text = resp["choices"][0]["message"]["content"]
+        message = resp["choices"][0]["message"]
+        text = message.get("content") or ""
+
+        # Reasoning models may return content in reasoning_content when content is empty
+        if not text and message.get("reasoning_content"):
+            text = message["reasoning_content"]
+
         return {"text": text, "meta": meta}
 
     # ------------------------------------------------------------------
@@ -320,7 +336,10 @@ class MoonshotDriver(CostMixin, Driver):
             choices = chunk.get("choices", [])
             if choices:
                 delta = choices[0].get("delta", {})
-                content = delta.get("content", "")
+                content = delta.get("content") or ""
+                # Reasoning models stream thinking via reasoning_content
+                if not content:
+                    content = delta.get("reasoning_content") or ""
                 if content:
                     full_text += content
                     yield {"type": "delta", "text": content}

{prompture-0.0.42.dev1 → prompture-0.0.45.dev1}/prompture/groups.py

@@ -114,6 +114,27 @@ class SequentialGroup:
         """Request graceful shutdown after the current agent finishes."""
         self._stop_requested = True
 
+    @property
+    def shared_state(self) -> dict[str, Any]:
+        """Return a copy of the current shared execution state."""
+        return dict(self._state)
+
+    def inject_state(self, state: dict[str, Any], *, recursive: bool = False) -> None:
+        """Merge external key-value pairs into this group's shared state.
+
+        Existing keys are NOT overwritten (uses setdefault semantics).
+
+        Args:
+            state: Key-value pairs to inject.
+            recursive: If True, also inject into nested sub-groups.
+        """
+        for k, v in state.items():
+            self._state.setdefault(k, v)
+        if recursive:
+            for agent, _ in self._agents:
+                if hasattr(agent, "inject_state"):
+                    agent.inject_state(state, recursive=True)
+
     def save(self, path: str) -> None:
         """Run and save result to file. Convenience wrapper."""
         result = self.run()
@@ -267,6 +288,27 @@ class LoopGroup:
         """Request graceful shutdown."""
         self._stop_requested = True
 
+    @property
+    def shared_state(self) -> dict[str, Any]:
+        """Return a copy of the current shared execution state."""
+        return dict(self._state)
+
+    def inject_state(self, state: dict[str, Any], *, recursive: bool = False) -> None:
+        """Merge external key-value pairs into this group's shared state.
+
+        Existing keys are NOT overwritten (uses setdefault semantics).
+
+        Args:
+            state: Key-value pairs to inject.
+            recursive: If True, also inject into nested sub-groups.
+        """
+        for k, v in state.items():
+            self._state.setdefault(k, v)
+        if recursive:
+            for agent, _ in self._agents:
+                if hasattr(agent, "inject_state"):
+                    agent.inject_state(state, recursive=True)
+
     def run(self, prompt: str = "") -> GroupResult:
         """Execute the loop."""
         self._stop_requested = False

{prompture-0.0.42.dev1 → prompture-0.0.45.dev1/prompture.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: prompture
-Version: 0.0.42.dev1
+Version: 0.0.45.dev1
 Summary: Ask LLMs to return structured JSON and run cross-model tests. API-first.
 Author-email: Juan Denis <juan@vene.co>
 License-Expression: MIT