js-api 0.2.83__tar.gz → 0.2.85__tar.gz

{js_api-0.2.83/src/js_api.egg-info → js_api-0.2.85}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: js-api
-Version: 0.2.83
+Version: 0.2.85
 Summary: Custom API written in Python using FastAPI
 Author-email: Jack Stockley <jack@jstockley.com>
 Project-URL: Homepage, https://github.com/jnstockley/api
@@ -11,7 +11,7 @@ Classifier: Programming Language :: Python :: 3
 Requires-Python: <4.0,>=3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: fastapi[standard]==0.139.1
+Requires-Dist: fastapi[standard]==0.140.0
 Requires-Dist: sqlalchemy==2.0.51
 Requires-Dist: sqlmodel==0.0.39
 Requires-Dist: python-dotenv==1.2.2

{js_api-0.2.83 → js_api-0.2.85}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "js-api"
-version = "0.2.83"
+version = "0.2.85"
 description = "Custom API written in Python using FastAPI"
 authors = [
     {name = "Jack Stockley", email = "jack@jstockley.com"}
@@ -8,7 +8,7 @@ authors = [
 readme = "README.md"
 requires-python = ">=3.14, <4.0"
 dependencies = [
-    "fastapi[standard]==0.139.1",
+    "fastapi[standard]==0.140.0",
     "sqlalchemy==2.0.51",
     "sqlmodel==0.0.39",
     "python-dotenv==1.2.2",

{js_api-0.2.83 → js_api-0.2.85}/src/api.py

@@ -16,7 +16,7 @@ try:
     pyproject_path = Path(__file__).parent.parent / "pyproject.toml"
     with open(pyproject_path, "rb") as f:
         version = tomllib.load(f)["project"]["version"]
-except Exception:
+except Exception:  # noqa: BLE001
     version = "0.1.0"
 
 

{js_api-0.2.83 → js_api-0.2.85}/src/controllers/health_check.py

@@ -13,6 +13,6 @@ async def health_check(db: db_dependency):
         # Execute a simple query to check the database connection
         db.exec(select(1))
         return {"status": "ok"}
-    except Exception as e:
+    except Exception as e:  # noqa: BLE001
         logger.error(e)
         raise HTTPException(status_code=500, detail="Database connection failed")

{js_api-0.2.83 → js_api-0.2.85}/src/controllers/ip.py

@@ -1,6 +1,5 @@
 import datetime
 import re
-from typing import Optional
 
 from fastapi import APIRouter, HTTPException, Request, Security
 from sqlalchemy import select
@@ -35,8 +34,8 @@ ipv6_pattern = re.compile(
 async def add_ip(
     identifier: str,
     request: Request,
-    ipv4_address: Optional[str] = None,
-    ipv6_address: Optional[str] = None,
+    ipv4_address: str | None = None,
+    ipv6_address: str | None = None,
 ):
     if identifier.strip() == "":
         raise HTTPException(
@@ -74,24 +73,23 @@ async def get_ip(identifier: str):
         return row
 
 
-def __update_ip(
-    identifier: str, ipv4_address: Optional[str], ipv6_address: Optional[str]
-):
+def __update_ip(identifier: str, ipv4_address: str | None, ipv6_address: str | None):
     with Session(engine) as s:
         stmt = select(IpAddress).where(IpAddress.id == identifier)
         row: IpAddress = s.execute(stmt).scalar_one_or_none()
+        tz_info = datetime.datetime.now(datetime.UTC).astimezone().tzinfo
         if row is None:
             row = IpAddress(
                 id=identifier,
                 ipv4_address=ipv4_address,
                 ipv6_address=ipv6_address,
-                updated_at=datetime.datetime.now(),
+                updated_at=datetime.datetime.now(tz=tz_info),
             )
             s.add(row)
         else:
             row.ipv4_address = ipv4_address
             row.ipv6_address = ipv6_address
-            row.updated_at = datetime.datetime.now()
+            row.updated_at = datetime.datetime.now(tz=tz_info)
         s.flush()
         s.commit()
         s.refresh(row)

{js_api-0.2.83 → js_api-0.2.85/src/js_api.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: js-api
-Version: 0.2.83
+Version: 0.2.85
 Summary: Custom API written in Python using FastAPI
 Author-email: Jack Stockley <jack@jstockley.com>
 Project-URL: Homepage, https://github.com/jnstockley/api
@@ -11,7 +11,7 @@ Classifier: Programming Language :: Python :: 3
 Requires-Python: <4.0,>=3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: fastapi[standard]==0.139.1
+Requires-Dist: fastapi[standard]==0.140.0
 Requires-Dist: sqlalchemy==2.0.51
 Requires-Dist: sqlmodel==0.0.39
 Requires-Dist: python-dotenv==1.2.2

{js_api-0.2.83 → js_api-0.2.85}/src/js_api.egg-info/requires.txt

@@ -1,4 +1,4 @@
-fastapi[standard]==0.139.1
+fastapi[standard]==0.140.0
 sqlalchemy==2.0.51
 sqlmodel==0.0.39
 python-dotenv==1.2.2

{js_api-0.2.83 → js_api-0.2.85}/src/util/docker.py

@@ -33,9 +33,8 @@ def get_latest_docker_image(image: str) -> str | None:
                 "digest" in docker_image
                 and "name" in docker_image
                 and docker_image["digest"] == digest
+                and docker_image["name"] != "latest"
+                and re.fullmatch(version_regex, docker_image["name"])
             ):
-                if docker_image["name"] != "latest" and re.fullmatch(
-                    version_regex, docker_image["name"]
-                ):
-                    return docker_image["name"]
+                return docker_image["name"]
     return None

{js_api-0.2.83 → js_api-0.2.85}/src/util/healthcheck.py

@@ -1,3 +1,5 @@
+import sys
+
 from sqlalchemy import select
 
 from database import get_db
@@ -10,7 +12,7 @@ def healthcheck() -> bool:
         db = next(get_db())
         # Execute a simple query to check the database connection
         db.exec(select(1))
-        exit(0)
-    except Exception as e:
+        sys.exit(0)
+    except Exception as e:  # noqa: BLE001
         logger.error(e)
-        exit(1)
+        sys.exit(1)

{js_api-0.2.83 → js_api-0.2.85}/tests/test_docker.py

@@ -7,10 +7,8 @@ from sqlalchemy.orm import sessionmaker
 from testcontainers.postgres import PostgresContainer
 
 from database import Base, get_db
-
 from src.api import app
 
-
 postgres = PostgresContainer("postgres:17-alpine").start()
 
 # Set up the test database URL before importing the app

{js_api-0.2.83 → js_api-0.2.85}/tests/test_health_check.py

@@ -1,7 +1,6 @@
 import os
 from unittest import TestCase, skip
 
-from src.api import app
 from fastapi.testclient import TestClient
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
@@ -9,7 +8,7 @@ from testcontainers.postgres import PostgresContainer
 
 import models
 from database import get_db
-
+from src.api import app
 
 postgres = PostgresContainer("postgres:17-alpine").start()
 

{js_api-0.2.83 → js_api-0.2.85}/tests/test_ip.py

@@ -1,13 +1,13 @@
 import os
 from unittest import TestCase
 
-from database import engine, get_db
-from src.api import app
 from fastapi.testclient import TestClient
 from sqlalchemy.orm import sessionmaker
 from testcontainers.postgres import PostgresContainer
 
 import models
+from database import engine, get_db
+from src.api import app
 
 postgres = PostgresContainer("postgres:17-alpine").start()
 
@@ -68,9 +68,9 @@ class TestIp(TestCase):
 
         assert response.status_code == 200
         res_json: dict = response.json()
-        assert "id" in res_json.keys()
-        assert "ipv4_address" in res_json.keys()
-        assert "updated_at" in res_json.keys()
+        assert "id" in res_json
+        assert "ipv4_address" in res_json
+        assert "updated_at" in res_json
         assert res_json["id"] == identifier
         assert res_json["ipv4_address"] == ip
 
@@ -86,9 +86,9 @@ class TestIp(TestCase):
 
         assert response.status_code == 200
         res_json: dict = response.json()
-        assert "id" in res_json.keys()
-        assert "ipv4_address" in res_json.keys()
-        assert "updated_at" in res_json.keys()
+        assert "id" in res_json
+        assert "ipv4_address" in res_json
+        assert "updated_at" in res_json
         assert res_json["id"] == identifier
         assert res_json["ipv4_address"] == ip
 
@@ -101,9 +101,9 @@ class TestIp(TestCase):
         res_json: list[dict] = response.json()
         assert len(res_json) == 1
         res_json: dict = res_json[0]
-        assert "id" in res_json.keys()
-        assert "ipv4_address" in res_json.keys()
-        assert "updated_at" in res_json.keys()
+        assert "id" in res_json
+        assert "ipv4_address" in res_json
+        assert "updated_at" in res_json
         assert res_json["id"] == "test"
         assert res_json["ipv4_address"] == "1.1.1.1"
 
@@ -120,8 +120,8 @@ class TestIp(TestCase):
         response = client.get("/ip/test", headers=header)
         assert response.status_code == 200
         res_json: dict = response.json()
-        assert "id" in res_json.keys()
-        assert "ipv4_address" in res_json.keys()
-        assert "updated_at" in res_json.keys()
+        assert "id" in res_json
+        assert "ipv4_address" in res_json
+        assert "updated_at" in res_json
         assert res_json["id"] == "test"
         assert res_json["ipv4_address"] == "1.1.1.1"