espark-core 0.5.3__py3-none-any.whl → 0.5.4__py3-none-any.whl

{espark_core-0.5.3.dist-info → espark_core-0.5.4.dist-info}/METADATA

@@ -1,18 +1,18 @@
 Metadata-Version: 2.4
 Name: espark-core
-Version: 0.5.3
+Version: 0.5.4
 Summary: The core module of the Espark ESP32-based IoT device management framework.
 License: MIT
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiomqtt>=2.4.0
 Requires-Dist: apscheduler>=3.11.2
-Requires-Dist: fastapi>=0.127.0
+Requires-Dist: fastapi>=0.128.0
 Requires-Dist: packaging>=25.0
 Requires-Dist: slack-sdk==3.39.0
 Requires-Dist: sqlalchemy>=2.0.45
-Requires-Dist: sqlmodel>=0.0.29
+Requires-Dist: sqlmodel>=0.0.31
 Requires-Dist: uvicorn[standard]>=0.40.0
 Provides-Extra: dev
 Requires-Dist: aiosqlite==0.22.1; extra == "dev"

{espark_core-0.5.3.dist-info → espark_core-0.5.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-espark_core-0.5.3.dist-info/licenses/LICENSE,sha256=wkIXJHYIspOGVvn_ajKyLucpIyw9_pO3QExFcNTCY78,1065
+espark_core-0.5.4.dist-info/licenses/LICENSE,sha256=wkIXJHYIspOGVvn_ajKyLucpIyw9_pO3QExFcNTCY78,1065
 esparkcore/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 esparkcore/constants.py,sha256=2Bmx62j4kykkPhcQ9ygEJ08uyVlykXMNFhpO26-Czlg,417
 esparkcore/data/__init__.py,sha256=abMOPq6jC5qOQCl9j7iPDv8iyjzDF-oVd_gW0la5kL4,45
@@ -11,21 +11,21 @@ esparkcore/data/models/telemetry.py,sha256=OfzGqGj2Y1sdK519sSOEXhfuErHoeEdpy5qmJ
 esparkcore/data/models/trigger.py,sha256=rJw3ZjWcQiT3ET3W5n_km9F0cNe2BU6GpIigZYYlJZE,986
 esparkcore/data/models/version.py,sha256=h2O_Owx-exx5tiQiiauCSELkUHDx-QZjiIGqFPybT4M,269
 esparkcore/data/repositories/__init__.py,sha256=zlTYJ_KKBqkY7KpIi1kJlCG5UA6zXlLm5wK9INLpZQY,358
-esparkcore/data/repositories/base_repository.py,sha256=L5APTp8SczndbWqgJyEqKe-4NQoL_YYOapUN6i572cM,2097
+esparkcore/data/repositories/base_repository.py,sha256=mFoWhEwAFOHU1NwvRzWX_lpIvLgIEu9CDqq4axEv5sY,2175
 esparkcore/data/repositories/device_repository.py,sha256=P9KK-Ta9MgMdrnct5hbGEoipPOPrrDQ4wINQnZZ6iZY,1131
 esparkcore/data/repositories/notification_repository.py,sha256=N-bcprhnG6noTdhIzLMBJtCmGeMtnZw2bPx8JdjamW8,205
 esparkcore/data/repositories/outbox_repository.py,sha256=PdPyKq2Km4_7732O6HhA4BlV_zBjYF91GkMltNKUovg,1015
-esparkcore/data/repositories/telemetry_repository.py,sha256=9wkgE2SU6_fqJMxpnG_IOF_ONxi9qi0coy_gVSJG2q8,2105
+esparkcore/data/repositories/telemetry_repository.py,sha256=zdod2C9_rJoduEiIYbRjscr1JyYGRAZ4JxAUiE9XyN4,2128
 esparkcore/data/repositories/trigger_repository.py,sha256=xHYky1ZAT2H0cLPGTjVbmnH6ZHPgFXzga2SeOx-xSNo,185
 esparkcore/data/repositories/version_repository.py,sha256=QZZX2BpFx1i0oeFJ6j0nZvlZH7cViKU8VERBE8AU3ZY,395
 esparkcore/notifications/__init__.py,sha256=WrdUPsRS0tg2rAhv4aj4eGDekkfAsKjcRPRlT6btzQs,77
 esparkcore/notifications/notifier.py,sha256=d4a8leU-oTwWe7ZTLw-vxfCrYlFnCIvbcXabiXkT6Lc,446
 esparkcore/notifications/slack_notifier.py,sha256=-H-3YYm0CRTV8pZgggrNPJKz6815HTumKvE7VsvvSAA,644
 esparkcore/routers/__init__.py,sha256=sZv812GJl-JEWJQ7IR1gAQ5BdCf5nTkfbJZXv5jZv_4,225
-esparkcore/routers/base_router.py,sha256=t-x8tYZVzBk9bD__9yaGYhm66glq_oM_lAHn0eplM2M,3902
-esparkcore/routers/device_router.py,sha256=KM6MI6BaxDbZJaqDPEi6iJYPwnOIujtAFG8J1oGRq3I,2506
+esparkcore/routers/base_router.py,sha256=ELSdrwrKavqc1tYfTnNhNmYmKnCbmlWdvXyB1CBjcYg,4029
+esparkcore/routers/device_router.py,sha256=iqKK1MZM9CWMw331bQvwieXE9TpbKut6BU7GvjLbM3I,2549
 esparkcore/routers/notification_router.py,sha256=vLG99eW-b9UlO9NiV1yZZeqkG4XLVv5Yj5JvHZLP6Dg,411
-esparkcore/routers/telemetry_router.py,sha256=3690D4603gVK3-yaJT-sAVKwhIYEYKxQZpIu84a9flg,2584
+esparkcore/routers/telemetry_router.py,sha256=iPAzZf7B7qnDHfSJYtTGchKLuzdddZQodQHlPYpPOAw,2588
 esparkcore/routers/trigger_router.py,sha256=YSNYrLTQYeGToVBOlSK4PtDKpdFpesk-ZnNn_lXu6Ec,366
 esparkcore/routers/version_router.py,sha256=7HYD6sbGWow3DDvK62RXPZu5Qz8DCTTs7wkksQKBq9c,383
 esparkcore/schedules/__init__.py,sha256=v5Wy3Cbt2AnudGMGXv_Cyaa10s6NAmP66rDjcMSvf0o,74
@@ -35,7 +35,7 @@ esparkcore/services/__init__.py,sha256=RIZOHBfkWn3HsApdA5rH9EZbbXGq0NfiGoOWDO_JX
 esparkcore/services/mqtt.py,sha256=5h_mhXhFt11TyhGwNhaY08Y4tttvSTPkiR3veTqpb3A,8972
 esparkcore/utils/__init__.py,sha256=rzuCJUAaQl-yPhM1vcWB_1zVXqtA71ChYP2aM_3UfKk,42
 esparkcore/utils/logging.py,sha256=sRO8uOcPkFH-DwepqLOTS2qGaopXpMdVOjzZL6RpGs4,257
-espark_core-0.5.3.dist-info/METADATA,sha256=KDl4boE59BMZAwh9qW4IxL8rXGqJSglWxRRtgjmrG7w,6329
-espark_core-0.5.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-espark_core-0.5.3.dist-info/top_level.txt,sha256=hXVyhIPB4aGskFm5queWALxDPhcDkrN7_8vcjwA1iE4,11
-espark_core-0.5.3.dist-info/RECORD,,
+espark_core-0.5.4.dist-info/METADATA,sha256=XrE-QAk_K75Ij1iy13zQ8xkR3TJUU2Yf6QB-YdWN9Z0,6330
+espark_core-0.5.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+espark_core-0.5.4.dist-info/top_level.txt,sha256=hXVyhIPB4aGskFm5queWALxDPhcDkrN7_8vcjwA1iE4,11
+espark_core-0.5.4.dist-info/RECORD,,

esparkcore/data/repositories/base_repository.py

@@ -1,6 +1,6 @@
 from typing import Generic, Optional, Sequence, Type, TypeVar
 
-from sqlalchemy import func, ColumnElement
+from sqlalchemy import ColumnElement, func, text
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlmodel import select, SQLModel
 
@@ -41,14 +41,14 @@ class AsyncRepository(Generic[T]):
 
         return (await session.execute(query)).scalars().first()
 
-    async def list(self, session: AsyncSession, *conditions: ColumnElement[bool], offset: Optional[int] = None, order_by=None, limit: Optional[int] = None) -> Sequence[T]:
+    async def list(self, session: AsyncSession, *conditions: ColumnElement[bool], offset: Optional[int] = None, order_by: ColumnElement | str = None, limit: Optional[int] = None) -> Sequence[T]:
         query = select(self.model)
 
         if conditions:
             query = query.where(*conditions)
 
         if order_by is not None:
-            query = query.order_by(order_by)
+            query = query.order_by(text(order_by) if isinstance(order_by, str) else order_by)
 
         if offset is not None:
             query = query.offset(offset)

esparkcore/data/repositories/telemetry_repository.py

@@ -17,7 +17,7 @@ class TelemetryRepository(AsyncRepository[Telemetry]):
         results = await self.list(session, and_(Telemetry.device_id == device_id, Telemetry.data_type == data_type), order_by=Telemetry.timestamp.desc(), limit=1)
         return results[0] if results else None
 
-    async def list(self, session: AsyncSession, *conditions: ColumnElement[bool], offset: Optional[int] = None, order_by=None, limit: Optional[int] = None) -> Sequence[Telemetry]:
+    async def list(self, session: AsyncSession, *conditions: ColumnElement[bool], offset: Optional[int] = None, order_by: ColumnElement | str = None, limit: Optional[int] = None) -> Sequence[Telemetry]:
         if order_by is None:
             # pylint: disable=no-member
             order_by = Telemetry.timestamp.desc()

esparkcore/routers/base_router.py

@@ -1,6 +1,6 @@
 from typing import Generic, List, Sequence, Type, TypeVar
 
-from fastapi import APIRouter, Body, Depends, HTTPException, Query, status, Response
+from fastapi import APIRouter, Body, Depends, HTTPException, Query, status, Response, Path
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlmodel import SQLModel
 
@@ -57,7 +57,7 @@ class BaseRouter(Generic[T]):
             return result
 
         @self.router.delete('/{id}', status_code=status.HTTP_204_NO_CONTENT)
-        async def delete(id: str, session: AsyncSession = Depends(BaseRouter._get_session)) -> None:
+        async def delete(id: str = Path(..., min_length=1), session: AsyncSession = Depends(BaseRouter._get_session)) -> None:
             entity = await self.repo.get(session, self.model.id == id)
             if not entity:
                 raise HTTPException(status_code=status.HTTP_404_NOT_FOUND)
@@ -67,7 +67,7 @@ class BaseRouter(Generic[T]):
             await self._after_delete(entity, session)
 
         @self.router.get('/{id}', response_model=self.model)
-        async def get(id: str, session: AsyncSession = Depends(BaseRouter._get_session)) -> T:
+        async def get(id: str = Path(..., min_length=1), session: AsyncSession = Depends(BaseRouter._get_session)) -> T:
             entity = await self.repo.get(session, self.model.id == id)
             if not entity:
                 raise HTTPException(status_code=status.HTTP_404_NOT_FOUND)
@@ -75,13 +75,13 @@ class BaseRouter(Generic[T]):
             return entity
 
         @self.router.get('/', response_model=List[self.model])
-        async def list(response: Response, session: AsyncSession = Depends(BaseRouter._get_session), offset: int = Query(None, ge=0), limit: int = Query(None, ge=1, le=100)) -> Sequence[T]:
+        async def list(response: Response, session: AsyncSession = Depends(BaseRouter._get_session), order_by: str = Query(None), offset: int = Query(0, ge=0), limit: int = Query(10, ge=1, le=100)) -> Sequence[T]:
             response.headers['X-Total-Count'] = str(await self.repo.count(session))
 
-            return await self.repo.list(session, offset=offset, limit=limit)
+            return await self.repo.list(session, order_by=order_by, offset=offset, limit=limit)
 
         @self.router.put('/{id}', response_model=self.model)
-        async def update(id: str, data: dict = Body(...), session: AsyncSession = Depends(BaseRouter._get_session)) -> T:
+        async def update(id: str = Path(..., min_length=1), data: dict = Body(...), session: AsyncSession = Depends(BaseRouter._get_session)) -> T:
             entity = await self.repo.get(session, self.model.id == id)
             if not entity:
                 raise HTTPException(status_code=status.HTTP_404_NOT_FOUND)

esparkcore/routers/device_router.py

@@ -31,10 +31,10 @@ class DeviceRouter(BaseRouter):
 
     def _setup_routes(self) -> None:
         @self.router.get('/all')
-        async def list_all(response: Response, session: AsyncSession = Depends(BaseRouter._get_session), offset: int = Query(None, ge=0), limit: int = Query(None, ge=1, le=100)):
+        async def list_all(response: Response, session: AsyncSession = Depends(BaseRouter._get_session), order_by: str = Query(None), offset: int = Query(0, ge=0), limit: int = Query(10, ge=1, le=100)):
             response.headers['X-Total-Count'] = str(await self.repo.count(session))
 
-            devices                = await self.repo.list(session, offset=offset, limit=limit)
+            devices                = await self.repo.list(session, order_by=order_by, offset=offset, limit=limit)
             devices_with_telemetry = []
             telemetry_repo         = TelemetryRepository()
 

esparkcore/routers/telemetry_router.py

@@ -18,7 +18,7 @@ class TelemetryRouter(BaseRouter):
 
     def _setup_routes(self) -> None:
         @self.router.get('/history', response_model=Sequence[Telemetry])
-        async def list_history(response: Response, session: AsyncSession = Depends(BaseRouter._get_session), device_id: int = Query(..., ge=1), offset: int = Query(..., min=0)) -> Sequence[Telemetry]:
+        async def list_history(response: Response, session: AsyncSession = Depends(BaseRouter._get_session), device_id: str = Query(..., min_length=1), offset: int = Query(0, min=0)) -> Sequence[Telemetry]:
             from_date = datetime.now(timezone.utc) - timedelta(seconds=offset)
             results   = await self.repo.list(session, and_(Telemetry.device_id == device_id, Telemetry.timestamp >= from_date))
 
@@ -27,7 +27,7 @@ class TelemetryRouter(BaseRouter):
             return results
 
         @self.router.get('/recent', response_model=Sequence[Telemetry])
-        async def list_recent(response: Response, session: AsyncSession = Depends(BaseRouter._get_session), offset: int = Query(..., min=0)) -> Sequence[Telemetry]:
+        async def list_recent(response: Response, session: AsyncSession = Depends(BaseRouter._get_session), offset: int = Query(0, min=0)) -> Sequence[Telemetry]:
             from_date   = datetime.now(timezone.utc) - timedelta(seconds=offset)
             device_repo = DeviceRepository()
             # pylint: disable=no-member