stores 0.1.7.dev6__py3-none-any.whl → 0.1.8.dev1__py3-none-any.whl

stores/format.py

@@ -61,7 +61,7 @@ def get_type_repr(typ: Type | GenericAlias) -> list[str]:
         return [type_mappings[typ.__name__]]
 
 
-def get_type_schema(typ: Type | GenericAlias):
+def get_type_schema(typ: Type | GenericAlias, provider: ProviderFormat):
     origin = get_origin(typ)
     args = get_args(typ)
 
@@ -77,24 +77,27 @@ def get_type_schema(typ: Type | GenericAlias):
         schema["enum"] = [v.value for v in typ]
     elif isinstance(typ, type) and typ.__class__.__name__ == "_TypedDictMeta":
         hints = get_type_hints(typ)
-        schema["properties"] = {k: get_type_schema(v) for k, v in hints.items()}
-        schema["additionalProperties"] = False
+        schema["properties"] = {
+            k: get_type_schema(v, provider) for k, v in hints.items()
+        }
+        if provider != ProviderFormat.GOOGLE_GEMINI:
+            schema["additionalProperties"] = False
         schema["required"] = list(hints.keys())
     elif origin in (list, List) or typ is dict:
         if args:
-            schema["items"] = get_type_schema(args[0])
+            schema["items"] = get_type_schema(args[0], provider)
         else:
             raise TypeError("Insufficient argument type information")
     elif origin in (dict, Dict) or typ is dict:
         raise TypeError("Insufficient argument type information")
     elif origin in (tuple, Tuple) or typ is tuple:
         if args:
-            schema["items"] = get_type_schema(args[0])
+            schema["items"] = get_type_schema(args[0], provider)
         else:
             raise TypeError("Insufficient argument type information")
     elif origin is Union or origin is T.UnionType:
         for arg in args:
