From f47436991de81c8c2926413a65883e6ca69c28f2 Mon Sep 17 00:00:00 2001 From: LouisSzeto Date: Tue, 23 Jul 2024 22:32:47 +0800 Subject: [PATCH] code gen sphinx refactor --- .github/workflows/code_generators.yml | 3 +-- code-generators/indicator_reference_code_generator.py | 5 +---- ...g-algorithm-api-reference-sphinx-code-generator.py | 11 ++++++----- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/code_generators.yml b/.github/workflows/code_generators.yml index fd873a732d..5ad7650d40 100644 --- a/.github/workflows/code_generators.yml +++ b/.github/workflows/code_generators.yml @@ -21,8 +21,7 @@ jobs: market-hour-code-generator, Supported-Assets-Table-Code-Generator, us-energy-indicators-code-generator, - writing-algorithm-api-reference-sphinx-code-generator, - indicator_reference_code_generator # must be after writing-algorithm-api-reference-sphinx-code-generator + writing-algorithm-api-reference-sphinx-code-generator ] runs-on: ubuntu-20.04 diff --git a/code-generators/indicator_reference_code_generator.py b/code-generators/indicator_reference_code_generator.py index ccded6273f..1acdac6921 100644 --- a/code-generators/indicator_reference_code_generator.py +++ b/code-generators/indicator_reference_code_generator.py @@ -261,7 +261,4 @@ def find_indicator_type(base_type): $csharpProperties = {indicator['properties'][0]}; $pythonProperties = {indicator['py_properties'][0]}; include(DOCS_RESOURCES."/indicators/indicator-history.php"); -?>""") - -if __name__ == '__main__': - Generate_Indicators_Reference() \ No newline at end of file +?>""") \ No newline at end of file diff --git a/code-generators/writing-algorithm-api-reference-sphinx-code-generator.py b/code-generators/writing-algorithm-api-reference-sphinx-code-generator.py index 61653ccd34..943164b81f 100644 --- a/code-generators/writing-algorithm-api-reference-sphinx-code-generator.py +++ b/code-generators/writing-algorithm-api-reference-sphinx-code-generator.py @@ -5,6 +5,7 @@ import re import shutil from urllib.request import urlopen +from indicator_reference_code_generator import Generate_Indicators_Reference from _code_generation_helpers import get_all_indicators, _type_conversion, extract_xml_content, title_to_dash_linked_lower_case LEAN = "https://github.com/QuantConnect/Lean/blob/master" @@ -36,9 +37,8 @@ .subsection-content { margin-left: 10px; } ''' -TYPE_ORDER = ["bool", "int", "long", "float", "single", "double", "decimal", "string", "str", - "datetime", "timespan", "timedelta", "list", "set", "ienumerable", "dictionary", "dict", - "callable", "func"] +TYPE_ORDER = ["bool", "int", "long", "float", "single", "double", "decimal", "string", "str", "datetime", "timespan", "timedelta"] +JOINT_TYPE_ORDER = ["list", "set", "ienumerable", "dictionary", "dict", "callable", "func", "action"] DOCS_ATTR = {} EXTRAS = {} @@ -357,7 +357,7 @@ def _merge_args(old_dict, new_dict): def _type_sorting(arg): null = arg is None if not null: - arg_type = arg.lower().split('[')[0].split('<')[0] + arg_type = arg.split('[')[0].split('<')[0].lower() pyobj = "pyobject" in arg_type try: joint_type = JOINT_TYPE_ORDER.index(arg_type) @@ -545,4 +545,5 @@ def _get_field_return(return_type_name, description, source_url, line_num, langu if __name__ == '__main__': - render_docs() \ No newline at end of file + render_docs() + Generate_Indicators_Reference() \ No newline at end of file