Skip to content
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

Switch to std-uritemplate #118

Merged
merged 5 commits into from
Sep 12, 2023
Merged

Switch to std-uritemplate #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
89968d1
Switch to std-uritemplate
andreaTP Sep 4, 2023
26592a0
minor fixes
andreaTP Sep 4, 2023
7d26998
bump std-uritemplate
andreaTP Sep 4, 2023
7fae319
bump version to include all the fixes
andreaTP Sep 4, 2023
3b2e249
Merge branch 'main' into switch-to-stduritemplate
samwelkanda Sep 12, 2023
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
5 changes: 2 additions & 3 deletions kiota_abstractions/request_information.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from uuid import UUID

from opentelemetry import trace
from uritemplate import URITemplate
from stduritemplate import StdUriTemplate

from ._version import VERSION
from .method import Method
Expand Down Expand Up @@ -74,14 +74,13 @@ def url(self) -> Url:
if not self.url_template:
raise Exception("Url Template cannot be null")

template = URITemplate(self.url_template)
data: Dict[str, Any] = {}
for key, val in self.query_parameters.items():
data[key] = val
for key, val in self.path_parameters.items():
data[key] = val

result = template.expand(data)
result = StdUriTemplate.expand(self.url_template, data)
return result

@url.setter
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ build-backend = "flit_core.buildapi"
name = "microsoft-kiota-abstractions"
authors = [{name = "Microsoft", email = "[email protected]"}]
dependencies = [
"uritemplate >=4.1.1",
"std-uritemplate >=0.0.38",
"opentelemetry-api >=1.19.0",
"opentelemetry-sdk >=1.19.0",
]
Expand Down
4 changes: 2 additions & 2 deletions requirements-dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ wrapt==1.15.0 ; python_version < '3.11'

yapf==0.40.1

uritemplate==4.1.1
std-uritemplate==0.0.38

opentelemetry-api==1.20.0

opentelemetry-sdk==1.20.0
opentelemetry-sdk==1.20.0