fixed nasty bug with Fast_API add_routes* methods, which where not using the "Type_Safe and Type_Safe__Primitive" aware methods

fixed bug in create_wrapper which was not capturing the return_type
added test_Fast_API__routes
refactored out the Fast_API__CLI into the _to_refactor_to_separate_project folder
same with Fast_API__Routes__Paths (since this will need to be redone with the using the new routes parser)

Author: DinisCruz

osbot_fast_api/cli/Fast_API__CLI.py renamed to _to_refactor_to_separate_project/code/cli/Fast_API__CLI.py

@@ -0,0 +1,13 @@
+# from Routes__Config
+
+    def routes__json(self):
+        return Fast_API__Routes__Paths(app=self.app).routes_tree()
+
+    def routes__html(self):
+        html_content = Fast_API__Routes__Paths(app=self.app).routes_html()
+        return HTMLResponse(content=html_content)
+
+
+    def setup_routes(self):
+        self.add_route_get(self.routes__json  )
+        self.add_route_get(self.routes__html  )

osbot_fast_api/cli/__init__.py renamed to _to_refactor_to_separate_project/code/cli/__init__.py

@@ -1,4 +1,5 @@
 from osbot_fast_api.api.middlewares.Middleware__Request_ID                      import Middleware__Request_ID
+from osbot_fast_api.api.routes.Fast_API__Route__Helper                          import Fast_API__Route__Helper
 from osbot_fast_api.api.schemas.Schema__Fast_API__Config                        import Schema__Fast_API__Config
 from osbot_utils.type_safe.Type_Safe                                            import Type_Safe
 from osbot_utils.decorators.lists.index_by                                      import index_by
@@ -20,7 +21,11 @@ class Fast_API(Type_Safe):
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
         if not self.config.name:
-            self.config.name           = self.__class__.__name__                # this makes the api name more user friendly
+            self.config.name           = self.__class__.__name__                # this makes the api name more user-friendly
+
+    @cache_on_self
+    def route_helper(self):
+        return Fast_API__Route__Helper()
 
     # todo: improve the error handling of validation errors (namely from Type_Safe_Primitive)
     #       see code example in https://claude.ai/chat/f443e322-fa43-487f-9dd9-2d4cfb261b1e
@@ -55,16 +60,25 @@ def add_flask_app(self, path, flask_app):
         self.app().mount(path, WSGIMiddleware(flask_app))
         return self
 
-    def add_route(self,function, methods):
-        path = '/' + function.__name__.replace('_', '-')
-        self.app().add_api_route(path=path, endpoint=function, methods=methods)
+    def add_route(self, function, methods):                                             # Register a route with Type_Safe support
+        self.route_helper().add_route(self.app(), function, methods)
         return self
 
-    def add_route_get(self, function):
-        return self.add_route(function=function, methods=['GET'])
+    def add_route_get(self, function):                                                  # Register GET route with Type_Safe support
+        self.route_helper().add_route_get(self.app(), function)
+        return self
 
-    def add_route_post(self, function):
-        return self.add_route(function=function, methods=['POST'])
+    def add_route_post(self, function):                                                 # Register POST route with Type_Safe support
+        self.route_helper().add_route_post(self.app(), function)
+        return self
+
+    def add_route_put(self, function):                                                  # Register PUT route with Type_Safe support
+        self.route_helper().add_route_put(self.app(), function)
+        return self
+
+    def add_route_delete(self, function):                                               # Register DELETE route with Type_Safe support
+        self.route_helper().add_route_delete(self.app(), function)
+        return self
 
     def add_routes(self, class_routes):
         class_routes(app=self.app()).setup()
@@ -153,7 +167,6 @@ def routes_paths(self, include_default=False, expand_mounts=False):
     def routes_paths_all(self):
         return self.routes_paths(include_default=True, expand_mounts=True)
 
-
     def setup_middlewares(self):                 # overwrite to add more middlewares    (NOTE: the middleware execution is the reverse of the order they are added)
         self.setup_middleware__detect_disconnect()
         self.setup_middleware__cors             ()

