fixed nasty bug in the Fast_API openapi.json creation, which was not including the return Type_Safe class in it's definition (the fix was to add the method create_passthrough_wrapper to the Type_Safe__Route__Wrapper class

added large number of tests to the test_Type_Safe__Route__Wrapper that check for the new behaviour and check for any possible FastAPI and Pydantic side effects
updated to latest version of OSBot_Utils, which had a new location of the __ class

Author: DinisCruz

_to_refactor_to_separate_project/code/cli/Fast_API__CLI.py

@@ -7,7 +7,6 @@
 from osbot_fast_api.api.Fast_API import Fast_API
 from osbot_fast_api.utils.Fast_API_Server import Fast_API_Server
 from osbot_utils.type_safe.Type_Safe import Type_Safe
-from osbot_utils.utils.Objects import obj_data
 
 
 class Fast_API__CLI(Type_Safe):

osbot_fast_api/api/routes/type_safe/Type_Safe__Route__Wrapper.py

@@ -1,6 +1,6 @@
 import functools
 import inspect
-from typing                                                          import Callable
+from typing                                                          import Callable, get_type_hints
 from fastapi                                                         import HTTPException
 from fastapi.exceptions                                              import RequestValidationError
 from osbot_utils.type_safe.Type_Safe                                 import Type_Safe
@@ -18,7 +18,9 @@ def create_wrapper(self, function  : Callable                 ,         # Origin
                         ) -> Callable:                                      # Returns wrapper function
 
         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.return_type is not None:                                           # Even if no conversions needed, preserve return type for OpenAPI
+                return self.create_passthrough_wrapper(function, signature)                 # Create minimal wrapper that preserves return type annotation
+            return function                                                                 # No return type - return original
 
         if signature.has_body_params:                                                   # Different wrappers for different scenarios
             wrapper_function = self.create_body_wrapper(function, signature)
@@ -39,6 +41,33 @@ def create_wrapper(self, function  : Callable                 ,         # Origin
 
         return wrapper_function
 
+    @type_safe
+    def create_passthrough_wrapper(self, function  : Callable                ,     # Function to wrap
+                                         signature : Schema__Route__Signature      # Signature info
+                                    ) -> Callable:                                 # Returns minimal wrapper that preserves annotations
+
+        @functools.wraps(function)
+        def wrapper(*args, **kwargs):
+            return function(*args, **kwargs)                                        # Simply pass through to the original function
+
+        wrapper.__signature__ = inspect.signature(function)                         # Preserve the original signature
+
+        try:                                                                        # Build annotations dict including the return type
+            type_hints              = get_type_hints(function)
+            wrapper.__annotations__ = type_hints.copy()
+        except:
+            wrapper.__annotations__ = getattr(function, '__annotations__', {}).copy()   # Fallback to __annotations__ if get_type_hints fails
+
+        if signature.return_type is not None and 'return' not in wrapper.__annotations__:  # Ensure return type is set
+            wrapper.__annotations__['return'] = signature.return_type
+
+        wrapper.__original_return_type__ = signature.return_type                    # Preserve original return type metadata
+
+        if hasattr(function, '__route_path__'):                                     # Preserve route_path decorator if it exists
+            wrapper.__route_path__ = function.__route_path__
+
+        return wrapper
+
     @type_safe
     def create_body_wrapper(self, function  : Callable                ,     # Function to wrap
                                   signature : Schema__Route__Signature      # Signature info

osbot_fast_api/utils/Fast_API_Server.py

@@ -3,11 +3,11 @@
 from urllib.parse                    import urljoin
 from threading                       import Thread
 from fastapi                         import FastAPI
+from osbot_utils.utils.Objects       import base_types
 from osbot_utils.type_safe.Type_Safe import Type_Safe
 from osbot_utils.testing.Stderr      import Stderr
 from osbot_utils.testing.Stdout      import Stdout
 from osbot_utils.utils.Http          import wait_for_port, wait_for_port_closed, is_port_open, url_join_safe
-from osbot_utils.utils.Objects       import base_types
 from uvicorn                         import Config, Server
 from osbot_utils.utils.Misc          import random_port
 

tests/unit/api/routes/test_Fast_API__Routes.py

@@ -1,6 +1,7 @@
 from unittest                                                               import TestCase
 from fastapi                                                                import FastAPI, APIRouter
-from osbot_utils.utils.Objects                                              import __
+from osbot_utils.testing.__                                                 import __
+#from osbot_utils.testing.__                                                 import __
 from osbot_fast_api.api.routes.Fast_API__Routes                             import Fast_API__Routes
 from osbot_fast_api.api.routes.type_safe.Type_Safe__Route__Registration     import Type_Safe__Route__Registration
 from osbot_fast_api.api.schemas.safe_str.Safe_Str__Fast_API__Route__Prefix  import Safe_Str__Fast_API__Route__Prefix

tests/unit/api/routes/test_Fast_API__Routes__with_Type_Safe.py

@@ -1,14 +1,13 @@
-from unittest                                                                   import TestCase
-from dataclasses                                                                import dataclass
-from typing                                                                     import Optional, List
-
-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.type_safe.primitives.domains.files.safe_str.Safe_Str__File__Path  import Safe_Str__File__Path
-from osbot_utils.utils.Objects                                                  import __
-from pydantic                                                                   import BaseModel
-from osbot_fast_api.api.routes.Fast_API__Routes                                 import Fast_API__Routes
-from osbot_fast_api.api.Fast_API                                                import Fast_API
+from unittest                                                                       import TestCase
+from dataclasses                                                                    import dataclass
+from typing                                                                         import Optional, List
+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.type_safe.primitives.domains.files.safe_str.Safe_Str__File__Path   import Safe_Str__File__Path
+from osbot_utils.testing.__                                                         import __
+from pydantic                                                                       import BaseModel
+from osbot_fast_api.api.routes.Fast_API__Routes                                     import Fast_API__Routes
+from osbot_fast_api.api.Fast_API                                                    import Fast_API
 
 
 class test_Fast_API__Routes__with_Type_Safe(TestCase):

tests/unit/api/routes/type_safe/test_Type_Safe__Route__Converter.py

@@ -2,7 +2,7 @@
 from osbot_fast_api.api.schemas.routes.Schema__Route__Signature                           import Schema__Route__Signature
 from osbot_utils.type_safe.primitives.domains.web.safe_str.Safe_Str__Email                import Safe_Str__Email
 from osbot_utils.type_safe.primitives.domains.identifiers.safe_str.Safe_Str__Display_Name import Safe_Str__Display_Name
-from osbot_utils.utils.Objects                                                            import __
+from osbot_utils.testing.__                                                               import __
 from osbot_utils.type_safe.Type_Safe                                                      import Type_Safe
 from osbot_utils.type_safe.primitives.core.Safe_Str                                       import Safe_Str
 from osbot_utils.type_safe.primitives.core.Safe_Int                                       import Safe_Int