stoobly-agent 1.9.0__py3-none-any.whl → 1.9.2__py3-none-any.whl

stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.9.0'
+VERSION = '1.9.2'

stoobly_agent/app/models/factories/resource/local_db/helpers/log.py

@@ -8,6 +8,7 @@ from stoobly_agent.config.data_dir import DataDir
 from stoobly_agent.lib.logger import bcolors, Logger
 
 from .log_event import LogEvent
+from .request_snapshot import RequestSnapshot
 from .snapshot_types import DELETE_ACTION, PUT_ACTION, Resource
 
 EVENT_DELIMITTER = "\n"
@@ -67,6 +68,10 @@ class Log():
     contents = self.read()
     return self.build_raw_events(contents) 
 
+  @property
+  def scenario_inverted_index(self):
+    return self.build_scenario_inverted_index(self.target_events)
+
   @property
   def unprocessed_events(self) -> List[LogEvent]:
     events = self.events
@@ -133,6 +138,22 @@ class Log():
 
   def build_log_events(self, raw_events) -> List[LogEvent]:
     return list(map(lambda raw_event: LogEvent(raw_event), raw_events))
+  
+  def build_scenario_inverted_index(self, events: List[LogEvent], index = {}):
+    def handle_snapshot(snapshot: RequestSnapshot):
+      request_uuid = snapshot.uuid
+      if not request_uuid in index:
+        index[request_uuid] = []
+
+      index[request_uuid].append(event.resource_uuid)
+
+    for event in events:
+      if not event.is_scenario():
+        continue 
+
+      event.snapshot().iter_request_snapshots(handle_snapshot)
+
+    return index
 
   def next_version(self, last_processed_uuid: str = None):
     uuids = self.uuids()
@@ -149,7 +170,7 @@ class Log():
   def collapse(self, events: List[LogEvent]) -> List[LogEvent]:
     events_count = {}
 
-    # More recent events take precedence over earlier ones, keep only the most recent event 
+    # More recent events take precedence over earlier ones, only the most recent event 
     for event in events:
       event_key = event.key
 
@@ -197,12 +218,18 @@ class Log():
 
       resource_index[event.resource_uuid].append(event)
 
+    scenario_inverted_index = self.scenario_inverted_index
+
     pruned_events = self.collapse(events)
     for event in pruned_events:
       snapshot = event.snapshot()
       snapshot_exists = snapshot.exists
 
       if event.action == DELETE_ACTION or not snapshot_exists:
+        if event.is_request() and event.resource_uuid in scenario_inverted_index:
+          # If a request is deleted, only prune if it's not also a part of a scenario
+          continue
+
         Logger.instance(LOG_ID).info(f"{bcolors.OKBLUE}Removing{bcolors.ENDC} {event.resource} {event.resource_uuid}")
 
         resource_events: List[LogEvent] = resource_index[event.resource_uuid]
@@ -218,8 +245,16 @@ class Log():
           removed_events[event.uuid] = True
 
         if event.action == DELETE_ACTION and snapshot_exists: 
-          if not dry_run:
+          if dry_run:
+            continue
+
+          if event.is_scenario():
+            # We still need to check each request in a scenario to make sure another scenario does not depend on it
+            snapshot.remove(lambda snapshot: self.remove_request_snapshot(snapshot, scenario_inverted_index))
+          elif event.is_request():
+            # We have already checked that a scenario does not depend on the request above
             snapshot.remove()
+
           Logger.instance(LOG_ID).info(f"Removing {event.resource} snapshot")
 
   def build_raw_events(self, contents: str) -> List[str]:
@@ -240,8 +275,10 @@ class Log():
   
   def remove_dangling_events(self, processed_events: List[LogEvent], unprocessed_events: List[LogEvent]):
     '''
-    Remove DELETE events where the last processed event was a PUT
+    Remove DELETE events unless the last processed event was a PUT
     '''
+
+    # Build an index to keep track of the last action that occurred for a resource
     index = {}
     for event in processed_events:
       if event.action == PUT_ACTION:
@@ -249,10 +286,32 @@ class Log():
       elif event.action == DELETE_ACTION:
         if event.resource_uuid in index:
           del index[event.resource_uuid]
+
+    scenario_inverted_index = self.build_scenario_inverted_index(processed_events)
+    
+    def keep(e: LogEvent):
+      # Keep the event if it's a PUT, it may have been updated
+      if e.action == PUT_ACTION:
+        return True
+
+      if e.action == DELETE_ACTION:
+        if e.is_request():
+          referenced = e.resource_uuid in scenario_inverted_index
+          # Keep the DELETE event if the requests exists in a scenario
+          # or if it doesn't exist in a scenario, there was a previous delete event
+          return referenced or (e.resource_uuid in index and not referenced)
+        elif e.is_scenario():
+          # Update scenario_inverted_index with unprocessed event
+          self.build_scenario_inverted_index([e], scenario_inverted_index)
+
+          # Keep DELETE scenario event only if previous event for the resource was PUT
+          return e.resource_uuid in index
+        else:
+          return True
     
     return list(
       filter(
-        lambda e: e.action != DELETE_ACTION or (e.action == DELETE_ACTION and e.resource_uuid in index), 
+        keep,
         unprocessed_events
       )
     )
@@ -289,6 +348,12 @@ class Log():
     remaining_events = self.remove_dangling_events(processed_events, unprocessed_events)
     return list(filter(lambda e: e.uuid not in remaining_version_uuids, remaining_events))
 
+  def remove_request_snapshot(self, snapshot: RequestSnapshot, scenario_inverted_index: dict = None):
+    scenario_inverted_index = scenario_inverted_index or self.scenario_inverted_index
+
+    if snapshot.uuid not in scenario_inverted_index:
+      snapshot.remove()
+
   # Rotate log to history
   def rotate(self):
     if not os.path.exists(self.__log_file_path):

stoobly_agent/app/models/factories/resource/local_db/helpers/request_snapshot.py

@@ -1,5 +1,4 @@
 import os
-import shutil
 
 from stoobly_agent.app.models.adapters.orm import JoinedRequestStringAdapter
 from stoobly_agent.lib.orm.request import Request

stoobly_agent/app/models/factories/resource/local_db/helpers/scenario_snapshot.py

@@ -1,7 +1,6 @@
 import json
 import os
 import pdb
-import shutil
 
 from typing import Callable, List
 
@@ -128,12 +127,12 @@ class ScenarioSnapshot(Snapshot):
     if os.path.exists(metadata_file_path):
       os.remove(metadata_file_path)
 
-  def remove_requests(self):
+  def remove_requests(self, handle_remove_request_snapshot = None):
     requests_file_path = self.requests_path
 
     if os.path.exists(requests_file_path):
       # A request only every belongs to one scenario
