Skip to content

Commit e386155

Browse files
alexcheng1982alexcheng1982
committed
refactor code structure
1 parent d4c4b0c commit e386155

File tree

14 files changed

+173
-76
lines changed

14 files changed

+173
-76
lines changed

‎deployment/ollama/pom.xml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
<parent>
7+
<groupId>com.javaaidev.pdfqa</groupId>
8+
<artifactId>deployment</artifactId>
9+
<version>1.0.0-SNAPSHOT</version>
10+
</parent>
11+
12+
<artifactId>deployment-ollama</artifactId>
13+
14+
<dependencies>
15+
<dependency>
16+
<groupId>org.springframework.ai</groupId>
17+
<artifactId>spring-ai-starter-model-ollama</artifactId>
18+
</dependency>
19+
<dependency>
20+
<groupId>com.javaaidev.pdfqa</groupId>
21+
<artifactId>shared</artifactId>
22+
<version>${project.version}</version>
23+
</dependency>
24+
</dependencies>
25+
26+
</project>

‎deployment/ollama/src/main/java/com/javaaidev/pdfqa/PdfQaOllamaApplication.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package com.javaaidev.pdfqa;
2+
3+
import org.springframework.boot.SpringApplication;
4+
import org.springframework.boot.autoconfigure.SpringBootApplication;
5+
6+
@SpringBootApplication
7+
public class PdfQaOllamaApplication {
8+
9+
public static void main(String[] args) {
10+
SpringApplication.run(PdfQaOllamaApplication.class, args);
11+
}
12+
}

‎deployment/ollama/src/main/resources/application.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
spring:
2+
config:
3+
import:
4+
- optional:classpath:config/shared.yaml
5+
ai:
6+
ollama:
7+
chat:
8+
options:
9+
model: "phi3"
10+
temperature: 0
11+
embedding:
12+
options:
13+
model: "bge-large"

‎deployment/openai/pom.xml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
<parent>
7+
<groupId>com.javaaidev.pdfqa</groupId>
8+
<artifactId>deployment</artifactId>
9+
<version>1.0.0-SNAPSHOT</version>
10+
</parent>
11+
12+
<artifactId>deployment-openai</artifactId>
13+
14+
<dependencies>
15+
<dependency>
16+
<groupId>org.springframework.ai</groupId>
17+
<artifactId>spring-ai-starter-model-openai</artifactId>
18+
</dependency>
19+
<dependency>
20+
<groupId>com.javaaidev.pdfqa</groupId>
21+
<artifactId>shared</artifactId>
22+
<version>${project.version}</version>
23+
</dependency>
24+
</dependencies>
25+
26+
</project>

‎deployment/openai/src/main/java/com/javaaidev/pdfqa/PdfQaOpenAiApplication.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package com.javaaidev.pdfqa;
2+
3+
import org.springframework.boot.SpringApplication;
4+
import org.springframework.boot.autoconfigure.SpringBootApplication;
5+
6+
@SpringBootApplication
7+
public class PdfQaOpenAiApplication {
8+
9+
public static void main(String[] args) {
10+
SpringApplication.run(PdfQaOpenAiApplication.class, args);
11+
}
12+
}

‎src/main/resources/application-openai.yaml renamed to ‎deployment/openai/src/main/resources/application.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
spring:
2+
config:
3+
import:
4+
- optional:classpath:config/shared.yaml
25
ai:
3-
ollama:
4-
chat:
5-
enabled: false
6-
embedding:
7-
enabled: false
86
openai:
97
api-key: ${OPENAI_API_KEY:demo}
108
chat:

‎deployment/pom.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
<parent>
7+
<groupId>com.javaaidev.pdfqa</groupId>
8+
<artifactId>pdf-qa</artifactId>
9+
<version>1.0.0-SNAPSHOT</version>
10+
</parent>
11+
12+
<artifactId>deployment</artifactId>
13+
<packaging>pom</packaging>
14+
<modules>
15+
<module>ollama</module>
16+
<module>openai</module>
17+
</modules>
18+
19+
</project>

‎pom.xml

Lines changed: 8 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,25 @@
77
<parent>
88
<groupId>org.springframework.boot</groupId>
99
<artifactId>spring-boot-starter-parent</artifactId>
10-
<version>3.4.4</version>
10+
<version>3.4.5</version>
1111
<relativePath/>
1212
</parent>
1313

14-
<groupId>com.javaaidev</groupId>
14+
<groupId>com.javaaidev.pdfqa</groupId>
1515
<artifactId>pdf-qa</artifactId>
1616
<version>1.0.0-SNAPSHOT</version>
17+
<packaging>pom</packaging>
18+
<modules>
19+
<module>shared</module>
20+
<module>deployment</module>
21+
</modules>
1722

1823
<properties>
1924
<java.version>21</java.version>
2025
<maven.compiler.source>${java.version}</maven.compiler.source>
2126
<maven.compiler.target>${java.version}</maven.compiler.target>
2227
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
23-
<spring-ai.version>1.0.0-M6</spring-ai.version>
24-
<chat-agent-ui.version>0.11.0</chat-agent-ui.version>
25-
<llm-agent-spec.version>0.1.2</llm-agent-spec.version>
28+
<spring-ai.version>1.0.0-M8</spring-ai.version>
2629
</properties>
2730

