ailoy-py 0.0.3__cp313-cp313-macosx_14_0_arm64.whl → 0.0.5__cp313-cp313-macosx_14_0_arm64.whl

ailoy/agent.py

@@ -216,8 +216,11 @@ class ToolParameters(BaseModel):
     required: Optional[list[str]] = []
 
 
+JsonSchemaTypes = Literal["string", "integer", "number", "boolean", "object", "array", "null"]
+
+
 class ToolParametersProperty(BaseModel):
-    type: Literal["string", "number", "boolean", "object", "array", "null"]
+    type: JsonSchemaTypes | list[JsonSchemaTypes]
     description: Optional[str] = None
     model_config = ConfigDict(extra="allow")
 
@@ -506,7 +509,9 @@ class Agent:
                         raise RuntimeError("Tool not found")
                     tool_result = tool_.call(**tool_call.function.arguments)
                     return ToolMessage(
-                        content=[TextContent(text=json.dumps(tool_result))],
+                        content=[
+                            TextContent(text=tool_result if isinstance(tool_result, str) else json.dumps(tool_result))
+                        ],
                         tool_call_id=tool_call.id,
                     )
 

ailoy/models/api_model.py

@@ -1,4 +1,4 @@
-from typing import Literal, Optional, Self, get_args
+from typing import Literal, Optional, get_args
 
 from pydantic import model_validator
 from pydantic.dataclasses import dataclass
@@ -34,7 +34,20 @@ ClaudeModelId = Literal[
     "claude-3-haiku-20240307",
 ]
 
-APIModelProvider = Literal["openai", "gemini", "claude"]
+GrokModelId = Literal[
+    "grok-4",
+    "grok-4-0709",
+    "grok-3",
+    "grok-3-fast",
+    "grok-3-mini",
+    "grok-3-mini-fast",
+    "grok-2",
+    "grok-2-1212",
+    "grok-2-vision-1212",
+    "grok-2-image-1212",
+]
+
+APIModelProvider = Literal["openai", "gemini", "claude", "grok"]
 
 
 @dataclass
@@ -44,7 +57,7 @@ class APIModel:
     provider: Optional[APIModelProvider] = None
 
     @model_validator(mode="after")
-    def validate_provider(self) -> Self:
+    def validate_provider(self):
         if self.provider is None:
             if self.id in get_args(OpenAIModelId):
                 self.provider = "openai"
@@ -52,6 +65,8 @@ class APIModel:
                 self.provider = "gemini"
             elif self.id in get_args(ClaudeModelId):
                 self.provider = "claude"
