Skip to content

fix(invoke): auto-generate session ID for bearer-token invocations #953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aidandaly24 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(invoke): auto-generate session ID for bearer-token invocations #953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions src/assets/__tests__/__snapshots__/assets.snapshot.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1889,6 +1889,7 @@ exports[`Assets Directory Snapshots > Python framework assets > python/python/a2

exports[`Assets Directory Snapshots > Python framework assets > python/python/a2a/strands/capabilities/memory/session.py should match snapshot 1`] = `
"import os
import uuid
from typing import Optional

from bedrock_agentcore.memory.integrations.strands.config import AgentCoreMemoryConfig{{#if memoryProviders.[0].strategies.length}}, RetrievalConfig{{/if}}
Expand All @@ -1897,10 +1898,14 @@ from bedrock_agentcore.memory.integrations.strands.session_manager import AgentC
MEMORY_ID = os.getenv("{{memoryProviders.[0].envVarName}}")
REGION = os.getenv("AWS_REGION")

def get_memory_session_manager(session_id: str, actor_id: str) -> Optional[AgentCoreMemorySessionManager]:
def get_memory_session_manager(session_id: Optional[str], actor_id: str) -> Optional[AgentCoreMemorySessionManager]:
if not MEMORY_ID:
return None

# AgentCoreMemoryConfig rejects None; OAuth/CUSTOM_JWT callers can reach us
# without a runtime session header, so synthesize one when absent.
session_id = session_id or uuid.uuid4().hex

{{#if memoryProviders.[0].strategies.length}}
retrieval_config = {
{{#if (includes memoryProviders.[0].strategies "SEMANTIC")}}
Expand Down Expand Up @@ -2724,6 +2729,7 @@ exports[`Assets Directory Snapshots > Python framework assets > python/python/ag

exports[`Assets Directory Snapshots > Python framework assets > python/python/agui/strands/capabilities/memory/session.py should match snapshot 1`] = `
"import os
import uuid
from typing import Optional

from bedrock_agentcore.memory.integrations.strands.config import AgentCoreMemoryConfig{{#if memoryProviders.[0].strategies.length}}, RetrievalConfig{{/if}}
Expand All @@ -2732,10 +2738,14 @@ from bedrock_agentcore.memory.integrations.strands.session_manager import AgentC
MEMORY_ID = os.getenv("{{memoryProviders.[0].envVarName}}")
REGION = os.getenv("AWS_REGION")

def get_memory_session_manager(session_id: str, actor_id: str) -> Optional[AgentCoreMemorySessionManager]:
def get_memory_session_manager(session_id: Optional[str], actor_id: str) -> Optional[AgentCoreMemorySessionManager]:
if not MEMORY_ID:
return None

# AgentCoreMemoryConfig rejects None; OAuth/CUSTOM_JWT callers can reach us
# without a runtime session header, so synthesize one when absent.
session_id = session_id or uuid.uuid4().hex

{{#if memoryProviders.[0].strategies.length}}
retrieval_config = {
{{#if (includes memoryProviders.[0].strategies "SEMANTIC")}}
Expand Down Expand Up @@ -4993,6 +5003,7 @@ exports[`Assets Directory Snapshots > Python framework assets > python/python/ht