-            subschema = get_type_schema(arg)
+            subschema = get_type_schema(arg, provider)
             del subschema["type"]
             schema = {
                 **schema,
@@ -103,14 +106,17 @@ def get_type_schema(typ: Type | GenericAlias):
 
     # Un-nest single member type lists since Gemini does not accept list of types
     # Optional for OpenAI or Anthropic
-    if schema["type"] and len(schema["type"]) == 1:
-        schema["type"] = schema["type"][0]
+    if schema["type"]:
+        if len(schema["type"]) == 1:
+            schema["type"] = schema["type"][0]
+        elif len(schema["type"]) > 1 and provider == ProviderFormat.GOOGLE_GEMINI:
+            schema["type"] = schema["type"][0]
 
     return schema
 
 
 def get_param_schema(param: inspect.Parameter, provider: ProviderFormat):
-    param_schema = get_type_schema(param.annotation)
+    param_schema = get_type_schema(param.annotation, provider)
 
     if param_schema["type"] is None:
         raise TypeError(f"Unsupported type: {param.annotation.__name__}")

stores/indexes/base_index.py

@@ -9,7 +9,6 @@ from typing import (
     Callable,
     List,
     Literal,
-    Optional,
     Tuple,
     Union,
     get_args,
@@ -98,7 +97,7 @@ def _handle_non_string_literal(annotation: type):
         return list[new_annotation], {"item": literal_map}
     if origin is Union or origin is UnionType:
         union_literal_maps = {}
-        argtype_args = [a for a in get_args(annotation) if a != NoneType]
+        argtype_args = [a for a in get_args(annotation)]
         new_union, literal_map = _handle_non_string_literal(argtype_args[0])
         union_literal_maps[new_union.__name__] = literal_map
         for child_argtype in argtype_args[1:]:
@@ -198,12 +197,12 @@ def wrap_tool(tool: Callable):
             # Process args with default values: make sure type includes None
             new_annotation = argtype
             if new_annotation is Parameter.empty:
-                new_annotation = Optional[type(new_arg.default)]
+                new_annotation = type(new_arg.default) | None
             origin = get_origin(new_annotation)
             if origin not in [Union, UnionType] or NoneType not in get_args(
                 new_annotation
             ):
-                new_annotation = Optional[new_annotation]
+                new_annotation = new_annotation | None
             new_arg = new_arg.replace(
                 default=None,
                 kind=Parameter.POSITIONAL_OR_KEYWORD,
@@ -402,13 +401,17 @@ class BaseIndex:
             # Handle sync
             yield tool_fn(**kwargs)
 
-    def parse_and_execute(self, msg: str):
+    def parse_and_execute(self, msg: str, collect_results=False):
         toolcall = llm_parse_json(msg, keys=["toolname", "kwargs"])
-        return self.execute(toolcall.get("toolname"), toolcall.get("kwargs"))
+        return self.execute(
+            toolcall.get("toolname"), toolcall.get("kwargs"), collect_results
+        )
 
-    async def async_parse_and_execute(self, msg: str):
+    async def aparse_and_execute(self, msg: str, collect_results=False):
         toolcall = llm_parse_json(msg, keys=["toolname", "kwargs"])
-        return await self.aexecute(toolcall.get("toolname"), toolcall.get("kwargs"))
+        return await self.aexecute(
+            toolcall.get("toolname"), toolcall.get("kwargs"), collect_results
+        )
 
     def stream_parse_and_execute(self, msg: str):
         toolcall = llm_parse_json(msg, keys=["toolname", "kwargs"])
@@ -416,7 +419,7 @@ class BaseIndex:
 
     async def astream_parse_and_execute(self, msg: str):
         toolcall = llm_parse_json(msg, keys=["toolname", "kwargs"])
-        async for value in self.astream_parse_and_execute(
+        async for value in self.astream_execute(
             toolcall.get("toolname"), toolcall.get("kwargs")
         ):
             yield value

stores/indexes/remote_index.py

@@ -8,7 +8,7 @@ from pathlib import Path
 from typing import Optional
 
 import requests
-from git import Repo
+from git import GitCommandError, Repo
 
 from stores.constants import VENV_NAME
 from stores.indexes.base_index import BaseIndex
@@ -44,6 +44,8 @@ def lookup_index(index_id: str, index_version: str | None = None):
     )
     if response.ok:
         return response.json()
+    else:
+        raise ValueError(f"Index {index_id} not found in database")
 
 
 class RemoteIndex(BaseIndex):
@@ -88,7 +90,10 @@ class RemoteIndex(BaseIndex):
             if not repo_url:
                 # Otherwise, assume index references a GitHub repo
                 repo_url = f"https://github.com/{index_id}.git"
-            repo = Repo.clone_from(repo_url, self.index_folder)
+            try:
+                repo = Repo.clone_from(repo_url, self.index_folder)
+            except GitCommandError as e:
+                raise ValueError(f"Index {index_id} not found") from e
             if commit_like:
                 repo.git.checkout(commit_like)
 

{stores-0.1.7.dev6.dist-info → stores-0.1.8.dev1.dist-info}/METADATA

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

{stores-0.1.7.dev6.dist-info → stores-0.1.8.dev1.dist-info}/RECORD

@@ -1,15 +1,15 @@
 stores/__init__.py,sha256=KYpKkNrMLx6ssVUbxHnn9wFBq5F5KnaFchcimIfDf9g,186
 stores/constants.py,sha256=7WqFmoGCtmUKHA5WHxOJvvK7g-yYu_KGoqnuVFADNao,57
-stores/format.py,sha256=LduYBVDiUDB1J1HDyu9jHrRG1V97pw6C5g76OirpJJY,7792
+stores/format.py,sha256=L6DaRklE0CpUzMoVTckliaP-M5UrF6gW8nEG_m4y21M,8089
 stores/parse.py,sha256=HYPNPzQod2vpu1Cln7yQ8aVkZT1Mw2IN0sZ2A1DIaqE,4967
 stores/utils.py,sha256=GPWT6lCoGobwP3PlEOHyJfKyd0dobamjyErcR7lgm7M,242
 stores/indexes/__init__.py,sha256=s-RNqml8uGREQhxwSdDoxcbcxeD8soB9BcL5dBKsQfI,215
-stores/indexes/base_index.py,sha256=YrEwETZ5eXj3rXK5qxOllRXqFifQoteYdzPAasbvEyg,15536
+stores/indexes/base_index.py,sha256=oaLN_Tk6PdoTSlRdGsd2wTvBVQ4S3ylV8rbIVSSNkEQ,15608
 stores/indexes/index.py,sha256=Cub5mtnYGipHfPR8BexJYRSKfuJmcGPp0B3ou2bGNqs,2901
 stores/indexes/local_index.py,sha256=Gg9LkEo1L0_NZZYPItsF_-1y6nFP369C3QlPvPyvPx8,3708
-stores/indexes/remote_index.py,sha256=-GV4l2c7GL6_bcVOQnSK5rzYru237bwC5L6eiO-QFzM,3438
+stores/indexes/remote_index.py,sha256=kbyfjqeOgH5IgC0gYfoq79loFM1AeOCCYcsKimudZAg,3666
 stores/indexes/venv_utils.py,sha256=k664ptVhPfs4AHCpB6CiE-pWHGcqi982YjsZDDt64Ys,18577
-stores-0.1.7.dev6.dist-info/METADATA,sha256=Gg4CaLZDS0isd_R0Vhpn7IGCIQQ51Og5rBuBANnV7tk,3081
-stores-0.1.7.dev6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-stores-0.1.7.dev6.dist-info/licenses/LICENSE,sha256=VTidYE7_Dam0Dwyq095EhhDIqi47g03oVpLAHQgKws0,1066
-stores-0.1.7.dev6.dist-info/RECORD,,
+stores-0.1.8.dev1.dist-info/METADATA,sha256=tByMf-oftedetQH71kTs_UrtHdpAqxtppYNe2sYtp5Q,3081
+stores-0.1.8.dev1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+stores-0.1.8.dev1.dist-info/licenses/LICENSE,sha256=VTidYE7_Dam0Dwyq095EhhDIqi47g03oVpLAHQgKws0,1066
+stores-0.1.8.dev1.dist-info/RECORD,,