stores 0.1.3__tar.gz → 0.1.5__tar.gz

{stores-0.1.3 → stores-0.1.5}/PKG-INFO

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

{stores-0.1.3 → stores-0.1.5}/pyproject.toml

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

{stores-0.1.3 → stores-0.1.5}/stores/indexes/base_index.py

@@ -250,6 +250,11 @@ class BaseIndex:
         return {tool.__name__: tool for tool in self.tools}
 
     def execute(self, toolname: str, kwargs: dict | None = None):
+        loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(loop)
+        return loop.run_until_complete(self.async_execute(toolname, kwargs))
+
+    async def async_execute(self, toolname: str, kwargs: dict | None = None):
         kwargs = kwargs or {}
 
         # Use regex since we need to match cases where we perform
@@ -269,9 +274,7 @@ class BaseIndex:
 
         tool = self.tools_dict[toolname]
         if inspect.iscoroutinefunction(tool):
-            loop = asyncio.new_event_loop()
-            asyncio.set_event_loop(loop)
-            return loop.run_until_complete(tool(**kwargs))
+            return await tool(**kwargs)
         else:
             return tool(**kwargs)
 
@@ -279,5 +282,11 @@ class BaseIndex:
         toolcall = llm_parse_json(msg, keys=["toolname", "kwargs"])
         return self.execute(toolcall.get("toolname"), toolcall.get("kwargs"))
 
+    async def async_parse_and_execute(self, msg: str):
+        toolcall = llm_parse_json(msg, keys=["toolname", "kwargs"])
+        return await self.async_execute(
+            toolcall.get("toolname"), toolcall.get("kwargs")
+        )
+
     def format_tools(self, provider: ProviderFormat):
         return format_tools(self.tools, provider)

{stores-0.1.3 → stores-0.1.5}/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.3 → stores-0.1.5}/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.3 → stores-0.1.5}/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.3 → stores-0.1.5}/stores/indexes/venv_utils.py

@@ -28,11 +28,35 @@ logger.setLevel(logging.INFO)
 HASH_FILE = ".deps_hash"
 
 
-SUPPORTED_DEP_CONFIGS = {
-    "pyproject.toml": f"{VENV_NAME}/bin/pip install .",
-    "setup.py": f"{VENV_NAME}/bin/pip install .",
-    "requirements.txt": f"{VENV_NAME}/bin/pip install -r requirements.txt",
-}
+SUPPORTED_CONFIGS = [
+    "pyproject.toml",
+    "setup.py",
+    "requirements.txt",
+]
+
+
+def get_pip_command(venv_path: os.PathLike, config_file: str) -> list[str]:
+    venv_path = Path(venv_path).resolve()
+    if os.name == "nt":
+        pip_path = venv_path / "Scripts" / "pip.exe"
+    else:
+        pip_path = venv_path / "bin" / "pip"
+
+    if config_file in {"pyproject.toml", "setup.py"}:
+        return [str(pip_path), "install", "."]
+    elif config_file == "requirements.txt":
+        return [str(pip_path), "install", "-r", "requirements.txt"]
+    else:
+        raise ValueError(f"Unsupported config file: {config_file}")
+
+
+def get_python_command(venv_path: os.PathLike) -> list[str]:
+    venv_path = Path(venv_path).resolve()
+    if os.name == "nt":
+        executable = venv_path / "Scripts" / "python.exe"
+    else:
+        executable = venv_path / "bin" / "python"
+    return str(executable)
 
 
 def has_installed(config_path: os.PathLike):
@@ -63,18 +87,19 @@ def write_hash(config_path: os.PathLike):
 def install_venv_deps(index_folder: os.PathLike):
     index_folder = Path(index_folder)
 
-    for config_file, install_cmd in SUPPORTED_DEP_CONFIGS.items():
+    for config_file in SUPPORTED_CONFIGS:
         config_path = index_folder / config_file
         if config_path.exists():
             # Check if already installed
             if has_installed(config_path):
                 return "Already installed"
+            pip_command = get_pip_command(index_folder / VENV_NAME, config_file)
             subprocess.check_call(
-                install_cmd.split(),
+                pip_command,
                 cwd=index_folder,
             )
             write_hash(config_path)
-            message = f"Installed with {index_folder}/{install_cmd}"
+            message = f'Installed with "{" ".join(pip_command)}"'
             logger.info(message)
             return message
 
@@ -201,10 +226,10 @@ except Exception as e:
     pickle.dump({{"ok": False, "error": err}}, sys.stdout.buffer)
 """
     result = subprocess.run(
-        [f"{venv}/bin/python", "-c", runner],
+        [get_python_command(Path(index_folder) / venv), "-c", runner],
         capture_output=True,
         cwd=index_folder,
-        env=env_var,
+        env=env_var or None,
     )
     try:
         response = pickle.loads(result.stdout)
@@ -380,11 +405,11 @@ sock = socket.create_connection(("localhost", {port}))
 sock.sendall(response.encode("utf-8"))
 sock.close()
 """
-    subprocess.run(
-        [f"{index_folder}/{venv}/bin/python", "-c", runner],
+    result = subprocess.run(
+        [get_python_command(Path(index_folder) / venv), "-c", runner],
         input=payload,
         capture_output=True,
-        env=env_var,
+        env=env_var or None,
     )
 
     t.join()

{stores-0.1.3 → stores-0.1.5}/tests/test_indexes/test_venv_utils.py

@@ -35,9 +35,11 @@ async def test_install_venv_deps(remote_index_folder):
     result = venv_utils.install_venv_deps(remote_index_folder)
     assert (remote_index_folder / venv_utils.HASH_FILE).exists()
 
-    for config_file, cmd in venv_utils.SUPPORTED_DEP_CONFIGS.items():
+    for config_file in venv_utils.SUPPORTED_CONFIGS:
         if (remote_index_folder / config_file).exists():
-            assert result.endswith(cmd)
+            assert result.endswith(
+                f'"{" ".join(venv_utils.get_pip_command(venv_folder, config_file))}"'
+            )
             assert venv_utils.has_installed(remote_index_folder / config_file)
             break
 

{stores-0.1.3 → stores-0.1.5}/uv.lock

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