kaggle 1.6.0a5__tar.gz → 1.6.1__tar.gz

{kaggle-1.6.0a5/kaggle.egg-info → kaggle-1.6.1}/PKG-INFO

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

{kaggle-1.6.0a5 → kaggle-1.6.1}/kaggle/__init__.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright 2023 Kaggle Inc
+# Copyright 2024 Kaggle Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{kaggle-1.6.0a5 → kaggle-1.6.1}/kaggle/api/__init__.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright 2023 Kaggle Inc
+# Copyright 2024 Kaggle Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{kaggle-1.6.0a5 → kaggle-1.6.1}/kaggle/api/kaggle_api.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright 2023 Kaggle Inc
+# Copyright 2024 Kaggle Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{kaggle-1.6.0a5 → kaggle-1.6.1}/kaggle/api/kaggle_api_extended.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright 2023 Kaggle Inc
+# Copyright 2024 Kaggle Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -272,7 +272,7 @@ class ResumableFileUpload(object):
 
 
 class KaggleApi(KaggleApi):
-    __version__ = '1.6.0a5'
+    __version__ = '1.6.1'
 
     CONFIG_NAME_PROXY = 'proxy'
     CONFIG_NAME_COMPETITION = 'competition'
@@ -911,7 +911,7 @@ class KaggleApi(KaggleApi):
         """ download a competition file to a designated location, or use
             a default location
 
-            Paramters
+            Parameters
             =========
             competition: the name of the competition
             file_name: the configuration file name
@@ -2876,6 +2876,16 @@ class KaggleApi(KaggleApi):
             data['licenseName'] = mi['licenseName']
             data['fineTunable'] = mi['fineTunable']
             data['trainingData'] = mi['trainingData']
+            data['versionId'] = mi['versionId']
+            data['versionNumber'] = mi['versionNumber']
+            data['modelInstanceType'] = mi['modelInstanceType']
+            if mi['baseModelInstanceInformation'] is not None:
+                data['baseModelInstance'] = '{}/{}/{}/{}'.format(
+                    mi['baseModelInstanceInformation']['owner']['slug'],
+                    mi['baseModelInstanceInformation']['modelSlug'],
+                    mi['baseModelInstanceInformation']['framework'],
+                    mi['baseModelInstanceInformation']['instanceSlug'])
+            data['externalBaseModelUrl'] = mi['externalBaseModelUrl']
 
             with open(meta_file, 'w') as f:
                 json.dump(data, f, indent=2)
@@ -2912,7 +2922,10 @@ class KaggleApi(KaggleApi):
 ''',
             'licenseName': 'Apache 2.0',
             'fineTunable': False,
-            'trainingData': []
+            'trainingData': [],
+            'modelInstanceType': 'Unspecified',
+            'baseModelInstanceId': 0,
+            'externalBaseModelUrl': ''
         }
         meta_file = os.path.join(folder, self.MODEL_INSTANCE_METADATA_FILE)
         with open(meta_file, 'w') as f:
@@ -2952,6 +2965,14 @@ class KaggleApi(KaggleApi):
         license_name = self.get_or_fail(meta_data, 'licenseName')
         fine_tunable = self.get_or_default(meta_data, 'fineTunable', False)
         training_data = self.get_or_default(meta_data, 'trainingData', [])
+        model_instance_type = self.get_or_default(meta_data,
+                                                  'modelInstanceType',
+                                                  'Unspecified')
+        base_model_instance = self.get_or_default(meta_data,
+                                                  'baseModelInstance', '')
+        external_base_model_url = self.get_or_default(meta_data,
+                                                      'externalBaseModelUrl',
+                                                      '')
 
         # validations
         if owner_slug == 'INSERT_OWNER_SLUG_HERE':
@@ -2977,14 +2998,18 @@ class KaggleApi(KaggleApi):
         if not isinstance(training_data, list):
             raise ValueError('modelInstance.trainingData must be a list')
 
-        request = ModelNewInstanceRequest(instance_slug=instance_slug,
-                                          framework=framework,
-                                          overview=overview,
-                                          usage=usage,
-                                          license_name=license_name,
-                                          fine_tunable=fine_tunable,
-                                          training_data=training_data,
-                                          files=[])
+        request = ModelNewInstanceRequest(
+            instance_slug=instance_slug,
+            framework=framework,
+            overview=overview,
+            usage=usage,
+            license_name=license_name,
+            fine_tunable=fine_tunable,
+            training_data=training_data,
+            model_instance_type=model_instance_type,
+            base_model_instance=base_model_instance,
+            external_base_model_url=external_base_model_url,
+            files=[])
 
         with ResumableUploadContext() as upload_context:
             self.upload_files(request, None, folder, ApiBlobType.MODEL,
@@ -3077,6 +3102,13 @@ class KaggleApi(KaggleApi):
         license_name = self.get_or_default(meta_data, 'licenseName', None)
         fine_tunable = self.get_or_default(meta_data, 'fineTunable', None)
         training_data = self.get_or_default(meta_data, 'trainingData', None)
+        model_instance_type = self.get_or_default(meta_data,
+                                                  'modelInstanceType', None)
+        base_model_instance = self.get_or_default(meta_data,
+                                                  'baseModelInstance', None)
+        external_base_model_url = self.get_or_default(meta_data,
+                                                      'externalBaseModelUrl',
+                                                      None)
 
         # validations
         if owner_slug == 'INSERT_OWNER_SLUG_HERE':
@@ -3116,13 +3148,23 @@ class KaggleApi(KaggleApi):
             update_mask['paths'].append('fine_tunable')
         if training_data != None:
             update_mask['paths'].append('training_data')
-
-        request = ModelInstanceUpdateRequest(overview=overview,
-                                             usage=usage,
-                                             license_name=license_name,
-                                             fine_tunable=fine_tunable,
-                                             training_data=training_data,
-                                             update_mask=update_mask)
+        if model_instance_type != None:
+            update_mask['paths'].append('model_instance_type')
+        if base_model_instance != None:
+            update_mask['paths'].append('base_model_instance')
+        if external_base_model_url != None:
+            update_mask['paths'].append('external_base_model_url')
+
+        request = ModelInstanceUpdateRequest(
+            overview=overview,
+            usage=usage,
+            license_name=license_name,
+            fine_tunable=fine_tunable,
+            training_data=training_data,
+            model_instance_type=model_instance_type,
+            base_model_instance=base_model_instance,
+            external_base_model_url=external_base_model_url,
+            update_mask=update_mask)
         result = ModelNewResponse(
             self.process_response(
                 self.update_model_instance_with_http_info(
@@ -3271,6 +3313,7 @@ class KaggleApi(KaggleApi):
                     os.remove(outfile)
                 except OSError as e:
                     print('Could not delete tar file, got %s' % e)
+        return outfile
 
     def model_instance_version_download_cli(self,
                                             model_instance_version,
@@ -3289,11 +3332,11 @@ class KaggleApi(KaggleApi):
             quiet: suppress verbose output (default is False)
             untar: if True, untar files upon download (default is False)
         """
