remove tag driven actions

Author: Radovan Fuchs

tests/e2e/features/environment.py

@@ -343,7 +343,7 @@ def _restore_llama_stack(context: Context) -> None:
 def before_feature(context: Context, feature: Feature) -> None:
     """Run before each feature file is exercised.
 
-    Per-feature setup that is not expressed in Gherkin (e.g. feedback cleanup state).
+    Per-feature setup that is not expressed in Gherkin.
     Lightspeed YAML is applied in feature Backgrounds via ``configure_service``.
 
     Records monotonic start time on ``feature`` for duration logging in
@@ -369,27 +369,28 @@ def before_feature(context: Context, feature: Feature) -> None:
             if _E2E_FLAKY_TAG in scenario.effective_tags:
                 patch_scenario_with_autoretry(scenario, max_attempts=max_flaky)
 
-    if "Feedback" in feature.tags:
-        context.hostname = os.getenv("E2E_LSC_HOSTNAME", "localhost")
-        context.port = os.getenv("E2E_LSC_PORT", "8080")
-        context.feedback_conversations = []
+    # Do not inherit feedback teardown state from a previous feature file.
+    for _attr in ("feedback_e2e_conversation_cleanup", "feedback_conversations"):
+        if hasattr(context, _attr):
+            delattr(context, _attr)
 
 
 def after_feature(context: Context, feature: Feature) -> None:
     """Run after each feature file is exercised.
 
-    Perform feature-level teardown: restore any modified configuration and
-    clean up feedback conversations.
+    Perform feature-level teardown: restore any modified configuration and,
+    when ``context.feedback_e2e_conversation_cleanup`` is set by feedback steps,
+    delete tracked feedback test conversations.
     """
     # Restore Llama Stack FIRST (before any lightspeed-stack restart)
     llama_was_running = getattr(context, "llama_stack_was_running", False)
     if llama_was_running:
         _restore_llama_stack(context)
         context.llama_stack_was_running = False
 
-    if "Feedback" in feature.tags:
+    if getattr(context, "feedback_e2e_conversation_cleanup", False):
         token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6Ikpva"
-        for conversation_id in context.feedback_conversations:
+        for conversation_id in getattr(context, "feedback_conversations", []):
             url = f"http://{context.hostname}:{context.port}/v1/conversations/{conversation_id}"
             headers = {"Authorization": f"Bearer {token}"}
             response = requests.delete(url, headers=headers, timeout=10)

tests/e2e/features/steps/feedback.py

@@ -24,10 +24,18 @@
 DEFAULT_TIMEOUT = 10
 
 
+def _register_feedback_conversation_cleanup(context: Context) -> None:
+    """Mark that ``after_feature`` should DELETE tracked conversations (see ``environment``)."""
+    context.feedback_e2e_conversation_cleanup = True
+    if not hasattr(context, "feedback_conversations"):
+        context.feedback_conversations = []
+
+
 @step("The feedback is enabled")  # type: ignore[reportCallIssue]
 def enable_feedback(context: Context) -> None:
     """Enable the feedback endpoint and assert success."""
     assert context is not None
+    _register_feedback_conversation_cleanup(context)
     payload = {"status": True}
     access_feedback_put_endpoint(context, payload)
 
@@ -36,6 +44,7 @@ def enable_feedback(context: Context) -> None:
 def disable_feedback(context: Context) -> None:
     """Disable the feedback endpoint and assert success."""
     assert context is not None
+    _register_feedback_conversation_cleanup(context)
     payload = {"status": False}
     access_feedback_put_endpoint(context, payload)
 
@@ -142,6 +151,7 @@ def create_conversation_with_user_id(
     body = response.json()
     context.conversation_id = body["conversation_id"]
     assert context.conversation_id, "Conversation was not created."
+    _register_feedback_conversation_cleanup(context)
     context.feedback_conversations.append(context.conversation_id)
     context.response = response