|
8 | 8 | from .base import ( |
9 | 9 | append_dependency_files, |
10 | 10 | collect_source_dependencies, |
11 | | - copy_source_tree, |
12 | 11 | DetectedEnvironment, |
13 | | - ensure_vendor_package, |
14 | 12 | iter_python_files, |
15 | 13 | module_path, |
| 14 | + prepare_import_package, |
16 | 15 | render_importer_template, |
17 | | - safe_vendor_dir_name, |
18 | 16 | write_text, |
19 | 17 | ) |
20 | 18 |
|
@@ -209,39 +207,20 @@ def generate( |
209 | 207 | env_name: str, |
210 | 208 | detected: DetectedEnvironment, |
211 | 209 | ) -> None: |
212 | | - from openenv.cli.commands.init import ( |
213 | | - _copy_template_directory, |
214 | | - _create_template_replacements, |
215 | | - ) |
216 | | - |
217 | | - replacements = _create_template_replacements(env_name) |
218 | | - _copy_template_directory( |
219 | | - "openenv.cli.templates.openenv_env", |
220 | | - "", |
221 | | - destination, |
222 | | - replacements, |
223 | | - env_name, |
224 | | - ) |
225 | | - |
226 | | - vendor_dir = safe_vendor_dir_name(source) |
227 | | - vendor_path = destination / "vendor" / vendor_dir |
228 | | - copy_source_tree(source, vendor_path) |
229 | | - ensure_vendor_package(vendor_path) |
230 | | - |
231 | | - prefix = replacements["__ENV_CLASS_NAME__"] |
| 210 | + package = prepare_import_package(source, destination, env_name) |
232 | 211 | write_text( |
233 | 212 | destination / "server" / f"{env_name}_environment.py", |
234 | 213 | _wrapper_source( |
235 | 214 | env_name=env_name, |
236 | | - class_name_prefix=prefix, |
| 215 | + class_name_prefix=package.class_name_prefix, |
237 | 216 | source_module=detected.module_path, |
238 | 217 | source_class=detected.class_name, |
239 | | - vendor_dir=vendor_dir, |
| 218 | + vendor_dir=package.vendor_dir, |
240 | 219 | ), |
241 | 220 | ) |
242 | 221 | write_text( |
243 | 222 | destination / "server" / "app.py", |
244 | | - _app_source(env_name=env_name, class_name_prefix=prefix), |
| 223 | + _app_source(env_name=env_name, class_name_prefix=package.class_name_prefix), |
245 | 224 | ) |
246 | 225 | dependencies = collect_source_dependencies(source) |
247 | 226 | for dependency in detect_ors_dependencies(source): |
|
0 commit comments