stoobly-agent 1.10.5__py3-none-any.whl → 1.11.0__py3-none-any.whl

stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.10.5'
+VERSION = '1.11.0'

stoobly_agent/app/cli/intercept_cli.py

@@ -128,7 +128,7 @@ def configure(**kwargs):
         active_mode = settings.proxy.intercept.mode
         valid_policies = __get_policy_options(active_mode)
 
-        if not kwargs['policy'] in valid_policies:
+        if kwargs['policy'] not in valid_policies:
             print("Error: Valid policies for {active_mode} are {valid_policies}", file=sys.stderr)
             sys.exit(1)
 

stoobly_agent/app/cli/request_cli.py

@@ -1,6 +1,7 @@
 import click
 
 from stoobly_agent.app.cli.helpers.handle_replay_service import BODY_FORMAT, JSON_FORMAT
+from stoobly_agent.lib.intercepted_requests_logger import InterceptedRequestsLogger
 from stoobly_agent.app.models.factories.resource.local_db.helpers.log_event import DELETE_ACTION, PUT_ACTION
 from stoobly_agent.app.settings import Settings
 from stoobly_agent.config.constants import alias_resolve_strategy, test_filter, test_output_level, test_strategy
@@ -170,4 +171,21 @@ def get(**kwargs) -> None:
 def query(**kwargs):
   query_handler(kwargs)
 
-request.add_command(response)
+@click.group(
+  epilog="Run 'stoobly-agent request log COMMAND --help' for more information on a command.",
+  help="Manage intercepted requests logs"
+)
+@click.pass_context
+def log(ctx):
+    pass
+
+@log.command(name="list", help="List intercepted requests log entries")
+def log_list(**kwargs):
+  InterceptedRequestsLogger.dump_logs()
+
+@log.command(name="delete", help="Delete intercepted requests log entries")
+def log_delete(**kwargs):
+  InterceptedRequestsLogger.truncate()
+
+request.add_command(response)
+request.add_command(log)

stoobly_agent/app/cli/scaffold/docker/service/builder.py

@@ -1,21 +1,18 @@
 import os
 import pdb
 
-from typing import List
-
 from stoobly_agent.config.data_dir import DATA_DIR_NAME
 
 from ...app_config import AppConfig
 from ...constants import (
-  APP_DIR, SERVICES_NAMESPACE, 
+  APP_DIR, SERVICES_NAMESPACE,
   SERVICE_HOSTNAME, SERVICE_HOSTNAME_ENV,
-  SERVICE_NAME, SERVICE_NAME_ENV, 
   SERVICE_ID,
-  SERVICE_PORT, SERVICE_PORT_ENV, 
+  SERVICE_PORT, SERVICE_PORT_ENV,
   SERVICE_SCHEME, SERVICE_SCHEME_ENV,
   SERVICE_UPSTREAM_HOSTNAME, SERVICE_UPSTREAM_HOSTNAME_ENV, SERVICE_UPSTREAM_PORT, SERVICE_UPSTREAM_PORT_ENV, SERVICE_UPSTREAM_SCHEME, SERVICE_UPSTREAM_SCHEME_ENV,
   STOOBLY_HOME_DIR, 
-  WORKFLOW_NAME, WORKFLOW_NAME_ENV, WORKFLOW_SCRIPTS, WORKFLOW_TEMPLATE
+  WORKFLOW_SCRIPTS, WORKFLOW_TEMPLATE
 )
 from ...service_config import ServiceConfig
 from ...local.service.builder import ServiceBuilder

stoobly_agent/app/cli/scaffold/docker/workflow/builder.py

@@ -4,7 +4,7 @@ import pdb
 from typing import List, Union
 
 from ...constants import (
-  WORKFLOW_CONTAINER_CONFIGURE_TEMPLATE, WORKFLOW_CONTAINER_INIT_TEMPLATE, WORKFLOW_CONTAINER_PROXY_TEMPLATE, WORKFLOW_NAME, WORKFLOW_NAME_ENV
+  WORKFLOW_CONTAINER_CONFIGURE_TEMPLATE, WORKFLOW_CONTAINER_INIT_TEMPLATE, WORKFLOW_CONTAINER_PROXY_TEMPLATE, WORKFLOW_NAME
 )
 from ...local.workflow.builder import WorkflowBuilder
 from ..builder import Builder
@@ -13,6 +13,7 @@ from ..service.builder import DockerServiceBuilder
 from .mock_decorator import MockDecorator
 from .reverse_proxy_decorator import ReverseProxyDecorator
 
+
 class DockerWorkflowBuilder(Builder, WorkflowBuilder):
 
   def __init__(self, workflow_path: str, service_builder: DockerServiceBuilder):

stoobly_agent/app/cli/scaffold/docker/workflow/mock_decorator.py

@@ -34,6 +34,8 @@ class MockDecorator(CommandDecorator):
       command.append('--certs')
       command.append(os.path.join(STOOBLY_CERTS_DIR, f"{SERVICE_HOSTNAME}-joined.pem"))
 
+    command.append('--request-log-enable')
+
     services = self.workflow_builder.services
     proxy_name = self.workflow_builder.proxy
     proxy_service = services.get(proxy_name) or {}

stoobly_agent/app/cli/scaffold/docker/workflow/run_command.py

@@ -435,6 +435,11 @@ class DockerWorkflowRunCommand(WorkflowRunCommand):
     if folder != self.workflow_name:
       workflow_name = file_name.split(self.timestamp_file_extension)[0]
 
+    # If the workflow is namespaced, allow it to run at the same time
+    # Same workflow with same namespace is allowed, workflow will be restarted
+    if workflow_name == self.workflow_name:
+      return
+
     Logger.instance(LOG_ID).error(f"Workflow '{workflow_name}' is running, please stop it first.")
 
     if folder != workflow_name:

stoobly_agent/app/cli/scaffold/local/service/builder.py

@@ -3,17 +3,10 @@ from typing import List
 
 from stoobly_agent.config.data_dir import DATA_DIR_NAME
 
-from ...app_config import AppConfig
 from ...constants import (
-  APP_DIR, SERVICES_NAMESPACE, 
-  SERVICE_HOSTNAME, SERVICE_HOSTNAME_ENV,
-  SERVICE_NAME, SERVICE_NAME_ENV, 
-  SERVICE_ID,
-  SERVICE_PORT, SERVICE_PORT_ENV, 
-  SERVICE_SCHEME, SERVICE_SCHEME_ENV,
-  SERVICE_UPSTREAM_HOSTNAME, SERVICE_UPSTREAM_HOSTNAME_ENV, SERVICE_UPSTREAM_PORT, SERVICE_UPSTREAM_PORT_ENV, SERVICE_UPSTREAM_SCHEME, SERVICE_UPSTREAM_SCHEME_ENV,
+  SERVICES_NAMESPACE, SERVICE_NAME, SERVICE_NAME_ENV, 
   STOOBLY_HOME_DIR, 
-  WORKFLOW_NAME, WORKFLOW_NAME_ENV, WORKFLOW_SCRIPTS, WORKFLOW_TEMPLATE
+  WORKFLOW_NAME, WORKFLOW_NAME_ENV, WORKFLOW_NAMESPACE_ENV
 )
 from ...service_config import ServiceConfig
 
@@ -23,7 +16,7 @@ class ServiceBuilder():
     self.__config = config
     self.__dir_path = config.dir
     self.__upstream_port = None
