Skip to content

fix(vdp): fix update pipeline parameter #233

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
merged 1 commit into from
Oct 15, 2024
Merged

fix(vdp): fix update pipeline parameter #233

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
66 changes: 34 additions & 32 deletions instill/clients/pipeline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,11 +315,6 @@ def update_pipeline(
namespace_id: str,
pipeline_id: str,
description: str,
readme: str,
tags: List[str],
source_url: str,
documentation_url: str,
license_url: str,
recipe: Optional[dict] = None,
raw_recipe: str = "",
async_enabled: bool = False,
Expand All @@ -330,11 +325,6 @@ def update_pipeline(
id=pipeline_id,
description=description,
raw_recipe=raw_recipe,
readme=readme,
tags=tags,
source_url=source_url,
documentation_url=documentation_url,
license=license_url,
)

if recipe is None:
Expand Down Expand Up @@ -672,11 +662,9 @@ def create_pipeline_release(
namespace_id: str,
pipeline_id: str,
release_id: str,
name: str,
description: str,
alias: str,
readme: str,
release: pipeline_interface.PipelineRelease,
name: str = "",
description: str = "",
alias: str = "",
recipe: Optional[dict] = None,
raw_recipe: str = "",
metadata: Optional[dict] = None,
Expand All @@ -687,7 +675,6 @@ def create_pipeline_release(
name=name,
description=description,
alias=alias,
readme=readme,
raw_recipe=raw_recipe,
)

Expand Down Expand Up @@ -796,26 +783,27 @@ def update_pipeline_release(
namespace_id: str,
pipeline_id: str,
release_id: str,
recipe: Struct,
readme: str,
description: str = "",
recipe: Optional[dict] = None,
raw_recipe: str = "",
async_enabled: bool = False,
) -> pipeline_interface.UpdateNamespacePipelineReleaseResponse:
release = pipeline_interface.PipelineRelease(
name=f"namespaces/{namespace_id}/models/{pipeline_id}/releases/{release_id}",
id=release_id,
recipe=recipe,
readme=readme,
description=description,
raw_recipe=raw_recipe,
)

if recipe is None:
recipe = {}
release.recipe.update(recipe)

update_mask = field_mask_pb2.FieldMask()
update_mask.paths.extend(
[
"recipe",
"readme",
"tags",
"source_url",
"documentation_url",
"license",
"description",
]
)

Expand Down Expand Up @@ -1484,8 +1472,8 @@ def create_connection(
scopes=scopes,
)

if setup is None:
setup = {}
setup = {} if setup is None else setup
connection.setup.Clear()
connection.setup.update(setup)
if o_auth_access_details is None:
o_auth_access_details = {}
Expand Down Expand Up @@ -1524,7 +1512,7 @@ def update_connection(
scopes: Optional[List[str]] = None,
identity: Optional[str] = None,
setup: Optional[dict] = None,
o_auth_access_details: Optional[dict] = None,
# o_auth_access_details: Optional[dict] = None,
is_oauth: bool = False,
async_enabled: bool = False,
) -> integration_interface.UpdateNamespaceConnectionResponse:
Expand All @@ -1533,17 +1521,27 @@ def update_connection(
connection = integration_interface.Connection(
namespace_id=namespace_id,
integration_id=integration_id,
id=connection_id,
scopes=scopes,
identity=identity,
)

if setup is None:
setup = {}
connection.setup.Clear()
connection.setup.update(setup)
if o_auth_access_details is None:
o_auth_access_details = {}
connection.o_auth_access_details.update(o_auth_access_details)
# if o_auth_access_details is None:
# o_auth_access_details = {}
# connection.o_auth_access_details.Clear()
# connection.o_auth_access_details.update(o_auth_access_details)

update_mask = field_mask_pb2.FieldMask()
update_mask.paths.extend(
[
"setup",
"scopes",
"identity",
]
)

if is_oauth:
connection.method = integration_interface.Connection.Method.METHOD_OAUTH
Expand All @@ -1556,15 +1554,19 @@ def update_connection(
return RequestFactory(
method=self.host.async_client.UpdateNamespaceConnection,
request=integration_interface.UpdateNamespaceConnectionRequest(
connection_id=connection_id,
connection=connection,
update_mask=update_mask,
),
metadata=self.host.metadata + self.metadata,
).send_async()

return RequestFactory(
method=self.host.client.UpdateNamespaceConnection,
request=integration_interface.UpdateNamespaceConnectionRequest(
connection_id=connection_id,
connection=connection,
update_mask=update_mask,
),
metadata=self.host.metadata + self.metadata,
).send_sync()
Expand Down
Loading