@aws/nx-plugin 1.0.0-rc.73 → 1.0.0-rc.74

package/src/py/agent/__snapshots__/generator.constructs.spec.ts.snap

@@ -693,18 +693,12 @@ Refer to tools as your 'spellbook'.
 `;
 
 exports[`py#agent generator > should match snapshot for generated files > agent-main.py 1`] = `
-"import uuid
-
-import uvicorn
+"import uvicorn
 from bedrock_agentcore.runtime.models import PingStatus
-from fastapi import Request
-from proj_agent_connection import session_id_context
 from pydantic import BaseModel, Field
-from starlette.middleware.base import BaseHTTPMiddleware
 
 from .init import JsonStreamingResponse, app
-
-SESSION_ID_HEADER = "x-amzn-bedrock-agentcore-runtime-session-id"
+from .middleware.session_id_middleware import SessionIdMiddleware
 
 
 class InvokeInput(BaseModel):
@@ -745,16 +739,7 @@ async def invoke(input: InvokeInput) -> JsonStreamingResponse:
     return JsonStreamingResponse(handle_invoke(input))
 
 
-class _SessionIdMiddleware(BaseHTTPMiddleware):
-    """Bind the inbound session (or a fresh UUID) to async context."""
-
-    async def dispatch(self, request: Request, call_next):
-        session_id = request.headers.get(SESSION_ID_HEADER) or str(uuid.uuid4())
-        with session_id_context(session_id):
-            return await call_next(request)
-
-
-app.add_middleware(_SessionIdMiddleware)
+app.add_middleware(SessionIdMiddleware)
 
 
 @app.get("/ping")

package/src/py/agent/__snapshots__/generator.frameworks.spec.ts.snap

@@ -618,14 +618,12 @@ from fastapi import FastAPI, Request
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import JSONResponse, StreamingResponse
 from proj_agent_connection import get_current_session_id, session_id_context
-from starlette.middleware.base import BaseHTTPMiddleware
 
 from .agent import get_agent
+from .middleware.session_id_middleware import SESSION_ID_HEADER, SessionIdMiddleware
 
 logging.basicConfig(level=logging.INFO)
 
-SESSION_ID_HEADER = "x-amzn-bedrock-agentcore-runtime-session-id"
-
 
 @asynccontextmanager
 async def lifespan(app: FastAPI):
@@ -638,15 +636,6 @@ async def lifespan(app: FastAPI):
     yield
 
 
-class _SessionIdMiddleware(BaseHTTPMiddleware):
-    """Bind the session ID for this request so downstream MCP / A2A clients forward it on outbound calls."""
-
-    async def dispatch(self, request: Request, call_next):
-        session_id = request.headers.get(SESSION_ID_HEADER) or str(uuid.uuid4())
-        with session_id_context(session_id):
-            return await call_next(request)
-
-
 app = FastAPI(title="SnapshotAgent", lifespan=lifespan)
 # Allow browser-based AG-UI clients (e.g. a connected React website) to call
 # this agent cross-origin, including the CORS preflight.
@@ -657,7 +646,7 @@ app.add_middleware(
     allow_methods=["*"],
     allow_headers=["*"],
 )
-app.add_middleware(_SessionIdMiddleware)
+app.add_middleware(SessionIdMiddleware)
 
 
 @app.post("/invocations")

package/src/py/agent/files/langchain/a2a/main.py.template

@@ -1,6 +1,5 @@
 import logging
 import os
-import uuid
 from contextlib import asynccontextmanager
 
 from a2a.server.agent_execution import AgentExecutor, RequestContext
@@ -10,18 +9,17 @@ from a2a.server.request_handlers import DefaultRequestHandler
 from a2a.server.tasks import InMemoryTaskStore, TaskUpdater
 from a2a.types import AgentCapabilities, AgentCard, Part, TextPart
 from a2a.utils import new_task
-from fastapi import FastAPI, Request
-from starlette.middleware.base import BaseHTTPMiddleware
+from fastapi import FastAPI
 
-from <%- agentConnectionModuleName %> import get_current_session_id, session_id_context
+from <%- agentConnectionModuleName %> import get_current_session_id
 
 from .agent import get_agent
