stores 0.1.0__tar.gz → 0.1.2__tar.gz

{stores-0.1.0 → stores-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: stores
-Version: 0.1.0
+Version: 0.1.2
 Summary: Repository of Python functions and tools for LLMs
 License-File: LICENSE
 Requires-Python: >=3.10

{stores-0.1.0 → stores-0.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "stores"
-version = "0.1.0"
+version = "0.1.2"
 description = "Repository of Python functions and tools for LLMs"
 readme = "README.md"
 requires-python = ">=3.10"

stores-0.1.2/run_complex.py

@@ -0,0 +1,123 @@
+# import anthropic
+import inspect
+
+import dotenv
+from langchain_core.tools import tool as callable_as_lc_tool
+from langchain_google_genai import ChatGoogleGenerativeAI
+
+# from openai import OpenAI
+# from google import genai
+# from google.genai import types
+# from litellm import completion
+# from stores.indexes import LocalIndex
+import stores
+
+dotenv.load_dotenv()
+
+
+# def foo(bar: str = "test"):
+#     return bar
+
+
+# index = stores.Index([foo])
+# print(inspect.signature(index.tools[0]))
+# print(index.tools[0]())
+# quit()
+
+
+index = stores.Index(
+    ["silanthro/todoist"],
+    env_var={
+        "silanthro/todoist": {
+            "TODOIST_API_TOKEN": "6a0815ff164d7ebd6d45d433bdbd32fcb164e1ec",
+        }
+    },
+)
+
+sig = inspect.signature(index.tools[0])
+print(sig)
+
+wrap = callable_as_lc_tool()(index.tools[0])
+sig_wrap = inspect.signature(wrap)
+print(sig_wrap)
+# quit()
+
+for argname, arg in sig.parameters.items():
+    print(argname)
+    print(arg.annotation)
+    print([arg.default])
+
+# print(sig)
+# quit()
+
+# result = index.execute(
+#     "todoist.get_tasks",
+#     {
+#         "project_id": None,
+#         "search_query": None,
+#         "due_date_filter": "today",
+#         "priority": None,
+#         "other_filters": None,
+#         "limit": None,
+#     },
+# )
+# print(result)
+# quit()
+
+
+task = "Find tasks of priority 1"
+
+# print(index.tools)
+
+# print(index.format_tools("openai-chat-completions"))
+# quit()
+
+# client = OpenAI()
+# response = client.responses.create(
+#     model="gpt-4o-mini-2024-07-18",
+#     input=[{"role": "user", "content": task}],
+#     tools=index.format_tools("openai-responses"),
+# )
+# client = anthropic.Anthropic()
+# response = client.messages.create(
+#     model="claude-3-5-sonnet-20241022",
+#     max_tokens=1024,
+#     messages=[{"role": "user", "content": task}],
+#     tools=index.format_tools("anthropic"),
+# )
+# response = completion(
+#     model="gemini/gemini-2.0-flash-001",
+#     messages=[
+#         {
+#             "role": "user",
+#             "content": task,
+#         }
+#     ],
+#     tools=index.format_tools("google-gemini"),
+# )
+# client = genai.Client(
+#     # api_key=os.environ["GEMINI_API_KEY"],
+# )
+# config = types.GenerateContentConfig(
+#     tools=index.tools,
+#     automatic_function_calling=types.AutomaticFunctionCallingConfig(
+#         disable=True  # Gemini automatically executes tool calls. This script shows how to manually execute tool calls.
+#     ),
+# )
+
+# # Get the response from the model
+# response = client.models.generate_content(
+#     model="gemini-2.0-flash",
+#     contents=task,
+#     config=config,
+# )
+# tool_call = response.candidates[0].content.parts[0].function_call
+
+model = ChatGoogleGenerativeAI(model="gemini-2.0-flash-001")
+model_with_tools = model.bind_tools(index.tools)
+response = model_with_tools.invoke(task)
+tool_call = response.tool_calls[0]
+
+print(tool_call)
+# Execute the tool call
+# print(response)

stores-0.1.2/run_remote_tool.py

@@ -0,0 +1,8 @@
+import stores
+
+# import stores.indexes.remote_index as remote
+
+# remote.clear_cache()
+
+index = stores.Index(["silanthro/slack"])
+print(index.tools)

{stores-0.1.0 → stores-0.1.2}/stores/indexes/base_index.py

@@ -1,5 +1,4 @@
 import asyncio
-import functools
 import inspect
 import logging
 import re
@@ -18,6 +17,8 @@ from typing import (
     get_type_hints,
 )
 
+from makefun import create_function
+
 from stores.format import ProviderFormat, format_tools
 from stores.parse import llm_parse_json
 from stores.utils import check_duplicates
@@ -209,8 +210,15 @@ def wrap_tool(tool: Callable):
             # Inject default values within wrapper
             bound_args = original_signature.bind(*args, **kwargs)
             bound_args.apply_defaults()
-            _cast_bound_args(bound_args)
             # Inject correct Literals
+            for k, v in bound_args.arguments.items():
+                if (
+                    v is None
+                    and original_signature.parameters[k].default is not Parameter.empty
+                ):
+                    bound_args.arguments[k] = original_signature.parameters[k].default
+
+            _cast_bound_args(bound_args)
             for k, v in bound_args.arguments.items():
                 if k in literal_maps:
                     param = original_signature.parameters[k]
@@ -219,11 +227,17 @@ def wrap_tool(tool: Callable):
                     )
             return tool(*bound_args.args, **bound_args.kwargs)
 
-    functools.update_wrapper(wrapper, tool)
-    wrapper.__signature__ = new_sig
-    wrapper._wrapped = True
+    wrapped = create_function(
+        new_sig,
+        wrapper,
+        qualname=tool.__name__,
+        doc=inspect.getdoc(tool),
+    )
+
+    wrapped.__name__ = tool.__name__
+    wrapped._wrapped = True
 
-    return wrapper
+    return wrapped
 
 
 class BaseIndex:

{stores-0.1.0 → stores-0.1.2}/stores/indexes/index.py

@@ -1,7 +1,7 @@
 import logging
 import os
 from pathlib import Path
-from typing import Callable
+from typing import Callable, Optional
 
 from stores.indexes.base_index import BaseIndex
 from stores.indexes.local_index import LocalIndex
@@ -17,6 +17,8 @@ class Index(BaseIndex):
         self,
         tools: list[Callable, os.PathLike] | None = None,
         env_var: dict[str, dict] | None = None,
+        cache_dir: Optional[os.PathLike] = None,
+        reset_cache=False,
     ):
         self.env_var = env_var or {}
         tools = tools or []
