goose-py 0.6.0__py3-none-any.whl → 0.7.1__py3-none-any.whl

goose/__init__.py

@@ -1,5 +1,4 @@
-from goose._agent import Agent, AgentResponse, IAgentLogger
-from goose._flow import flow
-from goose._result import Result, TextResult
-from goose._store import IFlowRunStore
-from goose._task import task
+from goose._internal.agent import Agent
+from goose._internal.flow import flow
+from goose._internal.result import Result, TextResult
+from goose._internal.task import task

goose/{_agent.py → _internal/agent.py}

@@ -6,8 +6,13 @@ from typing import Any, ClassVar, Protocol, TypedDict
 from litellm import acompletion
 from pydantic import BaseModel, computed_field
 
-from goose._result import Result, TextResult
-from goose.types.agent import AssistantMessage, GeminiModel, SystemMessage, UserMessage
+from goose._internal.result import Result, TextResult
+from goose._internal.types.agent import (
+    AssistantMessage,
+    GeminiModel,
+    SystemMessage,
+    UserMessage,
+)
 
 
 class AgentResponseDump(TypedDict):
@@ -60,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
@@ -95,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,
@@ -156,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,
@@ -169,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/{_conversation.py → _internal/conversation.py}

@@ -1,7 +1,12 @@
 from pydantic import BaseModel
 
-from goose._result import Result
-from goose.types.agent import AssistantMessage, LLMMessage, SystemMessage, UserMessage
+from goose._internal.result import Result
+from goose._internal.types.agent import (
+    AssistantMessage,
+    LLMMessage,
+    SystemMessage,
+    UserMessage,
+)
 
 
 class Conversation[R: Result](BaseModel):
@@ -19,18 +24,10 @@ 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

goose/{_flow.py → _internal/flow.py}

@@ -1,21 +1,20 @@
+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._agent import Agent, IAgentLogger
-from goose._conversation import Conversation
-from goose._result import Result
-from goose._state import FlowRun, get_current_flow_run, set_current_flow_run
-from goose._store import IFlowRunStore, InMemoryFlowRunStore
+from goose._internal.agent import Agent, IAgentLogger
+from goose._internal.conversation import Conversation
+from goose._internal.result import Result
+from goose._internal.state import FlowRun, get_current_flow_run, set_current_flow_run
+from goose._internal.store import IFlowRunStore, InMemoryFlowRunStore
 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/{_state.py → _internal/state.py}

@@ -4,18 +4,18 @@ from typing import TYPE_CHECKING, Any, Self
 
 from pydantic import BaseModel
 
-from goose._agent import (
+from goose._internal.agent import (
     Agent,
     IAgentLogger,
     SystemMessage,
     UserMessage,
 )
-from goose._conversation import Conversation
-from goose._result import Result
+from goose._internal.conversation import Conversation
+from goose._internal.result import Result
 from goose.errors import Honk
 
 if TYPE_CHECKING:
-    from goose._task import Task
+    from goose._internal.task import Task
 
 
 @dataclass
@@ -97,23 +97,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 +137,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 +169,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/{_store.py → _internal/store.py}

@@ -2,8 +2,8 @@ from __future__ import annotations
 
 from typing import Protocol
 
-from goose._flow import FlowRun
-from goose._state import FlowRunState
+from goose._internal.flow import FlowRun
+from goose._internal.state import FlowRunState
 
 
 class IFlowRunStore(Protocol):

goose/{_task.py → _internal/task.py}

@@ -1,11 +1,12 @@
-from typing import Awaitable, Callable, overload
-
-from goose._agent import Agent, GeminiModel, SystemMessage, UserMessage
-from goose._conversation import Conversation
-from goose._result import Result, TextResult
-from goose._state import FlowRun, NodeState, get_current_flow_run
+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
+from goose._internal.result import Result, TextResult
+from goose._internal.state import FlowRun, NodeState, get_current_flow_run
+from goose._internal.types.agent import AssistantMessage
 from goose.errors import Honk
-from goose.types.agent import AssistantMessage
 
 
 class Task[**P, R: Result]:
@@ -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,9 +57,7 @@ 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)
 
@@ -97,11 +94,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/agent.py

@@ -0,0 +1,28 @@
+from goose._internal.agent import AgentResponse, IAgentLogger
+from goose._internal.types.agent import (
+    AssistantMessage,
+    GeminiModel,
+    LLMMediaMessagePart,
+    LLMMessage,
+    LLMTextMessagePart,
+    MediaMessagePart,
+    SystemMessage,
+    TextMessagePart,
+    UserMediaContentType,
+    UserMessage,
+)
+
+__all__ = [
+    "AgentResponse",
+    "IAgentLogger",
+    "AssistantMessage",
+    "GeminiModel",
+    "LLMMediaMessagePart",
+    "LLMMessage",
+    "LLMTextMessagePart",
+    "MediaMessagePart",
+    "SystemMessage",
+    "TextMessagePart",
+    "UserMediaContentType",
+    "UserMessage",
+]

goose/flow.py

@@ -0,0 +1,3 @@
+from goose._internal.flow import Flow
+
+__all__ = ["Flow"]

goose/runs.py

@@ -0,0 +1,4 @@
+from goose._internal.state import FlowRun, FlowRunState
+from goose._internal.store import IFlowRunStore
+
+__all__ = ["FlowRun", "FlowRunState", "IFlowRunStore"]

goose_py-0.7.1.dist-info/METADATA

@@ -0,0 +1,14 @@
+Metadata-Version: 2.4
+Name: goose-py
+Version: 0.7.1
+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
+Requires-Dist: jsonpath-ng>=1.7.0
+Requires-Dist: litellm>=1.56.5
+Requires-Dist: pydantic>=2.8.2
+Description-Content-Type: text/markdown
+
+# Goose
+
+Docs to come.

