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

ailoy/__init__.py

@@ -1,12 +1,12 @@
 """""" # start delvewheel patch
-def _delvewheel_patch_1_10_1():
+def _delvewheel_patch_1_11_0():
     import os
     if os.path.isdir(libs_dir := os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir, 'ailoy_py.libs'))):
         os.add_dll_directory(libs_dir)
 
 
-_delvewheel_patch_1_10_1()
-del _delvewheel_patch_1_10_1
+_delvewheel_patch_1_11_0()
+del _delvewheel_patch_1_11_0
 # end delvewheel patch
 
 if __doc__ is None:

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.5.dist-info/DELVEWHEEL

@@ -0,0 +1,2 @@
+Version: 1.11.0
+Arguments: ['C:\\Program Files\\Python313\\Lib\\site-packages\\delvewheel\\__main__.py', 'repair', '-w', 'wheelhouse', 'C:\\workspace\\bindings\\python\\dist\\ailoy_py-0.0.5-cp313-cp313-win_amd64.whl', '--add-path', 'C:\\workspace\\bindings\\python\\build\\_deps\\tvm-build\\Release', '--exclude', 'vulkan-1.dll']

{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,14 +1,14 @@
-ailoy/agent.py,sha256=HowE3cc1nxuoi41SiX6tyAZudlJ2I_pdnOs3SFHebJw,27549
-ailoy/ailoy_py.cp313-win_amd64.pyd,sha256=YGESQzWy--RT4ElV7ntbsyuXIfXbQk7TiVEfUA8_Xfg,11655168
+ailoy/agent.py,sha256=SqpnpywdXg28UjtBHcU0k446s1DxW-g6jWCNEHQxGAk,27728
+ailoy/ailoy_py.cp313-win_amd64.pyd,sha256=DrKTkNIMNIFyKev9vmlj2ttPtakDRjRfWb-RsJIdENg,12851200
 ailoy/ailoy_py.pyi,sha256=wr_-KGTI-O9usNdzTyszn4mAjnjiV2cJf0aBct2PKrU,1020
 ailoy/mcp.py,sha256=mwxfEZj7Je2PJTwwM9zVQ44AurrA5xY5TWVsAUkk9T8,6971
 ailoy/runtime.py,sha256=Bic6acq6NVuZchyuB51lm-58Xe_blRJbIE3gF9Xk22w,10833
-ailoy/tools.py,sha256=5Q7Q59ozeKWXwH5q9WY_9nuI3ALMAorKPgX6LNPWaJg,8412
+ailoy/tools.py,sha256=OQZHMGOWovx0uWlYeWN2BoPG_G5rMW5HXCP3yTvtLDk,9081
 ailoy/vector_store.py,sha256=507HG-3W_glmZsKDUcFygdaPg3d7xyHbAFczE3diGwo,7723
-ailoy/__init__.py,sha256=BXhdYLP-Ja7E2JQACEDkaPhEapgjF4fF02Cr7IPSRzI,1135
+ailoy/__init__.py,sha256=gR2i8fAFUqreAxQmdJ38Fw7QF6SVtlXLhGbRBL-ve_Q,1135
 ailoy/cli/model.py,sha256=t1-uO5vRDUomxIDpuMduPVCOKBR9VHMXqMcz38m_-YI,3091
 ailoy/cli/__main__.py,sha256=JUWtde3gYqKxuCtihgr5g2MAQgj151wv41OOZv2uHsQ,190
-ailoy/models/api_model.py,sha256=Bkj60H1_AMGltRjBpFGlwxk-FTuf1FeAUWQ1aucuyKE,1858
+ailoy/models/api_model.py,sha256=q99HKACIutjkBPyVRFbdsrFoD8DYI9bayLM0ZBcwupM,2176
 ailoy/models/local_model.py,sha256=Z7TwScM2V1U99ErqgO2YVcSOc85wEmIie8xTXP7wMBA,1250
 ailoy/models/__init__.py,sha256=AfJlZYoacXf9de0LOttkFNirwS8XFaZcHUg7dA7xQsw,124
 ailoy/presets/tools/calculator.json,sha256=8G5t1PGyM7ZmX97WNfrF-H-x7LR8s_O15ppY_APFnVo,1064
@@ -17,11 +17,11 @@ ailoy/presets/tools/nytimes.json,sha256=diio4FSJGHvumX05MQ0RgrqZzggpjyX8ekBPZ4NC
 ailoy/presets/tools/tmdb.json,sha256=o9dg9bdfFhvgrhVGw5hP3V0EgGvBzm5ZrTtxrb1PerM,7231
 ailoy/utils/image.py,sha256=hMNrwexs_8Dz0QK2CUI8Kyw3_X3v4mWxtskg9SLBLCg,299
 ailoy/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ailoy_py-0.0.3.dist-info/DELVEWHEEL,sha256=wMXrH9ZNTXTOYvDVyN-OLkDy5CQ5zHlVP1OH4Z8pgEQ,339
-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.3.dist-info/RECORD,,
-ailoy_py-0.0.3.dist-info/WHEEL,sha256=_PdgJ-W7uMAsWwnGnEdiicDU_PKcobRdffEM23gmN6g,106
-ailoy_py.libs/msvcp140-0c97ddc05c5b9024aa6af9538804ea77.dll,sha256=0JEULNWjSOvIT9uiwpZrJ2N5awL-smgUd5rFf3QSK6g,557696
-ailoy_py.libs/tvm_runtime-ebd136148ad4b472eba26f3ddd5cba0e.dll,sha256=XXXiaRtmm09F1kebr1Oa4knSyR_8-gy3gUWhScxkt84,2531840
-ailoy_py.libs/vcomp140-f99ecd9a7e9d3df487b10cf7a201d515.dll,sha256=42pcXjKbx6811PqmEKKa7ugmp4EOBnEvD1Tpss_mpyg,192112
+ailoy_py-0.0.5.dist-info/DELVEWHEEL,sha256=tzg8LeWmovsBMqrD2Eai_LwA4HiaPc_ezuFFu4Q4-vE,330
+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
+ailoy_py-0.0.5.dist-info/RECORD,,
+ailoy_py-0.0.5.dist-info/WHEEL,sha256=_PdgJ-W7uMAsWwnGnEdiicDU_PKcobRdffEM23gmN6g,106
+ailoy_py.libs/msvcp140-0f885b509a685d2bbfa652fed26b5fb3.dll,sha256=D4hbUJpoXSu_plL-0mtfsx2I-9qwqXjGQdHHuKpGCqk,557728
+ailoy_py.libs/tvm_runtime-9ad88c2ade755144e8d7f595777f385a.dll,sha256=ypvU1f-sl7PDVH5_A93puMngWpEQTa3TS9zUJrbUoCw,2531328
+ailoy_py.libs/vcomp140-55aba23cdcd6484fbb06f4155b8ca75a.dll,sha256=VauiPNzWSE-7BvQVW4ynWt_OeogfEK_QxJRXFl5ncWQ,193152

ailoy_py-0.0.3.dist-info/DELVEWHEEL

@@ -1,2 +0,0 @@
-Version: 1.10.1
-Arguments: ['C:\\hostedtoolcache\\windows\\Python\\3.13.5\\x64\\Scripts\\delvewheel', 'repair', '-w', 'wheelhouse', 'D:\\a\\ailoy\\ailoy\\bindings\\python\\dist\\ailoy_py-0.0.3-cp313-cp313-win_amd64.whl', '--add-path', 'D:\\a\\ailoy\\ailoy\\bindings\\python\\build\\_deps\\tvm-build\\Release', '--exclude', 'vulkan-1.dll']