Skip to content

Commit 8916690

Browse files
Merge pull request #42 from edgeandnode/ma/ASND-161-simplify-setup-002
ASND-161: simplify
2 parents dfcb15d + cf2c8c9 commit 8916690

File tree

14 files changed

+22
-133
lines changed

14 files changed

+22
-133
lines changed

python/ampersend-sdk/src/ampersend_sdk/__init__.py

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,4 @@
1-
"""
2-
Ampersend SDK - Payment capabilities for AI agents.
3-
4-
Quick start (A2A toolset for ADK):
5-
from ampersend_sdk import create_ampersend_toolset
6-
from google.adk import Agent
7-
8-
toolset = create_ampersend_toolset(
9-
remote_agent_urls=["https://agent.example.com"],
10-
smart_account_address="0x...",
11-
session_key_private_key="0x...",
12-
)
13-
14-
agent = Agent(
15-
name="orchestrator",
16-
model="gemini-2.0-flash",
17-
tools=[toolset],
18-
before_agent_callback=toolset.get_before_agent_callback(),
19-
)
20-
21-
Quick start (treasurer only):
22-
from ampersend_sdk import create_ampersend_treasurer
23-
24-
treasurer = create_ampersend_treasurer(
25-
smart_account_address="0x...",
26-
session_key_private_key="0x...",
27-
)
28-
"""
1+
"""Ampersend SDK - Payment capabilities for AI agents."""
292

303
from ampersend_sdk.a2a.client import (
314
create_ampersend_client_factory,

python/ampersend-sdk/src/ampersend_sdk/ampersend/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@
2929
RejectedRequirement,
3030
)
3131

32-
__version__ = "1.0.0"
33-
3432
__all__ = [
3533
# Client and API types
3634
"ApiClient",

python/langchain-ampersend/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ pip install langchain-ampersend
1111
## Usage
1212

1313
```python
14-
from ampersend_sdk import create_ampersend_treasurer
15-
from langchain_ampersend import A2AToolkit
14+
from langchain_ampersend import A2AToolkit, create_ampersend_treasurer
1615
from langchain.agents import create_agent
1716
from langchain_openai import ChatOpenAI
1817

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
11
"""LangChain integration for Ampersend x402 payments."""
22

3-
# Re-export common items from ampersend-sdk for convenience
4-
from ampersend_sdk.ampersend import AmpersendTreasurer, ApiClient, ApiClientOptions
5-
from ampersend_sdk.smart_account import SmartAccountConfig
3+
from ampersend_sdk.ampersend import AmpersendTreasurer, create_ampersend_treasurer
64
from ampersend_sdk.x402.treasurer import X402Treasurer
7-
from ampersend_sdk.x402.wallets.smart_account import SmartAccountWallet
85

96
from .a2a import A2AToolkit
107

118
__all__ = [
9+
# Simplified factories (recommended)
10+
"create_ampersend_treasurer",
11+
# Toolkit
1212
"A2AToolkit",
13-
"X402Treasurer",
13+
# Types (for type hints)
1414
"AmpersendTreasurer",
15-
"ApiClient",
16-
"ApiClientOptions",
17-
"SmartAccountConfig",
18-
"SmartAccountWallet",
15+
"X402Treasurer",
1916
]
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
"""A2A toolkit for LangChain."""
2-
31
from .toolkit import A2AToolkit
42

53
__all__ = ["A2AToolkit"]

python/langchain-ampersend/src/langchain_ampersend/a2a/toolkit.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ class A2AToolkit:
2828
2929
Example:
3030
```python
31-
from ampersend_sdk import create_ampersend_treasurer
32-
from langchain_ampersend import A2AToolkit
31+
from langchain_ampersend import A2AToolkit, create_ampersend_treasurer
3332
from langchain.agents import create_agent
3433
3534
# Create treasurer (one-liner setup)
Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
// Re-export all types and client
2-
export * from "./types.js"
3-
export { ApiClient } from "./client.js"
1+
export * from "./types.ts"
2+
export { ApiClient } from "./client.ts"
43
export {
54
AmpersendTreasurer,
65
createAmpersendTreasurer,
76
type AmpersendTreasurerConfig,
87
type SimpleAmpersendTreasurerConfig,
98
type FullAmpersendTreasurerConfig,
10-
} from "./treasurer.js"
9+
} from "./treasurer.ts"
Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,21 @@
1-
#!/usr/bin/env node
2-
3-
// =============================================================================
4-
// PRIMARY API - Simplified Setup (Recommended)
5-
// =============================================================================
6-
7-
// Treasurer - core payment authorization
1+
// Simplified factories (recommended)
82
export {
93
createAmpersendTreasurer,
104
AmpersendTreasurer,
115
type AmpersendTreasurerConfig,
126
type SimpleAmpersendTreasurerConfig,
137
type FullAmpersendTreasurerConfig,
148
} from "./ampersend/index.ts"
15-
16-
// MCP Proxy - simplified setup
179
export { createAmpersendProxy, type SimpleProxyOptions } from "./mcp/proxy/factory.ts"
18-
19-
// MCP Client - simplified setup
2010
export { createAmpersendMcpClient, type SimpleClientOptions } from "./mcp/client/factory.ts"
21-
22-
// HTTP Client - simplified setup
2311
export { createAmpersendHttpClient, type SimpleHttpClientOptions } from "./x402/http/factory.ts"
2412

