Skip to content

Commit 5d4b2f4

Browse files
SK-1908: Migrate Python SDK from openapi generator to Fern SDK generator (#166)
* SK-1908: Migrate from openapi generator to Fern
1 parent b98aab0 commit 5d4b2f4

File tree

168 files changed

+7131
-12338
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

168 files changed

+7131
-12338
lines changed

ci-scripts/bump_version.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ then
77

88
sed -E "s/current_version = .+/current_version = '$SEMVER'/g" setup.py > tempfile && cat tempfile > setup.py && rm -f tempfile
99
sed -E "s/SDK_VERSION = .+/SDK_VERSION = '$SEMVER'/g" skyflow/utils/_version.py > tempfile && cat tempfile > skyflow/utils/_version.py && rm -f tempfile
10+
sed -E "s/__version__ = .+/__version__ = '$SEMVER'/g" skyflow/generated/rest/version.py > tempfile && cat tempfile > skyflow/generated/rest/version.py && rm -f tempfile
1011

1112
echo --------------------------
1213
echo "Done, Package now at $1"
@@ -18,6 +19,7 @@ else
1819

1920
sed -E "s/current_version = .+/current_version = '$DEV_VERSION'/g" setup.py > tempfile && cat tempfile > setup.py && rm -f tempfile
2021
sed -E "s/SDK_VERSION = .+/SDK_VERSION = '$DEV_VERSION'/g" skyflow/utils/_version.py > tempfile && cat tempfile > skyflow/utils/_version.py && rm -f tempfile
22+
sed -E "s/__version__ = .+/__version__ = '$DEV_VERSION'/g" skyflow/generated/rest/version.py > tempfile && cat tempfile > skyflow/generated/rest/version.py && rm -f tempfile
2123

2224
echo --------------------------
2325
echo "Done, Package now at $DEV_VERSION"

requirements.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ PyJWT~=2.9.0
88
requests~=2.32.3
99
coverage
1010
cryptography
11-
python-dotenv~=1.0.1
11+
python-dotenv~=1.0.1
12+
httpx

setup.py

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,18 @@
2020
description='Skyflow SDK for the Python programming language',
2121
long_description=open('README.rst').read(),
2222
install_requires=[
23-
'python_dateutil >= 2.5.3',
24-
'setuptools >= 21.0.0',
25-
'urllib3 >= 1.25.3, < 2.1.0',
26-
'pydantic >= 2',
27-
'typing-extensions >= 4.7.1',
28-
'DateTime~=5.5',
29-
'PyJWT~=2.9.0',
30-
'requests~=2.32.3',
31-
'coverage',
32-
'cryptography',
33-
'python-dotenv~=1.0.1'
34-
],
35-
python_requires=">=3.8"
23+
'python_dateutil >= 2.5.3',
24+
'setuptools >= 21.0.0',
25+
'urllib3 >= 1.25.3, < 2.1.0',
26+
'pydantic >= 2',
27+
'typing-extensions >= 4.7.1',
28+
'DateTime~=5.5',
29+
'PyJWT~=2.9.0',
30+
'requests~=2.32.3',
31+
'coverage',
32+
'cryptography',
33+
'python-dotenv~=1.0.1',
34+
'httpx'
35+
],
36+
python_requires=">=3.8",
3637
)

skyflow/client/skyflow.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from skyflow import LogLevel
33
from skyflow.error import SkyflowError
44
from skyflow.utils import SkyflowMessages
5-
from skyflow.utils.logger import log_info, Logger, log_error
5+
from skyflow.utils.logger import log_info, Logger
66
from skyflow.utils.validations import validate_vault_config, validate_connection_config, validate_update_vault_config, \
77
validate_update_connection_config, validate_credentials, validate_log_level
88
from skyflow.vault.client.client import VaultClient

skyflow/generated/rest/__init__.py

Lines changed: 131 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1,88 +1,133 @@
1-
# coding: utf-8
1+
# This file was auto-generated by Fern from our API Definition.
22