osbot_fast_api/utils/Fast_API__Routes__Paths.py renamed to _to_refactor_to_separate_project/code/routes_mini_ui/Fast_API__Routes__Paths.py

@@ -1,9 +1,7 @@
 from fastapi                                             import Response
-from fastapi.responses                                   import HTMLResponse
 from osbot_fast_api.api.decorators.route_path            import route_path
 from osbot_fast_api.api.routes.Fast_API__Routes          import Fast_API__Routes
 from osbot_fast_api.api.transformers.OpenAPI__To__Python import OpenAPI__To__Python
-from osbot_fast_api.utils.Fast_API__Routes__Paths        import Fast_API__Routes__Paths
 from osbot_fast_api.utils.Fast_API__Server_Info          import fast_api__server_info
 from osbot_fast_api.utils.Version                        import version__osbot_fast_api
 
@@ -21,13 +19,6 @@ def status(self):
     def version(self):
         return {'version': version__osbot_fast_api}
 
-    def routes__json(self):
-        return Fast_API__Routes__Paths(app=self.app).routes_tree()
-
-    def routes__html(self):
-        html_content = Fast_API__Routes__Paths(app=self.app).routes_html()
-        return HTMLResponse(content=html_content)
-
     @route_path('/openapi.py')
     def openapi_python(self):
         open_api_to_python = OpenAPI__To__Python()
@@ -40,6 +31,4 @@ def setup_routes(self):
         self.add_route_get(self.info          )
         self.add_route_get(self.status        )
         self.add_route_get(self.version       )
-        self.add_route_get(self.routes__json  )
-        self.add_route_get(self.routes__html  )
         self.add_route_get(self.openapi_python)

_to_refactor_to_separate_project/code/routes_mini_ui/code-snippet.txt

