mirror of
https://github.com/mealie-recipes/mealie.git
synced 2025-05-24 01:12:54 -04:00
9ecef4c25f
This PR does too many things :(
1. Major refactoring of the dev/scripts and dev/code-generation folders.
Primarily this was removing duplicate code and cleaning up some poorly written code snippets as well as making them more idempotent so then can be re-run over and over again but still maintain the same results. This is working on my machine, but I've been having problems in CI and comparing diffs so running generators in CI will have to wait.
2. Re-Implement using the generated api routes for testing
This was a _huge_ refactor that touched damn near every test file but now we have auto-generated typed routes with inline hints and it's used for nearly every test excluding a few that use classes for better parameterization. This should greatly reduce errors when writing new tests.
3. Minor Perf improvements for the All Recipes endpoint
A. Removed redundant loops
B. Uses orjson to do the encoding directly and returns a byte response instead of relying on the default
jsonable_encoder.
4. Fix some TS type errors that cropped up for seemingly no reason half way through the PR.
See this issue https://github.com/phillipdupuis/pydantic-to-typescript/issues/28
Basically, the generated TS type is not-correct since Pydantic will automatically fill in null fields. The resulting TS type is generated with a ? to indicate it can be null even though we _know_ that i can't be.
109 lines
2.8 KiB
Python
109 lines
2.8 KiB
Python
import logging
|
|
import re
|
|
from dataclasses import dataclass
|
|
from pathlib import Path
|
|
|
|
import black
|
|
import isort
|
|
from jinja2 import Template
|
|
from rich.logging import RichHandler
|
|
|
|
FORMAT = "%(message)s"
|
|
logging.basicConfig(level=logging.INFO, format=FORMAT, datefmt="[%X]", handlers=[RichHandler()])
|
|
|
|
log = logging.getLogger("rich")
|
|
|
|
|
|
def render_python_template(template_file: Path | str, dest: Path, data: dict):
|
|
"""Render and Format a Jinja2 Template for Python Code"""
|
|
if isinstance(template_file, Path):
|
|
tplt = Template(template_file.read_text())
|
|
else:
|
|
tplt = Template(template_file)
|
|
|
|
text = tplt.render(data=data)
|
|
|
|
text = black.format_str(text, mode=black.FileMode())
|
|
|
|
dest.write_text(text)
|
|
isort.file(dest)
|
|
|
|
|
|
@dataclass
|
|
class CodeSlicer:
|
|
start: int
|
|
end: int
|
|
|
|
indentation: str
|
|
text: list[str]
|
|
|
|
_next_line = None
|
|
|
|
def purge_lines(self) -> None:
|
|
start = self.start + 1
|
|
end = self.end
|
|
del self.text[start:end]
|
|
|
|
def push_line(self, string: str) -> None:
|
|
self._next_line = self._next_line or self.start + 1
|
|
self.text.insert(self._next_line, self.indentation + string + "\n")
|
|
self._next_line += 1
|
|
|
|
|
|
def get_indentation_of_string(line: str, comment_char: str = "//") -> str:
|
|
return re.sub(rf"{comment_char}.*", "", line).removesuffix("\n")
|
|
|
|
|
|
def find_start_end(file_text: list[str], gen_id: str) -> tuple[int, int, str]:
|
|
start = None
|
|
end = None
|
|
indentation = None
|
|
|
|
for i, line in enumerate(file_text):
|
|
if "CODE_GEN_ID:" in line and gen_id in line:
|
|
start = i
|
|
indentation = get_indentation_of_string(line)
|
|
if f"END: {gen_id}" in line:
|
|
end = i
|
|
|
|
if start is None or end is None:
|
|
raise Exception("Could not find start and end of code generation block")
|
|
|
|
if start > end:
|
|
raise Exception(f"Start ({start=}) of code generation block is after end ({end=})")
|
|
|
|
return start, end, indentation
|
|
|
|
|
|
def inject_inline(file_path: Path, key: str, code: list[str]) -> None:
|
|
"""Injects a list of strings into the file where the key is found in the format defined
|
|
by the code-generation. Strings are properly indented and a '\n' is added to the end of
|
|
each string.
|
|
|
|
Start -> 'CODE_GEN_ID: <key>'
|
|
End -> 'END: <key>'
|
|
|
|
If no 'CODE_GEN_ID: <key>' is found, and exception is raised
|
|
|
|
Args:
|
|
file_path (Path): Write to file
|
|
key (str): CODE_GEN_ID: <key>
|
|
code (list[str]): List of strings to inject.
|
|
|
|
"""
|
|
|
|
with open(file_path) as f:
|
|
file_text = f.readlines()
|
|
|
|
start, end, indentation = find_start_end(file_text, key)
|
|
|
|
slicer = CodeSlicer(start, end, indentation, file_text)
|
|
|
|
slicer.purge_lines()
|
|
|
|
for line in code:
|
|
slicer.push_line(line)
|
|
|
|
with open(file_path, "w") as file:
|
|
file.writelines(slicer.text)
|