update ci

Author: OleksandrZhydyk

.github/workflows/ci_filter.yml

@@ -11,25 +11,27 @@ jobs:
         max-parallel: 4
         matrix:
           os: [ubuntu-latest]
-          python-version: ['3.9', '3.10', '3.11']
+          python-version: ['3.9', '3.10', '3.11', '3.12']
 
       steps:
-        - uses: actions/checkout@v2
+        - uses: actions/checkout@v3
         - name: Setup Python ${{ matrix.python-version }}
-          uses: actions/setup-python@v2
+          uses: actions/setup-python@v3
           with:
             python-version: ${{ matrix.python-version }}
         - name: Install dependencies
           run: |
             python3 -m pip install --upgrade pip
-            python3 -m pip install pipenv
-            pipenv install --dev --skip-lock
+            python3 -m pip install poetry
+            poetry config virtualenvs.create false
+            poetry lock
+            poetry install --no-root
         - name: Run tests
           run: |
-            pipenv run pytest -s
+            poetry run pytest -s
         - name: Run flake8
           run: |
-            pipenv run flake8 --max-line-length=120
+            poetry run flake8 --max-line-length=120
         - name: Upload coverage reports to Codecov
           uses: codecov/codecov-action@v3
           env:

fastapi_sa_orm_filter/main.py

@@ -148,7 +148,9 @@ class model.__name__(BaseModel):
             optional_model = self._get_optional_pydantic_model(model, pydantic_serializer)
             optional_list_model = self._get_optional_pydantic_model(model, pydantic_serializer, is_list=True)
 
-            serializers[model.__tablename__] = {"optional_model": optional_model, "optional_list_model":optional_list_model}
+            serializers[model.__tablename__] = {
+                "optional_model": optional_model, "optional_list_model": optional_list_model
+            }
 
         return serializers
 

fastapi_sa_orm_filter/parsers.py

@@ -101,7 +101,8 @@ def _parse_expression(
                 model, table, field_name = self._get_relation_model(field_name)
             operator, value = condition.split("=")
         except ValueError:
-            raise SAFilterOrmException("Incorrect filter request syntax,"
+            raise SAFilterOrmException(
+                "Incorrect filter request syntax,"
                 " please use pattern :"
                 "'{field_name}__{condition}={value}{conjunction}' "
                 "or '{relation}.{field_name}__{condition}={value}{conjunction}'",

poetry.lock

@@ -17,6 +17,7 @@ pytest = "^8.3.3"
 pytest-asyncio = "^0.24.0"
 aiosqlite = "^0.20.0"
 flit = "^3.10.1"
+flake8 = "^7.1.1"
 
 
 [build-system]

pyproject.toml

@@ -30,6 +30,7 @@ class Vacancy(Base):
     company_id: Mapped[int] = mapped_column(ForeignKey("companies.id"))
     company: Mapped["Company"] = relationship(back_populates="vacancies")
 
+
 class Company(Base):
     __tablename__ = "companies"
     id: Mapped[int] = mapped_column(primary_key=True)
@@ -145,6 +146,7 @@ def get_group_by_query_part(self):
 
     return CustomFilter(Vacancy, get_vacancy_restriction)
 
+
 @pytest.fixture
 def get_company_restriction() -> dict:
     return {
@@ -153,6 +155,7 @@ def get_company_restriction() -> dict:
         "salary_from": [ops.eq, ops.gt, ops.lte, ops.gte]
     }
 
+
 @pytest.fixture
 def get_company_filter(get_company_restriction):
     return FilterCore(Company, get_company_restriction)
@@ -166,4 +169,4 @@ def get_query(self, custom_filter):
             query = super().get_query(custom_filter)
             return query.join(Vacancy).options(joinedload(Company.vacancies))
 
-    return CustomFilter(Company, get_company_restriction)
+    return CustomFilter(Company, get_company_restriction)