Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,17 @@ repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.12.1
hooks:
- id: ruff
args: ["check", "crudadmin", "--fix"]
- id: ruff-check
args: ["crudadmin", "--fix"]
- id: ruff-format
args: ["crudadmin"]

- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.16.1
- repo: local
hooks:
- id: mypy
args: ["crudadmin", "--strict"]
name: mypy
entry: uv run mypy crudadmin/
language: system
types: [python]
pass_filenames: false
args: [--config-file=pyproject.toml]
3 changes: 3 additions & 0 deletions crudadmin/admin_interface/model_view.py
Original file line number Diff line number Diff line change
Expand Up @@ -1092,17 +1092,20 @@ async def get_model_update_page_inner(
)

form_fields = _get_form_fields_from_schema(self.update_schema)
field_values: Dict[str, Any] = {}
for field in form_fields:
field_name = field["name"]
if field_name in item:
field["value"] = item[field_name]
field_values[field_name] = item[field_name]

return self.templates.TemplateResponse(
template,
{
"request": request,
"model_name": self.model_key,
"form_fields": form_fields,
"field_values": field_values,
"url_prefix": self.get_url_prefix(),
"id": id,
},
Expand Down
11 changes: 9 additions & 2 deletions crudadmin/session/backends/redis.py
Original file line number Diff line number Diff line change
Expand Up @@ -339,8 +339,15 @@ async def get_user_sessions(self, user_id: int) -> list[str]:
user_sessions_key = self.get_user_sessions_key(user_id)

try:
members = await self.client.smembers(user_sessions_key)
return [m.decode("utf-8") if isinstance(m, bytes) else m for m in members]
members = self.client.smembers(user_sessions_key)
if not hasattr(members, "__await__"):
raise TypeError(
f"Expected awaitable from smembers, got {type(members)}"
)
members_await = await members
return [
m.decode("utf-8") if isinstance(m, bytes) else m for m in members_await
]
except self.RedisError as e:
logger.error(f"Error getting user sessions: {e}")
raise
Expand Down
16 changes: 12 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -152,12 +152,20 @@ ignore = [
known-third-party = ["fastapi", "pydantic", "starlette"]

[tool.mypy]
python_version = "3.8"
strict = true
python_version = "3.9"
warn_return_any = true
warn_unused_configs = true
disallow_untyped_defs = true
disallow_incomplete_defs = true
disallow_untyped_defs = false
disallow_incomplete_defs = false
check_untyped_defs = true
disallow_untyped_decorators = false
no_implicit_optional = true
strict_optional = true
warn_redundant_casts = true
warn_unused_ignores = true
warn_no_return = true
warn_unreachable = true


[tool.coverage.run]
source = ["crudadmin"]
Expand Down
4 changes: 3 additions & 1 deletion tests/event/test_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ def test_create_admin_event_log_repr_method(self):
repr_str = repr(instance)
assert "AdminEventLog" in repr_str
assert "id=1" in repr_str
assert any(s in repr_str for s in ("event_type=create", "event_type=EventType.CREATE"))
assert any(
s in repr_str for s in ("event_type=create", "event_type=EventType.CREATE")
)
assert "user_id=123" in repr_str

def test_create_admin_event_log_returns_existing_class(self):
Expand Down
8 changes: 3 additions & 5 deletions tests/session/test_integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,9 @@ class TestSessionManagerIntegration:
@pytest.fixture
def session_manager_with_mocks(self, mock_session_storage, mock_csrf_storage):
"""Create a session manager with mock storage."""
with (
patch(
"crudadmin.session.manager.get_session_storage",
return_value=mock_session_storage,
),
with patch(
"crudadmin.session.manager.get_session_storage",
return_value=mock_session_storage,
):
manager = SessionManager(session_storage=mock_session_storage)
manager.csrf_storage = mock_csrf_storage
Expand Down
Loading