Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bumpversion.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tool.bumpversion]
current_version = "1.19.0+260822"
current_version = "1.19.0+260829"
parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)\\+(?P<build>\\d+)"
serialize = ["{major}.{minor}.{patch}+{build}"]
search = "{current_version}"
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "rasenmaeher_api"
version = "1.19.0+260822"
version = "1.19.0+260829"
description = "python-rasenmaeher-api"
authors = [
{ name = "Aciid", email = "703382+Aciid@users.noreply.github.com" },
Expand Down
2 changes: 1 addition & 1 deletion src/rasenmaeher_api/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
"""python-rasenmaeher-api"""

__version__ = "1.19.0+260822" # NOTE Use `bump-my-version` to bump versions correctly
__version__ = "1.19.0+260829" # NOTE Use `bump-my-version` to bump versions correctly
6 changes: 5 additions & 1 deletion src/rasenmaeher_api/productapihelpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,11 @@ async def _method_to_product(
session = await get_session_winit()
async with session as client:
try:
url = f"{productconf['api']}{url_suffix}"
# Normalise the join: every manifest "api" value ends in "/" (see
# miniwerk manifests), so a suffix that also starts with one gave
# "https://host:4626//api/v1/..." — which Starlette does not route,
# so the product 404s and the caller sees only a swallowed None.
url = f"{productconf['api'].rstrip('/')}/{url_suffix.lstrip('/')}"
LOGGER.debug(f"calling {methodname}({url})")
if data is None:
resp = await getattr(client, methodname)(url, timeout=rmconf.integration_api_timeout)
Expand Down
2 changes: 1 addition & 1 deletion src/rasenmaeher_api/web/api/product/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ async def add_interop(
raise HTTPException(status_code=500, detail="Manifest does not have products key")
if tgtproduct not in manifest["products"]:
raise HTTPException(status_code=404, detail=f"Unknown product {tgtproduct}")
resp = await post_to_product(tgtproduct, "/api/v1/interop/add", srcproduct.model_dump(), OperationResultResponse)
resp = await post_to_product(tgtproduct, "api/v1/interop/add", srcproduct.model_dump(), OperationResultResponse)
if resp is None:
return OperationResultResponse(success=False, error="post_to_product returned None")
resp = cast(OperationResultResponse, resp)
Expand Down
2 changes: 1 addition & 1 deletion tests/test_rasenmaeher_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

def test_version() -> None:
"""Make sure version matches expected"""
assert __version__ == "1.19.0+260822"
assert __version__ == "1.19.0+260829"


@pytest.mark.asyncio(loop_scope="session")
Expand Down
2 changes: 1 addition & 1 deletion uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading