goose-py 0.9.7__py3-none-any.whl → 0.9.8__py3-none-any.whl

goose/_internal/agent.py

@@ -7,7 +7,7 @@ from litellm import acompletion
 from pydantic import BaseModel, computed_field
 
 from .result import Result, TextResult
-from .types.agent import AssistantMessage, GeminiModel, SystemMessage, UserMessage
+from .types.agent import AIModel, AssistantMessage, SystemMessage, UserMessage
 
 
 class AgentResponseDump(TypedDict):
@@ -29,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
@@ -130,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/_internal/task.py

@@ -5,7 +5,7 @@ from typing import Any, overload
 from pydantic import BaseModel
 
 from ..errors import Honk
-from .agent import Agent, GeminiModel, SystemMessage, UserMessage
+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
@@ -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/_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/agent.py

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

{goose_py-0.9.7.dist-info → goose_py-0.9.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: goose-py
-Version: 0.9.7
+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.7.dist-info → goose_py-0.9.8.dist-info}/RECORD

@@ -1,18 +1,18 @@
 goose/__init__.py,sha256=wjGDgWzKcD6S8loVr0n-rLCpRwg-ZKAixcUaw1wobMc,243
-goose/agent.py,sha256=xA5mYqjS9iwiXooQzP0l1FsoDe6R7t1lyhekqroMu7c,590
+goose/agent.py,sha256=2iFjsZtXXNLXu1grCp3S_eJotGJnfP2190GYKEFQdTg,582
 goose/errors.py,sha256=-0OyZQJWYTRw5YgnCB2_uorVaUsL6Z0QYQO2FqzCiyg,32
 goose/flow.py,sha256=YsZLBa5I1W27_P6LYGWbtFX8ZYx9vJG3KtENYChHm5E,111
 goose/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 goose/runs.py,sha256=ub-r_gzbUbaIzWXX-jc-dncNxEh6zTfzIkmnDfCSbRI,160
-goose/_internal/agent.py,sha256=DmkQGXoNEYo7CYUMUu81gJ0ZguCy7SiKQbamqYnvLpk,5824
+goose/_internal/agent.py,sha256=VRDEhBDTpKZS09B6xnWsOqLsxP7D5NHKVGlxwayPdoo,6030
 goose/_internal/conversation.py,sha256=zbMvP4oxhKAzATVEXZfGVKXWfEjh472MYKhmyJzSLgI,1172
 goose/_internal/flow.py,sha256=RShMsxgt49g1fZJ3rlwDHtI1j39lZzewx8hZ7DGN5kg,4124
 goose/_internal/result.py,sha256=-eZJn-2sPo7rHZ38Sz6IAHXqiJ-Ss39esEoFGimJEBI,155
 goose/_internal/state.py,sha256=pI-C37Ybazo7EJPbZklxbiCYFy3u4I031NKBr8Jm_CI,6534
 goose/_internal/store.py,sha256=tWmKfa1-yq1jU6lT3l6kSOmVt2m3H7I1xLMTrxnUDI8,889
-goose/_internal/task.py,sha256=wK0LMlQKzlRQO-F2Xyni0hkg91cSKkW65aHv0w9ANoc,6035
+goose/_internal/task.py,sha256=Ka3tm5Ymu8sE6_GCbkj3JDHK683ZET5HlkcgrQgnzEo,6028
 goose/_internal/types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-goose/_internal/types/agent.py,sha256=rNVt2gEr_m4_8tGFgcdichpPp8xhOS5GY0kN2C4tiE8,2153
-goose_py-0.9.7.dist-info/METADATA,sha256=dtdYEIAxpQERMBb3GwU3-ukAy_-ecRZuchae4Dpz2Po,441
-goose_py-0.9.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-goose_py-0.9.7.dist-info/RECORD,,
+goose/_internal/types/agent.py,sha256=QRYux_vbOe_wRtYBMqFpt4y6v9fKN70mwcsqaT0e1wE,2430
+goose_py-0.9.8.dist-info/METADATA,sha256=UpVDqVUdVPwynJJtQwQUbyva7qThIBdAPwaTOXpjUPs,441
+goose_py-0.9.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+goose_py-0.9.8.dist-info/RECORD,,