paisley-rag · jjmchew · Aug 8, 2024 · Aug 7, 2024 · Aug 7, 2024 · Aug 7, 2024
diff --git a/.gitignore b/.gitignore
@@ -10,7 +10,7 @@ __pycache__/
 .Python
 build/
 develop-eggs/
-dist/
+# dist/
 downloads/
 eggs/
 .eggs/

diff --git a/pipeline/config_util.py b/pipeline/config_util.py
@@ -37,3 +37,28 @@ def ui_to_pipeline(ui_json):
 
     log.debug('config_util.py ui_to_pipeline: pipeline_obj', pipeline_obj)
     return pipeline_obj
+
+
+def pipeline_to_ui(pipeline_obj):
+    ui_obj = {
+        "id": pipeline_obj['id'],
+        "name": pipeline_obj['name'],
+        "knowledge_bases": pipeline_obj['knowledgebases'],
+        "generative_model": pipeline_obj['generative_model'],
+        "similarity": {
+            "on": pipeline_obj['postprocessing']['similarity']['on'],
+            "cutoff": pipeline_obj['postprocessing']['similarity'].get('similarity_cutoff', 0.7)
+        },
+        "colbert_rerank": {
+            "on": pipeline_obj['postprocessing']['colbertRerank']['on'],
+            "top_n": pipeline_obj['postprocessing']['colbertRerank'].get('top_n', DEFAULT_TOP_N)
+        },
+        "long_context_reorder": {
+            "on": pipeline_obj['postprocessing']['longContextReorder']['on']
+        },
+        "prompt": pipeline_obj['prompt']['template_str']
+    }
+
+    log.debug('config_util.py pipeline_to_ui: ui_obj', ui_obj)
+    return ui_obj
+
diff --git a/routers/chatbots.py b/routers/chatbots.py
@@ -29,7 +29,7 @@ async def get_chatbots():
     log.info('/api/chatbots loaded')
     results = mutil.get_all(CONFIG_DB, CONFIG_PIPELINE_COL, {}, { '_id': 0 })
     log.info('/api/chatbots results:', results)
-    return results
+    return [cutil.pipeline_to_ui(result) for result in results]
 
 @router.get('/{id}')
 async def get_chatbots_id(id: str):
@@ -38,7 +38,7 @@ async def get_chatbots_id(id: str):
     if not results:
         return {"message": "no chatbot configuration found"}
 
-    return results
+    return cutil.pipeline_to_ui(results)
 
 @router.post('/')
 async def post_chatbots(request: Request):

diff --git a/systemd/test.service b/systemd/test.service
@@ -1,14 +1,15 @@
-[Unit]
-Description=Skateboard backend
-After=network-online.target
+  [Unit]
+  Description=Skateboard backend
+  After=network-online.target
 
-[Service]
-Type=simple
-Restart=always
-User=ubuntu
-WorkingDirectory=/home/ubuntu/db/
-Environment="PYTHONPATH=/home/ubuntu/.pyenv/versions/3.10.12/bin"
-ExecStart=/home/ubuntu/.pyenv/shims/pipenv run python /home/ubuntu/db/server.py
+  [Service]
+  Type=simple
+  Restart=always
+  User=ubuntu
+  WorkingDirectory=/home/ubuntu/
+  Environment="PIPENV_PIPFILE=/home/ubuntu/db/Pipfile"
+  Environment="PYTHONPATH=/home/ubuntu/.local/share/virtualenvs/db-grdQ2Ybz/bin"
+  ExecStart=/home/ubuntu/.local/bin/pipenv run python -m db.server
 
-[Install]
-WantedBy=multi-user.target
+  [Install]
+  WantedBy=multi-user.target
diff --git a/ui/.gitignore b/ui/.gitignore
@@ -8,7 +8,7 @@ pnpm-debug.log*
 lerna-debug.log*
 
 node_modules
-dist
+# dist
 dist-ssr
 *.local
 

diff --git a/ui/dist/assets/index-BzAze5ww.css b/ui/dist/assets/index-BzAze5ww.css
diff --git a/ui/dist/assets/index-DF12BThB.js b/ui/dist/assets/index-DF12BThB.js
diff --git a/ui/dist/index.html b/ui/dist/index.html
@@ -0,0 +1,14 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Vite + React + TS</title>
+    <script type="module" crossorigin src="/assets/index-DF12BThB.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-BzAze5ww.css">
+  </head>
+  <body>
+    <div id="root"></div>
+  </body>
+</html>
diff --git a/ui/dist/vite.svg b/ui/dist/vite.svg
diff --git a/ui/src/services/evaluations-service.ts b/ui/src/services/evaluations-service.ts
@@ -7,8 +7,9 @@ async function fetchChatbotHistory() {
   const response = await axios.get(`${baseUrl}/api/history`);
   console.log('RESPONSE IS:', response)
   console.log('RESPONSE.DATA IS:', response.data)
-
-  return response.data;
+  console.log('RESPONSE.DATA[TABLE_DATA] IS:', response.data['table_data'])
+
+  return response.data['table_data'];
 }
 
 export const evaluationsService = {

diff --git a/ui/src/services/knowledge-base-service.ts b/ui/src/services/knowledge-base-service.ts
@@ -125,7 +125,7 @@ async function fetchKnowledgeBases() {
 }
 
 async function fetchKnowledgeBaseById(id: string) {
-  const response = await axios.get(`${baseUrl}/api/knowledge-base/${id}`);
+  const response = await axios.get(`${baseUrl}/api/knowledge-bases/${id}`);
   console.log(response.data);
   return response.data;
 }