stoobly-agent 0.34.0__tar.gz → 0.34.2__tar.gz

{stoobly_agent-0.34.0 → stoobly_agent-0.34.2}/PKG-INFO

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

{stoobly_agent-0.34.0 → stoobly_agent-0.34.2}/pyproject.toml

@@ -10,7 +10,7 @@ description = "Record, mock, and test HTTP(s) requests. CLI agent for Stoobly"
 license = "Apache License 2.0"
 name = "stoobly-agent"
 readme = "README.md"
-version = "0.34.0"
+version = "0.34.2"
 
 [tool.poetry.dependencies]
 python = "^3.8"

{stoobly_agent-0.34.0 → stoobly_agent-0.34.2}/stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '0.34.0'
+VERSION = '0.34.2'

{stoobly_agent-0.34.0 → stoobly_agent-0.34.2}/stoobly_agent/app/cli/config_cli.py

@@ -61,6 +61,15 @@ def dump(**kwargs):
     else:
         print(output)
 
+@config.command(
+    help="Reset config to defaults"
+)
+def reset():
+    settings = Settings.instance()
+    settings.reset()
+
+    print(f"Reset {settings.path} to defaults.")
+
 ### Scenario
 
 @click.group(

{stoobly_agent-0.34.0 → stoobly_agent-0.34.2}/stoobly_agent/app/cli/dev_tools_cli.py

@@ -5,6 +5,7 @@ import sys
 from stoobly_agent import VERSION
 from stoobly_agent.app.proxy.replay.body_parser_service import decode_response, is_traversable
 from stoobly_agent.app.models.adapters.raw_http_response_adapter import RawHttpResponseAdapter
+from stoobly_agent.lib.api.response_param_names_resource import ResponseParamNamesResource
 from stoobly_agent.lib.orm.migrate_service import migrate as database_migrate, rollback as database_rollback
 from stoobly_agent.lib.orm.replayed_response import ReplayedResponse
 from stoobly_agent.lib.orm.request import Request

{stoobly_agent-0.34.0 → stoobly_agent-0.34.2}/stoobly_agent/app/cli/endpoint_cli.py

@@ -47,7 +47,7 @@ def apply(**kwargs):
   context.with_lifecycle_hooks_path(kwargs.get('lifecycle_hooks_path'))
   context.with_source(kwargs.get('source_path'), kwargs.get('source_format'))
 
-  endpoint_handler = lambda endpoint: print(f"{bcolors.OKBLUE}Applying Endpoint: {endpoint['path']}{bcolors.ENDC}")
+  endpoint_handler = lambda endpoint: print(f"{bcolors.OKBLUE}Applying Endpoint {endpoint['method']} {endpoint['path']}{bcolors.ENDC}")
   context.with_endpoint_handler(endpoint_handler)
 
   request_handler = lambda request, endpoint: print(request.url)
@@ -72,7 +72,7 @@ def import_endpoint(**kwargs):
   
   context.with_source(kwargs.get('source_path'), kwargs.get('source_format'))
 
-  endpoint_handler = lambda endpoint: print(f"{bcolors.OKBLUE}Importing Endpoint: {endpoint['method']} {endpoint['path']}{bcolors.ENDC}")
+  endpoint_handler = lambda endpoint: print(f"{bcolors.OKBLUE}Importing Endpoint {endpoint['method']} {endpoint['path']}{bcolors.ENDC}")
   context.with_endpoint_handler(endpoint_handler)
   
   facade = EndpointFacade(settings)

{stoobly_agent-0.34.0 → stoobly_agent-0.34.2}/stoobly_agent/app/cli/helpers/endpoints_import_service.py

@@ -24,7 +24,7 @@ def import_endpoints(context: EndpointsImportContext):
         try:
             res = import_endpoint(context.project_id, context.resources['endpoint'], endpoint)
         except requests.HTTPError as e:
-            error_handler(endpoint, e)
+            error_handler(e, f"Failed to import endpoint: {endpoint['method']} {endpoint['path']}")
             return
         
         if res.status_code == 409: # Endpoint already created
@@ -34,11 +34,12 @@ def import_endpoints(context: EndpointsImportContext):
         try:
             res = import_component_names(context.project_id, endpoint_id, endpoint, context.resources)
         except requests.HTTPError as e:
-            error_handler(endpoint, e)
+            error_handler(e, f"Failed to import endpoint: {endpoint['method']} {endpoint['path']}")
+
             try:
                 cleanup_endpoint(context.project_id, endpoint_id, context.resources['endpoint'])
             except requests.HTTPError as e:
-                print(f"{bcolors.FAIL}Encountered {e.response.status_code} {e.response.reason}: {e.response.text} - Failed to delete endpoint: {endpoint['method']} {endpoint['path']}{bcolors.ENDC}", file=sys.stderr)
+                error_handler(e, f"Failed to delete endpoint: {endpoint['method']} {endpoint['path']}, id {endpoint_id}")
             return
 
 def import_endpoint(project_id: int, endpoint_resource: EndpointsResource, endpoint: EndpointShowResponse):
@@ -133,15 +134,19 @@ def import_component_names(project_id: int, endpoint_id: int, endpoint: Endpoint
             process_import(component_name, project_id, endpoint_id, resource, component)
 
 def cleanup_endpoint(project_id: int, endpoint_id: int, resource: EndpointsResource):
-    print(f"{bcolors.FAIL}Cleaning up partial import...{bcolors.ENDC}")
+    print(f"{bcolors.OKBLUE}Cleaning up partial import...{bcolors.ENDC}")
     res: requests.Response = resource.destroy(endpoint_id, **{
         'project_id': project_id
     })
 
     res.raise_for_status()
 
-def error_handler(endpoint: EndpointShowResponse, error: requests.HTTPError):
-    print(
-        f"{bcolors.FAIL}Encountered {error.response.status_code} {error.response.reason}: {error.response.text} - Failed to import endpoint: {endpoint['method']} {endpoint['path']} - Aborting operation{bcolors.ENDC}", 
-        file=sys.stderr
-    )
+def error_handler(error: requests.HTTPError, message = ''):
+    if message:
+        print(
+            f"{bcolors.FAIL}{message}{bcolors.ENDC}",
+            file=sys.stderr
+        )
+
+    print(error.response.text, file=sys.stderr)
+    print(f"Error {error.response.status_code} {error.response.reason}", file=sys.stderr)

{stoobly_agent-0.34.0 → stoobly_agent-0.34.2}/stoobly_agent/app/cli/helpers/openapi_endpoint_adapter.py

@@ -603,6 +603,10 @@ class OpenApiEndpointAdapter():
 
   def __parse_responses(self, endpoint: EndpointShowResponse, responses: Spec, components: Spec):
     for response_code, response_definition in responses.items():
+      # Only support status code 200 for now
+      if response_code != '200':
+        continue
+
       # Construct response param name components
       literal_response_params = {}
       response_body_array = False

{stoobly_agent-0.34.0 → stoobly_agent-0.34.2}/stoobly_agent/app/cli/helpers/replay_facade.py

@@ -17,7 +17,9 @@ class ReplayCliOptions(TypedDict):
   lifecycle_hooks_path: str
   on_response: Callable
   project_key: str
+  public_directory_path: str
   record: bool
+  response_fixtures_path: str
   scenario_key: str
   scheme: str
   trace: Trace
@@ -57,7 +59,9 @@ class ReplayFacade():
       'host': cli_options.get('host'),
       'lifecycle_hooks_path': cli_options.get('lifecycle_hooks_path'),
       'overwrite': cli_options.get('overwrite'),
+      'public_directory_path': cli_options.get('public_directory_path'),
       'request_origin': request_origin.CLI,
+      'response_fixtures_path': cli_options.get('response_fixtures_path'),
       'save': cli_options.get('save'),
       'scheme': cli_options.get('scheme'),
       'trace_context': trace_context,

{stoobly_agent-0.34.0 → stoobly_agent-0.34.2}/stoobly_agent/app/cli/request_cli.py

@@ -134,8 +134,10 @@ if not is_remote:
     Configure which tests to print. Defaults to {test_output_level.PASSED}.
   '''
 )
+@click.option('--public-directory-path', help='Path to public files. Used for mocking requests.')
 @ConditionalDecorator(lambda f: click.option('--remote-project-key', help='Use remote project for endpoint definitions.')(f), is_remote and is_local)
 @ConditionalDecorator(lambda f: click.option('--report-key', help='Save to report.')(f), is_remote)
+@click.option('--response-fixtures-path', help='Path to response fixtures yaml. Used for mocking requests.')
 @ConditionalDecorator(lambda f: click.option('--save', is_flag=True, default=False, help='Saves test results.')(f), is_remote)
 @click.option('--scheme', type=click.Choice(['http', 'https']), help='Rewrite request scheme.')
 @click.option('--strategy', default=test_strategy.DIFF, type=click.Choice([test_strategy.CONTRACT, test_strategy.CUSTOM, test_strategy.DIFF, test_strategy.FUZZY]), help='How to test responses.')

{stoobly_agent-0.34.0 → stoobly_agent-0.34.2}/stoobly_agent/app/cli/scenario_cli.py

@@ -158,8 +158,10 @@ if is_local:
     Configure which tests to print. Defaults to {test_output_level.PASSED}.
   '''
 )
+@click.option('--public-directory-path', help='Path to public files. Used for mocking requests.')
 @ConditionalDecorator(lambda f: click.option('--remote-project-key', help='Use remote project for endpoint definitions.')(f), is_remote)
 @ConditionalDecorator(lambda f: click.option('--report-key', help='Save results to report.')(f), is_remote)
+@click.option('--response-fixtures-path', help='Path to response fixtures yaml. Used for mocking requests.')
 @ConditionalDecorator(lambda f: click.option('--save', is_flag=True, default=False, help='Save results.')(f), is_remote)
 @click.option('--scheme', help='Rewrite request scheme.')
 @click.option(

{stoobly_agent-0.34.0 → stoobly_agent-0.34.2}/stoobly_agent/app/cli/types/test.py

@@ -15,8 +15,10 @@ class TestOptions(TypedDict):
   lifecycle_hooks_path: str
   log_level: logger.LogLevel
   output_level: test_output_level.TestOutputLevel
+  public_directory_path: str
   remote_project_key: str
   report_key: str
+  response_fixtures_path: str
   save: str
   scheme: str
   strategy: test_strategy.TestStrategy

{stoobly_agent-0.34.0 → stoobly_agent-0.34.2}/stoobly_agent/app/models/factories/resource/local_db/helpers/request_builder.py

@@ -35,7 +35,7 @@ class RequestBuilder():
 
   @property
   def request_body(self):
-    return self.__properties.get('request_body')
+    return self.__properties.get('request_body') or b''
 
   @property
   def request_headers(self):

{stoobly_agent-0.34.0 → stoobly_agent-0.34.2}/stoobly_agent/app/proxy/handle_mock_service.py

@@ -14,6 +14,7 @@ from stoobly_agent.lib.logger import Logger
 
 from .constants import custom_response_codes
 from .mock.context import MockContext
+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
@@ -65,14 +66,14 @@ def handle_request_mock_generic(context: MockContext, **options: MockOptions):
         if handle_failure:
             res = handle_failure(context)
     elif policy == mock_policy.ALL:
-        res = eval_request_with_retry(eval_request, request, **options) 
+        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(eval_request, request, **options) 
+        res = eval_request_with_retry(context, eval_request, **options) 
 
         context.with_response(res)
 
@@ -93,7 +94,8 @@ def handle_request_mock_generic(context: MockContext, **options: MockOptions):
 
     return pass_on(context.flow, res)
 
-def eval_request_with_retry(eval_request, request, **options: MockOptions):
+def eval_request_with_retry(context: MockContext, eval_request, **options: MockOptions):
+    request = context.flow.request
     infer = bool(options.get('infer'))
     ignored_components = options['ignored_components'] if 'ignored_components' in options else []
 
@@ -103,6 +105,16 @@ def eval_request_with_retry(eval_request, request, **options: MockOptions):
         ignored_components.append(res.content)
         res = eval_request(request, ignored_components, infer=infer, retry=1)
 
+    if res.status_code == custom_response_codes.NOT_FOUND:
+        intercept_settings = context.intercept_settings
+        fixture = eval_fixtures(
+            request,
+            public_directory_path=intercept_settings.public_directory_path,
+            response_fixtures=intercept_settings.response_fixtures
+        )
+        if fixture:
+            res = fixture
+
     return res
 
 def handle_request_mock(context: MockContext):

{stoobly_agent-0.34.0 → stoobly_agent-0.34.2}/stoobly_agent/app/proxy/intercept_settings.py

@@ -1,5 +1,6 @@
 import os
 import pdb
+import yaml
 
 from runpy import run_path
 from typing import List, Union
@@ -37,6 +38,9 @@ class InterceptSettings:
     self.__lifecycle_hooks = None
     self.__initialize_lifecycle_hooks()
 
+    self.__response_fixtures = None
+    self.__initialize_response_fixtures()
+
   @property
   def settings(self):
     return self.__settings
@@ -102,6 +106,14 @@ class InterceptSettings:
     except InvalidProjectKey:
       pass
 
+  @property
+  def public_directory_path(self):
+    if self.__headers and custom_headers.PUBLIC_DIRECTORY_PATH in self.__headers:
+      return self.__headers[custom_headers.PUBLIC_DIRECTORY_PATH]
+
+    if os.environ.get(env_vars.AGENT_PUBLIC_DIRECTORY_PATH):
+      return os.environ[env_vars.AGENT_PUBLIC_DIRECTORY_PATH] 
+
   @property
   def remote_project_key(self):
     # When not local project, don't return set remote project_key
@@ -114,6 +126,18 @@ class InterceptSettings:
 
     return self.__settings.remote.project_key
 
+  @property
+  def response_fixtures_path(self):
+    if self.__headers and custom_headers.RESPONSE_FIXTURES_PATH in self.__headers:
+      return self.__headers[custom_headers.RESPONSE_FIXTURES_PATH]
+
+    if os.environ.get(env_vars.AGENT_RESPONSE_FIXTURES_PATH):
+      return os.environ[env_vars.AGENT_RESPONSE_FIXTURES_PATH] 
+
+  @property
+  def response_fixtures(self):
+    return self.__response_fixtures or {}
+
   @property
   def parsed_remote_project_key(self):
     try: 
@@ -288,6 +312,21 @@ class InterceptSettings:
     except Exception as e:
         return Logger.instance().error(e)
 
+  def __initialize_response_fixtures(self):
+    fixtures_path = self.response_fixtures_path
+
+    if not fixtures_path:
+        return
+
+    if not os.path.exists(fixtures_path):
+        return Logger.instance().error(f"Response fixtures {fixtures_path} does not exist")
+
+    with open(fixtures_path, 'r') as stream:
+        try:
+            self.__response_fixtures = yaml.safe_load(stream)
+        except yaml.YAMLError as exc:
+            Logger.instance().error(exc)
+        
   def __policy(self, mode):
     if mode == intercept_mode.MOCK:
       if self.__headers and custom_headers.MOCK_POLICY in self.__headers:

stoobly_agent-0.34.2/stoobly_agent/app/proxy/mock/eval_fixtures_service.py

@@ -0,0 +1,61 @@
+import os
+import pdb
+import re
+
+from io import BytesIO
+from mitmproxy.http import Request as MitmproxyRequest
+from requests import Response
+from typing import Union
+
+from stoobly_agent.lib.logger import bcolors, Logger
+
+from .types import Fixtures
+
+class Options():
+  public_directory_path: str
+  response_fixtures: Fixtures
+
+def eval_fixtures(request: MitmproxyRequest, **options: Options) -> Union[Response, None]:
+  response_fixtures = options.get('response_fixtures')
+
+  fixture_path = __eval_response_fixtures(request, response_fixtures)
+  if not fixture_path:
+    public_directory_path = options.get('public_directory_path')
+
+    if public_directory_path and os.path.exists(public_directory_path):
+      static_file_path = os.path.join(public_directory_path, request.path.lstrip('/'))
+
+      if os.path.exists(static_file_path):
+        fixture_path = static_file_path
+
+  if not fixture_path:
+    return
+
+  with open(fixture_path, 'rb') as fp:
+    response = Response()
+
+    response.status_code = 200
+    response.raw = BytesIO(fp.read()) 
+
+    Logger.instance().debug(f"{bcolors.OKBLUE}Resolved fixture {fixture_path}{bcolors.ENDC}")
+
+    return response
+
+def __eval_response_fixtures(request: MitmproxyRequest, response_fixtures: Fixtures):
+  if not response_fixtures:
+    return
+
+  method = request.method
+  routes = response_fixtures.get(method)
+
+  if not routes:
+    return
+
+  for path_pattern in routes:
+    if not re.match(path_pattern, request.path):
+      continue
+    
+    path = routes[path_pattern].get('path')
+
+    if path and os.path.exists(path):
+      return path

stoobly_agent-0.34.2/stoobly_agent/app/proxy/mock/types/__init__.py

@@ -0,0 +1,10 @@
+from typing import TypedDict
+
+class Route(TypedDict):
+  path: str
+
+class Fixtures(TypedDict):
+  DELETE: Route
+  GET: Route
+  POST: Route
+  PUT: Route

{stoobly_agent-0.34.0 → stoobly_agent-0.34.2}/stoobly_agent/app/proxy/replay/replay_request_service.py

@@ -27,9 +27,11 @@ class ReplayRequestOptions(TypedDict):
   after_replay: Union[Callable[[ReplayContext], Union[requests.Response, None]], None]
   project_key: Union[str, None]
   proxies: dict
+  public_directory_path: str
   remote_project_key: str
   report_key: Union[str, None] 
   request_origin: Union[request_origin.CLI, None] 
+  response_fixtures_path: str
   scenario_key: Union[str, None] 
   scheme: str
   test_filter: test_filter.TestFilter
@@ -58,7 +60,7 @@ def replay(context: ReplayContext, options: ReplayRequestOptions) -> requests.Re
     headers[custom_headers.ALIAS_RESOLVE_STRATEGY] = options['alias_resolve_strategy']
 
   if options.get('lifecycle_hooks_path'):
-    __handle_lifecycle_hooks_path(options['lifecycle_hooks_path'], headers) 
+    __handle_path_header(custom_headers.LIFECYCLE_HOOKS_PATH, options['lifecycle_hooks_path'], headers) 
 
   if options.get('mode'):
     __handle_mode_option(options['mode'], request, headers)
@@ -66,6 +68,9 @@ def replay(context: ReplayContext, options: ReplayRequestOptions) -> requests.Re
   if options.get('project_key'):
     headers[custom_headers.PROJECT_KEY] = options['project_key']
 
+  if options.get('public_directory_path'):
+    __handle_path_header(custom_headers.PUBLIC_DIRECTORY_PATH, options['public_directory_path'], headers)
+
   if options.get('report_key'):
     headers[custom_headers.REPORT_KEY] = options['report_key']
 
@@ -75,6 +80,9 @@ def replay(context: ReplayContext, options: ReplayRequestOptions) -> requests.Re
   if custom_headers.REQUEST_ORIGIN not in headers:
     headers[custom_headers.REQUEST_ORIGIN] = request_origin.CLI
 
+  if options.get('response_fixtures_path'):
+    __handle_path_header(custom_headers.RESPONSE_FIXTURES_PATH, options['response_fixtures_path'], headers)
+
   if options.get('scenario_key'):
     headers[custom_headers.SCENARIO_KEY] = options['scenario_key']
 
@@ -146,14 +154,14 @@ def replay(context: ReplayContext, options: ReplayRequestOptions) -> requests.Re
 
   return res
 
-def __handle_lifecycle_hooks_path(script_path, headers):
+def __handle_path_header(header_name: str, script_path: str, headers):
   if not script_path:
     return
 
   if not os.path.isabs(script_path):
     script_path = os.path.join(os.path.abspath('.'), script_path)
 
-  headers[custom_headers.LIFECYCLE_HOOKS_PATH] = script_path
+  headers[header_name] = script_path
 
 def __handle_mode_option(_mode, request: Request, headers):
   headers[custom_headers.PROXY_MODE] = _mode

{stoobly_agent-0.34.0 → stoobly_agent-0.34.2}/stoobly_agent/app/proxy/run.py

@@ -124,6 +124,12 @@ def __filter_options(options):
     if 'lifecycle_hooks_path' in options:
         del options['lifecycle_hooks_path']
 
+    if 'public_directory_path' in options:
+        del options['public_directory_path']
+
+    if 'response_fixtures_path' in options:
+        del options['response_fixtures_path']
+
     if 'ui_host' in options:
         del options['ui_host']
 

{stoobly_agent-0.34.0 → stoobly_agent-0.34.2}/stoobly_agent/app/proxy/test/context.py

@@ -142,6 +142,10 @@ class TestContext(TestContextABC):
   def passed(self, v):
     self.__passed = v
 
+  @property
+  def public_directory_path(self):
+    return self.__intercept_settings.public_directory_path
+
   @property
   def replay_context(self) -> ReplayContext:
     return self.__replay_context
@@ -162,6 +166,14 @@ class TestContext(TestContextABC):
   def response(self) -> TestContextResponse:
     return self.__response
 
+  @property
+  def response_fixtures(self):
+    return self.__intercept_settings.response_fixtures
+
+  @property
+  def response_fixtures_path(self):
+    return self.__intercept_settings.response_fixtures_path
+
   @property
   def response_param_names(self) -> RequestComponentNamesFacade:
     if self.__cached_response_param_names:

{stoobly_agent-0.34.0 → stoobly_agent-0.34.2}/stoobly_agent/app/proxy/test/context_abc.py

@@ -119,6 +119,11 @@ class TestContextABC(abc.ABC):
   def passed(self, v):
     pass
 
+  @property
+  @abc.abstractmethod
+  def public_directory_path(self):
+    pass
+
   @property
   @abc.abstractmethod
   def replay_context(self):
@@ -144,6 +149,16 @@ class TestContextABC(abc.ABC):
   def response(self) -> TestContextResponse:
     pass
 
+  @property
+  @abc.abstractmethod
+  def response_fixtures(self):
+    pass
+
+  @property
+  @abc.abstractmethod
+  def response_fixtures_path(self):
+    pass
+
   @property
   @abc.abstractmethod
   def response_param_names(self) -> RequestComponentNamesFacade: 

{stoobly_agent-0.34.0 → stoobly_agent-0.34.2}/stoobly_agent/app/settings/__init__.py

@@ -68,6 +68,10 @@ class Settings:
     def ui(self):
         return self.__ui_settings
 
+    @property
+    def path(self):
+        return self.__settings_file_path
+
     @property
     def proxy(self):
         return self.__proxy_settings

{stoobly_agent-0.34.0 → stoobly_agent-0.34.2}/stoobly_agent/cli.py

@@ -105,6 +105,8 @@ def init(**kwargs):
   the form of "http[s]://host[:port]".
 ''')
 @click.option('--proxy-port', default=8080, help='Proxy service port.')
+@click.option('--public-directory-path', help='Path to public files. Used for mocking requests.')
+@click.option('--response-fixtures-path', help='Path to response fixtures yaml. Used for mocking requests.')
 @click.option('--ssl-insecure', is_flag=True, default=False, help='Do not verify upstream server SSL/TLS certificates.')
 @click.option('--ui-host', default='0.0.0.0', help='Address to bind UI to.')
 @click.option('--ui-port', default=4200, help='UI service port.')
@@ -116,6 +118,12 @@ def run(**kwargs):
     if kwargs.get('lifecycle_hooks_path'):
       os.environ[env_vars.AGENT_LIFECYCLE_HOOKS_PATH] = kwargs['lifecycle_hooks_path']
 
+    if kwargs.get('public_directory_path'):
+      os.environ[env_vars.AGENT_PUBLIC_DIRECTORY_PATH] = kwargs['public_directory_path']
+
+    if kwargs.get('response_fixtures_path'):
+      os.environ[env_vars.AGENT_RESPONSE_FIXTURES_PATH] = kwargs['response_fixtures_path']
+
     # Observe config for changes
     Settings.instance().watch()
 
@@ -137,7 +145,10 @@ def run(**kwargs):
 @ConditionalDecorator(lambda f: click.option('--remote-project-key', help='Use remote project for endpoint definitions.')(f), is_remote and is_local)
 @click.option('--format', type=click.Choice([RAW_FORMAT]), help='Format response')
 @click.option('-H', '--header', multiple=True, help='Pass custom header(s) to server')
+@click.option('--lifecycle-hooks-path', help='Path to lifecycle hooks script.')
 @ConditionalDecorator(lambda f: click.option('--project-key')(f), is_remote)
+@click.option('--public-directory-path', help='Path to public files. Used for mocking requests.')
+@click.option('--response-fixtures-path', help='Path to response fixtures yaml. Used for mocking requests.')
 @click.option('-X', '--request', default='GET', help='Specify request command to use')
 @click.option('--scenario-key')
 @click.argument('url')
@@ -165,7 +176,7 @@ def mock(**kwargs):
     print_raw_response(response)
   else:
     content = response.content
-    print(decode(content))
+    print(decode(content), end='')
 
 @main.command(
   help="Record request"
@@ -194,7 +205,7 @@ def record(**kwargs):
   else:
     try:
       content = response.raw.data
-      print(content.decode(json.detect_encoding(content)))
+      print(content.decode(json.detect_encoding(content)), end='')
     except UnicodeDecodeError:
       print('Warning: Binary output can mess up your terminal.')
 

{stoobly_agent-0.34.0 → stoobly_agent-0.34.2}/stoobly_agent/config/constants/custom_headers.py

@@ -9,9 +9,11 @@ DO_PROXY = 'X-Do-Proxy'
 LIFECYCLE_HOOKS_PATH = 'X-Stoobly-Lifecycle-Hooks-Path'
 PROJECT_KEY = 'X-Project-Key'
 PROXY_MODE = 'X-Proxy-Mode'
+PUBLIC_DIRECTORY_PATH = 'X-Stoobly-Public-Directory-Path'
 RECORD_POLICY = 'X-Record-Policy'
 REPORT_KEY = 'X-Report-Key'
 REQUEST_ORIGIN = 'X-Proxy-Request-Origin'
+RESPONSE_FIXTURES_PATH = 'X-Stoobly-Response-Fixtures-Path'
 RESPONSE_ID = 'X-Response-Id'
 RESPONSE_LATENCY = 'X-Stoobly-Request-Response-Latency'
 RESPONSE_PROXY_MODE = 'X-Response-Proxy-Mode'

{stoobly_agent-0.34.0 → stoobly_agent-0.34.2}/stoobly_agent/config/constants/env_vars.py

@@ -9,10 +9,12 @@ AGENT_LIFECYCLE_HOOKS_PATH = 'STOOBLY_AGENT_LIFECYCLE_HOOKS_PATH'
 AGENT_POLICY = 'STOOBLY_AGENT_POLICY'
 AGENT_PROJECT_KEY = 'STOOBLY_AGENT_PROJECT_KEY'
 AGENT_PROXY_URL = 'STOOBLY_AGENT_PROXY_URL'
+AGENT_PUBLIC_DIRECTORY_PATH = 'STOOBLY_AGENT_PUBLIC_DIRECTORY_PATH'
 AGENT_REMOTE_ENABLED = 'STOOBLY_AGENT_REMOTE_ENABLED'
 AGENT_REMOTE_PROJECT_KEY = 'STOOBLY_AGENT_REMOTE_PROJECT_KEY'
 AGENT_REPLAY_HOST = 'STOOBLY_AGENT_REPLAY_HOST'
 AGENT_REPLAY_SCHEME = 'STOOBLY_AGENT_REPLAY_SCHEME'
+AGENT_RESPONSE_FIXTURES_PATH = 'STOOBLY_AGENT_RESPONSE_FIXTURES_PATH'
 AGENT_SERVICE_URL = 'STOOBLY_AGENT_SERVICE_URL'
 AGENT_SCENARIO_KEY = 'STOOBLY_AGENT_SCENARIO_KEY'
 AGENT_SIMULATE_LATENCY = 'STOOBLY_AGENT_SIMULATE_LATENCY'

{stoobly_agent-0.34.0 → stoobly_agent-0.34.2}/stoobly_agent/test/app/cli/helpers/openapi_endpoint_adapter_additional_props_test.py

@@ -55,30 +55,6 @@ class TestOpenApiEndpointAdapterAdditionalProps():
           'type': 'static'
         }
       ],
-      'response_param_names': [
-        {
-          'endpoint_id': 1,
-          'id': 1,
-          'inferred_type': 'Integer',
-          'is_deterministic': True,
-          'is_required': True,
-          'name': 'code',
-          'query': 'code',
-          'response_param_name_id': None,
-          'values': [0]
-        },
-        {
-          'endpoint_id': 1,
-          'id': 2,
-          'inferred_type': 'String',
-          'is_deterministic': True,
-          'is_required': True,
-          'name': 'message',
-          'query': 'message',
-          'response_param_name_id': None,
-          'values': ['']
-        }
-      ]
     }