espark-core 0.5.3__tar.gz → 0.5.4__tar.gz

{espark_core-0.5.3/espark_core.egg-info → espark_core-0.5.4}/PKG-INFO

@@ -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 → espark_core-0.5.4/espark_core.egg-info}/PKG-INFO

@@ -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 → espark_core-0.5.4}/espark_core.egg-info/requires.txt

@@ -1,10 +1,10 @@
 aiomqtt>=2.4.0
 apscheduler>=3.11.2
-fastapi>=0.127.0
+fastapi>=0.128.0
 packaging>=25.0
 slack-sdk==3.39.0
 sqlalchemy>=2.0.45
-sqlmodel>=0.0.29
+sqlmodel>=0.0.31
 uvicorn[standard]>=0.40.0
 
 [dev]

{espark_core-0.5.3 → espark_core-0.5.4}/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)

{espark_core-0.5.3 → espark_core-0.5.4}/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()

{espark_core-0.5.3 → espark_core-0.5.4}/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)

{espark_core-0.5.3 → espark_core-0.5.4}/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()
 

{espark_core-0.5.3 → espark_core-0.5.4}/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

{espark_core-0.5.3 → espark_core-0.5.4}/requirements.txt

@@ -1,8 +1,8 @@
 aiomqtt>=2.4.0
 apscheduler>=3.11.2
-fastapi>=0.127.0
+fastapi>=0.128.0
 packaging>=25.0
 slack-sdk==3.39.0
 sqlalchemy>=2.0.45
-sqlmodel>=0.0.29
+sqlmodel>=0.0.31
 uvicorn[standard]>=0.40.0

{espark_core-0.5.3 → espark_core-0.5.4}/setup.py

@@ -10,7 +10,7 @@ extra_requirements      = (root / 'requirements.dev.txt').read_text().splitlines
 
 setup(
     name='espark-core',
-    version='0.5.3',
+    version='0.5.4',
     description='The core module of the Espark ESP32-based IoT device management framework.',
     long_description=(root / 'README.md').read_text(),
     long_description_content_type='text/markdown',
@@ -18,7 +18,7 @@ setup(
     license_files=[
         'LICENSE',
     ],
-    python_requires='>=3.8',
+    python_requires='>=3.10',
     packages=find_packages(where='.'),
     package_dir={
         '' : '.',