kaggle 1.7.3b1__py3-none-any.whl → 1.7.4.1__py3-none-any.whl

kaggle/api/kaggle_api_extended.py

@@ -34,7 +34,8 @@ import requests
 import urllib3.exceptions as urllib3_exceptions
 from requests import RequestException
 
-from kaggle.models.kaggle_models_extended import ResumableUploadResult, File
+from kaggle.models.kaggle_models_extended import ResumableUploadResult, File, \
+  Kernel
 
 from requests.adapters import HTTPAdapter
 from slugify import slugify
@@ -61,7 +62,8 @@ from kagglesdk.datasets.types.dataset_types import DatasetSettings, \
   SettingsLicense, DatasetCollaborator
 from kagglesdk.kernels.types.kernels_api_service import ApiListKernelsRequest, \
   ApiListKernelFilesRequest, ApiSaveKernelRequest, ApiGetKernelRequest, \
-  ApiListKernelSessionOutputRequest, ApiGetKernelSessionStatusRequest
+  ApiListKernelSessionOutputRequest, ApiGetKernelSessionStatusRequest, \
+  ApiSaveKernelResponse
 from kagglesdk.kernels.types.kernels_enums import KernelsListSortType, \
   KernelsListViewType
 from kagglesdk.models.types.model_api_service import ApiListModelsRequest, \
@@ -251,7 +253,7 @@ class ResumableFileUpload(object):
 
 
 class KaggleApi:
-  __version__ = '1.7.3b1'
+  __version__ = '1.7.4.1'
 
   CONFIG_NAME_PROXY = 'proxy'
   CONFIG_NAME_COMPETITION = 'competition'
@@ -290,7 +292,7 @@ class KaggleApi:
 
   args = {}  # DEBUG Add --local to use localhost
   if os.environ.get('KAGGLE_API_ENVIRONMENT') == 'LOCALHOST':
-    args = {'--local'}
+    args = {'--verbose','--local'}
 
   # Kernels valid types
   valid_push_kernel_types = ['script', 'notebook']
@@ -700,7 +702,16 @@ class KaggleApi:
       return enum_class[item]
     except KeyError:
       prefix = self.camel_to_snake(enum_class.__name__).upper()
-      return enum_class[f'{prefix}_{self.camel_to_snake(item_name).upper()}']
+      full_name = f'{prefix}_{self.camel_to_snake(item_name).upper()}'
+    try:
+      return enum_class[full_name]
+    except KeyError:
+      # Handle PY_TORCH vs PYTORCH, etc.
+      full_name = full_name.replace('_', '')
+      for item in vars(enum_class):
+        if item.replace('_', '') == full_name:
+          return enum_class[item]
+      raise
 
   def short_enum_name(self, value):
     full_name = str(value)
@@ -792,8 +803,47 @@ class KaggleApi:
     else:
       print('No competitions found')
 
+  def competition_submit_code(self, file_name, message, competition, kernel=None, kernel_version=None, quiet=False):
+    """ Submit to a code competition.
+
+            Parameters
+            ==========
+            file_name: the name of  the output file created by the kernel (not used for packages)
+            message: the submission description
+            competition: the competition name; if not given use the 'competition' config value
+            kernel: the <owner>/<notebook> of the notebook to use for a code competition
+            kernel_version: the version number, returned by 'kaggle kernels push ...'
+            quiet: suppress verbose output (default is False)
+        """
+    if competition is None:
+      competition = self.get_config_value(self.CONFIG_NAME_COMPETITION)
+      if competition is not None and not quiet:
+        print('Using competition: ' + competition)
+    if competition is None:
+      raise ValueError('No competition specified')
+
+    if kernel is None:
+      raise ValueError('No kernel specified')
+    else:
+      with self.build_kaggle_client() as kaggle:
+        items = kernel.split('/')
+        if len(items) != 2:
+          raise ValueError('The kernel must be specified as <owner>/<notebook>')
+        submit_request = ApiCreateCodeSubmissionRequest()
+        submit_request.file_name = file_name
+        submit_request.competition_name = competition
+        submit_request._kernel_owner = items[0]
+        submit_request.kernel_slug = items[1]
+        if kernel_version:
+          submit_request.kernel_version = int(kernel_version)
+        if message:
+          submit_request.submission_description = message
+        submit_response = kaggle.competitions.competition_api_client.create_code_submission(
+            submit_request)
+        return submit_response
+
   def competition_submit(self, file_name, message, competition, quiet=False):
-    """ Submit a competition.
+    """ Submit to a competition.
 
             Parameters
             ==========
@@ -810,6 +860,8 @@ class KaggleApi:
     if competition is None:
       raise ValueError('No competition specified')
     else:
+      if file_name is None:
+        raise ValueError('No file specified')
       with self.build_kaggle_client() as kaggle:
         request = ApiStartSubmissionUploadRequest()
         request.competition_name = competition