-        self.model_instance_version_download(model_instance_version,
-                                             path=path,
-                                             untar=untar,
-                                             force=force,
-                                             quiet=quiet)
+        return self.model_instance_version_download(model_instance_version,
+                                                    path=path,
+                                                    untar=untar,
+                                                    force=force,
+                                                    quiet=quiet)
 
     def model_instance_version_delete(self, model_instance_version, yes):
         """ call to delete a model instance version from the API
@@ -3517,6 +3560,9 @@ class KaggleApi(KaggleApi):
                           'Version, please consider updating (server ' +
                           api_version + ' / client ' + self.__version__ + ')')
                     self.already_printed_version_warning = True
+            if isinstance(data,
+                          dict) and 'code' in data and data['code'] != 200:
+                raise Exception(data['message'])
             return data
         return result
 

{kaggle-1.6.0a5 → kaggle-1.6.1}/kaggle/api_client.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright 2023 Kaggle Inc
+# Copyright 2024 Kaggle Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{kaggle-1.6.0a5 → kaggle-1.6.1}/kaggle/cli.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright 2023 Kaggle Inc
+# Copyright 2024 Kaggle Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{kaggle-1.6.0a5 → kaggle-1.6.1}/kaggle/configuration.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright 2023 Kaggle Inc
+# Copyright 2024 Kaggle Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{kaggle-1.6.0a5 → kaggle-1.6.1}/kaggle/models/__init__.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright 2023 Kaggle Inc
+# Copyright 2024 Kaggle Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{kaggle-1.6.0a5 → kaggle-1.6.1}/kaggle/models/api_blob_type.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright 2023 Kaggle Inc
+# Copyright 2024 Kaggle Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{kaggle-1.6.0a5 → kaggle-1.6.1}/kaggle/models/collaborator.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright 2023 Kaggle Inc
+# Copyright 2024 Kaggle Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{kaggle-1.6.0a5 → kaggle-1.6.1}/kaggle/models/create_inbox_file_request.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright 2023 Kaggle Inc
+# Copyright 2024 Kaggle Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{kaggle-1.6.0a5 → kaggle-1.6.1}/kaggle/models/dataset_column.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright 2023 Kaggle Inc
+# Copyright 2024 Kaggle Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{kaggle-1.6.0a5 → kaggle-1.6.1}/kaggle/models/dataset_new_request.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright 2023 Kaggle Inc
+# Copyright 2024 Kaggle Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -199,7 +199,7 @@ class DatasetNewRequest(object):
         :param license_name: The license_name of this DatasetNewRequest.  # noqa: E501
         :type: str
         """
