llama-deploy-appserver 0.3.17__py3-none-any.whl → 0.3.19__py3-none-any.whl

llama_deploy/appserver/deployment.py

@@ -19,7 +19,7 @@ from starlette.routing import Route
 from workflows import Context, Workflow
 from workflows.handler import WorkflowHandler
 from workflows.server import SqliteWorkflowStore, WorkflowServer
-from workflows.server.abstract_workflow_store import EmptyWorkflowStore
+from workflows.server.memory_workflow_store import MemoryWorkflowStore
 
 logger = logging.getLogger()
 
@@ -95,7 +95,7 @@ class Deployment:
     def create_workflow_server(
         self, deployment_config: DeploymentConfig, settings: ApiserverSettings
     ) -> WorkflowServer:
-        persistence = EmptyWorkflowStore()
+        persistence = MemoryWorkflowStore()
         if settings.persistence == "local":
             logger.info("Using local sqlite persistence for workflows")
             persistence = SqliteWorkflowStore(
@@ -125,7 +125,7 @@ class Deployment:
                     f"/deployments/{config.name}{route.path}",
                     route.endpoint,
                     name=f"{config.name}_{route.name}",
-                    methods=route.methods,
+                    methods=list(route.methods) if route.methods else None,
                     include_in_schema=True,  # change to false when schemas are added to workflow server
                     tags=["workflows"],
                 )

llama_deploy/appserver/process_utils.py

@@ -4,7 +4,8 @@ import platform
 import subprocess
 import sys
 import threading
