goose-py 0.9.6__tar.gz → 0.9.8__tar.gz

{goose_py-0.9.6 → goose_py-0.9.8}/.stubs/litellm/__init__.pyi

@@ -4,6 +4,9 @@ _LiteLLMGeminiModel = Literal[
     "vertex_ai/gemini-1.5-flash",
     "vertex_ai/gemini-1.5-pro",
     "vertex_ai/gemini-1.5-flash-8b",
+    "gemini/gemini-1.5-flash",
+    "gemini/gemini-1.5-pro",
+    "gemini/gemini-1.5-flash-8b",
 ]
 _MessageRole = Literal["system", "user", "assistant"]
 

{goose_py-0.9.6 → goose_py-0.9.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: goose-py
-Version: 0.9.6
+Version: 0.9.8
 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.9.6 → goose_py-0.9.8}/goose/_internal/agent.py

@@ -6,13 +6,8 @@ from typing import Any, ClassVar, Protocol, TypedDict
 from litellm import acompletion
 from pydantic import BaseModel, computed_field
 
-from goose._internal.result import Result, TextResult
-from goose._internal.types.agent import (
-    AssistantMessage,
-    GeminiModel,
-    SystemMessage,
-    UserMessage,
-)
+from .result import Result, TextResult
+from .types.agent import AIModel, AssistantMessage, SystemMessage, UserMessage
 
 
 class AgentResponseDump(TypedDict):
@@ -34,22 +29,28 @@ class AgentResponseDump(TypedDict):
 
 
 class AgentResponse[R: BaseModel | str](BaseModel):