goose_py-0.7.1.dist-info/RECORD

@@ -0,0 +1,18 @@
+goose/__init__.py,sha256=mppYCowcZw9ke_4y1d1ayHwI3502LBaY959jdOVBPp0,170
+goose/agent.py,sha256=g2tPFqEhqBABEjmpNJ2ShfjHDGzmeUXIgOZCKDZ2-40,600
+goose/errors.py,sha256=-0OyZQJWYTRw5YgnCB2_uorVaUsL6Z0QYQO2FqzCiyg,32
+goose/flow.py,sha256=A1bzNIjnoVXRFm6LGhQglxVnKMP0vEVfvTubTol7Kww,58
+goose/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+goose/runs.py,sha256=HHcky_IbmY9HWBjpXJgOcH2Ko0N39qADsGIPR8QYpek,160
+goose/_internal/agent.py,sha256=l0pKfShovrs238sKAr-zubtcacYm82TGwQHcBWVJm2g,5875
+goose/_internal/conversation.py,sha256=BiWxWN2W-0fMMLgVRaVYld5_5-AttA3M5KF8JGznVwg,1081
+goose/_internal/flow.py,sha256=KGT6NpkMY8q_N1yKwWrxfTbhwcu5AwdHtgCPqCdL3F8,3266
+goose/_internal/result.py,sha256=-eZJn-2sPo7rHZ38Sz6IAHXqiJ-Ss39esEoFGimJEBI,155
+goose/_internal/state.py,sha256=dKXSNMVzeM_2h0YuyMatU1I57REAzttuYBJmoUMy3ag,5703
+goose/_internal/store.py,sha256=vIxPIpechF_lEQlQ8JT1NDySDfHe3-eMHEWeTqVbscg,946
+goose/_internal/task.py,sha256=cHzS7TTDXruPwXDK8P03zs3HUiJqAXECuPuAM3Oo5Tw,4685
+goose/_internal/types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+goose/_internal/types/agent.py,sha256=rNVt2gEr_m4_8tGFgcdichpPp8xhOS5GY0kN2C4tiE8,2153
+goose_py-0.7.1.dist-info/METADATA,sha256=b_FEa3StNuozZAxU6W_qXdEVzW98W6nLpibqcqNhh9s,441
+goose_py-0.7.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+goose_py-0.7.1.dist-info/RECORD,,

{goose_py-0.6.0.dist-info → goose_py-0.7.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.1
+Generator: hatchling 1.27.0
 Root-Is-Purelib: true
 Tag: py3-none-any

goose_py-0.6.0.dist-info/METADATA

@@ -1,31 +0,0 @@
-Metadata-Version: 2.1
-Name: goose-py
-Version: 0.6.0
-Summary: A tool for AI workflows based on human-computer collaboration and structured output.
-Home-page: https://github.com/chelle-ai/goose
-Keywords: ai,yaml,configuration,llm
-Author: Nash Taylor
-Author-email: nash@chelle.ai
-Requires-Python: >=3.12,<4.0
-Classifier: Development Status :: 4 - Beta
-Classifier: Intended Audience :: Developers
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Provides-Extra: test
-Requires-Dist: ipykernel ; extra == "test"
-Requires-Dist: jsonpath-ng (>=1.7.0,<2.0.0)
-Requires-Dist: litellm (>=1.56.5,<2.0.0)
-Requires-Dist: pydantic (>=2.8.2,<3.0.0)
-Requires-Dist: pytest (<8) ; extra == "test"
-Requires-Dist: pytest-asyncio ; extra == "test"
-Requires-Dist: pytest-mock ; extra == "test"
-Project-URL: Documentation, https://github.com/chelle-ai/goose
-Project-URL: Repository, https://github.com/chelle-ai/goose
-Description-Content-Type: text/markdown
-
-# Goose
-
-Docs to come.
-

goose_py-0.6.0.dist-info/RECORD

@@ -1,15 +0,0 @@
-goose/__init__.py,sha256=vDVznQm4FIZmqjmCEJdOozSWLse5c-adbesRLdmNyiE,202
-goose/_agent.py,sha256=aeHJrCP3257fNDwpt4ls-zqL76Vs3p4wNJvQFHdk_xM,6061
-goose/_conversation.py,sha256=8ZgoBHnwWZ4zYnf5wQXEo0mVs50ixMIQqc2qDOTorPE,1177
-goose/_flow.py,sha256=lx8L6ZizovtgLG1GGn0zf_zuRAez5TN6gD8Q182s0Ks,3208
-goose/_result.py,sha256=-eZJn-2sPo7rHZ38Sz6IAHXqiJ-Ss39esEoFGimJEBI,155
-goose/_state.py,sha256=eG5SyO-YVj9A9a4HSoIF-YInVF3cwJkZ906B1GHohr4,5793
-goose/_store.py,sha256=wB-VWaWXvW1PlyKm05Ti21XM6PFqsAPEGvAYyFokApk,928
-goose/_task.py,sha256=lE7k79Jmb7Lkz4vJj2rEt53TG7XnVqDFltON3iONamk,4710
-goose/errors.py,sha256=-0OyZQJWYTRw5YgnCB2_uorVaUsL6Z0QYQO2FqzCiyg,32
-goose/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-goose/types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-goose/types/agent.py,sha256=rNVt2gEr_m4_8tGFgcdichpPp8xhOS5GY0kN2C4tiE8,2153
-goose_py-0.6.0.dist-info/METADATA,sha256=VR7a7oYrrSN8a1-aF5xC05ZwUp45gwh8txPv1VMgYxE,1106
-goose_py-0.6.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-goose_py-0.6.0.dist-info/RECORD,,