Skip to content

Commit e5ef092

Browse files
authored
Merge pull request #129 from conductor-oss/rename-conductor-ai-modules
Restructure modules: conductor-client-ai[-spring] rename, agent-examples/e2e rename, drop shim modules
2 parents 1d394f0 + 0413dab commit e5ef092

354 files changed

Lines changed: 47 additions & 161 deletions

File tree

Some content is hidden

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

.github/workflows/agent-e2e.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Agent E2E
22

3-
# Runs the agent e2e suites (conductor-ai-e2e/) against the Conductor OSS
3+
# Runs the agent e2e suites (e2e/) against the Conductor OSS
44
# server boot JAR (Maven Central) — the server this SDK ships against, with
55
# the agent runtime on by default from 3.32.0-rc.8 onward. The Agentspan
66
# server JAR is no longer used here.
@@ -88,7 +88,7 @@ jobs:
8888
exit 1
8989
9090
- name: Run e2e suites
91-
run: ./gradlew :conductor-ai-e2e:test -Pe2e
91+
run: ./gradlew :e2e:test -Pe2e
9292

9393
# BaseTest assumeTrue-skips every suite when the server is unreachable —
9494
# without this guard a boot failure after the health gate (or a future
@@ -102,7 +102,7 @@ jobs:
102102
import xml.etree.ElementTree as ET
103103
104104
total = executed = 0
105-
for path in glob.glob("conductor-ai-e2e/build/test-results/test/TEST-*.xml"):
105+
for path in glob.glob("e2e/build/test-results/test/TEST-*.xml"):
106106
root = ET.parse(path).getroot()
107107
t = int(root.get("tests", 0))
108108
sk = int(root.get("skipped", 0))
@@ -118,7 +118,7 @@ jobs:
118118
with:
119119
name: agent-e2e-results
120120
path: |
121-
conductor-ai-e2e/build/test-results/test/
122-
conductor-ai-e2e/build/reports/tests/test/
121+
e2e/build/test-results/test/
122+
e2e/build/reports/tests/test/
123123
server.log
124124
retention-days: 14

CHANGELOG.md

Lines changed: 6 additions & 2 deletions

README.md

Lines changed: 9 additions & 9 deletions
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ plugins {
44
}
55

66
// Run individual examples via:
7-
// ./gradlew :conductor-ai-examples:run -PmainClass=org.conductoross.conductor.ai.examples.openai.Example01BasicAgent
7+
// ./gradlew :agent-examples:run -PmainClass=org.conductoross.conductor.ai.examples.openai.Example01BasicAgent
88
application {
99
mainClass = project.findProperty('mainClass') ?: 'org.conductoross.conductor.ai.examples.Example01BasicAgent'
1010
}
1111

1212
dependencies {
13-
implementation project(':conductor-ai')
13+
implementation project(':conductor-client-ai')
1414

1515
// Native framework SDKs used by the adk/, langchain/, langgraph/, openai/
1616
// subpackages. @Tool / @P annotations are RUNTIME-retained, so these must be

conductor-ai-examples/src/main/java/org/conductoross/conductor/ai/examples/Example01BasicAgent.java renamed to agent-examples/src/main/java/org/conductoross/conductor/ai/examples/Example01BasicAgent.java

File renamed without changes.

conductor-ai-examples/src/main/java/org/conductoross/conductor/ai/examples/Example02Tools.java renamed to agent-examples/src/main/java/org/conductoross/conductor/ai/examples/Example02Tools.java

File renamed without changes.

conductor-ai-examples/src/main/java/org/conductoross/conductor/ai/examples/Example02aSimpleTools.java renamed to agent-examples/src/main/java/org/conductoross/conductor/ai/examples/Example02aSimpleTools.java

File renamed without changes.

conductor-ai-examples/src/main/java/org/conductoross/conductor/ai/examples/Example02bMultiStepTools.java renamed to agent-examples/src/main/java/org/conductoross/conductor/ai/examples/Example02bMultiStepTools.java

File renamed without changes.

conductor-ai-examples/src/main/java/org/conductoross/conductor/ai/examples/Example02cTypedToolArgs.java renamed to agent-examples/src/main/java/org/conductoross/conductor/ai/examples/Example02cTypedToolArgs.java

File renamed without changes.

0 commit comments

Comments
 (0)