otterapi 0.1.1__tar.gz → 0.1.2__tar.gz

{otterapi-0.1.1 → otterapi-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: otterapi
-Version: 0.1.1
+Version: 0.1.2
 Summary: A cute little companion that generates type-safe clients from OpenAPI documents.
 Project-URL: Source, https://github.com/danplischke/otter
 Author: Dan Plischke

{otterapi-0.1.1 → otterapi-0.1.2}/otterapi/codegen/codegen.py

@@ -1276,7 +1276,10 @@ class Codegen(OpenAPIProcessor):
         if type_checking_block:
             final_body.append(type_checking_block)
 
-        final_body.append(_all(sorted(endpoint_names)))
+        all_names: set[str] = set(endpoint_names)
+        if self.config.reexport_models:
+            all_names |= import_collector._imports.get(MODELS_MODULE, set())
+        final_body.append(_all(sorted(all_names)))
         final_body.extend(body)
 
         write_mod(final_body, path)
@@ -1580,6 +1583,7 @@ class Codegen(OpenAPIProcessor):
             pagination_config=self.config.pagination,
             response_unwrap_config=self.config.response_unwrap,
             export_config=self.config.export,
+            reexport_models=self.config.reexport_models,
         )
 
         emitted = emitter.emit(

{otterapi-0.1.1 → otterapi-0.1.2}/otterapi/codegen/splitting.py

@@ -607,6 +607,7 @@ class SplitModuleEmitter:
         pagination_config: PaginationConfig | None = None,
         response_unwrap_config: ResponseUnwrapConfig | None = None,
         export_config: ExportConfig | None = None,
+        reexport_models: bool = False,
     ):
         """Initialize the split module emitter.
 
@@ -620,6 +621,7 @@ class SplitModuleEmitter:
             pagination_config: Optional pagination configuration.
             response_unwrap_config: Optional response unwrap configuration.
             export_config: Optional export configuration.
+            reexport_models: Whether to include model names in __all__.
         """
         self.config = config
         self.output_dir = UPath(output_dir)
@@ -630,6 +632,7 @@ class SplitModuleEmitter:
         self.pagination_config = pagination_config
         self.response_unwrap_config = response_unwrap_config
         self.export_config = export_config
+        self.reexport_models = reexport_models
         self._emitted_modules: list[EmittedModule] = []
         self._typegen_types: dict[str, Type] = {}
 
@@ -1050,7 +1053,11 @@ class SplitModuleEmitter:
         endpoint_names: list[str],
     ) -> bool:
         """Emit sync+async export wrappers around the paginated ``_iter`` fns."""
-        if not self.export_config or not self.export_config.enabled or item_type_ast is None:
+        if (
+            not self.export_config
+            or not self.export_config.enabled
+            or item_type_ast is None
+        ):
             return False
         should_generate, formats, _path = (
             self.export_config.should_generate_for_endpoint(
@@ -1070,7 +1077,9 @@ class SplitModuleEmitter:
         ):
             fn, imports = build_standalone_paginated_export_fn(
                 fn_name=fn_name,
-                target_iter_fn_name=f'{endpoint.sync_fn_name}_iter' if not is_async else f'{endpoint.async_fn_name}_iter',
+                target_iter_fn_name=f'{endpoint.sync_fn_name}_iter'
+                if not is_async
+                else f'{endpoint.async_fn_name}_iter',
                 parameters=endpoint.parameters,
                 request_body_info=endpoint.request_body,
                 item_type_ast=item_type_ast,
@@ -1116,7 +1125,9 @@ class SplitModuleEmitter:
         ):
             fn, imports = build_standalone_export_fn(
                 fn_name=fn_name,
-                target_fn_name=endpoint.sync_fn_name if not is_async else endpoint.async_fn_name,
+                target_fn_name=endpoint.sync_fn_name
+                if not is_async
+                else endpoint.async_fn_name,
                 parameters=endpoint.parameters,
                 request_body_info=endpoint.request_body,
                 item_type_ast=item_type_ast,
@@ -1158,8 +1169,12 @@ class SplitModuleEmitter:
                 endpoint, pag_config.data_path
             )
             has_export_methods = self._emit_paginated_export_pair(
-                endpoint, item_type_ast, item_type_imports,
-                body, import_collector, endpoint_names,
+                endpoint,
+                item_type_ast,
+                item_type_imports,
+                body,
+                import_collector,
+                endpoint_names,
             )
         else:
             generated_paginated_df = False
@@ -1168,7 +1183,10 @@ class SplitModuleEmitter:
             )
             # Export for non-paginated endpoints
             has_export_methods = self._emit_standalone_export_pair(
-                endpoint, body, import_collector, endpoint_names,
+                endpoint,
+                body,
+                import_collector,
+                endpoint_names,
             )
 
         has_dataframe_methods = generated_paginated_df
@@ -1259,15 +1277,20 @@ class SplitModuleEmitter:
         endpoint_names: list[str] = []
 
         for endpoint in endpoints:
-            endpoint_has_df, endpoint_has_pagination, endpoint_has_export = self._emit_endpoint_functions(
-                endpoint, body, import_collector, endpoint_names
+            endpoint_has_df, endpoint_has_pagination, endpoint_has_export = (
+                self._emit_endpoint_functions(
+                    endpoint, body, import_collector, endpoint_names
+                )
             )
             has_dataframe_methods = has_dataframe_methods or endpoint_has_df
             has_pagination_methods = has_pagination_methods or endpoint_has_pagination
             has_export_methods = has_export_methods or endpoint_has_export
 
         type_checking_block = self._collect_module_file_imports(
-            import_collector, endpoints, has_dataframe_methods, has_pagination_methods,
+            import_collector,
+            endpoints,
+            has_dataframe_methods,
+            has_pagination_methods,
             has_export_methods,
         )
 
@@ -1277,7 +1300,12 @@ class SplitModuleEmitter:
         if type_checking_block:
             final_body.append(type_checking_block)
 
-        final_body.append(_all(sorted(endpoint_names)))
+        all_names = list(endpoint_names)
+        if self.reexport_models:
+            model_names = sorted(import_collector._imports.get(MODELS_MODULE, set()))
+            all_names = sorted(set(all_names) | set(model_names))
+
+        final_body.append(_all(sorted(all_names)))
         final_body.extend(body)
 
         file_path = UPath(file_path)

{otterapi-0.1.1 → otterapi-0.1.2}/otterapi/config.py

@@ -1003,6 +1003,15 @@ class DocumentConfig(BaseModel):
         None, description='Optional name for a generated client class.'
     )
 
+    reexport_models: bool = Field(
+        default=False,
+        description=(
+            'When True, all Pydantic models used in an endpoint module are '
+            "added to that module's ``__all__``, making them importable directly "
+            'from the endpoint module instead of only from the models module.'
+        ),
+    )
+
     module_split: ModuleSplitConfig = Field(
         default_factory=ModuleSplitConfig,
         description='Configuration for splitting endpoints into submodules.',