Skip to content

SK-1909 Handle API error cases after fern migration #171

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
skyflow-vivek merged 6 commits into from
May 14, 2025
Merged

SK-1909 Handle API error cases after fern migration #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3f3a297
SK-1909 Update generated code
skyflow-vivek May 2, 2025
463ffc2
SK-1909 Handle API error cases after fern migration
skyflow-vivek May 2, 2025
f2ce452
SK-1909 Update fern generated code
skyflow-vivek May 12, 2025
a9a44d8
SK-1909 Handle invalid cluster ID error scenario
skyflow-vivek May 12, 2025
da88042
SK-1909 Fix inconsistencies and issues in Python SDK v2
skyflow-vivek May 14, 2025
d79488a
SK-1909 Fix issues in Python SDK v2
skyflow-vivek May 14, 2025
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 skyflow/error/_skyflow_error.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ def __init__(self,
request_id = None,
grpc_code = None,
http_status = None,
details = None):
details = []):
self.message = message
self.http_code = http_code
self.grpc_code = grpc_code
Expand Down
2 changes: 2 additions & 0 deletions skyflow/generated/rest/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# This file was auto-generated by Fern from our API Definition.

# isort: skip_file

from .types import (
AuditEventAuditResourceType,
AuditEventContext,
Expand Down
2 changes: 2 additions & 0 deletions skyflow/generated/rest/audit/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# This file was auto-generated by Fern from our API Definition.

# isort: skip_file

from .types import (
AuditServiceListAuditEventsRequestFilterOpsActionType,
AuditServiceListAuditEventsRequestFilterOpsContextAccessType,
Expand Down
266 changes: 109 additions & 157 deletions skyflow/generated/rest/audit/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,45 @@
# This file was auto-generated by Fern from our API Definition.

from ..core.client_wrapper import SyncClientWrapper
import typing
from .types.audit_service_list_audit_events_request_filter_ops_context_actor_type import (
AuditServiceListAuditEventsRequestFilterOpsContextActorType,

from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
from ..core.request_options import RequestOptions
from ..types.v_1_audit_response import V1AuditResponse
from .raw_client import AsyncRawAuditClient, RawAuditClient
from .types.audit_service_list_audit_events_request_filter_ops_action_type import (
AuditServiceListAuditEventsRequestFilterOpsActionType,
)
from .types.audit_service_list_audit_events_request_filter_ops_context_access_type import (
AuditServiceListAuditEventsRequestFilterOpsContextAccessType,
)
from .types.audit_service_list_audit_events_request_filter_ops_context_actor_type import (
AuditServiceListAuditEventsRequestFilterOpsContextActorType,
)
from .types.audit_service_list_audit_events_request_filter_ops_context_auth_mode import (
AuditServiceListAuditEventsRequestFilterOpsContextAuthMode,
)
from .types.audit_service_list_audit_events_request_filter_ops_action_type import (
AuditServiceListAuditEventsRequestFilterOpsActionType,
)
from .types.audit_service_list_audit_events_request_filter_ops_resource_type import (
AuditServiceListAuditEventsRequestFilterOpsResourceType,
)
from .types.audit_service_list_audit_events_request_sort_ops_order_by import (
AuditServiceListAuditEventsRequestSortOpsOrderBy,
)
from ..core.request_options import RequestOptions
from ..types.v_1_audit_response import V1AuditResponse
from ..core.pydantic_utilities import parse_obj_as
from ..errors.not_found_error import NotFoundError
from json.decoder import JSONDecodeError
from ..core.api_error import ApiError
from ..core.client_wrapper import AsyncClientWrapper


class AuditClient:
def __init__(self, *, client_wrapper: SyncClientWrapper):
self._client_wrapper = client_wrapper
self._raw_client = RawAuditClient(client_wrapper=client_wrapper)

@property
def with_raw_response(self) -> RawAuditClient:
"""
Retrieves a raw implementation of this client that returns raw responses.

Returns
-------
RawAuditClient
"""
return self._raw_client

def audit_service_list_audit_events(
self,
Expand Down Expand Up @@ -192,82 +200,62 @@ def audit_service_list_audit_events(
Examples
--------
from skyflow import Skyflow

client = Skyflow(
token="YOUR_TOKEN",
)
client.audit.audit_service_list_audit_events(
filter_ops_account_id="filterOps.accountID",
)
client = Skyflow(token="YOUR_TOKEN", )
client.audit.audit_service_list_audit_events(filter_ops_account_id='filterOps.accountID', )
"""
_response = self._client_wrapper.httpx_client.request(
"v1/audit/events",
method="GET",
params={
"filterOps.context.changeID": filter_ops_context_change_id,
"filterOps.context.requestID": filter_ops_context_request_id,
"filterOps.context.traceID": filter_ops_context_trace_id,
"filterOps.context.sessionID": filter_ops_context_session_id,
"filterOps.context.actor": filter_ops_context_actor,
"filterOps.context.actorType": filter_ops_context_actor_type,
"filterOps.context.accessType": filter_ops_context_access_type,
"filterOps.context.ipAddress": filter_ops_context_ip_address,
"filterOps.context.origin": filter_ops_context_origin,
"filterOps.context.authMode": filter_ops_context_auth_mode,
"filterOps.context.jwtID": filter_ops_context_jwt_id,
"filterOps.context.bearerTokenContextID": filter_ops_context_bearer_token_context_id,
"filterOps.parentAccountID": filter_ops_parent_account_id,
"filterOps.accountID": filter_ops_account_id,
"filterOps.workspaceID": filter_ops_workspace_id,
"filterOps.vaultID": filter_ops_vault_id,
"filterOps.resourceIDs": filter_ops_resource_i_ds,
"filterOps.actionType": filter_ops_action_type,
"filterOps.resourceType": filter_ops_resource_type,
"filterOps.tags": filter_ops_tags,
"filterOps.responseCode": filter_ops_response_code,
"filterOps.startTime": filter_ops_start_time,
"filterOps.endTime": filter_ops_end_time,
"filterOps.apiName": filter_ops_api_name,
"filterOps.responseMessage": filter_ops_response_message,
"filterOps.httpMethod": filter_ops_http_method,
"filterOps.httpURI": filter_ops_http_uri,
"sortOps.sortBy": sort_ops_sort_by,
"sortOps.orderBy": sort_ops_order_by,
"afterOps.timestamp": after_ops_timestamp,
"afterOps.changeID": after_ops_change_id,
"limit": limit,
"offset": offset,
},
_response = self._raw_client.audit_service_list_audit_events(
filter_ops_account_id=filter_ops_account_id,
filter_ops_context_change_id=filter_ops_context_change_id,
filter_ops_context_request_id=filter_ops_context_request_id,
filter_ops_context_trace_id=filter_ops_context_trace_id,
filter_ops_context_session_id=filter_ops_context_session_id,
filter_ops_context_actor=filter_ops_context_actor,
filter_ops_context_actor_type=filter_ops_context_actor_type,
filter_ops_context_access_type=filter_ops_context_access_type,
filter_ops_context_ip_address=filter_ops_context_ip_address,
filter_ops_context_origin=filter_ops_context_origin,
filter_ops_context_auth_mode=filter_ops_context_auth_mode,
filter_ops_context_jwt_id=filter_ops_context_jwt_id,
filter_ops_context_bearer_token_context_id=filter_ops_context_bearer_token_context_id,
filter_ops_parent_account_id=filter_ops_parent_account_id,
filter_ops_workspace_id=filter_ops_workspace_id,
filter_ops_vault_id=filter_ops_vault_id,
filter_ops_resource_i_ds=filter_ops_resource_i_ds,
filter_ops_action_type=filter_ops_action_type,
filter_ops_resource_type=filter_ops_resource_type,
filter_ops_tags=filter_ops_tags,
filter_ops_response_code=filter_ops_response_code,
filter_ops_start_time=filter_ops_start_time,
filter_ops_end_time=filter_ops_end_time,
filter_ops_api_name=filter_ops_api_name,
filter_ops_response_message=filter_ops_response_message,
filter_ops_http_method=filter_ops_http_method,
filter_ops_http_uri=filter_ops_http_uri,
sort_ops_sort_by=sort_ops_sort_by,
sort_ops_order_by=sort_ops_order_by,
after_ops_timestamp=after_ops_timestamp,
after_ops_change_id=after_ops_change_id,
limit=limit,
offset=offset,
request_options=request_options,
)
try:
if 200 <= _response.status_code < 300:
return typing.cast(
V1AuditResponse,
parse_obj_as(
type_=V1AuditResponse, # type: ignore
object_=_response.json(),
),
)
if _response.status_code == 404:
raise NotFoundError(
typing.cast(
typing.Dict[str, typing.Optional[typing.Any]],
parse_obj_as(
type_=typing.Dict[str, typing.Optional[typing.Any]], # type: ignore
object_=_response.json(),
),
)
)
_response_json = _response.json()
except JSONDecodeError:
raise ApiError(status_code=_response.status_code, body=_response.text)
raise ApiError(status_code=_response.status_code, body=_response_json)
return _response.data


class AsyncAuditClient:
def __init__(self, *, client_wrapper: AsyncClientWrapper):
self._client_wrapper = client_wrapper
self._raw_client = AsyncRawAuditClient(client_wrapper=client_wrapper)

@property
def with_raw_response(self) -> AsyncRawAuditClient:
"""
Retrieves a raw implementation of this client that returns raw responses.

Returns
-------
AsyncRawAuditClient
"""
return self._raw_client

async def audit_service_list_audit_events(
self,
Expand Down Expand Up @@ -427,83 +415,47 @@ async def audit_service_list_audit_events(

Examples
--------
import asyncio

from skyflow import AsyncSkyflow

client = AsyncSkyflow(
token="YOUR_TOKEN",
)


import asyncio
client = AsyncSkyflow(token="YOUR_TOKEN", )
async def main() -> None:
await client.audit.audit_service_list_audit_events(
filter_ops_account_id="filterOps.accountID",
)


await client.audit.audit_service_list_audit_events(filter_ops_account_id='filterOps.accountID', )
asyncio.run(main())
"""
_response = await self._client_wrapper.httpx_client.request(
"v1/audit/events",
method="GET",
params={
"filterOps.context.changeID": filter_ops_context_change_id,
"filterOps.context.requestID": filter_ops_context_request_id,
"filterOps.context.traceID": filter_ops_context_trace_id,
"filterOps.context.sessionID": filter_ops_context_session_id,
"filterOps.context.actor": filter_ops_context_actor,
"filterOps.context.actorType": filter_ops_context_actor_type,
"filterOps.context.accessType": filter_ops_context_access_type,
"filterOps.context.ipAddress": filter_ops_context_ip_address,
"filterOps.context.origin": filter_ops_context_origin,
"filterOps.context.authMode": filter_ops_context_auth_mode,
"filterOps.context.jwtID": filter_ops_context_jwt_id,
"filterOps.context.bearerTokenContextID": filter_ops_context_bearer_token_context_id,
"filterOps.parentAccountID": filter_ops_parent_account_id,
"filterOps.accountID": filter_ops_account_id,
"filterOps.workspaceID": filter_ops_workspace_id,
"filterOps.vaultID": filter_ops_vault_id,
"filterOps.resourceIDs": filter_ops_resource_i_ds,
"filterOps.actionType": filter_ops_action_type,
"filterOps.resourceType": filter_ops_resource_type,
"filterOps.tags": filter_ops_tags,
"filterOps.responseCode": filter_ops_response_code,
"filterOps.startTime": filter_ops_start_time,
"filterOps.endTime": filter_ops_end_time,
"filterOps.apiName": filter_ops_api_name,
"filterOps.responseMessage": filter_ops_response_message,
"filterOps.httpMethod": filter_ops_http_method,
"filterOps.httpURI": filter_ops_http_uri,
"sortOps.sortBy": sort_ops_sort_by,
"sortOps.orderBy": sort_ops_order_by,
"afterOps.timestamp": after_ops_timestamp,
"afterOps.changeID": after_ops_change_id,
"limit": limit,
"offset": offset,
},
_response = await self._raw_client.audit_service_list_audit_events(
filter_ops_account_id=filter_ops_account_id,
filter_ops_context_change_id=filter_ops_context_change_id,
filter_ops_context_request_id=filter_ops_context_request_id,
filter_ops_context_trace_id=filter_ops_context_trace_id,
filter_ops_context_session_id=filter_ops_context_session_id,
filter_ops_context_actor=filter_ops_context_actor,
filter_ops_context_actor_type=filter_ops_context_actor_type,
filter_ops_context_access_type=filter_ops_context_access_type,
filter_ops_context_ip_address=filter_ops_context_ip_address,
filter_ops_context_origin=filter_ops_context_origin,
filter_ops_context_auth_mode=filter_ops_context_auth_mode,
filter_ops_context_jwt_id=filter_ops_context_jwt_id,
filter_ops_context_bearer_token_context_id=filter_ops_context_bearer_token_context_id,
filter_ops_parent_account_id=filter_ops_parent_account_id,
filter_ops_workspace_id=filter_ops_workspace_id,
filter_ops_vault_id=filter_ops_vault_id,
filter_ops_resource_i_ds=filter_ops_resource_i_ds,
filter_ops_action_type=filter_ops_action_type,
filter_ops_resource_type=filter_ops_resource_type,
filter_ops_tags=filter_ops_tags,
filter_ops_response_code=filter_ops_response_code,
filter_ops_start_time=filter_ops_start_time,
filter_ops_end_time=filter_ops_end_time,
filter_ops_api_name=filter_ops_api_name,
filter_ops_response_message=filter_ops_response_message,
filter_ops_http_method=filter_ops_http_method,
filter_ops_http_uri=filter_ops_http_uri,
sort_ops_sort_by=sort_ops_sort_by,
sort_ops_order_by=sort_ops_order_by,
after_ops_timestamp=after_ops_timestamp,
after_ops_change_id=after_ops_change_id,
limit=limit,
offset=offset,
request_options=request_options,
)
try:
if 200 <= _response.status_code < 300:
return typing.cast(
V1AuditResponse,
parse_obj_as(
type_=V1AuditResponse, # type: ignore
object_=_response.json(),
),
)
if _response.status_code == 404:
raise NotFoundError(
typing.cast(
typing.Dict[str, typing.Optional[typing.Any]],
parse_obj_as(
type_=typing.Dict[str, typing.Optional[typing.Any]], # type: ignore
object_=_response.json(),
),
)
)
_response_json = _response.json()
except JSONDecodeError:
raise ApiError(status_code=_response.status_code, body=_response.text)
raise ApiError(status_code=_response.status_code, body=_response_json)
return _response.data
Loading
Loading