langgraph-api 0.2.14__tar.gz → 0.2.15__tar.gz

{langgraph_api-0.2.14 → langgraph_api-0.2.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: langgraph-api
-Version: 0.2.14
+Version: 0.2.15
 Summary: 
 License: Elastic-2.0
 Author: Nuno Campos

langgraph_api-0.2.15/langgraph_api/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.15"

{langgraph_api-0.2.14 → langgraph_api-0.2.15}/langgraph_api/logging.py

@@ -1,6 +1,8 @@
+import contextvars
 import logging
 import os
 import threading
+import typing
 
 import structlog
 from starlette.config import Config
@@ -17,6 +19,10 @@ LOG_LEVEL = log_env("LOG_LEVEL", cast=str, default="INFO")
 logging.getLogger().setLevel(LOG_LEVEL.upper())
 logging.getLogger("psycopg").setLevel(logging.WARNING)
 
+worker_config: contextvars.ContextVar[dict[str, typing.Any] | None] = (
+    contextvars.ContextVar("worker_config", default=None)
+)
+
 # custom processors
 
 
@@ -27,6 +33,15 @@ def add_thread_name(
     return event_dict
 
 
+def set_logging_context(val: dict[str, typing.Any] | None) -> contextvars.Token:
+    if val is None:
+        return worker_config.set(None)
+    current = worker_config.get()
+    if current is None:
+        return worker_config.set(val)
+    return worker_config.set({**current, **val})
+
+
 class AddPrefixedEnvVars:
     def __init__(self, prefix: str) -> None:
         self.kv = {
@@ -42,6 +57,15 @@ class AddPrefixedEnvVars:
         return event_dict
 
 
+class AddLoggingContext:
+    def __call__(
+        self, logger: logging.Logger, method_name: str, event_dict: EventDict
+    ) -> EventDict:
+        if (ctx := worker_config.get()) is not None:
+            event_dict.update(ctx)
+        return event_dict
+
+
 class JSONRenderer:
     def __call__(
         self, logger: logging.Logger, method_name: str, event_dict: EventDict
@@ -87,6 +111,7 @@ shared_processors = [
     structlog.processors.StackInfoRenderer(),
     structlog.processors.format_exc_info,
     structlog.processors.UnicodeDecoder(),
+    AddLoggingContext(),
 ]
 
 

langgraph_api-0.2.15/langgraph_api/middleware/request_id.py

@@ -0,0 +1,30 @@
+"""Middleware to handle setting request IDs for logging."""
+
+import re
+import uuid
+
+from starlette.types import ASGIApp, Receive, Scope, Send
+
+PATHS_INCLUDE = ("/runs", "/threads")
+
+
+class RequestIdMiddleware:
+    def __init__(self, app: ASGIApp, mount_prefix: str = ""):
+        self.app = app
+        paths = (
+            (mount_prefix + p for p in ("/runs", "/threads"))
+            if mount_prefix
+            else ("/runs", "/threads")
+        )
+        self.pattern = re.compile(r"^(" + "|".join(paths) + r")(/.*)?$")
+
+    async def __call__(self, scope: Scope, receive: Receive, send: Send):
+        if scope["type"] == "http" and self.pattern.match(scope["path"]):
+            request_id = next(
+                (h[1] for h in scope["headers"] if h[0] == b"x-request-id"),
+                None,
+            )
+            if request_id is None:
+                request_id = str(uuid.uuid4()).encode()
+                scope["headers"].append((b"x-request-id", request_id))
+        await self.app(scope, receive, send)

{langgraph_api-0.2.14 → langgraph_api-0.2.15}/langgraph_api/models/run.py

@@ -248,6 +248,7 @@ async def create_valid_run(
     barrier: asyncio.Barrier | None = None,
     run_id: UUID | None = None,
 ) -> Run:
+    request_id = headers.get("x-request-id")  # Will be null in the crons scheduler.
     (
         assistant_id,
         thread_id,
@@ -288,6 +289,8 @@ async def create_valid_run(
         configurable["langgraph_auth_permissions"] = ctx.permissions
     else:
         user_id = None
+    if not configurable.get("langgraph_request_id"):
+        configurable["langgraph_request_id"] = request_id
     run_coro = Runs.put(
         conn,
         assistant_id,

{langgraph_api-0.2.14 → langgraph_api-0.2.15}/langgraph_api/server.py

@@ -29,6 +29,7 @@ from langgraph_api.errors import (
 from langgraph_runtime.lifespan import lifespan
 from langgraph_api.middleware.http_logger import AccessLoggerMiddleware
 from langgraph_api.middleware.private_network import PrivateNetworkMiddleware
+from langgraph_api.middleware.request_id import RequestIdMiddleware
 from langgraph_api.utils import SchemaGenerator
 from langgraph_runtime.retry import OVERLOADED_EXCEPTIONS
 from langgraph_api.js.base import is_js_path
@@ -69,6 +70,7 @@ middleware.extend(
             )
         ),
         Middleware(AccessLoggerMiddleware, logger=logger),
+        Middleware(RequestIdMiddleware, mount_prefix=config.MOUNT_PREFIX),
     ]
 )
 exception_handlers = {

{langgraph_api-0.2.14 → langgraph_api-0.2.15}/langgraph_api/worker.py

@@ -8,23 +8,18 @@ import structlog
 from langgraph.pregel.debug import CheckpointPayload, TaskResultPayload
 from starlette.exceptions import HTTPException
 
+import langgraph_api.logging as lg_logging
 from langgraph_api.auth.custom import SimpleUser, normalize_user
 from langgraph_api.config import (
     BG_JOB_ISOLATED_LOOPS,
     BG_JOB_MAX_RETRIES,
     BG_JOB_TIMEOUT_SECS,
 )
-from langgraph_api.errors import (
-    UserInterrupt,
-    UserRollback,
-)
+from langgraph_api.errors import UserInterrupt, UserRollback
 from langgraph_api.js.errors import RemoteException
 from langgraph_api.metadata import incr_runs
 from langgraph_api.schema import Run
-from langgraph_api.stream import (
-    astream_state,
-    consume,
-)
+from langgraph_api.stream import astream_state, consume
 from langgraph_api.utils import set_auth_ctx, with_user
 from langgraph_runtime.database import connect
 from langgraph_runtime.ops import Runs, Threads
@@ -89,15 +84,22 @@ async def worker(
     ):
         temporary = run["kwargs"].get("temporary", False)
         run_created_at = run["created_at"].isoformat()
+        run["kwargs"]
+        lg_logging.set_logging_context(
+            {
+                "run_id": str(run_id),
+                "run_attempt": attempt,
+                "thread_id": str(run.get("thread_id")),
+                "assistant_id": str(run.get("assistant_id")),
+                "graph_id": _get_graph_id(run),
+                "request_id": _get_request_id(run),
+            }
+        )
+
         await logger.ainfo(
             "Starting background run",
-            run_id=str(run_id),
-            run_attempt=attempt,
-            run_created_at=run_created_at,
             run_started_at=run_started_at.isoformat(),
             run_queue_ms=ms(run_started_at, run["created_at"]),
-            thread_id=run.get("thread_id"),
-            assistant_id=run.get("assistant_id"),
         )
 
         def on_checkpoint(checkpoint_arg: CheckpointPayload):
@@ -168,7 +170,6 @@ async def worker(
                 run_started_at=run_started_at.isoformat(),
                 run_ended_at=run_ended_at,
                 run_exec_ms=ms(datetime.now(UTC), run_started_at),
-                graph_id=_get_graph_id(run),
             )
             await Runs.set_status(conn, run_id, "timeout")
         except UserRollback as e:
@@ -185,7 +186,6 @@ async def worker(
                     run_started_at=run_started_at.isoformat(),
                     run_ended_at=run_ended_at,
                     run_exec_ms=ms(datetime.now(UTC), run_started_at),
-                    graph_id=_get_graph_id(run),
                 )
 
             except InFailedSqlTransaction as e:
@@ -223,7 +223,6 @@ async def worker(
                 run_started_at=run_started_at.isoformat(),
                 run_ended_at=run_ended_at,
                 run_exec_ms=ms(datetime.now(UTC), run_started_at),
-                graph_id=_get_graph_id(run),
             )
             await Runs.set_status(conn, run_id, "interrupted")
         except RETRIABLE_EXCEPTIONS as e:
@@ -239,7 +238,6 @@ async def worker(
                 run_started_at=run_started_at.isoformat(),
                 run_ended_at=run_ended_at,
                 run_exec_ms=ms(datetime.now(UTC), run_started_at),
-                graph_id=_get_graph_id(run),
             )
             await Runs.set_status(conn, run_id, "pending")
             raise
@@ -256,7 +254,6 @@ async def worker(
                 run_started_at=run_started_at.isoformat(),
                 run_ended_at=run_ended_at,
                 run_exec_ms=ms(datetime.now(UTC), run_started_at),
-                graph_id=_get_graph_id(run),
             )
             await Runs.set_status(conn, run_id, "error")
         set_auth_ctx(None, None)
@@ -313,6 +310,13 @@ def ms(after: datetime, before: datetime) -> int:
     return int((after - before).total_seconds() * 1000)
 
 
+def _get_request_id(run: Run) -> str | None:
+    try:
+        return run["kwargs"]["config"]["configurable"]["langgraph_request_id"]
+    except Exception:
+        return None
+
+
 def _get_graph_id(run: Run) -> str | None:
     try:
         return run["kwargs"]["config"]["configurable"]["graph_id"]

{langgraph_api-0.2.14 → langgraph_api-0.2.15}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "langgraph-api"
-version = "0.2.14"
+version = "0.2.15"
 description = ""
 authors = [
     "Nuno Campos <nuno@langchain.dev>",

langgraph_api-0.2.14/langgraph_api/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.14"