Added es 7 compatibility with es 8 client, just for tests

Author: RamiAwar

Makefile

@@ -40,7 +40,7 @@ formatting: codestyle
 #* Linting
 .PHONY: test
 test:
-	PYTHONPATH=$(PYTHONPATH) poetry run pytest -c pyproject.toml --cov-report=html --cov=pydastic tests/
+	PYTHONPATH=$(PYTHONPATH) poetry run pytest -c pyproject.toml --cov-report html --cov-report xml --cov=pydastic tests/
 	poetry run coverage-badge -o assets/images/coverage.svg -f
 
 .PHONY: check-codestyle

assets/images/coverage.svg

@@ -1,11 +1,17 @@
+import os
+import sys
+
 import pytest
 from elasticsearch import Elasticsearch
 from user import User
 
+# Enable backwards compatibility of es client 8.x.x with ES db 7.x.x
+os.environ["ELASTIC_CLIENT_APIVERSIONING"] = "1"
+
 
 @pytest.fixture()
 def es() -> Elasticsearch:
-    return Elasticsearch(hosts="http://localhost:9200", ssl_show_warn=False, headers={"Accept": "application/json", "Content-Type": "application/json"})
+    return Elasticsearch(hosts="http://localhost:9200", ssl_show_warn=False)
 
 
 @pytest.fixture()

tests/conftest.py

@@ -123,6 +123,11 @@ def test_model_from_es(es: Elasticsearch):
     assert user == user_from_es
 
 
+def test_model_from_es_empty_data():
+    user = User.from_es({})
+    assert user is None
+
+
 def test_model_from_es_invalid_format():
     res = {"does not": "include _source", "or": "_id"}
 
@@ -139,6 +144,15 @@ def test_model_to_es(es: Elasticsearch):
     assert res["_source"] == es_from_user
 
 
+def test_model_to_es_with_exclude(es: Elasticsearch):
+    user = User(name="Carla")
+    user.save(es, wait_for=True)
+    es_from_user = user.to_es(exclude={"last_login", "phone"})
+
+    # Check that id excluded and fields excluded
+    assert es_from_user == {"name": "Carla"}
+
+
 def test_model_get(es: Elasticsearch):
     user = User(name="Jean", phone="128")
     user.save(es, wait_for=True)