reload model table on publish to CAS

Author: jlwalke2

src/sasctl/_services/model_management.py

@@ -20,15 +20,25 @@ class ModelManagement(Service):
                             'performance tasks')
 
     # TODO:  set ds2MultiType
-    def publish_model(self, model, destination, name=None, force=False, casEndPoint=False):
+    def publish_model(self,
+                      model,
+                      destination,
+                      name=None,
+                      force=False,
+                      reload_model_table=False):
         """
 
         Parameters
         ----------
         model
         destination
         name
-        force
+        force : bool, optional
+            Whether to overwrite the model if it already exists in the
+            publishing `destination`.
+        reload_model_table : bool, optional
+            Whether the model table in CAS should be reloaded.  Defaults to
+            False.
 
         Returns
         -------
@@ -50,7 +60,8 @@ def publish_model(self, model, destination, name=None, force=False, casEndPoint=
 
         # TODO: Verify allowed formats by destination type.
         # As of 19w04 MAS throws HTTP 500 if name is in invalid format.
-        model_name = name or '{}_{}'.format(model_obj['name'].replace(' ', ''), model_obj['id']).replace('-', '')
+        model_name = name or '{}_{}'.format(model_obj['name'].replace(' ', ''),
+                                            model_obj['id']).replace('-', '')
 
         request = {
             "name": model_obj.get('name'),
@@ -69,12 +80,12 @@ def publish_model(self, model, destination, name=None, force=False, casEndPoint=
         # Publishes a model that has already been registered in the model
         # repository.
         # Unlike model_publish service, does not require Code to be specified.
-        if casEndPoint:
-             r = self.post('/publish', json=request, params=dict(force=force,reloadModelTable=True),
-                      headers={'Content-Type': 'application/vnd.sas.models.publishing.request.asynchronous+json'})
-        else:
-             r = self.post('/publish', json=request, params=dict(force=force),
-                      headers={'Content-Type': 'application/vnd.sas.models.publishing.request.asynchronous+json'})
+        r = self.post('/publish',
+                      json=request,
+                      params=dict(force=force,
+                                  reloadModelTable=reload_model_table),
+                      headers={'Content-Type':
+                                   'application/vnd.sas.models.publishing.request.asynchronous+json'})
         return r
 
     def create_performance_definition(self,

src/sasctl/tasks.py

@@ -219,7 +219,10 @@ def register_model(model, name, project, repository=None, input=None,
     return model
 
 
-def publish_model(model, destination, code=None, max_retries=60,
+def publish_model(model,
+                  destination,
+                  code=None,
+                  max_retries=60,
                   replace=False, **kwargs):
     """Publish a model to a configured publishing destination.
 
@@ -264,13 +267,15 @@ def publish_model(model, destination, code=None, max_retries=60,
     def submit_request():
         # Submit a publishing request
         if code is None:
-            destType=mp.get_destination(destination).destinationType
-            if destType == "cas":
+            dest_obj = mp.get_destination(destination)
+
+            if dest_obj and dest_obj.destinationType == "cas":
                 publish_req = mm.publish_model(model, destination,
-                                           force=replace, casEndPoint=True, **kwargs)
+                                               force=replace,
+                                               reload_model_table=True)
             else:
                 publish_req = mm.publish_model(model, destination,
-                                           force=replace, **kwargs)
+                                               force=replace)
         else:
             publish_req = mp.publish_model(model, destination,
                                            code=code, **kwargs)