Merge dev into main

Author: DinisCruz

README.md

@@ -1,4 +1,4 @@
 # OSBot-Fast-API-Serverless
 Repo for OSBot-Fast-API-Serverless
 
-![Current Release](https://img.shields.io/badge/release-v1.24.0-blue)
+![Current Release](https://img.shields.io/badge/release-v1.24.1-blue)

modules/OSBot-Fast-API

@@ -1 +1,2 @@
+package_name = 'osbot_fast_api_serverless'
 path=__path__[0]

modules/OSBot-Utils

@@ -1,6 +1,6 @@
 from osbot_aws.aws.lambda_.boto3__lambda import load_dependencies       # using the lightweight file (which only has the boto3 calls required to load_dependencies)
 
-LAMBDA_DEPENDENCIES =  ['osbot-fast-api==v0.28.0', 'mangum']
+LAMBDA_DEPENDENCIES =  ['osbot-fast-api==v0.31.0', 'mangum==0.19.0']
 
 load_dependencies(LAMBDA_DEPENDENCIES)
 

osbot_fast_api_serverless/__init__.py

@@ -1,16 +1,38 @@
-from osbot_fast_api.api.routes.Fast_API__Routes     import Fast_API__Routes
-from osbot_fast_api_serverless.utils.Version        import version__osbot_fast_api_serverless
+from osbot_fast_api.api.routes.Fast_API__Routes           import Fast_API__Routes
+from osbot_fast_api_serverless.services.info.Service_Info import Service_Info
+from osbot_fast_api_serverless.utils.Version              import version__osbot_fast_api_serverless
 
-ROUTES_PATHS__INFO = ['/info/version']
+TAG__ROUTES_INFO                  = 'info'
+ROUTES_PATHS__INFO                = [ f'/{TAG__ROUTES_INFO}/health'  ,
+                                      f'/{TAG__ROUTES_INFO}/server'  ,
+                                      f'/{TAG__ROUTES_INFO}/status'  ,
+                                      f'/{TAG__ROUTES_INFO}/version' ,
+                                      f'/{TAG__ROUTES_INFO}/versions']
+ROUTES_INFO__HEALTH__RETURN_VALUE = {'status': 'ok'}
 
 class Routes__Info(Fast_API__Routes):
-    tag :str = 'info'
+    tag         : str          = 'info'
+    service_info: Service_Info
 
+    def health(self):
+        return ROUTES_INFO__HEALTH__RETURN_VALUE
+
+    def server(self):                                             # Get service versions
+        return self.service_info.server_info()
+
+    def status(self):                                               # Get service status information
+        return self.service_info.service_info()
+
+    def versions(self):                                             # Get service versions
+        return self.service_info.versions()                         # todo: this should also include the version from Fast_API
+                                                                    #       and see if this should not be inside the /server endpoint
 
     def version(self):
-        return {'version': version__osbot_fast_api_serverless}
+        return dict(version=version__osbot_fast_api_serverless )    # todo: fix this to get this value from FastAPI app object
 
-    
     def setup_routes(self):
-        self.add_route_get(self.version)
-
+        self.add_route_get(self.health  )
+        self.add_route_get(self.server  )
+        self.add_route_get(self.status  )
+        self.add_route_get(self.version )
+        self.add_route_get(self.versions)

osbot_fast_api_serverless/fast_api/lambda_handler.py

@@ -0,0 +1,24 @@
+from osbot_fast_api.utils.Fast_API__Server_Info                            import fast_api__server_info, Fast_API__Server_Info
+from osbot_fast_api_serverless.services.info.schemas.Enum__Service_Environment import Enum__Service_Environment
+from osbot_fast_api_serverless.services.info.schemas.Schema__Server__Versions import Schema__Server__Versions
+from osbot_fast_api_serverless.services.info.schemas.Schema__Service__Status import Schema__Service__Status
+from osbot_utils.type_safe.Type_Safe                                       import Type_Safe
+
+
+class Service_Info(Type_Safe):
+
+    def environment(self):                                                   # Determine current environment
+        import os
+        if os.getenv('AWS_REGION'):
+            return Enum__Service_Environment.aws_lambda
+        else:
+            return Enum__Service_Environment.local
+
+    def service_info(self) -> Schema__Service__Status:                               # Get current service status
+        return Schema__Service__Status(environment = self.environment())
+
+    def versions(self):
+        return Schema__Server__Versions()
+
+    def server_info(self) -> Fast_API__Server_Info:
+        return fast_api__server_info

osbot_fast_api_serverless/fast_api/routes/Routes__Info.py

@@ -0,0 +1,6 @@
+from enum import Enum
+
+
+class Enum__Service_Environment(str, Enum):
+    aws_lambda = 'aws-lambda'
+    local      = 'local'

osbot_fast_api_serverless/services/info/Service_Info.py

@@ -0,0 +1,5 @@
+from enum import Enum
+
+class Enum__Service_Status(str, Enum):
+    operational = 'operational'
+    degraded    = 'degraded'