migrated new tasks

Author: jlwalke2

src/sasctl/pzmm/writeScoreCode.py

@@ -4,7 +4,7 @@
 from pathlib import Path
 import numpy as np
 import re
-from ..tasks import get_software_version, upload_and_copy_score_resources
+from ..core import platform_version
 from .._services.model_repository import ModelRepository as modelRepo
 
 # %%
@@ -94,11 +94,18 @@ def writeScoreCode(cls, inputDF, targetDF, modelPrefix,
             Python score code wrapped in DS2 and prepared for SAS Microanalyic Service scoring or publishing.
         '''       
         # Call REST API to check SAS Viya version
-        isViya35 = (get_software_version() == '3.5')
+        isViya35 = (platform_version() == '3.5')
 
         # Initialize modelID to remove unbound variable warnings
         modelID = None
-        
+
+        # Helper method for uploading & migrating files
+        # TODO: Integrate with register_model() or publish_model() task.
+        def upload_and_copy_score_resources(model, files):
+            for file in files:
+                modelRepo.add_model_content(model, **file)
+            return modelRepo.copy_python_resources(model)
+
         # For SAS Viya 3.5, either return an error or return the model UUID as a string
         if isViya35:
             if model == None:

src/sasctl/tasks.py

@@ -708,44 +708,3 @@ def _parse_module_url(msg):
         module_url = match.group(1) if match else None
 
     return module_url
-
-
-    
-def upload_and_copy_score_resources(model, files, name=None):
-    '''Upload Python score resources to a model and copy the score resources 
-    to the Compute Server.
-    
-    For SAS Model Manager installations on SAS Viya 3.5, Python score resources
-    are not automatically copied to the Compute server and a valid DS2 wrapper is not
-    automatically generated for Python score code. After registering a new
-    model or attempting to update an old model, pzmm.writeScoreCode.py creates
-    Python score code and the DS2 wrapper, which can then be uploaded to the model and 
-    copied to the Compute Server using this function. 
-    
-    In order to copy score resources to the Compute server, include the role key for
-    each file.
-
-    Parameters
-    ----------
-    model : str or dict
-        The name or id of the model, or a dictionary representation of
-        the model.
-    files : list
-        A list of dictionaries of the form {'name': filename, 'file': filecontent}.
-        An optional 'role' key is supported for designating a file as score
-        code, astore, etc.
-    name : str
-        Name of the file related to the model. The default is None.
-        
-    Returns
-    -------
-    response : list of RestObj
-        A list of uploaded file contents as instances of ``RestObj``s.
-    '''        
-    for file in files:
-        if isinstance(file, dict):
-            mr.add_model_content(model, **file)
-        else:
-            mr.add_model_content(model, file, name)
-    
-    return mr.copy_python_resources(model)