Update kagglesdk

Author: stevemessick

kagglesdk/datasets/types/dataset_api_service.py

@@ -1355,6 +1355,7 @@ class ApiDownloadDatasetRequest(KaggleObject):
     file_name (str)
     dataset_version_number (int)
     raw (bool)
+    hash_link (str)
   """
 
   def __init__(self):
@@ -1363,6 +1364,7 @@ def __init__(self):
     self._file_name = None
     self._dataset_version_number = None
     self._raw = False
+    self._hash_link = None
     self._freeze()
 
   @property
@@ -1430,6 +1432,19 @@ def raw(self, raw: bool):
       raise TypeError('raw must be of type bool')
     self._raw = raw
 
+  @property
+  def hash_link(self) -> str:
+    return self._hash_link or ""
+
+  @hash_link.setter
+  def hash_link(self, hash_link: str):
+    if hash_link is None:
+      del self.hash_link
+      return
+    if not isinstance(hash_link, str):
+      raise TypeError('hash_link must be of type str')
+    self._hash_link = hash_link
+
   def endpoint(self):
     if self.file_name:
       path = '/api/v1/datasets/download/{owner_slug}/{dataset_slug}/{file_name}'
@@ -2668,6 +2683,7 @@ def files(self, files: Optional[List[Optional['ApiDatasetNewFile']]]):
   FieldMetadata("fileName", "file_name", "_file_name", str, None, PredefinedSerializer(), optional=True),
   FieldMetadata("datasetVersionNumber", "dataset_version_number", "_dataset_version_number", int, None, PredefinedSerializer(), optional=True),
   FieldMetadata("raw", "raw", "_raw", bool, False, PredefinedSerializer()),
+  FieldMetadata("hashLink", "hash_link", "_hash_link", str, None, PredefinedSerializer(), optional=True),
 ]
 
 ApiGetDatasetMetadataRequest._fields = [

kagglesdk/kaggle_client.py

@@ -6,6 +6,8 @@
 from kagglesdk.competitions.services.competition_api_service import CompetitionApiClient
 from kagglesdk.datasets.services.dataset_api_service import DatasetApiClient
 from kagglesdk.admin.services.inbox_file_service import InboxFileClient
+from kagglesdk.security.services.oauth_service import OAuthClient
+from kagglesdk.users.services.account_service import AccountClient
 from kagglesdk.kaggle_env import KaggleEnv
 from kagglesdk.kaggle_http_client import KaggleHttpClient
 
@@ -40,6 +42,14 @@ class Admin(object):
     def __init__(self, http_client: KaggleHttpClient):
       self.inbox_file_client = InboxFileClient(http_client)
 
+  class Security(object):
+    def __init__(self, http_client: KaggleHttpClient):
+      self.oauth_client = OAuthClient(http_client)
+
+  class Users(object):
+    def __init__(self, http_client: KaggleHttpClient):
+      self.account_client = AccountClient(http_client)
+
   def __init__(self, env: KaggleEnv = None, verbose: bool = False, username: str = None, password: str = None):
     self._http_client = http_client = KaggleHttpClient(env, verbose, self._renew_iap_token, username=username, password=password)
     self.kernels = KaggleClient.Kernels(http_client)
@@ -49,6 +59,8 @@ def __init__(self, env: KaggleEnv = None, verbose: bool = False, username: str =
     self.competitions = KaggleClient.Competitions(http_client)
     self.datasets = KaggleClient.Datasets(http_client)
     self.admin = KaggleClient.Admin(http_client)
+    self.security = KaggleClient.Security(http_client)
+    self.users = KaggleClient.Users(http_client)
     self.username = username
     self.password = password
 

kagglesdk/kernels/types/kernels_api_service.py

@@ -1219,6 +1219,10 @@ class ApiSaveKernelRequest(KaggleObject):
     session_timeout_seconds (int)
       If specified, terminate the kernel session after this many seconds of
       runtime, which must be lower than the global maximum.
+    priority (int)
+      Sets the execution priority of this kernel session request when queued,
+      lower is better (10 will get run before 100).
+      Only allowed or certain clients.
   """
 
   def __init__(self):
@@ -1239,6 +1243,7 @@ def __init__(self):
     self._docker_image_pinning_type = None
     self._model_data_sources = []
     self._session_timeout_seconds = None
+    self._priority = None
     self._freeze()
 
   @property
@@ -1517,6 +1522,24 @@ def session_timeout_seconds(self, session_timeout_seconds: int):
       raise TypeError('session_timeout_seconds must be of type int')
     self._session_timeout_seconds = session_timeout_seconds
 
+  @property
+  def priority(self) -> int:
+    r"""
+    Sets the execution priority of this kernel session request when queued,
+    lower is better (10 will get run before 100).
+    Only allowed or certain clients.
+    """
+    return self._priority or 0
+
+  @priority.setter
+  def priority(self, priority: int):
+    if priority is None:
+      del self.priority
+      return
+    if not isinstance(priority, int):
+      raise TypeError('priority must be of type int')
+    self._priority = priority
+
   def endpoint(self):
     path = '/api/v1/kernels/push'
     return path.format_map(self.to_field_map(self))
