Skip to content

Commit

Permalink
update with Kotlin changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexcheng1982
alexcheng1982 committed Oct 1, 2024
1 parent eccb17f commit 5ede01c
Show file tree
Hide file tree
Showing 8 changed files with 93 additions and 83 deletions.
150 changes: 79 additions & 71 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>io.github.llmagentbuilder</groupId>
<artifactId>toolkit-file</artifactId>
<version>0.1.0</version>
<version>0.1.1</version>
<packaging>pom</packaging>
<name>LLM Agent Builder :: Toolkit :: File</name>
<description>LLM Agent Builder :: Toolkit :: File</description>
Expand Down Expand Up @@ -74,7 +74,6 @@
<configuration>
<sourceDirs>
<sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
<sourceDir>${project.basedir}/src/main/java</sourceDir>
</sourceDirs>
</configuration>
</execution>
Expand All @@ -86,7 +85,6 @@
<configuration>
<sourceDirs>
<sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
<sourceDir>${project.basedir}/src/test/java</sourceDir>
</sourceDirs>
</configuration>
</execution>
Expand Down Expand Up @@ -129,74 +127,6 @@
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.22.2</version>
</plugin>
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>0.4.0</version>
<extensions>true</extensions>
<configuration>
<publishingServerId>ossrh</publishingServerId>
<tokenAuth>true</tokenAuth>
<autoPublish>true</autoPublish>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.6.3</version>
<executions>
<execution>
<id>attach-javadocs</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<failOnError>false</failOnError>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jetbrains.dokka</groupId>
<artifactId>dokka-maven-plugin</artifactId>
<version>1.9.20</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>javadocJar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down Expand Up @@ -247,4 +177,82 @@
</dependency>
</dependencies>

<profiles>
<profile>
<id>publish</id>
<build>
<plugins>
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>0.4.0</version>
<extensions>true</extensions>
<configuration>
<publishingServerId>ossrh</publishingServerId>
<tokenAuth>true</tokenAuth>
<autoPublish>true</autoPublish>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.6.3</version>
<executions>
<execution>
<id>attach-javadocs</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<failOnError>false</failOnError>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jetbrains.dokka</groupId>
<artifactId>dokka-maven-plugin</artifactId>
<version>1.9.20</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>javadocJar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
2 changes: 1 addition & 1 deletion read-local-file/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.github.llmagentbuilder</groupId>
<artifactId>toolkit-file</artifactId>
<version>0.1.0</version>
<version>0.1.1</version>
</parent>

<artifactId>tool-read-local-file</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions ...-file/src/main/kotlin/io/github/llmagentbuilder/tool/readlocalfile/ReadLocalFileConfig.kt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package io.github.llmagentbuilder.tool.readlocalfile

data class ReadLocalFileConfig(
val basePath: String,
val charset: String?
val basePath: String? = null,
val charset: String? = null,
)