@@ -20,10 +20,18 @@ def create_wrapper(self, function  : Callable                 ,         # Origin
         if not signature.primitive_conversions and not signature.type_safe_conversions and not signature.return_needs_conversion:
             return function                                                 # No conversion needed - return original
 
-        if signature.has_body_params:                                       # Different wrappers for different scenarios
-            return self.create_body_wrapper(function, signature)
+        if signature.has_body_params:                                                   # Different wrappers for different scenarios
+            wrapper_function = self.create_body_wrapper(function, signature)
         else:
-            return self.create_query_wrapper(function, signature)
+            wrapper_function = self.create_query_wrapper(function, signature)
+
+        if signature.return_type is not None:
+            wrapper_function.__original_return_type__ = signature.return_type           # Preserve original return type metadata for route extractors
+
+        if hasattr(function, '__route_path__'):                                         # Also preserve route_path decorator if it exists
+            wrapper_function.__route_path__ = function.__route_path__
+
+        return wrapper_function
 
     @type_safe
     def create_body_wrapper(self, function  : Callable                ,     # Function to wrap

tests/unit/cli/test_Fast_API__CLI.py renamed to _to_refactor_to_separate_project/tests/cli/test_Fast_API__CLI.py

@@ -27,16 +27,16 @@
 EXPECTED_ROUTES_METHODS                 = [ 'info'            ,
                                             'openapi_python'  ,
                                             'redirect_to_docs',
-                                            'routes__html'    ,
-                                            'routes__json'    ,
+                                            #'routes__html'    ,
+                                            #'routes__json'    ,
                                             'set_auth_cookie' ,
                                             'set_cookie_form' ,
                                             'status'          ,
                                             'version'         ]
 EXPECTED_ROUTES__CONFIG                 = ['/config/info'          ,
                                            '/config/openapi.py'    ,
-                                           '/config/routes/html'   ,
-                                           '/config/routes/json'   ,
+                                           #'/config/routes/html'   ,
+                                           #'/config/routes/json'   ,
                                            '/config/status'        ,
                                            '/config/version'       ]
 EXPECTED_ROUTES__SET_COOKIE             = ['/auth/set-auth-cookie' ,
@@ -52,8 +52,8 @@
 ROUTES__CONFIG                          = [{ 'http_methods': ['GET'       ], 'http_path': Safe_Str__Fast_API__Route__Prefix('/config/info'         ) , 'method_name': 'info'               },
                                            { 'http_methods': ['GET'       ], 'http_path': Safe_Str__Fast_API__Route__Prefix('/config/status'       ) , 'method_name': 'status'             },
                                            { 'http_methods': ['GET'       ], 'http_path': Safe_Str__Fast_API__Route__Prefix('/config/version'      ) , 'method_name': 'version'            },
-                                           { 'http_methods': ['GET'       ], 'http_path': Safe_Str__Fast_API__Route__Prefix('/config/routes/json'  ) , 'method_name': 'routes__json'       },
-                                           { 'http_methods': ['GET'       ], 'http_path': Safe_Str__Fast_API__Route__Prefix('/config/routes/html'  ) , 'method_name': 'routes__html'       },
+                                           #{ 'http_methods': ['GET'       ], 'http_path': Safe_Str__Fast_API__Route__Prefix('/config/routes/json'  ) , 'method_name': 'routes__json'       },
+                                           #{ 'http_methods': ['GET'       ], 'http_path': Safe_Str__Fast_API__Route__Prefix('/config/routes/html'  ) , 'method_name': 'routes__html'       },
                                            { 'http_methods': ['GET'       ], 'http_path': Safe_Str__Fast_API__Route__Prefix('/config/openapi.py'   ) , 'method_name': 'openapi_python'     },
                                            { 'http_methods': ['GET'       ], 'http_path': Safe_Str__Fast_API__Route__Prefix('/auth/set-cookie-form') , 'method_name': 'set_cookie_form'    },
                                            { 'http_methods': ['POST'      ], 'http_path': Safe_Str__Fast_API__Route__Prefix('/auth/set-auth-cookie') , 'method_name': 'set_auth_cookie'    },]

osbot_fast_api/api/Fast_API.py

@@ -1,3 +1,4 @@
+import inspect
 from typing                                                                     import List, Union
 from pydantic_core                                                              import PydanticUndefined
 from osbot_fast_api.api.schemas.routes.Schema__Fast_API__Route                  import Schema__Fast_API__Route
@@ -16,8 +17,8 @@
 from starlette.middleware.wsgi                                                  import WSGIMiddleware
 from starlette.routing                                                          import Mount, Route
 from starlette.staticfiles                                                      import StaticFiles
-from osbot_fast_api.api.schemas.safe_str.Safe_Str__Fast_API__Route__Prefix          import Safe_Str__Fast_API__Route__Prefix
-from osbot_fast_api.api.schemas.enums.Enum__Fast_API__Route__Type                   import Enum__Fast_API__Route__Type
+from osbot_fast_api.api.schemas.safe_str.Safe_Str__Fast_API__Route__Prefix      import Safe_Str__Fast_API__Route__Prefix
+from osbot_fast_api.api.schemas.enums.Enum__Fast_API__Route__Type               import Enum__Fast_API__Route__Type
 
 class Fast_API__Route__Extractor(Type_Safe):                              # Dedicated class for route extraction
     app               : FastAPI
@@ -185,10 +186,10 @@ def extract__body_params(self, route: APIRoute):
         return body_params
 
     @type_safe
-    def extract__return_type(self, route: APIRoute):
-        # Get return type from endpoint callable
+    def extract__return_type(self, route: APIRoute):                                                # Get return type from endpoint callable
         if hasattr(route, 'endpoint') and route.endpoint:
-            import inspect
+            if hasattr(route.endpoint, '__original_return_type__'):                                 # check if Type_Safe__Route__Wrapper added the __original_return_type__
+                return route.endpoint.__original_return_type__
             sig = inspect.signature(route.endpoint)
             if sig.return_annotation != inspect.Parameter.empty:
                 return sig.return_annotation