Merge branch 'meilisearch:main' into main

Author: kevinamstutz

.github/workflows/tests.yml

@@ -67,7 +67,7 @@ jobs:
       - name: Install dependencies for production only
         run: pipenv install
       - name: Meilisearch setup with Docker
-        run: docker run -d -p 7700:7700 getmeili/meilisearch:latest ./meilisearch --no-analytics --master-key=masterKey
+        run: docker run -d -p 7700:7700 getmeili/meilisearch:latest meilisearch --no-analytics --master-key=masterKey
       - name: Run the scraper with basic config
         run: pipenv run ./docs_scraper $CONFIG_FILE
         env:

Dockerfile

@@ -1,14 +1,21 @@
 FROM python:3.8.4-buster
 
-WORKDIR /docs-scraper
-
-COPY . .
-
 ENV LC_ALL C.UTF-8
 ENV LANG C.UTF-8
 
+WORKDIR /docs-scraper
+
 RUN apt-get update -y \
-    && apt-get install -y python3-pip libnss3
+    && apt-get install -y python3-pip libnss3 \
+    && apt-get install -y chromium-driver
 
 RUN pip3 install pipenv
+
+
+COPY Pipfile Pipfile
+COPY Pipfile.lock Pipfile.lock 
+
 RUN pipenv --python 3.8 install
+
+
+COPY . . 

Pipfile

@@ -5,13 +5,13 @@ name = "pypi"
 
 [packages]
 Scrapy = "==2.6.1"
-selenium = "==4.1.3"
-pytest = "==7.0.0"
-meilisearch = "==0.18.1"
+selenium = "==4.1.5"
+pytest = "==7.1.2"
+meilisearch = "==0.19.1"
 requests-iap = "==0.2.0"
 python-keycloak-client = "==0.2.3"
 
 [dev-packages]
 pylint = "==2.8.2"
-tox = "==3.24.5"
+tox = "==3.25.0"
 tox-pipenv = "==1.10.1"

Pipfile.lock

@@ -530,7 +530,7 @@ Websites that need JavaScript for rendering are passed through ChromeDriver.<br>
 
 ## 🤖 Compatibility with Meilisearch
 
-This package only guarantees the compatibility with the [version v0.26.0 of Meilisearch](https://github.com/meilisearch/meilisearch/releases/tag/v0.26.0).
+This package only guarantees the compatibility with the [version v0.28.0 of Meilisearch](https://github.com/meilisearch/meilisearch/releases/tag/v0.28.0).
 
 ## ⚙️ Development Workflow and Contributing
 

README.md

@@ -77,7 +77,7 @@ def run_config(config):
           client_secret=os.getenv("KC_CLIENT_SECRET"))
         token_response = oidc_client.client_credentials()
         token = token_response["access_token"]
-        headers.update({"Authorization": 'bearer ' + token})
+        headers.update({"Authorization": 'Bearer ' + token})
 
     DEFAULT_REQUEST_HEADERS = headers
 

scraper/src/index.py

@@ -101,12 +101,16 @@ class MeiliSearchHelper:
     def __init__(self, host_url, api_key, index_uid, custom_settings):
         self.meilisearch_client = meilisearch.Client(host_url, api_key)
         self.meilisearch_index = self.meilisearch_client.index(index_uid)
+        self.delete_index()
         self.add_settings(MeiliSearchHelper.SETTINGS, custom_settings)
 
     def add_settings(self, default_settings, custom_settings):
         settings = {**default_settings, **custom_settings}
         self.meilisearch_index.update_settings(settings)
 
+    def delete_index(self):
+        self.meilisearch_index.delete()
+
     def add_records(self, records, url, from_sitemap):
         """Add new records to the index"""