-    self.__env = [SERVICE_NAME_ENV, WORKFLOW_NAME_ENV]
+    self.__env = [SERVICE_NAME_ENV, WORKFLOW_NAME_ENV, WORKFLOW_NAMESPACE_ENV]
     self.__service_name = os.path.basename(config.dir)
     self.__working_dir = os.path.join(
       STOOBLY_HOME_DIR, DATA_DIR_NAME, SERVICES_NAMESPACE, SERVICE_NAME, WORKFLOW_NAME

stoobly_agent/app/cli/scaffold/local/workflow/builder.py

@@ -1,14 +1,12 @@
 import os
 
-from typing import Union
-
-from ...constants import SERVICE_NAME_ENV, WORKFLOW_NAME_ENV
+from ...constants import SERVICE_NAME_ENV, WORKFLOW_NAME_ENV, WORKFLOW_NAMESPACE_ENV
 from ..service.builder import ServiceBuilder
 
 class WorkflowBuilder():
 
   def __init__(self, workflow_path: str, service_builder: ServiceBuilder):
-    self._env = [SERVICE_NAME_ENV, WORKFLOW_NAME_ENV]
+    self._env = [SERVICE_NAME_ENV, WORKFLOW_NAME_ENV, WORKFLOW_NAMESPACE_ENV]
     self._service_builder = service_builder
     self._workflow_name = os.path.basename(workflow_path)
 

stoobly_agent/app/cli/scaffold/local/workflow/run_command.py

@@ -283,9 +283,16 @@ class LocalWorkflowRunCommand(WorkflowRunCommand):
     else:
       file_name = os.path.basename(pid_file_path)
       workflow_name = self.workflow_name
+
+      # If the folder is not the same as the workflow name, then the workflow is namespaced, get the real workflow name
       if folder != self.workflow_name:
         workflow_name = file_name.split(self.pid_file_extension)[0]
 
+      # If the workflow is namespaced, allow it to run at the same time
+      # Same workflow with same namespace is covered by pid_file_path check
+      if workflow_name == self.workflow_name:
+        return
+
       Logger.instance(LOG_ID).error(f"Workflow {workflow_name} is already running with PID {pid}")
 
       if folder != workflow_name:

stoobly_agent/app/cli/scaffold/service_workflow_validate_command.py

@@ -135,7 +135,7 @@ class ServiceWorkflowValidateCommand(ServiceCommand, ValidateCommand):
     # connection is working, but we haven't recorded anything yet
     logs = output.decode('ascii')
     if logs != '200' and  logs != '499':
-      raise ScaffoldValidateException(f"Error reaching {url} from inside Docker network")
+      raise ScaffoldValidateException(f"Error reaching {url} from inside Docker network with logs: \n{logs}")
 
   # Check public folder exists in container
   def validate_public_folder(self, container: Container):

stoobly_agent/app/cli/scaffold/templates/app/.Dockerfile.context

@@ -1,6 +1,6 @@
-FROM stoobly/agent:1.10
+FROM stoobly/agent:1.11
 
 ARG USER_ID
 
 # Change user id of stoobly user to that of host's user id
-RUN if [ -n "$USER_ID" ]; then usermod -u $USER_ID stoobly; fi
+RUN if [ -n "$USER_ID" ]; then usermod -u $USER_ID stoobly; fi

stoobly_agent/app/cli/scaffold/templates/app/.Makefile

@@ -110,10 +110,11 @@ intercept/disable:
 intercept/enable:
 	@export EXEC_COMMAND=intercept/.enable EXEC_OPTIONS="" EXEC_ARGS=$(scenario_key) && \
 	$(stoobly_exec)
-mock: workflow/mock ca-cert/install workflow/up nameservers workflow/hostname/install workflow/run
+mock: workflow/mock ca-cert/install workflow/up nameservers workflow/hostname/install workflow/up/run
+mock/down: workflow/mock workflow/down workflow/down/run workflow/hostname/uninstall
+mock/logs: workflow/mock workflow/logs workflow/logs/run
+mock/report: workflow/mock workflow/report
 mock/services: workflow/mock workflow/services
-mock/logs: workflow/mock workflow/logs workflow/run
-mock/down: workflow/mock workflow/down workflow/run workflow/hostname/uninstall
 pipx/install:
 	@if ! command -v pipx >/dev/null 2>&1; then \
 		echo "pipx is not installed. Installing pipx..."; \
@@ -124,10 +125,11 @@ python/validate:
 		echo "Error: Python 3.10, 3.11, or 3.12 is required."; \
 		exit 1; \
 	fi
-record: workflow/record ca-cert/install workflow/up nameservers workflow/hostname/install workflow/run
-record/down: workflow/record workflow/down workflow/run workflow/hostname/uninstall
+record: workflow/record ca-cert/install workflow/up nameservers workflow/hostname/install workflow/up/run
+record/down: workflow/record workflow/down workflow/down/run workflow/hostname/uninstall
+record/logs: workflow/record workflow/logs workflow/logs/run
+record/report: workflow/record workflow/report
 record/services: workflow/record workflow/services
-record/logs: workflow/record workflow/logs workflow/run
 scenario/create:
 # Create a scenario
 	@export EXEC_COMMAND=scenario/.create EXEC_OPTIONS="$(options)" EXEC_ARGS="$(name)" && \
@@ -157,15 +159,18 @@ stoobly/install: python/validate pipx/install
 		echo "stoobly-agent not found. Installing..."; \
 		pipx install stoobly-agent || { echo "Failed to install stoobly-agent"; exit 1; }; \
 	fi
-test: workflow/test workflow/up workflow/run
+test: workflow/test workflow/up workflow/up/run
+test/down: workflow/test workflow/down workflow/down/run
+test/logs: workflow/test workflow/logs workflow/logs/run
+test/report: workflow/test workflow/report
 test/services: workflow/test workflow/services
-test/logs: workflow/test workflow/logs workflow/run
-test/down: workflow/test workflow/down workflow/run
 tmpdir:
 	@mkdir -p $(app_tmp_dir)
 workflow/down: dotenv
 	@export EXEC_COMMAND=scaffold/.down EXEC_OPTIONS="$(workflow_down_options) $(workflow_run_options) $(options)" EXEC_ARGS="$(workflow)" && \
 	$(stoobly_exec_run)
+workflow/down/run:
+	@bash "$(app_dir)/$(workflow_script)"
 workflow/hostname: stoobly/install
 	@if [ -n "$$STOOBLY_HOSTNAME_INSTALL_CONFIRM" ]; then \
 		confirm="$$STOOBLY_HOSTNAME_INSTALL_CONFIRM"; \
@@ -187,14 +192,17 @@ workflow/hostname/uninstall: action/uninstall workflow/hostname
 workflow/logs:
 	@export EXEC_COMMAND=scaffold/.logs EXEC_OPTIONS="$(workflow_log_options) $(workflow_run_options) $(options)" EXEC_ARGS="$(workflow)" && \
 	$(stoobly_exec_run)
+workflow/logs/run:
+	@bash "$(app_dir)/$(workflow_script)"
 workflow/mock:
 	$(eval workflow=mock)
 workflow/namespace: tmpdir
 	@mkdir -p $(workflow_namespace_dir)
 workflow/record:
 	$(eval workflow=record)
-workflow/run:
-	@bash "$(app_dir)/$(workflow_script)"
+workflow/report:
+	@export EXEC_COMMAND=request/log/.list EXEC_OPTIONS="$(options)" EXEC_ARGS="" && \
+	$(stoobly_exec)
 workflow/services:
 	@export EXEC_COMMAND=scaffold/.services EXEC_OPTIONS="$(workflow_service_options) $(options)" EXEC_ARGS="$(workflow)" && \
 	$(stoobly_exec_run)
@@ -203,3 +211,5 @@ workflow/test:
 workflow/up: dotenv
 	@export EXEC_COMMAND=scaffold/.up EXEC_OPTIONS="$(workflow_up_options) $(workflow_run_options) $(options)" EXEC_ARGS="$(workflow)" && \
 	$(stoobly_exec_run)
+workflow/up/run:
+	@bash "$(app_dir)/$(workflow_script)"

stoobly_agent/app/cli/scaffold/templates/app/.docker-compose.base.yml

@@ -4,6 +4,8 @@ services:
       service: stoobly_base
     volumes:
       - ${CONTEXT_DIR}/.stoobly:/home/stoobly/.stoobly
+      - ${APP_DIR}/.stoobly/ca_certs:/home/stoobly/.stoobly/ca_certs
+      - ${APP_DIR}/.stoobly/certs:/home/stoobly/.stoobly/certs
       - ${APP_DIR}/.stoobly/services:/home/stoobly/.stoobly/services
   stoobly_base:
     image: stoobly.${USER_ID}

stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/mock/.docker-compose.yml

@@ -5,8 +5,8 @@ services:
       file: ../.docker-compose.base.yml
       service: stoobly_ui.base
     networks:
-      app.egress: 
-        aliases: 
+      app.egress:
+        aliases:
           - local.stoobly.com
     ports:
       - '${APP_UI_PORT}:4200'

stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/record/.docker-compose.yml

@@ -5,8 +5,8 @@ services:
       file: ../.docker-compose.base.yml
       service: stoobly_ui.base
     networks:
-      app.egress: 
-        aliases: 
+      app.egress:
+        aliases:
           - local.stoobly.com
     ports:
       - '${APP_UI_PORT}:4200'

stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/request/log/.list

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+extra_options=$EXEC_OPTIONS
+
+stoobly-agent request log list $extra_options

stoobly_agent/app/cli/scaffold/workflow_run_command.py

@@ -8,8 +8,8 @@ from stoobly_agent.config.data_dir import DataDir
 
 from .app import App
 from .constants import (
-  APP_DIR_ENV, APP_NETWORK_ENV, APP_PLUGINS_ENV, CA_CERTS_DIR_ENV, CERTS_DIR_ENV, CONTEXT_DIR_ENV, 
-  SERVICE_DNS_ENV, SERVICE_NAME_ENV, SERVICE_SCRIPTS_DIR,  SERVICE_SCRIPTS_ENV, USER_ID_ENV, 
+  APP_DIR_ENV, APP_NETWORK_ENV, CA_CERTS_DIR_ENV, CERTS_DIR_ENV, CONTEXT_DIR_ENV,
+  SERVICE_DNS_ENV, SERVICE_NAME_ENV, SERVICE_SCRIPTS_DIR,  SERVICE_SCRIPTS_ENV, USER_ID_ENV,
   WORKFLOW_NAME_ENV, WORKFLOW_NAMESPACE_ENV, WORKFLOW_SCRIPTS_DIR, WORKFLOW_SCRIPTS_ENV, WORKFLOW_TEMPLATE_ENV
 )
 
@@ -139,9 +139,8 @@ class WorkflowRunCommand(WorkflowCommand):
     _config[WORKFLOW_NAME_ENV] = self.workflow_name
     _config[WORKFLOW_SCRIPTS_ENV] = WORKFLOW_SCRIPTS_DIR
     _config[WORKFLOW_TEMPLATE_ENV] = self.workflow_name
-    
-    if namespace:
-      _config[WORKFLOW_NAMESPACE_ENV] = namespace
+    # Default to the workflow name if a namespace isn't given
+    _config[WORKFLOW_NAMESPACE_ENV] = namespace if namespace else _config[WORKFLOW_NAME_ENV]
 
     if self.network:
       _config[APP_NETWORK_ENV] = self.network

stoobly_agent/app/proxy/handle_mock_service.py

@@ -10,8 +10,8 @@ from stoobly_agent.app.models.request_model import RequestModel
 from stoobly_agent.app.proxy.mitmproxy.request_facade import MitmproxyRequestFacade
 from stoobly_agent.app.proxy.utils.rewrite_rules_to_ignored_components_service import rewrite_rules_to_ignored_components
 from stoobly_agent.config.constants import custom_headers, env_vars, lifecycle_hooks, mock_policy, request_origin
-from stoobly_agent.lib.logger import bcolors, Logger
-
+from stoobly_agent.lib.logger import bcolors, Logger, DEBUG, INFO, WARNING, ERROR
+from stoobly_agent.lib.intercepted_requests_logger import InterceptedRequestsLogger
 from .constants import custom_response_codes
 from .mock.context import MockContext
 from .mock.eval_fixtures_service import eval_fixtures
@@ -153,6 +153,9 @@ def handle_response_mock(context: MockContext):
 def __handle_mock_failure(context: MockContext) -> None:
     flow = context.flow
     request = flow.request
+    response = context.response
+
+    InterceptedRequestsLogger.error("Mock failure", request=request, response=response)
 
     if request.method.upper() != 'OPTIONS':
         return False
@@ -187,10 +190,12 @@ def __handle_mock_success(context: MockContext) -> None:
         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}")
