goose-py 0.7.0__tar.gz → 0.7.2__tar.gz

goose_py-0.7.2/.github/workflows/publish.yml

@@ -0,0 +1,48 @@
+name: CI/CD
+
+on:
+  push:
+    branches:
+      - main
+    tags:
+      - "v*"
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+
+    permissions:
+      id-token: write
+    
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version-file: .python-version
+
+      - name: Setup UV
+        uses: astral-sh/setup-uv@v5
+        with:
+          version: "0.5.25"
+
+      - name: Initialize environment
+        run: uv sync --all-extras --dev
+
+      - name: Run tests
+        run: uv run pytest
+        env:
+          GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
+
+      - name: Build package
+        run: uv build
+
+      - name: Publish package
+        run: uv publish
+        continue-on-error: true

goose_py-0.7.2/Makefile

@@ -0,0 +1,9 @@
+test:
+	uv run pytest tests
+lint:
+	uv run ruff check .
+	uv run ruff format .
+	uv run pyright .
+publish:
+	uv build
+	uv publish

{goose_py-0.7.0 → goose_py-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: goose-py
-Version: 0.7.0
+Version: 0.7.2
 Summary: A tool for AI workflows based on human-computer collaboration and structured output.
 Author-email: Nash Taylor <nash@chelle.ai>, Joshua Cook <joshua@chelle.ai>, Michael Sankur <michael@chelle.ai>
 Requires-Python: >=3.12

{goose_py-0.7.0 → goose_py-0.7.2}/goose/_internal/agent.py

@@ -65,20 +65,12 @@ class AgentResponse[R: BaseModel | str](BaseModel):
     @computed_field
     @property
     def input_cost(self) -> float:
-        return (
-            self.INPUT_CENTS_PER_MILLION_TOKENS[self.model]
-            * self.input_tokens
-            / 1_000_000
-        )
+        return self.INPUT_CENTS_PER_MILLION_TOKENS[self.model] * self.input_tokens / 1_000_000
 
     @computed_field
     @property
     def output_cost(self) -> float:
-        return (
-            self.OUTPUT_CENTS_PER_MILLION_TOKENS[self.model]
-            * self.output_tokens
-            / 1_000_000
-        )
+        return self.OUTPUT_CENTS_PER_MILLION_TOKENS[self.model] * self.output_tokens / 1_000_000
 
     @computed_field
     @property
@@ -100,15 +92,9 @@ class AgentResponse[R: BaseModel | str](BaseModel):
             for part in message["content"]:
                 if part["type"] == "image_url":
                     part["image_url"] = "__MEDIA__"
-        minimized_input_messages = [
-            json.dumps(message) for message in minimized_input_messages
-        ]
-
-        output_message = (
-            self.response.model_dump_json()
-            if isinstance(self.response, BaseModel)
-            else self.response
-        )
+        minimized_input_messages = [json.dumps(message) for message in minimized_input_messages]
+
+        output_message = self.response.model_dump_json() if isinstance(self.response, BaseModel) else self.response
 
         return {
             "run_id": self.run_id,
@@ -161,9 +147,7 @@ class Agent:
 
         if response_model is TextResult:
             response = await acompletion(model=model.value, messages=rendered_messages)
-            parsed_response = response_model.model_validate(
-                {"text": response.choices[0].message.content}
-            )
+            parsed_response = response_model.model_validate({"text": response.choices[0].message.content})
         else:
             response = await acompletion(
                 model=model.value,
@@ -174,9 +158,7 @@ class Agent:
                     "enforce_validation": True,
                 },
             )
-            parsed_response = response_model.model_validate_json(
-                response.choices[0].message.content
-            )
+            parsed_response = response_model.model_validate_json(response.choices[0].message.content)
 
         end_time = datetime.now()
         agent_response = AgentResponse(

{goose_py-0.7.0 → goose_py-0.7.2}/goose/_internal/conversation.py

@@ -1,12 +1,9 @@
+from typing import Self
+
 from pydantic import BaseModel
 
 from goose._internal.result import Result
-from goose._internal.types.agent import (
-    AssistantMessage,
-    LLMMessage,
-    SystemMessage,
-    UserMessage,
-)
+from goose._internal.types.agent import AssistantMessage, LLMMessage, SystemMessage, UserMessage
 
 
 class Conversation[R: Result](BaseModel):
@@ -24,18 +21,15 @@ class Conversation[R: Result](BaseModel):
             messages.append(self.context.render())
 
         for message_index in range(len(self.user_messages)):
-            messages.append(
-                AssistantMessage(
-                    text=self.result_messages[message_index].model_dump_json()
-                ).render()
-            )
+            messages.append(AssistantMessage(text=self.result_messages[message_index].model_dump_json()).render())
             messages.append(self.user_messages[message_index].render())
 
         if len(self.result_messages) > len(self.user_messages):
-            messages.append(
-                AssistantMessage(
-                    text=self.result_messages[-1].model_dump_json()
-                ).render()
-            )
+            messages.append(AssistantMessage(text=self.result_messages[-1].model_dump_json()).render())
 
         return messages
+
+    def undo(self) -> Self:
+        self.user_messages.pop()
+        self.result_messages.pop()
+        return self

{goose_py-0.7.0 → goose_py-0.7.2}/goose/_internal/flow.py

@@ -1,6 +1,7 @@
+from collections.abc import AsyncIterator, Awaitable, Callable
 from contextlib import asynccontextmanager
 from types import CodeType
-from typing import AsyncIterator, Awaitable, Callable, Protocol, overload
+from typing import Protocol, overload
 
 from goose._internal.agent import Agent, IAgentLogger
 from goose._internal.conversation import Conversation
@@ -13,9 +14,7 @@ from goose.errors import Honk
 class IAdapter[ResultT: Result](Protocol):
     __code__: CodeType
 
-    async def __call__(
-        self, *, conversation: Conversation[ResultT], agent: Agent
-    ) -> ResultT: ...
+    async def __call__(self, *, conversation: Conversation[ResultT], agent: Agent) -> ResultT: ...
 
 
 class Flow[**P]:

{goose_py-0.7.0 → goose_py-0.7.2}/goose/_internal/state.py

@@ -61,6 +61,10 @@ class NodeState[ResultT: Result](BaseModel):
         self.conversation.user_messages.append(message)
         return self
 
+    def undo(self) -> Self:
+        self.conversation.undo()
+        return self
+
 
 class FlowRun:
     def __init__(self) -> None:
@@ -97,23 +101,17 @@ class FlowRun:
         matching_nodes: list[NodeState[R]] = []
         for key, node_state in self._node_states.items():
             if key[0] == task.name:
-                matching_nodes.append(
-                    NodeState[task.result_type].model_validate_json(node_state)
-                )
+                matching_nodes.append(NodeState[task.result_type].model_validate_json(node_state))
         return sorted(matching_nodes, key=lambda node: node.index)
 
     def get[R: Result](self, *, task: "Task[Any, R]", index: int = 0) -> NodeState[R]:
-        if (
-            existing_node_state := self._node_states.get((task.name, index))
-        ) is not None:
+        if (existing_node_state := self._node_states.get((task.name, index))) is not None:
             return NodeState[task.result_type].model_validate_json(existing_node_state)
         else:
             return NodeState[task.result_type](
                 task_name=task.name,
                 index=index,
-                conversation=Conversation[task.result_type](
-                    user_messages=[], result_messages=[]
-                ),
+                conversation=Conversation[task.result_type](user_messages=[], result_messages=[]),
                 last_hash=0,
             )
 
@@ -143,9 +141,7 @@ class FlowRun:
         self._last_requested_indices = {}
         self._flow_name = flow_name
         self._id = run_id
-        self._agent = Agent(
-            flow_name=self.flow_name, run_id=self.id, logger=agent_logger
-        )
+        self._agent = Agent(flow_name=self.flow_name, run_id=self.id, logger=agent_logger)
 
     def end(self) -> None:
         self._last_requested_indices = {}
@@ -177,9 +173,7 @@ class FlowRun:
         return flow_run
 
 
-_current_flow_run: ContextVar[FlowRun | None] = ContextVar(
-    "current_flow_run", default=None
-)
+_current_flow_run: ContextVar[FlowRun | None] = ContextVar("current_flow_run", default=None)
 
 
 def get_current_flow_run() -> FlowRun | None:

{goose_py-0.7.0 → goose_py-0.7.2}/goose/_internal/task.py

@@ -1,4 +1,5 @@
-from typing import Awaitable, Callable, overload
+from collections.abc import Awaitable, Callable
+from typing import overload
 
 from goose._internal.agent import Agent, GeminiModel, SystemMessage, UserMessage
 from goose._internal.conversation import Conversation
@@ -33,9 +34,7 @@ class Task[**P, R: Result]:
     def name(self) -> str:
         return self._generator.__name__
 
-    async def generate(
-        self, state: NodeState[R], *args: P.args, **kwargs: P.kwargs
-    ) -> R:
+    async def generate(self, state: NodeState[R], *args: P.args, **kwargs: P.kwargs) -> R:
         state_hash = self.__hash_task_call(*args, **kwargs)
         if state_hash != state.last_hash:
             result = await self._generator(*args, **kwargs)
@@ -58,14 +57,18 @@ class Task[**P, R: Result]:
             node_state.set_context(context=context)
         node_state.add_user_message(message=user_message)
 
-        result = await self.__adapt(
-            conversation=node_state.conversation, agent=flow_run.agent
-        )
+        result = await self.__adapt(conversation=node_state.conversation, agent=flow_run.agent)
         node_state.add_result(result=result)
         flow_run.add_node_state(node_state)
 
         return result
 
+    def undo(self, *, index: int = 0) -> None:
+        flow_run = self.__get_current_flow_run()
+        node_state = flow_run.get(task=self, index=index)
+        node_state.undo()
+        flow_run.add_node_state(node_state)
+
     async def __call__(self, *args: P.args, **kwargs: P.kwargs) -> R:
         flow_run = self.__get_current_flow_run()
         node_state = flow_run.get_next(task=self)
@@ -97,11 +100,7 @@ class Task[**P, R: Result]:
 
     def __hash_task_call(self, *args: P.args, **kwargs: P.kwargs) -> int:
         try:
-            to_hash = str(
-                tuple(args)
-                + tuple(kwargs.values())
-                + (self._generator.__code__, self._adapter_model)
-            )
+            to_hash = str(tuple(args) + tuple(kwargs.values()) + (self._generator.__code__, self._adapter_model))
             return hash(to_hash)
         except TypeError:
             raise Honk(f"Unhashable argument to task {self.name}: {args} {kwargs}")

{goose_py-0.7.0 → goose_py-0.7.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "goose-py"
-version = "0.7.0"
+version = "0.7.2"
 description = "A tool for AI workflows based on human-computer collaboration and structured output."
 readme = "README.md"
 authors = [
@@ -38,6 +38,7 @@ exclude = [
     ".venv",
     "**/.venv",
     "notebooks",
+    ".stubs",
 ]
 force-exclude = true
 line-length = 120
@@ -61,12 +62,12 @@ pythonVersion = "3.12"
 typeCheckingMode = "strict"
 reportMissingModuleSource = false
 useLibraryCodeForTypes = false
-reportImportCycles = true
 reportUnknownMemberType = false
 reportUnknownVariableType = false
 stubPath = ".stubs"
 venvPath = "."
 venv = ".venv"
+exclude = ["goose/__init__.py", ".venv", "notebooks"]
 
 [tool.pytest.ini_options]
 filterwarnings = [

{goose_py-0.7.0 → goose_py-0.7.2}/tests/conftest.py

@@ -1,4 +1,5 @@
 import asyncio
+
 import pytest
 
 

{goose_py-0.7.0 → goose_py-0.7.2}/tests/test_agent.py

@@ -5,26 +5,20 @@ from pytest_mock import MockerFixture
 
 from goose import TextResult, flow, task
 from goose._internal.agent import Agent, AgentResponse, IAgentLogger
-from goose.types.agent import GeminiModel, TextMessagePart, UserMessage
+from goose.agent import GeminiModel, TextMessagePart, UserMessage
 
 
 class MockLiteLLMResponse:
-    def __init__(
-        self, *, response: str, prompt_tokens: int, completion_tokens: int
-    ) -> None:
+    def __init__(self, *, response: str, prompt_tokens: int, completion_tokens: int) -> None:
         self.choices = [Mock(message=Mock(content=response))]
-        self.usage = Mock(
-            prompt_tokens=prompt_tokens, completion_tokens=completion_tokens
-        )
+        self.usage = Mock(prompt_tokens=prompt_tokens, completion_tokens=completion_tokens)
 
 
 @pytest.fixture
 def mock_litellm(mocker: MockerFixture) -> Mock:
     return mocker.patch(
-        "goose._agent.acompletion",
-        return_value=MockLiteLLMResponse(
-            response="Hello", prompt_tokens=10, completion_tokens=10
-        ),
+        "goose._internal.agent.acompletion",
+        return_value=MockLiteLLMResponse(response="Hello", prompt_tokens=10, completion_tokens=10),
     )
 
 

{goose_py-0.7.0 → goose_py-0.7.2}/tests/test_complex_flow_arguments.py

@@ -1,8 +1,7 @@
 import pytest
 from pydantic import BaseModel
 
-from goose import flow
-from goose._agent import Agent
+from goose import Agent, flow
 
 
 class MyMessage(BaseModel):

{goose_py-0.7.0 → goose_py-0.7.2}/tests/test_downstream_task.py

@@ -12,9 +12,7 @@ class GeneratedWord(Result):
 
 @task
 async def generate_random_word(*, n_characters: int) -> GeneratedWord:
-    return GeneratedWord(
-        word="".join(random.sample(string.ascii_lowercase, n_characters))
-    )
+    return GeneratedWord(word="".join(random.sample(string.ascii_lowercase, n_characters)))
 
 
 @task

{goose_py-0.7.0 → goose_py-0.7.2}/tests/test_jamming.py

@@ -6,7 +6,7 @@ import pytest
 from pytest_mock import MockerFixture
 
 from goose import Result, flow, task
-from goose.types.agent import SystemMessage, TextMessagePart, UserMessage
+from goose.agent import SystemMessage, TextMessagePart, UserMessage
 
 
 class GeneratedWord(Result):
@@ -19,9 +19,7 @@ class GeneratedSentence(Result):
 
 @task
 async def generate_random_word(*, n_characters: int) -> GeneratedWord:
-    return GeneratedWord(
-        word="".join(random.sample(string.ascii_lowercase, n_characters))
-    )
+    return GeneratedWord(word="".join(random.sample(string.ascii_lowercase, n_characters)))
 
 
 @pytest.fixture

{goose_py-0.7.0 → goose_py-0.7.2}/tests/test_looping.py

@@ -31,9 +31,7 @@ async def number_of_learning_outcomes() -> NumberOfLearningOutcomes:
 
 
 @task
-async def learning_outcome(
-    *, objective: CourseObjective, previous_outcomes: list[LearningOutcome]
-) -> LearningOutcome:
+async def learning_outcome(*, objective: CourseObjective, previous_outcomes: list[LearningOutcome]) -> LearningOutcome:
     return LearningOutcome(outcome="Learn Python")
 
 
@@ -48,9 +46,7 @@ async def course_content() -> None:
     num_outcomes = await number_of_learning_outcomes()
     outcomes: list[LearningOutcome] = []
     for _ in range(num_outcomes.number):
-        outcomes.append(
-            await learning_outcome(objective=objective, previous_outcomes=outcomes)
-        )
+        outcomes.append(await learning_outcome(objective=objective, previous_outcomes=outcomes))
 
     for outcome in outcomes:
         await quiz_question(outcome=outcome.outcome)

{goose_py-0.7.0 → goose_py-0.7.2}/tests/test_state.py

@@ -1,9 +1,12 @@
 import random
 import string
+from unittest.mock import Mock
 
 import pytest
+from pytest_mock import MockerFixture
 
 from goose import Result, flow, task
+from goose._internal.types.agent import SystemMessage, TextMessagePart, UserMessage
 from goose.errors import Honk
 
 
@@ -17,8 +20,15 @@ class GeneratedSentence(Result):
 
 @task
 async def generate_random_word(*, n_characters: int) -> GeneratedWord:
-    return GeneratedWord(
-        word="".join(random.sample(string.ascii_lowercase, n_characters))
+    return GeneratedWord(word="".join(random.sample(string.ascii_lowercase, n_characters)))
+
+
+@pytest.fixture
+def generate_random_word_adapter(mocker: MockerFixture) -> Mock:
+    return mocker.patch.object(
+        generate_random_word,
+        "_Task__adapt",
+        return_value=GeneratedWord(word="__ADAPTED__"),
     )
 
 
@@ -49,3 +59,22 @@ async def test_state_causes_caching() -> None:
     new_random_word = new_run.get(task=generate_random_word).result.word
 
     assert random_word == new_random_word  # unchanged node is not re-generated
+
+
+@pytest.mark.asyncio
+@pytest.mark.usefixtures("generate_random_word_adapter")
+async def test_state_undo() -> None:
+    async with with_state.start_run(run_id="2"):
+        await with_state.generate()
+
+    async with with_state.start_run(run_id="2"):
+        await generate_random_word.jam(
+            index=0,
+            user_message=UserMessage(parts=[TextMessagePart(text="Change it")]),
+            context=SystemMessage(parts=[TextMessagePart(text="Extra info")]),
+        )
+
+    async with with_state.start_run(run_id="2") as run:
+        generate_random_word.undo()
+
+    assert run.get(task=generate_random_word).result.word != "__ADAPTED__"

{goose_py-0.7.0 → goose_py-0.7.2}/uv.lock

@@ -233,8 +233,8 @@ wheels = [
 ]
 
 [[package]]
-name = "goose"
-version = "0.6.1"
+name = "goose-py"
+version = "0.7.2"
 source = { editable = "." }
 dependencies = [
     { name = "jsonpath-ng" },

goose_py-0.7.0/.github/workflows/publish.yml

@@ -1,75 +0,0 @@
-name: CI/CD
-
-on:
-  push:
-    branches:
-      - main
-    tags:
-      - "v*"
-  pull_request:
-    branches:
-      - main
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Set up Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: "3.12"
-
-      - name: Install Poetry
-        uses: snok/install-poetry@v1
-        with:
-          version: 1.8.5
-          virtualenvs-create: true
-          virtualenvs-in-project: true
-
-      - name: Install dependencies
-        run: poetry install --all-extras
-
-      - name: Run tests
-        run: poetry run pytest tests
-        env:
-          GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
-
-  publish:
-    needs: test
-    runs-on: ubuntu-latest
-    if: github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/main')
-    permissions:
-      id-token: write
-      contents: read
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Set up Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: "3.12"
-
-      - name: Install Poetry
-        uses: snok/install-poetry@v1
-        with:
-          version: 1.8.5
-          virtualenvs-create: true
-          virtualenvs-in-project: true
-
-      - name: Install dependencies
-        run: poetry install --all-extras
-
-      - name: Build package
-        run: poetry build
-
-      - name: Publish to PyPI
-        if: startsWith(github.ref, 'refs/tags/')
-        uses: pypa/gh-action-pypi-publish@release/v1