-        allowed_values = ["CC0-1.0", "CC-BY-SA-4.0", "GPL-2.0", "ODbL-1.0", "CC-BY-NC-SA-4.0", "unknown", "DbCL-1.0", "CC-BY-SA-3.0", "copyright-authors", "other", "reddit-api", "world-bank", "CC-BY-4.0", "CC-BY-NC-4.0", "PDDL", "CC-BY-3.0", "CC-BY-3.0-IGO", "US-Government-Works", "CC-BY-NC-SA-3.0-IGO", "CDLA-Permissive-1.0", "CDLA-Sharing-1.0", "CC-BY-ND-4.0", "CC-BY-NC-ND-4.0", "ODC-BY-1.0", "LGPL-3.0", "AGPL-3.0", "FDL-1.3", "EU-ODP-Legal-Notice", "apache-2.0"]  # noqa: E501
+        allowed_values = ["CC0-1.0", "CC-BY-SA-4.0", "GPL-2.0", "ODbL-1.0", "CC-BY-NC-SA-4.0", "unknown", "DbCL-1.0", "CC-BY-SA-3.0", "copyright-authors", "other", "reddit-api", "world-bank", "CC-BY-4.0", "CC-BY-NC-4.0", "PDDL", "CC-BY-3.0", "CC-BY-3.0-IGO", "US-Government-Works", "CC-BY-NC-SA-3.0-IGO", "CDLA-Permissive-1.0", "CDLA-Sharing-1.0", "CC-BY-ND-4.0", "CC-BY-NC-ND-4.0", "ODC-BY-1.0", "LGPL-3.0", "AGPL-3.0", "FDL-1.3", "EU-ODP-Legal-Notice", "apache-2.0", "GPL-3.0"]  # 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.0a5 → kaggle-1.6.1}/kaggle/models/dataset_new_version_request.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright 2023 Kaggle Inc
+# Copyright 2024 Kaggle Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{kaggle-1.6.0a5 → kaggle-1.6.1}/kaggle/models/dataset_update_settings_request.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright 2023 Kaggle Inc
+# Copyright 2024 Kaggle Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{kaggle-1.6.0a5 → kaggle-1.6.1}/kaggle/models/error.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright 2023 Kaggle Inc
+# Copyright 2024 Kaggle Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{kaggle-1.6.0a5 → kaggle-1.6.1}/kaggle/models/kaggle_models_extended.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright 2023 Kaggle Inc
+# Copyright 2024 Kaggle Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{kaggle-1.6.0a5 → kaggle-1.6.1}/kaggle/models/kernel_push_request.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright 2023 Kaggle Inc
+# Copyright 2024 Kaggle Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{kaggle-1.6.0a5 → kaggle-1.6.1}/kaggle/models/license.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright 2023 Kaggle Inc
+# Copyright 2024 Kaggle Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -84,7 +84,7 @@ class License(object):
         """
         if name is None:
             raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
-        allowed_values = ["CC0-1.0", "CC-BY-SA-4.0", "GPL-2.0", "ODbL-1.0", "CC-BY-NC-SA-4.0", "unknown", "DbCL-1.0", "CC-BY-SA-3.0", "copyright-authors", "other", "reddit-api", "world-bank", "CC-BY-4.0", "CC-BY-NC-4.0", "PDDL", "CC-BY-3.0", "CC-BY-3.0-IGO", "US-Government-Works", "CC-BY-NC-SA-3.0-IGO", "CDLA-Permissive-1.0", "CDLA-Sharing-1.0", "CC-BY-ND-4.0", "CC-BY-NC-ND-4.0", "ODC-BY-1.0", "LGPL-3.0", "AGPL-3.0", "FDL-1.3", "EU-ODP-Legal-Notice", "apache-2.0"]  # noqa: E501
+        allowed_values = ["CC0-1.0", "CC-BY-SA-4.0", "GPL-2.0", "ODbL-1.0", "CC-BY-NC-SA-4.0", "unknown", "DbCL-1.0", "CC-BY-SA-3.0", "copyright-authors", "other", "reddit-api", "world-bank", "CC-BY-4.0", "CC-BY-NC-4.0", "PDDL", "CC-BY-3.0", "CC-BY-3.0-IGO", "US-Government-Works", "CC-BY-NC-SA-3.0-IGO", "CDLA-Permissive-1.0", "CDLA-Sharing-1.0", "CC-BY-ND-4.0", "CC-BY-NC-ND-4.0", "ODC-BY-1.0", "LGPL-3.0", "AGPL-3.0", "FDL-1.3", "EU-ODP-Legal-Notice", "apache-2.0", "GPL-3.0"]  # noqa: E501
         if name not in allowed_values:
             raise ValueError(
                 "Invalid value for `name` ({0}), must be one of {1}"  # noqa: E501

{kaggle-1.6.0a5 → kaggle-1.6.1}/kaggle/models/model_instance_new_version_request.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright 2023 Kaggle Inc
+# Copyright 2024 Kaggle Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{kaggle-1.6.0a5 → kaggle-1.6.1}/kaggle/models/model_instance_update_request.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright 2023 Kaggle Inc
+# Copyright 2024 Kaggle Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -52,6 +52,9 @@ class ModelInstanceUpdateRequest(object):
         'license_name': 'str',
         'fine_tunable': 'bool',
         'training_data': 'list[str]',
+        'model_instance_type': 'str',
+        'base_model_instance': 'str',
+        'external_base_model_url': 'int',
         'update_mask': 'str'
     }
 
@@ -61,10 +64,13 @@ class ModelInstanceUpdateRequest(object):
         'license_name': 'licenseName',
         'fine_tunable': 'fineTunable',
         'training_data': 'trainingData',
+        'model_instance_type': 'modelInstanceType',
+        'base_model_instance': 'baseModelInstance',
+        'external_base_model_url': 'externalBaseModelUrl',
         'update_mask': 'updateMask'
     }
 
-    def __init__(self, overview=None, usage=None, license_name='Apache 2.0', fine_tunable=True, training_data=None, update_mask=None):  # noqa: E501
+    def __init__(self, overview=None, usage=None, license_name='Apache 2.0', fine_tunable=True, training_data=None, model_instance_type=None, base_model_instance=None, external_base_model_url=None, update_mask=None):  # noqa: E501
         """ModelInstanceUpdateRequest - a model defined in Swagger"""  # noqa: E501
 
         self._overview = None
@@ -72,6 +78,9 @@ class ModelInstanceUpdateRequest(object):
         self._license_name = None
         self._fine_tunable = None
         self._training_data = None
+        self._model_instance_type = None
+        self._base_model_instance = None
+        self._external_base_model_url = None
         self._update_mask = None
         self.discriminator = None
 
@@ -85,6 +94,12 @@ class ModelInstanceUpdateRequest(object):
             self.fine_tunable = fine_tunable
         if training_data is not None:
             self.training_data = training_data
+        if model_instance_type is not None:
+            self.model_instance_type = model_instance_type
+        if base_model_instance is not None:
+            self.base_model_instance = base_model_instance
+        if external_base_model_url is not None:
+            self.external_base_model_url = external_base_model_url
         self.update_mask = update_mask
 
     @property
@@ -137,7 +152,7 @@ class ModelInstanceUpdateRequest(object):
     def license_name(self):
         """Gets the license_name of this ModelInstanceUpdateRequest.  # noqa: E501
 