25-
// =============================================================================
26-
// TYPES - For type annotations
27-
// =============================================================================
13+
// Types
2814
export type { X402Treasurer, Authorization, PaymentContext, PaymentStatus } from "./x402/index.ts"
2915
export type { X402Wallet, SmartAccountConfig } from "./x402/index.ts"
3016

31-
// =============================================================================
32-
// ADVANCED - Building blocks (NaiveTreasurer requires deep import)
33-
// =============================================================================
34-
35-
// Wallets
17+
// Advanced building blocks
3618
export { AccountWallet, SmartAccountWallet, WalletError } from "./x402/index.ts"
37-
38-
// Advanced MCP (original functions that take treasurer directly)
3919
export { initializeProxyServer } from "./mcp/proxy/index.ts"
4020
export { Client } from "./mcp/client/index.ts"
41-
42-
// Advanced HTTP
4321
export { wrapWithAmpersend } from "./x402/http/index.ts"
44-
45-
// =============================================================================
46-
// NOTE: NaiveTreasurer is NOT exported here - use deep import for testing:
47-
// import { NaiveTreasurer } from "@ampersend_ai/ampersend-sdk/x402/treasurers"
48-
// =============================================================================

typescript/packages/ampersend-sdk/src/mcp/client/client.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import {
1111
type ReadResourceRequest,
1212
type ReadResourceResult,
1313
} from "@modelcontextprotocol/sdk/types.js"
14+
import type { PaymentRequirements } from "x402/types"
1415

1516
import type { Authorization, X402Treasurer } from "../../x402/treasurer.ts"
16-
import type { PaymentRequirements } from "./index.ts"
1717
import { asX402Response } from "./protocol.ts"
1818
import type { ClientOptions, X402Response } from "./types.ts"
1919

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
11
export { Client } from "./client.ts"
22
export { X402Middleware } from "./middleware.ts"
33
export type { ClientOptions, PaymentEvent } from "./types.ts"
4-
5-
// Core abstractions (re-exported for convenience)
6-
export type { Authorization, PaymentContext, PaymentStatus, X402Treasurer } from "../../x402/treasurer.ts"
7-
8-
// Re-export MCP types for convenience
9-
export type { Tool } from "@modelcontextprotocol/sdk/types.js"
10-
11-
// Re-export x402 types for convenience
12-
export type { PaymentPayload, PaymentRequirements } from "x402/types"

0 commit comments

Comments
 (0)