@@ -1924,6 +1947,7 @@ def creation_date(self, creation_date: str):
   FieldMetadata("dockerImagePinningType", "docker_image_pinning_type", "_docker_image_pinning_type", str, None, PredefinedSerializer(), optional=True),
   FieldMetadata("modelDataSources", "model_data_sources", "_model_data_sources", str, [], ListSerializer(PredefinedSerializer())),
   FieldMetadata("sessionTimeoutSeconds", "session_timeout_seconds", "_session_timeout_seconds", int, None, PredefinedSerializer(), optional=True),
+  FieldMetadata("priority", "priority", "_priority", int, None, PredefinedSerializer(), optional=True),
 ]
 
 ApiSaveKernelResponse._fields = [

kagglesdk/models/services/model_api_service.py

@@ -1,6 +1,6 @@
 from kagglesdk.common.types.http_redirect import HttpRedirect
 from kagglesdk.kaggle_http_client import KaggleHttpClient
-from kagglesdk.models.types.model_api_service import ApiCreateModelInstanceRequest, ApiCreateModelInstanceVersionRequest, ApiCreateModelRequest, ApiCreateModelResponse, ApiDeleteModelInstanceRequest, ApiDeleteModelInstanceVersionRequest, ApiDeleteModelRequest, ApiDeleteModelResponse, ApiDownloadModelInstanceVersionRequest, ApiGetModelInstanceRequest, ApiGetModelRequest, ApiListModelGatingUserConsentsRequest, ApiListModelGatingUserConsentsResponse, ApiListModelInstanceVersionFilesRequest, ApiListModelInstanceVersionFilesResponse, ApiListModelsRequest, ApiListModelsResponse, ApiModel, ApiModelInstance, ApiReviewGatingUserConsentRequest, ApiUpdateModelInstanceRequest, ApiUpdateModelRequest, ApiUpdateModelResponse, ApiUploadModelFileRequest, ApiUploadModelFileResponse, CreateModelSigningTokenRequest, CreateModelSigningTokenResponse, KeysRequest, KeysResponse, WellKnowEndpointRequest, WellKnowEndpointResponse
+from kagglesdk.models.types.model_api_service import ApiCreateModelInstanceRequest, ApiCreateModelInstanceVersionRequest, ApiCreateModelRequest, ApiCreateModelResponse, ApiDeleteModelInstanceRequest, ApiDeleteModelInstanceVersionRequest, ApiDeleteModelRequest, ApiDeleteModelResponse, ApiDownloadModelInstanceVersionRequest, ApiGetModelInstanceRequest, ApiGetModelRequest, ApiListModelGatingUserConsentsRequest, ApiListModelGatingUserConsentsResponse, ApiListModelInstanceVersionFilesRequest, ApiListModelInstanceVersionFilesResponse, ApiListModelsRequest, ApiListModelsResponse, ApiModel, ApiModelInstance, ApiReviewModelGatingUserConsentRequest, ApiUpdateModelInstanceRequest, ApiUpdateModelRequest, ApiUpdateModelResponse, ApiUploadModelFileRequest, ApiUploadModelFileResponse, CreateModelSigningTokenRequest, CreateModelSigningTokenResponse, KeysRequest, KeysResponse, WellKnowEndpointRequest, WellKnowEndpointResponse
 
 class ModelApiClient(object):
 
@@ -240,16 +240,17 @@ def list_model_gating_user_consents(self, request: ApiListModelGatingUserConsent
 
     return self._client.call("models.ModelApiService", "ApiListModelGatingUserConsents", request, ApiListModelGatingUserConsentsResponse)
 
-  def review_gating_user_consent(self, request: ApiReviewGatingUserConsentRequest = None):
+  def review_model_gating_user_consent(self, request: ApiReviewModelGatingUserConsentRequest = None):
     r"""
-    Review the user consents for an agreement.
+    Review the user consents for a gated model, under the model's current
+    active agreement.
 
     Args:
-      request (ApiReviewGatingUserConsentRequest):
+      request (ApiReviewModelGatingUserConsentRequest):
         The request object; initialized to empty instance if not specified.
     """
 
     if request is None:
-      request = ApiReviewGatingUserConsentRequest()
+      request = ApiReviewModelGatingUserConsentRequest()
 
-    self._client.call("models.ModelApiService", "ApiReviewGatingUserConsent", request, None)
+    self._client.call("models.ModelApiService", "ApiReviewModelGatingUserConsent", request, None)

kagglesdk/models/types/model_api_service.py

@@ -2226,34 +2226,49 @@ def total_uncompressed_bytes(self, total_uncompressed_bytes: int):
     self._total_uncompressed_bytes = total_uncompressed_bytes
 
 
-class ApiReviewGatingUserConsentRequest(KaggleObject):
+class ApiReviewModelGatingUserConsentRequest(KaggleObject):
   r"""
   Attributes:
-    agreement_id (int)
+    owner_slug (str)
+    model_slug (str)
     user_name (str)
     review_status (GatingAgreementRequestsReviewStatus)
     publisher_notes (str)
   """
 
   def __init__(self):
-    self._agreement_id = 0
+    self._owner_slug = ""
+    self._model_slug = ""
     self._user_name = ""
     self._review_status = GatingAgreementRequestsReviewStatus.GATING_AGREEMENT_REQUESTS_REVIEW_STATUS_UNSPECIFIED
     self._publisher_notes = None
     self._freeze()
 
   @property
-  def agreement_id(self) -> int:
-    return self._agreement_id
+  def owner_slug(self) -> str:
+    return self._owner_slug
 
-  @agreement_id.setter
-  def agreement_id(self, agreement_id: int):
-    if agreement_id is None:
-      del self.agreement_id
+  @owner_slug.setter
+  def owner_slug(self, owner_slug: str):
+    if owner_slug is None:
+      del self.owner_slug
       return
-    if not isinstance(agreement_id, int):
-      raise TypeError('agreement_id must be of type int')
-    self._agreement_id = agreement_id
+    if not isinstance(owner_slug, str):
+      raise TypeError('owner_slug must be of type str')
+    self._owner_slug = owner_slug
+
+  @property
+  def model_slug(self) -> str:
+    return self._model_slug
+
+  @model_slug.setter
+  def model_slug(self, model_slug: str):
+    if model_slug is None:
+      del self.model_slug
+      return
+    if not isinstance(model_slug, str):
+      raise TypeError('model_slug must be of type str')
+    self._model_slug = model_slug
 
   @property
   def user_name(self) -> str:
@@ -2295,7 +2310,7 @@ def publisher_notes(self, publisher_notes: str):
     self._publisher_notes = publisher_notes
 
   def endpoint(self):
-    path = '/api/v1/gating/{agreement_id}/user-consent/review'
+    path = '/api/v1/models/{owner_slug}/{model_slug}/user-consents/review'
     return path.format_map(self.to_field_map(self))
 
 
@@ -3599,8 +3614,9 @@ def e(self, e: str):
   FieldMetadata("totalUncompressedBytes", "total_uncompressed_bytes", "_total_uncompressed_bytes", int, 0, PredefinedSerializer()),
 ]
 
-ApiReviewGatingUserConsentRequest._fields = [
-  FieldMetadata("agreementId", "agreement_id", "_agreement_id", int, 0, PredefinedSerializer()),
+ApiReviewModelGatingUserConsentRequest._fields = [
+  FieldMetadata("ownerSlug", "owner_slug", "_owner_slug", str, "", PredefinedSerializer()),
+  FieldMetadata("modelSlug", "model_slug", "_model_slug", str, "", PredefinedSerializer()),
   FieldMetadata("userName", "user_name", "_user_name", str, "", PredefinedSerializer()),
   FieldMetadata("reviewStatus", "review_status", "_review_status", GatingAgreementRequestsReviewStatus, GatingAgreementRequestsReviewStatus.GATING_AGREEMENT_REQUESTS_REVIEW_STATUS_UNSPECIFIED, EnumSerializer()),
   FieldMetadata("publisherNotes", "publisher_notes", "_publisher_notes", str, None, PredefinedSerializer(), optional=True),

kagglesdk/security/__init__.py

@@ -0,0 +1,32 @@
+from kagglesdk.common.types.http_redirect import HttpRedirect
+from kagglesdk.kaggle_http_client import KaggleHttpClient
+from kagglesdk.security.types.oauth_service import ExchangeOAuthTokenRequest, ExchangeOAuthTokenResponse, StartOAuthFlowRequest
+
+class OAuthClient(object):
+
+  def __init__(self, client: KaggleHttpClient):
+    self._client = client
+
+  def start_oauth_flow(self, request: StartOAuthFlowRequest = None) -> HttpRedirect:
+    r"""
+    Args:
+      request (StartOAuthFlowRequest):
+        The request object; initialized to empty instance if not specified.
+    """
+
+    if request is None:
+      request = StartOAuthFlowRequest()
+
+    return self._client.call("security.OAuthService", "StartOAuthFlow", request, HttpRedirect)
+
+  def exchange_oauth_token(self, request: ExchangeOAuthTokenRequest = None) -> ExchangeOAuthTokenResponse:
+    r"""
+    Args:
+      request (ExchangeOAuthTokenRequest):
+        The request object; initialized to empty instance if not specified.
+    """
+
+    if request is None:
+      request = ExchangeOAuthTokenRequest()
+
+    return self._client.call("security.OAuthService", "ExchangeOAuthToken", request, ExchangeOAuthTokenResponse)