Merge dev into main

DinisCruz · DinisCruz · commit 45bb95d46092 · 2025-10-07T22:06:10.000+01:00
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "modules/OSBot-Fast-API"]
 	path = modules/OSBot-Fast-API
 	url = git@github.com:owasp-sbot/OSBot-Fast-API.git
+[submodule "modules/OSBot-Utils"]
+	path = modules/OSBot-Utils
+	url = git@github.com:owasp-sbot/OSBot-Utils.git
diff --git a/README.md b/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.22.0-blue)
+![Current Release](https://img.shields.io/badge/release-v1.22.1-blue)
diff --git a/modules/OSBot-Fast-API b/modules/OSBot-Fast-API
@@ -1 +1 @@
-Subproject commit 17868cf398d6eb85716d4eb3c1cb61db7fe389f6
+Subproject commit 246aac9f106e530cbea54af34bb947f5669160ee
diff --git a/modules/OSBot-Utils b/modules/OSBot-Utils
@@ -0,0 +1 @@
+Subproject commit f425a9a010bbd34acc694f760aa6267abaf1971a
diff --git a/osbot_fast_api_serverless/fast_api/Serverless__Fast_API.py b/osbot_fast_api_serverless/fast_api/Serverless__Fast_API.py
@@ -1,13 +1,12 @@
-from osbot_fast_api.api.Fast_API                            import Fast_API
-from mangum                                                 import Mangum
-from osbot_utils.utils.Env                                  import load_dotenv
-from osbot_fast_api_serverless.fast_api.routes.Routes__Info import Routes__Info
+from osbot_fast_api.api.Fast_API                                     import Fast_API
+from mangum                                                          import Mangum
+from osbot_utils.utils.Env                                           import load_dotenv
+from osbot_fast_api_serverless.fast_api.routes.Routes__Info          import Routes__Info
+from osbot_fast_api_serverless.fast_api.Serverless__Fast_API__Config import Serverless__Fast_API__Config
 
 
 class Serverless__Fast_API(Fast_API):
-    enable_cors    : bool = True
-    enable_api_key : bool = True
-    default_routes : bool = False
+    config: Serverless__Fast_API__Config
 
     def setup(self):
         load_dotenv()                                       # needed for api key support # todo: add this to Fast_API class (maybe as an top level option)
diff --git a/osbot_fast_api_serverless/fast_api/Serverless__Fast_API__Config.py b/osbot_fast_api_serverless/fast_api/Serverless__Fast_API__Config.py
@@ -0,0 +1,7 @@
+from osbot_fast_api.api.schemas.Schema__Fast_API__Config import Schema__Fast_API__Config
+
+
+class Serverless__Fast_API__Config(Schema__Fast_API__Config):
+    enable_cors    : bool = True
+    enable_api_key : bool = True
+    default_routes : bool = False
diff --git a/osbot_fast_api_serverless/fast_api/lambda_handler.py b/osbot_fast_api_serverless/fast_api/lambda_handler.py
@@ -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.25.0', 'mangum']
+LAMBDA_DEPENDENCIES =  ['osbot-fast-api==v0.28.0', 'mangum']
 
 load_dependencies(LAMBDA_DEPENDENCIES)
 
diff --git a/osbot_fast_api_serverless/version b/osbot_fast_api_serverless/version
@@ -1 +1 @@
-v1.22.0
+v1.22.1
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name        = "osbot_fast_api_serverless"
-version     = "v1.22.0"
+version     = "v1.22.1"
 description = "OSBot-Fast-API-Serverless"
 authors     = ["Dinis Cruz <dinis.cruz@owasp.org>"]
 license     = "Apache 2.0"

-Original file line number
+Diff line change
@@ @@ -1,3 +1,6 @@ @@
 [submodule "modules/OSBot-Fast-API"]
 	path = modules/OSBot-Fast-API
 	url = [email protected]:owasp-sbot/OSBot-Fast-API.git
 +[submodule "modules/OSBot-Utils"]
 +	path = modules/OSBot-Utils
 +	url = [email protected]:owasp-sbot/OSBot-Utils.git