nighthawk-python 0.11.0__py3-none-any.whl → 0.12.0__py3-none-any.whl

nighthawk/backends/base.py

@@ -9,6 +9,7 @@ from pydantic import BaseModel, ConfigDict, field_validator
 from pydantic_ai.exceptions import UnexpectedModelBehavior, UserError
 from pydantic_ai.messages import (
     CachePoint,
+    InstructionPart,
     ModelMessage,
     ModelRequest,
     RetryPromptPart,
@@ -73,6 +74,31 @@ def _collect_system_prompt_text(model_request: ModelRequest) -> str:
     return "\n\n".join(parts)
 
 
+def _collect_instruction_text(
+    messages: list[ModelMessage],
+    model_request_parameters: ModelRequestParameters,
+) -> str | None:
+    instruction_parts = model_request_parameters.instruction_parts
+    if instruction_parts is not None:
+        return InstructionPart.join(instruction_parts)
+
+    model_request_list = [message for message in reversed(messages) if isinstance(message, ModelRequest)]
+    if not model_request_list:
+        return None
+
+    most_recent_model_request = model_request_list[0]
+    if most_recent_model_request.instructions is not None:
+        return most_recent_model_request.instructions
+
+    if len(model_request_list) < 2:
+        return None
+
+    if all(isinstance(part, ToolReturnPart | RetryPromptPart) for part in most_recent_model_request.parts):
+        return model_request_list[1].instructions
+
+    return None
+
+
 def _resolve_current_tool_result_max_tokens() -> int:
     return resolve_current_tool_result_rendering_policy().tool_result_max_tokens
 
@@ -152,8 +178,8 @@ class BackendModelBase(Model):
         messages: list[ModelMessage],
         model_request_parameters: ModelRequestParameters,
     ) -> PreparedRequestParts:
-        if model_request_parameters.builtin_tools:
-            raise UserError(f"{self.backend_label} does not support builtin tools")
+        if model_request_parameters.native_tools:
+            raise UserError(f"{self.backend_label} does not support native tools")
 
         if model_request_parameters.allow_image_output:
             raise UserError(f"{self.backend_label} does not support image output")
@@ -162,7 +188,7 @@ class BackendModelBase(Model):
 
         system_prompt_text = _collect_system_prompt_text(model_request)
 
-        instructions = self._get_instructions(messages, model_request_parameters)
+        instructions = _collect_instruction_text(messages, model_request_parameters)
         if instructions:
             system_prompt_text = "\n\n".join([system_prompt_text, instructions]) if system_prompt_text else instructions
 

nighthawk/backends/claude_code_cli.py

@@ -8,7 +8,6 @@ import tempfile
 from typing import IO, TypedDict
 
 from pydantic import field_validator
-from pydantic_ai.builtin_tools import AbstractBuiltinTool
 from pydantic_ai.exceptions import UnexpectedModelBehavior, UserError
 from pydantic_ai.messages import ModelMessage, ModelResponse, TextPart
 from pydantic_ai.models import ModelRequestParameters
@@ -137,7 +136,7 @@ class ClaudeCodeCliModel(BackendModelBase):
                 supports_json_object_output=False,
                 supports_image_output=False,
                 default_structured_output_mode="native",
-                supported_builtin_tools=frozenset([AbstractBuiltinTool]),
+                supported_native_tools=frozenset(),
             ),
         )
         self._model_name = model_name

nighthawk/backends/claude_code_sdk.py

@@ -7,7 +7,6 @@ from datetime import datetime
 from typing import Any
 
 from opentelemetry import context as otel_context
-from pydantic_ai.builtin_tools import AbstractBuiltinTool
 from pydantic_ai.exceptions import UnexpectedModelBehavior
 from pydantic_ai.messages import ModelMessage, ModelResponse, TextPart
 from pydantic_ai.models import ModelRequestParameters
@@ -111,7 +110,7 @@ class ClaudeCodeSdkModel(BackendModelBase):
                 supports_json_object_output=False,
                 supports_image_output=False,
                 default_structured_output_mode="native",
-                supported_builtin_tools=frozenset([AbstractBuiltinTool]),
+                supported_native_tools=frozenset(),
             ),
         )
         self._model_name = model_name

nighthawk/backends/codex.py

@@ -8,7 +8,6 @@ from dataclasses import replace
 from typing import IO, Any, Literal, TypedDict
 
 from pydantic import field_validator
-from pydantic_ai.builtin_tools import AbstractBuiltinTool
 from pydantic_ai.exceptions import UnexpectedModelBehavior, UserError
 from pydantic_ai.messages import ModelMessage, ModelResponse, TextPart
 from pydantic_ai.models import ModelRequestParameters
@@ -165,7 +164,7 @@ class CodexModel(BackendModelBase):
                 supports_json_object_output=False,
                 supports_image_output=False,
                 default_structured_output_mode="native",