2831
<dependencyManagement>
@@ -36,54 +39,4 @@
3639
</dependency>
3740
</dependencies>
3841
</dependencyManagement>
39-
40-
<dependencies>
41-
<dependency>
42-
<groupId>org.springframework.ai</groupId>
43-
<artifactId>spring-ai-pgvector-store-spring-boot-starter</artifactId>
44-
</dependency>
45-
<dependency>
46-
<groupId>org.springframework.ai</groupId>
47-
<artifactId>spring-ai-ollama-spring-boot-starter</artifactId>
48-
</dependency>
49-
<dependency>
50-
<groupId>org.springframework.ai</groupId>
51-
<artifactId>spring-ai-openai-spring-boot-starter</artifactId>
52-
</dependency>
53-
<dependency>
54-
<groupId>org.springframework.ai</groupId>
55-
<artifactId>spring-ai-pdf-document-reader</artifactId>
56-
</dependency>
57-
<dependency>
58-
<groupId>org.springframework.boot</groupId>
59-
<artifactId>spring-boot-starter-web</artifactId>
60-
</dependency>
61-
<dependency>
62-
<groupId>org.springdoc</groupId>
63-
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
64-
<version>2.5.0</version>
65-
</dependency>
66-
<dependency>
67-
<groupId>com.javaaidev.chatagentui</groupId>
68-
<artifactId>chat-agent-ui</artifactId>
69-
<version>${chat-agent-ui.version}</version>
70-
</dependency>
71-
<dependency>
72-
<groupId>com.javaaidev.llmagentspec</groupId>
73-
<artifactId>spring-ai-adapter</artifactId>
74-
<version>${llm-agent-spec.version}</version>
75-
</dependency>
76-
</dependencies>
77-
78-
<repositories>
79-
<repository>
80-
<id>spring-milestones</id>
81-
<name>Spring Milestones</name>
82-
<url>https://repo.spring.io/milestone</url>
83-
<snapshots>
84-
<enabled>false</enabled>
85-
</snapshots>
86-
</repository>
87-
</repositories>
88-
8942
</project>

‎shared/pom.xml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
<parent>
7+
<groupId>com.javaaidev.pdfqa</groupId>
8+
<artifactId>pdf-qa</artifactId>
9+
<version>1.0.0-SNAPSHOT</version>
10+
</parent>
11+
12+
<artifactId>shared</artifactId>
13+
<name>Shared</name>
14+
15+
<properties>
16+
<java.version>21</java.version>
17+
<maven.compiler.source>${java.version}</maven.compiler.source>
18+
<maven.compiler.target>${java.version}</maven.compiler.target>
19+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
20+
<chat-agent-ui.version>0.11.0</chat-agent-ui.version>
21+
<llm-agent-spec.version>0.1.2</llm-agent-spec.version>
22+
</properties>
23+
24+
<dependencies>
25+
<dependency>
26+
<groupId>org.springframework.ai</groupId>
27+
<artifactId>spring-ai-starter-vector-store-pgvector</artifactId>
28+
</dependency>
29+
<dependency>
30+
<groupId>org.springframework.ai</groupId>
31+
<artifactId>spring-ai-pdf-document-reader</artifactId>
32+
</dependency>
33+
<dependency>
34+
<groupId>org.springframework.boot</groupId>
35+
<artifactId>spring-boot-starter-web</artifactId>
36+
</dependency>
37+
<dependency>
38+
<groupId>org.springdoc</groupId>
39+
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
40+
<version>2.5.0</version>
41+
</dependency>
42+
<dependency>
43+
<groupId>com.javaaidev.chatagentui</groupId>
44+
<artifactId>chat-agent-ui</artifactId>
45+
<version>${chat-agent-ui.version}</version>
46+
</dependency>
47+
<dependency>
48+
<groupId>com.javaaidev.llmagentspec</groupId>
49+
<artifactId>spring-ai-adapter</artifactId>
50+
<version>${llm-agent-spec.version}</version>
51+
</dependency>
52+
</dependencies>
53+
54+
</project>

‎src/main/java/com/javaaidev/pdfqa/AppConfiguration.java renamed to ‎shared/src/main/java/com/javaaidev/pdfqa/AppConfiguration.java

File renamed without changes.

‎src/main/java/com/javaaidev/pdfqa/PDFContentLoader.java renamed to ‎shared/src/main/java/com/javaaidev/pdfqa/PDFContentLoader.java

File renamed without changes.

‎src/main/java/com/javaaidev/pdfqa/PdfQaApplication.java renamed to ‎shared/src/main/java/com/javaaidev/pdfqa/PdfQaApplication.java

File renamed without changes.

‎src/main/java/com/javaaidev/pdfqa/QaController.java renamed to ‎shared/src/main/java/com/javaaidev/pdfqa/QaController.java

File renamed without changes.

‎src/main/resources/application.yaml renamed to ‎shared/src/main/resources/config/shared.yaml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,6 @@ spring:
44
threads:
55
virtual:
66
enabled: true
7-
ai:
8-
ollama:
9-
chat:
10-
enabled: true
11-
options:
12-
model: "phi3"
13-
temperature: 0
14-
embedding:
15-
enabled: true
16-
options:
17-
model: "bge-large"
18-
openai:
19-
chat:
20-
enabled: false
21-
embedding:
22-
enabled: false
237
vectorstore:
248
pgvector:
259
initializeSchema: true

0 commit comments

Comments
 (0)