kaggle 1.7.4.1__py3-none-any.whl → 1.7.4.5__py3-none-any.whl

kaggle/models/upload_file.py

@@ -61,75 +61,77 @@ class UploadFile(object):
 
   @property
   def token(self):
-    """Gets the token of this UploadFile.  # noqa: E501
+    """Gets the token of this UploadFile.  # noqa: E501.
 
-        A token referencing a specific file upload that can be used across requests  # noqa: E501
+    A token referencing a specific file upload that can be used across
+    requests  # noqa: E501
 
-        :return: The token of this UploadFile.  # noqa: E501
-        :rtype: str
-        """
+    :return: The token of this UploadFile.  # noqa: E501
+    :rtype: str
+    """
     return self._token
 
   @token.setter
   def token(self, token):
     """Sets the token of this UploadFile.
 
-        A token referencing a specific file upload that can be used across requests  # noqa: E501
+    A token referencing a specific file upload that can be used across
+    requests  # noqa: E501
 
-        :param token: The token of this UploadFile.  # noqa: E501
-        :type: str
-        """
+    :param token: The token of this UploadFile.  # noqa: E501
+    :type: str
+    """
 
     self._token = token
 
   @property
   def description(self):
-    """Gets the description of this UploadFile.  # noqa: E501
+    """Gets the description of this UploadFile.  # noqa: E501.
 
-        The file description  # noqa: E501
+    The file description  # noqa: E501
 
-        :return: The description of this UploadFile.  # noqa: E501
-        :rtype: str
-        """
+    :return: The description of this UploadFile.  # noqa: E501
+    :rtype: str
+    """
     return self._description
 
   @description.setter
   def description(self, description):
     """Sets the description of this UploadFile.
 
-        The file description  # noqa: E501
+    The file description  # noqa: E501
 
-        :param description: The description of this UploadFile.  # noqa: E501
-        :type: str
-        """
+    :param description: The description of this UploadFile. # noqa: E501
+    :type: str
+    """
 
     self._description = description
 
   @property
   def columns(self):
-    """Gets the columns of this UploadFile.  # noqa: E501
+    """Gets the columns of this UploadFile.  # noqa: E501.
 
-        A list of dataset column metadata  # noqa: E501
+    A list of dataset column metadata  # noqa: E501
 
