summaryrefslogtreecommitdiff
path: root/continuedev/src/continuedev/server
diff options
context:
space:
mode:
authorNate Sesti <sestinj@gmail.com>2023-07-25 23:09:21 -0700
committerNate Sesti <sestinj@gmail.com>2023-07-25 23:09:21 -0700
commitd2afe5ff258eb2443e0f2178da523150fdb5eb0d (patch)
tree181be2609e924d084a8ad9781283cb725377b87f /continuedev/src/continuedev/server
parent861a873f7ecf455b9c7833040b2a8163e369e062 (diff)
downloadsncontinue-d2afe5ff258eb2443e0f2178da523150fdb5eb0d.tar.gz
sncontinue-d2afe5ff258eb2443e0f2178da523150fdb5eb0d.tar.bz2
sncontinue-d2afe5ff258eb2443e0f2178da523150fdb5eb0d.zip
meilisearch async client
Diffstat (limited to 'continuedev/src/continuedev/server')
-rw-r--r--continuedev/src/continuedev/server/main.py14
-rw-r--r--continuedev/src/continuedev/server/meilisearch_server.py12
2 files changed, 13 insertions, 13 deletions
diff --git a/continuedev/src/continuedev/server/main.py b/continuedev/src/continuedev/server/main.py
index 7ee64041..0398c3b0 100644
--- a/continuedev/src/continuedev/server/main.py
+++ b/continuedev/src/continuedev/server/main.py
@@ -1,7 +1,6 @@
import asyncio
-import subprocess
import time
-import meilisearch
+from meilisearch_python_async import Client
import psutil
import os
from fastapi import FastAPI
@@ -87,13 +86,14 @@ if __name__ == "__main__":
# cpu_thread = threading.Thread(target=cpu_usage_loop)
# cpu_thread.start()
- try:
- start_meilisearch()
- except Exception as e:
- print("Failed to start MeiliSearch")
- print(e)
+ # try:
+ # await start_meilisearch()
+ # except Exception as e:
+ # print("Failed to start MeiliSearch")
+ # print(e)
run_server()
except Exception as e:
+ print("Error starting Continue server: ", e)
cleanup()
raise e
diff --git a/continuedev/src/continuedev/server/meilisearch_server.py b/continuedev/src/continuedev/server/meilisearch_server.py
index 232b6243..286019e1 100644
--- a/continuedev/src/continuedev/server/meilisearch_server.py
+++ b/continuedev/src/continuedev/server/meilisearch_server.py
@@ -2,7 +2,7 @@ import os
import shutil
import subprocess
-import meilisearch
+from meilisearch_python_async import Client
from ..libs.util.paths import getServerFolderPath
@@ -41,14 +41,14 @@ def ensure_meilisearch_installed():
f"curl -L https://install.meilisearch.com | sh", shell=True, check=True, cwd=serverPath)
-def check_meilisearch_running() -> bool:
+async def check_meilisearch_running() -> bool:
"""
Checks if MeiliSearch is running.
"""
try:
- client = meilisearch.Client('http://localhost:7700')
- resp = client.health()
+ client = Client('http://localhost:7700')
+ resp = await client.health()
if resp["status"] != "available":
return False
return True
@@ -56,7 +56,7 @@ def check_meilisearch_running() -> bool:
return False
-def start_meilisearch():
+async def start_meilisearch():
"""
Starts the MeiliSearch server, wait for it.
"""
@@ -71,7 +71,7 @@ def start_meilisearch():
ensure_meilisearch_installed()
# Check if MeiliSearch is running
- if not check_meilisearch_running():
+ if not await check_meilisearch_running():
print("Starting MeiliSearch...")
subprocess.Popen(["./meilisearch"], cwd=serverPath, stdout=subprocess.DEVNULL,
stderr=subprocess.STDOUT, close_fds=True, start_new_session=True)