fix enum type bug (#18)

Author: ciur

.github/workflows/tests.yml

@@ -7,23 +7,23 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@master
-      - name: Set up Python 3.10
+      - name: Set up Python 3.11
         uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
+          python-version: "3.11"
       - uses: pre-commit/[email protected]
 
   unit-tests:
     needs: pre-commit
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@master
-      - name: Set up Python 3.10
+      - name: Set up Python 3.11
         uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
+          python-version: "3.11"
       - name: Run Tests
         run: |
           python -m pip install --upgrade pip
           pip install poetry
-          poetry install && poetry run pytest
+          poetry install -E xapian && poetry run pytest

poetry.lock

@@ -1,16 +1,18 @@
 [tool.poetry]
 name = "salinic"
-version = "0.3.10"
+version = "0.4.0"
 description = "Search abstraction layer"
 authors = ["Eugen Ciur <[email protected]>"]
 readme = "README.md"
 
 [tool.poetry.dependencies]
-python = ">=3.8, <4.0"
-pydantic = "^2.1.1"
-xapianpy = "^1.4.22.post2305071405"
+python = ">=3.11, <4.0"
+pydantic = "^2.7"
 requests = "^2.31.0"
+xapianpy = {version = "1.4.22.post2406040406", optional = true}
 
+[tool.poetry.extras]
+xapian = ["xapianpy"]
 
 [tool.poetry.group.test.dependencies]
 pytest = "^7.4.0"

pyproject.toml

@@ -32,28 +32,28 @@ def remove(self, **kwargs):
 
 
 def get_ro_client_backend_class(engine):
-    module_full_path = f'salinic.backends.{engine.url.scheme}.client'
+    module_full_path = f'salinic.backends.{engine.url.scheme.value}.client'
     module = importlib.import_module(module_full_path)
 
     return module.ClientRO
 
 
 def get_rw_client_backend_class(engine):
-    module_full_path = f'salinic.backends.{engine.url.scheme}.client'
+    module_full_path = f'salinic.backends.{engine.url.scheme.value}.client'
     module = importlib.import_module(module_full_path)
 
     return module.ClientRW
 
 
 def get_ro_index_backend_class(engine):
-    module_full_path = f'salinic.backends.{engine.url.scheme}.index'
+    module_full_path = f'salinic.backends.{engine.url.scheme.value}.index'
     module = importlib.import_module(module_full_path)
 
     return module.IndexRO
 
 
 def get_rw_index_backend_class(engine):
-    module_full_path = f'salinic.backends.{engine.url.scheme}.index'
+    module_full_path = f'salinic.backends.{engine.url.scheme.value}.index'
     module = importlib.import_module(module_full_path)
 
     return module.IndexRW

salinic/index.py

@@ -35,14 +35,15 @@ def get_schema_manager_backend(engine, model):
 
 
 def get_schema_manager_backend_class(engine):
-    module_full_path = f'salinic.backends.{engine.url.scheme}.schema_manager'
+    full_path = f'salinic.backends.{engine.url.scheme.value}.schema_manager'
+    module_full_path = full_path
     module = importlib.import_module(module_full_path)
 
     return module.SchemaManager
 
 
 def get_rw_client_backend_class(engine):
-    module_full_path = f'salinic.backends.{engine.url.scheme}.client'
+    module_full_path = f'salinic.backends.{engine.url.scheme.value}.client'
     module = importlib.import_module(module_full_path)
 
     return module.ClientRW

salinic/schema_manager.py

@@ -0,0 +1,7 @@
+from salinic.engine import create_engine
+
+
+def test_engine():
+    engine = create_engine('solr://solr-instance.default')
+    assert engine.url.scheme == 'solr'
+    assert str(engine.url.scheme.value) == 'solr'

tests/test_engine.py

@@ -0,0 +1,8 @@
+from salinic.engine import create_engine
+from salinic.index import get_ro_client_backend_class
+
+
+def test_get_ro_client_backend_class():
+    url = "solr://solr-solrcloud-0.solr-solrcloud-headless.default"
+    engine = create_engine(url)
+    assert get_ro_client_backend_class(engine)