-        :return: The columns of this UploadFile.  # noqa: E501
-        :rtype: list[DatasetColumn]
-        """
+    :return: The columns of this UploadFile.  # noqa: E501
+    :rtype: list[DatasetColumn]
+    """
     return self._columns
 
   @columns.setter
   def columns(self, columns):
     """Sets the columns of this UploadFile.
 
-        A list of dataset column metadata  # noqa: E501
+    A list of dataset column metadata  # noqa: E501
 
-        :param columns: The columns of this UploadFile.  # noqa: E501
-        :type: list[DatasetColumn]
-        """
+    :param columns: The columns of this UploadFile.  # noqa: E501
+    :type: list[DatasetColumn]
+    """
 
     self._columns = columns
 
   def to_dict(self):
-    """Returns the model properties as a dict"""
+    """Returns the model properties as a dict."""
     result = {}
 
     for attr, _ in six.iteritems(self.column_types):
@@ -150,7 +152,7 @@ class UploadFile(object):
     return result
 
   def to_str(self):
-    """Returns the string representation of the model"""
+    """Returns the string representation of the model."""
     return pprint.pformat(self.to_dict())
 
   def __repr__(self):
@@ -158,12 +160,12 @@ class UploadFile(object):
     return self.to_str()
 
   def __eq__(self, other):
-    """Returns true if both objects are equal"""
+    """Returns true if both objects are equal."""
     if not isinstance(other, UploadFile):
       return False
 
     return self.__dict__ == other.__dict__
 
   def __ne__(self, other):
-    """Returns true if both objects are not equal"""
+    """Returns true if both objects are not equal."""
     return not self == other

{kaggle-1.7.4.1.dist-info → kaggle-1.7.4.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kaggle
-Version: 1.7.4.1
+Version: 1.7.4.5
 Summary: Access Kaggle resources anywhere
 Project-URL: Homepage, https://github.com/Kaggle/kaggle-api
 Project-URL: Issues, https://github.com/Kaggle/kaggle-api/issues

{kaggle-1.7.4.1.dist-info → kaggle-1.7.4.5.dist-info}/RECORD

@@ -1,34 +1,34 @@
 kaggle/LICENSE,sha256=PN5H3cwV3xW9nvUXKcB_XOH60cWqne6qK3SAE8NI74s,11340
 kaggle/__init__.py,sha256=XFAbsmBy7kvlQrRhwEl2f8sb0-RdaLOieLQsX0CkEHU,151
 kaggle/cli.py,sha256=xhlpnWLtKAUG2m3baqODIX-1Lev4Un2IoHLDHbGU06E,63718
-kaggle/configuration.py,sha256=rgBGwX_iQnHMerDO0oOJJDClq_VRQeKmg0XMfgn5mzg,6069
+kaggle/configuration.py,sha256=hBzQMHXNIbcPc2sak9Px7kGmI5TyBM5Q5oD6AayRnv4,6072
 kaggle/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-kaggle/api/kaggle_api.py,sha256=vyvS-HH2sEftKYxl1Y4nQWSbDXYW57NXDcezQKECtac,24828
-kaggle/api/kaggle_api_extended.py,sha256=nJBJCUOV8UVGnGl0bFPkjVsboIjov1zG3LhE1BRmt64,185825
+kaggle/api/kaggle_api.py,sha256=bHR81Iv1dvnFa3AxmPDCyItrA62iqPiC0wgH2CQh6bQ,24682
+kaggle/api/kaggle_api_extended.py,sha256=ahoxcfNGrqeWUPUo906HW-G1dFtDkdOuALh_x03pyNg,181049
 kaggle/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kaggle/models/api_blob_type.py,sha256=wLxLS86hWWlCM-cad4WITBiUEIVNkBbclJ7sZm72u0A,85
-kaggle/models/dataset_column.py,sha256=q1cQnOHPVEV8olnpwAHnB4z7w9AHMGR2iA6OKZaLKKE,6768
-kaggle/models/dataset_new_request.py,sha256=kJ2az668iDTXAE18XQOyD8M5w0_teQwjXoCZn67Q09k,12186
-kaggle/models/dataset_new_version_request.py,sha256=PcbrYife2VBTHji6KX5zRS79fJVXDVSkLU3qXRWaUWc,9332
-kaggle/models/dataset_update_settings_request.py,sha256=luybsR3typrKKqdmlJIUb7Nzrgih0EU4DD7NUW2PVtY,9426
+kaggle/models/dataset_column.py,sha256=BqX82R28fkzxYqtv09pyc4-O4Nt9PTIM9cZVLI4B2U4,6665
+kaggle/models/dataset_new_request.py,sha256=FfYLk02PPW03ptO6U7hnm1EEoiscGuqHFVc1AoHjpOA,12357
+kaggle/models/dataset_new_version_request.py,sha256=qptalzvSPEgr_2hYerl26dQ5_YJL0-gYghmddiQhL0U,9585
+kaggle/models/dataset_update_settings_request.py,sha256=5NWbEERm34ZMqcGusRbd2jlQtmC0GXHHiXyS4XkYRQE,9694
 kaggle/models/kaggle_models_extended.py,sha256=5H0dPscq8A9NJN-FTCBkUUTpuz1hj6eKtW5w3C-QcHU,7431
-kaggle/models/kernel_push_request.py,sha256=mFzHNkyirbeMfYsxizX-XUhTAfESZaGXvI2Ll1baPNk,19278
-kaggle/models/model_instance_new_version_request.py,sha256=Mi8sgb7yPvgxSOtFzI_HrZLfipqTR6KYzT0Rxsyi_WE,4526
-kaggle/models/model_instance_update_request.py,sha256=YMHo7G3H3AsiZWuQpR53JGOP0VySlHGuzug2N4_RgbQ,13625
-kaggle/models/model_new_instance_request.py,sha256=O2cWriVgGYeOK_e-Ft0J8OVhrizbflprK4jygZzP460,16074
-kaggle/models/model_new_request.py,sha256=87no0q1MhqWyzzgBTNCVAtbGobeEldsaQdmfovclSBc,9376
-kaggle/models/model_update_request.py,sha256=cLKv-KdXzqOx16KqXzt6GLjwJVTdrE43lmQcaV3TIak,8446
-kaggle/models/start_blob_upload_request.py,sha256=ylocFhngpaGx3g7gzI4zja4xOYGaNqeQ8Pk0fLUQmpw,7219
-kaggle/models/start_blob_upload_response.py,sha256=vPuW8kpR9w1EqKWyJQHlAkFTu9FG2UufISZg73yGZjY,4197
-kaggle/models/upload_file.py,sha256=0wouJIbb7K-voEah9JrognMuJP_EGQrf96mcsy1AEsI,4787
+kaggle/models/kernel_push_request.py,sha256=SJVk5M6aqTB0wx1es6rhvpCc72jDIUUJejGbnMKo-Jo,19629
+kaggle/models/model_instance_new_version_request.py,sha256=3F__pc8dQcfj_SVvhhrFaSroBckKxvnGT4_ym2PZhXY,4608
+kaggle/models/model_instance_update_request.py,sha256=2KTM1o_6ng_H2Ti9wVo0lEh54_OScwNhOWCjxmRuKSk,13933
+kaggle/models/model_new_instance_request.py,sha256=Ll2Yu3syLrHGi8vAa4CGsshVNSW0rRLLJZXNC8es_rI,16449
+kaggle/models/model_new_request.py,sha256=916-XfsshreGW2Tsst3lu5U8i7iANKsEraN_TqQq02s,9465
+kaggle/models/model_update_request.py,sha256=SaM0BHwRq3x0ax6pJuBs0NBxuLnfSCi2vzRFXqcvU_w,8573
+kaggle/models/start_blob_upload_request.py,sha256=Cqx1KLjerB2huky7AmvbJRBDuykHOWKPBBnYhzg2his,7141
+kaggle/models/start_blob_upload_response.py,sha256=AC5vtuCkl2MUZcH_S_rtBx7sPSxeL6az176Qv284VXk,4173
+kaggle/models/upload_file.py,sha256=tbYnmnU3ytvJMCRiSLN0YvbaAVd1NNy2ibiVgI2wBwc,4707
 kaggle/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kaggle/test/test_authenticate.py,sha256=tO71JieT3adp1DixfKo1G53CByEhai2VwNxWVE4RhPY,1111
 kagglesdk/LICENSE,sha256=PN5H3cwV3xW9nvUXKcB_XOH60cWqne6qK3SAE8NI74s,11340
-kagglesdk/__init__.py,sha256=IJFgr7644bKJJb8xPv9SwE4y7ZFff2kaO9fqFCPZMLI,91
-kagglesdk/kaggle_client.py,sha256=ZAONI1jbSlQE97RtxlSm07LReYwkGoVab22nrTmQTxU,2779
-kagglesdk/kaggle_env.py,sha256=0R-RIbO09nud9eZsb9YB72W9enI92j4jmgVxILj-AkQ,1146
-kagglesdk/kaggle_http_client.py,sha256=aGWaU98cw4IdEM95sC1GmX6IqF5JOE5rhK5mNHczum8,10172
-kagglesdk/kaggle_object.py,sha256=eng8cWtDwkAKS4kbjXSfnpN_7PfpCyLlQRz8Lnpk6_w,10787
+kagglesdk/__init__.py,sha256=ASJl7410iRr3Dyd4cKYEzxVvU2QByf-ayg4lCJ-J2EY,92
+kagglesdk/kaggle_client.py,sha256=PtjqWQXMFzQmUyqKAaIrbImNcKH08f0f16NcPZQaCUs,3283
+kagglesdk/kaggle_env.py,sha256=j8maAydT3K1wkOIw0daNF2fL1IiqSCpGgDLm3YwSkp4,1072
+kagglesdk/kaggle_http_client.py,sha256=SWcF5cjEvHuATwZizg-AqaG_m3FLHPsIZlVCnFo3XB0,10539
+kagglesdk/kaggle_object.py,sha256=h4J7nA6ZCnzrqhrCdYSxaQ7T6VeSEKQpoOjcWLHyRkM,10703
 kagglesdk/admin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kagglesdk/admin/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kagglesdk/admin/services/inbox_file_service.py,sha256=dbNqDOZChTWolt9eP39M8dPg7AXEXWIwgjLgV8thsik,777
@@ -54,7 +54,7 @@ kagglesdk/datasets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 kagglesdk/datasets/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kagglesdk/datasets/services/dataset_api_service.py,sha256=yhFRkYyRW5fadR6frqoZwdztVJcURMSRZtj3xtqevQU,6862
 kagglesdk/datasets/types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-kagglesdk/datasets/types/dataset_api_service.py,sha256=vkBsU4BpDeA_MlCU0oLcnJbvKL-IiCyfae_ZkjTXJns,80375
+kagglesdk/datasets/types/dataset_api_service.py,sha256=IcGQXDagC1uRT7EbV8Htac1rrdcx8U8sO2PvGy2NABQ,80854
 kagglesdk/datasets/types/dataset_enums.py,sha256=LvroQzkG1gHC1XNUN6pRH5ZMi-nlAJ2DJMQuSrwu-Tk,2355
 kagglesdk/datasets/types/dataset_types.py,sha256=U0QDSMa17uG_4zdfLFbUTSQFcR00ml6ZiVa1OmXZ4xk,19652
 kagglesdk/education/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -67,23 +67,32 @@ kagglesdk/kernels/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 kagglesdk/kernels/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kagglesdk/kernels/services/kernels_api_service.py,sha256=uRsWb4FFmkPKiQGqajQSi6oRcCUkuM70xMEbWWffxpA,4402
 kagglesdk/kernels/types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-kagglesdk/kernels/types/kernels_api_service.py,sha256=nO-S6NFnBdC-PBzNkKHcL61muJUOMdsfKtmckAVhE7Y,61371
+kagglesdk/kernels/types/kernels_api_service.py,sha256=WrA05JY1HHZjtFLoyoTx0d1tpacKBMEvZk9rqD6sKho,62183
 kagglesdk/kernels/types/kernels_enums.py,sha256=lg1bQyVN2tZ7k9Hy5bY5vjm9GzAbzI0uW-W527BmzIA,597
 kagglesdk/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kagglesdk/models/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-kagglesdk/models/services/model_api_service.py,sha256=vF7NH0MAZoX_b0z3RqGhjdAiuaWU_ACNRDLjUN2HC3M,10145
+kagglesdk/models/services/model_api_service.py,sha256=0z9ROm5Lf4N-lR28_NAnSgJaPM-f_wxlU7ltzo_WDJ0,10225
 kagglesdk/models/services/model_service.py,sha256=-KM64rnYBO8L2ten5VEhQW7OhZa7yaIc4dOYROtJvYU,672
 kagglesdk/models/types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-kagglesdk/models/types/model_api_service.py,sha256=dDabW7I8MaRuz-iOBSlx_vQPWF8mEig678DusyvxHIk,111682
+kagglesdk/models/types/model_api_service.py,sha256=mBF8loxyi954Sj9DZr-1Voy5cuKTTFuyMrXRA2TfjWw,112144
 kagglesdk/models/types/model_enums.py,sha256=pitgapPKLK4BUWFOMQaSDgyrsk6bYJ4nzZ3FJPZWJWA,2013
 kagglesdk/models/types/model_service.py,sha256=cAJ3P_DInVWZ0Io46zi8SWnQtBJFIJkw6TW330gMVLA,7648
 kagglesdk/models/types/model_types.py,sha256=jg2rDQP48OG0hikZC4NI6tlf4F00eUgRO2Br6c-QJUA,8048
-kagglesdk/test/test_client.py,sha256=Z5hkIE7EeoM5bUfgAqid1YuZ1EAkzvw_PFIZiy0X3UQ,1084
+kagglesdk/security/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+kagglesdk/security/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+kagglesdk/security/services/oauth_service.py,sha256=gtNnNP1IlKSK8c2zwxSZOC-WQHo5AsZlf-h7g8nqdgo,1177
+kagglesdk/security/types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+kagglesdk/security/types/authentication.py,sha256=NZZQEJ8ewQiJu-UkV3Z7oofKQAs0E1CoGUAzgRE7GSQ,4897
+kagglesdk/security/types/oauth_service.py,sha256=1y2oz8TKeKIkR26_Izptsj27oqAa9vabwM6NOqTQM4E,12892
+kagglesdk/test/test_client.py,sha256=C_cyzV_SaFVDthbBfzf5AqIyz9k3g2aOuo283904cck,1065
 kagglesdk/users/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+kagglesdk/users/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+kagglesdk/users/services/account_service.py,sha256=pSsv_5a1VWJ9hBcpOohjQuqooL8086wtChMSFmo5RA8,712
 kagglesdk/users/types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+kagglesdk/users/types/account_service.py,sha256=As1aIBxCawzzc6Z1jYKkNStRtDZBwV20L2z0IZFIWUw,6890
 kagglesdk/users/types/users_enums.py,sha256=iAzI5TAM8tysOcqG2AUsb-DTdWEQF9XPOCy-M8Vv_ro,380
-kaggle-1.7.4.1.dist-info/METADATA,sha256=bygU0bEZ1uARv2CWWUI_ArTrZZ0gcdVMMgKwCq2jxKk,16953
-kaggle-1.7.4.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-kaggle-1.7.4.1.dist-info/entry_points.txt,sha256=hl3dQAS4qpVkC5FWiqfnU6qKJU924OEN6PsHEiw-FGg,43
-kaggle-1.7.4.1.dist-info/licenses/LICENSE.txt,sha256=IzhfWrxIlFAci3lzZCg5WWHZJBI1QSzsHxO0plI63vk,11541
-kaggle-1.7.4.1.dist-info/RECORD,,
+kaggle-1.7.4.5.dist-info/METADATA,sha256=oh-FtAhsGjM14hzKXu8ieEqyjEj7FxCmLGjgIYlU_Ok,16953
+kaggle-1.7.4.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+kaggle-1.7.4.5.dist-info/entry_points.txt,sha256=hl3dQAS4qpVkC5FWiqfnU6qKJU924OEN6PsHEiw-FGg,43
+kaggle-1.7.4.5.dist-info/licenses/LICENSE.txt,sha256=IzhfWrxIlFAci3lzZCg5WWHZJBI1QSzsHxO0plI63vk,11541
+kaggle-1.7.4.5.dist-info/RECORD,,

kagglesdk/__init__.py

@@ -1,2 +1,2 @@
 from kagglesdk.kaggle_client import KaggleClient
-from kagglesdk.kaggle_env import KaggleEnv
+from kagglesdk.kaggle_env import KaggleEnv

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 @@ class ApiDownloadDatasetRequest(KaggleObject):
     self._file_name = None
     self._dataset_version_number = None
     self._raw = False
+    self._hash_link = None
     self._freeze()
 
   @property
@@ -1430,6 +1432,19 @@ class ApiDownloadDatasetRequest(KaggleObject):
       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 @@ ApiDownloadDatasetRequest._fields = [
   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.models.services.model_service import ModelClient
 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 KaggleClient(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 @@ class KaggleClient(object):
     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/kaggle_env.py

@@ -6,18 +6,18 @@ class KaggleEnv(Enum):
   LOCAL = 0  # localhost
   STAGING = 1  # staging.kaggle.com
   ADMIN = 2  # admin.kaggle.com
-  QA = 3 # qa.kaggle.com
+  QA = 3  # qa.kaggle.com
   # Direct prod access is not allowed to have IAP protection during testing, but we support basic auth.
   PROD = 4  # www.kaggle.com
 
 
 _env_to_endpoint = {
-  KaggleEnv.LOCAL: 'http://localhost',
-  KaggleEnv.STAGING: 'https://staging.kaggle.com',
-  KaggleEnv.ADMIN: 'https://admin.kaggle.com',
-  KaggleEnv.QA: 'https://qa.kaggle.com',
-  # See the comment above in KaggleEnv enum.
-  KaggleEnv.PROD: "https://www.kaggle.com",
+    KaggleEnv.LOCAL: 'http://localhost',
+    KaggleEnv.STAGING: 'https://staging.kaggle.com',
+    KaggleEnv.ADMIN: 'https://admin.kaggle.com',
+    KaggleEnv.QA: 'https://qa.kaggle.com',
+    # See the comment above in KaggleEnv enum.
+    KaggleEnv.PROD: 'https://www.kaggle.com',
 }
 
 
@@ -27,8 +27,8 @@ def get_endpoint(env: KaggleEnv):
 
 def get_env():
   env = os.getenv('KAGGLE_API_ENVIRONMENT')
-  if env is None:
-    raise Exception('Must specify KaggleEnv or set KAGGLE_API_ENVIRONMENT env var')
+  if env is None or env == 'PROD':
+    return KaggleEnv.PROD
   if env == 'LOCALHOST':
     return KaggleEnv.LOCAL
   if env == 'ADMIN':
@@ -37,6 +37,4 @@ def get_env():
     return KaggleEnv.STAGING
   if env == 'QA':
     return KaggleEnv.QA
-  if env == 'PROD':
-    return KaggleEnv.PROD
   raise Exception(f'Unrecognized value in KAGGLE_API_ENVIRONMENT: "{env}"')

kagglesdk/kaggle_http_client.py

@@ -18,7 +18,14 @@ from typing import Type
 # currently usable by the CLI.
 
 # TODO: Extend kapigen to add a boolean to these requests indicating that they use forms.
-REQUESTS_REQUIRING_FORMS = ['ApiUploadDatasetFileRequest', 'ApiCreateSubmissionRequest', 'ApiCreateCodeSubmissionRequest', 'ApiStartSubmissionUploadRequest', 'ApiUploadModelFileRequest']
+REQUESTS_REQUIRING_FORMS = [
+    'ApiUploadDatasetFileRequest',
+    'ApiCreateSubmissionRequest',
+    'ApiCreateCodeSubmissionRequest',
+    'ApiStartSubmissionUploadRequest',
+    'ApiUploadModelFileRequest',
+]
+
 
 def _headers_to_str(headers):
   return '\n'.join(f'{k}: {v}' for k, v in headers.items())
@@ -44,7 +51,9 @@ def _get_apikey_creds():
 
 def clean_data(data):
   if isinstance(data, dict):
-    return {to_lower_camel_case(k): clean_data(v) for k, v in data.items() if v is not None}
+    return {
+        to_lower_camel_case(k): clean_data(v) for k, v in data.items() if v is not None
+    }
   if isinstance(data, list):
     return [clean_data(v) for v in data if v is not None]
   if data is True:
@@ -53,6 +62,7 @@ def clean_data(data):
     return 'false'
   return data
 
+
 def find_words(source, left='{', right='}'):
   words = []
   split_str = source.split(left)
@@ -64,8 +74,10 @@ def find_words(source, left='{', right='}'):
 
   return words
 
+
 def to_camel_case(snake_str):
-  return "".join(x.capitalize() for x in snake_str.lower().split("_"))
+  return ''.join(x.capitalize() for x in snake_str.lower().split('_'))
+
 
 def to_lower_camel_case(snake_str):
   # https://stackoverflow.com/questions/19053707/converting-snake-case-to-lower-camel-case-lowercamelcase
@@ -74,18 +86,21 @@ def to_lower_camel_case(snake_str):
   camel_string = to_camel_case(snake_str)
   return snake_str[0].lower() + camel_string[1:]
 
+
 class KaggleHttpClient(object):
   _xsrf_cookie_name = 'XSRF-TOKEN'
-  _csrf_cookie_name = "CSRF-TOKEN"
+  _csrf_cookie_name = 'CSRF-TOKEN'
   _xsrf_cookies = (_xsrf_cookie_name, _csrf_cookie_name)
   _xsrf_header_name = 'X-XSRF-TOKEN'
 
-  def __init__(self,
-               env: KaggleEnv = None,
-               verbose: bool = False,
-               renew_iap_token=None,
-               username=None,
-               password=None):
+  def __init__(
+      self,
+      env: KaggleEnv = None,
+      verbose: bool = False,
+      renew_iap_token=None,
+      username=None,
+      password=None,
+  ):
     self._env = env or get_env()
     self._signed_in = None
     self._endpoint = get_endpoint(self._env)
@@ -94,21 +109,29 @@ class KaggleHttpClient(object):
     self._username = username
     self._password = password
 
-  def call(self, service_name: str, request_name: str, request: KaggleObject,
-           response_type: Type[KaggleObject]):
+  def call(
+      self,
+      service_name: str,
+      request_name: str,
+      request: KaggleObject,
+      response_type: Type[KaggleObject],
+  ):
     self._init_session()
     http_request = self._prepare_request(service_name, request_name, request)
 
-    http_response = self._session.send(http_request)
+    # Merge environment settings into session
+    settings = self._session.merge_environment_settings(http_request.url, {}, None, None, None)
+    http_response = self._session.send(http_request, **settings)
 
     response = self._prepare_response(response_type, http_response)
     return response
 
-  def _prepare_request(self, service_name: str, request_name: str,
-                       request: KaggleObject):
+  def _prepare_request(
+      self, service_name: str, request_name: str, request: KaggleObject
+  ):
     request_url = self._get_request_url(request)
     method = request.method()
-    data= ''
+    data = ''
     if method == 'GET':
       data = request.__class__.to_dict(request, ignore_defaults=False)
       if request.endpoint_path():
@@ -119,10 +142,12 @@ class KaggleHttpClient(object):
       if data:
         request_url = f'{request_url}?{urllib.parse.urlencode(clean_data(data))}'
       data = ''
-      self._session.headers.update({
-        'Accept': 'application/json',
-        'Content-Type': 'text/plain',
-        })
+      self._session.headers.update(
+          {
+              'Accept': 'application/json',
+              'Content-Type': 'text/plain',
+          }
+      )
     elif method == 'POST':
       data = request.to_field_map(request, ignore_defaults=True)
       if isinstance(data, dict):
@@ -136,17 +161,20 @@ class KaggleHttpClient(object):
         else:
           content_type = 'application/json'
           data = json.dumps(data)
-        self._session.headers.update({
-          'Accept': 'application/json',
-          'Content-Type': content_type,
-          })
+        self._session.headers.update(
+            {
+                'Accept': 'application/json',
+                'Content-Type': content_type,
+            }
+        )
     http_request = requests.Request(
-      method=method,
-      url=request_url,
-      data=data,
-      headers=self._session.headers,
-      # cookies=self._get_xsrf_cookies(),
-      auth=self._session.auth)
+        method=method,
+        url=request_url,
+        data=data,
+        headers=self._session.headers,
+        # cookies=self._get_xsrf_cookies(),
+        auth=self._session.auth,
+    )
     prepared_request = http_request.prepare()
     self._print_request(prepared_request)
     return prepared_request
@@ -164,8 +192,7 @@ class KaggleHttpClient(object):
     if 'application/json' in http_response.headers['Content-Type']:
       resp = http_response.json()
       if 'code' in resp and resp['code'] >= 400:
-        raise requests.exceptions.HTTPError(
-          resp['message'], response=http_response)
+        raise requests.exceptions.HTTPError(resp['message'], response=http_response)
     if response_type is None:  # Method doesn't have a return type
       return None
     return response_type.prepare_from(http_response)
@@ -175,8 +202,8 @@ class KaggleHttpClient(object):
       return
     self._print('---------------------Request----------------------')
     self._print(
-      f'{request.method} {request.url}\n{_headers_to_str(request.headers)}\n\n{request.body}'
-      )
+        f'{request.method} {request.url}\n{_headers_to_str(request.headers)}\n\n{request.body}'
+    )
     self._print('--------------------------------------------------')
 
   def _print_response(self, response, body=True):
@@ -205,17 +232,21 @@ class KaggleHttpClient(object):
       return self._session
 
     self._session = requests.Session()
-    self._session.headers.update({
-      'User-Agent': 'kaggle-api/v1.7.0',  # Was: V2
-      'Content-Type': 'application/x-www-form-urlencoded',  # Was: /json
-      })
+    self._session.headers.update(
+        {
+            'User-Agent': 'kaggle-api/v1.7.0',  # Was: V2
+            'Content-Type': 'application/x-www-form-urlencoded',  # Was: /json
+        }
+    )
 
     iap_token = self._get_iap_token_if_required()
     if iap_token is not None:
-      self._session.headers.update({
-        # https://cloud.google.com/iap/docs/authentication-howto#authenticating_from_proxy-authorization_header
-        'Proxy-Authorization': f'Bearer {iap_token}',
-        })
+      self._session.headers.update(
+          {
+              # https://cloud.google.com/iap/docs/authentication-howto#authenticating_from_proxy-authorization_header
+              'Proxy-Authorization': f'Bearer {iap_token}',
+          }
+      )
 
     self._try_fill_auth()
     # self._fill_xsrf_token(iap_token)  # TODO Make this align with original handler.
@@ -230,10 +261,11 @@ class KaggleHttpClient(object):
 
   def _fill_xsrf_token(self, iap_token):
     initial_get_request = requests.Request(
-      method='GET',
-      url=self._endpoint,
-      headers=self._session.headers,
-      auth=self._session.auth)
+        method='GET',
+        url=self._endpoint,
+        headers=self._session.headers,
+        auth=self._session.auth,
+    )
     prepared_request = initial_get_request.prepare()
     self._print_request(prepared_request)
 
@@ -244,10 +276,13 @@ class KaggleHttpClient(object):
       raise requests.exceptions.HTTPError('IAP token invalid or expired')
     http_response.raise_for_status()
 
-    self._session.headers.update({
-      KaggleHttpClient._xsrf_header_name:
-        self._session.cookies[KaggleHttpClient._xsrf_cookie_name],
-      })
+    self._session.headers.update(
+        {
+            KaggleHttpClient._xsrf_header_name: self._session.cookies[
+                KaggleHttpClient._xsrf_cookie_name
+            ],
+        }
+    )
 
   class BearerAuth(requests.auth.AuthBase):
 
@@ -255,7 +290,7 @@ class KaggleHttpClient(object):
       self.token = token
 
     def __call__(self, r):
-      r.headers["Authorization"] = f"Bearer {self.token}"
+      r.headers['Authorization'] = f'Bearer {self.token}'
       return r
 
   def _try_fill_auth(self):
@@ -286,11 +321,11 @@ class KaggleHttpClient(object):
   def make_form(fields):
     body = BytesIO()
     boundary = binascii.hexlify(os.urandom(16)).decode()
-    writer = codecs.lookup("utf-8")[3]
+    writer = codecs.lookup('utf-8')[3]
 
     for field in fields.items():
       field = RequestField.from_tuples(*field)
-      body.write(f"--{boundary}\r\n".encode("latin-1"))
+      body.write(f'--{boundary}\r\n'.encode('latin-1'))
 
       writer(body).write(field.render_headers())
       data = field.data
@@ -303,11 +338,11 @@ class KaggleHttpClient(object):
       else:
         body.write(data)
 
-      body.write(b"\r\n")
+      body.write(b'\r\n')
 
-    body.write(f"--{boundary}--\r\n".encode("latin-1"))
+    body.write(f'--{boundary}--\r\n'.encode('latin-1'))
 
-    content_type = f"multipart/form-data; boundary={boundary}"
+    content_type = f'multipart/form-data; boundary={boundary}'
 
     return body.getvalue(), content_type