-      self.iter_request_snapshots(self.__handle_remove_requests)
+      self.iter_request_snapshots(handle_remove_request_snapshot or self.__handle_remove_requests)
 
       os.remove(requests_file_path)
 

stoobly_agent/app/models/factories/resource/local_db/helpers/snapshot_service.py

@@ -14,15 +14,17 @@ def snapshot_request(request: Request, **options: RequestSnapshotOptions):
     return
 
   snapshot = RequestSnapshot(request.uuid)
-
   snapshot.backup()
 
+  log = Log()
+
   if action == PUT_ACTION:
     snapshot.write(request, **options)
   elif action == DELETE_ACTION:
-    snapshot.remove()
+    inverted_scenario_index = log.scenario_inverted_index
 
-  log = Log()
+    # If a scenario currently depends on this request, we can't remove the snapshot until the scenario is also removed
+    log.remove_request_snapshot(snapshot, inverted_scenario_index) 
 
   try:
     if action == PUT_ACTION:
@@ -40,7 +42,6 @@ def snapshot_scenario(scenario: Scenario, **options):
     return
 
   snapshot = ScenarioSnapshot(scenario.uuid)
-
   snapshot.backup_metadata()
 
   if action == PUT_ACTION:
@@ -50,13 +51,13 @@ def snapshot_scenario(scenario: Scenario, **options):
 
   snapshot.backup_requests()
 
+  log = Log()
+  inverted_scenario_index = log.scenario_inverted_index
   if action == PUT_ACTION:
-    snapshot.remove_requests()
+    snapshot.remove_requests(lambda snapshot: log.remove_request_snapshot(snapshot, inverted_scenario_index))
     snapshot.write_requests(scenario, **options)
   elif action == DELETE_ACTION:
-    snapshot.remove_requests()
-
-  log = Log()
+    snapshot.remove_requests(lambda snapshot: log.remove_request_snapshot(snapshot, inverted_scenario_index))
 
   if action == PUT_ACTION:
     log.put(scenario)

stoobly_agent/app/models/helpers/apply.py

@@ -1,5 +1,7 @@
 import pdb
 
+from typing import List
+
 from stoobly_agent.app.models.factories.resource.local_db.helpers.log import Log
 from stoobly_agent.app.models.factories.resource.local_db.helpers.request_snapshot import RequestSnapshot
 from stoobly_agent.app.models.factories.resource.local_db.helpers.scenario_snapshot import ScenarioSnapshot
@@ -71,6 +73,7 @@ class Apply():
       if results:
         status = results[1]
         if status == 0 or status >= 400:
+          self.__logger(f"{bcolors.FAIL}Error{bcolors.ENDC} {results[0]}")
           completed = False
           break
 
@@ -218,14 +221,16 @@ class Apply():
 
     snapshot_requests = {}
 
-    request_snapshots = snapshot.request_snapshots
+    request_snapshots: List[RequestSnapshot] = snapshot.request_snapshots
     for request_snapshot in request_snapshots:
       raw_request = request_snapshot.request
-      
-      toks = raw_request.split(REQUEST_STRING_CLRF, 1)
 
+      if not raw_request:
+        return f"{request_snapshot.path} is missing", 400
+        
+      toks = raw_request.split(REQUEST_STRING_CLRF, 1)
       if len(toks) != 2:
-        return f"{snapshot.requests_path} contains an invalid request", 400
+        return f"{request_snapshot.path} contains an invalid request", 400
 
       uuid = request_snapshot.uuid
       res, status = self.__put_request(uuid, raw_request, scenario_id=scenario['id'])

stoobly_agent/app/proxy/handle_mock_service.py

@@ -147,15 +147,8 @@ def handle_request_mock(context: MockContext):
 # 2. AFTER_MOCK gets triggered (if mock found)
 #
 def handle_response_mock(context: MockContext):
-    response = context.flow.response
-    request_key = response.headers.get(custom_headers.MOCK_REQUEST_KEY)
-
-    if request_key:
-        request = context.flow.request
-        Logger.instance(LOG_ID).info(f"{bcolors.OKBLUE}Mocked{bcolors.ENDC} {request.url} -> {request_key}")
-
-        __rewrite_response(context)
-        __mock_hook(lifecycle_hooks.AFTER_MOCK, context)
+    __rewrite_response(context)
+    __mock_hook(lifecycle_hooks.AFTER_MOCK, context)
 
 def __handle_mock_failure(context: MockContext) -> None:
     flow = context.flow
@@ -186,6 +179,19 @@ def __handle_found_policy(context: MockContext) -> None:
     reverse_proxy(req, upstream_url, {})
 
 def __handle_mock_success(context: MockContext) -> None:
+    response = context.response
+
+    if response:
+        request = context.flow.request
+
+        request_key = response.headers.get(custom_headers.MOCK_REQUEST_KEY)
+        if request_key:
+            Logger.instance(LOG_ID).info(f"{bcolors.OKBLUE}Mocked{bcolors.ENDC} {request.url} -> {request_key}")
+
+        fixture_path = response.headers.get(custom_headers.MOCK_FIXTURE_PATH)
+        if fixture_path:
+            Logger.instance(LOG_ID).info(f"{bcolors.OKBLUE}Mocked{bcolors.ENDC} {request.url} -> {fixture_path}")
+
     if os.environ.get(env_vars.AGENT_SIMULATE_LATENCY):
         response = context.response
         start_time = context.start_time

stoobly_agent/app/proxy/mock/eval_fixtures_service.py

@@ -10,6 +10,7 @@ from requests.structures import CaseInsensitiveDict
 from typing import Union
 
 from stoobly_agent.lib.logger import bcolors, Logger
+from stoobly_agent.config.constants.custom_headers import MOCK_FIXTURE_PATH
 
 from .types import Fixtures
 
@@ -20,45 +21,50 @@ class Options():
   response_fixtures: Fixtures
 
 def eval_fixtures(request: MitmproxyRequest, **options: Options) -> Union[Response, None]:
-  fixture_path = None
+  fixture_path = request.headers.get(MOCK_FIXTURE_PATH)
   headers = CaseInsensitiveDict()
   status_code = 200
 
-  response_fixtures = options.get('response_fixtures')
-  fixture: dict = __eval_response_fixtures(request, response_fixtures)
-
-  if not fixture:
-    public_directory_path = options.get('public_directory_path')
-
-    if not public_directory_path:
+  if fixture_path:
+    if not os.path.exists(fixture_path):
       return
+  else:
+    response_fixtures = options.get('response_fixtures')
+    fixture: dict = __eval_response_fixtures(request, response_fixtures)
 
-    request_path = 'index' if request.path == '/' else request.path
-    _fixture_path = os.path.join(public_directory_path, request_path.lstrip('/'))
-    if request.headers.get('accept'):
-      fixture_path = __guess_file_path(_fixture_path, request.headers['accept'])
+    if not fixture:
+      public_directory_path = options.get('public_directory_path')
 