+            InterceptedRequestsLogger.info("Mock success", request=request, response=response, request_key=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}")
+            InterceptedRequestsLogger.info("Mock success", request=request, response=response, fixture_path=fixture_path)
 
     if os.environ.get(env_vars.AGENT_SIMULATE_LATENCY):
         response = context.response

stoobly_agent/app/proxy/run.py

@@ -138,4 +138,7 @@ def __filter_options(options):
     del options['log_level']
     del options['proxy_host']
     del options['proxy_mode']
-    del options['proxy_port']
+    del options['proxy_port']
+    del options['request_log_enable']
+    del options['request_log_level']
+    del options['request_log_truncate']

stoobly_agent/cli.py

@@ -12,9 +12,9 @@ from stoobly_agent.app.cli.helpers.validations import validate_project_key, vali
 from stoobly_agent.app.cli.intercept_cli import mode_options
 from stoobly_agent.app.proxy.constants import custom_response_codes
 from stoobly_agent.app.proxy.replay.replay_request_service import replay as replay_request
-from stoobly_agent.app.settings.constants import intercept_mode
 from stoobly_agent.config.constants import env_vars, mode
 from stoobly_agent.config.data_dir import DataDir
+from stoobly_agent.lib.intercepted_requests_logger import InterceptedRequestsLogger
 from stoobly_agent.lib.logger import Logger
 from stoobly_agent.lib.utils.conditional_decorator import ConditionalDecorator
 
@@ -123,6 +123,9 @@ def init(**kwargs):
 @click.option('--proxy-port', default=8080, type=click.IntRange(1, 65535), help='Proxy service port.')
 @click.option('--public-directory-path', multiple=True, help='Path to public files. Used for mocking requests. Can take the form <FOLDER-PATH>[:<ORIGIN>].')
 @click.option('--response-fixtures-path', multiple=True, help='Path to response fixtures yaml. Used for mocking requests. Can take the form <FILE-PATH>[:<ORIGIN>].')
+@click.option('--request-log-enable', is_flag=True, default=False, required=False, help='Enable intercepted requests logging')
+@click.option('--request-log-level', default=logger.INFO, type=click.Choice([logger.DEBUG, logger.INFO, logger.WARNING, logger.ERROR]), help='Log level for intercepted requests.')
+@click.option('--request-log-truncate', is_flag=True, default=True, required=False, help='Truncate the intercepted requests log')
 @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, type=click.IntRange(1, 65535), help='UI service port.')
@@ -180,6 +183,18 @@ def run(**kwargs):
       os.environ[env_vars.AGENT_PROXY_URL] = proxy_url
       settings.proxy.url = proxy_url
 
+    if kwargs.get('request_log_enable'):
+      # If truncating, do that first (it handles enable internally)
+      if kwargs.get('request_log_truncate'):
+        InterceptedRequestsLogger.truncate()
+      else:
+        InterceptedRequestsLogger.enable_logger_file()
+
+      # Set log level after logger is enabled
+      request_log_level = kwargs.get('request_log_level')
+      if request_log_level:
+        InterceptedRequestsLogger.set_log_level(request_log_level)
+
     if kwargs.get('detached'):
       # Run in detached mode with output redirection
       import subprocess

stoobly_agent/config/constants/custom_headers.py

@@ -25,6 +25,7 @@ SESSION_ID = 'X-Stoobly-Session-Id'
 SERVICE_URL = 'X-Stoobly-Service-Url'
 TEST_FILTER = 'X-Stoobly-Test-Filter'
 TEST_ID = 'X-Stoobly-Test-Id'
+TEST_NAME = 'X-Stoobly-Test-Name'
 TEST_POLICY = 'X-Stoobly-Test-Policy'
 TEST_SAVE_RESULTS = 'X-Stoobly-Test-Save-Results'
 TEST_SKIP = 'X-Stoobly-Test-Skip'

stoobly_agent/lib/intercepted_requests_logger.py

