Updates to score testing logic

Author: djm21

src/sasctl/_services/score_definitions.py

@@ -83,15 +83,20 @@ def create_score_definition(
         else:
             object_descriptor_type = "sas.models.model.ds2"
 
-        model = cls._model_repository.get_model(model)
+        if cls._model_repository.is_uuid(model):
+            model_id = model
+        elif isinstance(model, dict) and "id" in model:
+            model_id = model["id"]
+        else:
+            model = cls._model_repository.get_model(model)
+            model_id = model["id"]
 
         if not model:
             raise HTTPError(
                 {
                     f"This model may not exist in a project or the model may not exist at all."
                 }
             )
-        model_id = model.id
         model_project_id = model.get("projectId")
         model_project_version_id = model.get("projectVersionId")
         model_name = model.get("name")

src/sasctl/_services/score_execution.py

@@ -149,6 +149,7 @@ def poll_score_execution_state(
     def get_score_execution_results(
         cls,
         score_execution: Union[dict, str],
+        use_cas_gateway: False
     ):
         """Generates an output table for the score_execution results.
 
@@ -183,13 +184,13 @@ def get_score_execution_results(
         else:
             session = current_session()
             cas = session.as_swat()
-            response = cas.loadActionSet("gateway")
-            if not response:
+            if not use_cas_gateway:
                 output_table = cls._no_gateway_get_results(
                     server_name, library_name, table_name
                 )
                 return output_table
             else:
+                cas.loadActionSet("gateway")
                 gateway_code = f"""
 import pandas as pd
 import numpy as np
@@ -235,12 +236,14 @@ def _no_gateway_get_results(cls, server_name, library_name, table_name):
             f"caslibs/{library_name}/"
             f"tables/{table_name}/columns?limit=10000"
         )
-        columns = json_normalize(output_columns.json(), "items")
-        column_names = columns["names"].to_list()
+        columns = json_normalize(output_columns)
+        column_names = columns["name"].to_list()
 
-        output_rows = cls._services.get(
-            f"casRowSets/servers/{server_name}"
-            f"caslibs/{library_name}"
+        session = current_session()
+
+        output_rows = session.get(
+            f"casRowSets/servers/{server_name}/"
+            f"caslibs/{library_name}/"
             f"tables/{table_name}/rows?limit=10000"
         )
         output_table = pd.DataFrame(

src/sasctl/tasks.py

@@ -996,5 +996,5 @@ def score_model_with_cas(
     score_execution = se.create_score_execution(score_definition.id)
     score_execution_poll = se.poll_score_execution_state(score_execution)
     print(score_execution_poll)
-    score_results = se.get_score_execution_results(score_execution)
+    score_results = se.get_score_execution_results(score_execution, use_cas_gateway)
     return score_results