exports[`Assets Directory Snapshots > Python framework assets > python/python/http/strands/capabilities/memory/session.py should match snapshot 1`] = `
"import os
import uuid
from typing import Optional

from bedrock_agentcore.memory.integrations.strands.config import AgentCoreMemoryConfig{{#if memoryProviders.[0].strategies.length}}, RetrievalConfig{{/if}}
Expand All @@ -5001,10 +5012,14 @@ from bedrock_agentcore.memory.integrations.strands.session_manager import AgentC
MEMORY_ID = os.getenv("{{memoryProviders.[0].envVarName}}")
REGION = os.getenv("AWS_REGION")

def get_memory_session_manager(session_id: str, actor_id: str) -> Optional[AgentCoreMemorySessionManager]:
def get_memory_session_manager(session_id: Optional[str], actor_id: str) -> Optional[AgentCoreMemorySessionManager]:
if not MEMORY_ID:
return None

# AgentCoreMemoryConfig rejects None; OAuth/CUSTOM_JWT callers can reach us
# without a runtime session header, so synthesize one when absent.
session_id = session_id or uuid.uuid4().hex

{{#if memoryProviders.[0].strategies.length}}
retrieval_config = {
{{#if (includes memoryProviders.[0].strategies "SEMANTIC")}}
Expand Down
7 changes: 6 additions & 1 deletion src/assets/python/a2a/strands/capabilities/memory/session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import os
import uuid
from typing import Optional

from bedrock_agentcore.memory.integrations.strands.config import AgentCoreMemoryConfig{{#if memoryProviders.[0].strategies.length}}, RetrievalConfig{{/if}}
Expand All @@ -7,10 +8,14 @@
MEMORY_ID = os.getenv("{{memoryProviders.[0].envVarName}}")
REGION = os.getenv("AWS_REGION")

def get_memory_session_manager(session_id: str, actor_id: str) -> Optional[AgentCoreMemorySessionManager]:
def get_memory_session_manager(session_id: Optional[str], actor_id: str) -> Optional[AgentCoreMemorySessionManager]:
if not MEMORY_ID:
return None

# AgentCoreMemoryConfig rejects None; OAuth/CUSTOM_JWT callers can reach us
# without a runtime session header, so synthesize one when absent.
session_id = session_id or uuid.uuid4().hex

{{#if memoryProviders.[0].strategies.length}}
retrieval_config = {
{{#if (includes memoryProviders.[0].strategies "SEMANTIC")}}
Expand Down
7 changes: 6 additions & 1 deletion src/assets/python/agui/strands/capabilities/memory/session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import os
import uuid
from typing import Optional

from bedrock_agentcore.memory.integrations.strands.config import AgentCoreMemoryConfig{{#if memoryProviders.[0].strategies.length}}, RetrievalConfig{{/if}}
Expand All @@ -7,10 +8,14 @@
MEMORY_ID = os.getenv("{{memoryProviders.[0].envVarName}}")
REGION = os.getenv("AWS_REGION")

def get_memory_session_manager(session_id: str, actor_id: str) -> Optional[AgentCoreMemorySessionManager]:
def get_memory_session_manager(session_id: Optional[str], actor_id: str) -> Optional[AgentCoreMemorySessionManager]:
if not MEMORY_ID:
return None

# AgentCoreMemoryConfig rejects None; OAuth/CUSTOM_JWT callers can reach us
# without a runtime session header, so synthesize one when absent.
session_id = session_id or uuid.uuid4().hex

{{#if memoryProviders.[0].strategies.length}}
retrieval_config = {
{{#if (includes memoryProviders.[0].strategies "SEMANTIC")}}
Expand Down
7 changes: 6 additions & 1 deletion src/assets/python/http/strands/capabilities/memory/session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import os
import uuid
from typing import Optional

from bedrock_agentcore.memory.integrations.strands.config import AgentCoreMemoryConfig{{#if memoryProviders.[0].strategies.length}}, RetrievalConfig{{/if}}
Expand All @@ -7,10 +8,14 @@
MEMORY_ID = os.getenv("{{memoryProviders.[0].envVarName}}")
REGION = os.getenv("AWS_REGION")

def get_memory_session_manager(session_id: str, actor_id: str) -> Optional[AgentCoreMemorySessionManager]:
def get_memory_session_manager(session_id: Optional[str], actor_id: str) -> Optional[AgentCoreMemorySessionManager]:
if not MEMORY_ID:
return None

# AgentCoreMemoryConfig rejects None; OAuth/CUSTOM_JWT callers can reach us
# without a runtime session header, so synthesize one when absent.
session_id = session_id or uuid.uuid4().hex

{{#if memoryProviders.[0].strategies.length}}
retrieval_config = {
{{#if (includes memoryProviders.[0].strategies "SEMANTIC")}}
Expand Down
9 changes: 9 additions & 0 deletions src/cli/commands/invoke/action.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
import { InvokeLogger } from '../../logging';
import { formatMcpToolList } from '../../operations/dev/utils';
import { canFetchRuntimeToken, fetchRuntimeToken } from '../../operations/fetch-access';
import { generateSessionId } from '../../operations/session';
import type { InvokeOptions, InvokeResult } from './types';

export interface InvokeContext {
Expand Down Expand Up @@ -114,6 +115,14 @@ export async function handleInvoke(context: InvokeContext, options: InvokeOption
}
}

// When invoking with a bearer token (OAuth/CUSTOM_JWT), AgentCore does not
// auto-generate a runtime session ID the way it does for SigV4 callers. Templates
// that wire up AgentCoreMemorySessionManager require a non-null session_id, so
// generate one here if the caller didn't pass --session-id.
if (options.bearerToken && !options.sessionId) {
options = { ...options, sessionId: generateSessionId() };
}

// Exec mode: run shell command in runtime container
if (options.exec) {
const logger = new InvokeLogger({
Expand Down
Loading