first working version of Fast_API__Client__Generator :)

Author: DinisCruz

osbot_fast_api/client/Client__Generator__AST.py

@@ -481,7 +481,7 @@ def _build_response_handling(self, endpoint: Schema__Endpoint__Contract,
         else:
             return '''
                                                                                     # Return response data
-            return result.json if result.json else result.text'''
+        return result.json if result.json else result.text'''
 
     def _generate_module_aggregator(self, module        : Schema__Routes__Module,  # Module to generate aggregator for
                                          route_classes  : List[str]                # Route classes to aggregate

osbot_fast_api/client/Fast_API__Client__Generator.py

@@ -21,7 +21,7 @@ def generate_client(self, client_name: Optional[str] = None                    #
         contract = self.extract_contract()
                                                                                    # Generate client code
         generator = Client__Generator__AST(contract    = contract    ,
-                                          client_name = client_name  )
+                                           client_name = client_name  )
 
         return generator.generate_client_files()
 
@@ -51,7 +51,7 @@ def print_client_summary(self):                                               #
 
         contract = self.extract_contract()
 
-        print(f"Service: {contract.service_name} v{contract.version}")
+        print(f"Service: {contract.service_name} {contract.version}")
         print(f"Modules: {len(contract.modules)}")
         print(f"Total Endpoints: {len(contract.endpoints)}")
         print()

osbot_fast_api/client/Fast_API__Contract__Extractor.py

@@ -95,10 +95,12 @@ def extract_endpoint_contracts(self, route_data: Schema__Fast_API__Route
         for http_method in (http_methods or [Enum__Http__Method.GET]):                      # Create one contract per HTTP method
             operation_id = f"{http_method.value.lower()}__{method_name}"                    # Create operation_id with HTTP method prefix
 
-            endpoint = Schema__Endpoint__Contract(operation_id = operation_id   ,
-                                                  path_pattern = http_path      ,
-                                                  method       = http_method    ,
-                                                  route_method = method_name    )
+            endpoint = Schema__Endpoint__Contract(operation_id = operation_id            ,
+                                                  path_pattern = http_path               ,
+                                                  method       = http_method             ,
+                                                  route_method = method_name             ,
+                                                  path_params  = route_data.path_params  ,      # Copy extracted params
+                                                  query_params = route_data.query_params )      # Copy extracted params
 
             endpoint_func = None                                                            # Find the actual endpoint function (same for all methods)
             for route_obj in self.fast_api.app().routes:
@@ -109,15 +111,6 @@ def extract_endpoint_contracts(self, route_data: Schema__Fast_API__Route
                         qualname = route_obj.endpoint.__qualname__                          # Extract route class
                         if '.' in qualname:
                             endpoint.route_class = qualname.split('.')[0]
-                        #raise Exception("Code below can be deleted since have captured this on the Fast_API__Route__Extrator")
-                        # if hasattr(route_obj, 'path_regex'):                                # Extract path parameters
-                        #     param_pattern = r'\{(\w+)\}'
-                        #     path_params   = re.findall(param_pattern, http_path)
-                        #     for param_name in path_params:
-                        #         endpoint.path_params.append(Schema__Endpoint__Param(name       = param_name,
-                        #                                                             location   = Enum__Param__Location.PATH,
-                        #                                                             param_type = 'str'                     ))
-                        # break
 
             # Enhance with function signature analysis (same for all methods)
             if endpoint_func:

tests/unit/client/test_Client__Generator__AST.py

@@ -367,7 +367,7 @@ def test__build_response_handling(self):                                       #
             assert code =="""\
 
                                                                                     # Return response data
-            return result.json if result.json else result.text"""
+        return result.json if result.json else result.text"""
 
             assert "# Return response data" in code
             assert "return result.json if result.json else result.text" in code