stores 0.1.7.dev1__py3-none-any.whl → 0.1.7.dev2__py3-none-any.whl

stores/indexes/venv_utils.py

@@ -1,3 +1,4 @@
+import asyncio
 import hashlib
 import inspect
 import json
@@ -308,7 +309,7 @@ def parse_tool_signature(
 
         async def func_handler(*args, **kwargs):
             # TODO: Make this truly async
-            for value in run_remote_tool(
+            async for value in run_remote_tool(
                 tool_id=signature_dict["tool_id"],
                 index_folder=index_folder,
                 args=args,
@@ -410,7 +411,7 @@ def run_remote_tool(
 
     result_data = {}
 
-    def handle_connection(stream_mode: bool = False):
+    def handle_connection_sync():
         conn, _ = listener.accept()
         with conn:
             buffer = ""
@@ -425,24 +426,43 @@ def run_remote_tool(
                         continue
                     msg = json.loads(line)
                     if msg.get("ok") and "stream" in msg:
-                        if stream_mode:
-                            yield msg["stream"]
-                        else:
-                            result_data.setdefault("stream", []).append(msg["stream"])
+                        result_data.setdefault("stream", []).append(msg["stream"])
                     elif msg.get("ok") and "result" in msg:
                         result_data["result"] = msg["result"]
                     elif "error" in msg:
                         result_data["error"] = msg["error"]
                     elif msg.get("done"):
-                        if stream_mode:
-                            break
-                        else:
-                            return
+                        return
+
+    async def handle_connection_async():
+        loop = asyncio.get_running_loop()
+        conn, _ = await loop.sock_accept(listener)
+        conn.setblocking(False)
+        buffer = ""
+        try:
+            while True:
+                chunk = await loop.sock_recv(conn, 4096)
+                if not chunk:
+                    break
+                buffer += chunk.decode("utf-8")
+                while "\n" in buffer:
+                    line, buffer = buffer.split("\n", 1)
+                    if not line.strip():
+                        continue
+                    msg = json.loads(line)
+                    if msg.get("ok") and "stream" in msg:
+                        yield msg["stream"]
+                    elif msg.get("ok") and "result" in msg:
+                        yield msg["result"]
+                    elif "error" in msg:
+                        raise RuntimeError(f"Subprocess error:\n{msg['error']}")
+                    elif msg.get("done"):
+                        return
+        finally:
+            conn.close()
 
     if not stream:
-        thread = threading.Thread(
-            target=lambda: list(handle_connection(stream_mode=False))
-        )
+        thread = threading.Thread(target=lambda: list(handle_connection_sync()))
         thread.start()
 
     runner = f"""
@@ -493,12 +513,16 @@ finally:
     except:
         pass
 """
-    subprocess.run(
+
+    proc = subprocess.Popen(
         [get_python_command(Path(index_folder) / venv), "-c", runner],
-        input=payload,
-        capture_output=True,
+        stdin=subprocess.PIPE,
+        stdout=subprocess.DEVNULL,
+        stderr=subprocess.PIPE,
         env=env_var or None,
     )
+    proc.stdin.write(payload)
+    proc.stdin.close()
 
     if not stream:
         thread.join()
@@ -512,4 +536,4 @@ finally:
         else:
             raise RuntimeError("Subprocess completed without returning data.")
     else:
-        return handle_connection(stream_mode=True)
+        return handle_connection_async()

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

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

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

@@ -8,8 +8,8 @@ stores/indexes/base_index.py,sha256=YrEwETZ5eXj3rXK5qxOllRXqFifQoteYdzPAasbvEyg,
 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/venv_utils.py,sha256=BWr9sh_qlu95ClG7Ki254_PnSC0HXzZnSFCZG2ZpOxg,16521
-stores-0.1.7.dev1.dist-info/METADATA,sha256=BaD9eKOOCTPTyC-jXKQUgHseFFBIfe249-v_S8DJXQA,3081
-stores-0.1.7.dev1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-stores-0.1.7.dev1.dist-info/licenses/LICENSE,sha256=VTidYE7_Dam0Dwyq095EhhDIqi47g03oVpLAHQgKws0,1066
-stores-0.1.7.dev1.dist-info/RECORD,,
+stores/indexes/venv_utils.py,sha256=tS2ZYt2Cf7rqHxBXwn5EoEdUFjyaAIXVRiy8iXjCMb4,17397
+stores-0.1.7.dev2.dist-info/METADATA,sha256=AciMTIC_8qRvud2y3guHn78X-F_n5j-rlCOUNeFLBAc,3081
+stores-0.1.7.dev2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+stores-0.1.7.dev2.dist-info/licenses/LICENSE,sha256=VTidYE7_Dam0Dwyq095EhhDIqi47g03oVpLAHQgKws0,1066
+stores-0.1.7.dev2.dist-info/RECORD,,