@@ -0,0 +1,382 @@
+
+import os
+import logging
+import json
+from datetime import datetime
+from typing import Final
+
+from mitmproxy.http import Request as MitmproxyRequest
+from requests import Response
+from stoobly_agent.app.cli.scaffold.constants import WORKFLOW_NAMESPACE_ENV, SERVICE_NAME_ENV
+from stoobly_agent.app.settings import Settings
+from stoobly_agent.app.proxy.intercept_settings import InterceptSettings
+from stoobly_agent.config.data_dir import DataDir
+from stoobly_agent.lib.api.keys.scenario_key import ScenarioKey, InvalidScenarioKey
+from stoobly_agent.lib.api.keys.request_key import RequestKey, InvalidRequestKey
+from stoobly_agent.lib.orm.scenario import Scenario
+from stoobly_agent.lib.orm.request import Request
+from stoobly_agent.lib.logger import DEBUG, ERROR, INFO, WARNING, Logger
+from stoobly_agent.config.constants import custom_headers
+
+
+class InterceptedRequestsLogger():
+    __LOG_ID: Final[str] = "InterceptedRequestsLogger"
+    __logger: Logger = Logger.instance(__LOG_ID)
+
+    __settings: Settings = Settings.instance()
+    __NAMESPACE: str = os.environ.get(WORKFLOW_NAMESPACE_ENV, __settings.proxy.intercept.mode)
+    __file_path: str = None
+    __previous_scenario_key: str = None
+
+    # Initialize logger as disabled by default
+    __logger.disabled = True
+
+    class JSONFormatter(logging.Formatter):
+        def __init__(self, settings: Settings):
+            super().__init__()
+            self.__settings = settings
+
+        def _get_base_ui_url(self) -> str:
+            base_url = self.__settings.ui.url
+
+            # If base URL is not set in settings.yml OR it's set to the URL from within a Scaffold workflow
+            # Then return the localhost URL so users can access it.
+            if not base_url or base_url == 'http://local.stoobly.com:4200':
+                base_url = 'http://localhost:4200'
+            return base_url
+
+        def format(self, record: logging.LogRecord) -> str:
+            # Handle delimiter entries such as when changing scenarios
+            if hasattr(record, 'delimiter'):
+                delimiter_entry = {
+                    "timestamp": datetime.fromtimestamp(record.created).isoformat(),
+                    **record.delimiter
+                }
+                return json.dumps(delimiter_entry)
+
+            log_entry = {
+                "timestamp": datetime.fromtimestamp(record.created).isoformat(),
+                "level": record.levelname,
+                "message": record.getMessage()
+            }
+
+            # Extract fields from request
+            if hasattr(record, 'request') and record.request is not None:
+                request: MitmproxyRequest = record.request
+                log_entry.update({
+                    "method": request.method,
+                    "url": request.pretty_url,
+                })
+
+            # Extract fields from response
+            if hasattr(record, 'response') and record.response is not None:
+                response = record.response
+                log_entry.update({
+                    "status_code": response.status_code,
+                })
+
+            # Set scenario key
+            intercept_settings = InterceptSettings(self.__settings)
+            scenario_key = intercept_settings.scenario_key
+            log_entry.update({
+                "scenario_key": scenario_key
+            })
+
+            # Set scenario name if scenario_key is set
+            scenario_name = ""
+            if scenario_key:
+                scenario_name = InterceptedRequestsLogger._get_scenario_name(scenario_key)
+                log_entry.update({
+                    "scenario_name": scenario_name
+                })
+
+            # Set scaffold service name
+            service_name = ""
+            env_var_service_name = os.environ.get(SERVICE_NAME_ENV)
+            if env_var_service_name:
+                service_name = env_var_service_name
+                log_entry.update({
+                    "service_name": service_name
+                })
+
+            # Set scaffold namespace name
+            env_var_namespace_name = os.environ.get(WORKFLOW_NAMESPACE_ENV)
+            if env_var_namespace_name:
+                log_entry.update({
+                    "namespace": env_var_namespace_name
+                })
+
+            # Set scenario UI URL if scenario_key has a value
+            stoobly_ui_scenario_url = ""
+            if scenario_key:
+                scenario_id = InterceptedRequestsLogger._get_scenario_id(scenario_key)
+                if scenario_id:
+                    base_url = self._get_base_ui_url()
+                    stoobly_ui_scenario_url = f"{base_url}/agent/scenarios/{scenario_id}"
+                log_entry.update({
+                    "stoobly_ui_scenario_url": stoobly_ui_scenario_url
+                })
+
+            # Set request key and UI URL - prioritize passed-in value, fallback to response headers
+            stoobly_ui_request_url = ""
+            request_key = None
+
+            # Check for passed-in request_key first
+            if hasattr(record, 'request_key') and record.request_key is not None:
+                request_key = record.request_key
+            # Fallback to extracting from response headers
+            elif hasattr(record, 'response') and record.response is not None:
+                request_key = InterceptedRequestsLogger._extract_request_key(record.response)
+
+            if request_key:
+                log_entry.update({
+                    "request_key": request_key
+                })
+
+                request_id = InterceptedRequestsLogger._get_request_id(request_key)
+                if request_id:
+                    base_url = self._get_base_ui_url()
+                    stoobly_ui_request_url = f"{base_url}/agent/requests/{request_id}"
+
+                    log_entry.update({
+                        "stoobly_ui_request_url": stoobly_ui_request_url
+                    })
+
+            # Set fixture path if provided
+            if hasattr(record, 'fixture_path') and record.fixture_path is not None:
+                log_entry.update({
+                    "fixture_path": record.fixture_path
+                })
+
+            # Set test name if available in request headers
+            if hasattr(record, 'request') and record.request is not None:
+                request: MitmproxyRequest = record.request
+                if hasattr(request, 'headers') and request.headers:
+                    test_name = request.headers.get(custom_headers.TEST_NAME, "")
+                    if test_name:
+                        log_entry.update({
+                            "test_name": test_name
+                        })
+
+            return json.dumps(log_entry)
+
+    @classmethod
+    def set_file_path(cls, file_path: str) -> None:
+        cls.__file_path = file_path
+
+    @classmethod
+    def reset_scenario_key(cls) -> None:
+        cls.__previous_scenario_key = None
+
+    @classmethod
+    def set_log_level(cls, log_level: str) -> None:
+        # Convert string log level to Python standard logging constants
+        level_mapping = {
+            DEBUG: logging.DEBUG,
+            INFO: logging.INFO,
+            WARNING: logging.WARNING,
+            ERROR: logging.ERROR,
+        }
+
+        numeric_level = level_mapping.get(log_level.lower())
+        if numeric_level is None:
+            raise ValueError(f"Invalid log level: {log_level}. Must be one of: {', '.join(level_mapping.keys())}")
+        cls.__logger.setLevel(numeric_level)
+
+    @classmethod
+    def _get_scenario_name(cls, scenario_key: str) -> str:
+        if not scenario_key:
+            return None
+
+        try:
+            parsed_key = ScenarioKey(scenario_key)
+            scenario = Scenario.find_by(uuid=parsed_key.id)
+            return scenario.name if scenario else None
+        except (InvalidScenarioKey, Exception):
+            return None
+
+    @classmethod
+    def _get_scenario_id(cls, scenario_key: str) -> int:
+        if not scenario_key:
+            return None
+
+        try:
+            parsed_key = ScenarioKey(scenario_key)
+            scenario = Scenario.find_by(uuid=parsed_key.id)
+            return scenario.id if scenario else None
+        except (InvalidScenarioKey, Exception):
+            return None
+
+    @classmethod
+    def _extract_request_key(cls, response) -> str:
+        if not response or not hasattr(response, 'headers'):
+            return None
+
+        try:
+            return response.headers.get('X-Stoobly-Request-Key')
+        except (AttributeError, Exception):
+            return None
+
+    @classmethod
+    def _get_request_id(cls, request_key: str) -> int:
+        if not request_key:
+            return None
+
+        try:
+            parsed_key = RequestKey(request_key)
+            request = Request.find_by(uuid=parsed_key.id)
+            return request.id if request else None
+        except (InvalidRequestKey, Exception):
+            return None
+
+    @classmethod
+    def __get_file_path(cls) -> str:
+        if cls.__file_path is not None:
+            return cls.__file_path
+
+        data_dir_path = DataDir.instance().path
+        return f"{data_dir_path}/tmp/{cls.__NAMESPACE}/logs/requests.json"
+
+    @classmethod
+    def enable_logger_file(cls) -> None:
+        cls.__ensure_directory()
+
+        # Enable the logger before setup so error logging works
+        cls.__logger.disabled = False
+
+        try:
+            # Remove all existing handlers to prevent logging to stdout
+            cls.__logger.handlers.clear()
+            # Prevent propagation to parent loggers which may have console handlers
+            cls.__logger.propagate = False
+
+            file_handler = logging.FileHandler(cls.__get_file_path())
+            json_formatter = cls.JSONFormatter(cls.__settings)
+            file_handler.setFormatter(json_formatter)
+            cls.__logger.addHandler(file_handler)
+
+        except IOError as e:
+            cls.__logger.error(f"Failed to configure logger file output: {e}")
+
+    @classmethod
+    def __log_scenario_change_delimiter(cls, previous_scenario_key: str, current_scenario_key: str) -> None:
+        cls.__ensure_directory()
+
+        previous_name = cls._get_scenario_name(previous_scenario_key)
+        current_name = cls._get_scenario_name(current_scenario_key)
+
+        extra = {
+            'delimiter': {
+                "type": "----- Scenario change delimiter -----",
+                "previous_scenario_key": previous_scenario_key or "",
+                "previous_scenario_name": previous_name or "",
+                "current_scenario_key": current_scenario_key or "",
+                "current_scenario_name": current_name or "",
+            }
+        }
+
+        cls.__logger.info(f"Scenario changed to {current_name or ''}", extra=extra)
+
+    @classmethod
+    def __setup_logging(cls, request: MitmproxyRequest = None, response: Response = None, request_key: str = None, fixture_path: str = None) -> dict:
+        cls.__ensure_directory()
+        cls.__check_scenario_key_changes()
+        extra = {}
+
+        if request is not None:
+            extra['request'] = request
+        if response is not None:
+            extra['response'] = response
+        if request_key is not None:
+            extra['request_key'] = request_key
+        if fixture_path is not None:
+            extra['fixture_path'] = fixture_path
+
+        return extra
+
+    @classmethod
+    def __check_scenario_key_changes(cls) -> None:
+        intercept_settings = InterceptSettings(cls.__settings)
+        current_scenario_key = intercept_settings.scenario_key
+
+        if cls.__previous_scenario_key != current_scenario_key:
+            cls.__log_scenario_change_delimiter(cls.__previous_scenario_key, current_scenario_key)
+            cls.__previous_scenario_key = current_scenario_key
+
+    @classmethod
+    def debug(cls, message: str, *, request: MitmproxyRequest = None, response: Response = None, request_key: str = None, fixture_path: str = None) -> None:
+        extra = cls.__setup_logging(request, response, request_key, fixture_path)
+        cls.__logger.debug(message, extra=extra if extra else None)
+
+    @classmethod
+    def info(cls, message: str, *, request: MitmproxyRequest = None, response: Response = None, request_key: str = None, fixture_path: str = None) -> None:
+        extra = cls.__setup_logging(request, response, request_key, fixture_path)
+        cls.__logger.info(message, extra=extra if extra else None)
+
+    @classmethod
+    def warning(cls, message: str, *, request: MitmproxyRequest = None, response: Response = None, request_key: str = None, fixture_path: str = None) -> None:
+        extra = cls.__setup_logging(request, response, request_key, fixture_path)
+        cls.__logger.warning(message, extra=extra if extra else None)
+
+    @classmethod
+    def error(cls, message: str, *, request: MitmproxyRequest = None, response: Response = None, request_key: str = None, fixture_path: str = None) -> None:
+        extra = cls.__setup_logging(request, response, request_key, fixture_path)
+        cls.__logger.error(message, extra=extra if extra else None)
+
+    @classmethod
+    def dump_logs(cls):
+        file_path = cls.__get_file_path()
+        if not os.path.exists(file_path):
+            return
+
+        try:
+            with open(file_path, 'r', encoding='utf-8') as f:
+                content = f.read()
+                if content.strip():
+                    print(content)
+                else:
+                    print(end='')
+        except IOError as e:
+            cls.__logger.error(f"Failed to read log file: {e}")
+            print(f"Failed to read log file: {e}")
+
+    @classmethod
+    def truncate(cls) -> None:
+        cls.__ensure_directory()
+
+        file_path = cls.__get_file_path()
+
+        if not os.path.exists(file_path):
+            cls.enable_logger_file()
+            return
+
+        try:
+            # Close and remove existing handler to release the file lock
+            for handler in cls.__logger.handlers[:]:
+                if isinstance(handler, logging.FileHandler):
+                    handler.close()
+                    cls.__logger.removeHandler(handler)
+
+            # Now truncate the file
+            with open(file_path, 'w', encoding='utf-8') as f:
+                f.write('')
+
+            # Re-enable logging with a fresh handler
+            cls.enable_logger_file()
+            cls.__logger.debug(f"Cleared log file: {file_path}")
+
+            cls.reset_scenario_key()
+        except IOError as e:
+            cls.__logger.error(f"Failed to clear log file: {e}")
+
+    @classmethod
+    def __ensure_directory(cls):
+        file_path = cls.__get_file_path()
+        directory = os.path.dirname(file_path)
+
+        if directory and not os.path.exists(directory):
+            try:
+                cls.__logger.debug(f"created missing directory: {directory}")
+                os.makedirs(directory, exist_ok=True)
+            except OSError as e:
+                cls.__logger.error(f"Failed to create log directory: {e}")