-        The license that should be associated with the model  # noqa: E501
+        The license that should be associated with the model instance  # noqa: E501
 
         :return: The license_name of this ModelInstanceUpdateRequest.  # noqa: E501
         :rtype: str
@@ -148,12 +163,12 @@ class ModelInstanceUpdateRequest(object):
     def license_name(self, license_name):
         """Sets the license_name of this ModelInstanceUpdateRequest.
 
-        The license that should be associated with the model  # noqa: E501
+        The license that should be associated with the model instance  # noqa: E501
 
         :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"]  # 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
         if license_name not in allowed_values:
             raise ValueError(
                 "Invalid value for `license_name` ({0}), must be one of {1}"  # noqa: E501
@@ -208,6 +223,81 @@ class ModelInstanceUpdateRequest(object):
 
         self._training_data = training_data
 
+    @property
+    def model_instance_type(self):
+        """Gets the model_instance_type of this ModelInstanceUpdateRequest.  # noqa: E501
+
+        Whether the model instance is a base model, external variant, internal variant, or unspecified  # noqa: E501
+
+        :return: The model_instance_type of this ModelInstanceUpdateRequest.  # noqa: E501
+        :rtype: str
+        """
+        return self._model_instance_type
+
+    @model_instance_type.setter
+    def model_instance_type(self, model_instance_type):
+        """Sets the model_instance_type of this ModelInstanceUpdateRequest.
+
+        Whether the model instance is a base model, external variant, internal variant, or unspecified  # noqa: E501
+
+        :param model_instance_type: The model_instance_type of this ModelInstanceUpdateRequest.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["Unspecified", "BaseModel", "KaggleVariant", "ExternalVariant"]  # noqa: E501
+        if model_instance_type not in allowed_values:
+            raise ValueError(
+                "Invalid value for `model_instance_type` ({0}), must be one of {1}"  # noqa: E501
+                .format(model_instance_type, allowed_values)
+            )
+
+        self._model_instance_type = model_instance_type
+
+    @property
+    def base_model_instance(self):
+        """Gets the base_model_instance of this ModelInstanceUpdateRequest.  # noqa: E501
+
+        If this is an internal variant, the `{owner-slug}/{model-slug}/{framework}/{instance-slug}` of the base model instance  # noqa: E501
+
+        :return: The base_model_instance of this ModelInstanceUpdateRequest.  # noqa: E501
+        :rtype: str
+        """
+        return self._base_model_instance
+
+    @base_model_instance.setter
+    def base_model_instance(self, base_model_instance):
+        """Sets the base_model_instance of this ModelInstanceUpdateRequest.
+
+        If this is an internal variant, the `{owner-slug}/{model-slug}/{framework}/{instance-slug}` of the base model instance  # noqa: E501
+
+        :param base_model_instance: The base_model_instance of this ModelInstanceUpdateRequest.  # noqa: E501
+        :type: str
+        """
+
+        self._base_model_instance = base_model_instance
+
+    @property
+    def external_base_model_url(self):
+        """Gets the external_base_model_url of this ModelInstanceUpdateRequest.  # noqa: E501
+
+        If this is an external variant, a URL to the base model  # noqa: E501
+
+        :return: The external_base_model_url of this ModelInstanceUpdateRequest.  # noqa: E501
+        :rtype: int
+        """
+        return self._external_base_model_url
+
+    @external_base_model_url.setter
+    def external_base_model_url(self, external_base_model_url):
+        """Sets the external_base_model_url of this ModelInstanceUpdateRequest.
+
+        If this is an external variant, a URL to the base model  # noqa: E501
+
+        :param external_base_model_url: The external_base_model_url of this ModelInstanceUpdateRequest.  # noqa: E501
+        :type: int
+        """
+
+        self._external_base_model_url = external_base_model_url
+
     @property
     def update_mask(self):
         """Gets the update_mask of this ModelInstanceUpdateRequest.  # noqa: E501

{kaggle-1.6.0a5 → kaggle-1.6.1}/kaggle/models/model_new_instance_request.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright 2023 Kaggle Inc
+# Copyright 2024 Kaggle Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -56,6 +56,9 @@ class ModelNewInstanceRequest(object):
         'license_name': 'str',
         'fine_tunable': 'bool',
         'training_data': 'list[str]',
+        'model_instance_type': 'str',
+        'base_model_instance': 'str',
+        'external_base_model_url': 'int',
         'files': 'list[UploadFile]'
     }
 
@@ -67,10 +70,13 @@ class ModelNewInstanceRequest(object):
         'license_name': 'licenseName',
         'fine_tunable': 'fineTunable',
         'training_data': 'trainingData',
+        'model_instance_type': 'modelInstanceType',
+        'base_model_instance': 'baseModelInstance',
+        'external_base_model_url': 'externalBaseModelUrl',
         'files': 'files'
     }
 
-    def __init__(self, instance_slug=None, framework=None, overview=None, usage=None, license_name='Apache 2.0', fine_tunable=True, training_data=None, files=None):  # noqa: E501
+    def __init__(self, instance_slug=None, framework=None, overview=None, usage=None, license_name='Apache 2.0', fine_tunable=True, training_data=None, model_instance_type=None, base_model_instance=None, external_base_model_url=None, files=None):  # noqa: E501
         """ModelNewInstanceRequest - a model defined in Swagger"""  # noqa: E501
 
         self._instance_slug = None
@@ -80,6 +86,9 @@ class ModelNewInstanceRequest(object):
         self._license_name = None
         self._fine_tunable = None
         self._training_data = None
+        self._model_instance_type = None
+        self._base_model_instance = None
+        self._external_base_model_url = None
         self._files = None
         self.discriminator = None
 
@@ -94,6 +103,12 @@ class ModelNewInstanceRequest(object):
             self.fine_tunable = fine_tunable
         if training_data is not None:
             self.training_data = training_data
+        if model_instance_type is not None:
+            self.model_instance_type = model_instance_type
+        if base_model_instance is not None:
+            self.base_model_instance = base_model_instance
+        if external_base_model_url is not None:
+            self.external_base_model_url = external_base_model_url
         if files is not None:
             self.files = files
 
@@ -203,7 +218,7 @@ class ModelNewInstanceRequest(object):
     def license_name(self):
         """Gets the license_name of this ModelNewInstanceRequest.  # noqa: E501
 
