Final code changes for 1.7.4

Author: stevemessick

kaggle/api/kaggle_api_extended.py

@@ -253,7 +253,7 @@ def __repr__(self):
 
 
 class KaggleApi:
-  __version__ = '1.7.3'
+  __version__ = '1.7.4b4'
 
   CONFIG_NAME_PROXY = 'proxy'
   CONFIG_NAME_COMPETITION = 'competition'
@@ -703,15 +703,15 @@ def lookup_enum(self, enum_class, item_name):
     except KeyError:
       prefix = self.camel_to_snake(enum_class.__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 enum_class.keys:
-          if item.replace('_', '') == full_name:
-            return enum_class[item]
-          raise
+    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)
@@ -1728,8 +1728,14 @@ def dataset_download_cli(self,
     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']:
       # license_objs format is like: [{ 'name': 'CC0-1.0' }]
@@ -2360,10 +2366,6 @@ def kernels_list_files_cli(self,
       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))
@@ -2892,9 +2894,9 @@ def model_get_cli(self, model, folder=None):
       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)
@@ -3073,7 +3075,7 @@ def model_create_new_cli(self, folder=None):
     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:
@@ -3197,7 +3199,7 @@ def model_update_cli(self, folder=None):
     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:
@@ -3420,7 +3422,7 @@ def model_instance_create_cli(self, folder, quiet=False, dir_mode='skip'):
     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:
@@ -3505,7 +3507,7 @@ def model_instance_files(self,
         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({})
@@ -4698,6 +4700,20 @@ def __init__(self, init_dict):
     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)
@@ -360,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',
@@ -384,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(
@@ -396,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)
@@ -435,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)
@@ -647,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(
@@ -718,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)
 
@@ -752,6 +758,7 @@ def parse_kernels(subparsers):
   parser_kernels_push_optional.add_argument(
       '-t',
       '--timeout',
+      type=int,
       dest='timeout')
   parser_kernels_push._action_groups.append(parser_kernels_push_optional)
   parser_kernels_push.set_defaults(func=api.kernels_push_cli)
@@ -891,7 +898,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',
@@ -1058,7 +1065,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',
@@ -1186,7 +1193,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',

kaggle/models/kaggle_models_extended.py

@@ -120,7 +120,10 @@ def __init__(self, init_dict):
     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:
+        self.size = File.get_size(init_dict.size)
 
   def __repr__(self):
     return self.name

setup.py

@@ -9,7 +9,7 @@
 # https://packaging.python.org/en/latest/guides/modernize-setup-py-project/
 setup(
     name='kaggle',
-    version='1.7.3',
+    version='1.7.4b4',
     description='Kaggle API',
     long_description=(
         'Official API for https://www.kaggle.com, accessible using a command line '

src/__init__.py

@@ -1 +1 @@
-__version__ = "1.7.3"
+__version__ = "1.7.4b4"