Revert task refactor changes to side branch and run black/isort

Author: smlindauer

examples/register_scikit_classification_model.py

@@ -25,7 +25,7 @@
     # Register the model in Model Manager
     register_model(model,
                    model_name,
-                   input_data=X,  # Use X to determine model inputs
+                   input=X,         # Use X to determine model inputs
                    project='Iris',  # Register in "Iris" project
                    force=True)      # Create project if it doesn't exist
 

examples/register_scikit_regression_model.py

@@ -28,7 +28,7 @@
     project_name = 'Boston Housing'
 
     # Register the model in SAS Model Manager
-    register_model(model, model_name, project_name, input_data=X, force=True)
+    register_model(model, model_name, project_name, input=X, force=True)
 
     # Publish the model to the real-time scoring engine
     module = publish_model(model_name, 'maslocal', replace=True)

src/sasctl/_services/workflow.py

@@ -126,7 +126,6 @@ def run_workflow_definition(cls, name, prompts=None):
                 headers={"Content-Type": "application/vnd.sas.workflow.variables+json"},
             )
         if isinstance(prompts, dict):
-
             variables = []
 
             # For each prompt defined in the workflow, check if a value was provided.

src/sasctl/tasks.py

@@ -9,11 +9,12 @@
 import json
 import logging
 import math
-import pickle  # skipcq BAN-B301
 import os
+import pickle  # skipcq BAN-B301
 import re
 import sys
 import warnings
+
 import pandas as pd
 
 try:
@@ -29,9 +30,8 @@
 from .services import model_management as mm
 from .services import model_publish as mp
 from .services import model_repository as mr
-from .utils.pymas import from_pickle
 from .utils.misc import installed_packages
-
+from .utils.pymas import from_pickle
 
 logger = logging.getLogger(__name__)
 
@@ -301,8 +301,8 @@ def register_model(
             if create_project:
                 out_var = []
                 in_var = []
-                import zipfile as zp
                 import copy
+                import zipfile as zp
 
                 zip_file_copy = copy.deepcopy(zip_file)
                 tmp_zip = zp.ZipFile(zip_file_copy)
@@ -765,7 +765,6 @@ def update_model_performance(data, model, label, refresh=True):
 
     # Upload the performance data to CAS
     with sess.as_swat(server=cas_id) as s:
-
         s.setsessopt(messagelevel="warning")
 
         with swat.options(exception_on_severity=2):
@@ -863,9 +862,10 @@ def get_project_kpis(
         A pandas DataFrame representing the MM_STD_KPI table. Note that SAS
         missing values are replaced with pandas valid missing values.
     """
-    from .core import is_uuid
     from distutils.version import StrictVersion
 
+    from .core import is_uuid
+
     # Check the pandas version for where the json_normalize function exists
     if pd.__version__ >= StrictVersion("1.0.3"):
         from pandas import json_normalize

tests/integration/test_full_pipelines.py

@@ -149,7 +149,7 @@ def test_register_model(self, boston_dataset):
         model.fit(X, y)
 
         model = register_model(
-            model, self.MODEL_NAME, self.PROJECT_NAME, input_data=X, force=True
+            model, self.MODEL_NAME, self.PROJECT_NAME, input=X, force=True
         )
         assert model.name == self.MODEL_NAME
         assert model.projectName == self.PROJECT_NAME
@@ -268,7 +268,7 @@ def test_register_model(self, iris_dataset):
         model.fit(X, y)
 
         model = register_model(
-            model, self.MODEL_NAME, self.PROJECT_NAME, input_data=X, force=True
+            model, self.MODEL_NAME, self.PROJECT_NAME, input=X, force=True
         )
         assert model.name == self.MODEL_NAME
         assert model.projectName == self.PROJECT_NAME

tests/integration/test_tasks.py

@@ -94,7 +94,7 @@ def test_register_sklearn(self, sklearn_logistic_model):
             sk_model,
             SCIKIT_MODEL_NAME,
             project=PROJECT_NAME,
-            input_data=train_df,
+            input=train_df,
             force=True,
         )
         assert isinstance(model, RestObj)
@@ -195,11 +195,7 @@ def test_register_model(self, sklearn_linear_model):
 
         # Register model and ensure attributes are set correctly
         model = register_model(
-            sk_model,
-            self.MODEL_NAME,
-            project=self.PROJECT_NAME,
-            input_data=X,
-            force=True,
+            sk_model, self.MODEL_NAME, project=self.PROJECT_NAME, input=X, force=True
         )
 
         assert isinstance(model, RestObj)

tests/unit/test_pageiterator.py

@@ -45,7 +45,7 @@ def paging(request):
         def side_effect(_, link, **kwargs):
             assert "limit=%d" % limit in link
             start = int(re.search(r"(?<=start=)[\d]+", link).group())
-            return RestObj(items=items[start: start + limit])
+            return RestObj(items=items[start : start + limit])
 
         req.side_effect = side_effect
         yield obj, items[:], req

tests/unit/test_tasks.py

@@ -8,19 +8,20 @@
 
 import pytest
 
-from sasctl.core import RestObj
 from sasctl._services.model_repository import ModelRepository
+from sasctl.core import RestObj
 
 
 def test_sklearn_metadata():
     pytest.importorskip("sklearn")
 
-    from sasctl.tasks import _sklearn_to_dict
-    from sklearn.linear_model import LogisticRegression, LinearRegression
-    from sklearn.ensemble import GradientBoostingClassifier
-    from sklearn.tree import DecisionTreeClassifier
-    from sklearn.ensemble import RandomForestClassifier
+    from sklearn.ensemble import (GradientBoostingClassifier,
+                                  RandomForestClassifier)
+    from sklearn.linear_model import LinearRegression, LogisticRegression
     from sklearn.svm import SVC
+    from sklearn.tree import DecisionTreeClassifier
+
+    from sasctl.tasks import _sklearn_to_dict
 
     info = _sklearn_to_dict(LinearRegression())
     assert info["algorithm"] == "Linear regression"
@@ -137,6 +138,7 @@ def test_register_model_403_error(get_project, list_repositories):
     See: https://github.com/sassoftware/python-sasctl/issues/39
     """
     from urllib.error import HTTPError
+
     from sasctl.exceptions import AuthorizationError
     from sasctl.tasks import register_model
 

tests/unit/test_workflow.py

@@ -9,8 +9,8 @@
 
 import pytest
 
-from sasctl.core import RestObj
 from sasctl._services import workflow
+from sasctl.core import RestObj
 
 
 def test_list_workflow_prompt_invalidworkflow():
@@ -154,7 +154,6 @@ def test_run_workflow_definition_with_prompts(get_workflow, post):
     # Check each prompt value that was passed and ensure it was correctly
     # matched to the prompts defined by the workflow.
     for name, value in PROMPTS.items():
-
         # Find the matching variable entry in the POST data
         variable = next(v for v in params["json"]["variables"] if v["name"] == name)