-    INPUT_CENTS_PER_MILLION_TOKENS: ClassVar[dict[GeminiModel, float]] = {
-        GeminiModel.FLASH_8B: 30,
-        GeminiModel.FLASH: 15,
-        GeminiModel.PRO: 500,
+    INPUT_CENTS_PER_MILLION_TOKENS: ClassVar[dict[AIModel, float]] = {
+        AIModel.VERTEX_FLASH_8B: 30,
+        AIModel.VERTEX_FLASH: 15,
+        AIModel.VERTEX_PRO: 500,
+        AIModel.GEMINI_FLASH_8B: 30,
+        AIModel.GEMINI_FLASH: 15,
+        AIModel.GEMINI_PRO: 500,
     }
-    OUTPUT_CENTS_PER_MILLION_TOKENS: ClassVar[dict[GeminiModel, float]] = {
-        GeminiModel.FLASH_8B: 30,
-        GeminiModel.FLASH: 15,
-        GeminiModel.PRO: 500,
+    OUTPUT_CENTS_PER_MILLION_TOKENS: ClassVar[dict[AIModel, float]] = {
+        AIModel.VERTEX_FLASH_8B: 30,
+        AIModel.VERTEX_FLASH: 15,
+        AIModel.VERTEX_PRO: 500,
+        AIModel.GEMINI_FLASH_8B: 30,
+        AIModel.GEMINI_FLASH: 15,
+        AIModel.GEMINI_PRO: 500,
     }
 
     response: R
     run_id: str
     flow_name: str
     task_name: str
-    model: GeminiModel
+    model: AIModel
     system: SystemMessage | None = None
     input_messages: list[UserMessage | AssistantMessage]
     input_tokens: int
@@ -135,7 +136,7 @@ class Agent:
         self,
         *,
         messages: list[UserMessage | AssistantMessage],
-        model: GeminiModel,
+        model: AIModel,
         task_name: str,
         response_model: type[R] = TextResult,
         system: SystemMessage | None = None,

{goose_py-0.9.6 → goose_py-0.9.8}/goose/_internal/conversation.py

@@ -2,8 +2,8 @@ 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 .result import Result
+from .types.agent import AssistantMessage, LLMMessage, SystemMessage, UserMessage
 
 
 class Conversation[R: Result](BaseModel):

{goose_py-0.9.6 → goose_py-0.9.8}/goose/_internal/flow.py

@@ -3,12 +3,12 @@ from contextlib import asynccontextmanager
 from types import CodeType
 from typing import Protocol, overload
 
-from goose._internal.agent import Agent, IAgentLogger
-from goose._internal.conversation import Conversation
-from goose._internal.result import Result
-from goose._internal.state import FlowArguments, FlowRun, get_current_flow_run, set_current_flow_run
-from goose._internal.store import IFlowRunStore, InMemoryFlowRunStore
-from goose.errors import Honk
+from ..errors import Honk
+from .agent import Agent, IAgentLogger
+from .conversation import Conversation
+from .result import Result
+from .state import FlowArguments, FlowRun, get_current_flow_run, set_current_flow_run
+from .store import IFlowRunStore, InMemoryFlowRunStore
 
 
 class IGenerator[FlowArgumentsT: FlowArguments](Protocol):

{goose_py-0.9.6 → goose_py-0.9.8}/goose/_internal/state.py

@@ -4,15 +4,15 @@ from typing import TYPE_CHECKING, Any, NewType, Self
 
 from pydantic import BaseModel, ConfigDict
 
-from goose._internal.agent import (
+from ..errors import Honk
+from .agent import (
     Agent,
     IAgentLogger,
     SystemMessage,
     UserMessage,
 )
-from goose._internal.conversation import Conversation
-from goose._internal.result import Result
-from goose.errors import Honk
+from .conversation import Conversation
+from .result import Result
 
 if TYPE_CHECKING:
     from goose._internal.task import Task

{goose_py-0.9.6 → goose_py-0.9.8}/goose/_internal/store.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from typing import Protocol
 
-from goose._internal.state import SerializedFlowRun
+from .state import SerializedFlowRun
 
 
 class IFlowRunStore(Protocol):

{goose_py-0.9.6 → goose_py-0.9.8}/goose/_internal/task.py

@@ -4,12 +4,12 @@ from typing import Any, overload
 
 from pydantic import BaseModel
 
-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 ..errors import Honk
+from .agent import Agent, AIModel, SystemMessage, UserMessage
+from .conversation import Conversation
+from .result import Result, TextResult
+from .state import FlowRun, NodeState, get_current_flow_run
+from .types.agent import AssistantMessage
 
 
 class Task[**P, R: Result]:
@@ -19,7 +19,7 @@ class Task[**P, R: Result]:
         /,
         *,
         retries: int = 0,
-        adapter_model: GeminiModel = GeminiModel.FLASH,
+        adapter_model: AIModel = AIModel.GEMINI_FLASH,
     ) -> None:
         self._generator = generator
         self._retries = retries
@@ -145,14 +145,14 @@ class Task[**P, R: Result]:
 def task[**P, R: Result](generator: Callable[P, Awaitable[R]], /) -> Task[P, R]: ...
 @overload
 def task[**P, R: Result](
-    *, retries: int = 0, adapter_model: GeminiModel = GeminiModel.FLASH
+    *, retries: int = 0, adapter_model: AIModel = AIModel.GEMINI_FLASH
 ) -> Callable[[Callable[P, Awaitable[R]]], Task[P, R]]: ...
 def task[**P, R: Result](
     generator: Callable[P, Awaitable[R]] | None = None,
     /,
     *,
     retries: int = 0,
-    adapter_model: GeminiModel = GeminiModel.FLASH,
+    adapter_model: AIModel = AIModel.GEMINI_FLASH,
 ) -> Task[P, R] | Callable[[Callable[P, Awaitable[R]]], Task[P, R]]:
     if generator is None:
 

{goose_py-0.9.6 → goose_py-0.9.8}/goose/_internal/types/agent.py

@@ -4,10 +4,16 @@ from typing import Literal, NotRequired, TypedDict
 from pydantic import BaseModel
 
 
-class GeminiModel(StrEnum):
-    PRO = "vertex_ai/gemini-1.5-pro"
-    FLASH = "vertex_ai/gemini-1.5-flash"
-    FLASH_8B = "vertex_ai/gemini-1.5-flash-8b"
+class AIModel(StrEnum):
+    # vertex (production Google, requires GCP environment)
+    VERTEX_PRO = "vertex_ai/gemini-1.5-pro"
+    VERTEX_FLASH = "vertex_ai/gemini-1.5-flash"
+    VERTEX_FLASH_8B = "vertex_ai/gemini-1.5-flash-8b"
+
+    # gemini (publicly available, no GCP environment required)
+    GEMINI_PRO = "gemini/gemini-1.5-pro"
+    GEMINI_FLASH = "gemini/gemini-1.5-flash"
+    GEMINI_FLASH_8B = "gemini/gemini-1.5-flash-8b"
 
 
 class UserMediaContentType(StrEnum):

{goose_py-0.9.6 → goose_py-0.9.8}/goose/agent.py

@@ -1,7 +1,7 @@
-from goose._internal.agent import AgentResponse, IAgentLogger
-from goose._internal.types.agent import (
+from ._internal.agent import AgentResponse, IAgentLogger
+from ._internal.types.agent import (
+    AIModel,
     AssistantMessage,
-    GeminiModel,
     LLMMediaMessagePart,
     LLMMessage,
     LLMTextMessagePart,
@@ -14,9 +14,9 @@ from goose._internal.types.agent import (
 
 __all__ = [
     "AgentResponse",
+    "AIModel",
     "IAgentLogger",
     "AssistantMessage",
-    "GeminiModel",
     "LLMMediaMessagePart",
     "LLMMessage",
     "LLMTextMessagePart",

goose_py-0.9.8/goose/flow.py

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

goose_py-0.9.8/goose/runs.py

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

{goose_py-0.9.6 → goose_py-0.9.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "goose-py"
-version = "0.9.6"
+version = "0.9.8"
 description = "A tool for AI workflows based on human-computer collaboration and structured output."
 readme = "README.md"
 authors = [

{goose_py-0.9.6 → goose_py-0.9.8}/tests/test_agent.py

@@ -4,7 +4,7 @@ import pytest
 from pytest_mock import MockerFixture
 
 from goose import Agent, FlowArguments, TextResult, flow, task
-from goose.agent import AgentResponse, GeminiModel, IAgentLogger, TextMessagePart, UserMessage
+from goose.agent import AgentResponse, AIModel, IAgentLogger, TextMessagePart, UserMessage
 
 
 class TestFlowArguments(FlowArguments):
@@ -29,7 +29,7 @@ def mock_litellm(mocker: MockerFixture) -> Mock:
 async def use_agent(*, agent: Agent) -> TextResult:
     return await agent(
         messages=[UserMessage(parts=[TextMessagePart(text="Hello")])],
-        model=GeminiModel.FLASH_8B,
+        model=AIModel.GEMINI_FLASH_8B,
         task_name="greet",
     )
 

{goose_py-0.9.6 → goose_py-0.9.8}/uv.lock

@@ -234,7 +234,7 @@ wheels = [
 
 [[package]]
 name = "goose-py"
-version = "0.9.6"
+version = "0.9.8"
 source = { editable = "." }
 dependencies = [
     { name = "jsonpath-ng" },

goose_py-0.9.6/goose/flow.py

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

goose_py-0.9.6/goose/runs.py

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