omnata-plugin-devkit 0.2.28__tar.gz → 0.2.30__tar.gz

{omnata_plugin_devkit-0.2.28 → omnata_plugin_devkit-0.2.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omnata-plugin-devkit
-Version: 0.2.28
+Version: 0.2.30
 Summary: 
 Author: James Weakley
 Author-email: james.weakley@omnata.com
@@ -10,7 +10,7 @@ Classifier: Programming Language :: Python :: 3.10
 Requires-Dist: behave (>=1.2,<2.0)
 Requires-Dist: behave_pandas (>=0.5.0,<0.6.0)
 Requires-Dist: jinja2 (>=3,<4)
-Requires-Dist: omnata-plugin-runtime (>=0.2.56,<0.3.0)
+Requires-Dist: omnata-plugin-runtime (>=0.2.61,<0.3.0)
 Requires-Dist: omnata_cli (>=0.1.12,<0.2.0)
 Requires-Dist: pandas
 Requires-Dist: pydantic (>=1,<2)

{omnata_plugin_devkit-0.2.28 → omnata_plugin_devkit-0.2.30}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "omnata-plugin-devkit"
-version = "0.2.28"
+version = "0.2.30"
 description = ""
 authors = ["James Weakley <james.weakley@omnata.com>"]
 readme = "README.md"
@@ -9,7 +9,7 @@ packages = [{ include = "omnata_plugin_devkit", from = "src" }]
 [tool.poetry.dependencies]
 python = "~3.10"
 omnata_cli = "^0.1.12"
-omnata-plugin-runtime = "^0.2.56"
+omnata-plugin-runtime = "^0.2.61"
 pandas = "*"
 jinja2 = "^3"
 pydantic = "^1"

{omnata_plugin_devkit-0.2.28 → omnata_plugin_devkit-0.2.30}/src/omnata_plugin_devkit/development_session.py

@@ -197,8 +197,8 @@ class DevelopmentSession:
         self.sync_slug = sync_slug
         session_run_response = self.session.sql(
             f"""
-                         call {self.omnata_app_name}.API.CREATE_DEVELOPMENT_SESSION_RUN('{sync_slug}')
-                         """
+            call {self.omnata_app_name}.API.CREATE_DEVELOPMENT_SESSION_RUN('{sync_slug}')
+            """
         ).collect()
         response_parsed = json.loads(session_run_response[0][0])
         if response_parsed["success"] is False:
@@ -236,8 +236,8 @@ class DevelopmentSession:
 
         secrets_fetch_response = self.session.sql(
             f"""
-                         call {plugin_app_name}.PLUGIN.RETRIEVE_SECRETS({oauth_secret_param},{other_secrets_param})
-                         """
+            call {plugin_app_name}.PLUGIN.RETRIEVE_SECRETS({oauth_secret_param},{other_secrets_param})
+            """
         ).collect()
         secrets_response_parsed = json.loads(secrets_fetch_response[0][0])
         if secrets_response_parsed["success"] is False:
@@ -296,6 +296,7 @@ class DevelopmentSession:
             sync_request=outbound_sync_request,
             scenario_records=scenario_records,
         )
+        self.run_id = outbound_payload.run_id
         outbound_sync_request._prebaked_record_state = scenario_records
         self.plugin_instance._sync_request = outbound_sync_request
         self._start_recording()
