Skip to content

fix: allow hyphens in parameter names #978

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.

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

Closed

Conversation

harabat
Copy link
Contributor

@harabat harabat commented Feb 23, 2024

Fixes #976:

openapi-python-client fails to generate endpoints and throws incorrect path templating warnings when the path has a parameter with a hyphen.

@harabat harabat changed the title allow hyphens in parameter names fix: allow hyphens in parameter names Feb 23, 2024
@harabat
Copy link
Contributor Author

harabat commented Feb 23, 2024

Sorry, was too quick to suggest the PR: after testing, it needs more work, as the hyphenated parameter names are identified, but not correctly replaced with their python_name in the generated code. Please leave it open, unless you prefer that I make a new PR.

@harabat
Copy link
Contributor Author

harabat commented Mar 3, 2024

Closed in favour of #986 and #987.

@harabat harabat closed this Mar 3, 2024
@harabat harabat deleted the harabat-path-param-regex-1 branch March 3, 2024 12:52
github-merge-queue bot pushed a commit that referenced this pull request Mar 6, 2024
Fixes #976 and #578, and replaces #978.

@dbanty please choose your preferred approach between this and PR #987.

The original issue is that `openapi-python-client` throws `incorrect
path templating` warnings when the path has a parameter with a hyphen
and consequently fails to generate the endpoints.

---

The first commit ensures that hyphens are recognised as allowed
delimiters in parameter path names. This allows the endpoints to be
generated.

However, this generates lines like these:

```python
def _get_kwargs(
    user_id: int,
) -> Dict[str, Any]:
    _kwargs: Dict[str, Any] = {
        "method": "post",
        "url": "/activitypub/user-id/{user-id}/inbox".format(user-id=user_id,),
    }
    return _kwargs
```

Since Python variable names cannot contain hyphens, the `user-id`
parameter name here will trigger errors (starting with `ruff`).

---

The second commit replaces parameter names with their `python_name` in
`__init__.py` and passes the modified path to
`templates/endpoint_module.py.jinja`.

This fixes the issue and allows endpoints to be generated correctly. 

---

#987 is a different option for the second commit which instead creates a
custom Jinja filter in `utils.py` and so that the parameter names in
`endpoint.path` can be converted to their python names directly in
`templates/endpoint_module.py.jinja`.

Both approaches are equivalent and have been tested with different
parameter names (snake case, camel case, kebab case, mixed).

---------

Co-authored-by: harabat <[email protected]>
Co-authored-by: Dylan Anthony <[email protected]>
Co-authored-by: Dylan Anthony <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Endpoints with hyphens in parameter names trigger Incorrect path templating warning, are not generated
1 participant