Merge branch 'main' of https://github.com/Seven-of-Di/ben

CHANGELOG.md

@@ -2,9 +2,9 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-## [0.9.0](https://github.com/Seven-of-Di/ben/compare/v0.8.0...v0.9.0) (2024-06-26)
+### [0.9.4](https://github.com/Seven-of-Di/ben/compare/v0.9.3...v0.9.4) (2024-10-01)
 
 
 ### Bug Fixes
 
-* Parenthesis fix, Lia was accepting the claim too agressively ([e4a5ba2](https://github.com/Seven-of-Di/ben/commit/e4a5ba2b2c7b894270f3f7141094cc887fc63aa2))
+* revert to simple http healthcheck ([b7e747b](https://github.com/Seven-of-Di/ben/commit/b7e747b885379862229c58bc280e3cd523b1be56))

VERSION

@@ -1 +1 @@
-0.9.0
+0.9.4

src/health_checker.py

@@ -1,7 +1,6 @@
 import psutil
 import threading
 from typing import List
-import logging
 
 class HealthChecker:
     cpu_usage: List[float]
@@ -12,7 +11,6 @@ def __init__(self) -> None:
     def healthy(self) -> bool:
         for cpu_per_core in self.cpu_usage:
             if cpu_per_core > 95:
-                logging.warning(self.cpu_usage)
                 return False
 
         return True

src/starlette_api.py

@@ -7,6 +7,7 @@
 from starlette.responses import JSONResponse
 from starlette.routing import Route
 from starlette.requests import Request
+from starlette.responses import Response
 from starlette.middleware.base import BaseHTTPMiddleware
 from opentelemetry import trace
 from starlette_exporter import PrometheusMiddleware, handle_metrics, CollectorRegistry, multiprocess # type: ignore
@@ -75,7 +76,6 @@ def __init__(self, play_card_request):
         self.playing_mode = PlayingMode.from_str(play_card_request[
             "playing_mode"]) if "playing_mode" in play_card_request else PlayingMode.MATCHPOINTS
 
-
 class MakeLead:
     def __init__(self, make_lead_request):
         self.hand = make_lead_request['hand']
@@ -261,14 +261,16 @@ async def alert_bid(request: Request):
         logging.exception(e)
         return {'error': str(e)},500
 
-health_checker = HealthChecker()
+# health_checker = HealthChecker()
+# health_checker.start()
 
-async def healthz():
-    healthy = health_checker.healthy()
-    if healthy:
-        return 'ok', 200
+async def healthz(_: Request):
+    return Response("OK", status_code=200)
+    # healthy = health_checker.healthy()
+    # if healthy:
+    #     return Response("OK", status_code=200)
 
-    return 'unhealthy', 500
+    # return Response("FAILURE", status_code=500)
 
 class TracingHeaderMiddleware(BaseHTTPMiddleware):
     async def dispatch(self, request, call_next):
@@ -314,7 +316,7 @@ async def dispatch(self, request, call_next):
         Route('/check_claim', check_claim, methods=['POST']),
         Route('/play_full_board', play_full_board, methods=['POST']),
         Route('/alert_bid', alert_bid, methods=['POST']),
-        # Route('/healthz', healthz, methods=['GET'])
+        Route('/healthz', healthz, methods=['GET'])
     ],
     middleware=[
         Middleware(OpenTelemetryMiddleware),

version.json

@@ -1,3 +1,3 @@
 {
-    "version": "0.9.0"
+    "version": "0.9.4"
 }