SK-1908: Migrate Python SDK from openapi generator to Fern SDK generator

ci-scripts/bump_version.sh

@@ -7,6 +7,7 @@ then
 
     sed -E "s/current_version = .+/current_version = '$SEMVER'/g" setup.py > tempfile && cat tempfile > setup.py && rm -f tempfile
     sed -E "s/SDK_VERSION = .+/SDK_VERSION = '$SEMVER'/g" skyflow/utils/_version.py > tempfile && cat tempfile > skyflow/utils/_version.py && rm -f tempfile
+    sed -E "s/__version__ = .+/__version__ = '$SEMVER'/g" skyflow/generated/rest/version.py > tempfile && cat tempfile > skyflow/generated/rest/version.py && rm -f tempfile
 
     echo --------------------------
     echo "Done, Package now at $1"
@@ -18,6 +19,7 @@ else
 
     sed -E "s/current_version = .+/current_version = '$DEV_VERSION'/g" setup.py > tempfile && cat tempfile > setup.py && rm -f tempfile
     sed -E "s/SDK_VERSION = .+/SDK_VERSION = '$DEV_VERSION'/g" skyflow/utils/_version.py > tempfile && cat tempfile > skyflow/utils/_version.py && rm -f tempfile
+    sed -E "s/__version__ = .+/__version__ = '$DEV_VERSION'/g" skyflow/generated/rest/version.py > tempfile && cat tempfile > skyflow/generated/rest/version.py && rm -f tempfile
 
     echo --------------------------
     echo "Done, Package now at $DEV_VERSION"

requirements.txt

@@ -8,4 +8,5 @@ PyJWT~=2.9.0
 requests~=2.32.3
 coverage
 cryptography
-python-dotenv~=1.0.1
+python-dotenv~=1.0.1
+httpx

setup.py

@@ -20,17 +20,18 @@
     description='Skyflow SDK for the Python programming language',
     long_description=open('README.rst').read(),
     install_requires=[
-    'python_dateutil >= 2.5.3',
-    'setuptools >= 21.0.0',
-    'urllib3 >= 1.25.3, < 2.1.0',
-    'pydantic >= 2',
-    'typing-extensions >= 4.7.1',
-    'DateTime~=5.5',
-    'PyJWT~=2.9.0',
-    'requests~=2.32.3',
-    'coverage',
-    'cryptography',
-    'python-dotenv~=1.0.1'
-],
-    python_requires=">=3.8"
+        'python_dateutil >= 2.5.3',
+    	'setuptools >= 21.0.0',
+        'urllib3 >= 1.25.3, < 2.1.0',
+        'pydantic >= 2',
+        'typing-extensions >= 4.7.1',
+        'DateTime~=5.5',
+        'PyJWT~=2.9.0',
+        'requests~=2.32.3',
+        'coverage',
+        'cryptography',
+        'python-dotenv~=1.0.1',
+        'httpx'
+    ],
+    python_requires=">=3.8",
 )

skyflow/client/skyflow.py

@@ -2,7 +2,7 @@
 from skyflow import LogLevel
 from skyflow.error import SkyflowError
 from skyflow.utils import SkyflowMessages
-from skyflow.utils.logger import log_info, Logger, log_error
+from skyflow.utils.logger import log_info, Logger
 from skyflow.utils.validations import validate_vault_config, validate_connection_config, validate_update_vault_config, \
     validate_update_connection_config, validate_credentials, validate_log_level
 from skyflow.vault.client.client import VaultClient

skyflow/generated/rest/__init__.py

@@ -1,88 +1,133 @@
-# coding: utf-8
+# This file was auto-generated by Fern from our API Definition.
 