@@ -38,7 +40,10 @@ class Index(BaseIndex):
                     # Load RemoteIndex
                     try:
                         loaded_index = RemoteIndex(
-                            index_name, env_var=self.env_var.get(index_name)
+                            index_name,
+                            env_var=self.env_var.get(index_name),
+                            cache_dir=cache_dir,
+                            reset_cache=reset_cache,
                         )
                     except Exception:
                         logger.warning(

{stores-0.1.0 → stores-0.1.2}/stores/indexes/remote_index.py

@@ -1,7 +1,10 @@
 import json
 import logging
+import shutil
 import venv
+from os import PathLike
 from pathlib import Path
+from typing import Optional
 
 import requests
 from git import Repo
@@ -21,6 +24,10 @@ INDEX_LOOKUP_URL = (
 )
 
 
+def clear_default_cache():
+    shutil.rmtree(CACHE_DIR)
+
+
 def lookup_index(index_id: str, index_version: str | None = None):
     response = requests.post(
         INDEX_LOOKUP_URL,
@@ -39,11 +46,24 @@ def lookup_index(index_id: str, index_version: str | None = None):
 
 
 class RemoteIndex(BaseIndex):
-    def __init__(self, index_id: str, env_var: dict | None = None):
+    def __init__(
+        self,
+        index_id: str,
+        env_var: dict | None = None,
+        cache_dir: Optional[PathLike] = None,
+        reset_cache=False,
+    ):
         self.index_id = index_id
-        self.index_folder = CACHE_DIR / self.index_id
+        if cache_dir is None:
+            cache_dir = CACHE_DIR
+        else:
+            cache_dir = Path(cache_dir)
+        if reset_cache:
+            shutil.rmtree(cache_dir)
+        self.index_folder = cache_dir / self.index_id
         self.env_var = env_var or {}
         if not self.index_folder.exists():
+            logger.info(f"Installing {index_id}...")
             commit_like = None
             if ":" in index_id:
                 index_id, commit_like = index_id.split(":")

{stores-0.1.0 → stores-0.1.2}/stores/indexes/venv_utils.py

@@ -115,44 +115,49 @@ from typing import Any, Dict, List, Literal, Tuple, Union, get_args, get_origin,
 import types as T
 
 
-def extract_type_info(typ):
+def extract_type_info(typ, custom_types: list[str] | None = None):
+    custom_types = custom_types or []
+    if hasattr(typ, "__name__") and typ.__name__ in custom_types:
+        return typ.__name__
     origin = get_origin(typ)
     args = list(get_args(typ))
     if origin is Literal:
         return {{"type": "Literal", "values": args}}
     elif inspect.isclass(typ) and issubclass(typ, enum.Enum):
+        custom_types.append(typ.__name__)
         return {{
             "type": "Enum",
             "type_name": typ.__name__,
             "values": {{v.name: v.value for v in typ}},
         }}
     elif isinstance(typ, type) and typ.__class__.__name__ == "_TypedDictMeta":
+        custom_types.append(typ.__name__)
         hints = get_type_hints(typ)
         return {{
             "type": "TypedDict",
             "type_name": typ.__name__,
-            "fields": {{k: extract_type_info(v) for k, v in hints.items()}}
+            "fields": {{k: extract_type_info(v, custom_types) for k, v in hints.items()}}
         }}
     elif origin in (list, List) or typ is list:
         return {{
             "type": "List",
-            "item_type": extract_type_info(args[0]) if args else {{"type": Any}}
+            "item_type": extract_type_info(args[0], custom_types) if args else {{"type": Any}}
         }}
     elif origin in (dict, Dict) or typ is dict:
         return {{
             "type": "Dict",
-            "key_type": extract_type_info(args[0]) if args else {{"type": Any}},
-            "value_type": extract_type_info(args[1]) if len(args) > 1 else {{"type": Any}}
+            "key_type": extract_type_info(args[0], custom_types) if args else {{"type": Any}},
+            "value_type": extract_type_info(args[1], custom_types) if len(args) > 1 else {{"type": Any}}
         }}
     elif origin in (tuple, Tuple) or typ is tuple:
         return {{
             "type": "Tuple",
-            "item_types": [extract_type_info(arg) for arg in args] if args else [{{"type": Any}}]
+            "item_types": [extract_type_info(arg, custom_types) for arg in args] if args else [{{"type": Any}}]
         }}
     elif origin is Union or origin is T.UnionType:
         return {{
             "type": "Union",
-            "options": [extract_type_info(arg) for arg in args]
+            "options": [extract_type_info(arg, custom_types) for arg in args]
         }}
     else:
         return {{"type": typ}}
@@ -205,33 +210,39 @@ except Exception as e:
         raise RuntimeError(f"Error loading tool {tool_id}:\n{response['error']}")
 
 
-def parse_param_type(param_info: dict):
+def parse_param_type(param_info: dict, custom_types: list[str] | None = None):
+    custom_types = custom_types or []
+    # Support ForwardRef
     param_type = param_info["type"]
+    if param_type in custom_types:
+        return param_type
     if not isinstance(param_type, str):
         return param_type
     if param_type == "Literal":
         return Literal.__getitem__(tuple(param_info["values"]))
     elif param_type == "Enum":
+        custom_types.append(param_info["type_name"])
         return Enum(param_info["type_name"], param_info["values"])
     elif param_type == "TypedDict":
+        custom_types.append(param_info["type_name"])
         properties = {}
         for k, v in param_info["fields"].items():
-            properties[k] = parse_param_type(v)
+            properties[k] = parse_param_type(v, custom_types)
         return TypedDict(param_info["type_name"], properties)
     elif param_type == "List":
-        return list[parse_param_type(param_info["item_type"])]
+        return list[parse_param_type(param_info["item_type"], custom_types)]
     elif param_type == "Dict":
         return Dict[
-            parse_param_type(param_info["key_type"]),
-            parse_param_type(param_info["value_type"]),
+            parse_param_type(param_info["key_type"], custom_types),
+            parse_param_type(param_info["value_type"], custom_types),
         ]
     elif param_type == "Tuple":
         return Tuple.__getitem__(
-            tuple([parse_param_type(i) for i in param_info["item_types"]])
+            tuple([parse_param_type(i, custom_types) for i in param_info["item_types"]])
         )
     elif param_type == "Union":
         return Union.__getitem__(
-            tuple([parse_param_type(i) for i in param_info["options"]])
+            tuple([parse_param_type(i, custom_types) for i in param_info["options"]])
         )
     else:
         raise TypeError(f"Invalid param type {param_type} in param info {param_info}")

{stores-0.1.0 → stores-0.1.2}/uv.lock

@@ -1156,7 +1156,7 @@ wheels = [
 
 [[package]]
 name = "langsmith"
-version = "0.3.24"
+version = "0.3.26"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "httpx" },
@@ -1167,9 +1167,9 @@ dependencies = [
     { name = "requests-toolbelt" },
     { name = "zstandard" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/b5/7f/74218413724e8d8783452a45db0e6808f171c91a7ce52f8fa3aefcf96ebf/langsmith-0.3.24.tar.gz", hash = "sha256:ee353dae8e59ec91eee8d3b601bc48e9d0e96722d1af14269b314ecb71e22088", size = 338075 }
+sdist = { url = "https://files.pythonhosted.org/packages/be/2e/9748883c40e8a3c5d628d5a81a531e1a5ae3a2bfced429ffdf86a437b269/langsmith-0.3.26.tar.gz", hash = "sha256:3bd5b952a5fc82d69b0e2c030e502ee081a8ccf20468e96fd3d53e1572aef6fc", size = 342721 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/d0/b7/83bdddd466c04f9c5914e5941f2c8180bc2b65c4f78b79f2d9530620a3e7/langsmith-0.3.24-py3-none-any.whl", hash = "sha256:24930d34970281950338f6e2724d04a69804ccb3e89dba9314e6086653dc8bc9", size = 352776 },
+    { url = "https://files.pythonhosted.org/packages/13/14/f2e972ac0cf9b4ff4d405f7843b0f14a1ef686544a54f91ac4d5ac723140/langsmith-0.3.26-py3-none-any.whl", hash = "sha256:3ae49e49d6f3c980a524d15ac2fd895896e709ecedc83ac150c38e1ead776e1b", size = 357325 },
 ]
 
 [[package]]
@@ -1825,7 +1825,7 @@ wheels = [
 
 [[package]]
 name = "openai"
-version = "1.70.0"
+version = "1.71.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "anyio" },
@@ -1837,14 +1837,14 @@ dependencies = [
     { name = "tqdm" },
     { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/87/f5/ae0f3cd226c2993b4ac1cc4b5f6ca099764689f403c14922c9356accec66/openai-1.70.0.tar.gz", hash = "sha256:e52a8d54c3efeb08cf58539b5b21a5abef25368b5432965e4de88cdf4e091b2b", size = 409640 }
+sdist = { url = "https://files.pythonhosted.org/packages/d9/19/b8f0347090a649dce55a008ec54ac6abb50553a06508cdb5e7abb2813e99/openai-1.71.0.tar.gz", hash = "sha256:52b20bb990a1780f9b0b8ccebac93416343ebd3e4e714e3eff730336833ca207", size = 409926 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/e2/39/c4b38317d2c702c4bc763957735aaeaf30dfc43b5b824121c49a4ba7ba0f/openai-1.70.0-py3-none-any.whl", hash = "sha256:f6438d053fd8b2e05fd6bef70871e832d9bbdf55e119d0ac5b92726f1ae6f614", size = 599070 },
+    { url = "https://files.pythonhosted.org/packages/c4/f7/049e85faf6a000890e5ca0edca8e9183f8a43c9e7bba869cad871da0caba/openai-1.71.0-py3-none-any.whl", hash = "sha256:e1c643738f1fff1af52bce6ef06a7716c95d089281e7011777179614f32937aa", size = 598975 },
 ]
 
 [[package]]
 name = "openai-agents"
-version = "0.0.8"
+version = "0.0.9"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "griffe" },
@@ -1855,9 +1855,9 @@ dependencies = [
     { name = "types-requests" },
     { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/23/9b/ad40458b8cf1cd1f6ba8f06859d44351f83e0e38f9bda3c47d0c3d074837/openai_agents-0.0.8.tar.gz", hash = "sha256:65c06d4ae6bfb27da50111df577e7d04ebef667eaac255a6fee5459a7a8692d8", size = 984793 }
+sdist = { url = "https://files.pythonhosted.org/packages/e3/ec/dc701417f2b58f66e938abb3acd11de39454ac5d3fe3164a05dd9bc0ce92/openai_agents-0.0.9.tar.gz", hash = "sha256:e6923395ae9afd463e6e0c25cbf2b2d42f8fbe5ad79e244aa9c362b62f335981", size = 985467 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/9a/97/fc19f0839a8c6ceb8b648b47b9e1862c005b444207c728a2e7bcc40db9c2/openai_agents-0.0.8-py3-none-any.whl", hash = "sha256:8e8777a4dd089e0e4d47884e974cad0b7a5f0e8ede633702dd09167ced13aaba", size = 107146 },
+    { url = "https://files.pythonhosted.org/packages/cb/ff/2b378aeb531b1937fe6f98cbdb934155ee185be15455c065dc949ed3e6c1/openai_agents-0.0.9-py3-none-any.whl", hash = "sha256:f4a4798d876db2f47e0cd86791bcdbfc24a37fd20504accde267b682b75d5af7", size = 107300 },
 ]
 
 [[package]]
@@ -2963,7 +2963,7 @@ wheels = [
 
 [[package]]
 name = "stores"
-version = "0.1.0"
+version = "0.1.1"
 source = { editable = "." }
 dependencies = [
     { name = "dirtyjson" },