Skip to content

fix: openapi enum variant names #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChristianBeilschmidt merged 2 commits into from
Apr 14, 2026
Merged

fix: openapi enum variant names #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d5831e
fix openapi enum variant names
michaelmattig Mar 27, 2026
e48da0b
fix degenerated enum names OneOf
michaelmattig Apr 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1,055 changes: 972 additions & 83 deletions .generation/input/openapi.json
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions .generation/post-process/typescript.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ def file_modifications() -> Generator[tuple[Path, FileModifier], None, None]:
yield Path("models/TaskStatusWithId.ts"), task_status_with_id_ts
yield Path("models/VecUpdate.ts"), vec_update_ts
yield Path("models/TypedOperator.ts"), typed_operator_ts
yield Path("models/HistogramBounds.ts"), histogram_bounds_ts
yield Path("runtime.ts"), runtime_ts


Expand Down Expand Up @@ -173,5 +174,13 @@ def vec_update_ts(file_contents: list[str]) -> Generator[str, None, None]:
yield line


def histogram_bounds_ts(file_contents: list[str]) -> Generator[str, None, None]:
"""Fix TS2352 in HistogramBoundsToJSONTyped for Data | object oneOf."""
for line in file_contents:
yield line.replace(
"DataToJSON(value as Data)", "DataToJSON(value as unknown as Data)"
)


if __name__ == "__main__":
main()
25 changes: 13 additions & 12 deletions justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,9 @@ _default:
_clear:
@-clear


# Build all API clients by executing the build steps for each language.
[group('build')]
build: _clear \
_build-python-preprocess _build-rust-preprocess _build-typescript-preprocess \
_build_call \
_build-python-postprocess _build-rust-postprocess _build-typescript-postprocess
build: _clear _build-python-preprocess _build-rust-preprocess _build-typescript-preprocess _build_call _build-python-postprocess _build-rust-postprocess _build-typescript-postprocess

_build_call generator="":
{{ OPENAPI_GENERATOR_CLI }} generate {{ if generator == "" { "" } else { "--generator-key " + generator } }}
Expand Down Expand Up @@ -43,12 +39,13 @@ _build-python-postprocess:

# Build the API clients for TypeScript by generating code with the OpenAPI Generator and applying post-processing steps. Also install npm dependencies and set up .gitignore.
[group('build')]
build-typescript: _clear (_build_call "typescript") _build-typescript-postprocess
build-typescript: _clear _build-typescript-preprocess (_build_call "typescript") _build-typescript-postprocess

# Remove some directories because they are not be overwritten by the generator.
_build-typescript-preprocess:
rm -rf \
typescript/src \
typescript/docs \
typescript/dist \
typescript/node_modules \
typescript/diffs
Expand All @@ -69,6 +66,9 @@ build-rust: _clear _build-rust-preprocess (_build_call "rust") _build-rust-postp

_build-rust-preprocess:
rm -rf \
rust/src/apis \
rust/src/models \
rust/docs \
rust/diffs

_build-rust-postprocess:
Expand All @@ -85,7 +85,8 @@ lint-openapi-spec: _clear
--recommend

# Generate the OpenAPI Generator configuration files from the config.ini.
[group('config'), script("python3")]
[group('config')]
[script("python3")]
update-generator-configs:
import configparser
import json
Expand Down Expand Up @@ -122,8 +123,8 @@ update-generator-configs:
print("Generated OpenAPI Generator configuration for TypeScript, Python, and Rust.")

# Update the backend commit in the config.ini and increment the version.
[group('config')]
[arg("backendCommit", long="backendCommit", help="The commit hash of the backend for which to fetch the OpenAPI specification.")]
[group('config')]
update-config backendCommit: _clear (_update-config backendCommit) update-generator-configs (fetch-openapi-spec backendCommit) lint-openapi-spec

[script("python3")]
Expand Down Expand Up @@ -153,8 +154,8 @@ _update-config backendCommit:
print(f"Updated {INI_FILE} with backendCommit={config['input']['backendCommit']} and version={config['general']['version']}.")

# Fetch the OpenAPI specification for the given backend commit from the Geo Engine repository and save it to the input directory.
[group('config')]
[arg("backendCommit", long="backendCommit", help="The commit hash of the backend for which to fetch the OpenAPI specification.")]
[group('config')]
fetch-openapi-spec backendCommit:
@echo "Fetching OpenAPI specification for backend commit {{ backendCommit }}…"
curl \
Expand All @@ -181,11 +182,11 @@ test: _clear test-python test-rust test-typescript
test-python: _clear
#!/usr/bin/env bash
python3 -m venv .venv && source .venv/bin/activate || source .venv/bin/activate

python -m pip install --upgrade pip
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
if [ -f test-requirements.txt ]; then pip install -r test-requirements.txt; fi

pytest

[group('test')]
Expand All @@ -198,4 +199,4 @@ test-rust: _clear
[working-directory("typescript")]
test-typescript: _clear
npm install
npm run build
npm run build
Loading
Loading