+            elif self.id in get_args(GrokModelId):
+                self.provider = "grok"
             else:
                 raise ValueError(
                     f'Failed to infer the model provider based on the model id "{self.id}". '

ailoy/tools.py

@@ -5,6 +5,7 @@ import types
 from typing import (
     Any,
     Callable,
+    Literal,
     Optional,
     Union,
     get_args,
@@ -41,7 +42,7 @@ class DocstringParsingException(Exception):
     pass
 
 
-def _get_json_schema_type(param_type: str) -> dict[str, str]:
+def _get_json_schema_type(param_type: type) -> dict[str, str]:
     type_mapping = {
         int: {"type": "integer"},
         float: {"type": "number"},
@@ -85,6 +86,20 @@ def _parse_type_hint(hint: str) -> dict:
             return_dict["nullable"] = True
         return return_dict
 
+    elif origin is Literal and len(args) > 0:
+        LITERAL_TYPES = (int, float, str, bool, type(None))
+        args_types = []
+        for arg in args:
+            if type(arg) not in LITERAL_TYPES:
+                raise TypeHintParsingException("Only the valid python literals can be listed in typing.Literal.")
+            arg_type = _get_json_schema_type(type(arg)).get("type")
+            if arg_type is not None and arg_type not in args_types:
+                args_types.append(arg_type)
+        return {
+            "type": args_types.pop() if len(args_types) == 1 else list(args_types),
+            "enum": list(args),
+        }
+
     elif origin is list:
         if not args:
             return {"type": "array"}
@@ -100,13 +115,13 @@ def _parse_type_hint(hint: str) -> dict:
                 f"The type hint {str(hint).replace('typing.', '')} is a Tuple with a single element, which "
                 "we do not automatically convert to JSON schema as it is rarely necessary. If this input can contain "
                 "more than one element, we recommend "
-                "using a List[] type instead, or if it really is a single element, remove the Tuple[] wrapper and just "
+                "using a list[] type instead, or if it really is a single element, remove the tuple[] wrapper and just "
                 "pass the element directly."
             )
         if ... in args:
             raise TypeHintParsingException(
                 "Conversion of '...' is not supported in Tuple type hints. "
-                "Use List[] types for variable-length"
+                "Use list[] types for variable-length"
                 " inputs instead."
             )
         return {"type": "array", "prefixItems": [_parse_type_hint(t) for t in args]}

{ailoy_py-0.0.3.dist-info → ailoy_py-0.0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ailoy-py
-Version: 0.0.3
+Version: 0.0.5
 Summary: Python binding for Ailoy runtime APIs
 Author-Email: "Brekkylab Inc." <contact@brekkylab.com>
 License-Expression: Apache-2.0

{ailoy_py-0.0.3.dist-info → ailoy_py-0.0.5.dist-info}/RECORD

@@ -1,25 +1,25 @@
 ailoy/ailoy_py.pyi,sha256=Yf90FEXkslpCpr1r2eqQ3-_1jLo65zmG94bBXDRqinU,991
 ailoy/vector_store.py,sha256=ZfIuGYKv2dQmjOuDlSKDc-BBPlQ8no_70mZwnPzbBzo,7515
-ailoy/ailoy_py.cpython-313-darwin.so,sha256=FG58UO3OQ0Aq-JhSYKuwDdf0mrF4CyUl04vrTqyXpK4,15150112
-ailoy/tools.py,sha256=RnTfmWlqYY1q0V377CpAAyAK-yET7k45GgEhgM9G8eI,8207
+ailoy/ailoy_py.cpython-313-darwin.so,sha256=eUBLZigHxAox-Z4x-XLDpcUltiKg_Ui_AGGdkyMU3rc,16572576
+ailoy/tools.py,sha256=hLdKe3TN_yn2qSbNG0uX2extokPIdJ6inLbSbhXdYTo,8861
 ailoy/__init__.py,sha256=INeFsnHtrqTwkMKUPSdD_9l8DhudnW574e9rsRtrMJc,783
 ailoy/runtime.py,sha256=-75KawEMQSwxGvX5wtECVCWiTNdcHojsQ1e-OVB4IQ8,10545
 ailoy/mcp.py,sha256=wVzXfwUh4UcU60PYq17kCFG7ZClmEDBRt8LxetuSkns,6800
-ailoy/agent.py,sha256=F15s3FzyrQ3pfNb0ZCLOPV2mrFDNCcFbYFP02hEbAk4,26780
+ailoy/agent.py,sha256=7v2E1ft1Aaufem9lxLEra3S-nX2fzeutJDgT-4LXwL8,26954
 ailoy/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ailoy/utils/image.py,sha256=zkufequcQVTmIkArreYUyB8r2nrcOL_8O6KOv5B-yis,288
 ailoy/models/__init__.py,sha256=1AtlJV9gYThw_3snu0jPEH_aQGI74ip7ZcVJLtN5nMU,117
 ailoy/models/local_model.py,sha256=Iyur0UEUSbLKzptx9croP_OAF-qh9S-ZDukDthHNz9w,1206
-ailoy/models/api_model.py,sha256=_-2TSunBh8kZQOF1CkQXBKi81XNClPWH4U5hQA7ioQ4,1787
+ailoy/models/api_model.py,sha256=kLDD1-R4hjgtTbIQkD-boT-ZK8UocmVyyHkI6tuxiFU,2090
 ailoy/cli/model.py,sha256=cerCHE-VY9TOwqRcLBtmqnV-5vphpvyhtrfPFZiTKCM,2979
 ailoy/cli/__main__.py,sha256=HnBVb2em1F2NLPeNX5r3xRndRrnGaXVCduo8WBULAI0,179
-ailoy/.dylibs/libomp.dylib,sha256=s963nLMIJ2lfA448nbin9lL52fnoeGySlgLfm4Y3HHs,735616
+ailoy/.dylibs/libomp.dylib,sha256=WYWnZ4ZNA08i3x3QtaLX9j-seoAHIteaFTvQlNHcT68,735616
 ailoy/.dylibs/libtvm_runtime.dylib,sha256=Fqp5JsiIMAsS7p94oDdxY_-kAqbwGpBGpkS2LhYfhZs,4620384
 ailoy/presets/tools/tmdb.json,sha256=UGLN5uAJ2b-Hu3nLcW95WXDLB3mfC3rBYfQANp_e8Ps,7046
 ailoy/presets/tools/calculator.json,sha256=ePnZsjZChnvS08s9eVdIp4Bys_PlJBXPHCCjv6oMvzA,1040
 ailoy/presets/tools/nytimes.json,sha256=wrfe9bnAlSPzHladoGEX2oCAeE0wed3BvgXQ_Z2PdXg,918
 ailoy/presets/tools/frankfurter.json,sha256=bZ5vhszf_aR-B_QN4L2xrI5nR-f4AMZk41UUDq1dTXg,1152
-ailoy_py-0.0.3.dist-info/RECORD,,
-ailoy_py-0.0.3.dist-info/WHEEL,sha256=IauIlnhfSTTHWYl3k448G23nPyWAM0vVFFo6kZ6tZmc,141
-ailoy_py-0.0.3.dist-info/entry_points.txt,sha256=gVG45uDE6kef0wm6SEMYSgZgRNNRhSAeP2n2lPR00dI,50
-ailoy_py-0.0.3.dist-info/METADATA,sha256=ZvX6pFs2Fb3uBmm_73Cq3rtYs52pfjd5_cEVZSluK68,2053
+ailoy_py-0.0.5.dist-info/RECORD,,
+ailoy_py-0.0.5.dist-info/WHEEL,sha256=IauIlnhfSTTHWYl3k448G23nPyWAM0vVFFo6kZ6tZmc,141
+ailoy_py-0.0.5.dist-info/entry_points.txt,sha256=gVG45uDE6kef0wm6SEMYSgZgRNNRhSAeP2n2lPR00dI,50
+ailoy_py-0.0.5.dist-info/METADATA,sha256=WpOovIib4t4AWYNmIBRRixucdz9-wBetyxyDaLjzOk4,2053