Fix 500 error when importing in Viya 3.5

Author: smlindauer

src/sasctl/pzmm/importModel.py

@@ -255,7 +255,7 @@ def getFiles(extensions):
                         Path(pyPath) / (modelPrefix + "Score.py")
                     )
                 )
-            zipIOFile = zm.zipFiles(Path(zPath), modelPrefix)
+            zipIOFile = zm.zipFiles(Path(zPath), modelPrefix, isViya4=True)
             print("All model files were zipped to {}.".format(Path(zPath)))
 
             # Check if project name provided exists and raise an error or create a new project
@@ -276,7 +276,7 @@ def getFiles(extensions):
                 print("Model failed to import to SAS Model Manager.")
         # For SAS Viya 3.5, the score code is written after upload in order to know the model UUID
         else:
-            zipIOFile = zm.zipFiles(Path(zPath), modelPrefix)
+            zipIOFile = zm.zipFiles(Path(zPath), modelPrefix, isViya4=False)
             print("All model files were zipped to {}.".format(Path(zPath)))
 
             # Check if project name provided exists and raise an error or create a new project

src/sasctl/pzmm/zipModel.py

@@ -11,7 +11,7 @@
 
 class ZipModel:
     @staticmethod
-    def zipFiles(fileDir, modelPrefix):
+    def zipFiles(fileDir, modelPrefix, isViya4=False):
         """
         Combines all JSON files with the model pickle file and associated score code file
         into a single archive ZIP file.
@@ -23,6 +23,10 @@ def zipFiles(fileDir, modelPrefix):
         modelPrefix : string
             Variable name for the model to be displayed in SAS Open Model Manager
             (i.e. hmeqClassTree + [Score.py || .pickle]).
+        isViya4 : boolean, optional
+            Boolean to indicate difference in logic between SAS Viya 3.5 and SAS Viya 4.
+            For Viya 3.5 models, ignore score code that is already in place in the file
+            directory provided. Default value is False. 
 
         Yields
         ---------------
@@ -33,7 +37,8 @@ def zipFiles(fileDir, modelPrefix):
 
         fileNames = []
         fileNames.extend(sorted(Path(fileDir).glob("*.json")))
-        fileNames.extend(sorted(Path(fileDir).glob("*Score.py")))
+        if isViya4:
+            fileNames.extend(sorted(Path(fileDir).glob("*Score.py")))
         fileNames.extend(sorted(Path(fileDir).glob("*.pickle")))
         # Include H2O.ai MOJO files
         fileNames.extend(sorted(Path(fileDir).glob("*.mojo")))