From 897e399c01a9d8ef51c0b09cef745b67043f6d0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <2270033969@qq.com>
Date: Wed, 12 Feb 2025 23:52:32 +0800
Subject: [PATCH] feat(rag): 1.4.0
---
deepseek-spring-boot-starter/pom.xml | 4 +--
deepseek4j-core/pom.xml | 2 +-
deepseek4j-example/pom.xml | 2 +-
.../example/embed/EmbedController.java | 28 -------------------
.../example/ollama/OllamaLocalController.java | 11 ++++++++
.../main/resources/application-ollama.yaml | 1 +
.../DeepseekExampleApplicationTests.java | 13 ---------
pom.xml | 2 +-
8 files changed, 17 insertions(+), 46 deletions(-)
delete mode 100644 deepseek4j-example/src/main/java/io/github/pigmesh/ai/deepseek/example/embed/EmbedController.java
delete mode 100644 deepseek4j-example/src/test/java/io/github/pigmesh/ai/deepseek/example/DeepseekExampleApplicationTests.java
diff --git a/deepseek-spring-boot-starter/pom.xml b/deepseek-spring-boot-starter/pom.xml
index a1041b5..88afc61 100644
--- a/deepseek-spring-boot-starter/pom.xml
+++ b/deepseek-spring-boot-starter/pom.xml
@@ -4,7 +4,7 @@
io.github.pig-mesh.ai
deepseek4j
- 1.4.0-SNAPSHOT
+ 1.4.0
deepseek-spring-boot-starter
@@ -30,7 +30,7 @@
io.github.pig-mesh.ai
deepseek4j-core
- 1.4.0-SNAPSHOT
+ 1.4.0
org.projectlombok
diff --git a/deepseek4j-core/pom.xml b/deepseek4j-core/pom.xml
index 1a964c5..d5e7921 100644
--- a/deepseek4j-core/pom.xml
+++ b/deepseek4j-core/pom.xml
@@ -5,7 +5,7 @@
io.github.pig-mesh.ai
deepseek4j
- 1.4.0-SNAPSHOT
+ 1.4.0
deepseek4j-core
diff --git a/deepseek4j-example/pom.xml b/deepseek4j-example/pom.xml
index 1a20aae..ed255d6 100644
--- a/deepseek4j-example/pom.xml
+++ b/deepseek4j-example/pom.xml
@@ -43,7 +43,7 @@
io.github.pig-mesh.ai
deepseek-spring-boot-starter
- 1.4.0-SNAPSHOT
+ 1.4.0
diff --git a/deepseek4j-example/src/main/java/io/github/pigmesh/ai/deepseek/example/embed/EmbedController.java b/deepseek4j-example/src/main/java/io/github/pigmesh/ai/deepseek/example/embed/EmbedController.java
deleted file mode 100644
index 68af722..0000000
--- a/deepseek4j-example/src/main/java/io/github/pigmesh/ai/deepseek/example/embed/EmbedController.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package io.github.pigmesh.ai.deepseek.example.embed;
-
-import io.github.pigmesh.ai.deepseek.core.EmbeddingClient;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-import java.util.Optional;
-
-/**
- * @author lengleng
- * @date 2025/2/11
- */
-@RestController
-@RequestMapping("/embed")
-@RequiredArgsConstructor
-public class EmbedController {
-
- private final Optional embeddingClientOptional;
-
- @GetMapping("/get")
- public List getEmbed() {
- return embeddingClientOptional.get().embed("Hello, world!");
- }
-
-}
diff --git a/deepseek4j-example/src/main/java/io/github/pigmesh/ai/deepseek/example/ollama/OllamaLocalController.java b/deepseek4j-example/src/main/java/io/github/pigmesh/ai/deepseek/example/ollama/OllamaLocalController.java
index 66a69ff..9f6203a 100644
--- a/deepseek4j-example/src/main/java/io/github/pigmesh/ai/deepseek/example/ollama/OllamaLocalController.java
+++ b/deepseek4j-example/src/main/java/io/github/pigmesh/ai/deepseek/example/ollama/OllamaLocalController.java
@@ -38,6 +38,17 @@ public Flux chat(String prompt) {
return deepSeekClient.chatFluxCompletion(prompt);
}
+ // 同步
+ @GetMapping(value = "/sync/chat")
+ public ChatCompletionResponse syncChat(String prompt) {
+ ChatCompletionRequest request = ChatCompletionRequest.builder()
+ // 根据渠道模型名称动态修改这个参数
+ .model(deepSeekProperties.getModel())
+ .addUserMessage(prompt).build();
+
+ return deepSeekClient.chatCompletion(request).execute();
+ }
+
@GetMapping(value = "/models", produces = MediaType.APPLICATION_JSON_VALUE)
public ModelsResponse models() {
return deepSeekClient.models();
diff --git a/deepseek4j-example/src/main/resources/application-ollama.yaml b/deepseek4j-example/src/main/resources/application-ollama.yaml
index 272bff0..d97f0b5 100644
--- a/deepseek4j-example/src/main/resources/application-ollama.yaml
+++ b/deepseek4j-example/src/main/resources/application-ollama.yaml
@@ -6,6 +6,7 @@ deepseek:
model: deepseek-r1:14b
api-key: ollama-local
log-level: info
+
embedding:
api-key: ollama-local
base-url: http://127.0.0.1:11434/v1
diff --git a/deepseek4j-example/src/test/java/io/github/pigmesh/ai/deepseek/example/DeepseekExampleApplicationTests.java b/deepseek4j-example/src/test/java/io/github/pigmesh/ai/deepseek/example/DeepseekExampleApplicationTests.java
deleted file mode 100644
index 5453791..0000000
--- a/deepseek4j-example/src/test/java/io/github/pigmesh/ai/deepseek/example/DeepseekExampleApplicationTests.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.github.pigmesh.ai.deepseek.example;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class DeepseekExampleApplicationTests {
-
- @Test
- void contextLoads() {
- }
-
-}
diff --git a/pom.xml b/pom.xml
index 4c999a7..77dca40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
io.github.pig-mesh.ai
deepseek4j
- 1.4.0-SNAPSHOT
+ 1.4.0
pom
deepseek4j