-        The license that should be associated with the model  # noqa: E501
+        The license that should be associated with the model instance  # noqa: E501
 
         :return: The license_name of this ModelNewInstanceRequest.  # noqa: E501
         :rtype: str
@@ -214,14 +229,14 @@ class ModelNewInstanceRequest(object):
     def license_name(self, license_name):
         """Sets the license_name of this ModelNewInstanceRequest.
 
-        The license that should be associated with the model  # noqa: E501
+        The license that should be associated with the model instance  # noqa: E501
 
         :param license_name: The license_name of this ModelNewInstanceRequest.  # noqa: E501
         :type: str
         """
         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"]  # 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
         if license_name not in allowed_values:
             raise ValueError(
                 "Invalid value for `license_name` ({0}), must be one of {1}"  # noqa: E501
@@ -276,6 +291,81 @@ class ModelNewInstanceRequest(object):
 
         self._training_data = training_data
 
+    @property
+    def model_instance_type(self):
+        """Gets the model_instance_type of this ModelNewInstanceRequest.  # noqa: E501
+
+        Whether the model instance is a base model, external variant, internal variant, or unspecified  # noqa: E501
+
+        :return: The model_instance_type of this ModelNewInstanceRequest.  # noqa: E501
+        :rtype: str
+        """
+        return self._model_instance_type
+
+    @model_instance_type.setter
+    def model_instance_type(self, model_instance_type):
+        """Sets the model_instance_type of this ModelNewInstanceRequest.
+
+        Whether the model instance is a base model, external variant, internal variant, or unspecified  # noqa: E501
+
+        :param model_instance_type: The model_instance_type of this ModelNewInstanceRequest.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["Unspecified", "BaseModel", "KaggleVariant", "ExternalVariant"]  # noqa: E501
+        if model_instance_type not in allowed_values:
+            raise ValueError(
+                "Invalid value for `model_instance_type` ({0}), must be one of {1}"  # noqa: E501
+                .format(model_instance_type, allowed_values)
+            )
+
+        self._model_instance_type = model_instance_type
+
+    @property
+    def base_model_instance(self):
+        """Gets the base_model_instance of this ModelNewInstanceRequest.  # noqa: E501
+
+        If this is an internal variant, the `{owner-slug}/{model-slug}/{framework}/{instance-slug}` of the base model instance  # noqa: E501
+
+        :return: The base_model_instance of this ModelNewInstanceRequest.  # noqa: E501
+        :rtype: str
+        """
+        return self._base_model_instance
+
+    @base_model_instance.setter
+    def base_model_instance(self, base_model_instance):
+        """Sets the base_model_instance of this ModelNewInstanceRequest.
+
+        If this is an internal variant, the `{owner-slug}/{model-slug}/{framework}/{instance-slug}` of the base model instance  # noqa: E501
+
+        :param base_model_instance: The base_model_instance of this ModelNewInstanceRequest.  # noqa: E501
+        :type: str
+        """
+
+        self._base_model_instance = base_model_instance
+
+    @property
+    def external_base_model_url(self):
+        """Gets the external_base_model_url of this ModelNewInstanceRequest.  # noqa: E501
+
+        If this is an external variant, a URL to the base model  # noqa: E501
+
+        :return: The external_base_model_url of this ModelNewInstanceRequest.  # noqa: E501
+        :rtype: int
+        """
+        return self._external_base_model_url
+
+    @external_base_model_url.setter
+    def external_base_model_url(self, external_base_model_url):
+        """Sets the external_base_model_url of this ModelNewInstanceRequest.
+
+        If this is an external variant, a URL to the base model  # noqa: E501
+
+        :param external_base_model_url: The external_base_model_url of this ModelNewInstanceRequest.  # noqa: E501
+        :type: int
+        """
+
+        self._external_base_model_url = external_base_model_url
+
     @property
     def files(self):
         """Gets the files of this ModelNewInstanceRequest.  # noqa: E501

{kaggle-1.6.0a5 → kaggle-1.6.1}/kaggle/models/model_new_request.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright 2023 Kaggle Inc
+# Copyright 2024 Kaggle Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{kaggle-1.6.0a5 → kaggle-1.6.1}/kaggle/models/model_update_request.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright 2023 Kaggle Inc
+# Copyright 2024 Kaggle Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{kaggle-1.6.0a5 → kaggle-1.6.1}/kaggle/models/result.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright 2023 Kaggle Inc
+# Copyright 2024 Kaggle Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{kaggle-1.6.0a5 → kaggle-1.6.1}/kaggle/models/start_blob_upload_request.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright 2023 Kaggle Inc
+# Copyright 2024 Kaggle Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{kaggle-1.6.0a5 → kaggle-1.6.1}/kaggle/models/start_blob_upload_response.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright 2023 Kaggle Inc
+# Copyright 2024 Kaggle Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{kaggle-1.6.0a5 → kaggle-1.6.1}/kaggle/models/upload_file.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright 2023 Kaggle Inc
+# Copyright 2024 Kaggle Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{kaggle-1.6.0a5 → kaggle-1.6.1}/kaggle/rest.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright 2023 Kaggle Inc
+# Copyright 2024 Kaggle Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{kaggle-1.6.0a5 → kaggle-1.6.1}/kaggle/test/__init__.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright 2023 Kaggle Inc
+# Copyright 2024 Kaggle Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{kaggle-1.6.0a5 → kaggle-1.6.1}/kaggle/test/test_authenticate.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright 2023 Kaggle Inc
+# Copyright 2024 Kaggle Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

{kaggle-1.6.0a5 → kaggle-1.6.1/kaggle.egg-info}/PKG-INFO

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

{kaggle-1.6.0a5 → kaggle-1.6.1}/setup.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright 2023 Kaggle Inc
+# Copyright 2024 Kaggle Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='kaggle',
-    version='1.6.0a5',
+    version='1.6.1',
     description='Kaggle API',
     long_description=
     ('Official API for https://www.kaggle.com, accessible using a command line '