stores 0.1.2__tar.gz → 0.1.4__tar.gz

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

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

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

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

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

@@ -19,6 +19,7 @@ class Index(BaseIndex):
         env_var: dict[str, dict] | None = None,
         cache_dir: Optional[os.PathLike] = None,
         reset_cache=False,
+        sys_executable: str | None = None,
     ):
         self.env_var = env_var or {}
         tools = tools or []
@@ -44,6 +45,7 @@ class Index(BaseIndex):
                             env_var=self.env_var.get(index_name),
                             cache_dir=cache_dir,
                             reset_cache=reset_cache,
+                            sys_executable=sys_executable,
                         )
                     except Exception:
                         logger.warning(

{stores-0.1.2 → stores-0.1.4}/stores/indexes/local_index.py

@@ -1,6 +1,7 @@
 import importlib
 import logging
 import os
+import subprocess
 import sys
 import venv
 from pathlib import Path
@@ -25,6 +26,7 @@ class LocalIndex(BaseIndex):
         index_folder: os.PathLike,
         create_venv: bool = False,
         env_var: dict | None = None,
+        sys_executable: str | None = None,
     ):
         self.index_folder = Path(index_folder)
         self.env_var = env_var or {}
@@ -38,7 +40,14 @@ class LocalIndex(BaseIndex):
             # Create venv and install deps
             self.venv = self.index_folder / VENV_NAME
             if not self.venv.exists():
-                venv.create(self.venv, symlinks=True, with_pip=True, upgrade_deps=True)
+                if sys_executable:
+                    subprocess.run(
+                        [sys_executable, "-m", "venv", str(self.venv)], check=True
+                    )
+                else:
+                    venv.create(
+                        self.venv, symlinks=True, with_pip=True, upgrade_deps=True
+                    )
             install_venv_deps(self.index_folder)
             # Initialize tools
             tools = init_venv_tools(self.index_folder, self.env_var)

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

@@ -1,6 +1,7 @@
 import json
 import logging
 import shutil
+import subprocess
 import venv
 from os import PathLike
 from pathlib import Path
@@ -52,6 +53,7 @@ class RemoteIndex(BaseIndex):
         env_var: dict | None = None,
         cache_dir: Optional[PathLike] = None,
         reset_cache=False,
+        sys_executable: str | None = None,
     ):
         self.index_id = index_id
         if cache_dir is None:
@@ -89,7 +91,12 @@ class RemoteIndex(BaseIndex):
         # Create venv and install deps
         self.venv = self.index_folder / VENV_NAME
         if not self.venv.exists():
-            venv.create(self.venv, symlinks=True, with_pip=True, upgrade_deps=True)
+            if sys_executable:
+                subprocess.run(
+                    [sys_executable, "-m", "venv", str(self.venv)], check=True
+                )
+            else:
+                venv.create(self.venv, symlinks=True, with_pip=True, upgrade_deps=True)
         install_venv_deps(self.index_folder)
         # Initialize tools
         tools = init_venv_tools(self.index_folder, self.env_var)

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

@@ -93,6 +93,7 @@ def init_venv_tools(index_folder: os.PathLike, env_var: dict | None = None):
             tool_id=tool_id,
             index_folder=index_folder,
             venv=VENV_NAME,
+            env_var=env_var,
         )
         tool = parse_tool_signature(
             signature_dict=tool_sig,
@@ -105,9 +106,15 @@ def init_venv_tools(index_folder: os.PathLike, env_var: dict | None = None):
 
 
 # TODO: Sanitize tool_id, args, and kwargs
-def get_tool_signature(tool_id: str, index_folder: os.PathLike, venv: str = VENV_NAME):
+def get_tool_signature(
+    tool_id: str,
+    index_folder: os.PathLike,
+    venv: str = VENV_NAME,
+    env_var: dict | None = None,
+):
     module_name = ".".join(tool_id.split(".")[:-1])
     tool_name = tool_id.split(".")[-1]
+    env_var = env_var or {}
 
     runner = f"""
 import pickle, sys, traceback, inspect, enum
@@ -197,6 +204,7 @@ except Exception as e:
         [f"{venv}/bin/python", "-c", runner],
         capture_output=True,
         cwd=index_folder,
+        env=env_var,
     )
     try:
         response = pickle.loads(result.stdout)

{stores-0.1.2 → stores-0.1.4}/tests/test_indexes/test_remote_index.py

@@ -40,3 +40,12 @@ async def test_remote_index():
         )
     # Clean up index
     shutil.rmtree(stores.indexes.remote_index.CACHE_DIR / "silanthro/send-gmail:0.2.0")
+
+
+async def test_remote_index_2():
+    # Check that env_vars are set correctly
+    stores.indexes.RemoteIndex(
+        "silanthro/filesystem:0.2.0",
+        env_var={"ALLOWED_DIR": "./test"},
+    )
+    shutil.rmtree(stores.indexes.remote_index.CACHE_DIR / "silanthro/filesystem:0.2.0")

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

@@ -2963,7 +2963,7 @@ wheels = [
 
 [[package]]
 name = "stores"
-version = "0.1.1"
+version = "0.1.2"
 source = { editable = "." }
 dependencies = [
     { name = "dirtyjson" },