kaggle 1.7.4__tar.gz → 1.7.4.1__tar.gz

{kaggle-1.7.4 → kaggle-1.7.4.1}/CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 ====
 
+### 1.7.4.1
+
+* Fix a dataset download problem. Datasets that had a license were failing to download.
+* Update the documentation to include code competition submit.
+
 ### 1.7.4
 
 Version 1.7.3 was never released. There were errors in versioning on

{kaggle-1.7.4 → kaggle-1.7.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kaggle
-Version: 1.7.4
+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
@@ -259,16 +259,6 @@ rm -rf /tmp/autogen && mkdir -p /tmp/autogen && unzip -qo /tmp/autogen.zip -d /t
 mv /tmp/autogen/autogen-*/* /tmp/autogen && rm -rf /tmp/autogen/autogen-* &&
 sudo chmod a+rx /tmp/autogen/autogen.sh
 ```
-The internal documentation needs to be updated. To install a release from test.pypi.org
-you need to do:
-```bash
-pip install \
-     --index-url https://test.pypi.org/simple \
-     --force \
-     --extra-index-url https://pypi.org/simple \
-     --break-system-packages \
-     kaggle
-```
 
 ### Prerequisites
 

{kaggle-1.7.4 → kaggle-1.7.4.1}/README.md

@@ -29,16 +29,6 @@ rm -rf /tmp/autogen && mkdir -p /tmp/autogen && unzip -qo /tmp/autogen.zip -d /t
 mv /tmp/autogen/autogen-*/* /tmp/autogen && rm -rf /tmp/autogen/autogen-* &&
 sudo chmod a+rx /tmp/autogen/autogen.sh
 ```
-The internal documentation needs to be updated. To install a release from test.pypi.org
-you need to do:
-```bash
-pip install \
-     --index-url https://test.pypi.org/simple \
-     --force \
-     --extra-index-url https://pypi.org/simple \
-     --break-system-packages \
-     kaggle
-```
 
 ### Prerequisites
 

{kaggle-1.7.4 → kaggle-1.7.4.1}/docs/README.md

@@ -159,25 +159,30 @@ Note: you will need to accept competition rules at `https://www.kaggle.com/c/<co
 ##### Submit to a competition
 
 ```
-usage: kaggle competitions submit [-h] -f FILE_NAME -m MESSAGE [-q]
-                                  [competition]
+usage: kaggle competitions submit [-h] [-f FILE_NAME] [-k KERNEL] -m MESSAGE [-v VERSION] [-q] [competition]
 
-required arguments:
-  -f FILE_NAME, --file FILE_NAME
-                        File for upload (full path)
-  -m MESSAGE, --message MESSAGE
-                        Message describing this submission
-
-optional arguments:
+options:
   -h, --help            show this help message and exit
   competition           Competition URL suffix (use "kaggle competitions list" to show options)
                         If empty, the default competition will be used (use "kaggle config set competition")"
+  -f FILE_NAME, --file FILE_NAME
+                        File for upload (full path), or the name of the output file produced by a kernel (for code competitions)
+  -k KERNEL, --kernel KERNEL
+                        Name of kernel (notebook) to submit to a code competition
+  -m MESSAGE, --message MESSAGE
+                        Message describing this submission
+  -v VERSION, --version VERSION
+                        Version of kernel to submit to a code competition, e.g. "Version 1"
   -q, --quiet           Suppress printing information about the upload/download progress
 ```
 
 Example: 
 
-`kaggle competitions submit favorita-grocery-sales-forecasting -f sample_submission_favorita.csv.7z -m "My submission message"`
+`kaggle competitions submit favorita-grocery-sales-forecasting \
+    -f sample_submission_favorita.csv.7z -m "My submission message"`
+
+`kaggle competitions submit llms-you-cant-please-them-all \
+    -k username/llms-can-t-please-all-submission -v 9 -f submission.csv -m "My submission message"'`
 
 Note: you will need to accept competition rules at `https://www.kaggle.com/c/<competition-name>/rules`.
 
@@ -503,6 +508,8 @@ usage: kaggle kernels push [-h] -p FOLDER
 
 optional arguments:
   -h, --help            show this help message and exit
+  -t N, --timeout N     Limit the run time of a kernel to the given number  of seconds.
+                        The global maximum time will not be exceeded.
   -p FOLDER, --path FOLDER
                         Folder for upload, containing data files and a special kernel-metadata.json file (https://github.com/Kaggle/kaggle-api/wiki/Kernel-Metadata). Defaults to current working directory
 ```

{kaggle-1.7.4 → kaggle-1.7.4.1}/kaggle/api/kaggle_api_extended.py

@@ -253,7 +253,7 @@ class ResumableFileUpload(object):
 
 
 class KaggleApi:
-  __version__ = '1.7.4'
+  __version__ = '1.7.4.1'
 
   CONFIG_NAME_PROXY = 'proxy'
   CONFIG_NAME_COMPETITION = 'competition'
@@ -1737,13 +1737,13 @@ class KaggleApi:
         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 = [
@@ -2440,6 +2440,7 @@ class KaggleApi:
             Parameters
             ==========
             folder: the path of the folder
+            timeout: maximum run time iin seconds
         """
     if not os.path.isdir(folder):
       raise ValueError('Invalid folder: ' + folder)
@@ -2561,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)

{kaggle-1.7.4/src → kaggle-1.7.4.1}/kaggle/cli.py

@@ -759,7 +759,8 @@ def parse_kernels(subparsers):
       '-t',
       '--timeout',
       type=int,
-      dest='timeout')
+      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)
 
@@ -1526,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-1.7.4/src → kaggle-1.7.4.1}/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

{kaggle-1.7.4 → kaggle-1.7.4.1}/setup.py

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

kaggle-1.7.4.1/src/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.7.4.1"

{kaggle-1.7.4 → kaggle-1.7.4.1}/src/kaggle/api/kaggle_api_extended.py

@@ -253,7 +253,7 @@ class ResumableFileUpload(object):
 
 
 class KaggleApi:
-  __version__ = '1.7.4'
+  __version__ = '1.7.4.1'
 
   CONFIG_NAME_PROXY = 'proxy'
   CONFIG_NAME_COMPETITION = 'competition'
@@ -1737,13 +1737,13 @@ class KaggleApi:
         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 = [
@@ -2440,6 +2440,7 @@ class KaggleApi:
             Parameters
             ==========
             folder: the path of the folder
+            timeout: maximum run time iin seconds
         """
     if not os.path.isdir(folder):
       raise ValueError('Invalid folder: ' + folder)
@@ -2561,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)

{kaggle-1.7.4 → kaggle-1.7.4.1/src}/kaggle/cli.py

@@ -759,7 +759,8 @@ def parse_kernels(subparsers):
       '-t',
       '--timeout',
       type=int,
-      dest='timeout')
+      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)
 
@@ -1526,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-1.7.4 → kaggle-1.7.4.1/src}/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

{kaggle-1.7.4 → kaggle-1.7.4.1}/src/setup.py

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

{kaggle-1.7.4 → kaggle-1.7.4.1}/tests/test_commands.sh

@@ -61,6 +61,7 @@ sed -i s/INSERT_TITLE_HERE/TitleHere/ tests/dataset/dataset-metadata.json
 sed -i s/INSERT_SLUG_HERE/$SLUG/ tests/dataset/dataset-metadata.json
 kaggle d create -p tests/dataset --public -q -t -r skip
 echo "kaggle datasets download"
+kaggle datasets download -d willianoliveiragibin/pixar-films # this one breaks in some environments
 kaggle d download goefft/public-datasets-with-file-types-and-columns -p tmp --unzip -o -q
 kaggle d download goefft/public-datasets-with-file-types-and-columns -f dataset_results.csv -w -q -o
 echo "kaggle datasets version"

kaggle-1.7.4/src/__init__.py

@@ -1 +0,0 @@
-__version__ = "1.7.4"