nighthawk-python 0.8.0__py3-none-any.whl → 0.9.0__py3-none-any.whl

nighthawk/__init__.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 from .configuration import (
     StepContextLimits,
     StepExecutorConfiguration,
-    StepExecutorConfigurationPatch,
     StepPromptTemplates,
 )
 from .errors import (
@@ -32,7 +31,6 @@ __all__ = [
     "StepContextLimits",
     "StepExecutor",
     "StepExecutorConfiguration",
-    "StepExecutorConfigurationPatch",
     "StepPromptTemplates",
     "ToolEvaluationError",
     "ToolRegistrationError",

nighthawk/configuration.py

@@ -160,44 +160,3 @@ class StepExecutorConfiguration(BaseModel):
             return tiktoken.encoding_for_model(model_name)
         except Exception:
             return tiktoken.get_encoding("o200k_base")
-
-
-class StepExecutorConfigurationPatch(BaseModel):
-    """Partial override for StepExecutorConfiguration.
-
-    Non-None fields replace the corresponding fields in the target configuration.
-
-    Attributes:
-        model: Model identifier override.
-        model_settings: Model settings override. Accepts a dict or a
-            backend-specific BaseModel instance (auto-converted to dict).
-        prompts: Prompt templates override.
-        context_limits: Context limits override.
-        json_renderer_style: JSON renderer style override.
-        tokenizer_encoding: Tokenizer encoding override.
-        system_prompt_suffix_fragments: System prompt suffix fragments override.
-        user_prompt_suffix_fragments: User prompt suffix fragments override.
-    """
-
-    model_config = ConfigDict(extra="forbid", frozen=True)
-
-    model: str | None = None
-    model_settings: dict[str, Any] | BaseModel | None = None
-
-    @field_validator("model_settings", mode="before")
-    @classmethod
-    def _normalize_model_settings(cls, value: Any) -> dict[str, Any] | None:
-        if isinstance(value, BaseModel):
-            return value.model_dump()
-        return value
-
-    prompts: StepPromptTemplates | None = None
-    context_limits: StepContextLimits | None = None
-    json_renderer_style: JsonRendererStyle | None = None
-    tokenizer_encoding: str | None = None
-    system_prompt_suffix_fragments: tuple[str, ...] | None = None
-    user_prompt_suffix_fragments: tuple[str, ...] | None = None
-
-    def apply_to(self, configuration: StepExecutorConfiguration) -> StepExecutorConfiguration:
-        """Apply non-None fields to the given configuration and return a new copy."""
-        return configuration.model_copy(update=self.model_dump(exclude_none=True))

nighthawk/runtime/scoping.py

@@ -2,17 +2,17 @@ from __future__ import annotations
 
 import importlib.metadata
 import threading
-from collections.abc import Iterator, Mapping
+from collections.abc import Iterator, Mapping, Sequence
 from contextlib import contextmanager
 from contextvars import ContextVar
 from copy import copy
 from dataclasses import dataclass, replace
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, Literal
 
 from opentelemetry.trace import Span, get_tracer_provider
 from pydantic_ai.usage import RunUsage
 
-from ..configuration import StepExecutorConfiguration, StepExecutorConfigurationPatch
+from ..configuration import StepExecutorConfiguration
 from ..errors import NighthawkError
 from ..tools.registry import tool_scope
 from ..ulid import generate_ulid
@@ -295,24 +295,28 @@ def run(
 @contextmanager
 def scope(
     *,
+    mode: Literal["inherit", "replace"] = "inherit",
     step_executor_configuration: StepExecutorConfiguration | None = None,
-    step_executor_configuration_patch: StepExecutorConfigurationPatch | None = None,
     step_executor: StepExecutor | None = None,
-    system_prompt_suffix_fragment: str | None = None,
-    user_prompt_suffix_fragment: str | None = None,
+    system_prompt_suffix_fragments: Sequence[str] | None = None,
+    user_prompt_suffix_fragments: Sequence[str] | None = None,
     implicit_references: ImplicitReferenceNameToValue | None = None,
 ) -> Iterator[StepExecutor]:
-    """Open a nested scope that can override the step executor or its configuration.
+    """Open a nested scope that can override the active execution context.
 
-    Must be called inside an active run context. Creates a new scope_id while inheriting the run_id from the parent context.
+    Must be called inside an active run context. Creates a new ``scope_id`` while inheriting the ``run_id`` from the parent context.
 
     Args:
+        mode: Scope composition mode. ``"inherit"`` appends/merges values into the current scope. ``"replace"`` fully replaces provided list/dict values.
+            In both modes, ``None`` means no change.
         step_executor_configuration: Full replacement configuration for the step executor.
-        step_executor_configuration_patch: Partial override applied on top of the current configuration.
         step_executor: Replacement step executor for this scope.
-        system_prompt_suffix_fragment: Additional text appended to the system prompt.
-        user_prompt_suffix_fragment: Additional text appended to the user prompt.
-        implicit_references: Additional implicit global references merged into this scope and inherited by nested scopes.
+        system_prompt_suffix_fragments: Additional system prompt suffix fragments.
+            In ``mode="inherit"``, fragments are appended. In ``mode="replace"``, provided fragments fully replace the current fragments.
+        user_prompt_suffix_fragments: Additional user prompt suffix fragments.
+            In ``mode="inherit"``, fragments are appended. In ``mode="replace"``, provided fragments fully replace the current fragments.
+        implicit_references: Implicit global references for this scope.
+            In ``mode="inherit"``, values are merged with conflict checks. In ``mode="replace"``, provided mappings fully replace the current mapping.
 
     Yields:
         The step executor active within this scope.
@@ -321,9 +325,9 @@ def scope(
         ```python
         with nighthawk.run(executor):
             with nighthawk.scope(
-                step_executor_configuration_patch=StepExecutorConfigurationPatch(
-                    model="openai:gpt-5.4-mini",
-                ),
+                mode="replace",
+                implicit_references={},
+                system_prompt_suffix_fragments=["Use concise answers."],
             ) as scoped_executor:
                 result = my_natural_function()
         ```
@@ -332,31 +336,13 @@ def scope(
     current_execution_context = get_execution_context()
 
     next_step_executor = current_step_executor
-
     if step_executor is not None:
         next_step_executor = step_executor
 
-    has_configuration_update = any(
-        value is not None
-        for value in (
-            step_executor_configuration,
-            step_executor_configuration_patch,
-        )
-    )
-
-    if has_configuration_update:
-        current_agent_step_executor = _resolve_agent_step_executor(next_step_executor)
-        next_configuration = current_agent_step_executor.configuration
-
-        if step_executor_configuration is not None:
-            next_configuration = step_executor_configuration
-
-        if step_executor_configuration_patch is not None:
-            next_configuration = step_executor_configuration_patch.apply_to(next_configuration)
-
+    if step_executor_configuration is not None:
         next_step_executor = _replace_step_executor_with_configuration(
             next_step_executor,
-            configuration=next_configuration,
+            configuration=step_executor_configuration,
         )
 
     next_execution_context = replace(
@@ -364,27 +350,36 @@ def scope(
         scope_id=generate_ulid(),
     )
 
-    next_system_fragments = _system_prompt_suffix_fragments_var.get()
-    next_user_fragments = _user_prompt_suffix_fragments_var.get()
+    next_system_prompt_suffix_fragments = _system_prompt_suffix_fragments_var.get()
+    next_user_prompt_suffix_fragments = _user_prompt_suffix_fragments_var.get()
     next_implicit_reference_name_to_value = _implicit_reference_name_to_value_var.get()
 
-    if system_prompt_suffix_fragment is not None:
-        next_system_fragments = (*next_system_fragments, system_prompt_suffix_fragment)
+    if system_prompt_suffix_fragments is not None:
+        if mode == "inherit":
+            next_system_prompt_suffix_fragments = (*next_system_prompt_suffix_fragments, *system_prompt_suffix_fragments)
+        else:
+            next_system_prompt_suffix_fragments = tuple(system_prompt_suffix_fragments)
 
-    if user_prompt_suffix_fragment is not None:
-        next_user_fragments = (*next_user_fragments, user_prompt_suffix_fragment)
+    if user_prompt_suffix_fragments is not None:
+        if mode == "inherit":
+            next_user_prompt_suffix_fragments = (*next_user_prompt_suffix_fragments, *user_prompt_suffix_fragments)
+        else:
+            next_user_prompt_suffix_fragments = tuple(user_prompt_suffix_fragments)
 
     if implicit_references is not None:
-        next_implicit_reference_name_to_value = _merge_implicit_reference_name_to_value_with_conflict_check(
-            next_implicit_reference_name_to_value,
-            implicit_references,
-        )
+        if mode == "inherit":
+            next_implicit_reference_name_to_value = _merge_implicit_reference_name_to_value_with_conflict_check(
+                next_implicit_reference_name_to_value,
+                implicit_references,
+            )
+        else:
+            next_implicit_reference_name_to_value = dict(implicit_references)
 
     with tool_scope():
         step_executor_token = _step_executor_var.set(next_step_executor)
         execution_context_token = _execution_context_var.set(next_execution_context)
-        system_fragments_token = _system_prompt_suffix_fragments_var.set(next_system_fragments)
-        user_fragments_token = _user_prompt_suffix_fragments_var.set(next_user_fragments)
+        system_fragments_token = _system_prompt_suffix_fragments_var.set(next_system_prompt_suffix_fragments)
+        user_fragments_token = _user_prompt_suffix_fragments_var.set(next_user_prompt_suffix_fragments)
         implicit_reference_name_to_value_token = _implicit_reference_name_to_value_var.set(next_implicit_reference_name_to_value)
         try:
             with span(

{nighthawk_python-0.8.0.dist-info → nighthawk_python-0.9.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nighthawk-python
-Version: 0.8.0
+Version: 0.9.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/

{nighthawk_python-0.8.0.dist-info → nighthawk_python-0.9.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
-nighthawk/__init__.py,sha256=AYep0vIYT0t5p6Qb-GyhEY5u0Kmp9nP6-jRZhkgWDn4,1382
-nighthawk/configuration.py,sha256=KKSpVnXd46Fg7l15xLZkdptnvhoy2xZqXry_zM4w_K0,8046
+nighthawk/__init__.py,sha256=YqE9InkNzbW12v9Bh3qF4INLUHfJfmNT_hPqmE_kNb8,1308
+nighthawk/configuration.py,sha256=1gtdLxcDMMnvz9t2fBZP-U-MHW54IHWmInSPiByTaGo,6286
 nighthawk/errors.py,sha256=CSw_VfIoppCE2SdN2zMtVbMGu_wFwD628v8ZAVxeHIY,602
 nighthawk/identifier_path.py,sha256=Io3VcT8BlxAASHQUSUclrRcCwnRKTtMDPSR1bpaDN6s,984
 nighthawk/json_renderer.py,sha256=ixpUYTsVVKOp-iMdHldw7-6I3JxelXOQD8vK2KVXwbw,7640
@@ -29,7 +29,7 @@ nighthawk/runtime/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 nighthawk/runtime/async_bridge.py,sha256=k1s7e5dJEMNZJd0xHqkqAY7VkE7tOBzJf6nAEJH_Xh0,1478
 nighthawk/runtime/prompt.py,sha256=fod1f8wS2xKoc3RM44eB8wrKwPmap9K1gwLw4EzUSP4,22669
 nighthawk/runtime/runner.py,sha256=saVkEeMkVfz1cm_AVaz8I23Y5OiWuWthqwv-z_4kwwY,23121
-nighthawk/runtime/scoping.py,sha256=jWvlNYMJ25cv3n0uA60vDkR9O-BBjREw1JVx6I9ChvY,14614
+nighthawk/runtime/scoping.py,sha256=oa3SqjxctFQtTTZNYFj-scvf5Q0_zaVtluh8V1h8pqE,14986
 nighthawk/runtime/step_context.py,sha256=-MafRMUV9fo0IBTGnQfAF72IyQy90ZoUS9SK77OVgPc,5529
 nighthawk/runtime/step_contract.py,sha256=2rbZpUBbmWGTogAksYerIAZfv2xgBgaNmidWxjJtfmY,6391
 nighthawk/runtime/step_executor.py,sha256=Y4P7PuGzJT64FIwjhU2gABxoqHf6wPTXMiSFTSfkK6U,12847
@@ -40,7 +40,7 @@ nighthawk/tools/contracts.py,sha256=9bFj88GiRqwyUSfjhZxY3jhtQafdBP3RvDSz6-QCYPs,
 nighthawk/tools/execution.py,sha256=e1uv09MWOkCoZ5uQu9myUXyhQzM_UziR9yE0raFYtQI,2740
 nighthawk/tools/provided.py,sha256=gsZ7xcrNmEmwcvdkQi4YndTAIcfpwY1jTxpKJsYU4QQ,2079
 nighthawk/tools/registry.py,sha256=wsZznwI2xPTflN6tfVE8je5keNVqBHHtTPd9bq0Cu7g,6425
-nighthawk_python-0.8.0.dist-info/METADATA,sha256=ZY11lioIPP53PYIiGEZkJjUGZ5GoJJ6zk3FEl7OzUVU,6192
-nighthawk_python-0.8.0.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-nighthawk_python-0.8.0.dist-info/licenses/LICENSE,sha256=R8tjrX79o5Pbi_l_aFPPWDbTZkmz4is0CxmzMMs3f0A,1076
-nighthawk_python-0.8.0.dist-info/RECORD,,
+nighthawk_python-0.9.0.dist-info/METADATA,sha256=DIyU5rb7e0BvfBfC7hbiw8vc8SIeDQRapJ1XTM0gDg0,6192
+nighthawk_python-0.9.0.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+nighthawk_python-0.9.0.dist-info/licenses/LICENSE,sha256=R8tjrX79o5Pbi_l_aFPPWDbTZkmz4is0CxmzMMs3f0A,1076
+nighthawk_python-0.9.0.dist-info/RECORD,,