stores 0.1.4__py3-none-any.whl → 0.1.5__py3-none-any.whl

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/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.4.dist-info → stores-0.1.5.dist-info}/METADATA

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

{stores-0.1.4.dist-info → stores-0.1.5.dist-info}/RECORD

@@ -4,12 +4,12 @@ stores/format.py,sha256=LduYBVDiUDB1J1HDyu9jHrRG1V97pw6C5g76OirpJJY,7792
 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=K4--_OAFyPNESaisD0JPNRIEffCnjw9nziahDgjdZHU,10708
+stores/indexes/base_index.py,sha256=U12ZuvyuHSZJGdVdTMakdz6yHJQ1No0wOY45W5FoN0s,11073
 stores/indexes/index.py,sha256=C3i5JAwYoKEK7jIJRAgnLrQxjeewtInKcMinep6yvyA,2432
 stores/indexes/local_index.py,sha256=TVk7W8BXF5KEqjEK0LYqq3CtLMfHaF-Tk_5cZ6bjsBU,3189
 stores/indexes/remote_index.py,sha256=CHa9kQVDQlgI8qw3XQXchrE1cjXJk9fNY2j2HWL2gio,3226
-stores/indexes/venv_utils.py,sha256=U69UsHn9APTc615TchW2aZmrBORgbZhuZunv4zQv_hU,12514
-stores-0.1.4.dist-info/METADATA,sha256=Rkj7Ot2ClwUiCfkhejFU7Hs8PvXxTEdBXNQeWtlIrGA,3076
-stores-0.1.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-stores-0.1.4.dist-info/licenses/LICENSE,sha256=VTidYE7_Dam0Dwyq095EhhDIqi47g03oVpLAHQgKws0,1066
-stores-0.1.4.dist-info/RECORD,,
+stores/indexes/venv_utils.py,sha256=2D0VasFfjwzEu_-LEyXREDN-SkWHGzx5TImvMpuKbjU,13313
+stores-0.1.5.dist-info/METADATA,sha256=3yGFn2ANPUz3kxJ6jqZpvu5vwvm-LzUWq4-_0ObKDFU,3076
+stores-0.1.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+stores-0.1.5.dist-info/licenses/LICENSE,sha256=VTidYE7_Dam0Dwyq095EhhDIqi47g03oVpLAHQgKws0,1066
+stores-0.1.5.dist-info/RECORD,,