-from typing import Callable, TextIO, cast
+from dataclasses import dataclass
+from typing import Callable, TextIO, Tuple, cast
 
 
 def run_process(
@@ -25,13 +26,13 @@ def run_process(
     use_pty = _should_use_pty(use_tty)
     prefixer = _make_prefixer(prefix, color_code, line_transform)
 
-    process, sources, cleanup = _spawn_process(cmd, cwd=cwd, env=env, use_pty=use_pty)
+    spawned = _spawn_process(cmd, cwd=cwd, env=env, use_pty=use_pty)
     threads: list[threading.Thread] = []
     try:
-        cleanup()
+        spawned.cleanup()
         _log_command(cmd, prefixer)
-        threads = _start_stream_threads(sources, prefixer)
-        ret = process.wait()
+        threads = _start_stream_threads(spawned.sources, prefixer)
+        ret = spawned.process.wait()
         if ret != 0:
             raise subprocess.CalledProcessError(ret, cmd)
     finally:
@@ -56,11 +57,11 @@ def spawn_process(
     use_pty = _should_use_pty(use_tty)
     prefixer = _make_prefixer(prefix, color_code, line_transform)
 
-    process, sources, cleanup = _spawn_process(cmd, cwd=cwd, env=env, use_pty=use_pty)
-    cleanup()
+    spawned = _spawn_process(cmd, cwd=cwd, env=env, use_pty=use_pty)
+    spawned.cleanup()
     _log_command(cmd, prefixer)
-    _start_stream_threads(sources, prefixer)
-    return process
+    _start_stream_threads(spawned.sources, prefixer)
+    return spawned.process
 
 
 @functools.cache
@@ -109,13 +110,20 @@ def should_use_color() -> bool:
     return _should_use_pty(None)
 
 
+@dataclass
+class SpawnProcessResult:
+    process: subprocess.Popen
+    sources: list[Tuple[int | TextIO, TextIO]]
+    cleanup: Callable[[], None]
+
+
 def _spawn_process(
     cmd: list[str],
     *,
     cwd: os.PathLike | None,
     env: dict[str, str] | None,
     use_pty: bool,
-) -> tuple[subprocess.Popen, list[tuple[int | TextIO, TextIO]], Callable[[], None]]:
+) -> SpawnProcessResult:
     if use_pty:
         import pty
 
@@ -139,7 +147,7 @@ def _spawn_process(
         sources: list[tuple[int | TextIO, TextIO]] = [
             (master_fd, cast(TextIO, sys.stdout)),
         ]
-        return process, sources, cleanup
+        return SpawnProcessResult(process, sources, cleanup)
 
     use_shell = False
     if platform.system() == "Windows":
@@ -161,10 +169,10 @@ def _spawn_process(
 
     assert process.stdout is not None and process.stderr is not None
     sources = [
-        (process.stdout, cast(TextIO, sys.stdout)),
-        (process.stderr, cast(TextIO, sys.stderr)),
+        (cast(int | TextIO, process.stdout), cast(TextIO, sys.stdout)),
+        (cast(int | TextIO, process.stderr), cast(TextIO, sys.stderr)),
     ]
-    return process, sources, cleanup
+    return SpawnProcessResult(process, sources, cleanup)
 
 
 def _stream_source(

llama_deploy/appserver/workflow_store/agent_data_store.py

@@ -81,12 +81,12 @@ class AgentDataStore(AbstractWorkflowStore):
         filters = self._build_filters(handler)
         results = await self.client.search(filter=filters, page_size=1000)
         await asyncio.gather(
-            *[self.client.delete_item(item_id=x.id) for x in results.items]
+            *[self.client.delete_item(item_id=x.id) for x in results.items if x.id]
         )
         return len(results.items)
 
     async def _get_item_id(self, handler: PersistentHandler) -> str | None:
-        cached_id = self.cache.get(handler.handler_id, None)
+        cached_id = self.cache.get(handler.handler_id)
         if cached_id is not None:
             return cached_id
         results = await self.client.search(

llama_deploy/appserver/workflow_store/lru_cache.py

@@ -19,10 +19,7 @@ class LRUCache(Generic[K, V]):
     def get(self, key: K, default: V | None = None) -> V | None:
         if key not in self._store:
             return default
-        # mark as recently used
-        value = self._store.pop(key)
-        self._store[key] = value
-        return value
+        return self[key]
 
     def set(self, key: K, value: V):
         if key in self._store:
@@ -37,7 +34,12 @@ class LRUCache(Generic[K, V]):
         return key in self._store
 
     def __getitem__(self, key: K) -> V:
-        return self.get(key)
+        # mark as recently used
+        if key not in self._store:
+            raise KeyError(key)
+        value = self._store.pop(key)
+        self._store[key] = value
+        return value
 
     def __setitem__(self, key: K, value: V):
         self.set(key, value)

{llama_deploy_appserver-0.3.17.dist-info → llama_deploy_appserver-0.3.19.dist-info}/METADATA

@@ -1,15 +1,15 @@
 Metadata-Version: 2.3
 Name: llama-deploy-appserver
-Version: 0.3.17
+Version: 0.3.19
 Summary: Application server components for LlamaDeploy
 Author: Massimiliano Pippi, Adrian Lyjak
 Author-email: Massimiliano Pippi <mpippi@gmail.com>, Adrian Lyjak <adrianlyjak@gmail.com>
 License: MIT
-Requires-Dist: llama-index-workflows[server]>=2.6.0
+Requires-Dist: llama-index-workflows[server]>=2.9.1
 Requires-Dist: pydantic-settings>=2.10.1
 Requires-Dist: fastapi>=0.100.0
 Requires-Dist: websockets>=12.0
-Requires-Dist: llama-deploy-core>=0.3.17,<0.4.0
+Requires-Dist: llama-deploy-core>=0.3.19,<0.4.0
 Requires-Dist: httpx>=0.24.0,<1.0.0
 Requires-Dist: prometheus-fastapi-instrumentator>=7.1.0
 Requires-Dist: packaging>=25.0

{llama_deploy_appserver-0.3.17.dist-info → llama_deploy_appserver-0.3.19.dist-info}/RECORD

@@ -3,10 +3,10 @@ llama_deploy/appserver/app.py,sha256=8f45734ee7d3748fefb29d9d8bf987de3fda8983487
 llama_deploy/appserver/bootstrap.py,sha256=d0c7b4ad5bd64aa5070d993b1439006694a639010ae757b1d897680318173743,2573
 llama_deploy/appserver/configure_logging.py,sha256=194dd1ebed3c1d9065d9174f7828d557a577eaac8fb0443b3102430b1f578c19,6329
 llama_deploy/appserver/correlation_id.py,sha256=8ac5bc6160c707b93a9fb818b64dd369a4ef7a53f9f91a6b3d90c4cf446f7327,572
-llama_deploy/appserver/deployment.py,sha256=b813ac5abe71940b8535e7c66348192848df14b9cdca2ff2830d0bee60c8a26c,6397
+llama_deploy/appserver/deployment.py,sha256=4cec5be1872005a275be74d96ed7a80fe417195bd2c3a3845a105b485c9de794,6430
 llama_deploy/appserver/deployment_config_parser.py,sha256=e2b6c483203d96ab795c4e55df15c694c20458d5a03fab89c2b71e481291a2d3,510
 llama_deploy/appserver/interrupts.py,sha256=14f262a0cedc00bb3aecd3d6c14c41ba0e88e7d2a6df02cd35b5bea1940822a2,1622
-llama_deploy/appserver/process_utils.py,sha256=5d449008cac17878e30aa0c47748f6b9feddcef72891e1a5190c8d86120fcb36,6297
+llama_deploy/appserver/process_utils.py,sha256=2f501d31df2ab77ad249139801f885b956cc5750fb6d048079fc9f5ff12d403e,6518
 llama_deploy/appserver/py.typed,sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855,0
 llama_deploy/appserver/routers/__init__.py,sha256=ee2d14ebf4b067c844947ed1cc98186456e8bfa4919282722eaaf8cca345a138,214
 llama_deploy/appserver/routers/deployments.py,sha256=e7bafd72c1b4b809e5ad57442594a997c85ecab998b8430da65899faa910db1c,7572
@@ -16,9 +16,9 @@ llama_deploy/appserver/settings.py,sha256=aa4512d2f1f28b8ee7d3fedc8c61f77bce9f80
 llama_deploy/appserver/stats.py,sha256=1f3989f6705a6de3e4d61ee8cdd189fbe04a2c53ec5e720b2e5168acc331427f,691
 llama_deploy/appserver/types.py,sha256=4edc991aafb6b8497f068d12387455df292da3ff8440223637641ab1632553ec,2133
 llama_deploy/appserver/workflow_loader.py,sha256=03ef9d2d5eed6b0ec3e3520a6566163637b6ba99b9fa77ecee8ce0243a211d13,15413
-llama_deploy/appserver/workflow_store/agent_data_store.py,sha256=c94ab0e0628eb3d6364179e4fbf9467524270cdf38d8d9294494f89c9629a229,4219
+llama_deploy/appserver/workflow_store/agent_data_store.py,sha256=c58d84ac658679cb9c9e4c7bc2f4096af8bb1aa8f6e3c24ff5a84be1125f4ab3,4221
 llama_deploy/appserver/workflow_store/keyed_lock.py,sha256=bb1504d9de09d51a8f60721cc77b14d4051ac5a897ace6f9d9cba494f068465e,950
-llama_deploy/appserver/workflow_store/lru_cache.py,sha256=7511231b6aba81ea96044cf644cd9c1f11d78190b7b7f578b1b5a55e2c218f9f,1323
-llama_deploy_appserver-0.3.17.dist-info/WHEEL,sha256=66530aef82d5020ef5af27ae0123c71abb9261377c5bc519376c671346b12918,79
-llama_deploy_appserver-0.3.17.dist-info/METADATA,sha256=e47c6356b06e16a3ff9606bf74c56b1b03820dba63b876cbee2d1188faba3924,1082
-llama_deploy_appserver-0.3.17.dist-info/RECORD,,
+llama_deploy/appserver/workflow_store/lru_cache.py,sha256=bb05c573cf92532a3e673e5b3d5765c4165bf6f8d985744941580c06ceb3eb2d,1386
+llama_deploy_appserver-0.3.19.dist-info/WHEEL,sha256=66530aef82d5020ef5af27ae0123c71abb9261377c5bc519376c671346b12918,79
+llama_deploy_appserver-0.3.19.dist-info/METADATA,sha256=d9eaf5a1bffc3fc66b27530c6c04d91920678840c11aa0fb011eed8a2105ae67,1082
+llama_deploy_appserver-0.3.19.dist-info/RECORD,,