@@ -828,15 +880,18 @@ class KaggleApi:
         submit_request = ApiCreateSubmissionRequest()
         submit_request.competition_name = competition
         submit_request.blob_file_tokens = response.token
-        submit_request.submission_description = message
+        if message:
+          submit_request.submission_description = message
         submit_response = kaggle.competitions.competition_api_client.create_submission(
             submit_request)
         return submit_response
 
   def competition_submit_cli(self,
-                             file_name,
-                             message,
-                             competition,
+                             file_name=None,
+                             message=None,
+                             competition=None,
+                             kernel=None,
+                             version=None,
                              competition_opt=None,
                              quiet=False):
     """ Submit a competition using the client. Arguments are same as for
@@ -847,12 +902,20 @@ class KaggleApi:
             file_name: the competition metadata file
             message: the submission description
             competition: the competition name; if not given use the 'competition' config value
+            kernel: the name of the kernel to submit to a code competition
+            version: the version of the kernel to submit to a code competition, e.g. '1'
             quiet: suppress verbose output (default is False)
             competition_opt: an alternative competition option provided by cli
         """
+    if kernel and not version or version and not kernel:
+      raise ValueError('Code competition submissions require both the output file name and the version label')
     competition = competition or competition_opt
     try:
-      submit_result = self.competition_submit(file_name, message, competition,
+      if kernel:
+        submit_result = self.competition_submit_code(file_name, message, competition,
+                                                     kernel, version, quiet)
+      else:
+        submit_result = self.competition_submit(file_name, message, competition,
                                               quiet)
     except RequestException as e:
       if e.response and e.response.status_code == 404:
@@ -1665,16 +1728,22 @@ class KaggleApi:
     dataset = dataset or dataset_opt
 
     owner_slug, dataset_slug, _ = self.split_dataset_string(dataset)
-    metadata = self.process_response(
-        self.metadata_get_with_http_info(owner_slug, dataset_slug))
+    request = ApiGetDatasetMetadataRequest()
+    request.owner_slug = owner_slug
+    request.dataset_slug = dataset_slug
+    with self.build_kaggle_client() as kaggle:
+      response = kaggle.datasets.dataset_api_client.get_dataset_metadata(request)
+      if response.error_message:
+        raise Exception(response.error_message)
+      metadata = response.info
 
-    if 'info' in metadata and 'licenses' in metadata['info']:
+    if metadata and metadata.licenses:
       # license_objs format is like: [{ 'name': 'CC0-1.0' }]
-      license_objs = metadata['info']['licenses']
+      license_objs = metadata.licenses
       licenses = [
-          license_obj['name']
+          license_obj.name
           for license_obj in license_objs
-          if 'name' in license_obj
+          if license_obj.name
       ]
     else:
       licenses = [
@@ -2297,10 +2366,6 @@ class KaggleApi:
       print('No files found')
       return
 
-    if result.error_message:
-      print(result.error_message)
-      return
-
     next_page_token = result.nextPageToken
     if next_page_token:
       print('Next Page Token = {}'.format(next_page_token))
@@ -2369,12 +2434,13 @@ class KaggleApi:
     meta_file = self.kernels_initialize(folder)
     print('Kernel metadata template written to: ' + meta_file)
 
-  def kernels_push(self, folder, timeout):
+  def kernels_push(self, folder, timeout=None) -> ApiSaveKernelResponse:
     """ Read the metadata file and kernel files from a notebook, validate
             both, and use the Kernel API to push to Kaggle if all is valid.
             Parameters
             ==========
             folder: the path of the folder
+            timeout: maximum run time iin seconds
         """
     if not os.path.isdir(folder):
       raise ValueError('Invalid folder: ' + folder)
@@ -2465,7 +2531,7 @@ class KaggleApi:
           # but the server expects just one
           if 'source' in cell and isinstance(cell['source'], list):
             cell['source'] = ''.join(cell['source'])
-      script_body = json.dumps(json_body).replace("'", "\\'")
+      script_body = json.dumps(json_body)
 
     with self.build_kaggle_client() as kaggle:
       request = ApiSaveKernelRequest()
@@ -2496,6 +2562,7 @@ class KaggleApi:
         Parameters
             ==========
             folder: the path of the folder
+            timeout: maximum run time in seconds
         """
     folder = folder or os.getcwd()
     result = self.kernels_push(folder, timeout)
@@ -2829,9 +2896,9 @@ class KaggleApi:
       data['slug'] = model_ref_split[1]
       data['title'] = model.title
       data['subtitle'] = model.subtitle
-      data['isPrivate'] = model.isPrivate  # TODO Test to ensure True default
+      data['isPrivate'] = model.is_private  # TODO Test to ensure True default
       data['description'] = model.description
-      data['publishTime'] = model.publishTime
+      data['publishTime'] = model.publish_time
 
       with open(meta_file, 'w') as f:
         json.dump(data, f, indent=2)
@@ -3010,7 +3077,7 @@ class KaggleApi:
     folder = folder or os.getcwd()
     result = self.model_create_new(folder)
 
-    if result.hasId:
+    if result.id:
       print('Your model was created. Id={}. Url={}'.format(
           result.id, result.url))
     else:
@@ -3134,7 +3201,7 @@ class KaggleApi:
     folder = folder or os.getcwd()
     result = self.model_update(folder)
 
-    if result.hasId:
+    if result.id:
       print('Your model was updated. Id={}. Url={}'.format(
           result.id, result.url))
     else:
@@ -3357,7 +3424,7 @@ class KaggleApi:
     folder = folder or os.getcwd()
     result = self.model_instance_create(folder, quiet, dir_mode)
 
-    if result.hasId:
+    if result.id:
       print('Your model instance was created. Id={}. Url={}'.format(
           result.id, result.url))
     else:
@@ -3442,10 +3509,10 @@ class KaggleApi:
         next_page_token = response.next_page_token
         if next_page_token:
           print('Next Page Token = {}'.format(next_page_token))
-        return response
+        return FileList.from_response(response)
       else:
         print('No files found')
-        return FileList({})
+        return FileList({'files': [], 'nextPageToken': ''})
 
   def model_instance_files_cli(self,
                                model_instance,
@@ -4635,6 +4702,20 @@ class FileList(object):
     else:
       self.nextPageToken = ""
 
+  @staticmethod
+  def from_response(response):
+    inst = FileList({'files': [], 'nextPageToken': ''})
+    inst.error_message = ''
+    files = response.files
+    if files:
+      inst.files = [File(f) for f in files]
+    else:
+      inst.files = []
+    token = response.next_page_token
+    if token:
+      inst.nextPageToken = token
+    else:
+      inst.nextPageToken = ""
   def __repr__(self):
     return ''
 

kaggle/cli.py

@@ -136,6 +136,7 @@ def parse_competitions(subparsers):
       '--page',
       dest='page',
       default=1,
+      type=int,
       required=False,
       help=Help.param_page)
   parser_competitions_list_optional.add_argument(
@@ -183,6 +184,7 @@ def parse_competitions(subparsers):
       dest='page_size',
       required=False,
       default=20,
+      type=int,
       help=Help.param_page_size)
   parser_competitions_files._action_groups.append(
       parser_competitions_files_optional)
@@ -234,8 +236,6 @@ def parse_competitions(subparsers):
       help=Help.command_competitions_submit)
   parser_competitions_submit_optional = parser_competitions_submit._action_groups.pop(
   )
-  parser_competitions_submit_required = parser_competitions_submit.add_argument_group(
-      'required arguments')
   parser_competitions_submit_optional.add_argument(
       'competition', nargs='?', default=None, help=Help.param_competition)
   parser_competitions_submit_optional.add_argument(
@@ -244,14 +244,18 @@ def parse_competitions(subparsers):
       dest='competition_opt',
       required=False,
       help=argparse.SUPPRESS)
-  parser_competitions_submit_required.add_argument(
-      '-f', '--file', dest='file_name', required=True, help=Help.param_upfile)
-  parser_competitions_submit_required.add_argument(
+  parser_competitions_submit_optional.add_argument(
+      '-f', '--file', dest='file_name', help=Help.param_upfile)
+  parser_competitions_submit_optional.add_argument(
+      '-k', '--kernel', dest='kernel', help=Help.param_code_kernel)
+  parser_competitions_submit_optional.add_argument(
       '-m',
       '--message',
       dest='message',
       required=True,
       help=Help.param_competition_message)
+  parser_competitions_submit_optional.add_argument(
+      '-v', '--version', dest='version', help=Help.param_code_version)
   parser_competitions_submit_optional.add_argument(
       '-q', '--quiet', dest='quiet', action='store_true', help=Help.param_quiet)
   parser_competitions_submit._action_groups.append(
@@ -358,7 +362,7 @@ def parse_datasets(subparsers):
       required=False,
       help=Help.param_dataset_sort_by)
   parser_datasets_list.add_argument(
-      '--size', dest='size', required=False, help=Help.param_dataset_size)
+      '--size', dest='size', type=int, required=False, help=Help.param_dataset_size)
   parser_datasets_list.add_argument(
       '--file-type',
       dest='file_type',
@@ -382,6 +386,7 @@ def parse_datasets(subparsers):
       '--page',
       dest='page',
       default=1,
+      type=int,
       required=False,
       help=Help.param_page)
   parser_datasets_list.add_argument(
@@ -394,11 +399,13 @@ def parse_datasets(subparsers):
       '--max-size',
       dest='max_size',
       required=False,
+      type=int,
       help=Help.param_dataset_maxsize)
   parser_datasets_list.add_argument(
       '--min-size',
       dest='min_size',
       required=False,
+      type=int,
       help=Help.param_dataset_minsize)
   parser_datasets_list._action_groups.append(parser_datasets_list_optional)
   parser_datasets_list.set_defaults(func=api.dataset_list_cli)
@@ -433,6 +440,7 @@ def parse_datasets(subparsers):
       dest='page_size',
       required=False,
       default=20,
+      type=int,
       help=Help.param_page_size)
   parser_datasets_files._action_groups.append(parser_datasets_files_optional)
   parser_datasets_files.set_defaults(func=api.dataset_list_files_cli)
@@ -645,9 +653,9 @@ def parse_kernels(subparsers):
   parser_kernels_list_optional.add_argument(
       '-m', '--mine', dest='mine', action='store_true', help=Help.param_mine)
   parser_kernels_list_optional.add_argument(
-      '-p', '--page', dest='page', default=1, help=Help.param_page)
+      '-p', '--page', dest='page', default=1, type=int, help=Help.param_page)
   parser_kernels_list_optional.add_argument(
-      '--page-size', dest='page_size', default=20, help=Help.param_page_size)
+      '--page-size', dest='page_size', default=20, type=int, help=Help.param_page_size)
   parser_kernels_list_optional.add_argument(
       '-s', '--search', dest='search', help=Help.param_search)
   parser_kernels_list_optional.add_argument(
@@ -716,7 +724,7 @@ def parse_kernels(subparsers):
   parser_kernels_files_optional.add_argument(
       '--page-token', dest='page_token', help=Help.param_page_token)
   parser_kernels_files_optional.add_argument(
-      '--page-size', dest='page_size', default=20, help=Help.param_page_size)
+      '--page-size', dest='page_size', default=20, type=int, help=Help.param_page_size)
   parser_kernels_files._action_groups.append(parser_kernels_files_optional)
   parser_kernels_files.set_defaults(func=api.kernels_list_files_cli)
 
@@ -750,7 +758,9 @@ def parse_kernels(subparsers):
   parser_kernels_push_optional.add_argument(
       '-t',
       '--timeout',
-      dest='timeout')
+      type=int,
+      dest='timeout',
+      help=Help.param_kernel_timeout)
   parser_kernels_push._action_groups.append(parser_kernels_push_optional)
   parser_kernels_push.set_defaults(func=api.kernels_push_cli)
 
@@ -889,7 +899,7 @@ def parse_models(subparsers):
   parser_models_list.add_argument(
       '--owner', dest='owner', required=False, help=Help.param_model_owner)
   parser_models_list.add_argument(
-      '--page-size', dest='page_size', default=20, help=Help.param_page_size)
+      '--page-size', dest='page_size', default=20, type=int, help=Help.param_page_size)
   parser_models_list.add_argument(
       '--page-token',
       dest='page_token',
@@ -1056,7 +1066,7 @@ def parse_model_instances(subparsers):
       action='store_true',
       help=Help.param_csv)
   parser_model_instances_files_optional.add_argument(
-      '--page-size', dest='page_size', default=20, help=Help.param_page_size)
+      '--page-size', dest='page_size', default=20, type=int, help=Help.param_page_size)
   parser_model_instances_files_optional.add_argument(
       '--page-token',
       dest='page_token',
@@ -1184,7 +1194,7 @@ def parse_model_instance_versions(subparsers):
       action='store_true',
       help=Help.param_csv)
   parser_model_instance_versions_files_optional.add_argument(
-      '--page-size', dest='page_size', default=20, help=Help.param_page_size)
+      '--page-size', dest='page_size', default=20, type=int, help=Help.param_page_size)
   parser_model_instance_versions_files_optional.add_argument(
       '--page-token',
       dest='page_token',
@@ -1420,7 +1430,9 @@ class Help(object):
   param_delete_old_version = 'Delete old versions of this dataset'
   param_force = ('Skip check whether local version of file is up to date, force'
                  ' file download')
-  param_upfile = 'File for upload (full path)'
+  param_upfile = 'File for upload (full path), or the name of the output file produced by a kernel (for code competitions)'
+  param_code_kernel = 'Name of kernel (notebook) to submit to a code competition'
+  param_code_version = 'Version of kernel to submit to a code competition, e.g. "Version 1"'
   param_csv = 'Print results in CSV format (if not set print in table format)'
   param_page = 'Page number for results paging. Page size is 20 by default'
   # NOTE: Default and max page size are set by the mid-tier code.
@@ -1515,6 +1527,9 @@ class Help(object):
   param_kernel_competition = 'Find kernels for a given competition slug'
   param_kernel_dataset = ('Find kernels for a given dataset slug. Format is '
                           '{username/dataset-slug}')
+  param_kernel_timeout = ('Limit the run time of a kernel to the given number '
+                          'of seconds. The global maximum time will not be '
+                          'exceeded.')
   param_kernel_user = 'Find kernels created by a given username'
   # TODO(b/129357583): Pull these from the same spot as the api impl
   param_kernel_language = (

kaggle/models/kaggle_models_extended.py

@@ -120,7 +120,10 @@ class File(object):
     except AttributeError:
       self.name = init_dict.name
       self.creation_date = init_dict.creation_date
-      self.size = File.get_size(init_dict.total_bytes)
+      try:
+        self.size = File.get_size(init_dict.total_bytes)
+      except Exception: # AttributeError would be preferred but doesn't work.
+        self.size = File.get_size(init_dict.size)
 
   def __repr__(self):
     return self.name

{kaggle-1.7.3b1.dist-info → kaggle-1.7.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kaggle
-Version: 1.7.3b1
+Version: 1.7.4.1
 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.3b1.dist-info → kaggle-1.7.4.1.dist-info}/RECORD

@@ -1,17 +1,17 @@
 kaggle/LICENSE,sha256=PN5H3cwV3xW9nvUXKcB_XOH60cWqne6qK3SAE8NI74s,11340
 kaggle/__init__.py,sha256=XFAbsmBy7kvlQrRhwEl2f8sb0-RdaLOieLQsX0CkEHU,151
-kaggle/cli.py,sha256=1POpmaPMD0SMhCNTLSJiTbQ0aOQ9tt4uaXpuePbEa7w,62937
+kaggle/cli.py,sha256=xhlpnWLtKAUG2m3baqODIX-1Lev4Un2IoHLDHbGU06E,63718
 kaggle/configuration.py,sha256=rgBGwX_iQnHMerDO0oOJJDClq_VRQeKmg0XMfgn5mzg,6069
 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=zVyDpP6EtZX-kYkLM3trOR8gJJ8C4bPfyEgWGb6XQD0,182215
+kaggle/api/kaggle_api_extended.py,sha256=nJBJCUOV8UVGnGl0bFPkjVsboIjov1zG3LhE1BRmt64,185825
 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/kaggle_models_extended.py,sha256=ajA-zSCp7dYTfxo70ub_M9a4I5r0TJ3_pIUUVmPCI24,7287
+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
@@ -27,8 +27,8 @@ 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=CIpYBThdnleSXFz1sSbVOoKctYZh01L-EM3WQmQDfgY,10138
-kagglesdk/kaggle_object.py,sha256=ZbCxMsA4AC-nefTy8X-2K8AsDdh9Gx0NYlnOBT5VCbU,10734
+kagglesdk/kaggle_http_client.py,sha256=aGWaU98cw4IdEM95sC1GmX6IqF5JOE5rhK5mNHczum8,10172
+kagglesdk/kaggle_object.py,sha256=eng8cWtDwkAKS4kbjXSfnpN_7PfpCyLlQRz8Lnpk6_w,10787
 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
@@ -45,9 +45,9 @@ kagglesdk/common/types/file_download.py,sha256=x8iOghw9ICDr2YnkBzBQtfOdRihX3QadO
 kagglesdk/common/types/http_redirect.py,sha256=7f-FJ0rgAAdmhGZmJAS_E1uLpTN7-w4gleo1ffvYF_A,3029
 kagglesdk/competitions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kagglesdk/competitions/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-kagglesdk/competitions/services/competition_api_service.py,sha256=pR53wFbtriTh113vnbkIeJJbGRaNjZqqRoTPzpVzfGY,5240
+kagglesdk/competitions/services/competition_api_service.py,sha256=P3CPPJ4m08ERjkBgwbT46EM38cv-3oWxZUMbzvfEzGs,5787
 kagglesdk/competitions/types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-kagglesdk/competitions/types/competition_api_service.py,sha256=amdcGskJLNbXWacyD7qIMYNwwxOSwnQ7IUHZwhkKNQA,55892
+kagglesdk/competitions/types/competition_api_service.py,sha256=NmJ0PRIjMrI_fjQt37YGJtCWFJCCFKbY-vO4v17o_JY,60307
 kagglesdk/competitions/types/competition_enums.py,sha256=gqjTYtlJ7bOB7QC0bniLDv7_GX_V8BFkOYY1NqN-fvU,1780
 kagglesdk/competitions/types/submission_status.py,sha256=DHbTr8S7AK8QpZ26Lg1m6CnDj_LeirVuP_xYuSBbwnE,247
 kagglesdk/datasets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -74,16 +74,16 @@ kagglesdk/models/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 kagglesdk/models/services/model_api_service.py,sha256=vF7NH0MAZoX_b0z3RqGhjdAiuaWU_ACNRDLjUN2HC3M,10145
 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=r_1JXYTiZT-kQ-Y6jh4KK8TEa-O8dE0zBnD6Az0DVoo,112500
-kagglesdk/models/types/model_enums.py,sha256=_XyoZl7xSbRI7b-FvFmI3U-DpIm8Cl-2TX09kwCqP4M,2013
+kagglesdk/models/types/model_api_service.py,sha256=dDabW7I8MaRuz-iOBSlx_vQPWF8mEig678DusyvxHIk,111682
+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/users/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kagglesdk/users/types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kagglesdk/users/types/users_enums.py,sha256=iAzI5TAM8tysOcqG2AUsb-DTdWEQF9XPOCy-M8Vv_ro,380
-kaggle-1.7.3b1.dist-info/METADATA,sha256=yOpLj9bvtM_xoS6zb-bP3Vk-cMB1ssNzLPENL0dE1ds,16953
-kaggle-1.7.3b1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-kaggle-1.7.3b1.dist-info/entry_points.txt,sha256=hl3dQAS4qpVkC5FWiqfnU6qKJU924OEN6PsHEiw-FGg,43
-kaggle-1.7.3b1.dist-info/licenses/LICENSE.txt,sha256=IzhfWrxIlFAci3lzZCg5WWHZJBI1QSzsHxO0plI63vk,11541
-kaggle-1.7.3b1.dist-info/RECORD,,
+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,,

kagglesdk/competitions/services/competition_api_service.py

@@ -1,6 +1,6 @@
 from kagglesdk.common.types.file_download import FileDownload
 from kagglesdk.common.types.http_redirect import HttpRedirect
-from kagglesdk.competitions.types.competition_api_service import ApiCreateSubmissionRequest, ApiCreateSubmissionResponse, ApiDownloadDataFileRequest, ApiDownloadDataFilesRequest, ApiDownloadLeaderboardRequest, ApiGetLeaderboardRequest, ApiGetLeaderboardResponse, ApiGetSubmissionRequest, ApiListCompetitionsRequest, ApiListCompetitionsResponse, ApiListDataFilesRequest, ApiListDataFilesResponse, ApiListSubmissionsRequest, ApiListSubmissionsResponse, ApiStartSubmissionUploadRequest, ApiStartSubmissionUploadResponse, ApiSubmission
+from kagglesdk.competitions.types.competition_api_service import ApiCreateCodeSubmissionRequest, ApiCreateCodeSubmissionResponse, ApiCreateSubmissionRequest, ApiCreateSubmissionResponse, ApiDownloadDataFileRequest, ApiDownloadDataFilesRequest, ApiDownloadLeaderboardRequest, ApiGetLeaderboardRequest, ApiGetLeaderboardResponse, ApiGetSubmissionRequest, ApiListCompetitionsRequest, ApiListCompetitionsResponse, ApiListDataFilesRequest, ApiListDataFilesResponse, ApiListSubmissionsRequest, ApiListSubmissionsResponse, ApiStartSubmissionUploadRequest, ApiStartSubmissionUploadResponse, ApiSubmission
 from kagglesdk.kaggle_http_client import KaggleHttpClient
 
 class CompetitionApiClient(object):
@@ -80,6 +80,18 @@ class CompetitionApiClient(object):
 
     return self._client.call("competitions.CompetitionApiService", "ApiCreateSubmission", request, ApiCreateSubmissionResponse)
 
+  def create_code_submission(self, request: ApiCreateCodeSubmissionRequest = None) -> ApiCreateCodeSubmissionResponse:
+    r"""
+    Args:
+      request (ApiCreateCodeSubmissionRequest):
+        The request object; initialized to empty instance if not specified.
+    """
+
+    if request is None:
+      request = ApiCreateCodeSubmissionRequest()
+
+    return self._client.call("competitions.CompetitionApiService", "ApiCreateCodeSubmission", request, ApiCreateCodeSubmissionResponse)
+
   def get_submission(self, request: ApiGetSubmissionRequest = None) -> ApiSubmission:
     r"""
     Args:

kagglesdk/competitions/types/competition_api_service.py

@@ -4,6 +4,153 @@ from kagglesdk.competitions.types.submission_status import SubmissionStatus
 from kagglesdk.kaggle_object import *
 from typing import Optional, List
 
+class ApiCreateCodeSubmissionRequest(KaggleObject):
+  r"""
+  Attributes:
+    competition_name (str)
+    kernel_owner (str)
+    kernel_slug (str)
+    kernel_version (int)
+    file_name (str)
+    submission_description (str)
+  """
+
+  def __init__(self):
+    self._competition_name = ""
+    self._kernel_owner = ""
+    self._kernel_slug = ""
+    self._kernel_version = None
+    self._file_name = None
+    self._submission_description = None
+    self._freeze()
+
+  @property
+  def competition_name(self) -> str:
+    return self._competition_name
+
+  @competition_name.setter
+  def competition_name(self, competition_name: str):
+    if competition_name is None:
+      del self.competition_name
+      return
+    if not isinstance(competition_name, str):
+      raise TypeError('competition_name must be of type str')
+    self._competition_name = competition_name
+
+  @property
+  def kernel_owner(self) -> str:
+    return self._kernel_owner
+
+  @kernel_owner.setter
+  def kernel_owner(self, kernel_owner: str):
+    if kernel_owner is None:
+      del self.kernel_owner
+      return
+    if not isinstance(kernel_owner, str):
+      raise TypeError('kernel_owner must be of type str')
+    self._kernel_owner = kernel_owner
+
+  @property
+  def kernel_slug(self) -> str:
+    return self._kernel_slug
+
+  @kernel_slug.setter
+  def kernel_slug(self, kernel_slug: str):
+    if kernel_slug is None:
+      del self.kernel_slug
+      return
+    if not isinstance(kernel_slug, str):
+      raise TypeError('kernel_slug must be of type str')
+    self._kernel_slug = kernel_slug
+
+  @property
+  def kernel_version(self) -> int:
+    return self._kernel_version or 0
+
+  @kernel_version.setter
+  def kernel_version(self, kernel_version: int):
+    if kernel_version is None:
+      del self.kernel_version
+      return
+    if not isinstance(kernel_version, int):
+      raise TypeError('kernel_version must be of type int')
+    self._kernel_version = kernel_version
+
+  @property
+  def file_name(self) -> str:
+    return self._file_name or ""
+
+  @file_name.setter
+  def file_name(self, file_name: str):
+    if file_name is None:
+      del self.file_name
+      return
+    if not isinstance(file_name, str):
+      raise TypeError('file_name must be of type str')
+    self._file_name = file_name
+
+  @property
+  def submission_description(self) -> str:
+    return self._submission_description or ""
+
+  @submission_description.setter
+  def submission_description(self, submission_description: str):
+    if submission_description is None:
+      del self.submission_description
+      return
+    if not isinstance(submission_description, str):
+      raise TypeError('submission_description must be of type str')
+    self._submission_description = submission_description
+
+  def endpoint(self):
+    path = '/api/v1/competitions/submissions/submit-notebook/{competition_name}'
+    return path.format_map(self.to_field_map(self))
+
+
+  @staticmethod
+  def method():
+    return 'POST'
+
+
+class ApiCreateCodeSubmissionResponse(KaggleObject):
+  r"""
+  Attributes:
+    message (str)
+    ref (int)
+  """
+
+  def __init__(self):
+    self._message = ""
+    self._ref = 0
+    self._freeze()
+
+  @property
+  def message(self) -> str:
+    return self._message
+
+  @message.setter
+  def message(self, message: str):
+    if message is None:
+      del self.message
+      return
+    if not isinstance(message, str):
+      raise TypeError('message must be of type str')
+    self._message = message
+
+  @property
+  def ref(self) -> int:
+    return self._ref
+
+  @ref.setter
+  def ref(self, ref: int):
+    if ref is None:
+      del self.ref
+      return
+    if not isinstance(ref, int):
+      raise TypeError('ref must be of type int')
+    self._ref = ref
+
+
 class ApiCreateSubmissionRequest(KaggleObject):
   r"""
   Attributes:
@@ -77,8 +224,6 @@ class ApiCreateSubmissionResponse(KaggleObject):
   r"""
   Attributes:
     message (str)
-      TODO: Remove when we feel okay with the breaking change, this adds no
-      value.
     ref (int)
   """
 
@@ -89,10 +234,6 @@ class ApiCreateSubmissionResponse(KaggleObject):
 
   @property
   def message(self) -> str:
-    r"""
-    TODO: Remove when we feel okay with the breaking change, this adds no
-    value.
-    """
     return self._message
 
   @message.setter
@@ -1719,6 +1860,20 @@ class ApiCategory(KaggleObject):
     self._total_count = total_count
 
 
+ApiCreateCodeSubmissionRequest._fields = [
+  FieldMetadata("competitionName", "competition_name", "_competition_name", str, "", PredefinedSerializer()),
+  FieldMetadata("kernelOwner", "kernel_owner", "_kernel_owner", str, "", PredefinedSerializer()),
+  FieldMetadata("kernelSlug", "kernel_slug", "_kernel_slug", str, "", PredefinedSerializer()),
+  FieldMetadata("kernelVersion", "kernel_version", "_kernel_version", int, None, PredefinedSerializer(), optional=True),
+  FieldMetadata("fileName", "file_name", "_file_name", str, None, PredefinedSerializer(), optional=True),
+  FieldMetadata("submissionDescription", "submission_description", "_submission_description", str, None, PredefinedSerializer(), optional=True),
+]
+
+ApiCreateCodeSubmissionResponse._fields = [
+  FieldMetadata("message", "message", "_message", str, "", PredefinedSerializer()),
+  FieldMetadata("ref", "ref", "_ref", int, 0, PredefinedSerializer()),
+]
+
 ApiCreateSubmissionRequest._fields = [
   FieldMetadata("competitionName", "competition_name", "_competition_name", str, "", PredefinedSerializer()),
   FieldMetadata("blobFileTokens", "blob_file_tokens", "_blob_file_tokens", str, "", PredefinedSerializer()),

kagglesdk/kaggle_http_client.py

@@ -18,7 +18,7 @@ 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', '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())

kagglesdk/kaggle_object.py

@@ -275,7 +275,10 @@ class KaggleObject(object):
     return KaggleObject.to_json(self, ignore_defaults=False)
 
   def __contains__(self, field_name):
-    field = self._get_field(field_name)
+    try:
+      field = self._get_field(field_name)
+    except ValueError:
+      return False
     value = getattr(self, field.private_field_name)
     if field.optional:
       return value is not None

kagglesdk/models/types/model_api_service.py

@@ -1169,7 +1169,6 @@ class ApiListModelGatingUserConsentsRequest(KaggleObject):
     model_slug (str)
     review_status (GatingAgreementRequestsReviewStatus)
       filters: a null value means the filter is off.
-    expiry_status (GatingAgreementRequestsExpiryStatus)
     is_user_request_data_expired (bool)
     page_size (int)
       paging
@@ -1180,7 +1179,6 @@ class ApiListModelGatingUserConsentsRequest(KaggleObject):
     self._owner_slug = ""
     self._model_slug = ""
     self._review_status = None
-    self._expiry_status = None
     self._is_user_request_data_expired = None
     self._page_size = None
     self._page_token = None
@@ -1226,19 +1224,6 @@ class ApiListModelGatingUserConsentsRequest(KaggleObject):
       raise TypeError('review_status must be of type GatingAgreementRequestsReviewStatus')
     self._review_status = review_status
 
-  @property
-  def expiry_status(self) -> 'GatingAgreementRequestsExpiryStatus':
-    return self._expiry_status or GatingAgreementRequestsExpiryStatus.GATING_AGREEMENT_REQUESTS_EXPIRY_STATUS_UNSPECIFIED
-
-  @expiry_status.setter
-  def expiry_status(self, expiry_status: 'GatingAgreementRequestsExpiryStatus'):
-    if expiry_status is None:
-      del self.expiry_status
-      return
-    if not isinstance(expiry_status, GatingAgreementRequestsExpiryStatus):
-      raise TypeError('expiry_status must be of type GatingAgreementRequestsExpiryStatus')
-    self._expiry_status = expiry_status
-
   @property
   def is_user_request_data_expired(self) -> bool:
     return self._is_user_request_data_expired or False
@@ -3531,7 +3516,6 @@ ApiListModelGatingUserConsentsRequest._fields = [
   FieldMetadata("ownerSlug", "owner_slug", "_owner_slug", str, "", PredefinedSerializer()),
   FieldMetadata("modelSlug", "model_slug", "_model_slug", str, "", PredefinedSerializer()),
   FieldMetadata("reviewStatus", "review_status", "_review_status", GatingAgreementRequestsReviewStatus, None, EnumSerializer(), optional=True),
-  FieldMetadata("expiryStatus", "expiry_status", "_expiry_status", GatingAgreementRequestsExpiryStatus, None, EnumSerializer(), optional=True),
   FieldMetadata("isUserRequestDataExpired", "is_user_request_data_expired", "_is_user_request_data_expired", bool, None, PredefinedSerializer(), optional=True),
   FieldMetadata("pageSize", "page_size", "_page_size", int, None, PredefinedSerializer(), optional=True),
   FieldMetadata("pageToken", "page_token", "_page_token", str, None, PredefinedSerializer(), optional=True),

kagglesdk/models/types/model_enums.py

@@ -1,10 +1,5 @@
 import enum
 
-class GatingAgreementRequestsExpiryStatus(enum.Enum):
-  GATING_AGREEMENT_REQUESTS_EXPIRY_STATUS_UNSPECIFIED = 0
-  GATING_AGREEMENT_REQUESTS_EXPIRY_STATUS_NOT_EXPIRED = 1
-  GATING_AGREEMENT_REQUESTS_EXPIRY_STATUS_IS_EXPIRED = 2
-
 class GatingAgreementRequestsReviewStatus(enum.Enum):
   GATING_AGREEMENT_REQUESTS_REVIEW_STATUS_UNSPECIFIED = 0
   GATING_AGREEMENT_REQUESTS_REVIEW_STATUS_PENDING = 1
@@ -58,3 +53,8 @@ class ModelVersionLinkType(enum.Enum):
   MODEL_VERSION_LINK_TYPE_VERTEX_OPEN = 1
   MODEL_VERSION_LINK_TYPE_VERTEX_DEPLOY = 2
 
+class GatingAgreementRequestsExpiryStatus(enum.Enum):
+  GATING_AGREEMENT_REQUESTS_EXPIRY_STATUS_UNSPECIFIED = 0
+  GATING_AGREEMENT_REQUESTS_EXPIRY_STATUS_NOT_EXPIRED = 1
+  GATING_AGREEMENT_REQUESTS_EXPIRY_STATUS_IS_EXPIRED = 2
+