-# flake8: noqa
+from .types import (
+    AuditEventAuditResourceType,
+    AuditEventContext,
+    AuditEventData,
+    AuditEventHttpInfo,
+    BatchRecordMethod,
+    ContextAccessType,
+    ContextAuthMode,
+    DetokenizeRecordResponseValueType,
+    GooglerpcStatus,
+    ProtobufAny,
+    RedactionEnumRedaction,
+    RequestActionType,
+    V1AuditAfterOptions,
+    V1AuditEventResponse,
+    V1AuditResponse,
+    V1AuditResponseEvent,
+    V1AuditResponseEventRequest,
+    V1BatchOperationResponse,
+    V1BatchRecord,
+    V1BinListResponse,
+    V1BulkDeleteRecordResponse,
+    V1BulkGetRecordResponse,
+    V1Byot,
+    V1Card,
+    V1DeleteFileResponse,
+    V1DeleteRecordResponse,
+    V1DetokenizeRecordRequest,
+    V1DetokenizeRecordResponse,
+    V1DetokenizeResponse,
+    V1FieldRecords,
+    V1FileAvScanStatus,
+    V1GetAuthTokenResponse,
+    V1GetFileScanStatusResponse,
+    V1GetQueryResponse,
+    V1InsertRecordResponse,
+    V1MemberType,
+    V1RecordMetaProperties,
+    V1TokenizeRecordRequest,
+    V1TokenizeRecordResponse,
+    V1TokenizeResponse,
+    V1UpdateRecordResponse,
+    V1VaultFieldMapping,
+    V1VaultSchemaConfig,
+)
+from .errors import BadRequestError, NotFoundError, UnauthorizedError
+from . import audit, authentication, bin_lookup, query, records, tokens
+from .audit import (
+    AuditServiceListAuditEventsRequestFilterOpsActionType,
+    AuditServiceListAuditEventsRequestFilterOpsContextAccessType,
+    AuditServiceListAuditEventsRequestFilterOpsContextActorType,
+    AuditServiceListAuditEventsRequestFilterOpsContextAuthMode,
+    AuditServiceListAuditEventsRequestFilterOpsResourceType,
+    AuditServiceListAuditEventsRequestSortOpsOrderBy,
+)
+from .client import AsyncSkyflow, Skyflow
+from .environment import SkyflowEnvironment
+from .records import (
+    RecordServiceBulkGetRecordRequestOrderBy,
+    RecordServiceBulkGetRecordRequestRedaction,
+    RecordServiceGetRecordRequestRedaction,
+)
+from .version import __version__
 