@@ -324,8 +325,8 @@ class DevelopmentSession:
         self.sync_slug = sync_slug
         session_run_response = self.session.sql(
             f"""
-                         call {self.omnata_app_name}.API.CREATE_DEVELOPMENT_SESSION_RUN('{sync_slug}')
-                         """
+            call {self.omnata_app_name}.API.CREATE_DEVELOPMENT_SESSION_RUN('{sync_slug}')
+            """
         ).collect()
         response_parsed = json.loads(session_run_response[0][0])
         if response_parsed["success"] is False:
@@ -425,11 +426,22 @@ class DevelopmentSession:
             sync_request=inbound_sync_request,
             scenario_records=None,
         )
+        self.run_id = inbound_payload.run_id
         self.plugin_instance._sync_request = inbound_sync_request
         self._start_recording()
         return configuration_parameters, inbound_sync_request
+    
+    def cancel_scenario(self):
+        """
+        Cancels the current scenario, and stops recording traffic.
+        """
+        if self.current_scenario is None:
+            return "Failed: you need to call prepare_outbound_scenario or prepare_inbound_scenario first"
+        self.current_scenario = None
+        self._stop_recording()
+        print("Success: cancelled scenario")
 
-    def complete_scenario(self):
+    def complete_scenario(self,apply_results:bool=True):
         """
         Marks the scenario as complete, and stops recording traffic.
         """
@@ -438,8 +450,18 @@ class DevelopmentSession:
         if self.current_scenario.results is None:
             return "Failed: you need to pass the results back to validate_response() before completing the scenario"
         self.recorded_scenarios.append(self.current_scenario)
-        self.current_scenario = None
         self._stop_recording()
+        if apply_results:
+            self.current_scenario.sync_request.apply_results_queue()
+        session_run_response = self.session.sql(
+            f"""
+            call {self.omnata_app_name}.API.COMPLETE_DEVELOPMENT_SESSION_RUN({self.run_id},{apply_results})
+            """
+        ).collect()
+        response_parsed = json.loads(session_run_response[0][0])
+        if response_parsed["success"] is False:
+            raise ValueError(f"Failed: {response_parsed['error']}")
+        self.current_scenario = None
         print("Success: finished recording scenario")
 
     def _stop_recording(self):
@@ -493,7 +515,7 @@ class DevelopmentSession:
             if self.current_scenario is None:
                 print("Failed: no active scenario")
                 return
-            results_dataframe = pandas.concat(outbound_sync_request._apply_results)
+            results_dataframe = pandas.concat(outbound_sync_request._apply_results).copy()
 
             originally_provided_records = self.current_scenario.scenario_records
 
@@ -544,7 +566,7 @@ class DevelopmentSession:
             inbound_sync_request: InboundSyncRequest = sync_request
             if inbound_sync_request._apply_results is None:
                 print("Failed: No results were enqueued to the sync request")
-            results_dataframe = inbound_sync_request._apply_results
+            results_dataframe = inbound_sync_request._apply_results.copy()
             self.current_scenario.results = results_dataframe
             print("Success: results are valid")
         else:
@@ -744,7 +766,7 @@ class DevelopmentSession:
                 )
                 table_indented = self.dataframe_to_behave_table(
                     recorded_scenario.scenario_records[
-                        ["IDENTIFIER", "SYNC_ACTION", "TRANSFORMED_RECORD"]
+                        ["IDENTIFIER", "APP_IDENTIFIER", "RESULT", "SYNC_ACTION", "TRANSFORMED_RECORD"]
                     ],
                     3,
                 )
@@ -756,7 +778,7 @@ class DevelopmentSession:
                     recorded_scenario.sync_request
                 )
                 for stream in inbound_sync_request.streams:
-                    if stream.stream_name in stream.latest_state:
+                    if stream.latest_state is not None:
                         f.write(
                             f"\t\t\t| {stream.stream_name} | {json.dumps(stream.latest_state,separators=(',', ':'))} | \n"
                         )
@@ -764,7 +786,7 @@ class DevelopmentSession:
                         f.write(f"\t\t\t| {stream.stream_name} | {{}} | \n")
             if len(self.vcr_filter_query_parameters) > 0:
                 f.write(
-                    f"\t\And when matching requests, we ignore query parameters {','.join(self.vcr_filter_query_parameters)}\n"
+                    f"\t\tAnd when matching requests, we ignore query parameters {','.join(self.vcr_filter_query_parameters)}\n"
                 )
             f.write(
                 f"\t\tAnd we use the HTTP recordings from {recorded_scenario.scenario_cassette_file_name}\n"
@@ -807,8 +829,11 @@ class DevelopmentSession:
                     f.write(
                         f"\t\tAnd the response for the {stream_name} stream will be:\n"
                     )
+                    if recorded_scenario.results[stream_name] is None:
+                        raise ValueError(f"Recorded results for scenario {recorded_scenario.scenario_name} were None")
                     results = pandas.concat(recorded_scenario.results[stream_name])
                     results["RECORD_DATA"] = results["RECORD_DATA"].apply(json.dumps)
+                    results["RECORD_DATA"] = results["RECORD_DATA"].replace("|", "\\|")
                     results.loc[
                         results["RECORD_DATA"] == '"null"', "RECORD_DATA"
                     ] = "null"