Fix content-type and add tests

Author: alallema

meilisearch/_httprequests.py

@@ -26,19 +26,19 @@ def send_request(
             self.headers['Content-Type'] = content_type
         try:
             request_path = self.config.url + '/' + path
-            if not content_type or content_type == 'application/json':
+            if isinstance(body, bytes):
                 request = http_method(
                     request_path,
                     timeout=self.config.timeout,
                     headers=self.headers,
-                    data=json.dumps(body) if body else "null"
+                    data=body
                 )
             else:
                 request = http_method(
                     request_path,
                     timeout=self.config.timeout,
                     headers=self.headers,
-                    data=body
+                    data=json.dumps(body) if body else "null"
                 )
             return self.__validate(request)
 

meilisearch/index.py

@@ -1241,7 +1241,7 @@ def __settings_url_for(self, sub_route: str) -> str:
     def _build_url(
         self,
         primary_key: Optional[str] = None,
-    ):
+    ) -> str:
         if primary_key is None:
             return f'{self.config.paths.index}/{self.uid}/{self.config.paths.document}'
         primary_key = urllib.parse.urlencode({'primaryKey': primary_key})

meilisearch/tests/conftest.py

@@ -38,6 +38,30 @@ def small_movies():
     with open('./datasets/small_movies.json', 'r', encoding="utf8") as movie_file:
         yield json.loads(movie_file.read())
 
+@fixture(scope='session')
+def small_movies_json_file():
+    """
+    Runs once per session. Provides the content of small_movies.json from read.
+    """
+    with open('./datasets/small_movies.json', 'r') as movie_json_file:
+        return movie_json_file.read().encode('utf-8')
+
+@fixture(scope='session')
+def songs_csv():
+    """
+    Runs once per session. Provides the content of songs.csv from read..
+    """
+    with open('./datasets/songs.csv', 'r') as song_csv_file:
+        return song_csv_file.read().encode('utf-8')
+
+@fixture(scope='session')
+def songs_ndjson():
+    """
+    Runs once per session. Provides the content of songs.ndjson from read..
+    """
+    with open('./datasets/songs.ndjson', 'r') as song_ndjson_file:
+        return song_ndjson_file.read().encode('utf-8')
+
 @fixture(scope='function')
 def empty_index(client):
     def index_maker(index_name=common.INDEX_UID):

meilisearch/tests/index/test_index_document_meilisearch.py

@@ -144,3 +144,36 @@ def test_delete_all_documents(index_with_documents):
     response = index.get_documents()
     assert isinstance(response, list)
     assert response == []
+
+def test_add_documents_csv(empty_index, songs_csv):
+    """Tests adding new documents to a clean index."""
+    index = empty_index()
+    response = index.add_documents_csv(songs_csv)
+    assert isinstance(response, dict)
+    assert 'updateId' in response
+    update = index.wait_for_pending_update(response['updateId'])
+    assert update['status'] == 'processed'
+    assert update['type']['number'] != 0
+    assert index.get_primary_key() == 'id'
+
+def test_add_documents_json(empty_index, small_movies_json_file):
+    """Tests adding new documents to a clean index."""
+    index = empty_index()
+    response = index.add_documents_json(small_movies_json_file)
+    assert isinstance(response, dict)
+    assert 'updateId' in response
+    update = index.wait_for_pending_update(response['updateId'])
+    assert update['status'] == 'processed'
+    assert update['type']['number'] != 0
+    assert index.get_primary_key() == 'id'
+
+def test_add_documents_ndjson(empty_index, songs_ndjson):
+    """Tests adding new documents to a clean index."""
+    index = empty_index()
+    response = index.add_documents_ndjson(songs_ndjson)
+    assert isinstance(response, dict)
+    assert 'updateId' in response
+    update = index.wait_for_pending_update(response['updateId'])
+    assert update['status'] == 'processed'
+    assert update['type']['number'] != 0
+    assert index.get_primary_key() == 'id'