summaryrefslogtreecommitdiff
path: root/continuedev/src/continuedev/server
diff options
context:
space:
mode:
authorNate Sesti <sestinj@gmail.com>2023-07-26 04:16:43 -0700
committerNate Sesti <sestinj@gmail.com>2023-07-26 04:16:43 -0700
commit12a8ae1c47f111b9f36633c96b26e8642c5ff223 (patch)
tree2b684e64cd76c5c4f7a0e52861edd4648f1bb8fd /continuedev/src/continuedev/server
parent1afb37b5bb901d95c493039591b9243cd2cdd6f7 (diff)
downloadsncontinue-12a8ae1c47f111b9f36633c96b26e8642c5ff223.tar.gz
sncontinue-12a8ae1c47f111b9f36633c96b26e8642c5ff223.tar.bz2
sncontinue-12a8ae1c47f111b9f36633c96b26e8642c5ff223.zip
fix: :bug: more reliable setup of meilisearch
Diffstat (limited to 'continuedev/src/continuedev/server')
-rw-r--r--continuedev/src/continuedev/server/meilisearch_server.py14
1 files changed, 10 insertions, 4 deletions
diff --git a/continuedev/src/continuedev/server/meilisearch_server.py b/continuedev/src/continuedev/server/meilisearch_server.py
index 286019e1..840a4b77 100644
--- a/continuedev/src/continuedev/server/meilisearch_server.py
+++ b/continuedev/src/continuedev/server/meilisearch_server.py
@@ -6,9 +6,11 @@ from meilisearch_python_async import Client
from ..libs.util.paths import getServerFolderPath
-def ensure_meilisearch_installed():
+def ensure_meilisearch_installed() -> bool:
"""
Checks if MeiliSearch is installed.
+
+ Returns a bool indicating whether it was installed to begin with.
"""
serverPath = getServerFolderPath()
meilisearchPath = os.path.join(serverPath, "meilisearch")
@@ -29,7 +31,7 @@ def ensure_meilisearch_installed():
# Clear the meilisearch binary
if meilisearchPath in existing_paths:
os.remove(meilisearchPath)
- non_existing_paths.remove(meilisearchPath)
+ existing_paths.remove(meilisearchPath)
# Clear the existing directories
for p in existing_paths:
@@ -40,6 +42,10 @@ def ensure_meilisearch_installed():
subprocess.run(
f"curl -L https://install.meilisearch.com | sh", shell=True, check=True, cwd=serverPath)
+ return False
+
+ return True
+
async def check_meilisearch_running() -> bool:
"""
@@ -68,10 +74,10 @@ async def start_meilisearch():
serverPath = getServerFolderPath()
# Check if MeiliSearch is installed, if not download
- ensure_meilisearch_installed()
+ was_already_installed = ensure_meilisearch_installed()
# Check if MeiliSearch is running
- if not await check_meilisearch_running():
+ if not await check_meilisearch_running() or not was_already_installed:
print("Starting MeiliSearch...")
subprocess.Popen(["./meilisearch"], cwd=serverPath, stdout=subprocess.DEVNULL,
stderr=subprocess.STDOUT, close_fds=True, start_new_session=True)