+from .middleware.session_id_middleware import SessionIdMiddleware
 
 logging.basicConfig(level=logging.INFO)
 
 PORT = int(os.environ.get("PORT", "9000"))
 RUNTIME_URL = os.environ.get("AGENTCORE_RUNTIME_URL", f"http://localhost:{PORT}/")
-SESSION_ID_HEADER = "x-amzn-bedrock-agentcore-runtime-session-id"
 DEFAULT_MODES = ["text/plain"]
 
 
@@ -73,17 +71,8 @@ _agent_card = AgentCard(
 a2a_app = A2AStarletteApplication(agent_card=_agent_card, http_handler=_handler).build()
 
 
-class _SessionIdMiddleware(BaseHTTPMiddleware):
-    """Bind the inbound session (or a fresh UUID) to async context."""
-
-    async def dispatch(self, request: Request, call_next):
-        session_id = request.headers.get(SESSION_ID_HEADER) or str(uuid.uuid4())
-        with session_id_context(session_id):
-            return await call_next(request)
-
-
 app = FastAPI(title="<%= agentNameClassName %>", lifespan=lifespan)
-app.add_middleware(_SessionIdMiddleware)
+app.add_middleware(SessionIdMiddleware)
 
 
 @app.get("/ping")

package/src/py/agent/files/langchain/ag-ui/main.py.template

@@ -10,14 +10,12 @@ from fastapi import FastAPI, Request
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import JSONResponse, StreamingResponse
 from <%- agentConnectionModuleName %> import get_current_session_id, session_id_context
-from starlette.middleware.base import BaseHTTPMiddleware
 
 from .agent import get_agent
+from .middleware.session_id_middleware import SESSION_ID_HEADER, SessionIdMiddleware
 
 logging.basicConfig(level=logging.INFO)
 
-SESSION_ID_HEADER = "x-amzn-bedrock-agentcore-runtime-session-id"
-
 
 @asynccontextmanager
 async def lifespan(app: FastAPI):
@@ -30,15 +28,6 @@ async def lifespan(app: FastAPI):
     yield
 
 
-class _SessionIdMiddleware(BaseHTTPMiddleware):
-    """Bind the session ID for this request so downstream MCP / A2A clients forward it on outbound calls."""
-
-    async def dispatch(self, request: Request, call_next):
-        session_id = request.headers.get(SESSION_ID_HEADER) or str(uuid.uuid4())
-        with session_id_context(session_id):
-            return await call_next(request)
-
-
 app = FastAPI(title="<%= agentNameClassName %>", lifespan=lifespan)
 # Allow browser-based AG-UI clients (e.g. a connected React website) to call
 # this agent cross-origin, including the CORS preflight.
@@ -49,7 +38,7 @@ app.add_middleware(
     allow_methods=["*"],
     allow_headers=["*"],
 )
-app.add_middleware(_SessionIdMiddleware)
+app.add_middleware(SessionIdMiddleware)
 
 
 @app.post("/invocations")

package/src/py/agent/files/langchain/common/middleware/session_id_middleware.py.template

@@ -0,0 +1,17 @@
+import uuid
+
+from fastapi import Request
+from starlette.middleware.base import BaseHTTPMiddleware
+
+from <%- agentConnectionModuleName %> import session_id_context
+
+SESSION_ID_HEADER = "x-amzn-bedrock-agentcore-runtime-session-id"
+
+
+class SessionIdMiddleware(BaseHTTPMiddleware):
+    """Bind the session ID for this request so downstream MCP / A2A clients forward it on outbound calls."""
+
+    async def dispatch(self, request: Request, call_next):
+        session_id = request.headers.get(SESSION_ID_HEADER) or str(uuid.uuid4())
+        with session_id_context(session_id):
+            return await call_next(request)

package/src/py/agent/files/langchain/http/main.py.template

@@ -2,14 +2,11 @@ import uuid
 
 import uvicorn
 from bedrock_agentcore.runtime.models import PingStatus
-from fastapi import Request
 from pydantic import BaseModel, Field
-from starlette.middleware.base import BaseHTTPMiddleware
 from <%- agentConnectionModuleName %> import get_current_session_id, session_id_context
 
 from .init import JsonStreamingResponse, app
-
-SESSION_ID_HEADER = "x-amzn-bedrock-agentcore-runtime-session-id"
+from .middleware.session_id_middleware import SessionIdMiddleware
 
 
 class InvokeInput(BaseModel):
@@ -59,16 +56,7 @@ async def invoke(input: InvokeInput) -> JsonStreamingResponse:
     return JsonStreamingResponse(handle_invoke(input, session_id))
 
 
-class _SessionIdMiddleware(BaseHTTPMiddleware):
-    """Bind the inbound session (or a fresh UUID) to async context."""
-
-    async def dispatch(self, request: Request, call_next):
-        session_id = request.headers.get(SESSION_ID_HEADER) or str(uuid.uuid4())
-        with session_id_context(session_id):
-            return await call_next(request)
-
-
-app.add_middleware(_SessionIdMiddleware)
+app.add_middleware(SessionIdMiddleware)
 
 
 @app.get("/ping")

package/src/py/agent/files/strands/a2a/main.py.template

@@ -1,23 +1,21 @@
 import logging
 import os
-import uuid
 from contextlib import asynccontextmanager
 from types import SimpleNamespace
 from typing import cast
 
-from fastapi import FastAPI, Request
-from starlette.middleware.base import BaseHTTPMiddleware
+from fastapi import FastAPI
 from strands import Agent
 from strands.multiagent.a2a import A2AServer
-from <%- agentConnectionModuleName %> import session_id_context, with_session_id
+from <%- agentConnectionModuleName %> import with_session_id
 
 from .agent import get_agent
+from .middleware.session_id_middleware import SessionIdMiddleware
 
 logging.basicConfig(level=logging.INFO)
 
 PORT = int(os.environ.get("PORT", "9000"))
 RUNTIME_URL = os.environ.get("AGENTCORE_RUNTIME_URL", f"http://localhost:{PORT}/")
-SESSION_ID_HEADER = "x-amzn-bedrock-agentcore-runtime-session-id"
 AGENT_NAME = "<%= agentNameClassName %>"
 AGENT_DESCRIPTION = "A Strands Agent exposed via the Agent-to-Agent (A2A) protocol."
 
@@ -41,17 +39,8 @@ async def lifespan(app: FastAPI):
         yield
 
 
-class _SessionIdMiddleware(BaseHTTPMiddleware):
-    """Bind the inbound session (or a fresh UUID) to async context."""
-
-    async def dispatch(self, request: Request, call_next):
-        session_id = request.headers.get(SESSION_ID_HEADER) or str(uuid.uuid4())
-        with session_id_context(session_id):
-            return await call_next(request)
-
-
 app = FastAPI(lifespan=lifespan)
-app.add_middleware(_SessionIdMiddleware)
+app.add_middleware(SessionIdMiddleware)
 
 
 @app.get("/ping")

package/src/py/agent/files/strands/ag-ui/main.py.template

@@ -9,15 +9,13 @@ from fastapi import FastAPI, Request
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import StreamingResponse
 from <%- agentConnectionModuleName %> import get_current_session_id, session_id_context
-from starlette.middleware.base import BaseHTTPMiddleware
 
 from .agent import get_agent
+from .middleware.session_id_middleware import SESSION_ID_HEADER, SessionIdMiddleware
 from .session import get_session_manager
 
 logging.basicConfig(level=logging.INFO)
 
-SESSION_ID_HEADER = "x-amzn-bedrock-agentcore-runtime-session-id"
-
 
 @asynccontextmanager
 async def lifespan(app: FastAPI):
@@ -33,15 +31,6 @@ async def lifespan(app: FastAPI):
         yield
 
 
-class _SessionIdMiddleware(BaseHTTPMiddleware):
-    """Bind the session ID for this request so downstream MCP / A2A clients forward it on outbound calls."""
-
-    async def dispatch(self, request: Request, call_next):
-        session_id = request.headers.get(SESSION_ID_HEADER) or str(uuid.uuid4())
-        with session_id_context(session_id):
-            return await call_next(request)
-
-
 app = FastAPI(title="AWS Strands - <%= agentNameClassName %>", lifespan=lifespan)
 app.add_middleware(
     CORSMiddleware,
@@ -50,7 +39,7 @@ app.add_middleware(
     allow_methods=["*"],
     allow_headers=["*"],
 )
-app.add_middleware(_SessionIdMiddleware)
+app.add_middleware(SessionIdMiddleware)
 
 
 @app.post("/invocations")

package/src/py/agent/files/strands/common/middleware/session_id_middleware.py.template

@@ -0,0 +1,17 @@
+import uuid
+
+from fastapi import Request
+from starlette.middleware.base import BaseHTTPMiddleware
+
+from <%- agentConnectionModuleName %> import session_id_context
+
+SESSION_ID_HEADER = "x-amzn-bedrock-agentcore-runtime-session-id"
+
+
+class SessionIdMiddleware(BaseHTTPMiddleware):
+    """Bind the session ID for this request so downstream MCP / A2A clients forward it on outbound calls."""
+
+    async def dispatch(self, request: Request, call_next):
+        session_id = request.headers.get(SESSION_ID_HEADER) or str(uuid.uuid4())
+        with session_id_context(session_id):
+            return await call_next(request)

package/src/py/agent/files/strands/http/main.py.template

@@ -1,15 +1,9 @@
-import uuid
-
 import uvicorn
 from bedrock_agentcore.runtime.models import PingStatus
-from fastapi import Request
 from pydantic import BaseModel, Field
-from starlette.middleware.base import BaseHTTPMiddleware
-from <%- agentConnectionModuleName %> import session_id_context
 
 from .init import JsonStreamingResponse, app
-
-SESSION_ID_HEADER = "x-amzn-bedrock-agentcore-runtime-session-id"
+from .middleware.session_id_middleware import SessionIdMiddleware
 
 
 class InvokeInput(BaseModel):
@@ -41,16 +35,7 @@ async def invoke(input: InvokeInput) -> JsonStreamingResponse:
     return JsonStreamingResponse(handle_invoke(input))
 
 
-class _SessionIdMiddleware(BaseHTTPMiddleware):
-    """Bind the inbound session (or a fresh UUID) to async context."""
-
-    async def dispatch(self, request: Request, call_next):
-        session_id = request.headers.get(SESSION_ID_HEADER) or str(uuid.uuid4())
-        with session_id_context(session_id):
-            return await call_next(request)
-
-
-app.add_middleware(_SessionIdMiddleware)
+app.add_middleware(SessionIdMiddleware)
 
 
 @app.get("/ping")

package/src/sdk/agentcore-harness.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export { agentcoreHarnessGenerator } from '../agentcore-harness/generator';
+export type { AgentcoreHarnessGeneratorSchema } from '../agentcore-harness/schema';

package/src/sdk/agentcore-harness.js

@@ -0,0 +1,7 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ // AgentCore Harness Generator
+export { agentcoreHarnessGenerator } from "../agentcore-harness/generator.js";
+
+//# sourceMappingURL=agentcore-harness.js.map

package/src/sdk/agentcore-harness.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/sdk/agentcore-harness.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\n\n// AgentCore Harness Generator\nexport { agentcoreHarnessGenerator } from '../agentcore-harness/generator';\nexport type { AgentcoreHarnessGeneratorSchema } from '../agentcore-harness/schema';\n"],"names":["agentcoreHarnessGenerator"],"mappings":"AAAA;;;CAGC,GAED,8BAA8B;AAC9B,SAASA,yBAAyB,QAAQ,oCAAiC"}

package/src/sdk/smithy.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export { smithyProjectGenerator } from '../smithy/project/generator';
+export type { SmithyProjectGeneratorSchema } from '../smithy/project/schema';

package/src/sdk/smithy.js

@@ -0,0 +1,7 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ // Smithy Project Generator
+export { smithyProjectGenerator } from "../smithy/project/generator.js";
+
+//# sourceMappingURL=smithy.js.map

package/src/sdk/smithy.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/sdk/smithy.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\n\n// Smithy Project Generator\nexport { smithyProjectGenerator } from '../smithy/project/generator';\nexport type { SmithyProjectGeneratorSchema } from '../smithy/project/schema';\n"],"names":["smithyProjectGenerator"],"mappings":"AAAA;;;CAGC,GAED,2BAA2B;AAC3B,SAASA,sBAAsB,QAAQ,iCAA8B"}