add zilliz cloud support and update the doc

nobodyiam · nobodyiam · commit ac153ad9fb06 · 2023-07-04T08:29:23.000+08:00
diff --git a/README.md b/README.md
@@ -20,8 +20,10 @@ A smart qa bot that can answer questions based on existing documents.
 #### Edit the `config/application.yaml`
 
 1. Config the `markdown.files.location` to the directory of the markdown files
-2. Config the `milvus.host` and `milvus.port` to the Milvus server
-3. Config other parameters as needed
+2. Config the `markdown.files.scheduleEnabled` to `true` if you want to auto update the markdown files
+3. Config the `milvus.host` and `milvus.port` to the Milvus server
+4. Config the `milvus.useZillzCloud`, `milvus.zillizCloudUri` and `milvus.zillizCloudToken` if you are using Zilliz Cloud
+5. Config other parameters as needed
 
 #### Edit the `qa-bot.conf`
 
@@ -48,19 +50,30 @@ Refer [apollo pr](https://github.com/apolloconfig/apollo/pull/4908/) for an exam
 ```html
 
 <html>
-<head>
-  <!-- add qa bot -->
-  <link rel="stylesheet" href="http://${your-server-url}:9090/qa-bot.css">
-  <script src="http://${your-server-url}:9090/qa-bot.js"></script>
-  <script>
-    QABot.initialize({
-      "serverUrl": "http://${your-server-url}:9090/qa",
-      "documentSiteUrlPrefix": "https://${your-documentation-site-prefix-url}"
-    });
-  </script>
-</head>
-<body>
-
-</body>
+    <head>
+      ...
+    </head>
+    <body>
+      ...
+    </body>
+    <!-- add qa bot -->
+    <script>
+      (function() {
+        var link = document.createElement('link');
+        link.rel = 'stylesheet';
+        link.href = 'http://${your-server-url}:9090/qa-bot.css';
+        document.head.appendChild(link);
+
+        var script = document.createElement('script');
+        script.src = 'http://${your-server-url}:9090/qa-bot.js';
+        script.onload = function () {
+          QABot.initialize({
+            "serverUrl": "http://${your-server-url}:9090/qa",
+            "documentSiteUrlPrefix": "https://${your-documentation-site-prefix-url}"
+          });
+        };
+        document.body.appendChild(script);
+      })();
+    </script>
 </html>
 ```
diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@
     <openai-gpt3-java.version>0.12.0</openai-gpt3-java.version>
     <guava.version>31.1-jre</guava.version>
     <flexmark.version>0.62.2</flexmark.version>
-    <milvus.version>2.2.5</milvus.version>
+    <milvus.version>2.2.7</milvus.version>
   </properties>
 
   <dependencyManagement>
diff --git a/src/main/java/com/apolloconfig/apollo/ai/qabot/config/MilvusConfig.java b/src/main/java/com/apolloconfig/apollo/ai/qabot/config/MilvusConfig.java
@@ -13,6 +13,12 @@ public class MilvusConfig {
   private int port;
   private String collection;
 
+  private boolean useZillzCloud;
+
+  private String zillizCloudUri;
+
+  private String zillizCloudToken;
+
   public String getHost() {
     return host;
   }
@@ -36,4 +42,28 @@ public void setPort(int port) {
   public void setCollection(String collection) {
     this.collection = collection;
   }
+
+  public boolean isUseZillzCloud() {
+    return useZillzCloud;
+  }
+
+  public void setUseZillzCloud(boolean useZillzCloud) {
+    this.useZillzCloud = useZillzCloud;
+  }
+
+  public String getZillizCloudUri() {
+    return zillizCloudUri;
+  }
+
+  public void setZillizCloudUri(String zillizCloudUri) {
+    this.zillizCloudUri = zillizCloudUri;
+  }
+
+  public String getZillizCloudToken() {
+    return zillizCloudToken;
+  }
+
+  public void setZillizCloudToken(String zillizCloudToken) {
+    this.zillizCloudToken = zillizCloudToken;
+  }
 }
diff --git a/src/main/java/com/apolloconfig/apollo/ai/qabot/milvus/MilvusClientFactory.java b/src/main/java/com/apolloconfig/apollo/ai/qabot/milvus/MilvusClientFactory.java
@@ -23,9 +23,24 @@ public static MilvusServiceClient getClient(String host, int port) {
     return clients.get(key);
   }
 
+  public static MilvusServiceClient getCloudClient(String uri, String token) {
+    if (!clients.containsKey(uri)) {
+      synchronized (INSTANCE) {
+        if (!clients.containsKey(uri)) {
+          clients.put(uri, INSTANCE.createCloudClient(uri, token));
+        }
+      }
+    }
+
+    return clients.get(uri);
+  }
+
   private MilvusServiceClient createClient(String host, int port) {
     return new MilvusServiceClient(
         ConnectParam.newBuilder().withHost(host).withPort(port).build());
   }
 
+  private MilvusServiceClient createCloudClient(String uri, String token) {
+    return new MilvusServiceClient(ConnectParam.newBuilder().withUri(uri).withToken(token).build());
+  }
 }
diff --git a/src/main/java/com/apolloconfig/apollo/ai/qabot/milvus/MilvusService.java b/src/main/java/com/apolloconfig/apollo/ai/qabot/milvus/MilvusService.java
@@ -46,8 +46,14 @@ class MilvusService implements VectorDBService {
 
   public MilvusService(MilvusConfig milvusConfig) {
     this.milvusConfig = milvusConfig;
-    this.milvusServiceClient = MilvusClientFactory.getClient(milvusConfig.getHost(),
-        milvusConfig.getPort());
+    if (milvusConfig.isUseZillzCloud()) {
+      this.milvusServiceClient = MilvusClientFactory.getCloudClient(
+          milvusConfig.getZillizCloudUri(),
+          milvusConfig.getZillizCloudToken());
+    } else {
+      this.milvusServiceClient = MilvusClientFactory.getClient(milvusConfig.getHost(),
+          milvusConfig.getPort());
+    }
     this.ensureCollections();
   }
 
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
@@ -47,6 +47,12 @@ milvus:
   host: localhost
   # the milvus database port
   port: 19530
+  # whether to use the milvus database cloud
+  useZillzCloud: false
+  # the zilliz cloud uri
+  zillizCloudUri: https://xxx.zillizcloud.com
+  # the zilliz cloud token
+  zillizCloudToken: xxxxxxxxxxxx
   # the milvus database collection name, no need to create it manually
   collection: docs
 
