Extending clonable models and fixing shared resources cloning

Author: mmerce

HISTORY.rst

@@ -3,6 +3,12 @@
 History
 -------
 
+9.6.2 (2023-08-02)
+------------------
+
+- Extending cloning to all available models and WhizzML scripts.
+- Fixing shared resources cloning.
+
 9.6.1 (2023-08-01)
 ------------------
 

bigml/api.py

@@ -119,7 +119,7 @@
     LINEAR_REGRESSION_PATH, LINEAR_REGRESSION_RE, SCRIPT_PATH, SCRIPT_RE,
     EXECUTION_PATH, EXECUTION_RE, LIBRARY_PATH, LIBRARY_RE, STATUS_PATH,
     IRREGULAR_PLURALS, RESOURCES_WITH_FIELDS, FIELDS_PARENT,
-    EXTERNAL_CONNECTOR_PATH, EXTERNAL_CONNECTOR_RE)
+    EXTERNAL_CONNECTOR_PATH, EXTERNAL_CONNECTOR_RE, CLONABLE_PATHS)
 
 from bigml.api_handlers.resourcehandler import (
     get_resource, get_resource_type, check_resource_type, get_source_id,
@@ -405,6 +405,11 @@ def __init__(self, username=None, api_key=None,
                 resource_type, resource_type))
             self.listers[resource_type] = getattr(self,
                                                   "list_%s" % method_name)
+        self.cloners = {}
+        for resource_type in CLONABLE_PATHS:
+            method_name = RENAMED_RESOURCES.get(resource_type, resource_type)
+            self.cloners[resource_type] = getattr(self,
+                                                  "clone_%s" % method_name)
 
     def prepare_image_fields(self, model_info, input_data):
         """Creating a source for each image field used by the model

bigml/api_handlers/fusionhandler.py

@@ -105,6 +105,18 @@ def update_fusion(self, fusion, changes):
                             message="A fusion id is needed.")
         return self.update_resource(fusion, changes)
 
+    def clone_fusion(self, fusion,
+                     args=None, wait_time=3, retries=10):
+        """Creates a cloned fusion from an existing `fusion`
+
+        """
+        create_args = self._set_clone_from_args(
+            fusion, "fusion", args=args, wait_time=wait_time,
+            retries=retries)
+
+        body = json.dumps(create_args)
+        return self._create(self.fusion_url, body)
+
     def delete_fusion(self, fusion, query_string=''):
         """Deletes a fusion.
 

bigml/api_handlers/resourcehandler.py

@@ -850,7 +850,7 @@ def _set_clone_from_args(self, origin, resource_type, args=None,
         if args is not None:
             create_args.update(args)
 
-        if origin["object"].get("shared_hash"):
+        if isinstance(origin, dict) and origin["object"].get("shared_hash"):
             attr = "shared_hash"
             origin_id = origin["object"][attr]
         else:

bigml/api_handlers/scripthandler.py

@@ -164,6 +164,18 @@ def update_script(self, script, changes):
                             message="A script id is needed.")
         return self.update_resource(script, changes)
 
+    def clone_script(self, script,
+                     args=None, wait_time=3, retries=10):
+        """Creates a cloned script from an existing `script`
+
+        """
+        create_args = self._set_clone_from_args(
+            script, "script", args=args, wait_time=wait_time,
+            retries=retries)
+
+        body = json.dumps(create_args)
+        return self._create(self.script_url, body)
+
     def delete_script(self, script, query_string=''):
         """Deletes a script.
 

bigml/constants.py

@@ -80,9 +80,12 @@
     ASSOCIATION_PATH,
     TOPIC_MODEL_PATH,
     TIME_SERIES_PATH,
-    FUSION_PATH
+    FUSION_PATH,
+    PCA_PATH
 ]
 
+CLONABLE_PATHS = [SOURCE_PATH, DATASET_PATH, SCRIPT_PATH]
+CLONABLE_PATHS.extend(MODELS_PATHS)
 
 PMML_MODELS = [
     MODEL_PATH,
@@ -95,7 +98,8 @@
 ID_PATTERN = '[a-f0-9]{24}'
 SHARED_PATTERN = '[a-zA-Z0-9]{24,30}'
 ID_RE = re.compile(r'^%s$' % ID_PATTERN)
-SOURCE_RE = re.compile(r'^%s/%s$' % (SOURCE_PATH, ID_PATTERN))
+SOURCE_RE = re.compile(r'^%s/%s|^shared/%s/%s$' % (SOURCE_PATH, ID_PATTERN,
+    SOURCE_PATH, SHARED_PATTERN))
 DATASET_RE = re.compile(r'^(public/)?%s/%s$|^shared/%s/%s$' % (
     DATASET_PATH, ID_PATTERN, DATASET_PATH, SHARED_PATTERN))
 MODEL_RE = re.compile(r'^(public/)?%s/%s$|^shared/%s/%s$' % (
@@ -146,8 +150,8 @@
     (FORECAST_PATH, ID_PATTERN))
 DEEPNET_RE = re.compile(r'^%s/%s|^shared/%s/%s$' % \
     (DEEPNET_PATH, ID_PATTERN, DEEPNET_PATH, SHARED_PATTERN))
-OPTIML_RE = re.compile(r'^%s/%s|^shared/%s/%s$' % \
-    (OPTIML_PATH, ID_PATTERN, OPTIML_PATH, SHARED_PATTERN))
+OPTIML_RE = re.compile(r'^%s/%s$' % \
+    (OPTIML_PATH, ID_PATTERN))
 FUSION_RE = re.compile(r'^%s/%s|^shared/%s/%s$' % \
     (FUSION_PATH, ID_PATTERN, FUSION_PATH, SHARED_PATTERN))
 PCA_RE = re.compile(r'^%s/%s|^shared/%s/%s$' % \
@@ -158,7 +162,7 @@
 LINEAR_REGRESSION_RE = re.compile(r'^%s/%s|^shared/%s/%s$' % \
     (LINEAR_REGRESSION_PATH, ID_PATTERN,
      LINEAR_REGRESSION_PATH, SHARED_PATTERN))
-SCRIPT_RE = re.compile(r'^%s/%s|^shared/%s/%s$' % \
+SCRIPT_RE = re.compile(r'^(public/)?%s/%s$|^shared/%s/%s$' % \
     (SCRIPT_PATH, ID_PATTERN, SCRIPT_PATH, SHARED_PATTERN))
 EXECUTION_RE = re.compile(r'^%s/%s|^shared/%s/%s$' % \
     (EXECUTION_PATH, ID_PATTERN, EXECUTION_PATH, SHARED_PATTERN))

bigml/version.py

@@ -1 +1 @@
-__version__ = '9.6.1'
+__version__ = '9.6.2'