pytrain-ogr-api 2.8.0__tar.gz → 2.8.2__tar.gz

{pytrain_ogr_api-2.8.0 → pytrain_ogr_api-2.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytrain-ogr-api
-Version: 2.8.0
+Version: 2.8.2
 Summary: Restful API to control Lionel TMCC/Legacy engines, switches, and accesseries from a Raspberry Pi
 Author-email: Dave Swindell <pytraininfo@gmail.com>
 License:                    GNU LESSER GENERAL PUBLIC LICENSE
@@ -190,7 +190,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: AUTHORS
 Requires-Dist: pytrain-ogr>=2.8.0
-Requires-Dist: fastapi>=0.139.0
+Requires-Dist: fastapi<0.137.0
 Requires-Dist: fastapi-utils>=0.8.0
 Requires-Dist: pyjwt>=2.13.0
 Requires-Dist: python-dotenv>=1.2.2

{pytrain_ogr_api-2.8.0 → pytrain_ogr_api-2.8.2}/pyproject.toml

@@ -29,7 +29,7 @@ license = { file = "LICENSE" }
 
 dependencies = [
     "pytrain-ogr >= 2.8.0",
-    "fastapi >= 0.139.0",
+    "fastapi < 0.137.0",
     "fastapi-utils >= 0.8.0",
     "pyjwt >= 2.13.0",
     "python-dotenv >= 1.2.2",

{pytrain_ogr_api-2.8.0 → pytrain_ogr_api-2.8.2}/requirements.txt

@@ -1,6 +1,6 @@
-pytrain-ogr>=2.8.0
+pytrain-ogr>=2.8.1
 fastapi-utils>=0.8.0
-fastapi>=0.139.0
+fastapi<0.137.0
 pyjwt>=2.13.0
 python-dotenv>=1.2.2
 python_multipart>=0.0.32

{pytrain_ogr_api-2.8.0 → pytrain_ogr_api-2.8.2}/src/pytrain_api/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2.8.0'
-__version_tuple__ = version_tuple = (2, 8, 0)
+__version__ = version = '2.8.2'
+__version_tuple__ = version_tuple = (2, 8, 2)
 
-__commit_id__ = commit_id = 'g67dcc178e'
+__commit_id__ = commit_id = 'g6b33c668c'

{pytrain_ogr_api-2.8.0 → pytrain_ogr_api-2.8.2}/src/pytrain_api/endpoints.py

@@ -27,13 +27,15 @@ from fastapi_utils.cbv import cbv
 from jwt import DecodeError, ExpiredSignatureError, InvalidSignatureError, InvalidTokenError
 from pydantic import BaseModel, ValidationError
 from pytrain import (
+    PROGRAM_NAME,
     CommandReq,
     CommandScope,
-    PROGRAM_NAME,
     TMCC1AuxCommandEnum,
     TMCC1HaltCommandEnum,
     TMCC1RouteCommandEnum,
     TMCC2EngineCommandEnum,
+)
+from pytrain import (
     get_version as pytrain_get_version,
 )
 from pytrain.protocol.command_def import CommandDefEnum
@@ -223,7 +225,7 @@ def create_secret(length: int = 32) -> str:
 def get_api_token(api_key: str = Security(api_key_header)) -> bool:
     """
     Accepts either:
-      1) Raw API key (API_TOKEN, API_KEYS, etc.), OR
+      1) Raw API key (API_TOKEN, API_KEYS, etc.) OR
       2) A JWT (Authorization-style bearer token) signed with SECRET_KEY.
 
     Returns True if authorized, otherwise raises HTTPException.
@@ -619,7 +621,7 @@ async def favicon():
 # noinspection PyUnusedLocal
 @app.exception_handler(StarletteHTTPException)
 async def http_exception_handler(request: Request, exc: StarletteHTTPException):
-    # allow APis that issue a legitimate 404 to send a 404 response
+    # allow APIs that issue a legitimate 404 to send a 404 response
     if exc.status_code in [404] and (not exc.headers or exc.headers.get("X-Error", None) not in {"404"}):
         return JSONResponse(content={"detail": "Forbidden"}, status_code=403)
     return JSONResponse(content={"detail": exc.detail}, status_code=exc.status_code)
@@ -891,6 +893,7 @@ async def get_version() -> VersionResponse:
         raise HTTPException(status_code=400, detail=str(e))
 
 
+# noinspection PathParameterInspection
 @router.post(
     "/{component}/{tmcc_id:int}/cli_req",
     summary=f"Send {PROGRAM_NAME} CLI command",
@@ -1184,7 +1187,7 @@ async def get_blocks(contains: str = None) -> list[BlockInfo]:
 class Block(PyTrainComponent):
     # noinspection PyTypeHints
     @classmethod
-    def id_path(cls, label: str = None, min_val: int = 1, max_val: int = 99) -> Path:
+    def id_path(cls, label: str = None, min_val: int = 1, max_val: int = 99):
         label = label if label else cls.__name__.replace("PyTrain", "")
         return Path(
             title="Block ID",
@@ -1206,7 +1209,7 @@ class Block(PyTrainComponent):
     )
     async def get_block(
         self,
-        block_id: Annotated[int, PyTrainComponent.id_path(label="Block")],
+        block_id: Annotated[int, id_path(label="Block")],
     ) -> BlockInfo:
         return BlockInfo(**super().get(block_id))
 

{pytrain_ogr_api-2.8.0 → pytrain_ogr_api-2.8.2}/src/pytrain_ogr_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytrain-ogr-api
-Version: 2.8.0
+Version: 2.8.2
 Summary: Restful API to control Lionel TMCC/Legacy engines, switches, and accesseries from a Raspberry Pi
 Author-email: Dave Swindell <pytraininfo@gmail.com>
 License:                    GNU LESSER GENERAL PUBLIC LICENSE
@@ -190,7 +190,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: AUTHORS
 Requires-Dist: pytrain-ogr>=2.8.0
-Requires-Dist: fastapi>=0.139.0
+Requires-Dist: fastapi<0.137.0
 Requires-Dist: fastapi-utils>=0.8.0
 Requires-Dist: pyjwt>=2.13.0
 Requires-Dist: python-dotenv>=1.2.2

{pytrain_ogr_api-2.8.0 → pytrain_ogr_api-2.8.2}/src/pytrain_ogr_api.egg-info/requires.txt

@@ -1,5 +1,5 @@
 pytrain-ogr>=2.8.0
-fastapi>=0.139.0
+fastapi<0.137.0
 fastapi-utils>=0.8.0
 pyjwt>=2.13.0
 python-dotenv>=1.2.2

{pytrain_ogr_api-2.8.0 → pytrain_ogr_api-2.8.2}/src/pytrain_ogr_api.egg-info/scm_version.json

@@ -1,7 +1,7 @@
 {
-  "tag": "2.8.0",
+  "tag": "2.8.2",
   "distance": 0,
-  "node": "g67dcc178e68ae9c7c95669ac5196a7898478cc90",
+  "node": "g6b33c668c401547e3ffdd04a7c846e9a720ddec3",
   "dirty": false,
   "branch": "HEAD",
   "node_date": "2026-07-09"

{pytrain_ogr_api-2.8.0 → pytrain_ogr_api-2.8.2}/tests/requirements.txt

@@ -1,7 +1,7 @@
 build>=1.5.1
 fastapi-cli>=0.0.29
 pytest>=9.1.1
-ruff>=0.15.20
+ruff>=0.15.21
 tox>=4.56.4
 twine>=6.1.0
 ipython>=9.10.0; python_version>="3.11"