Skip to content

Commit f241ead

Browse files
refactor: Fix redundant func import in request queue client (#1788)
This PR fixes a redundant import in `src/crawlee/storage_clients/_sql/_request_queue_client.py`: - Removes duplicate `from sqlalchemy import func as sql_func` import - Uses consistent `func` naming throughout the file --------- Co-authored-by: Vlada Dusek <v.dusek96@gmail.com>
1 parent 58156ca commit f241ead

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

src/crawlee/_utils/crypto.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ def compute_short_hash(data: bytes, *, length: int = 8) -> str:
2020

2121
def crypto_random_object_id(length: int = 17) -> str:
2222
"""Generate a random object ID."""
23-
chars = 'abcdefghijklmnopqrstuvwxyzABCEDFGHIJKLMNOPQRSTUVWXYZ0123456789'
23+
chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
2424
return ''.join(secrets.choice(chars) for _ in range(length))

src/crawlee/storage_clients/_sql/_request_queue_client.py

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
from typing import TYPE_CHECKING, Any, cast
99

1010
from sqlalchemy import CursorResult, exists, func, or_, select, update
11-
from sqlalchemy import func as sql_func
1211
from sqlalchemy.exc import SQLAlchemyError
1312
from sqlalchemy.orm import load_only
1413
from typing_extensions import NotRequired, Self, override
@@ -778,22 +777,20 @@ def _prepare_buffer_data(
778777
@override
779778
async def _apply_buffer_updates(self, session: AsyncSession, max_buffer_id: int) -> None:
780779
aggregations: list[ColumnElement[Any]] = [
781-
sql_func.max(self._BUFFER_TABLE.accessed_at).label('max_accessed_at'),
782-
sql_func.max(self._BUFFER_TABLE.modified_at).label('max_modified_at'),
783-
sql_func.sum(self._BUFFER_TABLE.delta_handled_count).label('delta_handled_count'),
784-
sql_func.sum(self._BUFFER_TABLE.delta_pending_count).label('delta_pending_count'),
785-
sql_func.sum(self._BUFFER_TABLE.delta_total_count).label('delta_total_count'),
780+
func.max(self._BUFFER_TABLE.accessed_at).label('max_accessed_at'),
781+
func.max(self._BUFFER_TABLE.modified_at).label('max_modified_at'),
782+
func.sum(self._BUFFER_TABLE.delta_handled_count).label('delta_handled_count'),
783+
func.sum(self._BUFFER_TABLE.delta_pending_count).label('delta_pending_count'),
784+
func.sum(self._BUFFER_TABLE.delta_total_count).label('delta_total_count'),
786785
]
787786

788787
if not self._had_multiple_clients:
789-
aggregations.append(
790-
sql_func.count(sql_func.distinct(self._BUFFER_TABLE.client_id)).label('unique_clients_count')
791-
)
788+
aggregations.append(func.count(func.distinct(self._BUFFER_TABLE.client_id)).label('unique_clients_count'))
792789

793790
if self._storage_client.get_dialect_name() == 'postgresql':
794-
aggregations.append(sql_func.bool_or(self._BUFFER_TABLE.need_recalc).label('need_recalc'))
791+
aggregations.append(func.bool_or(self._BUFFER_TABLE.need_recalc).label('need_recalc'))
795792
else:
796-
aggregations.append(sql_func.max(self._BUFFER_TABLE.need_recalc).label('need_recalc'))
793+
aggregations.append(func.max(self._BUFFER_TABLE.need_recalc).label('need_recalc'))
797794

798795
aggregation_stmt = select(*aggregations).where(
799796
self._BUFFER_TABLE.storage_id == self._id, self._BUFFER_TABLE.id <= max_buffer_id

0 commit comments

Comments
 (0)