stoobly-agent 1.5.0__py3-none-any.whl → 1.5.1__py3-none-any.whl

stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.5.0'
+VERSION = '1.5.1'

stoobly_agent/app/cli/helpers/handle_config_update_service.py

@@ -58,9 +58,9 @@ def handle_intercept_active_update(new_settings: Settings, context: Context = No
           scenario_model.update(_scenario_key.id, **{ 'overwritable': False })[1]
     elif _mode == intercept_mode.MOCK:
       # When mock is stopped, clear request access counts
-      from stoobly_agent.app.models.factories.resource.local_db.helpers.tiebreak_scenario_request import reset
+      from stoobly_agent.app.models.factories.resource.local_db.helpers.tiebreak_scenario_request import reset_sessions
 
-      reset()
+      reset_sessions()
 
 def handle_scenario_update(new_settings: Settings, context = None):
   new_scenario_key = __scenario_key(new_settings.proxy)

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

@@ -20,7 +20,7 @@ def generate_session_id(query: dict):
 
   return hashlib.md5(b'.'.join(toks)).hexdigest()
 
-def reset():
+def reset_sessions():
   Cache.instance().clear(f".+\.{PREFIX}")
 
 def tiebreak_scenario_request(session_id: str, requests: List[Request]):

stoobly_agent/app/models/factories/resource/local_db/request_adapter.py

@@ -10,7 +10,7 @@ from stoobly_agent.app.models.types import RequestCreateParams, RequestDestroyPa
 from stoobly_agent.app.proxy.mock.custom_not_found_response_builder import CustomNotFoundResponseBuilder
 from stoobly_agent.app.proxy.mock.ignored_components_response_builder import IgnoreComponentsResponseBuilder
 from stoobly_agent.app.proxy.record.joined_request import JoinedRequest
-from stoobly_agent.config.constants import custom_headers
+from stoobly_agent.config.constants import custom_headers, query_params as request_query_params
 from stoobly_agent.lib.orm import ORM
 from stoobly_agent.lib.orm.request import Request
 from stoobly_agent.lib.orm.response import Response
@@ -73,7 +73,6 @@ class LocalDBRequestAdapter(LocalDBAdapter):
   def response(self, **query_params: RequestColumns) -> requests.Response:
     self.__adapt_scenario_id(query_params)
 
-    endpoint_promise = query_params.get('endpoint_promise')
     request = None
 
     if not query_params.get('request_id'):
@@ -85,16 +84,19 @@ class LocalDBRequestAdapter(LocalDBAdapter):
       requests = self.__request_orm.where_for(**request_columns).get()
 
       if 'scenario_id' in query_params:
-        # TODO: Would need an additional ID to distinguish different scenario sessions
-        session_id = generate_session_id(request_columns) 
-
         if len(requests) > 1:
-          request = tiebreak_scenario_request(session_id, requests)
+          session_id = query_params.get(request_query_params.SESSION_ID)
+          request_session_id_components = { **request_columns }
+
+          if session_id:
+            request_session_id_components[request_query_params.SESSION_ID] = session_id
+
+          # When multiple requests are matched for a scenario, return them in sequence
+          request_session_id = generate_session_id(request_session_id_components)
+          request = tiebreak_scenario_request(request_session_id, requests)
+          access_request(request_session_id, request.id)
         else:
           request = requests.last()
-
-        if request:
-          access_request(session_id, request.id)
       else:
         request = requests.last()
     else:
@@ -104,6 +106,7 @@ class LocalDBRequestAdapter(LocalDBAdapter):
         request = None
 
     if not request:
+      endpoint_promise = query_params.get(request_query_params.ENDPOINT_PROMISE)
       return self.__handle_request_not_found(endpoint_promise) 
 
     response_record = request.response
@@ -315,8 +318,8 @@ class LocalDBRequestAdapter(LocalDBAdapter):
     return candidates.get()
 
   def __filter_request_response_columns(self, request_columns: RequestCreateParams):
-    if request_columns.get('endpoint_promise'):
-      del request_columns['endpoint_promise']
+    if request_columns.get(request_query_params.ENDPOINT_PROMISE):
+      del request_columns[request_query_params.ENDPOINT_PROMISE]
 
     if request_columns.get('infer'):
       del request_columns['infer']
@@ -327,6 +330,9 @@ class LocalDBRequestAdapter(LocalDBAdapter):
     if request_columns.get('retry'):
       del request_columns['retry']
 
+    if request_columns.get(request_query_params.SESSION_ID):
+      del request_columns[request_query_params.SESSION_ID]
+
   def __request(self, request_id: str):
     if self.validate_uuid(request_id):
       return self.__request_orm.find_by(uuid=request_id)

stoobly_agent/app/models/types/request.py

@@ -29,5 +29,4 @@ class RequestShowParams(TypedDict):
   headers: bool
   project_id: str
   query_params: bool
-  response: bool
-
+  response: bool

stoobly_agent/app/proxy/handle_mock_service.py

@@ -3,7 +3,7 @@ import pdb
 import requests
 import time
 
-from mitmproxy.http import Request as MitmproxyRequest
+from mitmproxy.http import HTTPFlow as MitmproxyHTTPFlow, Request as MitmproxyRequest
 from typing import Callable, TypedDict
 
 from stoobly_agent.app.models.request_model import RequestModel
@@ -18,7 +18,7 @@ from .mock.eval_fixtures_service import eval_fixtures
 from .mock.eval_request_service import inject_eval_request
 from .utils.allowed_request_service import get_active_mode_policy
 from .utils.request_handler import reverse_proxy
-from .utils.response_handler import bad_request, pass_on
+from .utils.response_handler import bad_request, enable_cors, pass_on
 from .utils.rewrite import rewrite_request, rewrite_response
 
 LOG_ID = 'Mock'
@@ -44,60 +44,68 @@ def handle_request_mock_generic_without_rewrite(context: MockContext, **options:
 # @param settings [Dict]
 #
 def handle_request_mock_generic(context: MockContext, **options: MockOptions):
+    handle_error = options['error'] if 'error' in options and callable(options['error']) else None
+    handle_failure = options['failure'] if 'failure' in options and callable(options['failure']) else None
+    handle_success = options['success'] if 'success' in options and callable(options['success']) else None
     intercept_settings = context.intercept_settings
     request: MitmproxyRequest = context.flow.request
-    handle_success = options['success'] if 'success' in options and callable(options['success']) else None
-    handle_failure = options['failure'] if 'failure' in options and callable(options['failure']) else None
+    res = None
 
     policy = get_active_mode_policy(request, intercept_settings)
     if policy == mock_policy.NONE:
+        if handle_error:
+            res = handle_error(context)
+
+        return pass_on(context.flow, res)
+
+    if policy not in [mock_policy.ALL, mock_policy.FOUND]:
+        if handle_error:
+            res = handle_error(context)
+
+        return bad_request(
+            context.flow,
+            "Valid env MOCK_POLICY: %s, Got: %s" %
+            ([mock_policy.ALL, mock_policy.FOUND, mock_policy.NONE], policy)
+        )
+
+    if not options.get('no_rewrite'):
+        __rewrite_request(context)
+
+    __mock_hook(lifecycle_hooks.BEFORE_MOCK, context)
+
+    # If ignore rules are set, then ignore specified request parameters
+    ignore_rules = intercept_settings.ignore_rules
+    if len(ignore_rules) > 0:
+        request_facade = MitmproxyRequestFacade(request)
+        _ignore_rules = request_facade.select_parameter_rules(ignore_rules)
+        ignored_components = rewrite_rules_to_ignored_components(_ignore_rules)
+        options['ignored_components'] += ignored_components if 'ignored_components' in options else ignored_components 
+
+    request_model = RequestModel(intercept_settings.settings)
+    eval_request = inject_eval_request(request_model, intercept_settings)
+
+    if policy == mock_policy.ALL:
+        res = eval_request_with_retry(context, eval_request, **options) 
+
+        context.with_response(res)
+    elif policy == mock_policy.FOUND:
+        res = eval_request_with_retry(context, eval_request, **options) 
+
+        context.with_response(res)
+
+        if res.status_code in [custom_response_codes.NOT_FOUND, custom_response_codes.IGNORE_COMPONENTS]:
+            try:
+                res = __handle_found_policy(context)
+            except RuntimeError:
+                # Do nothing, return custom error response
+                pass
+        
+    if res.status_code == custom_response_codes.NOT_FOUND:
         if handle_failure:
-            res = handle_failure(context)
+            res = handle_failure(context) or res
     else:
-        if not options.get('no_rewrite'):
-            __rewrite_request(context)
-
-        __mock_hook(lifecycle_hooks.BEFORE_MOCK, context)
-
-        # If ignore rules are set, then ignore specified request parameters
-        ignore_rules = intercept_settings.ignore_rules
-        if len(ignore_rules) > 0:
-            request_facade = MitmproxyRequestFacade(request)
-            _ignore_rules = request_facade.select_parameter_rules(ignore_rules)
-            ignored_components = rewrite_rules_to_ignored_components(_ignore_rules)
-            options['ignored_components'] += ignored_components if 'ignored_components' in options else ignored_components 
- 
-        request_model = RequestModel(intercept_settings.settings)
-        eval_request = inject_eval_request(request_model, intercept_settings)
-
-        if policy == mock_policy.ALL:
-            res = eval_request_with_retry(context, eval_request, **options) 
-
-            context.with_response(res)
-
-            if handle_success:
-                res = handle_success(context) or res
-        elif policy == mock_policy.FOUND:
-            res = eval_request_with_retry(context, eval_request, **options) 
-
-            context.with_response(res)
-
-            if res.status_code in [custom_response_codes.NOT_FOUND, custom_response_codes.IGNORE_COMPONENTS]:
-                if handle_failure:
-                    try:
-                        res = handle_failure(context)
-                    except RuntimeError:
-                        # Do nothing, return custom error response
-                        pass
-            else:
-                if handle_success:
-                    res = handle_success(context) or res
-        else:
-            return bad_request(
-                context.flow,
-                "Valid env MOCK_POLICY: %s, Got: %s" %
-                ([mock_policy.ALL, mock_policy.FOUND, mock_policy.NONE], policy)
-            )
+        if handle_success:
+            res = handle_success(context) or res
 
     return pass_on(context.flow, res)
 
@@ -147,13 +155,19 @@ def handle_response_mock(context: MockContext):
         __rewrite_response(context)
         __mock_hook(lifecycle_hooks.AFTER_MOCK, context)
 
-def __handle_mock_success(context: MockContext) -> None:
-    if os.environ.get(env_vars.AGENT_SIMULATE_LATENCY):
-        response = context.response
-        start_time = context.start_time
-        __simulate_latency(response.headers.get(custom_headers.RESPONSE_LATENCY), start_time)
-
 def __handle_mock_failure(context: MockContext) -> None:
+    flow = context.flow
+    request = flow.request
+
+    if request.method.upper() != 'OPTIONS':
+        return False
+        
+    # Default OPTIONS request to allow CORS
+    enable_cors(flow)
+
+    return True
+
+def __handle_found_policy(context: MockContext) -> None:
     req = context.flow.request
     intercept_settings = context.intercept_settings
     upstream_url = intercept_settings.upstream_url
@@ -169,6 +183,12 @@ def __handle_mock_failure(context: MockContext) -> None:
 
     reverse_proxy(req, upstream_url, {})
 
+def __handle_mock_success(context: MockContext) -> None:
+    if os.environ.get(env_vars.AGENT_SIMULATE_LATENCY):
+        response = context.response
+        start_time = context.start_time
+        __simulate_latency(response.headers.get(custom_headers.RESPONSE_LATENCY), start_time)
+
 def __rewrite_request(context: MockContext):
     # Rewrite request with paramter rules for mock
 

stoobly_agent/app/proxy/handle_test_service.py

@@ -62,6 +62,7 @@ def handle_response_test(context: ReplayContext) -> None:
     # At this point, the request may already been rewritten during replay, do not rewrite again
     handle_request_mock_generic_without_rewrite(
         MockContext(flow, intercept_settings),
+        error=lambda mock_context: __handle_mock_error(TestContext(context, mock_context)),
         failure=lambda mock_context: __handle_mock_failure(TestContext(context, mock_context)),
         #infer=intercept_settings.test_strategy == test_strategy.FUZZY, # For fuzzy testing we can use an inferred response
         success=lambda mock_context: __handle_mock_success(TestContext(context, mock_context))
@@ -71,6 +72,22 @@ def __decorate_test_id(flow: MitmproxyHTTPFlow, test_response: TestShowResponse)
     if test_response.get('id'):
         flow.response.headers[custom_headers.TEST_ID] = str(test_response['id'])
 
+def __handle_mock_error(test_context: TestContext):
+    Logger.instance().warn(f"{LOG_ID}:TestStatus: Mock not enabled")
+
+    intercept_settings = test_context.intercept_settings
+
+    if intercept_settings.request_origin == request_origin.CLI:
+        return build_response(False, 'No test found')
+
+def __handle_mock_failure(test_context: TestContext) -> None:
+    Logger.instance().warn(f"{LOG_ID}:TestStatus: No test found")
+
+    intercept_settings = test_context.intercept_settings
+
+    if intercept_settings.request_origin == request_origin.CLI:
+        return build_response(False, 'No test found')
+
 def __handle_mock_success(test_context: TestContext) -> None:
     flow: MitmproxyHTTPFlow = test_context.flow
 
@@ -138,14 +155,6 @@ def __handle_mock_success(test_context: TestContext) -> None:
     
     return flow.response
 
-def __handle_mock_failure(test_context: TestContext) -> None:
-    Logger.instance().warn(f"{LOG_ID}:TestStatus: No test found")
-
-    intercept_settings = test_context.intercept_settings
-
-    if intercept_settings.request_origin == request_origin.CLI:
-        return build_response(False, 'No test found')
-
 def __override_response(flow: MitmproxyHTTPFlow, content: bytes):
     headers = { 'Content-Type': 'text/plain' }
     headers[custom_headers.CONTENT_TYPE] = custom_headers.CONTENT_TYPE_TEST_RESULTS

stoobly_agent/app/proxy/mock/custom_not_found_response_builder.py

@@ -12,4 +12,9 @@ class CustomNotFoundResponseBuilder():
   def build(self):
     self.__response.status_code = custom_response_codes.NOT_FOUND
     self.__response.raw = BytesIO('Request not found'.encode()) 
+    self.__response.headers = {
+      'Access-Control-Allow-Origin': '*',
+      'Access-Control-Allow-Methods': 'GET, OPTIONS, POST, PATCH, PUT, DELETE',
+      'Content-Type': 'text/plain',
+    }
     return self.__response

stoobly_agent/app/proxy/mock/eval_fixtures_service.py

@@ -40,8 +40,9 @@ def eval_fixtures(request: MitmproxyRequest, **options: Options) -> Union[Respon
 
     if not fixture_path:
       fixture_path = _fixture_path
-      if not os.path.isfile(fixture_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):

stoobly_agent/app/proxy/mock/eval_request_service.py

@@ -5,16 +5,17 @@ import re
 from mitmproxy.http import Request as MitmproxyRequest
 from requests import Response
 from typing import List, TypedDict, Union
-from stoobly_agent.config.constants import custom_headers
 
-from stoobly_agent.lib.api.param_builder import ParamBuilder
-from stoobly_agent.lib.api.interfaces.requests import RequestResponseShowQueryParams
-from stoobly_agent.lib.logger import Logger
 from stoobly_agent.app.models.request_model import RequestModel
 from stoobly_agent.app.proxy.intercept_settings import InterceptSettings
+from stoobly_agent.app.proxy.mock.custom_not_found_response_builder import CustomNotFoundResponseBuilder
 from stoobly_agent.app.settings import Settings
 from stoobly_agent.app.settings.constants import request_component
 from stoobly_agent.app.settings.match_rule import MatchRule
+from stoobly_agent.config.constants import custom_headers, query_params as request_query_params
+from stoobly_agent.lib.api.param_builder import ParamBuilder
+from stoobly_agent.lib.api.interfaces.requests import RequestResponseShowQueryParams
+from stoobly_agent.lib.logger import Logger
 
 from .hashed_request_decorator import HashedRequestDecorator
 from .search_endpoint import inject_search_endpoint
@@ -40,10 +41,6 @@ def inject_eval_request(
         request_model, intercept_settings, request, ignored_components or [], **options 
     )
 
-###
-#
-# @param settings [Settings.mode.mock | Settings.mode.record]
-#
 def eval_request(
     request_model: RequestModel,
     intercept_settings: InterceptSettings,
@@ -52,9 +49,14 @@ def eval_request(
     **options: EvalRequestOptions
 ) -> Response:
     query_params_builder = ParamBuilder({})
-    query_params_builder.with_resource_scoping(intercept_settings.project_key, intercept_settings.scenario_key)
 
-    # Tease out API returning ignored components on not found
+    try:
+        query_params_builder.with_resource_scoping(intercept_settings.project_key, intercept_settings.scenario_key)
+    except:
+        # If project_key or scenario_key are invalid, assume custom not found
+        return CustomNotFoundResponseBuilder().build()
+
+    # Tease out API returning ignored components on custom not found
     if request_model.is_local and not options.get('retry'):
         remote_project_key = intercept_settings.parsed_remote_project_key
 
@@ -63,7 +65,7 @@ def eval_request(
             remote_project_id = remote_project_key.id
             endpoint_promise = lambda: search_endpoint(remote_project_id, request.method, request.url, ignored_components=1) 
 
-            query_params_builder.with_param('endpoint_promise', endpoint_promise)
+            query_params_builder.with_param(request_query_params.ENDPOINT_PROMISE, endpoint_promise)
 
     ignored_components = __build_ignored_components(ignored_components_list or [])
     query_params_builder.with_params(__build_request_params(request, ignored_components))
@@ -142,6 +144,9 @@ def __build_optional_params(request: MitmproxyRequest, options: EvalRequestOptio
     if custom_headers.MOCK_REQUEST_ID in headers:
         optional_params['request_id'] = headers[custom_headers.MOCK_REQUEST_ID]
 
+    if custom_headers.SESSION_ID in headers:
+        optional_params[request_query_params.SESSION_ID] = headers[custom_headers.SESSION_ID]
+
     return optional_params
 
 def __filter_by_match_rules(request: MitmproxyRequest, match_rules: List[MatchRule], query_params: RequestResponseShowQueryParams):

stoobly_agent/app/proxy/utils/response_handler.py

@@ -36,6 +36,17 @@ def bad_request(flow: MitmproxyHTTPFlow, message: str):
         {'Content-Type': 'text/plain'}  # (optional) headers
     )
 
+def enable_cors(flow: MitmproxyHTTPFlow):
+    flow.response = MitmproxyResponse.make(
+        200,
+        '',
+        {
+            'Access-Control-Allow-Origin': '*',
+            'Access-Control-Allow-Methods': 'GET, OPTIONS, POST, PATCH, PUT, DELETE',
+            'Access-Control-Allow-Headers': '*'
+        }
+    )
+
 # Without deleting this header, causes parsing issues when reading response
 def disable_transfer_encoding(response: MitmproxyResponse) -> None:
     header_name = 'Transfer-Encoding'

stoobly_agent/config/constants/custom_headers.py

@@ -19,6 +19,7 @@ RESPONSE_ID = 'X-Stoobly-Response-Id'
 RESPONSE_LATENCY = 'X-Stoobly-Request-Response-Latency'
 RESPONSE_PROXY_MODE = 'X-Stoobly-Response-Proxy-Mode'
 SCENARIO_KEY = 'X-Stoobly-Scenario-Key'
+SESSION_ID = 'X-Stoobly-Session-Id'
 SERVICE_URL = 'X-Stoobly-Service-Url'
 TEST_FILTER = 'X-Stoobly-Test-Filter'
 TEST_ID = 'X-Stoobly-Test-Id'

stoobly_agent/config/constants/query_params.py

@@ -0,0 +1,2 @@
+ENDPOINT_PROMISE = 'endpoint_promise'
+SESSION_ID = 'session_id'

stoobly_agent/test/app/models/factories/resource/local_db/helpers/tiebreak_scenario_request_test.py

@@ -5,7 +5,7 @@ import time
 from typing import List
 
 from stoobly_agent.app.models.factories.resource.local_db.helpers.tiebreak_scenario_request import (
-  access_request, generate_session_id, reset as reset_tiebreak, tiebreak_scenario_request
+  access_request, generate_session_id, reset_sessions, tiebreak_scenario_request
 )
 from stoobly_agent.lib.cache import Cache
 from stoobly_agent.lib.orm.request import Request
@@ -92,7 +92,7 @@ class TestTiebreakScenarioRequest():
       request = tiebreak_scenario_request(session_id, requests)
       assert request.id == 2
 
-  class TestWhenReset():
+  class TestWhenResetSessions():
     @pytest.fixture(scope='class')
     def created_request_one(self):
       return RequestMock(1)
@@ -105,7 +105,7 @@ class TestTiebreakScenarioRequest():
     def test_it_resets(self, cache: Cache, created_request_one: Request):
       cache.write('persists', 1)
       access_request('1', created_request_one.id)
-      reset_tiebreak()
+      reset_sessions()
 
       assert cache.read('persists') != None
-      assert len(cache.read_all()) == 1
+      assert len(cache.read_all()) == 1

stoobly_agent/test/cli/mock_scenario_lifecycle_hooks.py

@@ -0,0 +1,5 @@
+from stoobly_agent.app.proxy.context import InterceptContext
+from stoobly_agent.config.constants.custom_headers import MOCK_REQUEST_ID
+
+def handle_before_response(context: InterceptContext):
+  print(context.flow.response.headers[MOCK_REQUEST_ID], end='')

stoobly_agent/test/cli/mock_scenario_test.py

@@ -0,0 +1,62 @@
+import pdb
+import pytest
+
+from click.testing import CliRunner
+from pathlib import Path
+
+from stoobly_agent.test.test_helper import DETERMINISTIC_GET_REQUEST_URL, NON_DETERMINISTIC_GET_REQUEST_URL
+
+from stoobly_agent.config.constants.custom_headers import SESSION_ID
+from stoobly_agent.cli import mock, record, scenario
+from stoobly_agent.lib.api.keys.scenario_key import ScenarioKey
+from stoobly_agent.lib.orm.request import Request
+
+@pytest.fixture(scope='module')
+def runner():
+  return CliRunner()
+
+class TestMocking():
+  @pytest.fixture(scope='class')
+  def lifecycle_hooks_path(self):
+    return str(Path(__file__).parent / 'mock_scenario_lifecycle_hooks.py')
+
+  class TestScenario():
+    @pytest.fixture(scope='class')
+    def scenario_key(self, runner: CliRunner):
+      res = runner.invoke(scenario, ['create', '--select', 'key', '--without-headers', 'test-scenario'])
+      assert res.exit_code == 0
+      return ScenarioKey(res.stdout.strip()).raw
+
+    @pytest.fixture(autouse=True, scope='class')
+    def recorded_request1(self, runner: CliRunner, scenario_key: str):
+      record_result = runner.invoke(record, ['--scenario-key', scenario_key, DETERMINISTIC_GET_REQUEST_URL])
+      assert record_result.exit_code == 0
+      return Request.last()
+
+    @pytest.fixture(autouse=True, scope='class')
+    def recorded_request2(self, runner: CliRunner, scenario_key: str):
+      record_result = runner.invoke(record, ['--scenario-key', scenario_key, DETERMINISTIC_GET_REQUEST_URL])
+      assert record_result.exit_code == 0
+      return Request.last()
+
+    def test_it_does_not_mocks(self, runner: CliRunner, scenario_key: str):
+      mock_result = runner.invoke(mock, ['--scenario-key', scenario_key, NON_DETERMINISTIC_GET_REQUEST_URL])
+      assert mock_result.exit_code == 1
+
+    def test_it_mocks(self, runner: CliRunner, scenario_key: str):
+      mock_result = runner.invoke(mock, ['--scenario-key', scenario_key, DETERMINISTIC_GET_REQUEST_URL])
+      assert mock_result.exit_code == 0
+
+    def test_it_mocks_in_order(
+      self, runner: CliRunner, lifecycle_hooks_path: str, recorded_request1: Request, recorded_request2: Request, scenario_key: str
+    ):
+      session_id = 'test'
+      args = [
+        '--lifecycle-hooks-path', lifecycle_hooks_path, '--scenario-key', scenario_key, '--output', '/dev/null',
+        '-H', f"{SESSION_ID}: {session_id}", DETERMINISTIC_GET_REQUEST_URL
+      ]
+      mock_result = runner.invoke(mock, args)
+      assert int(mock_result.stdout) == recorded_request1.id
+
+      mock_result = runner.invoke(mock, args)
+      assert int(mock_result.stdout) == recorded_request2.id

stoobly_agent/test/cli/mock_test.py

@@ -8,8 +8,7 @@ from stoobly_agent.test.test_helper import DETERMINISTIC_GET_REQUEST_URL, reset
 
 from stoobly_agent.config.constants import mode
 from stoobly_agent.app.settings.constants import request_component
-from stoobly_agent.cli import config, mock, record, scenario
-from stoobly_agent.lib.api.keys.scenario_key import ScenarioKey
+from stoobly_agent.cli import config, mock, record
 from stoobly_agent.lib.orm.request import Request
 
 @pytest.fixture(scope='module')
@@ -143,10 +142,3 @@ class TestMocking():
         mock_result = runner.invoke(mock, [self.url])
         assert mock_result.exit_code == 0
 
-  class TestScenario():
-
-    @pytest.fixture
-    def scenario_key(self, runner: CliRunner):
-      res = runner.invoke(scenario, ['create', '--select', 'key', '--without-headers', 'test-scenario'])
-      assert res.exit_code == 0
-      return ScenarioKey(res.stdout.strip())

{stoobly_agent-1.5.0.dist-info → stoobly_agent-1.5.1.dist-info}/METADATA

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

{stoobly_agent-1.5.0.dist-info → stoobly_agent-1.5.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-stoobly_agent/__init__.py,sha256=B9xjv1tEfJArVbunhXpYOoMq78yC8Szpxo5TjlWi0y4,44
+stoobly_agent/__init__.py,sha256=7y5_V-Rf7rYs6CEsRG2wWBw1jEbmStksKk8cCeaQQVk,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=ZgCfmdr5um-OFAiuRHdBxFqPIeph9WqYkVg-oVQWw-E,5543
@@ -36,7 +36,7 @@ stoobly_agent/app/cli/helpers/endpoints_apply_service.py,sha256=9GYuUlo-nNn6z7jm
 stoobly_agent/app/cli/helpers/endpoints_import_context.py,sha256=w-iRZpNh3tX8GfafEe_6QMWCBiGNNSqvJKsfAXpnrLM,2209
 stoobly_agent/app/cli/helpers/endpoints_import_service.py,sha256=FSMy3TboX6hYtYt91jk97gD8a3PpSv_RR2pl3L9-0Zs,8322
 stoobly_agent/app/cli/helpers/feature_flags.py,sha256=neIdXHhDMv8Zq1zrfoZ28NDXkamUgDiwnu-7AS3LshE,558
-stoobly_agent/app/cli/helpers/handle_config_update_service.py,sha256=jGBt005zkHd7TbJhICz30wPpRGqjSFwxxygjLE2CP_g,5898
+stoobly_agent/app/cli/helpers/handle_config_update_service.py,sha256=0wGSvGP0t3tCFXMU872UJbyuenzwXwFw-ZAt_4oX0f8,5916
 stoobly_agent/app/cli/helpers/handle_mock_service.py,sha256=9rHhWVXniNWsAaR1jw5GgabiK5_YApq700P3F9w3gD8,701
 stoobly_agent/app/cli/helpers/handle_replay_service.py,sha256=MfCXVWoGXsuX-nt87kxLv9rScwQ_1Ec6B0m5exMAzx8,3955
 stoobly_agent/app/cli/helpers/handle_test_service.py,sha256=nlso1XXjPKoPayN13FXsE_cAhhxa8VuNCW3Md7ufqiY,7212
@@ -258,12 +258,12 @@ stoobly_agent/app/models/factories/resource/local_db/helpers/search.py,sha256=A7
 stoobly_agent/app/models/factories/resource/local_db/helpers/snapshot.py,sha256=8GNlt33L4zV8yIkkhmb2iLSMYegSiP91HrPyJkE9daE,733
 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_types.py,sha256=1pX0jrg13632g_yv_sF1ABzPR7LY7r2HC9g1a5zR1qI,379
-stoobly_agent/app/models/factories/resource/local_db/helpers/tiebreak_scenario_request.py,sha256=8MKvVPfkjcJPrgle_eAE_FvcdmmGIzwrDwxi4gZmzG4,1227
+stoobly_agent/app/models/factories/resource/local_db/helpers/tiebreak_scenario_request.py,sha256=4enljvFTDImj8ZqZBfUVo1rhIUV2aFOCSqX5CQzLUlU,1236
 stoobly_agent/app/models/factories/resource/local_db/local_db_adapter.py,sha256=uQ5wQ_n0iM8sjY5mkdqED7w4VUKFKjHQGjez1B6ruyg,384
 stoobly_agent/app/models/factories/resource/local_db/orm_request_builder.py,sha256=4UjFY26ln2Drlg71R4AKY5vUZYbQ28HYQolJv3SBDqE,1581
 stoobly_agent/app/models/factories/resource/local_db/query_param_adapter.py,sha256=GutK2RLOPvlCWDsj1PBwJFRNT7EwweQzjObvrA2cIaM,4067
 stoobly_agent/app/models/factories/resource/local_db/replayed_response_adapter.py,sha256=vUN9ARmRVrxKHpyzWB5w-XX-quOBMFpWOKkyBxTn6mM,3634
-stoobly_agent/app/models/factories/resource/local_db/request_adapter.py,sha256=v3BvyHZfIZaWYTqoCusM12VdsbMlcU9VSjEx9JNlXk0,12505
+stoobly_agent/app/models/factories/resource/local_db/request_adapter.py,sha256=wtNj8H3pylwToc4Q0TDfl6v6rgN6ae48GcF8WZBfd40,12992
 stoobly_agent/app/models/factories/resource/local_db/response_adapter.py,sha256=g2plyjBm5NUu1W6SVZavM2PgUYW_DuynFt_MREFhPVI,3228
 stoobly_agent/app/models/factories/resource/local_db/response_header_adapter.py,sha256=lSehvihNQgX6moFY0XLDyLkTeEweCRAwQ16QSdPsvEg,3070
 stoobly_agent/app/models/factories/resource/local_db/scenario_adapter.py,sha256=K6ITkYTUeEPNGL4_skL80K5G1kgqLtlM3IwpwXsleMw,3883
@@ -292,7 +292,7 @@ stoobly_agent/app/models/schemas/request.py,sha256=WVo-v0Di-WX5sYk5fQ5piS3uo4ROz
 stoobly_agent/app/models/types/__init__.py,sha256=TdT8MVvcJ1i4VJl-JN60FJBEQeYsKClyjuOFzIsGdgI,161
 stoobly_agent/app/models/types/endpoint.py,sha256=7e60mWQs-pNFO7KmhG9wreiF9pBYB-tct-kqQi5MIVo,588
 stoobly_agent/app/models/types/replayed_response.py,sha256=VbeX2yAPWACQBc7ePQ9PfU5Ot_Vq5aKFIGrPTvMQ8Xw,403
-stoobly_agent/app/models/types/request.py,sha256=zA5VJ316yoMTfSoHu9ab1wbOMzS1h6G2DAhjHb80mWI,705
+stoobly_agent/app/models/types/request.py,sha256=TLfgNSo7atZvCjdI_wdMRrH1qdxeO98JRNPaPjMEZHo,703
 stoobly_agent/app/models/types/request_components.py,sha256=6qEiadFnJWaTYfnxLblIOyRytLXx5FQ9yUzkWnHr0IM,471
 stoobly_agent/app/models/types/response.py,sha256=OQNvHnyLvRSJF3E4A1GaROlZekKvflzsuTZH6hDx1tY,107
 stoobly_agent/app/models/types/scenario.py,sha256=865pzF2vlhpslWf_77KTcb3XmF0lO8_LJy7qzJJNWmQ,184
@@ -300,10 +300,10 @@ 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=TzJXeupNT74uEUfqMYPTj8l6UJgp6-Hj7qewkPqMzoQ,8422
+stoobly_agent/app/proxy/handle_mock_service.py,sha256=2EHaQOcXhbeeKly-robt4tqBY3l5lkuJ4_ZkwW9r2Nw,8859
 stoobly_agent/app/proxy/handle_record_service.py,sha256=pd_3W7YxS52KYcHqzHGDIDMXQF0oLnfmnOFFQYFNWNI,3795
 stoobly_agent/app/proxy/handle_replay_service.py,sha256=kBUYd8kj8UPrsYHoBXmq06DPLjCnHo8K-QsKzhDIKcw,2526
-stoobly_agent/app/proxy/handle_test_service.py,sha256=Ot4YlLavDXBQp-jKjfTHZf8uoE9rCesXcG6PwwH4w6g,8014
+stoobly_agent/app/proxy/handle_test_service.py,sha256=WkMPbM4argVtl-TQB7VdQIvB8cOwURAahxFX5Vkqwws,8405
 stoobly_agent/app/proxy/hot_reload.py,sha256=bcxdN0WM5l7_zY2XYLV2wF7xCpGdZILi4dVsjqAVgig,983
 stoobly_agent/app/proxy/intercept_handler.py,sha256=XlFwO501lsAgWvIwjnNmbsdXfBd2WuNG2O8L7eeiAjc,4180
 stoobly_agent/app/proxy/intercept_settings.py,sha256=KoDoUjrwvX491NHgW2M2CvaEUHOIFejiPUX4icAPZIw,11890
@@ -317,9 +317,9 @@ stoobly_agent/app/proxy/mitmproxy/response_body_facade.py,sha256=vIu6cuCSiZDocvn
 stoobly_agent/app/proxy/mitmproxy/response_facade.py,sha256=0wCSzUULUhDDV93QXUgzMNxiiSZwcu-kUB2C5z1Ck0Y,4311
 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=Bwy7qsPzcIUw5FTaUGeaOnsTneuCCbGkTJU-wsmN3NE,415
-stoobly_agent/app/proxy/mock/eval_fixtures_service.py,sha256=cGoGRvn-Y8b6b2fGDODyEjcb2NK-zwk9EfXSVmSCDbA,3850
-stoobly_agent/app/proxy/mock/eval_request_service.py,sha256=uH0cwrn9q5Z3a-rtCKjypDwKLkoGMgnMDEVL3laO0qI,6967
+stoobly_agent/app/proxy/mock/custom_not_found_response_builder.py,sha256=xHjA2CNhW5A4NyPkDzws6DY5YQeJqF6b3Y3k0iJKNss,611
+stoobly_agent/app/proxy/mock/eval_fixtures_service.py,sha256=hc4VLnN50HBaWvFnrhQUJqdH-r3jBu9DHrpt8gbvkHY,3847
+stoobly_agent/app/proxy/mock/eval_request_service.py,sha256=EKHZT_sKZhGcGFCDa3XOSzYkSJIfJJUg4164BTxKUeY,7365
 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
 stoobly_agent/app/proxy/mock/request_hasher.py,sha256=WeOeksmW_b5Ql0Xb0fL2WMH3MVHrm-9GYWYoKYS1teg,3755
@@ -375,7 +375,7 @@ stoobly_agent/app/proxy/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 stoobly_agent/app/proxy/utils/allowed_request_service.py,sha256=dk4xnHzCgxyvD2Ih6JDbp4_9Y7s2ar-3lpM93CW--XA,3632
 stoobly_agent/app/proxy/utils/publish_change_service.py,sha256=vSpFt0Ox9fceJlalHji61N6StdkEZwAvVXhHXO6fwEI,1259
 stoobly_agent/app/proxy/utils/request_handler.py,sha256=VscAXf2_F1C1yrt2gNImPkatosuGj356pARTd_WnTUE,846
-stoobly_agent/app/proxy/utils/response_handler.py,sha256=FP_4p0MQZGJdJdhdUrLH2qelq8yNKW4AQSr74ccxCj4,1429
+stoobly_agent/app/proxy/utils/response_handler.py,sha256=t5spjycvPDOZi0YU39gpavnYLhb7C29HnRe9RmzGCtU,1749
 stoobly_agent/app/proxy/utils/rewrite.py,sha256=-Lf5H8aF63G37beoaG3ehr5LIAQfsKTWQvMCeNL34I4,2459
 stoobly_agent/app/proxy/utils/rewrite_rules_to_ignored_components_service.py,sha256=TEWakpZ7C468PW8lVJsRwqkRElpaCR5EOgNNzyGAleY,1043
 stoobly_agent/app/settings/__init__.py,sha256=Fm9Y4e0g_wQyPULavyv9IJopINTml7RYck6mJAPtEHY,6071
@@ -410,7 +410,7 @@ stoobly_agent/cli.py,sha256=nZDwOnhcNcZlr2hlznWVDnidPMe3LkVv88HOjamAqmA,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=IJZzZN77ZpbTr62EkXatm1r-I1_i4HEErO_LlQZLRU0,1279
+stoobly_agent/config/constants/custom_headers.py,sha256=cZZ3nae2fpnk_uUXFNYjrPp7Cdtgv0ytRw-WdHzYMZg,1315
 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
@@ -418,6 +418,7 @@ stoobly_agent/config/constants/lifecycle_hooks.py,sha256=aobclZmcND_mUnFKkUgpxgw
 stoobly_agent/config/constants/mitmproxy.py,sha256=AhaxRGMb7OC4DBqNvyBP0OVQSByCeA-itefzmMoIS14,116
 stoobly_agent/config/constants/mock_policy.py,sha256=oS3eKL5Ezpnm_4zvztcLvvtKppxm7eKvOOBHYKyKpeU,133
 stoobly_agent/config/constants/mode.py,sha256=J35vV1LPQRhD2ob6DaJ7mLGJrMhv-CVnC6IHWd7b_GM,160
+stoobly_agent/config/constants/query_params.py,sha256=b-QQGKTqf-HePt0X4ltFksf5ETiIFPgBvh-kFrF7kUk,63
 stoobly_agent/config/constants/record_policy.py,sha256=n5h5Mw0-RcwEGH18koE3-Krg-ek2rRMDOHdqMxJd4Gg,181
 stoobly_agent/config/constants/replay_policy.py,sha256=FgSUaVb52wknIbTu27cWxvB35ZhxP0g1KNc6Twhtjmc,117
 stoobly_agent/config/constants/request_origin.py,sha256=zLdLbGb8TQOK5TvsPdD17SAW_OupbM3Y9mKnv7C3BRU,39
@@ -692,7 +693,7 @@ stoobly_agent/test/app/models/adapters/python/request/stoobly_adapter_test.py,sh
 stoobly_agent/test/app/models/adapters/python/response/mitmproxy_response_adapter_test.py,sha256=dEUhIH5kekZsJDwOmWz0eHA2dWZ7QPYmgq_Na9ce3HA,1176
 stoobly_agent/test/app/models/adapters/python/response/raw_response_adapter_test.py,sha256=oJ0l2FZEH3-JANcpX4N83GKxqgVkaGRKIS7rsY8O7mM,1199
 stoobly_agent/test/app/models/factories/resource/local_db/helpers/log_test.py,sha256=FbGtjO_K_L2lZw1i6b1LlZoUyhisYqVST7f9T0PmpFk,3501
-stoobly_agent/test/app/models/factories/resource/local_db/helpers/tiebreak_scenario_request_test.py,sha256=5IFGVGn3ogvRT0fzZgXzhrYlSfSlr8IR1p_XExaegMQ,3399
+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=H03AltWPfSHjh1ZxrubymxIKuEIY-kfbLLU7yetbTaw,5
@@ -714,7 +715,9 @@ stoobly_agent/test/app/test/matchers/contract_test.py,sha256=fMV8BX4JfbIOD5i7ZV7
 stoobly_agent/test/app/test/matchers/diff_test.py,sha256=fNbzAz3MptieVIrMInxGlNa4FsBh-VQ2m7-OsrNm9sw,10266
 stoobly_agent/test/app/test/matchers/fuzzy_test.py,sha256=wkySpK00dFZLlXmW7xE7Q6UPJYLiq8aCnIHt4Nm4WEk,3231
 stoobly_agent/test/cli/lifecycle_hooks_test.py,sha256=zjLI8zteszWXgQuyEYM47MtI8KgLbEFVYJTaJdyBqOc,2491
-stoobly_agent/test/cli/mock_test.py,sha256=zhIPJFb4AxRR6ltHd_Su_BKMwQtZLy0Jx6VnkEELfO8,5983
+stoobly_agent/test/cli/mock_scenario_lifecycle_hooks.py,sha256=e57A3FWHt1ZgaWKhbl4Hs2Y4ux8tKMu9nxbqPCj6w54,254
+stoobly_agent/test/cli/mock_scenario_test.py,sha256=tHT-p8Vm8APP2KOlyfZ-5z_AxZO9TS4sDgui3X2qkaE,2620
+stoobly_agent/test/cli/mock_test.py,sha256=zYAFhHkR-1oafZzzL_4aPOWzM2nXWRHGt36yTAuG8Rw,5636
 stoobly_agent/test/cli/record_test.py,sha256=CG7prrooTgkW8RYaiDRYD3LuuDIR8dz8jaP9RNRrF4o,15814
 stoobly_agent/test/config/data_dir_test.py,sha256=sszUW6MKGFCS9JGhYL-E91hBzfI2jMaHRJMifNjZ00M,2659
 stoobly_agent/test/mock_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -734,8 +737,8 @@ stoobly_agent/test/mock_data/scaffold/docker-compose-local-service.yml,sha256=x7
 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.5.0.dist-info/LICENSE,sha256=o93sj12cdoEOsTCjPaPFsw3Xq0SXs3pPcY-9reE2sEw,548
-stoobly_agent-1.5.0.dist-info/METADATA,sha256=7g-q1O6IbKxg8zRdiyxSRGKBND6LLDeWTR9CBcDSzII,3087
-stoobly_agent-1.5.0.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-stoobly_agent-1.5.0.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
-stoobly_agent-1.5.0.dist-info/RECORD,,
+stoobly_agent-1.5.1.dist-info/LICENSE,sha256=o93sj12cdoEOsTCjPaPFsw3Xq0SXs3pPcY-9reE2sEw,548
+stoobly_agent-1.5.1.dist-info/METADATA,sha256=9Iio88ZqJsyCuENaWJPg_Ghxdd53RZtYsQzuqCJDR-E,3087
+stoobly_agent-1.5.1.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+stoobly_agent-1.5.1.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
+stoobly_agent-1.5.1.dist-info/RECORD,,