Updating files for testing

Author: samyarpotlapalli

src/sasctl/_services/score_execution.py

@@ -70,18 +70,22 @@ def create_score_execution(
         if not output_table_name:
             output_table_name = f"{model_name}_{score_definition_id}"
 
-        # Deleting any score executions that are already executing the same score definition
-        try:
-            score_execution = cls.get(
-                f"/executions?filter=eq(scoreExecutionRequest.scoreDefinitionId,%27{score_definition_id}%27)"
+        # Getting all score executions that are using the inputted score_definition_id
+       
+        score_execution = cls.list_executions(filter=f"eq(scoreDefinitionId, '{score_definition_id}')")
+        
+        if score_execution.status_code >= 400:
+            raise HTTPError(
+                {
+                    f"Something went wrong in the GET statement. See error: {score_execution.json()}"
+                }
             )
-            execution_count = score_execution.get("count")  # Exception catch location
-            if execution_count == 1:
-                execution_id = score_execution.get("items", [0], ["id"])
-                deleted_score_execution = cls.delete_execution(execution_id)
-                print(deleted_score_execution)
-        except KeyError:
-            print("There may not be a score execution already running.")
+        
+        # Checking the count of the execution list to see if there are any score executions for this score_definition_id already running
+        execution_count = score_execution.get("count")  # Exception catch location
+        if execution_count == 1:
+            execution_id = score_execution.get("items", [0], ["id"])
+            deleted_execution = cls.delete_execution(execution_id)       
 
         headers_score_exec = {"Content-Type": "application/json"}
 

tests/unit/test_score_definitions.py

@@ -36,6 +36,38 @@ def test_create_score_definition():
     """
     with mock.patch("sasctl.core.Session._get_authorization_token"):
         current_session("example.com", "username", "password")
+    
+    TARGET = {
+        "name": MODEL_NAME,
+        "projectId": PROJECT_ID,
+        "modeler": USER,
+        "description": "model description",
+        "function": "Classification",
+        "algorithm": "Dummy Algorithm",
+        "tool": "pytest",
+        "champion": True,
+        "role": "champion",
+        "immutable": True,
+        "retrainable": True,
+        "scoreCodeType": None,
+        "targetVariable": None,
+        "trainTable": None,
+        "classificationEventProbabilityVariableName": None,
+        "classificationTargetEventValue": None,
+        "location": None,
+        "properties": [
+            {"name": "custom1", "value": 123, "type": "numeric"},
+            {"name": "custom2", "value": "somevalue", "type": "string"},
+            # {'name': 'customDate', 'value': 1672462800000, 'type': 'date'},
+            {"name": "customDateTime", "value": 1672481272000, "type": "dateTime"},
+        ],
+        "inputVariables": [],
+        "outputVariables": [],
+        "version": 2,
+    }
+
+    # Passed params should be set correctly
+    target = copy.deepcopy(TARGET)
 
     with mock.patch(
         "sasctl._services.model_repository.ModelRepository.get_model"

tests/unit/test_score_execution.py

@@ -22,6 +22,7 @@
 from sasctl import current_session
 from sasctl.core import RestObj, VersionInfo
 from sasctl._services.score_definitions import ScoreDefinitions as sd
+from sasctl._services.score_execution import ScoreExecution as se
 
 
 def test_create_score_execution():
@@ -32,9 +33,12 @@ def test_create_score_execution():
         -no
     - Valid execution id?
 
-    -Valid count key?
+    -Valid count key? -> treated like input mapping -> no because i think it's required
+    - output table -> treat like input mapping but within the create_score_execution step (do I for library and server in score definition thought?)
 
     """
+    with mock.patch("sasctl.core.Session._get_authorization_token"):
+        current_session("example.com", "username", "password")    
 
     with mock.patch(
         "sasctl._services.score_definitions.ScoreDefinitions.get_definition"
@@ -45,5 +49,21 @@ def test_create_score_execution():
             with mock.patch(
                 "sasctl._services.score_execution.ScoreExecution.delete_execution"
             ) as delete_execution:
-                pytest.skip()
+                with mock.patch(
+                   "sasctl._services.score_execution.ScoreExecution.post" 
+                ) as post:
+                    get_definition.return_value.status_code = 404
+                    with pytest.raises(HTTPError):
+                        se.create_score_execution(
+                            score_definition_id="12345",
+                        )
+                    get_definition.return_value.status_code = 200
+                    get_execution.return_value.status_code = 400 #we might need a separate try except here to show that 404 statement is weird and should exit the program
+                    with pytest.raises(HTTPError):
+                        se.create_score_execution(
+                            score_definition_id="12345",
+                        )
+                    #stdout or pytest.raises but without ending program?
+                
+                #pytest.skip()
                 # raise HTTP error?