-                supported_builtin_tools=frozenset([AbstractBuiltinTool]),
+                supported_native_tools=frozenset(),
                 json_schema_transformer=_CodexJsonSchemaTransformer,
             ),
         )

nighthawk/backends/mcp_boundary.py

@@ -92,10 +92,10 @@ def _tool_outcome_to_mcp_content_list(
 
         if isinstance(content_item, BinaryContent):
             if content_item.is_image:
-                content_block_list.append(mcp_types.ImageContent(type="image", data=content_item.base64, mimeType=content_item.media_type))
+                content_block_list.append(mcp_types.ImageContent(type="image", data=content_item.base64, mime_type=content_item.media_type))
                 continue
             if content_item.is_audio:
-                content_block_list.append(mcp_types.AudioContent(type="audio", data=content_item.base64, mimeType=content_item.media_type))
+                content_block_list.append(mcp_types.AudioContent(type="audio", data=content_item.base64, mime_type=content_item.media_type))
                 continue
             # Non-image / non-audio blobs project to text per spec §8.3:
             # MCP's rich transport only has first-class slots for image and

nighthawk/backends/mcp_server.py

@@ -15,7 +15,7 @@ import time
 from collections.abc import AsyncIterator, Awaitable, Callable
 from contextlib import asynccontextmanager
 from contextvars import copy_context
-from typing import Any
+from typing import Any, cast
 
 from opentelemetry import context as otel_context
 from pydantic_ai.exceptions import UnexpectedModelBehavior
@@ -62,20 +62,20 @@ class McpServer:
             raise RuntimeError("MCP tool server is already started")
 
         import uvicorn
-        from mcp.server.fastmcp.server import StreamableHTTPASGIApp
-        from mcp.server.lowlevel.server import Server as McpLowLevelServer
+        from mcp import types as mcp_types
+        from mcp.server import Server as McpLowLevelServer
+        from mcp.server import ServerRequestContext
         from mcp.server.streamable_http_manager import (
+            StreamableHTTPASGIApp,
             StreamableHTTPSessionManager,
         )
         from starlette.applications import Starlette
         from starlette.routing import Route
 
-        mcp_server = McpLowLevelServer("nighthawk")
-
-        @mcp_server.list_tools()
-        async def list_tools() -> list[Any]:
-            from mcp import types as mcp_types
-
+        async def list_tools(
+            _context: ServerRequestContext[Any, Any],
+            _parameters: mcp_types.PaginatedRequestParams | None,
+        ) -> mcp_types.ListToolsResult:
             tools: list[mcp_types.Tool] = []
             for tool_name in sorted(self._tool_name_to_handler.keys()):
                 tool_definition = self._tool_name_to_tool_definition.get(tool_name)
@@ -86,13 +86,17 @@ class McpServer:
                     mcp_types.Tool(
                         name=tool_name,
                         description=tool_definition.description or "",
-                        inputSchema=tool_definition.parameters_json_schema,
+                        input_schema=tool_definition.parameters_json_schema,
                     )
                 )
-            return tools
-
-        @mcp_server.call_tool(validate_input=False)
-        async def call_tool(name: str, arguments: dict[str, Any]) -> Any:
+            return mcp_types.ListToolsResult(tools=tools)
+
+        async def call_tool(
+            _context: ServerRequestContext[Any, Any],
+            parameters: mcp_types.CallToolRequestParams,
+        ) -> mcp_types.CallToolResult:
+            name = parameters.name
+            arguments = parameters.arguments or {}
             handler = self._tool_name_to_handler.get(name)
             if handler is None:
                 tool_outcome: ToolOutcome = {
@@ -100,19 +104,27 @@ class McpServer:
                     "error": {"kind": "resolution", "message": f"Unknown tool: {name}", "guidance": "Choose a visible tool name and retry."},
                 }
                 tool_handler_result: ToolHandlerResult = build_tool_result_observation(tool_outcome=tool_outcome)