-    if not fixture_path:
-      fixture_path = _fixture_path
+      if not public_directory_path:
+        return
 
-    if not os.path.isfile(fixture_path):
-      return
-  else:
-    fixture_path = fixture.get('path')
-    if not fixture_path or not os.path.isfile(fixture_path):
-      return
+      request_path = 'index' if request.path == '/' else request.path
+      _fixture_path = os.path.join(public_directory_path, request_path.lstrip('/'))
+      if request.headers.get('accept'):
+        fixture_path = __guess_file_path(_fixture_path, request.headers['accept'])
+
+      if not fixture_path:
+        fixture_path = _fixture_path
 
-    _headers = fixture.get('headers')
-    headers = CaseInsensitiveDict(_headers if isinstance(_headers, dict) else {}) 
+      if not os.path.isfile(fixture_path):
+        return
+    else:
+      fixture_path = fixture.get('path')
+      if not fixture_path or not os.path.isfile(fixture_path):
+        return
 
-    if fixture.get('status_code'):
-      status_code = fixture.get('status_code')
+      _headers = fixture.get('headers')
+      headers = CaseInsensitiveDict(_headers if isinstance(_headers, dict) else {}) 
 
+      if fixture.get('status_code'):
+        status_code = fixture.get('status_code')
+    
   with open(fixture_path, 'rb') as fp:
     response = Response()
 
     response.status_code = status_code
     response.raw = BytesIO(fp.read()) 
+    headers[MOCK_FIXTURE_PATH] = fixture_path
     response.headers = headers
 
     if not response.headers.get('content-type'):

stoobly_agent/config/constants/custom_headers.py

@@ -2,6 +2,7 @@ ALIAS_RESOLVE_STRATEGY = 'X-Stoobly-Alias-Resolve-Strategy'
 CONTENT_TYPE = 'X-Stoobly-Content-Type'
 CONTENT_TYPE_TEST_RESULTS = 'test/results'
 REMOTE_PROJECT_KEY = 'X-Stoobly-Endpoints-Project-Id'
+MOCK_FIXTURE_PATH = 'X-Stoobly-Fixture-Path'
 MOCK_POLICY = 'X-Stoobly-Mock-Policy'
 MOCK_REQUEST_ID = 'X-Stoobly-Request-Id'
 MOCK_REQUEST_ENDPOINT_ID = 'X-Stoobly-Request-Endpoint-Id'

stoobly_agent/lib/api/keys/uuid_key.py

@@ -28,6 +28,10 @@ class UuidKey(ResourceKey):
     toks = key.split(DELIMITTER)
 
     d = {}
+
+    if len(toks) == 0:
+      return d
+
     for tok in toks:
       d[tok[0]] = tok[1:]
 

stoobly_agent/test/app/cli/request/request_snapshot_test.py

@@ -1,16 +1,18 @@
 import pdb
 import pytest
+import time
 
 from click.testing import CliRunner
-
-from stoobly_agent.test.test_helper import DETERMINISTIC_GET_REQUEST_URL, reset
+from typing import List
 
 from stoobly_agent.app.models.adapters.orm import JoinedRequestStringAdapter
 from stoobly_agent.app.models.factories.resource.local_db.helpers.log import Log
-from stoobly_agent.app.models.factories.resource.local_db.helpers.log_event import DELETE_ACTION
+from stoobly_agent.app.models.factories.resource.local_db.helpers.log_event import DELETE_ACTION, PUT_ACTION
 from stoobly_agent.app.models.factories.resource.local_db.helpers.request_snapshot import RequestSnapshot
-from stoobly_agent.cli import record, request
+from stoobly_agent.cli import record, request, scenario, snapshot
 from stoobly_agent.lib.orm.request import Request
+from stoobly_agent.lib.orm.scenario import Scenario
+from stoobly_agent.test.test_helper import DETERMINISTIC_GET_REQUEST_URL, NON_DETERMINISTIC_GET_REQUEST_URL, reset
 
 @pytest.fixture(scope='module')
 def runner():
@@ -122,3 +124,51 @@ class TestRequestSnapshot():
 
         event = unprocessed_events[0]
         assert event.resource_uuid == recorded_request_two.uuid
+        assert event.action == PUT_ACTION
+
+    class TestWhenDeleteFirst():
+
+      @pytest.fixture(scope='class')
+      def recorded_request(self, runner: CliRunner):
+        record_result = runner.invoke(record, [DETERMINISTIC_GET_REQUEST_URL])
+        assert record_result.exit_code == 0
+        return Request.last()
+
+      def test_initial_delete(self, runner: CliRunner, recorded_request: Request):
+        snapshot_result = runner.invoke(request, ['snapshot', '--action', DELETE_ACTION, recorded_request.key()])
+        assert snapshot_result.exit_code == 0
+
+        log = Log()
+
+        events = log.raw_events
+        assert len(events) == 1
+
+        unprocessed_events = log.unprocessed_events
+        assert len(unprocessed_events) == 0
+
+      def test_puts(self, runner: CliRunner, recorded_request: Request):
+        snapshot_result = runner.invoke(request, ['snapshot', '--action', PUT_ACTION, recorded_request.key()])
+        assert snapshot_result.exit_code == 0
+
+        log = Log()
+
+        events = log.raw_events
+        assert len(events) == 2
+
+        unprocessed_events = log.unprocessed_events
+        assert len(unprocessed_events) == 1
+        assert unprocessed_events[0].action == PUT_ACTION
+
+      def test_final_delete(self, runner: CliRunner, recorded_request: Request):
+        snapshot_result = runner.invoke(request, ['snapshot', '--action', DELETE_ACTION, recorded_request.key()])
+        assert snapshot_result.exit_code == 0
+
+        log = Log()
+
+        events = log.events
+        assert len(events) == 3
+
+        collapsed_events = log.collapse(events)
+        assert len(collapsed_events) == 1
+        unprocessed_events = log.unprocessed_events
+        assert len(unprocessed_events) == 0

stoobly_agent/test/app/cli/snapshot/snapshot_apply_test.py

@@ -547,4 +547,266 @@ class TestApply():
         recreated_scenario = Scenario.find_by(uuid=created_scenario.uuid)
         assert recreated_scenario
 
-        assert len(recreated_scenario.requests) == 0
+        assert len(recreated_scenario.requests) == 0
+
+    class TestWhenDeletingRequestWhileReferenced():
+
+      class TestWhenRemoveScenarioRequest():
+        '''
+        1. Create scenario
+        2. Add 2 requests to it
+        3. Snapshot scenario
+        4. Snapshot second request with action DELETE_ACTION
+        5. Apply
+        6. Expect scenario to have 1 request
+        '''
+
+        @pytest.fixture(scope='class')
+        def created_scenario(self, runner: CliRunner):
+          create_result = runner.invoke(scenario, ['create', 'test'])
+          assert create_result.exit_code == 0
+          return Scenario.last()
+
+        @pytest.fixture(scope='class', autouse=True)
+        def created_scenario_requests(self, runner: CliRunner, created_scenario: Scenario):
+          record_result = runner.invoke(record, ['--scenario-key', created_scenario.key(), DETERMINISTIC_GET_REQUEST_URL])
+          assert record_result.exit_code == 0
+
+          record_result = runner.invoke(record, ['--scenario-key', created_scenario.key(), NON_DETERMINISTIC_GET_REQUEST_URL])
+          assert record_result.exit_code == 0
+
+          return created_scenario.requests
+
+        @pytest.fixture(scope='class', autouse=True)
+        def delete_event(self, runner: CliRunner, created_scenario: Scenario, created_scenario_requests: List[Request]):
+          snapshot_result = runner.invoke(scenario, ['snapshot', created_scenario.key()])
+          assert snapshot_result.exit_code == 0
+
+          time.sleep(0.5) # So events do not have the same uuid
+
+          created_request = created_scenario_requests[1]
+          snapshot_result = runner.invoke(request, ['snapshot', created_request.key(), '--action', DELETE_ACTION])
+          assert snapshot_result.exit_code == 0
+
+          log = Log()
+          events = log.events
+          return events[len(events) - 1]
+
+        @pytest.fixture(scope='class')
+        def apply_result(self, runner: CliRunner, created_scenario: Scenario):
+          created_scenario = Scenario.find(created_scenario.id)
+          assert created_scenario.requests_count == 2
+          apply_result = runner.invoke(snapshot, ['apply'])
+
+          return apply_result
+
+        def test_it_updates_scenario(self, created_scenario: Scenario, apply_result):
+          assert apply_result.exit_code == 0
+
+          created_scenario = Scenario.find(created_scenario.id)
+          assert created_scenario.requests_count == 1
+
+        def test_it_maintains_requests(self, created_scenario: Scenario, created_scenario_requests: List[Request]):
+          created_scenario = Scenario.find(created_scenario.id)
+          assert len(created_scenario.requests) == 1
+
+          requests = created_scenario.requests
+
+          assert_orm_request_equivalent(requests[0], created_scenario_requests[0])
+      
+      class TestWhenMovingScenarioRequest():
+        '''
+        1. Create scenario one and scenario two
+        2. Add 1 request to scenario one
+        3. Snapshot scenario one
+        4. Move scenario one request to scenario two
+        5. Snapshot scenario two
+        5. Apply
+        6. Expect scenario one to have 0 requests
+        7. Expect scenario two to have 1 request
+        '''
+
+        @pytest.fixture(scope='class')
+        def created_scenario_one(self, runner: CliRunner):
+          create_result = runner.invoke(scenario, ['create', 'test1'])
+          assert create_result.exit_code == 0
+          return Scenario.last()
+
+        @pytest.fixture(scope='class')
+        def created_scenario_two(self, runner: CliRunner):
+          create_result = runner.invoke(scenario, ['create', 'test2'])
+          assert create_result.exit_code == 0
+          return Scenario.last()
+
+        @pytest.fixture(scope='class', autouse=True)
+        def created_scenario_request(self, runner: CliRunner, created_scenario_one: Scenario):
+          record_result = runner.invoke(record, ['--scenario-key', created_scenario_one.key(), DETERMINISTIC_GET_REQUEST_URL])
+          assert record_result.exit_code == 0
+
+          return created_scenario_one.requests[0]
+
+        @pytest.fixture(scope='class', autouse=True)
+        def put_event_one(self, runner: CliRunner, created_scenario_one: Scenario, created_scenario_request: Request):
+          snapshot_result = runner.invoke(scenario, ['snapshot', created_scenario_one.key()])
+          assert snapshot_result.exit_code == 0
+
+          log = Log()
+          events = log.events
+          return events[len(events) - 1]
+
+        @pytest.fixture(scope='class', autouse=True)
+        def put_event_two(self, runner: CliRunner, created_scenario_two: Scenario, created_scenario_request: Request):
+          created_scenario_request.update(scenario_id=created_scenario_two.id)
+
+          snapshot_result = runner.invoke(scenario, ['snapshot', created_scenario_two.key()])
+          assert snapshot_result.exit_code == 0
+
+          log = Log()
+          events = log.events
+          return events[len(events) - 1]
+
+        @pytest.fixture(scope='class')
+        def apply_result(self, runner: CliRunner):
+          apply_result = runner.invoke(snapshot, ['apply'])
+
+          return apply_result
+
+        def test_it_removes_request_from_scenario_one(self, created_scenario_one: Scenario, apply_result):
+          assert apply_result.exit_code == 0
+
+          created_scenario_one = Scenario.find(created_scenario_one.id)
+          assert created_scenario_one.requests_count == 0
+
+        def test_it_adds_request_to_scenario_two(self, created_scenario_two: Scenario, apply_result):
+          assert apply_result.exit_code == 0
+
+          created_scenario_two = Scenario.find(created_scenario_two.id)
+          assert created_scenario_two.requests_count == 1
+
+        def test_it_maintains_requests(self, created_scenario_two: Scenario, created_scenario_request):
+          created_scenario_two = Scenario.find(created_scenario_two.id)
+          assert len(created_scenario_two.requests) == 1
+
+          requests = created_scenario_two.requests
+
+          assert_orm_request_equivalent(requests[0], created_scenario_request)
+    
+    class TestApply():
+
+      class TestWhenNoApply():
+        '''
+        1. Create scenario
+        2. Add 2 requests to it
+        3. Snapshot scenario
+        4. Apply scenario
+        5. Snapshot second request with action DELETE_ACTION
+        6. Prune
+        7. Apply
+        8. Expect scenario to have 1 request, because scenario depends on the request, should not be able to prune
+        '''
+
+        @pytest.fixture(scope='class')
+        def created_scenario(self, runner: CliRunner):
+          create_result = runner.invoke(scenario, ['create', 'test'])
+          assert create_result.exit_code == 0
+          return Scenario.last()
+
+        @pytest.fixture(scope='class', autouse=True)
+        def created_scenario_requests(self, runner: CliRunner, created_scenario: Scenario):
+          record_result = runner.invoke(record, ['--scenario-key', created_scenario.key(), DETERMINISTIC_GET_REQUEST_URL])
+          assert record_result.exit_code == 0
+
+          record_result = runner.invoke(record, ['--scenario-key', created_scenario.key(), NON_DETERMINISTIC_GET_REQUEST_URL])
+          assert record_result.exit_code == 0
+
+          return created_scenario.requests
+
+        @pytest.fixture(scope='class', autouse=True)
+        def snapshots(self, runner: CliRunner, created_scenario: Scenario, created_scenario_requests: List[Request]):
+          snapshot_result = runner.invoke(scenario, ['snapshot', created_scenario.key()])
+          assert snapshot_result.exit_code == 0
+
+          created_request = created_scenario_requests[1]
+          snapshot_result = runner.invoke(request, ['snapshot', created_request.key(), '--action', DELETE_ACTION])
+          assert snapshot_result.exit_code == 0
+
+        def test_events(self):
+          log = Log()
+
+          events = log.events
+          assert len(events) == 2
+
+        def test_collapsed_events(self):
+          log = Log()
+
+          collapsed_events = log.collapse(log.events)
+          assert len(collapsed_events) == 2
+
+        def test_unprocessed_events(self):
+          log = Log()
+
+          unprocessed_events = log.unprocessed_events
+          assert len(unprocessed_events) == 2
+
+      class TestWhenRemoveScenarioRequest():
+        '''
+        1. Create scenario
+        2. Add 2 requests to it
+        3. Snapshot scenario
+        4. Apply scenario
+        5. Snapshot second request with action DELETE_ACTION
+        6. Prune
+        7. Apply
+        8. Expect scenario to have 1 request, because scenario depends on the request, should not be able to prune
+        '''
+
+        @pytest.fixture(scope='class')
+        def created_scenario(self, runner: CliRunner):
+          create_result = runner.invoke(scenario, ['create', 'test'])
+          assert create_result.exit_code == 0
+          return Scenario.last()
+
+        @pytest.fixture(scope='class', autouse=True)
+        def created_scenario_requests(self, runner: CliRunner, created_scenario: Scenario):
+          record_result = runner.invoke(record, ['--scenario-key', created_scenario.key(), DETERMINISTIC_GET_REQUEST_URL])
+          assert record_result.exit_code == 0
+
+          record_result = runner.invoke(record, ['--scenario-key', created_scenario.key(), NON_DETERMINISTIC_GET_REQUEST_URL])
+          assert record_result.exit_code == 0
+
+          return created_scenario.requests
+
+        @pytest.fixture(scope='class', autouse=True)
+        def apply_result(self, runner: CliRunner, created_scenario: Scenario, created_scenario_requests: List[Request]):
+          snapshot_result = runner.invoke(scenario, ['snapshot', created_scenario.key()])
+          assert snapshot_result.exit_code == 0
+
+          created_scenario = Scenario.find(created_scenario.id)
+          assert created_scenario.requests_count == 2
+          apply_result = runner.invoke(snapshot, ['apply'])
+          assert apply_result.exit_code == 0
+
+          created_request = created_scenario_requests[1]
+          snapshot_result = runner.invoke(request, ['snapshot', created_request.key(), '--action', DELETE_ACTION])
+          assert snapshot_result.exit_code == 0
+
+          return apply_result
+
+        def test_events(self):
+          log = Log()
+
+          events = log.events
+          assert len(events) == 2
+
+        def test_collapsed_events(self):
+          log = Log()
+
+          collapsed_events = log.collapse(log.events)
+          assert len(collapsed_events) == 2
+
+        def test_unprocessed_events(self):
+          log = Log()
+
+          unprocessed_events = log.unprocessed_events
+          assert len(unprocessed_events) == 1
+          assert unprocessed_events[0].action == DELETE_ACTION

stoobly_agent/test/app/cli/snapshot/snapshot_prune_test.py

@@ -3,12 +3,14 @@ import pytest
 import time
 
 from click.testing import CliRunner
+from typing import List
 
 from stoobly_agent.app.models.factories.resource.local_db.helpers.log import Log
 from stoobly_agent.app.models.factories.resource.local_db.helpers.log_event import DELETE_ACTION, LogEvent
-from stoobly_agent.cli import record, request, snapshot
+from stoobly_agent.cli import record, request, scenario, snapshot
 from stoobly_agent.lib.orm.request import Request
-from stoobly_agent.test.test_helper import DETERMINISTIC_GET_REQUEST_URL, reset
+from stoobly_agent.lib.orm.scenario import Scenario
+from stoobly_agent.test.test_helper import assert_orm_request_equivalent, DETERMINISTIC_GET_REQUEST_URL, NON_DETERMINISTIC_GET_REQUEST_URL, reset
 
 @pytest.fixture(scope='module')
 def runner():
@@ -107,4 +109,71 @@ class TestPrune():
 
         apply_result = runner.invoke(snapshot, ['prune'])
         assert apply_result.exit_code == 0
-        assert len(log.events) == 0
+        assert len(log.events) == 0
+
+    class TestWhenRemoveScenarioRequest():
+      '''
+      1. Create scenario
+      2. Add 2 requests to it
+      3. Snapshot scenario
+      4. Snapshot second request with action DELETE_ACTION
+      5. Prune
+      6. Apply
+      7. Expect scenario to have 1 request, because scenario depends on the request, should not be able to prune
+      '''
+
+      @pytest.fixture(scope='class')
+      def created_scenario(self, runner: CliRunner):
+        create_result = runner.invoke(scenario, ['create', 'test'])
+        assert create_result.exit_code == 0
+        return Scenario.last()
+
+      @pytest.fixture(scope='class', autouse=True)
+      def created_scenario_requests(self, runner: CliRunner, created_scenario: Scenario):
+        record_result = runner.invoke(record, ['--scenario-key', created_scenario.key(), DETERMINISTIC_GET_REQUEST_URL])
+        assert record_result.exit_code == 0
+
+        record_result = runner.invoke(record, ['--scenario-key', created_scenario.key(), NON_DETERMINISTIC_GET_REQUEST_URL])
+        assert record_result.exit_code == 0
+
+        return created_scenario.requests
+
+      @pytest.fixture(scope='class', autouse=True)
+      def delete_event(self, runner: CliRunner, created_scenario: Scenario, created_scenario_requests: List[Request]):
+        snapshot_result = runner.invoke(scenario, ['snapshot', created_scenario.key()])
+        assert snapshot_result.exit_code == 0
+
+        time.sleep(0.5) # So events do not have the same uuid
+
+        created_request = created_scenario_requests[1]
+        snapshot_result = runner.invoke(request, ['snapshot', created_request.key(), '--action', DELETE_ACTION])
+        assert snapshot_result.exit_code == 0
+
+        log = Log()
+        events = log.events
+        return events[len(events) - 1]
+
+      @pytest.fixture(scope='class')
+      def apply_result(self, runner: CliRunner, created_scenario: Scenario):
+        prune_result = runner.invoke(snapshot, ['prune'])
+        assert prune_result.exit_code == 0
+
+        created_scenario = Scenario.find(created_scenario.id)
+        assert created_scenario.requests_count == 2
+        apply_result = runner.invoke(snapshot, ['apply'])
+
+        return apply_result
+
+      def test_it_updates_scenario(self, created_scenario: Scenario, apply_result):
+        assert apply_result.exit_code == 0
+
+        created_scenario = Scenario.find(created_scenario.id)
+        assert created_scenario.requests_count == 1
+
+      def test_it_maintains_requests(self, created_scenario: Scenario, created_scenario_requests: List[Request]):
+        created_scenario = Scenario.find(created_scenario.id)
+        assert len(created_scenario.requests) == 1
+
+        requests = created_scenario.requests
+
+        assert_orm_request_equivalent(requests[0], created_scenario_requests[0])

