♻️ Extract yaml codec to a variable.

Author: rafalkrupinski

src/lapidary/render/load.py

@@ -4,17 +4,16 @@
 from pathlib import Path
 
 import httpx
-import ruamel.yaml
 
 from .config import Config
 
 logger = logging.getLogger(__name__)
 
 
 def load_document(root: Path, config: Config) -> Mapping:
-    logger.info('Load OpenAPI document')
+    from .yaml import yaml
 
-    yaml = ruamel.yaml.YAML(typ='safe')
+    logger.info('Load OpenAPI document')
 
     text = document_handler_for(root, config.document_path).load()
     return yaml.load(text)

src/lapidary/render/main.py

@@ -5,11 +5,11 @@
 
 import click
 import pydantic
-import ruamel.yaml
 
 from .config import Config, load_config
 from .load import document_handler_for, load_document
 from .model import conv_openapi, openapi, python
+from .yaml import yaml
 
 logger = logging.getLogger(__name__)
 
@@ -58,7 +58,6 @@ def init_project(
         package=package_name,
     )
 
-    yaml = ruamel.yaml.YAML(typ='safe')
     document = yaml.load(document_handler.load())
 
     init_project(project_root, config, document)
@@ -95,7 +94,6 @@ def progress(module: python.AbstractModule) -> None:
 def dump_model(project_root: Path, process: bool, output: TextIO):
     config = load_config(project_root)
     oa_doc = load_document(project_root, config)
-    yaml = ruamel.yaml.YAML(typ='safe')
 
     if not process:
         yaml.dump(oa_doc, output)

src/lapidary/render/yaml.py

@@ -0,0 +1,3 @@
+import ruamel.yaml
+
+yaml = ruamel.yaml.YAML(typ='safe')

tests/process/test_schema.py

@@ -3,17 +3,15 @@
 from pathlib import Path
 
 import pytest
-import ruamel.yaml
 from openapi_pydantic.v3.v3_1 import schema as schema31
 
 from lapidary.render import runtime
 from lapidary.render.model import conv_openapi, conv_schema, metamodel, openapi, python, stack
+from lapidary.render.yaml import yaml
 
 logging.basicConfig()
 logging.getLogger('lapidary').setLevel(logging.DEBUG)
 
-yaml = ruamel.yaml.YAML(typ='safe')
-
 
 @pytest.fixture
 def document() -> openapi.OpenAPI:

tests/process/test_security_scheme.py

@@ -1,19 +1,14 @@
 from pathlib import Path
 
 import pytest
-import ruamel.yaml
 
 from lapidary.render.model import conv_openapi, openapi, python
 from lapidary.render.model.stack import Stack
-
-
-@pytest.fixture()
-def yaml():
-    return ruamel.yaml.YAML(typ='safe')
+from lapidary.render.yaml import yaml
 
 
 @pytest.mark.parametrize('path', (Path(__file__).parent / 'security_schemes').glob('*'))
-def test_process_security_schemes(yaml: ruamel.yaml.YAML, path: Path):
+def test_process_security_schemes(path: Path):
     document = openapi.OpenAPI.model_validate(yaml.load(path.read_text()))
 
     converter = conv_openapi.OpenApi30Converter(python.ModulePath('package', False), document, None)

tests/process/test_servers.py

@@ -1,12 +1,10 @@
 from pathlib import Path
 
 import pytest
-import ruamel.yaml
 
 from lapidary.render.model import conv_openapi, openapi, python
 from lapidary.render.model.stack import Stack
-
-yaml = ruamel.yaml.YAML(typ='safe')
+from lapidary.render.yaml import yaml
 
 yaml_home = Path(__file__).parent / 'servers'
 test_files = [

tests/test_e2e.py

@@ -3,16 +3,9 @@
 from pathlib import Path
 
 import pytest
-import ruamel.yaml
 
 from lapidary.render.main import render_project
 
-
-@pytest.fixture()
-def yaml():
-    return ruamel.yaml.YAML(typ='safe')
-
-
 e2e_root = Path(__file__).parent / 'e2e'
 e2e_tests = [path.name for path in (e2e_root / 'init').iterdir() if path.is_dir()]
 
@@ -22,7 +15,7 @@ def yaml():
     e2e_tests,
     ids=e2e_tests,
 )
-def test_generate(yaml: ruamel.yaml.YAML, project_name: Path, tmp_path: Path) -> None:
+def test_generate(project_name: Path, tmp_path: Path) -> None:
     init_root = e2e_root / 'init' / project_name
     project_root = tmp_path / 'project'