Skip to content

Commit c254bbf

Browse files
orpiskeorpiske
committed
Added a new exec service
This resolves issue #199
1 parent 1ec9731 commit c254bbf

File tree

11 files changed

+545
-4
lines changed

11 files changed

+545
-4
lines changed

‎core/core-util/src/main/java/ai/wanaku/core/util/ProcessRunner.java

+44-4
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,49 @@
1818
package ai.wanaku.core.util;
1919

2020
import ai.wanaku.api.exceptions.WanakuException;
21+
import java.io.BufferedReader;
2122
import java.io.File;
2223
import java.io.IOException;
24+
import java.io.InputStreamReader;
2325
import org.jboss.logging.Logger;
2426

2527
public class ProcessRunner {
2628
private static final Logger LOG = Logger.getLogger(ProcessRunner.class);
2729

30+
public static String runWithOutput(String...command) {
31+
try {
32+
ProcessBuilder processBuilder = new ProcessBuilder(command);
33+
// Redirect output and error streams to a pipe
34+
processBuilder.redirectOutput(ProcessBuilder.Redirect.PIPE);
35+
processBuilder.redirectError(ProcessBuilder.Redirect.PIPE);
36+
37+
final Process process = processBuilder.start();
38+
LOG.info("Waiting for process to finish...");
39+
40+
String output = readOutput(process);
41+
42+
waitForExit(process);
43+
return output;
44+
} catch (IOException e) {
45+
LOG.error("I/O Error: %s", e.getMessage(), e);
46+
throw new WanakuException(e);
47+
} catch (InterruptedException e) {
48+
LOG.error("Interrupted: %s", e.getMessage(), e);
49+
throw new WanakuException(e);
50+
}
51+
}
52+
53+
private static String readOutput(Process process) throws IOException {
54+
// Read the output from the process
55+
BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
56+
StringBuilder output = new StringBuilder();
57+
String line;
58+
while ((line = reader.readLine()) != null) {
59+
output.append(line).append("\n");
60+
}
61+
return output.toString();
62+
}
63+
2864
public static void run(File directory, String...command) {
2965
try {
3066
ProcessBuilder processBuilder = new ProcessBuilder();
@@ -34,10 +70,7 @@ public static void run(File directory, String...command) {
3470

3571
final Process process = processBuilder.start();
3672
LOG.info("Waiting for process to finish...");
37-
final int i = process.waitFor();
38-
if (i != 0) {
39-
LOG.warn("Process did not execute successfully");
40-
}
73+
waitForExit(process);
4174
} catch (IOException e) {
4275
LOG.error("I/O Error: %s", e.getMessage(), e);
4376
throw new WanakuException(e);
@@ -46,4 +79,11 @@ public static void run(File directory, String...command) {
4679
throw new WanakuException(e);
4780
}
4881
}
82+
83+
private static void waitForExit(Process process) throws InterruptedException {
84+
final int ret = process.waitFor();
85+
if (ret != 0) {
86+
LOG.warnf("Process did not execute successfully: (return status %d)", ret);
87+
}
88+
}
4989
}

‎docs/usage.md

+1
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@ The following tools services can be made available using Wanaku and used to prov
295295
| `yaml-route` | wanaku-routing-yaml-route-service | Provides access to Camel routes in YAML tools via Wanaku |
296296
| `kafka` | wanaku-routing-kafka-service | Provides access to Kafka topics as tools via Wanaku |
297297
| `tavily` | wanaku-routing-tavily-service | Provides search capabilities on the Web using [Tavily](https://tavily.com/) |
298+
| `exec` | wanaku-routing-exec-service | Executes a process as a tool (use carefully - there's no input validation) |
298299

299300
NOTE: some services (i.e.; Tavily, S3, etc.) may require API keys and/or other forms of authentication. Check the README.md files in each service documentation for more details.
300301

‎services/tools/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<module>wanaku-routing-kafka-service</module>
1818
<module>wanaku-routing-yaml-route-service</module>
1919
<module>wanaku-routing-tavily-service</module>
20+
<module>wanaku-routing-exec-service</module>
2021
</modules>
2122

2223
</project>

‎services/tools/wanaku-routing-exec-service/README.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Wanaku Tool - Exec
2+
3+
Write the description of the tool here
4+
5+
```shell
6+
wanaku tools add -n "sample-exec" --description "Lists the content of a directory." --uri "/bin/ls {parameter.value('directory')}" --type exec --property "argument:string,The directory to list files" --required "directory"
7+
```

‎services/tools/wanaku-routing-exec-service/pom.xml

+200
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,200 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Licensed to the Apache Software Foundation (ASF) under one or more
4+
~ contributor license agreements. See the NOTICE file distributed with
5+
~ this work for additional information regarding copyright ownership.
6+
~ The ASF licenses this file to You under the Apache License, Version 2.0
7+
~ (the "License"); you may not use this file except in compliance with
8+
~ the License. You may obtain a copy of the License at
9+
~
10+
~ http://www.apache.org/licenses/LICENSE-2.0
11+
~
12+
~ Unless required by applicable law or agreed to in writing, software
13+
~ distributed under the License is distributed on an "AS IS" BASIS,
14+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
~ See the License for the specific language governing permissions and
16+
~ limitations under the License.
17+
-->
18+
19+
<project xmlns="http://maven.apache.org/POM/4.0.0"
20+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
22+
<modelVersion>4.0.0</modelVersion>
23+
<parent>
24+
<groupId>ai.wanaku</groupId>
25+
<artifactId>tools</artifactId>
26+
<version>0.0.4-SNAPSHOT</version>
27+
</parent>
28+
29+
<artifactId>wanaku-routing-exec-service</artifactId>
30+
<name>Wanaku :: Service :: Tools :: Exec</name>
31+
32+
<dependencyManagement>
33+
<dependencies>
34+
<dependency>
35+
<groupId>${quarkus.platform.group-id}</groupId>
36+
<artifactId>${quarkus.platform.artifact-id}</artifactId>
37+
<version>${quarkus.platform.version}</version>
38+
<type>pom</type>
39+
<scope>import</scope>
40+
</dependency>
41+
</dependencies>
42+
</dependencyManagement>
43+
44+
45+
<dependencies>
46+
<dependency>
47+
<groupId>ai.wanaku</groupId>
48+
<artifactId>core-exchange</artifactId>
49+
<version>${project.version}</version>
50+
</dependency>
51+
52+
<dependency>
53+
<groupId>ai.wanaku</groupId>
54+
<artifactId>core-services</artifactId>
55+
<version>${project.version}</version>
56+
</dependency>
57+
58+
<dependency>
59+
<groupId>ai.wanaku</groupId>
60+
<artifactId>core-service-discovery</artifactId>
61+
<version>${project.version}</version>
62+
</dependency>
63+
64+
<dependency>
65+
<groupId>io.quarkus</groupId>
66+
<artifactId>quarkus-arc</artifactId>
67+
</dependency>
68+
69+
<dependency>
70+
<groupId>io.quarkus</groupId>
71+
<artifactId>quarkus-grpc</artifactId>
72+
</dependency>
73+
74+
<!-- For building containers -->
75+
<dependency>
76+
<groupId>io.quarkus</groupId>
77+
<artifactId>quarkus-container-image-jib</artifactId>
78+
</dependency>
79+
80+
<!-- Tool dependencies go here -->
81+
82+
</dependencies>
83+
84+
<build>
85+
<plugins>
86+
<plugin>
87+
<groupId>${quarkus.platform.group-id}</groupId>
88+
<artifactId>quarkus-maven-plugin</artifactId>
89+
<version>${quarkus.platform.version}</version>
90+
<extensions>true</extensions>
91+
<executions>
92+
<execution>
93+
<goals>
94+
<goal>build</goal>
95+
<goal>generate-code</goal>
96+
<goal>generate-code-tests</goal>
97+
</goals>
98+
</execution>
99+
</executions>
100+
</plugin>
101+
</plugins>
102+
</build>
103+
104+
<profiles>
105+
<profile>
106+
<id>native</id>
107+
<activation>
108+
<property>
109+
<name>native</name>
110+
</property>
111+
</activation>
112+
<properties>
113+
<skipITs>false</skipITs>
114+
<quarkus.native.enabled>true</quarkus.native.enabled>
115+
</properties>
116+
</profile>
117+
<profile>
118+
<id>dist</id>
119+
<build>
120+
<plugins>
121+
<plugin>
122+
<groupId>org.apache.maven.plugins</groupId>
123+
<artifactId>maven-assembly-plugin</artifactId>
124+
<version>${maven-assembly-plugin.version}</version>
125+
<configuration>
126+
<attach>false</attach>
127+
<appendAssemblyId>false</appendAssemblyId>
128+
<outputDirectory>${distribution.directory}</outputDirectory>
129+
<workDirectory>${project.build.directory}/assembly/work</workDirectory>
130+
</configuration>
131+
<executions>
132+
<execution>
133+
<id>make-distribution</id>
134+
<phase>package</phase>
135+
<goals>
136+
<goal>single</goal>
137+
</goals>
138+
<configuration>
139+
<finalName>${project.artifactId}-${project.version}</finalName>
140+
<descriptors>
141+
<descriptor>src/main/assembly/assembly.xml</descriptor>
142+
</descriptors>
143+
</configuration>
144+
</execution>
145+
</executions>
146+
</plugin>
147+
</plugins>
148+
</build>
149+
</profile>
150+
<profile>
151+
<id>dist-native</id>
152+
<activation>
153+
<property>
154+
<name>native</name>
155+
</property>
156+
</activation>
157+
<build>
158+
<plugins>
159+
<plugin>
160+
<groupId>org.apache.maven.plugins</groupId>
161+
<artifactId>maven-assembly-plugin</artifactId>
162+
<version>${maven-assembly-plugin.version}</version>
163+
<configuration>
164+
<attach>false</attach>
165+
<appendAssemblyId>false</appendAssemblyId>
166+
<outputDirectory>${distribution.directory}</outputDirectory>
167+
<workDirectory>${project.build.directory}/assembly/work</workDirectory>
168+
</configuration>
169+
<executions>
170+
<execution>
171+
<id>make-native-distribution</id>
172+
<phase>package</phase>
173+
<goals>
174+
<goal>single</goal>
175+
</goals>
176+
<configuration>
177+
<finalName>${project.artifactId}-${project.version}-${os.detected.classifier}</finalName>
178+
<descriptors>
179+
<descriptor>src/main/assembly/assembly-native.xml</descriptor>
180+
</descriptors>
181+
</configuration>
182+
</execution>
183+
</executions>
184+
</plugin>
185+
</plugins>
186+
</build>
187+
</profile>
188+
<profile>
189+
<id>dist-windows</id>
190+
<activation>
191+
<os>
192+
<family>windows</family>
193+
</os>
194+
</activation>
195+
<properties>
196+
<executable-suffix>.exe</executable-suffix>
197+
</properties>
198+
</profile>
199+
</profiles>
200+
</project>

‎services/tools/wanaku-routing-exec-service/src/main/assembly/assembly-native.xml

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<!--
2+
~ Licensed to the Apache Software Foundation (ASF) under one or more
3+
~ contributor license agreements. See the NOTICE file distributed with
4+
~ this work for additional information regarding copyright ownership.
5+
~ The ASF licenses this file to You under the Apache License, Version 2.0
6+
~ (the "License"); you may not use this file except in compliance with
7+
~ the License. You may obtain a copy of the License at
8+
~
9+
~ http://www.apache.org/licenses/LICENSE-2.0
10+
~
11+
~ Unless required by applicable law or agreed to in writing, software
12+
~ distributed under the License is distributed on an "AS IS" BASIS,
13+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
~ See the License for the specific language governing permissions and
15+
~ limitations under the License.
16+
-->
17+
18+
<assembly
19+
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
20+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
22+
<id>dist</id>
23+
<formats>
24+
<format>tar.gz</format>
25+
<format>zip</format>
26+
<format>dir</format>
27+
</formats>
28+
<files>
29+
<file>
30+
<source>${project.build.directory}/${project.artifactId}-${project.version}-runner${executable-suffix}</source>
31+
<outputDirectory>./bin</outputDirectory>
32+
<destName>${project.artifactId}${executable-suffix}</destName>
33+
</file>
34+
<fileSet>
35+
<directory>${project.basedir}</directory>
36+
<outputDirectory>/</outputDirectory>
37+
<includes>
38+
<include>README.md</include>
39+
<include>LICENSE</include>
40+
</includes>
41+
</fileSet>
42+
</files>
43+
</assembly>

‎services/tools/wanaku-routing-exec-service/src/main/assembly/assembly.xml

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<!--
2+
~ Licensed to the Apache Software Foundation (ASF) under one or more
3+
~ contributor license agreements. See the NOTICE file distributed with
4+
~ this work for additional information regarding copyright ownership.
5+
~ The ASF licenses this file to You under the Apache License, Version 2.0
6+
~ (the "License"); you may not use this file except in compliance with
7+
~ the License. You may obtain a copy of the License at
8+
~
9+
~ http://www.apache.org/licenses/LICENSE-2.0
10+
~
11+
~ Unless required by applicable law or agreed to in writing, software
12+
~ distributed under the License is distributed on an "AS IS" BASIS,
13+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
~ See the License for the specific language governing permissions and
15+
~ limitations under the License.
16+
-->
17+
18+
<assembly
19+
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
20+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
22+
<id>bin</id>
23+
<formats>
24+
<format>tar.gz</format>
25+
<format>zip</format>
26+
</formats>
27+
<fileSets>
28+
<fileSet>
29+
<directory>${project.basedir}</directory>
30+
<outputDirectory>/</outputDirectory>
31+
<includes>
32+
<include>README.md</include>
33+
<include>LICENSE</include>
34+
</includes>
35+
</fileSet>
36+
<fileSet>
37+
<directory>${project.build.directory}/quarkus-app</directory>
38+
<outputDirectory>./</outputDirectory>
39+
<includes>
40+
<include>**/*</include>
41+
</includes>
42+
</fileSet>
43+
</fileSets>
44+
</assembly>

0 commit comments

Comments
 (0)