3-
# flake8: noqa
3+
from .types import (
4+
AuditEventAuditResourceType,
5+
AuditEventContext,
6+
AuditEventData,
7+
AuditEventHttpInfo,
8+
BatchRecordMethod,
9+
ContextAccessType,
10+
ContextAuthMode,
11+
DetokenizeRecordResponseValueType,
12+
GooglerpcStatus,
13+
ProtobufAny,
14+
RedactionEnumRedaction,
15+
RequestActionType,
16+
V1AuditAfterOptions,
17+
V1AuditEventResponse,
18+
V1AuditResponse,
19+
V1AuditResponseEvent,
20+
V1AuditResponseEventRequest,
21+
V1BatchOperationResponse,
22+
V1BatchRecord,
23+
V1BinListResponse,
24+
V1BulkDeleteRecordResponse,
25+
V1BulkGetRecordResponse,
26+
V1Byot,
27+
V1Card,
28+
V1DeleteFileResponse,
29+
V1DeleteRecordResponse,
30+
V1DetokenizeRecordRequest,
31+
V1DetokenizeRecordResponse,
32+
V1DetokenizeResponse,
33+
V1FieldRecords,
34+
V1FileAvScanStatus,
35+
V1GetAuthTokenResponse,
36+
V1GetFileScanStatusResponse,
37+
V1GetQueryResponse,
38+
V1InsertRecordResponse,
39+
V1MemberType,
40+
V1RecordMetaProperties,
41+
V1TokenizeRecordRequest,
42+
V1TokenizeRecordResponse,
43+
V1TokenizeResponse,
44+
V1UpdateRecordResponse,
45+
V1VaultFieldMapping,
46+
V1VaultSchemaConfig,
47+
)
48+
from .errors import BadRequestError, NotFoundError, UnauthorizedError
49+
from . import audit, authentication, bin_lookup, query, records, tokens
50+
from .audit import (
51+
AuditServiceListAuditEventsRequestFilterOpsActionType,
52+
AuditServiceListAuditEventsRequestFilterOpsContextAccessType,
53+
AuditServiceListAuditEventsRequestFilterOpsContextActorType,
54+
AuditServiceListAuditEventsRequestFilterOpsContextAuthMode,
55+
AuditServiceListAuditEventsRequestFilterOpsResourceType,
56+
AuditServiceListAuditEventsRequestSortOpsOrderBy,
57+
)
58+
from .client import AsyncSkyflow, Skyflow
59+
from .environment import SkyflowEnvironment
60+
from .records import (
61+
RecordServiceBulkGetRecordRequestOrderBy,
62+
RecordServiceBulkGetRecordRequestRedaction,
63+
RecordServiceGetRecordRequestRedaction,
64+
)
65+
from .version import __version__
466

