Merge pull request #155 from DeepInsight-AI/new_pre

Modify api server
DeepInsight-AI · Oct 8, 2024 · 4a20c7e · 4a20c7e
2 parents f1e2696 + e10d692
commit 4a20c7e
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 11 deletions.
diff --git a/ai/backend/base_config.py b/ai/backend/base_config.py
@@ -6,7 +6,7 @@ def __init__(self):
         self.load_conf()
 
     def load_conf(self):
-        self.ApiHost = "https://apiserver.deep-thought.io/proxy"
+        self.ApiHost = "https://apiserver.deepbi.com/proxy"
 
         # self.database_model = 'test'
         self.database_model = 'online'

diff --git a/bi/templates/emails/invite.html b/bi/templates/emails/invite.html
@@ -2,18 +2,33 @@
 
 {% block content %}
 
-<p class="intercom-align-left" style="line-height: 1.5; margin: 0 0 17px; text-align: left !important" align="left">Hi {{ invited.name }},</p>
-<h2 class="intercom-align-left" style="color: #282F33; font-size: 18px; font-weight: bold; margin-bottom: 7px; margin-top: 30px; text-align: left !important" align="left">
-    {{ inviter.name }} (<a href="mailto:{{ inviter.email }}" target="_blank" style="border: none; color: #1251BA; outline: none !important">{{ inviter.email }}</a>)
+<p class="intercom-align-left" style="line-height: 1.5; margin: 0 0 17px; text-align: left !important" align="left">Hi
+    {{ invited.name }},</p>
+<h2 class="intercom-align-left"
+    style="color: #282F33; font-size: 18px; font-weight: bold; margin-bottom: 7px; margin-top: 30px; text-align: left !important"
+    align="left">
+    {{ inviter.name }} (<a href="mailto:{{ inviter.email }}" target="_blank"
+        style="border: none; color: #1251BA; outline: none !important">{{ inviter.email }}</a>)
     诚邀加入{{ org.name }}.
 </h2>
-<table class="intercom-container intercom-align-center" align="center" style="border-collapse: collapse; border-spacing: 0; margin: 17px auto; table-layout: fixed; text-align: center !important"><tr><td style="background: #0071b2; border: 1px none #dadada; border-radius: 3px; font-family: Helvetica, Arial, sans-serif; font-size: 16px; margin: 0; padding: 12px 35px; text-align: left; vertical-align: top" align="left" bgcolor="#0071b2" valign="top"><a class="intercom-h2b-button" target="_blank" href="{{ invite_url }}" style="background: #0071b2; border: none; border-radius: 3px; color: white; display: inline-block; font-size: 14px; font-weight: bold; outline: none !important; text-decoration: none">Setup Account</a></td></tr></table>
+<table class="intercom-container intercom-align-center" align="center"
+    style="border-collapse: collapse; border-spacing: 0; margin: 17px auto; table-layout: fixed; text-align: center !important">
+    <tr>
+        <td style="background: #0071b2; border: 1px none #dadada; border-radius: 3px; font-family: Helvetica, Arial, sans-serif; font-size: 16px; margin: 0; padding: 12px 35px; text-align: left; vertical-align: top"
+            align="left" bgcolor="#0071b2" valign="top"><a class="intercom-h2b-button" target="_blank"
+                href="{{ invite_url }}"
+                style="background: #0071b2; border: none; border-radius: 3px; color: white; display: inline-block; font-size: 14px; font-weight: bold; outline: none !important; text-decoration: none">Setup
+                Account</a></td>
+    </tr>
+</table>
 <p class="intercom-align-left" style="line-height: 1.5; margin: 0 0 17px; text-align: left !important" align="left">
     <small>可以拷贝/粘贴链接地址到浏览器： {{ invite_url }}</small>
 </p>
 <p class="intercom-align-left" style="line-height: 1.5; margin: 0 0 17px; text-align: left !important" align="left">
     电子邮箱： {{ invited.email }}<br>
-    账户信息： <a href="{{ url_for('bi.index', org_slug=org.slug, _external=True) }}" target="_blank" style="border: none; color: #1251BA; outline: none !important">{{ url_for('redash.index', org_slug=org.slug, _external=True) }}</a>
+    账户信息： <a href="{{ url_for('bi.index', org_slug=org.slug, _external=True) }}" target="_blank"
+        style="border: none; color: #1251BA; outline: none !important">{{ url_for('bi.index', org_slug=org.slug,
+        _external=True) }}</a>
 </p>
 
-{% endblock %}
+{% endblock %}
diff --git a/client/app/llm.json b/client/app/llm.json
@@ -6,8 +6,7 @@
         "HttpProxyPort": "",
         "ApiHost": "",
         "required": [
-            "OpenaiApiKey",
-            "HttpProxyHost"
+            "OpenaiApiKey"
         ]
     },
     "DeepInsight": {

diff --git a/client/dist_source/llm.json b/client/dist_source/llm.json
@@ -6,8 +6,7 @@
         "HttpProxyPort": "",
         "ApiHost": "",
         "required": [
-            "OpenaiApiKey",
-            "HttpProxyHost"
+            "OpenaiApiKey"
         ]
     },
     "DeepInsight": {