-                return tool_handler_result_to_low_level_mcp_content(
+                content_block_list = tool_handler_result_to_low_level_mcp_content(
                     tool_name=name,
                     tool_handler_result=tool_handler_result,
                     rendering_policy=self._tool_result_rendering_policy,
                 )
+                return mcp_types.CallToolResult(content=cast(list[mcp_types.ContentBlock], content_block_list))
 
-            return await call_tool_for_low_level_mcp_server(
+            content_block_list = await call_tool_for_low_level_mcp_server(
                 tool_name=name,
                 arguments=arguments,
                 tool_handler=handler,
                 parent_otel_context=self._parent_otel_context,
                 rendering_policy=self._tool_result_rendering_policy,
             )
+            return mcp_types.CallToolResult(content=cast(list[mcp_types.ContentBlock], content_block_list))
+
+        mcp_server = McpLowLevelServer(
+            "nighthawk",
+            on_list_tools=list_tools,
+            on_call_tool=call_tool,
+        )
 
         session_manager = StreamableHTTPSessionManager(app=mcp_server)
         streamable_http_asgi = StreamableHTTPASGIApp(session_manager)

nighthawk/runtime/step_executor.py

@@ -337,7 +337,7 @@ class AgentStepExecutor:
 
         usage_meter = get_current_usage_meter()
         if usage_meter is not None and hasattr(result, "usage"):
-            usage_meter.record(result.usage(), kind="step")
+            usage_meter.record(result.usage, kind="step")
 
         step_outcome = self._parse_agent_result(result)
         bindings = self._extract_bindings(binding_names=binding_names, step_context=step_context)

{nighthawk_python-0.11.0.dist-info → nighthawk_python-0.12.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: nighthawk-python
-Version: 0.11.0
+Version: 0.12.0
 Summary: A Python library where Python controls flow and LLMs or coding agents reason within constrained Natural blocks.
 Project-URL: Repository, https://github.com/kurusugawa-computer/nighthawk-python
 Project-URL: Documentation, https://kurusugawa-computer.github.io/nighthawk-python/
@@ -20,17 +20,17 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
 Requires-Python: >=3.13
 Requires-Dist: headson>=0.16.1
-Requires-Dist: pydantic-ai-slim>=1.87.0
+Requires-Dist: pydantic-ai-slim>=2.37.0
 Requires-Dist: pydantic>=2.13.3
 Requires-Dist: pyyaml>=6.0.3
 Requires-Dist: tenacity>=9.1.4
 Requires-Dist: tiktoken>=0.12.0
 Provides-Extra: claude-code-cli
-Requires-Dist: mcp>=1.27.0; extra == 'claude-code-cli'
+Requires-Dist: mcp>=2.1.1; extra == 'claude-code-cli'
 Provides-Extra: claude-code-sdk
-Requires-Dist: claude-agent-sdk==0.1.48; extra == 'claude-code-sdk'
+Requires-Dist: claude-agent-sdk==0.2.151; extra == 'claude-code-sdk'
 Provides-Extra: codex
-Requires-Dist: mcp>=1.27.0; extra == 'codex'
+Requires-Dist: mcp>=2.1.1; extra == 'codex'
 Description-Content-Type: text/markdown
 
 [![PyPI](https://img.shields.io/pypi/v/nighthawk-python)](https://pypi.org/project/nighthawk-python)
@@ -68,12 +68,12 @@ For other providers, see [Pydantic AI providers](https://kurusugawa-computer.git
 ```py
 import nighthawk as nh
 
+
 def python_average(numbers):
     return sum(numbers) / len(numbers)
 
-step_executor = nh.AgentStepExecutor.from_configuration(
-    configuration=nh.StepExecutorConfiguration(model="openai-responses:gpt-5.4-nano")
-)
+
+step_executor = nh.AgentStepExecutor.from_configuration(configuration=nh.StepExecutorConfiguration(model="openai-responses:gpt-5.4-nano"))
 
 with nh.run(step_executor):
 

{nighthawk_python-0.11.0.dist-info → nighthawk_python-0.12.0.dist-info}/RECORD

@@ -8,13 +8,13 @@ nighthawk/testing.py,sha256=FCZObwxx1m9FJ28Gktlb7KmB9CCyjN_jLNyrXcysjiE,7600
 nighthawk/ulid.py,sha256=w195Uc1zx92LPONcbaSxA-ZwPnmXPiV3DzhtdBuSZdo,636
 nighthawk/backends/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nighthawk/backends/_text_fallback.py,sha256=0agbam4KsWwVEo7mgdHDlOzckEuqmd79EF1K6Oj6Kiw,5703
-nighthawk/backends/base.py,sha256=3R8GOISQ_RMgAj3hoCIotHi82_f8L7_4xE7EE63UVns,9719
-nighthawk/backends/claude_code_cli.py,sha256=edEu1kyuHzBl6TrxcN6KS51fmWooprhgc_ic9_67OAE,13698
-nighthawk/backends/claude_code_sdk.py,sha256=ATyyXX6Kk0GH6yQAz3LB-AevGStbSqUlb6mE4XMDnJ4,13545
+nighthawk/backends/base.py,sha256=bROIX11lzKv7njjBKe32ccn1aN7NKzO2tTItQecw1TM,10598
+nighthawk/backends/claude_code_cli.py,sha256=C_UA5ISxQBzh-q5SMuwcyT769BaJ2mWhBK_m9Rc_mrI,13618
+nighthawk/backends/claude_code_sdk.py,sha256=6Q2Wr46WbVRtguIKFsCHZ7goKBRrOmPKM9I63Q-FHL8,13465
 nighthawk/backends/claude_code_settings.py,sha256=wjHf8P38yrOvbhqUVT3uZ1qFjLlMIQ9de8DKHcRJn1g,1061
-nighthawk/backends/codex.py,sha256=w3R8_TpS9Nm766gdTI1s6YnwAAjECIsbGT4xkWXDEwE,14800
-nighthawk/backends/mcp_boundary.py,sha256=zKF7LgCQqF5zvYGBugQAT5T1QgkNF41hPGh6NBpuTrY,10644
-nighthawk/backends/mcp_server.py,sha256=rSJgKw6Zn6hSxmLu-va5H-4kZU5yoguXQekwSJRPBdA,7971
+nighthawk/backends/codex.py,sha256=Ds8QY-EyizILWu16LpkZS6yruM_kg9DrYbDUJ3rvgBI,14720
+nighthawk/backends/mcp_boundary.py,sha256=baua0hU9ooehkbqtxNssIBWE8rcWPiqJFjSyn_dp0gc,10646
+nighthawk/backends/mcp_server.py,sha256=ZlK0_WsPtbL1FqkDPKuKH2c0veBGhj2D8rFYYV612LU,8605
 nighthawk/backends/text_projection.py,sha256=ZG3bwoC1Rb3v2fxIA-s9zaqwZUxR1mRV4l2H179Kuks,13051
 nighthawk/backends/tool_bridge.py,sha256=d50isolJruaJi6EdAkIKEO1M1lbmkx63IuwnXzER8G8,10780
 nighthawk/natural/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -36,7 +36,7 @@ nighthawk/runtime/runner.py,sha256=o5xzv_pUBhwX83Iri45_OrQ2s1He_loRYSbj5XT14-U,2
 nighthawk/runtime/scoping.py,sha256=eRzW-1TmAvYCy3jPNPxPjeVQjHhhIe6uRv-yIWJsAf8,17678
 nighthawk/runtime/step_context.py,sha256=f93Ed7QDGfpcBBXLyY1hE3-lzjJN99t8RKwXvEwgdRw,6207
 nighthawk/runtime/step_contract.py,sha256=nOIWXRSwH2x66vUUAgnwjlanzI0pvXGHI8ITWimqjc4,6917
-nighthawk/runtime/step_executor.py,sha256=jInsTgBu5B0U1THHnDPjXwnaMYsU6duRHs0LMRVmMn4,13482
+nighthawk/runtime/step_executor.py,sha256=vRyVZdPWFh1b-GX44BN34wDlVKa2FyHoLr_XEeyb3tk,13480
 nighthawk/runtime/tool_calls.py,sha256=IZQWk2IH8rPF6hjVBzBDn0cpGDkG9k368dDFpmquYOg,3318
 nighthawk/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nighthawk/tools/_tool_return_content.py,sha256=tUkSuFjYcxwDLjK1DzKpapoWayIkBCzqqClMjIBRiSM,3110
@@ -45,7 +45,7 @@ nighthawk/tools/contracts.py,sha256=m6t-F1SwJ1BAfMFbTq9ppY8Vwbsrn_gYbl7O3VTiwf0,
 nighthawk/tools/execution.py,sha256=B9Oo-AyXKSEiq9fpwmD0LQ6hzX7OoGPnDWO_xl8ecns,8842
 nighthawk/tools/provided.py,sha256=gsZ7xcrNmEmwcvdkQi4YndTAIcfpwY1jTxpKJsYU4QQ,2079
 nighthawk/tools/registry.py,sha256=wsZznwI2xPTflN6tfVE8je5keNVqBHHtTPd9bq0Cu7g,6425
-nighthawk_python-0.11.0.dist-info/METADATA,sha256=d8t4e4wlxXeLaXD7bZjy1kdhSRqfzBkDd0uXpQd2QA4,6214
-nighthawk_python-0.11.0.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-nighthawk_python-0.11.0.dist-info/licenses/LICENSE,sha256=R8tjrX79o5Pbi_l_aFPPWDbTZkmz4is0CxmzMMs3f0A,1076
-nighthawk_python-0.11.0.dist-info/RECORD,,
+nighthawk_python-0.12.0.dist-info/METADATA,sha256=4NS3DvWh_bFlv96CDVCkhzB5iL6XI5jEeK9iVIINhCU,6209
+nighthawk_python-0.12.0.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
+nighthawk_python-0.12.0.dist-info/licenses/LICENSE,sha256=R8tjrX79o5Pbi_l_aFPPWDbTZkmz4is0CxmzMMs3f0A,1076
+nighthawk_python-0.12.0.dist-info/RECORD,,

{nighthawk_python-0.11.0.dist-info → nighthawk_python-0.12.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.29.0
+Generator: hatchling 1.32.0
 Root-Is-Purelib: true
 Tag: py3-none-any