5-
"""
6-
Skyflow Data API
7-
8-
# Data API This API inserts, retrieves, and otherwise manages data in a vault. The Data API is available from two base URIs. *identifier* is the identifier in your vault's URL.<ul><li><b>Sandbox:</b> https://*identifier*.vault.skyflowapis-preview.com</li><li><b>Production:</b> https://*identifier*.vault.skyflowapis.com</li></ul> When you make an API call, you need to add a header: <table><tr><th>Header</th><th>Value</th><th>Example</th></tr><tr><td>Authorization</td><td>A Bearer Token. See <a href='/api-authentication/'>API Authentication</a>.</td><td><code>Authorization: Bearer eyJhbGciOiJSUzI...1NiIsJdfPA</code></td></tr><table/>
9-
10-
The version of the OpenAPI document: v1
11-
Contact: support@skyflow.com
12-
Generated by OpenAPI Generator (https://openapi-generator.tech)
13-
14-
Do not edit the class manually.
15-
""" # noqa: E501
16-
17-
18-
__version__ = "1.0.0"
19-
20-
# import apis into sdk package
21-
from skyflow.generated.rest.api.audit_api import AuditApi
22-
from skyflow.generated.rest.api.bin_lookup_api import BINLookupApi
23-
from skyflow.generated.rest.api.query_api import QueryApi
24-
from skyflow.generated.rest.api.records_api import RecordsApi
25-
from skyflow.generated.rest.api.tokens_api import TokensApi
26-
27-
# import ApiClient
28-
from skyflow.generated.rest.api_response import ApiResponse
29-
from skyflow.generated.rest.api_client import ApiClient
30-
from skyflow.generated.rest.configuration import Configuration
31-
from skyflow.generated.rest.exceptions import OpenApiException
32-
from skyflow.generated.rest.exceptions import ApiTypeError
33-
from skyflow.generated.rest.exceptions import ApiValueError
34-
from skyflow.generated.rest.exceptions import ApiKeyError
35-
from skyflow.generated.rest.exceptions import ApiAttributeError
36-
from skyflow.generated.rest.exceptions import ApiException
37-
38-
# import models into sdk package
39-
from skyflow.generated.rest.models.audit_event_audit_resource_type import AuditEventAuditResourceType
40-
from skyflow.generated.rest.models.audit_event_context import AuditEventContext
41-
from skyflow.generated.rest.models.audit_event_data import AuditEventData
42-
from skyflow.generated.rest.models.audit_event_http_info import AuditEventHTTPInfo
43-
from skyflow.generated.rest.models.batch_record_method import BatchRecordMethod
44-
from skyflow.generated.rest.models.context_access_type import ContextAccessType
45-
from skyflow.generated.rest.models.context_auth_mode import ContextAuthMode
46-
from skyflow.generated.rest.models.detokenize_record_response_value_type import DetokenizeRecordResponseValueType
47-
from skyflow.generated.rest.models.googlerpc_status import GooglerpcStatus
48-
from skyflow.generated.rest.models.protobuf_any import ProtobufAny
49-
from skyflow.generated.rest.models.query_service_execute_query_body import QueryServiceExecuteQueryBody
50-
from skyflow.generated.rest.models.record_service_batch_operation_body import RecordServiceBatchOperationBody
51-
from skyflow.generated.rest.models.record_service_bulk_delete_record_body import RecordServiceBulkDeleteRecordBody
52-
from skyflow.generated.rest.models.record_service_insert_record_body import RecordServiceInsertRecordBody
53-
from skyflow.generated.rest.models.record_service_update_record_body import RecordServiceUpdateRecordBody
54-
from skyflow.generated.rest.models.redaction_enum_redaction import RedactionEnumREDACTION
55-
from skyflow.generated.rest.models.request_action_type import RequestActionType
56-
from skyflow.generated.rest.models.v1_audit_after_options import V1AuditAfterOptions
57-
from skyflow.generated.rest.models.v1_audit_event_response import V1AuditEventResponse
58-
from skyflow.generated.rest.models.v1_audit_response import V1AuditResponse
59-
from skyflow.generated.rest.models.v1_audit_response_event import V1AuditResponseEvent
60-
from skyflow.generated.rest.models.v1_audit_response_event_request import V1AuditResponseEventRequest
61-
from skyflow.generated.rest.models.v1_bin_list_request import V1BINListRequest
62-
from skyflow.generated.rest.models.v1_bin_list_response import V1BINListResponse
63-
from skyflow.generated.rest.models.v1_byot import V1BYOT
64-
from skyflow.generated.rest.models.v1_batch_operation_response import V1BatchOperationResponse
65-
from skyflow.generated.rest.models.v1_batch_record import V1BatchRecord
66-
from skyflow.generated.rest.models.v1_bulk_delete_record_response import V1BulkDeleteRecordResponse
67-
from skyflow.generated.rest.models.v1_bulk_get_record_response import V1BulkGetRecordResponse
68-
from skyflow.generated.rest.models.v1_card import V1Card
69-
from skyflow.generated.rest.models.v1_delete_file_response import V1DeleteFileResponse
70-
from skyflow.generated.rest.models.v1_delete_record_response import V1DeleteRecordResponse
71-
from skyflow.generated.rest.models.v1_detokenize_payload import V1DetokenizePayload
72-
from skyflow.generated.rest.models.v1_detokenize_record_request import V1DetokenizeRecordRequest
73-
from skyflow.generated.rest.models.v1_detokenize_record_response import V1DetokenizeRecordResponse
74-
from skyflow.generated.rest.models.v1_detokenize_response import V1DetokenizeResponse
75-
from skyflow.generated.rest.models.v1_field_records import V1FieldRecords
76-
from skyflow.generated.rest.models.v1_file_av_scan_status import V1FileAVScanStatus
77-
from skyflow.generated.rest.models.v1_get_file_scan_status_response import V1GetFileScanStatusResponse
78-
from skyflow.generated.rest.models.v1_get_query_response import V1GetQueryResponse
79-
from skyflow.generated.rest.models.v1_insert_record_response import V1InsertRecordResponse
80-
from skyflow.generated.rest.models.v1_member_type import V1MemberType
81-
from skyflow.generated.rest.models.v1_record_meta_properties import V1RecordMetaProperties
82-
from skyflow.generated.rest.models.v1_tokenize_payload import V1TokenizePayload
83-
from skyflow.generated.rest.models.v1_tokenize_record_request import V1TokenizeRecordRequest
84-
from skyflow.generated.rest.models.v1_tokenize_record_response import V1TokenizeRecordResponse
85-
from skyflow.generated.rest.models.v1_tokenize_response import V1TokenizeResponse
86-
from skyflow.generated.rest.models.v1_update_record_response import V1UpdateRecordResponse
87-
from skyflow.generated.rest.models.v1_vault_field_mapping import V1VaultFieldMapping
88-
from skyflow.generated.rest.models.v1_vault_schema_config import V1VaultSchemaConfig
67+
__all__ = [
68+
"AsyncSkyflow",
69+
"AuditEventAuditResourceType",
70+
"AuditEventContext",
71+
"AuditEventData",
72+
"AuditEventHttpInfo",
73+
"AuditServiceListAuditEventsRequestFilterOpsActionType",
74+
"AuditServiceListAuditEventsRequestFilterOpsContextAccessType",
75+
"AuditServiceListAuditEventsRequestFilterOpsContextActorType",
76+
"AuditServiceListAuditEventsRequestFilterOpsContextAuthMode",
77+
"AuditServiceListAuditEventsRequestFilterOpsResourceType",
78+
"AuditServiceListAuditEventsRequestSortOpsOrderBy",
79+
"BadRequestError",
80+
"BatchRecordMethod",
81+
"ContextAccessType",
82+
"ContextAuthMode",
83+
"DetokenizeRecordResponseValueType",
84+
"GooglerpcStatus",
85+
"NotFoundError",
86+
"ProtobufAny",
87+
"RecordServiceBulkGetRecordRequestOrderBy",
88+
"RecordServiceBulkGetRecordRequestRedaction",
89+
"RecordServiceGetRecordRequestRedaction",
90+
"RedactionEnumRedaction",
91+
"RequestActionType",
92+
"Skyflow",
93+
"SkyflowEnvironment",
94+
"UnauthorizedError",
95+
"V1AuditAfterOptions",
96+
"V1AuditEventResponse",
97+
"V1AuditResponse",
98+
"V1AuditResponseEvent",
99+
"V1AuditResponseEventRequest",
100+
"V1BatchOperationResponse",
101+
"V1BatchRecord",
102+
"V1BinListResponse",
103+
"V1BulkDeleteRecordResponse",
104+
"V1BulkGetRecordResponse",
105+
"V1Byot",
106+
"V1Card",
107+
"V1DeleteFileResponse",
108+
"V1DeleteRecordResponse",
109+
"V1DetokenizeRecordRequest",
110+
"V1DetokenizeRecordResponse",
111+
"V1DetokenizeResponse",
112+
"V1FieldRecords",
113+
"V1FileAvScanStatus",
114+
"V1GetAuthTokenResponse",
115+
"V1GetFileScanStatusResponse",
116+
"V1GetQueryResponse",
117+
"V1InsertRecordResponse",
118+
"V1MemberType",
119+
"V1RecordMetaProperties",
120+
"V1TokenizeRecordRequest",
121+
"V1TokenizeRecordResponse",
122+
"V1TokenizeResponse",
123+
"V1UpdateRecordResponse",
124+
"V1VaultFieldMapping",
125+
"V1VaultSchemaConfig",
126+
"__version__",
127+
"audit",
128+
"authentication",
129+
"bin_lookup",
130+
"query",
131+
"records",
132+
"tokens",
133+
]

skyflow/generated/rest/api/__init__.py

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)