Skip to content

Commit

Permalink
Merge branch 'main' into amckinney/fern/path-parameters
Browse files Browse the repository at this point in the history
  • Loading branch information
amckinney committed Nov 21, 2024
2 parents c520a4f + 8f00632 commit 80924e1
Show file tree
Hide file tree
Showing 8 changed files with 171 additions and 101 deletions.
7 changes: 4 additions & 3 deletions fern/pages/changelogs/cli/2024-11-21.mdx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## 0.45.0-rc50
**`(feat):`** Add support for the `inline-path-parameters` setting in the OpenAPI
importer.

## 0.45.0-rc51
**`(feat):`** Add support for the `inline-path-parameters` setting in the OpenAPI importer.

## 0.45.0-rc50
**`(fix):`** Increase max recursive depth allowed for example validation.
4 changes: 4 additions & 0 deletions fern/pages/changelogs/python-sdk/2024-11-20.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
## 4.3.8
**`(fix):`** Include content-type headers when available as part of endpoint request generation.


7 changes: 7 additions & 0 deletions generators/python/sdk/versions.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
# For unreleased changes, use unreleased.yml
- version: 4.3.8
irVersion: 53
changelogEntry:
- type: fix
summary: |
Include content-type headers when available as part of endpoint request generation.
- version: 4.3.7
irVersion: 53
changelogEntry:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -262,36 +262,42 @@ def generate_single_function(
endpoint=self._endpoint,
named_parameters=named_parameters,
path_parameters=self._endpoint.all_path_parameters,
snippet=endpoint_snippets[0].snippet
if endpoint_snippets is not None and len(endpoint_snippets) > 0 and include_snippet
else None,
snippet=(
endpoint_snippets[0].snippet
if endpoint_snippets is not None and len(endpoint_snippets) > 0 and include_snippet
else None
),
),
signature=AST.FunctionSignature(
parameters=unnamed_parameters,
named_parameters=named_parameters,
return_type=self._get_endpoint_return_type(streaming_parameter=streaming_parameter),
),
body=self._create_endpoint_body_writer(
service=self._service,
endpoint=self._endpoint,
idempotency_headers=self._idempotency_headers,
request_body_parameters=self.request_body_parameters,
is_async=self._is_async,
parameters=unnamed_parameters,
named_parameters=named_parameters,
)
if not is_overloaded
else self._create_empty_body_writer(),
decorators=[
AST.Expression(
AST.Reference(
qualified_name_excluding_import=("overload",),
import_=AST.ReferenceImport(module=AST.Module.built_in(("typing",))),
)
body=(
self._create_endpoint_body_writer(
service=self._service,
endpoint=self._endpoint,
idempotency_headers=self._idempotency_headers,
request_body_parameters=self.request_body_parameters,
is_async=self._is_async,
parameters=unnamed_parameters,
named_parameters=named_parameters,
)
]
if is_overloaded
else [],
if not is_overloaded
else self._create_empty_body_writer()
),
decorators=(
[
AST.Expression(
AST.Reference(
qualified_name_excluding_import=("overload",),
import_=AST.ReferenceImport(module=AST.Module.built_in(("typing",))),
)
)
]
if is_overloaded
else []
),
)
return GeneratedEndpointFunction(
function=function_declaration,
Expand Down Expand Up @@ -372,17 +378,19 @@ def _get_endpoint_named_parameters(
name=get_parameter_name(header.name.name),
docs=header.docs,
type_hint=header_type_hint,
initializer=AST.Expression(
AST.FunctionInvocation(
function_definition=AST.Reference(
import_=AST.ReferenceImport(module=AST.Module.built_in(("os",))),
qualified_name_excluding_import=("getenv",),
),
args=[AST.Expression(f'"{header.env}"')],
initializer=(
AST.Expression(
AST.FunctionInvocation(
function_definition=AST.Reference(
import_=AST.ReferenceImport(module=AST.Module.built_in(("os",))),
qualified_name_excluding_import=("getenv",),
),
args=[AST.Expression(f'"{header.env}"')],
)
)
)
if header.env is not None
else None,
if header.env is not None
else None
),
),
)

Expand Down Expand Up @@ -510,9 +518,9 @@ def get_httpx_request(
return HttpX.make_request(
is_streaming=is_streaming,
is_async=is_async,
path=self._get_path_for_endpoint(endpoint=endpoint)
if not is_endpoint_path_empty(endpoint)
else None,
path=(
self._get_path_for_endpoint(endpoint=endpoint) if not is_endpoint_path_empty(endpoint) else None
),
url=self._get_environment_as_str(endpoint=endpoint),
method=method,
query_parameters=self._get_query_parameters_for_endpoint(endpoint=endpoint, parent_writer=writer),
Expand Down Expand Up @@ -1165,6 +1173,12 @@ def _get_headers_for_endpoint(
if endpoint.idempotent:
ir_headers += idempotency_headers

if endpoint.request_body is not None:
unioned_value = endpoint.request_body.get_as_union()
if unioned_value.type == "inlinedRequestBody":
if unioned_value.content_type is not None:
headers.append(("content-type", AST.Expression(f'"{unioned_value.content_type}"')))

for header in ir_headers:
literal_header_value = self._context.get_literal_header_value(header)
if literal_header_value is not None and type(literal_header_value) is str:
Expand Down Expand Up @@ -1443,9 +1457,11 @@ def generate_snippet(self) -> AST.Expression:
self.snippet_writer.get_snippet_for_named_parameter(
parameter_name=self.path_parameter_names[path_parameter.name],
# If there's no value put a None in place as path parameters are unnamed and cannot be skipped
value=path_parameter_value
if path_parameter_value is not None
else AST.Expression(AST.TypeHint.none()),
value=(
path_parameter_value
if path_parameter_value is not None
else AST.Expression(AST.TypeHint.none())
),
),
)

Expand Down
8 changes: 8 additions & 0 deletions packages/cli/cli/versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@
importer.
type: feat
irVersion: 53
version: 0.45.0-rc51

- changelogEntry:
- summary: |
Increase max recursive depth allowed for example validation.
type: fix
irVersion: 53
version: 0.45.0-rc50

- changelogEntry:
Expand All @@ -12,6 +19,7 @@
type: fix
irVersion: 53
version: 0.45.0-rc49

- changelogEntry:
- summary: |
OAuth Client Credential Auth Scheme now supports the ability to optionally
Expand Down

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

6 changes: 6 additions & 0 deletions seed/python-sdk/grpc-proto/src/seed/userservice/client.py

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

Loading

0 comments on commit 80924e1

Please sign in to comment.