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.6.0-blue)
+![Current Release](https://img.shields.io/badge/release-v1.6.1-blue)

modules/OSBot-Fast-API

@@ -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', 'mangum']
+LAMBDA_DEPENDENCIES =  ['osbot-fast-api==v0.14.0', 'mangum']
 
 load_dependencies(LAMBDA_DEPENDENCIES)
 

osbot_fast_api_serverless/fast_api/lambda_handler.py

@@ -1,9 +1,9 @@
-from osbot_fast_api.api.Fast_API_Routes      import Fast_API_Routes
+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
 
 ROUTES_PATHS__INFO = ['/info/version']
 
-class Routes__Info(Fast_API_Routes):
+class Routes__Info(Fast_API__Routes):
     tag :str = 'info'
 
 

osbot_fast_api_serverless/fast_api/routes/Routes__Info.py

@@ -1 +1 @@
-v1.6.0
+v1.6.1

osbot_fast_api_serverless/version

@@ -1,6 +1,6 @@
 [tool.poetry]
 name        = "osbot_fast_api_serverless"
-version     = "v1.6.0"
+version     = "v1.6.1"
 description = "OSBot-Fast-API-Serverless"
 authors     = ["Dinis Cruz <dinis.cruz@owasp.org>"]
 license     = "Apache 2.0"
@@ -13,6 +13,7 @@ python            = "^3.12"
 osbot-aws         = "*"
 osbot-fast-api    = "*"
 mangum            = "*"
+pytest = "^8.4.1"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

poetry.lock

@@ -31,9 +31,9 @@ def test__init__(self):
 
     def test__client__root_path(self):
         path                = '/info/version'
-        auth_key_name       = get_env(ENV_VAR__FAST_API__AUTH__API_KEY__NAME )
-        auth_key_value      = get_env(ENV_VAR__FAST_API__AUTH__API_KEY__VALUE)
-        headers             = {auth_key_name: auth_key_value}
+        auth_key_name       = get_env(ENV_VAR__FAST_API__AUTH__API_KEY__NAME  )
+        auth_key_value      = get_env(ENV_VAR__FAST_API__AUTH__API_KEY__VALUE )
+        headers             = { auth_key_name: auth_key_value}
 
         response__no_auth   = self.client.get(url=path                 )
         response__with_auth = self.client.get(url=path, headers=headers)
@@ -55,6 +55,6 @@ def test__check_if_local_stack_is_setup(self):
             assert _.is_local_stack_configured_and_available() is True
 
 
-    def test__config_fast_api_routes(self):
+    def test__config_Fast_API__Routes(self):
         assert self.fast_api.routes_paths() == ROUTES_PATHS__INFO
 

pyproject.toml

@@ -6,16 +6,18 @@
 from osbot_fast_api.api.Fast_API                                                    import ENV_VAR__FAST_API__AUTH__API_KEY__VALUE, ENV_VAR__FAST_API__AUTH__API_KEY__NAME
 from osbot_aws.deploy.Deploy_Lambda                                                 import Deploy_Lambda
 from osbot_utils.utils.Objects                                                      import __
+from osbot_fast_api_serverless.fast_api.lambda_handler                              import LAMBDA_DEPENDENCIES
 from osbot_fast_api_serverless.utils.Version                                        import version__osbot_fast_api_serverless
 from osbot_fast_api_serverless.deploy.Deploy__Serverless__Fast_API                  import Deploy__Serverless__Fast_API, BASE__LAMBDA_NAME__FAST_API__SERVERLESS
 from osbot_fast_api_serverless.deploy.Schema__AWS_Setup__Serverless__Fast_API       import Schema__AWS_Setup__Serverless__Fast_API
+from osbot_fast_api_serverless.utils.testing.skip_tests                             import skip__if_not__in_github_actions
 from tests.serverless_fast_api__objs_for_tests                                      import Serverless__Fast_API__TEST__AWS_ACCOUNT_ID, Serverless__Fast_API__TEST__AWS_DEFAULT_REGION, setup_local_stack
 
 
 class test_Deploy__Serverless_Fast_API(TestCase):
     @classmethod
     def setUpClass(cls):
-        #skip__if_not__in_github_actions()
+        skip__if_not__in_github_actions()
         setup_local_stack()                                                 # deploy lambda to localstack
         cls.ephemeral_storage = 1048
         cls.memory_size       = 1024
@@ -43,7 +45,7 @@ def test_2_upload_lambda_dependencies_to_s3(self):
 
             status__packages = _.upload_lambda_dependencies_to_s3()
             for package_name, status__package in status__packages.items():
-                assert package_name                  in ['mangum', 'osbot-fast-api']
+                assert package_name                  in LAMBDA_DEPENDENCIES
                 assert list_set(status__package)     == ['local_result', 's3_exists']
                 assert status__package['s3_exists']  is True
                 assert type(status__package['local_result']) is Schema__Lambda__Dependency__Local_Install__Data
@@ -69,8 +71,8 @@ def test_3__create_or_update__lambda_function(self):
             lambda_configuration = _.lambda_function().info().get('Configuration')
 
             assert lambda_configuration.get('Architectures'   )                  == ['x86_64']
-            assert lambda_configuration.get('Environment'     ).get('Variables') == {'FAST_API__AUTH__API_KEY__NAME' : get_env(ENV_VAR__FAST_API__AUTH__API_KEY__NAME ),
-                                                                                     'FAST_API__AUTH__API_KEY__VALUE': get_env(ENV_VAR__FAST_API__AUTH__API_KEY__VALUE)}
+            assert lambda_configuration.get('Environment'     ).get('Variables') == { ENV_VAR__FAST_API__AUTH__API_KEY__NAME : get_env(ENV_VAR__FAST_API__AUTH__API_KEY__NAME ),
+                                                                                      ENV_VAR__FAST_API__AUTH__API_KEY__VALUE: get_env(ENV_VAR__FAST_API__AUTH__API_KEY__VALUE)}
             assert lambda_configuration.get('EphemeralStorage').get('Size') == self.ephemeral_storage
             assert lambda_configuration.get('FunctionName'    )             == 'fast-api__serverless__dev'
             assert lambda_configuration.get('MemorySize'      )             == self.memory_size
@@ -102,8 +104,8 @@ def test_5_check_deployment_files(self):
         with self.deploy_serverless_fast_api as _:
             with _.s3() as _:
                 dependencies_zips = _.folder_files('000000000000--osbot-lambdas--us-east-1', 'lambdas-dependencies')
-                for package_name in ['mangum.zip', 'osbot-fast-api.zip']:
-                    assert package_name in dependencies_zips
+                for package_name in LAMBDA_DEPENDENCIES:
+                    assert f"{package_name}.zip" in dependencies_zips
 
     def test_6_delete_lamda_function(self):
         with self.deploy_serverless_fast_api as _: