Skip to content

Commit ba89b81

Browse files
authored
Fixup packaging for ag_ui_adk (#388)
* Change package name to ag_ui_adk and add typescript and setup packaging * skip predictive state tests
1 parent 5c22341 commit ba89b81

File tree

83 files changed

+5019
-3003
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+5019
-3003
lines changed

.github/workflows/dojo-e2e.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
include:
17+
- suite: adk-middleware
18+
test_path: tests/adkMiddlewareTests
19+
services: ["dojo","adk-middleware"]
20+
wait_on: http://localhost:9999,tcp:localhost:8010
1721
- suite: agno
1822
test_path: tests/agnoTests
1923
services: ["dojo","agno"]
@@ -147,6 +151,7 @@ jobs:
147151
env:
148152
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
149153
LANGSMITH_API_KEY: ${{ secrets.LANGSMITH_API_KEY }}
154+
GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }}
150155
if: ${{ join(matrix.services, ',') != '' && contains(join(matrix.services, ','), 'dojo') }}
151156
with:
152157
run: |

typescript-sdk/apps/dojo/e2e/tests/adkMiddlewareTests/predictiveStateUpdatePage.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
import { PredictiveStateUpdatesPage } from "../../pages/adkMiddlewarePages/PredictiveStateUpdatesPage";
77

88
test.describe("Predictive State Updates Feature", () => {
9-
test("[ADK Middleware] should interact with agent and approve asked changes", async ({
9+
test.skip("[ADK Middleware] should interact with agent and approve asked changes", async ({
1010
page,
1111
}) => {
1212
await retryOnAIFailure(async () => {
@@ -43,7 +43,7 @@ test.describe("Predictive State Updates Feature", () => {
4343
});
4444
});
4545

46-
test("[ADK Middleware] should interact with agent and reject asked changes", async ({
46+
test.skip("[ADK Middleware] should interact with agent and reject asked changes", async ({
4747
page,
4848
}) => {
4949
await retryOnAIFailure(async () => {

typescript-sdk/apps/dojo/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"generate-content-json": "npx tsx scripts/generate-content-json.ts"
1212
},
1313
"dependencies": {
14+
"@ag-ui/adk": "workspace:*",
1415
"@ag-ui/agno": "workspace:*",
1516
"@ag-ui/crewai": "workspace:*",
1617
"@ag-ui/langgraph": "workspace:*",

typescript-sdk/apps/dojo/scripts/generate-content-json.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ const agentFilesMapper: Record<string, (agentKeys: string[]) => Record<string, s
208208
'adk-middleware': (agentKeys: string[]) => {
209209
return agentKeys.reduce((acc, agentId) => ({
210210
...acc,
211-
[agentId]: [path.join(__dirname, integrationsFolderPath, `/adk-middleware/examples/server/api/${agentId}.py`)]
211+
[agentId]: [path.join(__dirname, integrationsFolderPath, `/adk-middleware/python/examples/server/api/${agentId}.py`)]
212212
}), {})
213213
}
214214
}

typescript-sdk/apps/dojo/scripts/prep-dojo-everything.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ const ALL_TARGETS = {
101101
'adk-middleware': {
102102
command: 'uv sync',
103103
name: 'ADK Middleware',
104-
cwd: path.join(integrationsRoot, 'adk-middleware/examples'),
104+
cwd: path.join(integrationsRoot, 'adk-middleware/python/examples'),
105105
},
106106
'dojo': {
107107
command: 'pnpm install --no-frozen-lockfile && pnpm build --filter=demo-viewer...',

typescript-sdk/apps/dojo/scripts/run-dojo-everything.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ const ALL_SERVICES = {
113113
'adk-middleware': {
114114
command: 'uv run dev',
115115
name: 'ADK Middleware',
116-
cwd: path.join(integrationsRoot, 'adk-middleware/examples'),
116+
cwd: path.join(integrationsRoot, 'adk-middleware/python/examples'),
117117
env: { PORT: 8010 },
118118
},
119119
'dojo': {

typescript-sdk/apps/dojo/src/agents.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import { CrewAIAgent } from "@ag-ui/crewai";
1515
import getEnvVars from "./env";
1616
import { mastra } from "./mastra";
1717
import { PydanticAIAgent } from "@ag-ui/pydantic-ai";
18+
import { ADKAgent } from "@ag-ui/adk";
1819

1920
const envVars = getEnvVars();
2021
export const agentsIntegrations: AgentIntegrationConfig[] = [
@@ -64,11 +65,11 @@ export const agentsIntegrations: AgentIntegrationConfig[] = [
6465
id: "adk-middleware",
6566
agents: async () => {
6667
return {
67-
agentic_chat: new ServerStarterAgent({ url: `${envVars.adkMiddlewareUrl}/chat` }),
68-
tool_based_generative_ui: new ServerStarterAgent({ url: `${envVars.adkMiddlewareUrl}/adk-tool-based-generative-ui` }),
69-
human_in_the_loop: new ServerStarterAgent({ url: `${envVars.adkMiddlewareUrl}/adk-human-in-loop-agent` }),
70-
shared_state: new ServerStarterAgent({ url: `${envVars.adkMiddlewareUrl}/adk-shared-state-agent` }),
71-
// predictive_state_updates: new ServerStarterAgent({ url: `${envVars.adkMiddlewareUrl}/adk-predictive-state-agent` }),
68+
agentic_chat: new ADKAgent({ url: `${envVars.adkMiddlewareUrl}/chat` }),
69+
tool_based_generative_ui: new ADKAgent({ url: `${envVars.adkMiddlewareUrl}/adk-tool-based-generative-ui` }),
70+
human_in_the_loop: new ADKAgent({ url: `${envVars.adkMiddlewareUrl}/adk-human-in-loop-agent` }),
71+
shared_state: new ADKAgent({ url: `${envVars.adkMiddlewareUrl}/adk-shared-state-agent` }),
72+
// predictive_state_updates: new ADKAgent({ url: `${envVars.adkMiddlewareUrl}/adk-predictive-state-agent` }),
7273
};
7374
},
7475
},

typescript-sdk/apps/dojo/src/files.json

Lines changed: 4 additions & 4 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)