Refactoring

arakoodev · Sep 11, 2023 · 412ab98 · 412ab98
1 parent b3c0f69
commit 412ab98
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 18 deletions.
diff --git a/FlySpring/edgechain-app/src/main/java/com/edgechain/lib/endpoint/impl/BgeSmallEndpoint.java b/FlySpring/edgechain-app/src/main/java/com/edgechain/lib/endpoint/impl/BgeSmallEndpoint.java
@@ -81,16 +81,13 @@ public BgeSmallEndpoint(RetryPolicy retryPolicy, String modelUrl, String tokeniz
 
   @Override
   public Observable<WordEmbeddings> embeddings(String input, ArkRequest arkRequest) {
-
-    final String str = input.replaceAll("'", "");
-
-    setRawText(str);
+    setRawText(input);
 
     if (Objects.nonNull(arkRequest)) this.callIdentifier = arkRequest.getRequestURI();
     else this.callIdentifier = "URI wasn't provided";
 
     return Observable.fromSingle(
-        bgeSmallService.embeddings(this).map(m -> new WordEmbeddings(str, m.getEmbedding())));
+        bgeSmallService.embeddings(this).map(m -> new WordEmbeddings(input, m.getEmbedding())));
   }
 
   private void downloadFile(String urlStr, String path) {

diff --git a/FlySpring/edgechain-app/src/main/java/com/edgechain/lib/endpoint/impl/MiniLMEndpoint.java b/FlySpring/edgechain-app/src/main/java/com/edgechain/lib/endpoint/impl/MiniLMEndpoint.java
@@ -46,10 +46,7 @@ public MiniLMEndpoint(RetryPolicy retryPolicy, MiniLMModel miniLMModel) {
 
   @Override
   public Observable<WordEmbeddings> embeddings(String input, ArkRequest arkRequest) {
-
-    final String str = input.replaceAll("'", "");
-
-    setRawText(str);
+    setRawText(input);
 
     if (Objects.nonNull(arkRequest)) this.callIdentifier = arkRequest.getRequestURI();
     else this.callIdentifier = "URI wasn't provided";
@@ -59,6 +56,6 @@ public Observable<WordEmbeddings> embeddings(String input, ArkRequest arkRequest
     }
 
     return Observable.fromSingle(
-        miniLMService.embeddings(this).map(m -> new WordEmbeddings(str, m.getEmbedding())));
+        miniLMService.embeddings(this).map(m -> new WordEmbeddings(input, m.getEmbedding())));
   }
 }
diff --git a/FlySpring/edgechain-app/src/main/java/com/edgechain/lib/endpoint/impl/OpenAiEndpoint.java b/FlySpring/edgechain-app/src/main/java/com/edgechain/lib/endpoint/impl/OpenAiEndpoint.java
@@ -300,11 +300,7 @@ public Observable<ChatCompletionResponse> chatCompletion(
 
   @Override
   public Observable<WordEmbeddings> embeddings(String input, ArkRequest arkRequest) {
-    //    ?this.input = input; // set Input
-
-    final String str = input.replaceAll("'", "");
-
-    setRawText(str);
+    setRawText(input);
 
     if (Objects.nonNull(arkRequest)) this.callIdentifier = arkRequest.getRequestURI();
     else this.callIdentifier = "URI wasn't provided";
@@ -314,7 +310,7 @@ public Observable<WordEmbeddings> embeddings(String input, ArkRequest arkRequest
             .embeddings(this)
             .map(
                 embeddingResponse ->
-                    new WordEmbeddings(str, embeddingResponse.getData().get(0).getEmbedding())));
+                    new WordEmbeddings(input, embeddingResponse.getData().get(0).getEmbedding())));
   }
 
   private Observable<ChatCompletionResponse> chatCompletion(ArkRequest arkRequest) {

diff --git a/...hain-app/src/main/java/com/edgechain/lib/index/repositories/PostgresClientRepository.java b/...hain-app/src/main/java/com/edgechain/lib/index/repositories/PostgresClientRepository.java
@@ -103,7 +103,7 @@ public List<String> batchUpsertEmbeddings(
       if (wordEmbeddings != null && wordEmbeddings.getValues() != null) {
 
         float[] floatArray = FloatUtils.toFloatArray(wordEmbeddings.getValues());
-        String rawText = wordEmbeddings.getId();
+        String rawText = wordEmbeddings.getId().replace("'","");
 
         UUID id =
             jdbcTemplate.queryForObject(
@@ -140,7 +140,7 @@ public String upsertEmbeddings(
       PostgresLanguage language) {
 
     float[] floatArray = FloatUtils.toFloatArray(wordEmbeddings.getValues());
-    String rawText = wordEmbeddings.getId();
+    String rawText = wordEmbeddings.getId().replace("'","");
 
     UUID uuid =
         jdbcTemplate.queryForObject(