-"""
-    Skyflow Data API
-
-    # 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/>
-
-    The version of the OpenAPI document: v1
-    Contact: support@skyflow.com
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
-
-    Do not edit the class manually.
-"""  # noqa: E501
-
-
-__version__ = "1.0.0"
-
-# import apis into sdk package
-from skyflow.generated.rest.api.audit_api import AuditApi
-from skyflow.generated.rest.api.bin_lookup_api import BINLookupApi
-from skyflow.generated.rest.api.query_api import QueryApi
-from skyflow.generated.rest.api.records_api import RecordsApi
-from skyflow.generated.rest.api.tokens_api import TokensApi
-
-# import ApiClient
-from skyflow.generated.rest.api_response import ApiResponse
-from skyflow.generated.rest.api_client import ApiClient
-from skyflow.generated.rest.configuration import Configuration
-from skyflow.generated.rest.exceptions import OpenApiException
-from skyflow.generated.rest.exceptions import ApiTypeError
-from skyflow.generated.rest.exceptions import ApiValueError
-from skyflow.generated.rest.exceptions import ApiKeyError
-from skyflow.generated.rest.exceptions import ApiAttributeError
-from skyflow.generated.rest.exceptions import ApiException
-
-# import models into sdk package
-from skyflow.generated.rest.models.audit_event_audit_resource_type import AuditEventAuditResourceType
-from skyflow.generated.rest.models.audit_event_context import AuditEventContext
-from skyflow.generated.rest.models.audit_event_data import AuditEventData
-from skyflow.generated.rest.models.audit_event_http_info import AuditEventHTTPInfo
-from skyflow.generated.rest.models.batch_record_method import BatchRecordMethod
-from skyflow.generated.rest.models.context_access_type import ContextAccessType
-from skyflow.generated.rest.models.context_auth_mode import ContextAuthMode
-from skyflow.generated.rest.models.detokenize_record_response_value_type import DetokenizeRecordResponseValueType
-from skyflow.generated.rest.models.googlerpc_status import GooglerpcStatus
-from skyflow.generated.rest.models.protobuf_any import ProtobufAny
-from skyflow.generated.rest.models.query_service_execute_query_body import QueryServiceExecuteQueryBody
-from skyflow.generated.rest.models.record_service_batch_operation_body import RecordServiceBatchOperationBody
-from skyflow.generated.rest.models.record_service_bulk_delete_record_body import RecordServiceBulkDeleteRecordBody
-from skyflow.generated.rest.models.record_service_insert_record_body import RecordServiceInsertRecordBody
-from skyflow.generated.rest.models.record_service_update_record_body import RecordServiceUpdateRecordBody
-from skyflow.generated.rest.models.redaction_enum_redaction import RedactionEnumREDACTION
-from skyflow.generated.rest.models.request_action_type import RequestActionType
-from skyflow.generated.rest.models.v1_audit_after_options import V1AuditAfterOptions
-from skyflow.generated.rest.models.v1_audit_event_response import V1AuditEventResponse
-from skyflow.generated.rest.models.v1_audit_response import V1AuditResponse
-from skyflow.generated.rest.models.v1_audit_response_event import V1AuditResponseEvent
-from skyflow.generated.rest.models.v1_audit_response_event_request import V1AuditResponseEventRequest
-from skyflow.generated.rest.models.v1_bin_list_request import V1BINListRequest
-from skyflow.generated.rest.models.v1_bin_list_response import V1BINListResponse
-from skyflow.generated.rest.models.v1_byot import V1BYOT
-from skyflow.generated.rest.models.v1_batch_operation_response import V1BatchOperationResponse
-from skyflow.generated.rest.models.v1_batch_record import V1BatchRecord
-from skyflow.generated.rest.models.v1_bulk_delete_record_response import V1BulkDeleteRecordResponse
-from skyflow.generated.rest.models.v1_bulk_get_record_response import V1BulkGetRecordResponse
-from skyflow.generated.rest.models.v1_card import V1Card
-from skyflow.generated.rest.models.v1_delete_file_response import V1DeleteFileResponse
-from skyflow.generated.rest.models.v1_delete_record_response import V1DeleteRecordResponse
-from skyflow.generated.rest.models.v1_detokenize_payload import V1DetokenizePayload
-from skyflow.generated.rest.models.v1_detokenize_record_request import V1DetokenizeRecordRequest
-from skyflow.generated.rest.models.v1_detokenize_record_response import V1DetokenizeRecordResponse
-from skyflow.generated.rest.models.v1_detokenize_response import V1DetokenizeResponse
-from skyflow.generated.rest.models.v1_field_records import V1FieldRecords
-from skyflow.generated.rest.models.v1_file_av_scan_status import V1FileAVScanStatus
-from skyflow.generated.rest.models.v1_get_file_scan_status_response import V1GetFileScanStatusResponse
-from skyflow.generated.rest.models.v1_get_query_response import V1GetQueryResponse
-from skyflow.generated.rest.models.v1_insert_record_response import V1InsertRecordResponse
-from skyflow.generated.rest.models.v1_member_type import V1MemberType
-from skyflow.generated.rest.models.v1_record_meta_properties import V1RecordMetaProperties
-from skyflow.generated.rest.models.v1_tokenize_payload import V1TokenizePayload
-from skyflow.generated.rest.models.v1_tokenize_record_request import V1TokenizeRecordRequest
-from skyflow.generated.rest.models.v1_tokenize_record_response import V1TokenizeRecordResponse
-from skyflow.generated.rest.models.v1_tokenize_response import V1TokenizeResponse
-from skyflow.generated.rest.models.v1_update_record_response import V1UpdateRecordResponse
-from skyflow.generated.rest.models.v1_vault_field_mapping import V1VaultFieldMapping
-from skyflow.generated.rest.models.v1_vault_schema_config import V1VaultSchemaConfig
+__all__ = [
+    "AsyncSkyflow",
+    "AuditEventAuditResourceType",
+    "AuditEventContext",
+    "AuditEventData",
+    "AuditEventHttpInfo",
+    "AuditServiceListAuditEventsRequestFilterOpsActionType",
+    "AuditServiceListAuditEventsRequestFilterOpsContextAccessType",
+    "AuditServiceListAuditEventsRequestFilterOpsContextActorType",
+    "AuditServiceListAuditEventsRequestFilterOpsContextAuthMode",
+    "AuditServiceListAuditEventsRequestFilterOpsResourceType",
+    "AuditServiceListAuditEventsRequestSortOpsOrderBy",
+    "BadRequestError",
+    "BatchRecordMethod",
+    "ContextAccessType",
+    "ContextAuthMode",
+    "DetokenizeRecordResponseValueType",
+    "GooglerpcStatus",
+    "NotFoundError",
+    "ProtobufAny",
+    "RecordServiceBulkGetRecordRequestOrderBy",
+    "RecordServiceBulkGetRecordRequestRedaction",
+    "RecordServiceGetRecordRequestRedaction",
+    "RedactionEnumRedaction",
+    "RequestActionType",
+    "Skyflow",
+    "SkyflowEnvironment",
+    "UnauthorizedError",
+    "V1AuditAfterOptions",
+    "V1AuditEventResponse",
+    "V1AuditResponse",
+    "V1AuditResponseEvent",
+    "V1AuditResponseEventRequest",
+    "V1BatchOperationResponse",
+    "V1BatchRecord",
+    "V1BinListResponse",
+    "V1BulkDeleteRecordResponse",
+    "V1BulkGetRecordResponse",
+    "V1Byot",
+    "V1Card",
+    "V1DeleteFileResponse",
+    "V1DeleteRecordResponse",
+    "V1DetokenizeRecordRequest",
+    "V1DetokenizeRecordResponse",
+    "V1DetokenizeResponse",
+    "V1FieldRecords",
+    "V1FileAvScanStatus",
+    "V1GetAuthTokenResponse",
+    "V1GetFileScanStatusResponse",
+    "V1GetQueryResponse",
+    "V1InsertRecordResponse",
+    "V1MemberType",
+    "V1RecordMetaProperties",
+    "V1TokenizeRecordRequest",
+    "V1TokenizeRecordResponse",
+    "V1TokenizeResponse",
+    "V1UpdateRecordResponse",
+    "V1VaultFieldMapping",
+    "V1VaultSchemaConfig",
+    "__version__",
+    "audit",
+    "authentication",
+    "bin_lookup",
+    "query",
+    "records",
+    "tokens",
+]