stoobly_agent/test/app/models/schemas/.stoobly/db/VERSION

@@ -1 +1 @@
-1.8.5
+1.9.0

{stoobly_agent-1.9.0.dist-info → stoobly_agent-1.9.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: stoobly-agent
-Version: 1.9.0
+Version: 1.9.2
 Summary: Record, mock, and test HTTP(s) requests. CLI agent for Stoobly
 License: Apache-2.0
 Author: Matt Le

{stoobly_agent-1.9.0.dist-info → stoobly_agent-1.9.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-stoobly_agent/__init__.py,sha256=1zUUaHVU-BNUei6lrNgI-2kwbJnFfizP496P_Xekrwo,44
+stoobly_agent/__init__.py,sha256=epZElDe2ihHM7JdgjopRIH49aMQpYH4SYIjmxXXMnY0,44
 stoobly_agent/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/api/__init__.py,sha256=ctkB8KR-eXO0SFhj602huHiyvQ3PslFWd8fkcufgrAI,1000
 stoobly_agent/app/api/application_http_request_handler.py,sha256=Vvz53yB0bR7J-QqMAkLlhcZrA4P64ZEN7w8cMbgl6o0,5261
@@ -258,14 +258,14 @@ stoobly_agent/app/models/factories/resource/local_db/body_adapter.py,sha256=lrnI
 stoobly_agent/app/models/factories/resource/local_db/header_adapter.py,sha256=NQdCErFtJL7sBaLpKLYfJSEA3AiaaVuU7LUcGJ-dHOI,3104
 stoobly_agent/app/models/factories/resource/local_db/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/models/factories/resource/local_db/helpers/create_request_columns_service.py,sha256=HABMelW-cvhm2WXaywbQcd4PQhzSrz4vAbN7uOdetXM,1541
-stoobly_agent/app/models/factories/resource/local_db/helpers/log.py,sha256=0a3XRfrnbChCVrGpm5gqSlZ3zVK1S7nbWYwXTJawx58,9216
+stoobly_agent/app/models/factories/resource/local_db/helpers/log.py,sha256=COKyrRFZgxQgLVH6cs_Mvc616BScoldamg8QqG8JV3c,11670
 stoobly_agent/app/models/factories/resource/local_db/helpers/log_event.py,sha256=30wWhqibTWgnpibosclaB9OCWzArL7R4krGS8WW2bGY,3584
 stoobly_agent/app/models/factories/resource/local_db/helpers/request_builder.py,sha256=PyVvsYmi5bBQ6PsUPxQ4nJM9rhhjGVOTd7ipuc2tMMM,3227
-stoobly_agent/app/models/factories/resource/local_db/helpers/request_snapshot.py,sha256=XvUAqa9icAUPmktcAt30VnQspJVQZhA1K5n6ZVMRZIk,2686
-stoobly_agent/app/models/factories/resource/local_db/helpers/scenario_snapshot.py,sha256=mv_79PgvG6Q7rwYXdV0wZMneb4eC_PPjBk612cQPLqo,4914
+stoobly_agent/app/models/factories/resource/local_db/helpers/request_snapshot.py,sha256=Tpuu7sZ4A2Vc5e5OAyU9pSKzbOpLpZoI-4E2Ty7n4Ac,2672
+stoobly_agent/app/models/factories/resource/local_db/helpers/scenario_snapshot.py,sha256=f5psNwbl_mXF8rLNogqgfiHJudu2C9N9F35DZ_zgn6o,4973
 stoobly_agent/app/models/factories/resource/local_db/helpers/search.py,sha256=A7KVcmxj9c3CT2rh26YH6khiEPkB_4U1UHhiYelNaws,782
 stoobly_agent/app/models/factories/resource/local_db/helpers/snapshot.py,sha256=_8WPNE2NnvLlDbqnCfgnQveppDWfFZnqCBcX6THb1AU,742
-stoobly_agent/app/models/factories/resource/local_db/helpers/snapshot_service.py,sha256=fbqh5J5sMj0n_YFQFei2xhXLrSGU9vNmSX_uifA3U3M,1671
+stoobly_agent/app/models/factories/resource/local_db/helpers/snapshot_service.py,sha256=szL70Vubqg2JbxZ-rnlrxiqEgyPIcKAO9SsyyFxQ6ow,2106
 stoobly_agent/app/models/factories/resource/local_db/helpers/snapshot_types.py,sha256=1pX0jrg13632g_yv_sF1ABzPR7LY7r2HC9g1a5zR1qI,379
 stoobly_agent/app/models/factories/resource/local_db/helpers/tiebreak_scenario_request.py,sha256=BajElzsTE115hWBT6v67eyNFnrHGz-sU6WBNCzWp7Fg,1237
 stoobly_agent/app/models/factories/resource/local_db/local_db_adapter.py,sha256=Zeem6abkSHXRXTvE3XwzOkUY6fbNm9wocPP2qSX3zQ8,1439
@@ -287,7 +287,7 @@ stoobly_agent/app/models/factories/resource/stoobly/request_adapter.py,sha256=Zr
 stoobly_agent/app/models/factories/resource/stoobly/scenario_adapter.py,sha256=HnM4g5Qdv16QXj8u4JCiJm2Dbw9OhAxmn9e_R8oaHG4,1105
 stoobly_agent/app/models/header_model.py,sha256=m91upRZr8GfE5um0d5dguUESKigBMWhSyu_X3HFk28Y,1406
 stoobly_agent/app/models/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-stoobly_agent/app/models/helpers/apply.py,sha256=SQ5uBn2qGEaVIbgUVFWeTyqPg_wJVBjRte9-A6DTvzY,8293
+stoobly_agent/app/models/helpers/apply.py,sha256=ev8QmDvV7flFo82JUA6kBkofYCJ_lNXQGVIpknB94g8,8501
 stoobly_agent/app/models/helpers/create_request_params_service.py,sha256=o_VB2FsTGBX55UBBw1yQ8MtsJ4-0YXcxd4kNQ9l21nM,2070
 stoobly_agent/app/models/model.py,sha256=77ZTByQmH5sWBcSrCF3kG_C4muHggcFyH1DWsOhIgvg,1180
 stoobly_agent/app/models/query_param_model.py,sha256=EBj76phSJ9_45KgP0vIZGbkkG6-tSn_U1fNW_7qLy_4,1455
@@ -309,7 +309,7 @@ stoobly_agent/app/proxy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 stoobly_agent/app/proxy/constants/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/proxy/constants/custom_response_codes.py,sha256=1CaApt_6W7GrxvN8_Ozbf_SEodVEQaNZRR2sMYpI0U8,40
 stoobly_agent/app/proxy/context.py,sha256=m6iu6QSZsim8meZS8H8DsZeXyjfoC-MRMHhQD1MFKM0,532
-stoobly_agent/app/proxy/handle_mock_service.py,sha256=HszD77W3X1UIz0DvBtbRUfuWSgc8-GS6xvWq4VDL-4w,9216
+stoobly_agent/app/proxy/handle_mock_service.py,sha256=qz7rxAg6R8U9aiXbYjuncDkx5eliPYX3x-uVLelwSr0,9451
 stoobly_agent/app/proxy/handle_record_service.py,sha256=Fe8RAcMVvHhl3-XgjZ41242p4JXooYHQ-MhjcQhJn2E,4223
 stoobly_agent/app/proxy/handle_replay_service.py,sha256=kBUYd8kj8UPrsYHoBXmq06DPLjCnHo8K-QsKzhDIKcw,2526
 stoobly_agent/app/proxy/handle_test_service.py,sha256=WkMPbM4argVtl-TQB7VdQIvB8cOwURAahxFX5Vkqwws,8405
@@ -327,7 +327,7 @@ stoobly_agent/app/proxy/mitmproxy/response_facade.py,sha256=0wCSzUULUhDDV93QXUgz
 stoobly_agent/app/proxy/mock/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/proxy/mock/context.py,sha256=vDo5_3WBL73mVFnsmQWvcxvPg5nWtRJbigSrE3zGc-o,794
 stoobly_agent/app/proxy/mock/custom_not_found_response_builder.py,sha256=0KWB3KFxVrnJOKDaYxm5eoJEccw7IpJZRyUvBX61-8k,697
-stoobly_agent/app/proxy/mock/eval_fixtures_service.py,sha256=hc4VLnN50HBaWvFnrhQUJqdH-r3jBu9DHrpt8gbvkHY,3847
+stoobly_agent/app/proxy/mock/eval_fixtures_service.py,sha256=sVw8l916ouEBj2ViDtHFjgmEA4tLmZGvBfw8wD1Ab-c,4132
 stoobly_agent/app/proxy/mock/eval_request_service.py,sha256=A1tcE3wmrC1HwLpz0aRuRw-Nucn0dyHD_yHw5BeQEJU,8146
 stoobly_agent/app/proxy/mock/hashed_request_decorator.py,sha256=h1ma90fdaYI9LBWpMWMqWBz-RjNwI628O4VuS_uUBX4,5061
 stoobly_agent/app/proxy/mock/ignored_components_response_builder.py,sha256=E32_E1eSdmPn2SeM_e1jWnqu4xh5w_SnmOs32Shx99E,501
@@ -419,7 +419,7 @@ stoobly_agent/cli.py,sha256=sw8Ke5mCvzQ50X-zsb2Ld_zW4T6S58P0fN5GyKNOrcQ,10255
 stoobly_agent/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/config/constants/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/config/constants/alias_resolve_strategy.py,sha256=_R1tVqFnyGxCraVS5-dhSskaDj_X8-NthsY7i_bEt9M,119
-stoobly_agent/config/constants/custom_headers.py,sha256=9PhSGOsvoyi-w3sxfYJGl9mdTqtOGaog7fMuHrdu-20,1353
+stoobly_agent/config/constants/custom_headers.py,sha256=8YiKDjrpe0qH8tr4qM_CgonBy6bf_HHTqQ7B_hYv2L0,1398
 stoobly_agent/config/constants/env_vars.py,sha256=HAR_ZIdXXbpWQgCDaRR5RtpVyGXCsMLr_Fh8n6S12K0,1344
 stoobly_agent/config/constants/headers.py,sha256=Hfv7R8_NPXAGaMiZPqywGZDnr0qcVUyfenPb4g465rE,169
 stoobly_agent/config/constants/intercept_policy.py,sha256=5hIgOft8PQmCRdOHb5OEvEj10tU66DIQF3GYltlWyM8,25
@@ -488,7 +488,7 @@ stoobly_agent/lib/api/keys/request_key.py,sha256=68hN0KLdf0FwxSCSjeJZ1uUs526PCbN
 stoobly_agent/lib/api/keys/resource_key.py,sha256=9qrkp3t8iJsScZvKVcBDvVbcfwmP0yEBWy3b1tHi8CM,689
 stoobly_agent/lib/api/keys/scenario_key.py,sha256=VAc6gayvJS7shWgDL3SAqVET3fmgBefcygXTsKot07U,629
 stoobly_agent/lib/api/keys/test_key.py,sha256=-MCWp1oYLkJ3S_Pqs62j8KkkssXpT9quKb4YqMSq1Ks,438
-stoobly_agent/lib/api/keys/uuid_key.py,sha256=7_aL5wVTKF68bESHvqeQ2RUeC-Fw9-zpSrl8EWuFTJw,603
+stoobly_agent/lib/api/keys/uuid_key.py,sha256=30ZJIEAQHsR1KCsmeALxsKwCaUQtm7pKvFUhLmk0J4I,643
 stoobly_agent/lib/api/param_builder.py,sha256=50eq0zkqRz5MVezPZMIu69fYSB6z4CD5FG26_IU3eq0,996
 stoobly_agent/lib/api/projects_resource.py,sha256=7leBuQnlpgUwbYUX445lUC3jy-dzLMpTumeNPrqRc5c,1166
 stoobly_agent/lib/api/query_param_names_resource.py,sha256=k-3nlyfCOa_Vwj-TMI7v8_4g9qAs50baP073gkStAKE,1710
@@ -675,7 +675,7 @@ stoobly_agent/test/app/cli/request/request_list_test.py,sha256=tqMjkODU2i2eDvYyk
 stoobly_agent/test/app/cli/request/request_replay_test.py,sha256=w13NzkXhmBKvoogpQ8CdmBbCzoyqxEQvBZsEkGDCPx0,6237
 stoobly_agent/test/app/cli/request/request_reset_test.py,sha256=5My6Z452eideAOUun77tWUkuu3_yGhDVxCG1baUF8Zo,1290
 stoobly_agent/test/app/cli/request/request_response_test.py,sha256=Fu-A8tIn016DKme4WIaPzo3YeFY-CPtTOpaSFigUVVM,1263
-stoobly_agent/test/app/cli/request/request_snapshot_test.py,sha256=0013aoiMZin-2YEtHzEmQspAPA3SUd_6XiItbX0U7Ok,4425
+stoobly_agent/test/app/cli/request/request_snapshot_test.py,sha256=3kMmv0CuvnMXLgDQA-_u9S1DIiNOdL63L-IptVuOpf8,6308
 stoobly_agent/test/app/cli/request/request_test_test.py,sha256=-cJNXKjgryVVfVt-7IN5fIhBwe3NjFoPmeavDH8lAjU,5527
 stoobly_agent/test/app/cli/scaffold/cli_invoker.py,sha256=_nGDLUsYxqkeqs5DdhvAeXy3IuotpgqKHXKVzu6GDF4,3700
 stoobly_agent/test/app/cli/scaffold/cli_test.py,sha256=sMNvO845MIu5DVGa1HmwXQDmKDcwrfNTdEb3fK5886w,4557
@@ -688,10 +688,10 @@ stoobly_agent/test/app/cli/scenario/scenario_reset_test.py,sha256=QOyytOoFu1FALn
 stoobly_agent/test/app/cli/scenario/scenario_snapshot_test.py,sha256=IAe1l69Smd8a9E6I0CVs8lgqnC4mI4M1EFfUjC4ZHs8,3396
 stoobly_agent/test/app/cli/scenario/scenario_test_integration_test.py,sha256=BdXGe1xfb79tCCTKtp4sqI6CkZL_KamvQKLK8Wwb4u0,5543
 stoobly_agent/test/app/cli/snapshot/lifecycle_hooks_migrate.py,sha256=x3x5vHfZ1xmoOpZ0yRSB3kbWbPjfbLk2PJFSa1xOLoU,316
-stoobly_agent/test/app/cli/snapshot/snapshot_apply_test.py,sha256=p0Nyv66agEPOKY23lMNBZQNAXNL1zoYJz2N5ev4rvO0,21729
+stoobly_agent/test/app/cli/snapshot/snapshot_apply_test.py,sha256=mpkTZx8eaFFZU_RKHPcphaNl6zKCIOTJ2i4kY9BZRgQ,32395
 stoobly_agent/test/app/cli/snapshot/snapshot_copy_test.py,sha256=Yg78-FhSiG_r6Jpm-sN8sn0LjVXTwTOXt6hg8ni2GIY,1953
 stoobly_agent/test/app/cli/snapshot/snapshot_migrate_test.py,sha256=voEvblK6CMGCrSJDTHVmkUkLXj0auNb78jxlGiiBBQQ,7370
-stoobly_agent/test/app/cli/snapshot/snapshot_prune_test.py,sha256=Hi8-rpQ9ryy1Jdl_KB9ERXgbLHLKmuFQZaxn5EVFj9I,3752
+stoobly_agent/test/app/cli/snapshot/snapshot_prune_test.py,sha256=bn4yUU7Eb4-6GnwnRaPZPi5Cn7XEaIsrJ_mB7jydgWw,6693
 stoobly_agent/test/app/cli/snapshot/snapshot_update_test.py,sha256=fILsX2M5j4wuLRP6LJTHe4CPB8gvaEbsSoYmFCHmKVk,4514
 stoobly_agent/test/app/models/adapters/orm/joined_request_string_adapter_test.py,sha256=a2IHTk3l7aiLyYF7vtqissrk0MFTF2wlUBiaKWyJKfU,2667
 stoobly_agent/test/app/models/adapters/orm/request/orm_mitmproxy_request_adapter_test.py,sha256=PbJsAaxPUEbF9vM7DX4z858biWf4qlGnvE8KBuy8SgY,2763
@@ -707,7 +707,7 @@ stoobly_agent/test/app/models/factories/resource/local_db/helpers/log_test.py,sh
 stoobly_agent/test/app/models/factories/resource/local_db/helpers/tiebreak_scenario_request_test.py,sha256=a1SFLyEyRRLuADvAw6ckQQKORFXvyK1lyrbkaLWx8oU,3399
 stoobly_agent/test/app/models/factories/resource/local_db/request_adapter_test.py,sha256=Pzq1cBPnP9oSWG-p0c-VoymoHxgp483QmNwmV1b78RA,8453
 stoobly_agent/test/app/models/factories/resource/local_db/response_adapter_test.py,sha256=9P95EKH5rZGOrmRkRIDlQZqtiLJHk9735og18Ffwpfw,2204
-stoobly_agent/test/app/models/schemas/.stoobly/db/VERSION,sha256=vBPve_ulWPaMP-stw3TjfbPykk0t0aSluYQaVmn0ZJA,5
+stoobly_agent/test/app/models/schemas/.stoobly/db/VERSION,sha256=dxfL-Qxjo7CWAIdjoCBmI5kW-pkW-YJU0ao7JHCDD80,5
 stoobly_agent/test/app/models/schemas/.stoobly/db/stoobly_agent.sqlite3,sha256=ch8gNx6zIelLKQx65gwFx_LRNqUD3EC5xcHZ0ukIQiU,188416
 stoobly_agent/test/app/models/schemas/.stoobly/settings.yml,sha256=vLwMjweKOdod6tSLtIlyBefPQuNXq9wio4kBaODKtAU,726
 stoobly_agent/test/app/models/schemas/.stoobly/tmp/options.json,sha256=OTRzarwus48CTrItedXCrgQttJHSEZonEYc7R_knvYg,2212
@@ -748,8 +748,8 @@ stoobly_agent/test/mock_data/scaffold/docker-compose-local-service.yml,sha256=1W
 stoobly_agent/test/mock_data/scaffold/index.html,sha256=qJwuYajKZ4ihWZrJQ3BNObV5kf1VGnnm_vqlPJzdqLE,258
 stoobly_agent/test/mock_data/uspto.yaml,sha256=6U5se7C3o-86J4m9xpOk9Npias399f5CbfWzR87WKwE,7835
 stoobly_agent/test/test_helper.py,sha256=m_oAI7tmRYCNZdKfNqISWhMv3e44tjeYViQ3nTUfnos,1007
-stoobly_agent-1.9.0.dist-info/LICENSE,sha256=o93sj12cdoEOsTCjPaPFsw3Xq0SXs3pPcY-9reE2sEw,548
-stoobly_agent-1.9.0.dist-info/METADATA,sha256=XWWvk4MTuiKUjQ9RvRoI6r5yPRdV8Mgyzu1r1kQc9oc,3087
-stoobly_agent-1.9.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-stoobly_agent-1.9.0.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
-stoobly_agent-1.9.0.dist-info/RECORD,,
+stoobly_agent-1.9.2.dist-info/LICENSE,sha256=o93sj12cdoEOsTCjPaPFsw3Xq0SXs3pPcY-9reE2sEw,548
+stoobly_agent-1.9.2.dist-info/METADATA,sha256=qMOKulRLao6AQJC0ctx4h0IyYP6Fd-ACe5NtoyuIY1U,3087
+stoobly_agent-1.9.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+stoobly_agent-1.9.2.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
+stoobly_agent-1.9.2.dist-info/RECORD,,