stoobly_agent/test/app/cli/scaffold/docker/e2e_test.py

@@ -109,11 +109,11 @@ class TestScaffoldE2e():
     def create_scaffold_setup(self, runner, app_dir_path, app_name, target_workflow_name, external_service_docker_compose, external_https_service_docker_compose, local_service_docker_compose, local_service_mock_docker_compose_path):
       ScaffoldCliInvoker.cli_app_create(runner, app_dir_path, app_name)
 
-      # Create external user defined service
+      # Create user defined services
       ScaffoldCliInvoker.cli_service_create(runner, app_dir_path, external_service_docker_compose.hostname, external_service_docker_compose.service_name, False)
       ScaffoldCliInvoker.cli_service_create(runner, app_dir_path, external_https_service_docker_compose.hostname, external_https_service_docker_compose.service_name, True)
 
-      # Create local user defined service
+      # Create user defined custom container services
       ScaffoldCliInvoker.cli_service_create(runner, app_dir_path, local_service_docker_compose.hostname, local_service_docker_compose.service_name, False)
 
       # Validate docker-compose path exists

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

@@ -1 +1 @@
-1.10.2
+1.10.2

{stoobly_agent-1.10.5.dist-info → stoobly_agent-1.11.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: stoobly-agent
-Version: 1.10.5
+Version: 1.11.0
 Summary: Record, mock, and test HTTP(s) requests. CLI agent for Stoobly
 License: Apache-2.0
 License-File: LICENSE

{stoobly_agent-1.10.5.dist-info → stoobly_agent-1.11.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-stoobly_agent/__init__.py,sha256=sxrNGBqNJn6xpatZ-k8nV1eIVOpFpk1_oBfoMJlWMWA,45
+stoobly_agent/__init__.py,sha256=K4x_RYNZ1yt5BujLPBK0239IWwUcGdZ8CwmPVeTMXuY,45
 stoobly_agent/__main__.py,sha256=tefOkFZeCFU4l3C-Y4R_lR9Yt-FETISiXGUnbh6Os54,146
 stoobly_agent/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/api/__init__.py,sha256=NIgcbX7iiWrApsCITXlmhr4SYbWS0fwb01x-F3jTFdo,666
@@ -61,11 +61,11 @@ stoobly_agent/app/cli/helpers/trace_aliases.py,sha256=8N8pnsnONwVv-fabCTvDlXec-W
 stoobly_agent/app/cli/helpers/trace_context_facade.py,sha256=3MDjY_bdhvE2dad_B_w9gemCZZoiVjotbE8o9hrmVYo,1027
 stoobly_agent/app/cli/helpers/validations.py,sha256=o9_DqlAIw98QcMNXGsAnELQ6DeXdSRa1TLiTZu3V7ns,6236
 stoobly_agent/app/cli/helpers/verify_raw_request_service.py,sha256=tmLeRBYhNgAQeJD-rF6Nj22F_TfVktVSb1wjRPFblBQ,658
-stoobly_agent/app/cli/intercept_cli.py,sha256=tgGtl1EZerIdcuMR8KKHdrrn_7-XWSg0D6XdTuSq8k0,6698
+stoobly_agent/app/cli/intercept_cli.py,sha256=ULJPgN21qNBhO97O13HtQplXYlAz1HEOg7y9Y3RnrcM,6698
 stoobly_agent/app/cli/main_group.py,sha256=3UzBxin2f2p5KNqo6Oayo_I1VI2pHpqOoRexUnJ74a4,2187
 stoobly_agent/app/cli/project_cli.py,sha256=EXjeLjbnq9PhfCjvyfZ0UnJ2tejeCS0SIAo3Nc4fKOc,3852
 stoobly_agent/app/cli/report_cli.py,sha256=ZxJw0Xkx7KFZJn9e45BSKRKon8AD0Msrwy1fbPfbv0c,2543
-stoobly_agent/app/cli/request_cli.py,sha256=NVO6alj2acwaYLvU2445yB5qAQIK32Ll19tOErxzNR8,7863
+stoobly_agent/app/cli/request_cli.py,sha256=TEZNAKqDaZClNEJsRq1UcYrH60s0E20OPGfxXDdFOJ4,8448
 stoobly_agent/app/cli/scaffold/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/cli/scaffold/app.py,sha256=7d5nHnQwyBxEwSC2Jrvbk2U3dj9OnhaHrE2zmC37oOs,3922
 stoobly_agent/app/cli/scaffold/app_command.py,sha256=x--ejtVSBL0Jz8OiakBtxfI2IZFAWJWCwuSJo7TEU9Y,2386
@@ -81,29 +81,29 @@ stoobly_agent/app/cli/scaffold/docker/builder.py,sha256=uiGqhxBHEasZAqLzjKUGUs-1
 stoobly_agent/app/cli/scaffold/docker/constants.py,sha256=itm2owGfW53yDrfgkKQ4HIBdiwRC0IPOUTwUT9P78Lw,837
 stoobly_agent/app/cli/scaffold/docker/service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/cli/scaffold/docker/service/build_decorator.py,sha256=fGWtt_TFOaIVirlkUWVKVEhDPmn0A4D53mNSud-qzHg,1019
-stoobly_agent/app/cli/scaffold/docker/service/builder.py,sha256=s1fC8snapTP1_D3LTOJDPVidVURk_Y0Vago2Vn_AdeU,6236
+stoobly_agent/app/cli/scaffold/docker/service/builder.py,sha256=_cTBKTv0X-b1mAEA9GItLvPp8pTHvymgHyNmw04t0V4,6140
 stoobly_agent/app/cli/scaffold/docker/service/configure_gateway.py,sha256=Wsyd2Mche2greULTFYWm-SIhenh-I5hlauSOdGG2urU,4011
 stoobly_agent/app/cli/scaffold/docker/service/types.py,sha256=qB-yYHlu-PZDc0HYgTUvE5bWNpHxaSThC3JUG8okR1k,88
 stoobly_agent/app/cli/scaffold/docker/template_files.py,sha256=oqcocCAyXRJ8aq8M1zVLUUrxU3VU6D6V7ibZUYTr2b4,4724
 stoobly_agent/app/cli/scaffold/docker/workflow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/cli/scaffold/docker/workflow/build_decorator.py,sha256=K9yNlOc_r0vvXZ5BZDwk5IMpzgrx6v-igsTs_8oae6s,720
-stoobly_agent/app/cli/scaffold/docker/workflow/builder.py,sha256=cOPDT2wDiCwk4_6gLpCCUacXe3jzJNtB1HPe32hFPig,4414
+stoobly_agent/app/cli/scaffold/docker/workflow/builder.py,sha256=22uKov9GJ5PqM8bEpKhiqqLexlHIrrAhNphWi104pSc,4396
 stoobly_agent/app/cli/scaffold/docker/workflow/command_decorator.py,sha256=6gVdtTKIOyDlAfzOWefoffp6CtOC7gHz4dUQ6Z9lxWE,874
 stoobly_agent/app/cli/scaffold/docker/workflow/decorators_factory.py,sha256=BkxPzj__rBQa4_WXkfSV71-T9LayFzCOgCLyuJA4s-Q,1174
 stoobly_agent/app/cli/scaffold/docker/workflow/detached_decorator.py,sha256=qrvIYeCgnQNAs4n_g4DfTgO5fl9nW0e6wOIMhFELqXw,1178
 stoobly_agent/app/cli/scaffold/docker/workflow/dns_decorator.py,sha256=DGaSlbOvAAa16buFwQnkGHyqht4VR3rnIBOWr-ImIf8,952
 stoobly_agent/app/cli/scaffold/docker/workflow/local_decorator.py,sha256=xp1TmP8drOyl9Zhm5B1ci6NqPqRFDr2yxipmvSljgiE,717
-stoobly_agent/app/cli/scaffold/docker/workflow/mock_decorator.py,sha256=QO1TbAj6QthIyHvy7itV_d9NteNcjClYaan1GX-0kLc,1201
+stoobly_agent/app/cli/scaffold/docker/workflow/mock_decorator.py,sha256=CJyO_0Oo3pUrafqmdqLl5bJIj35zKohl8PVGgokRfW4,1245
 stoobly_agent/app/cli/scaffold/docker/workflow/reverse_proxy_decorator.py,sha256=tSPnscsBZusBaSt_NlB4exrZ2MnWMRAUJgw_NaEdHiw,1199
-stoobly_agent/app/cli/scaffold/docker/workflow/run_command.py,sha256=aqRVHTbCooan8zTMfKjxEjssf255YTEdLzoPUXna29o,18010
+stoobly_agent/app/cli/scaffold/docker/workflow/run_command.py,sha256=LLiC7KCgo9ZlmXcdaidmcN449GuDK_8dYykCNFjfhyo,18217
 stoobly_agent/app/cli/scaffold/env.py,sha256=dT33tHoQaUxfsFCYm8kfaAv-qPVrUPmNFQmLnFQhZeQ,1107
 stoobly_agent/app/cli/scaffold/hosts_file_manager.py,sha256=zNX5wh6zXQ4J2BA0YYdD7_CPqDz02b_ghXsY3oTjjB4,4999
 stoobly_agent/app/cli/scaffold/local/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/cli/scaffold/local/service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-stoobly_agent/app/cli/scaffold/local/service/builder.py,sha256=uZNPIQWo4UcLy3bcE6Wvntle6ONPpWjS5oAq3g0Punk,1852
+stoobly_agent/app/cli/scaffold/local/service/builder.py,sha256=9awizOv_LYAWgEXVguQOLZhO8gGEa_X_x1MRsQJEioU,1522
 stoobly_agent/app/cli/scaffold/local/workflow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-stoobly_agent/app/cli/scaffold/local/workflow/builder.py,sha256=O8Iwyd231-ciQWkiGB5HAiFJXMDUtXIoyl0S_Jrj3lQ,806
-stoobly_agent/app/cli/scaffold/local/workflow/run_command.py,sha256=BJrG5g-c4kf_cgQ1hE41KUKQsvtwVVKzaTgQ7eCaPUk,15625
+stoobly_agent/app/cli/scaffold/local/workflow/builder.py,sha256=EghacafZjr06igvQtWTjt9vwILHtJxSl3rPEW-VD6iU,828
+stoobly_agent/app/cli/scaffold/local/workflow/run_command.py,sha256=7XhI6X-TKAGv-HuOvh6Knm7R5DDpfi8ZZ8BJnHQwGtY,15956
 stoobly_agent/app/cli/scaffold/managed_services_docker_compose.py,sha256=-wLBXUi7DCWsfm5KzZzd_kdJKOTl1NT924XR7dyjbSY,574
 stoobly_agent/app/cli/scaffold/service.py,sha256=74JwjTRRkk6lo-k9hre1iGztbKa9zDqjPVx3Qgpze-s,699
 stoobly_agent/app/cli/scaffold/service_command.py,sha256=j-lkG5Zth_CBHa6Z9Kv3dJwxX9gylFBZMZbW691R8ZU,1480
@@ -114,11 +114,11 @@ stoobly_agent/app/cli/scaffold/service_dependency.py,sha256=olr_s_cfn51Pz5FlIihl
 stoobly_agent/app/cli/scaffold/service_docker_compose.py,sha256=fVUZ-oo-bn5GVZp8JgGq7AkiQQ6-JkxwK_OMlinS9WM,915
 stoobly_agent/app/cli/scaffold/service_update_command.py,sha256=oWusBKfvjt4RnK03_V3CJYWrfsCI4_LcR7W12eLXMR4,2579
 stoobly_agent/app/cli/scaffold/service_workflow.py,sha256=sQ_Edy_wGHKMXpD0DmhnOWkGEKz7gSgEGNI8f7aXOdg,444
-stoobly_agent/app/cli/scaffold/service_workflow_validate_command.py,sha256=DPYLBAwUsh4C8ho-4SwjBe32xuBSUpWlWgRF9JIbKRc,11768
+stoobly_agent/app/cli/scaffold/service_workflow_validate_command.py,sha256=uV5HcgWZu1RubPImVDyIUlZUNTok4Qr6CueQQswBoF8,11788
 stoobly_agent/app/cli/scaffold/templates/__init__.py,sha256=x8C_a0VoO_vUbosp4_6IC1U7Ge9NnUdVKDPpVMtMkeY,171
-stoobly_agent/app/cli/scaffold/templates/app/.Dockerfile.context,sha256=9DQK-OXnRKjjKWsUSIRAio6dkR4eGxD1vizPT7Q5sp8,159
-stoobly_agent/app/cli/scaffold/templates/app/.Makefile,sha256=9E46Dzs3xCKy2fP6L6Q4DxourYxrwKCcoUhEf3Y7DEs,9619
-stoobly_agent/app/cli/scaffold/templates/app/.docker-compose.base.yml,sha256=SABod6_InBFyOm-uulK7r27SR0sWRUiL0h69g_jvNJA,249
+stoobly_agent/app/cli/scaffold/templates/app/.Dockerfile.context,sha256=tQgVLNA2SWy1K_dl-loPKau55F3nyPp4vhCppol-fiQ,160
+stoobly_agent/app/cli/scaffold/templates/app/.Makefile,sha256=cywqyJkxHDRr3JOQSwx0pFwSi-b_iw6GzHxeIoVP66k,10028
+stoobly_agent/app/cli/scaffold/templates/app/.docker-compose.base.yml,sha256=cs6bRu6p8djhTKRic9UFTZujlNpHGudR2SrKauntmHg,381
 stoobly_agent/app/cli/scaffold/templates/app/.docker-compose.networks.yml,sha256=I4PbJpQjFHb5IbAUWNvYM6okDEtmwtKFDQg-yog05WM,141
 stoobly_agent/app/cli/scaffold/templates/app/Makefile,sha256=TEmPG7Bf0KZOnmfsgdzza3UdwcVMmM5Lj1YdLc4cgjA,79
 stoobly_agent/app/cli/scaffold/templates/app/build/.config.yml,sha256=8Wt8ZZ5irvBYYS44xGrR_EWlZDuXH9kyWmquzsh7s8g,19
@@ -160,8 +160,8 @@ stoobly_agent/app/cli/scaffold/templates/app/gateway/test/.docker-compose.yml,sh
 stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/.config.yml,sha256=XnLQZMzzMMIwVycjyPN5QXsmRztkTFAna1kIHYuDfJQ,19
 stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/.docker-compose.base.yml,sha256=W6cUnaJ6dmq4VOgrue_YaW4TyFx9zd4YrrRsxOimPEA,140
 stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/.docker-compose.yml,sha256=_lku3K0t2TRLMOcoSKcisCLQO_YCXZoevr_q6anjhL8,327
-stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/mock/.docker-compose.yml,sha256=06goBt7JXmt1jv5PPFp6T2D8mXkakPnoFMrCruYugLo,344
-stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/record/.docker-compose.yml,sha256=06goBt7JXmt1jv5PPFp6T2D8mXkakPnoFMrCruYugLo,344
+stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/mock/.docker-compose.yml,sha256=e4Bjb0deT6afbjHWG9aPLj83uJrcgeZq0xR0gOpPMBE,342
+stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/record/.docker-compose.yml,sha256=e4Bjb0deT6afbjHWG9aPLj83uJrcgeZq0xR0gOpPMBE,342
 stoobly_agent/app/cli/scaffold/templates/build/services/build/mock/.configure,sha256=B9re5KYSNfvbcawVQnU5JX-RdAWEjWP3327L29dTEK0,392
 stoobly_agent/app/cli/scaffold/templates/build/services/build/mock/.init,sha256=wyh47rAOxaqOa_O-t0kaqZE6aAc0h5bsX4t-PSkVPJM,302
 stoobly_agent/app/cli/scaffold/templates/build/services/build/mock/.run,sha256=0ib4oiLYiU-27nwhHFCNzQXz4fsAxypYECoAhZhkVUI,239
@@ -182,6 +182,7 @@ stoobly_agent/app/cli/scaffold/templates/build/services/entrypoint/test/.init,sh
 stoobly_agent/app/cli/scaffold/templates/build/services/entrypoint/test/.run,sha256=LQs_bJiN3LaC0eJnaF_Fnrr9ZIlxkaM8tnWMxjCovXM,446
 stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/intercept/.disable,sha256=xVf4Pk1RLvJm7Ff0rbGoWhYHPv0ME5e93fxS2yFqLnE,45
 stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/intercept/.enable,sha256=sfUSPG4uHdXX95BLgivXQYLbsLBP2DjJIiSTXRtvXuY,188
+stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/request/log/.list,sha256=JyfIkHOJbkjkJMibFVdRNDGtgSMRNE1PEHJEOZMY7tE,88
 stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/scaffold/.down,sha256=Eb-DY3NYLBny2Akx4R3ckqHqi_5gzYKNp9tJgFbeFOQ,205
 stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/scaffold/.logs,sha256=ebsSW7N3RbT4asqDVpdKWzztC3FZxXLpjnxsiblMSGQ,184
 stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/scaffold/.mkcert,sha256=vyHaXmvy-7oL2RD8rIxwT-fdJS5kXmB0yHK5fRMo_cM,46
@@ -240,7 +241,7 @@ stoobly_agent/app/cli/scaffold/workflow_create_command.py,sha256=5gSkxNxrXLeobLU
 stoobly_agent/app/cli/scaffold/workflow_env.py,sha256=shPjoX1SWe7K6pGpZvw2fPVHWd6j_azTe58jvOjGUns,607
 stoobly_agent/app/cli/scaffold/workflow_log_command.py,sha256=Bke4lMOMxuDUFuAx9nlXHbKgYMO4KAg9ASHvjz4aVWc,1372
 stoobly_agent/app/cli/scaffold/workflow_namesapce.py,sha256=VNaZrcqMMeqrzpPGhD9-oaZems1k0ebRc6wR74EvA8c,1170
-stoobly_agent/app/cli/scaffold/workflow_run_command.py,sha256=35wxoc9qH3ZGuPcKgFGQLEMvGwDVWbjpXqve4iz2wBY,6185
+stoobly_agent/app/cli/scaffold/workflow_run_command.py,sha256=IPKQyKZ5zZ1fBn5JyT5dEZxCLzW7gFbkLywWEmArBMg,6248
 stoobly_agent/app/cli/scaffold/workflow_validate_command.py,sha256=Uo_yo6rVR1ZR7xpvsQvlH48AyMBVLRupd4G-bRjzm_Q,5584
 stoobly_agent/app/cli/scaffold_cli.py,sha256=YnRKrC_XQ5OdQ1tgA-oL4rmamw70DlMm17SqIAQ9sfU,33677
 stoobly_agent/app/cli/scenario_cli.py,sha256=lA9a4UNnLzrbJX5JJE07KGb5i9pBd2c2vdFUW6_7k0E,8345
@@ -350,7 +351,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=worESliNvSoyVg8EvlC51aN4aaPA8k-FzuwlidIC4U8,9461
+stoobly_agent/app/proxy/handle_mock_service.py,sha256=t05JS8LTWWbAh06hQ_4C1gi2TzdF6VIQmckuTD6-QAc,9936
 stoobly_agent/app/proxy/handle_record_service.py,sha256=TXIxT5zYOCd96LoINvpCPm2PSnwCAPQQLqfjch9iVlo,4516
 stoobly_agent/app/proxy/handle_replay_service.py,sha256=6gB3y6xT6WEXduxFgK5bd3xiH2utrsfDSBV4i2Ai34Y,3085
 stoobly_agent/app/proxy/handle_test_service.py,sha256=WkMPbM4argVtl-TQB7VdQIvB8cOwURAahxFX5Vkqwws,8405
@@ -396,7 +397,7 @@ stoobly_agent/app/proxy/replay/replay_request_service.py,sha256=pRsKx3d7caXiHrEH
 stoobly_agent/app/proxy/replay/replay_scenario_service.py,sha256=9jV-iO5EBg8geUblEtjjWRFIkom_Pqmo7P-lTc3S4Xw,2824
 stoobly_agent/app/proxy/replay/rewrite_params_service.py,sha256=jEHlT6_OHq_VBa09Hd6QaRyErv7tZnziDvW7m3Q8CQg,2234
 stoobly_agent/app/proxy/replay/trace_context.py,sha256=lKpnQWVCUTcMPE-SOi90za3U1yL0VeBlIgj_KP63VsE,10435
-stoobly_agent/app/proxy/run.py,sha256=4TclB013474dHhIax__0qpM_UZH9YnMvrlymp8qUcIQ,3977
+stoobly_agent/app/proxy/run.py,sha256=viThhDVG0WR5r0xMTU6-9zgJW08S6WEAAMn_f5t77tw,4093
 stoobly_agent/app/proxy/settings.py,sha256=R0LkSa9HrkUXvCd-nur4syJePjbQZdlnAnOPpGnCx38,2172
 stoobly_agent/app/proxy/simulate_intercept_service.py,sha256=R-L2dh2dfYFebttWXU0NwyxFI_jP6Ud36oKPC-T8HiI,1942
 stoobly_agent/app/proxy/test/__init__.py,sha256=uW0Ab27oyH2odTeVRjcuUJF8A1FLbTT5sBMzhGZr1so,89
@@ -458,11 +459,11 @@ stoobly_agent/app/settings/types/remote_settings.py,sha256=4PvEGKULXM0zv29XTDzV7
 stoobly_agent/app/settings/types/ui_settings.py,sha256=BqPy2F32AbODqzi2mp2kRk28QVUydQIwVmvftn46pco,84
 stoobly_agent/app/settings/ui_settings.py,sha256=D4sP26dEhOlGPdeQgm4GyAYN3ENWXkfZ9s0ETlt3QEI,1175
 stoobly_agent/app/settings/url_rule.py,sha256=Qx7YrIpVRSC-4LeNiCAfCtE50Jou4423hojMW-4qUYg,954
-stoobly_agent/cli.py,sha256=FLoD1cldpv8UIH4WEdng8wiX1B9wl9mOZ7QjVFcz_SA,13482
+stoobly_agent/cli.py,sha256=Lre8Nu99cjhwOh0znXUjKFB1LSI1bV7aKghJOe273F0,14406
 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=4143apfSnmVHykFXum-lJzC3jw0q1SPEElL9iRZojfg,1444
+stoobly_agent/config/constants/custom_headers.py,sha256=NDuZ25zdtgObs_xoZ9BBXXwrFGCr6akyWJPnIZcSNus,1478
 stoobly_agent/config/constants/env_vars.py,sha256=pS6U1RHFljamBfoVyPiroH3SVy4-sTeESo6p5n19yls,1408
 stoobly_agent/config/constants/headers.py,sha256=Hfv7R8_NPXAGaMiZPqywGZDnr0qcVUyfenPb4g465rE,169
 stoobly_agent/config/constants/intercept_policy.py,sha256=5hIgOft8PQmCRdOHb5OEvEj10tU66DIQF3GYltlWyM8,25
@@ -546,6 +547,7 @@ stoobly_agent/lib/api/test_responses_resource.py,sha256=RdNj7N6xC7jW5zUoKfgNg8Ne
 stoobly_agent/lib/api/tests_resource.py,sha256=EKyI0xTgzRSPyGdepgteVH3EHUkXIzrt3HXahBau6CY,855
 stoobly_agent/lib/api/users_resource.py,sha256=xR0ug5xifuvRw4jdF4cVjrWBdkFccmL9_fy8ZxOPX74,477
 stoobly_agent/lib/cache.py,sha256=7sYq2wh6I5LmtKqvJYoY89h_PvZ21zvS9pCBCEutuCM,2266
+stoobly_agent/lib/intercepted_requests_logger.py,sha256=82ZfwV27NZGIWRArL7Oqv9LX66k2I-MqVcOccDrOdVU,14923
 stoobly_agent/lib/logger.py,sha256=6s_8UxXLJt1jor-Ez0xCBWhuAD932sTEBQBnNXpFTtQ,1971
 stoobly_agent/lib/orm/__init__.py,sha256=UCAL40_L9qf1sUqvUWKzc551jKLR4HKqRNLPdOuXl2w,1199
 stoobly_agent/lib/orm/base.py,sha256=3PZx0OWK241vrr8pLLQL0GFhKxvYVDFyVMMdYzhxMPM,358
@@ -723,7 +725,7 @@ stoobly_agent/test/app/cli/request/request_snapshot_test.py,sha256=3kMmv0CuvnMXL
 stoobly_agent/test/app/cli/request/request_test_test.py,sha256=-cJNXKjgryVVfVt-7IN5fIhBwe3NjFoPmeavDH8lAjU,5527
 stoobly_agent/test/app/cli/scaffold/docker/cli_invoker.py,sha256=W4ZZgrgUU0hBm_l0x04eR_9eGVyfbLSMbDVGqhpi2qE,5391
 stoobly_agent/test/app/cli/scaffold/docker/cli_test.py,sha256=wkYnRQo8OBDds-pGmdc2cYs5yxgO_2GiDxzI1imGntc,4301
-stoobly_agent/test/app/cli/scaffold/docker/e2e_test.py,sha256=RxHvIMyVhpXy0fkfCJPFLZ2DtyC3dieVGETWOq-rQos,13655
+stoobly_agent/test/app/cli/scaffold/docker/e2e_test.py,sha256=cdsXrN1YK4s2mugGWC2NCFOsgcebaPugEEUh6rxsP1w,13659
 stoobly_agent/test/app/cli/scaffold/hosts_file_manager_test.py,sha256=ztcPh1x0ZCW1FWA5YL4ulEVjfbW9TOPgk1bnSDPNmCw,2287
 stoobly_agent/test/app/cli/scaffold/local/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/test/app/cli/scaffold/local/cli_invoker.py,sha256=YLQuz5JjvzfqFKk-BFT-Bl9EZgj37ZDZtwNsvqNRDHA,4138
@@ -755,7 +757,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=NNWX20PKU7L9csy90a96D-I4wsC4Mh2tj0OhYTFD_GI,6
+stoobly_agent/test/app/models/schemas/.stoobly/db/VERSION,sha256=UAIPUXjU5C_KBbJFX74l8Kihm3U3urn6h0KexeviDeE,7
 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
@@ -797,8 +799,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=6v4AHeqYPw7vtRoxET_ubmRWPJoSmTR_DVHay3FxNbQ,1299
-stoobly_agent-1.10.5.dist-info/METADATA,sha256=7QB_Saw0H6Pz_qkMRM9HKiXta5p-noQJIMFN5lGVm4g,3203
-stoobly_agent-1.10.5.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-stoobly_agent-1.10.5.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
-stoobly_agent-1.10.5.dist-info/licenses/LICENSE,sha256=o93sj12cdoEOsTCjPaPFsw3Xq0SXs3pPcY-9reE2sEw,548
-stoobly_agent-1.10.5.dist-info/RECORD,,
+stoobly_agent-1.11.0.dist-info/METADATA,sha256=MMcUv_P6qdNNHfgupNdDP4MYHuqfN7rth4YkbS_c1gc,3203
+stoobly_agent-1.11.0.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+stoobly_agent-1.11.0.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
+stoobly_agent-1.11.0.dist-info/licenses/LICENSE,sha256=o93sj12cdoEOsTCjPaPFsw3Xq0SXs3pPcY-9reE2sEw,548
+stoobly_agent-1.11.0.dist-info/RECORD,,