data class ReadLocalFileRequest(val filePath: String)
Expand Down
2 changes: 2 additions & 0 deletions write-local-file/hello.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<!DOCTYPE html>
<!--STATUS OK--><html> <head><meta http-equiv=content-type content=text/html;charset=utf-8><meta http-equiv=X-UA-Compatible content=IE=Edge><meta content=always name=referrer><link rel=stylesheet type=text/css href=http://s1.bdstatic.com/r/www/cache/bdorz/baidu.min.css><title>百度一下，你就知道</title></head> <body link=#0000cc> <div id=wrapper> <div id=head> <div class=head_wrapper> <div class=s_form> <div class=s_form_wrapper> <div id=lg> <img hidefocus=true src=//www.baidu.com/img/bd_logo1.png width=270 height=129> </div> <form id=form name=f action=//www.baidu.com/s class=fm> <input type=hidden name=bdorz_come value=1> <input type=hidden name=ie value=utf-8> <input type=hidden name=f value=8> <input type=hidden name=rsv_bp value=1> <input type=hidden name=rsv_idx value=1> <input type=hidden name=tn value=baidu><span class="bg s_ipt_wr"><input id=kw name=wd class=s_ipt value maxlength=255 autocomplete=off autofocus></span><span class="bg s_btn_wr"><input type=submit id=su value=百度一下 class="bg s_btn"></span> </form> </div> </div> <div id=u1> <a href=http://news.baidu.com name=tj_trnews class=mnav>新闻</a> <a href=http://www.hao123.com name=tj_trhao123 class=mnav>hao123</a> <a href=http://map.baidu.com name=tj_trmap class=mnav>地图</a> <a href=http://v.baidu.com name=tj_trvideo class=mnav>视频</a> <a href=http://tieba.baidu.com name=tj_trtieba class=mnav>贴吧</a> <noscript> <a href=http://www.baidu.com/bdorz/login.gif?login&amp;tpl=mn&amp;u=http%3A%2F%2Fwww.baidu.com%2f%3fbdorz_come%3d1 name=tj_login class=lb>登录</a> </noscript> <script>document.write('<a href="http://www.baidu.com/bdorz/login.gif?login&tpl=mn&u='+ encodeURIComponent(window.location.href+ (window.location.search === "" ? "?" : "&")+ "bdorz_come=1")+ '" name="tj_login" class="lb">登录</a>');</script> <a href=//www.baidu.com/more/ name=tj_briicon class=bri style="display: block;">更多产品</a> </div> </div> </div> <div id=ftCon> <div id=ftConw> <p id=lh> <a href=http://home.baidu.com>关于百度</a> <a href=http://ir.baidu.com>About Baidu</a> </p> <p id=cp>&copy;2017&nbsp;Baidu&nbsp;<a href=http://www.baidu.com/duty/>使用百度前必读</a>&nbsp; <a href=http://jianyi.baidu.com/ class=cp-feedback>意见反馈</a>&nbsp;京ICP证030173号&nbsp; <img src=//www.baidu.com/img/gs.gif> </p> </div> </div> </div> </body> </html>
2 changes: 1 addition & 1 deletion write-local-file/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>io.github.llmagentbuilder</groupId>
<artifactId>toolkit-file</artifactId>
<version>0.1.0</version>
<version>0.1.1</version>
</parent>

<artifactId>tool-write-local-file</artifactId>
Expand Down
8 changes: 4 additions & 4 deletions ...ile/src/main/kotlin/io/github/llmagentbuilder/tool/writelocalfile/WriteLocalFileConfig.kt
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package io.github.llmagentbuilder.tool.writelocalfile

data class WriteLocalFileConfig(val basePath: String)
data class WriteLocalFileConfig(val basePath: String? = null)

data class WriteLocalFileRequest(
val filename: String,
val url: String,
val content: String,
val append: Boolean,
val url: String?,
val content: String?,
val append: Boolean?,
)

data class WriteLocalFileResponse(
Expand Down
2 changes: 1 addition & 1 deletion ...-file/src/main/kotlin/io/github/llmagentbuilder/tool/writelocalfile/WriteLocalFileTool.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class WriteLocalFileTool(private val config: WriteLocalFileConfig) :
Files.writeString(
savePath, request.content, StandardCharsets.UTF_8,
StandardOpenOption.CREATE,
if (request.append) StandardOpenOption.APPEND else StandardOpenOption.TRUNCATE_EXISTING
if (request.append == true) StandardOpenOption.APPEND else StandardOpenOption.TRUNCATE_EXISTING
)
} else if (StringUtils.isNotEmpty(request.url)) {
FileUtils.copyURLToFile(
Expand Down
6 changes: 3 additions & 3 deletions ...e/src/test/kotlin/io/github/llmagentbuilder/tool/writelocalfile/WriteLocalFileToolTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ class WriteLocalFileToolTest {
val content = "world"
val request = WriteLocalFileRequest("hello.txt", null, content, false)
val response = tool.apply(request)
assertNotNull(response.path())
assertEquals(content, Files.readString(Path.of(response.path())))
assertNotNull(response.path)
assertEquals(content, Files.readString(Path.of(response.path)))
}

@Test
Expand All @@ -27,6 +27,6 @@ class WriteLocalFileToolTest {
false
)
val response = tool.apply(request)
assertNotNull(response.path())
assertNotNull(response.path)
}
}

0 comments on commit 5ede01c

Please sign in to comment.