kaggle 1.6.14__tar.gz → 1.6.17__tar.gz

{kaggle-1.6.14/kaggle.egg-info → kaggle-1.6.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kaggle
-Version: 1.6.14
+Version: 1.6.17
 Summary: Kaggle API
 Home-page: https://github.com/Kaggle/kaggle-api
 Author: Kaggle

{kaggle-1.6.14 → kaggle-1.6.17}/kaggle/api/kaggle_api_extended.py

@@ -256,7 +256,7 @@ class ResumableFileUpload(object):
 
 
 class KaggleApi(KaggleApi):
-    __version__ = '1.6.14'
+    __version__ = '1.6.17'
 
     CONFIG_NAME_PROXY = 'proxy'
     CONFIG_NAME_COMPETITION = 'competition'
@@ -274,8 +274,17 @@ class KaggleApi(KaggleApi):
     MAX_NUM_INBOX_FILES_TO_UPLOAD = 1000
     MAX_UPLOAD_RESUME_ATTEMPTS = 10
 
-    config_dir = os.environ.get('KAGGLE_CONFIG_DIR') or os.path.join(
-        expanduser('~'), '.kaggle')
+    config_dir = os.environ.get('KAGGLE_CONFIG_DIR')
+
+    if not config_dir:
+        config_dir = os.path.join(expanduser('~'), '.kaggle')
+        # Use ~/.kaggle if it already exists for backwards compatibility,
+        # otherwise follow XDG base directory specification
+        if sys.platform.startswith('linux') and not os.path.exists(config_dir):
+            config_dir = os.path.join(
+                (os.environ.get('XDG_CONFIG_HOME')
+                 or os.path.join(expanduser('~'), '.config')), 'kaggle')
+
     if not os.path.exists(config_dir):
         os.makedirs(config_dir)
 
@@ -396,7 +405,9 @@ class KaggleApi(KaggleApi):
                 return
             else:
                 raise IOError('Could not find {}. Make sure it\'s located in'
-                              ' {}. Or use the environment method.'.format(
+                              ' {}. Or use the environment method. See setup'
+                              ' instructions at'
+                              ' https://github.com/Kaggle/kaggle-api/'.format(
                                   self.config_file, self.config_dir))
 
         # Step 3: load into configuration!
@@ -2307,6 +2318,10 @@ class KaggleApi(KaggleApi):
                 for cell in json_body['cells']:
                     if 'outputs' in cell and cell['cell_type'] == 'code':
                         cell['outputs'] = []
+                    # The spec allows a list of strings,
+                    # 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)
 
         kernel_push_request = KernelPushRequest(

{kaggle-1.6.14 → kaggle-1.6.17}/kaggle/cli.py

@@ -31,7 +31,13 @@ def main():
     parser.add_argument('-v',
                         '--version',
                         action='version',
+                        help='Print the Kaggle API version',
                         version='Kaggle API ' + KaggleApi.__version__)
+    parser.add_argument('-W',
+                        '--no-warn',
+                        dest='disable_version_warning',
+                        action='store_true',
+                        help='Disable out-of-date API version warning')
 
     subparsers = parser.add_subparsers(title='commands',
                                        help=Help.kaggle,
@@ -49,6 +55,9 @@ def main():
     command_args.update(vars(args))
     del command_args['func']
     del command_args['command']
+    if command_args['disable_version_warning']:
+        KaggleApi.already_printed_version_warning = True
+    del command_args['disable_version_warning']
     error = False
     try:
         out = args.func(**command_args)
@@ -1649,11 +1658,12 @@ class Help(object):
     command_model_instances_new = 'Create a new model instance'
     param_model_instance_downfile = (
         'Folder for downloading the special model-instance-metadata.json file '
-        '(https://github.com/Kaggle/kaggle-api/wiki/ModelInstance-Metadata). ')
+        '(https://github.com/Kaggle/kaggle-api/wiki/Model-Metadata#model-instance). '
+    )
     param_model_instance_upfile = (
         'Folder for upload, containing data files and a '
         'special model-instance-metadata.json file '
-        '(https://github.com/Kaggle/kaggle-api/wiki/ModelInstance-Metadata). '
+        '(https://github.com/Kaggle/kaggle-api/wiki/Model-Metadata#model-instance). '
         'Defaults to current working directory')
     command_model_instances_delete = 'Delete a model instance'
     command_model_instances_update = 'Update a model instance'

{kaggle-1.6.14 → kaggle-1.6.17}/kaggle/models/model_instance_update_request.py

@@ -152,7 +152,7 @@ class ModelInstanceUpdateRequest(object):
         :param license_name: The license_name of this ModelInstanceUpdateRequest.  # noqa: E501
         :type: str
         """
-        allowed_values = ["CC BY-NC-SA 4.0", "CC BY-SA 4.0", "GPL 2", "CC BY-SA 3.0", "Attribution 4.0 International (CC BY 4.0)", "Attribution-NonCommercial 4.0 International (CC BY-NC 4.0)", "ODC Public Domain Dedication and Licence (PDDL)", "Attribution 3.0 Unported (CC BY 3.0)", "Attribution 3.0 IGO (CC BY 3.0 IGO)", "Attribution-NonCommercial-ShareAlike 3.0 IGO (CC BY-NC-SA 3.0 IGO)", "Community Data License Agreement - Permissive - Version 1.0", "Community Data License Agreement - Sharing - Version 1.0", "Attribution-NoDerivatives 4.0 International (CC BY-ND 4.0)", "Attribution-NonCommercial-NoDerivatives 4.0 International (CC BY-NC-ND 4.0)", "ODC Attribution License (ODC-By)", "GNU Lesser General Public License 3.0", "GNU Affero General Public License 3.0", "GNU Free Documentation License 1.3", "Apache 2.0", "MIT", "BSD-3-Clause", "GPL 3"]  # noqa: E501
+        allowed_values = ["CC0 1.0", "CC BY-NC-SA 4.0", "Unknown", "CC BY-SA 4.0", "GPL 2", "CC BY-SA 3.0", "Other", "Other (specified in description)", "CC BY 4.0", "Attribution 4.0 International (CC BY 4.0)", "CC BY-NC 4.0", "Attribution-NonCommercial 4.0 International (CC BY-NC 4.0)", "PDDL", "ODC Public Domain Dedication and Licence (PDDL)", "CC BY 3.0", "Attribution 3.0 Unported (CC BY 3.0)", "CC BY 3.0 IGO", "Attribution 3.0 IGO (CC BY 3.0 IGO)", "CC BY-NC-SA 3.0 IGO", "Attribution-NonCommercial-ShareAlike 3.0 IGO (CC BY-NC-SA 3.0 IGO)", "CDLA Permissive 1.0", "Community Data License Agreement - Permissive - Version 1.0", "CDLA Sharing 1.0", "Community Data License Agreement - Sharing - Version 1.0", "CC BY-ND 4.0", "Attribution-NoDerivatives 4.0 International (CC BY-ND 4.0)", "CC BY-NC-ND 4.0", "Attribution-NonCommercial-NoDerivatives 4.0 International (CC BY-NC-ND 4.0)", "ODC-BY 1.0", "ODC Attribution License (ODC-By)", "LGPL 3.0", "GNU Lesser General Public License 3.0", "AGPL 3.0", "GNU Affero General Public License 3.0", "FDL 1.3", "GNU Free Documentation License 1.3", "apache-2.0", "Apache 2.0", "mit", "MIT", "bsd-3-clause", "BSD-3-Clause", "Llama 2", "Llama 2 Community License", "Gemma", "gpl-3", "GPL 3", "RAIL-M", "AI Pubs Open RAIL-M License", "AIPubs Research-Use RAIL-M", "AI Pubs Research-Use RAIL-M License", "BigScience OpenRAIL-M", "BigScience Open RAIL-M License", "RAIL", "RAIL (specified in description)", "Llama 3", "Llama 3 Community License"]  # noqa: E501
         if license_name not in allowed_values:
             raise ValueError(
                 "Invalid value for `license_name` ({0}), must be one of {1}"  # noqa: E501

{kaggle-1.6.14 → kaggle-1.6.17}/kaggle/models/model_new_instance_request.py

@@ -143,7 +143,7 @@ class ModelNewInstanceRequest(object):
         """
         if framework is None:
             raise ValueError("Invalid value for `framework`, must not be `None`")  # noqa: E501
-        allowed_values = ["tensorFlow1", "tensorFlow2", "tfLite", "tfJs", "pyTorch", "jax", "flax", "pax", "maxText", "gemmaCpp", "tensorRtLlm", "ggml", "gguf", "coral", "scikitLearn", "mxnet", "onnx", "keras", "transformers", "other"]  # noqa: E501
+        allowed_values = ["tensorFlow1", "tensorFlow2", "tfLite", "tfJs", "pyTorch", "jax", "flax", "pax", "maxText", "gemmaCpp", "tensorRtLlm", "ggml", "gguf", "coral", "scikitLearn", "mxnet", "onnx", "keras", "transformers", "triton", "other"]  # noqa: E501
         if framework not in allowed_values:
             raise ValueError(
                 "Invalid value for `framework` ({0}), must be one of {1}"  # noqa: E501
@@ -220,7 +220,7 @@ class ModelNewInstanceRequest(object):
         """
         if license_name is None:
             raise ValueError("Invalid value for `license_name`, must not be `None`")  # noqa: E501
-        allowed_values = ["CC BY-NC-SA 4.0", "CC BY-SA 4.0", "GPL 2", "CC BY-SA 3.0", "Attribution 4.0 International (CC BY 4.0)", "Attribution-NonCommercial 4.0 International (CC BY-NC 4.0)", "ODC Public Domain Dedication and Licence (PDDL)", "Attribution 3.0 Unported (CC BY 3.0)", "Attribution 3.0 IGO (CC BY 3.0 IGO)", "Attribution-NonCommercial-ShareAlike 3.0 IGO (CC BY-NC-SA 3.0 IGO)", "Community Data License Agreement - Permissive - Version 1.0", "Community Data License Agreement - Sharing - Version 1.0", "Attribution-NoDerivatives 4.0 International (CC BY-ND 4.0)", "Attribution-NonCommercial-NoDerivatives 4.0 International (CC BY-NC-ND 4.0)", "ODC Attribution License (ODC-By)", "GNU Lesser General Public License 3.0", "GNU Affero General Public License 3.0", "GNU Free Documentation License 1.3", "Apache 2.0", "MIT", "BSD-3-Clause", "GPL 3"]  # noqa: E501
+        allowed_values = ["CC0 1.0", "CC BY-NC-SA 4.0", "Unknown", "CC BY-SA 4.0", "GPL 2", "CC BY-SA 3.0", "Other", "Other (specified in description)", "CC BY 4.0", "Attribution 4.0 International (CC BY 4.0)", "CC BY-NC 4.0", "Attribution-NonCommercial 4.0 International (CC BY-NC 4.0)", "PDDL", "ODC Public Domain Dedication and Licence (PDDL)", "CC BY 3.0", "Attribution 3.0 Unported (CC BY 3.0)", "CC BY 3.0 IGO", "Attribution 3.0 IGO (CC BY 3.0 IGO)", "CC BY-NC-SA 3.0 IGO", "Attribution-NonCommercial-ShareAlike 3.0 IGO (CC BY-NC-SA 3.0 IGO)", "CDLA Permissive 1.0", "Community Data License Agreement - Permissive - Version 1.0", "CDLA Sharing 1.0", "Community Data License Agreement - Sharing - Version 1.0", "CC BY-ND 4.0", "Attribution-NoDerivatives 4.0 International (CC BY-ND 4.0)", "CC BY-NC-ND 4.0", "Attribution-NonCommercial-NoDerivatives 4.0 International (CC BY-NC-ND 4.0)", "ODC-BY 1.0", "ODC Attribution License (ODC-By)", "LGPL 3.0", "GNU Lesser General Public License 3.0", "AGPL 3.0", "GNU Affero General Public License 3.0", "FDL 1.3", "GNU Free Documentation License 1.3", "apache-2.0", "Apache 2.0", "mit", "MIT", "bsd-3-clause", "BSD-3-Clause", "Llama 2", "Llama 2 Community License", "Gemma", "gpl-3", "GPL 3", "RAIL-M", "AI Pubs Open RAIL-M License", "AIPubs Research-Use RAIL-M", "AI Pubs Research-Use RAIL-M License", "BigScience OpenRAIL-M", "BigScience Open RAIL-M License", "RAIL", "RAIL (specified in description)", "Llama 3", "Llama 3 Community License"]  # noqa: E501
         if license_name not in allowed_values:
             raise ValueError(
                 "Invalid value for `license_name` ({0}), must be one of {1}"  # noqa: E501

{kaggle-1.6.14 → kaggle-1.6.17}/kaggle/test/test_authenticate.py

@@ -35,7 +35,7 @@ class TestAuthenticate(unittest.TestCase):
     def test_config_actions(self):
         api = KaggleApi()
 
-        self.assertTrue(api.config_dir.endswith('.kaggle'))
+        self.assertTrue(api.config_dir.endswith('kaggle'))
         self.assertEqual(api.get_config_value('doesntexist'), None)
 
 

{kaggle-1.6.14 → kaggle-1.6.17/kaggle.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kaggle
-Version: 1.6.14
+Version: 1.6.17
 Summary: Kaggle API
 Home-page: https://github.com/Kaggle/kaggle-api
 Author: Kaggle

{kaggle-1.6.14 → kaggle-1.6.17}/setup.py

@@ -6,7 +6,7 @@ from setuptools import setup, find_packages
 # pyproject.toml instead of maintaining both flows.
 setup(
     name='kaggle',
-    version='1.6.14',
+    version='1.6.17',
     description='Kaggle API',
     long_description=
     ('Official API for https://www.kaggle.com, accessible using a command line '