stoobly-agent 1.5.9__py3-none-any.whl → 1.6.1__py3-none-any.whl

stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.5.9'
+VERSION = '1.6.1'

stoobly_agent/app/cli/scaffold/constants.py

@@ -46,12 +46,14 @@ WORKFLOW_CONTAINER_TEMPLATE = '{service_name}.{container}'
 WORKFLOW_CONTAINER_CONFIGURE_TEMPLATE = '{service_name}.' + WORKFLOW_CONTAINER_CONFIGURE
 WORKFLOW_CONTAINER_INIT_TEMPLATE = '{service_name}.' + WORKFLOW_CONTAINER_INIT
 WORKFLOW_CONTAINER_PROXY_TEMPLATE = '{service_name}.' + WORKFLOW_CONTAINER_PROXY
+WORKFLOW_EXEC_TYPE = 'exec'
 WORKFLOW_MOCK_TYPE = 'mock'
 WORKFLOW_NAME = '${WORKFLOW_NAME}'
 WORKFLOW_NAME_ENV = 'WORKFLOW_NAME'
 WORKFLOW_NAMESPACE_ENV = 'WORKFLOW_NAMESPACE'
 WORKFLOW_RECORD_TYPE = 'record'
+WORKFLOW_TEMPLATE = '${WORKFLOW_TEMPLATE}'
+WORKFLOW_TEMPLATE_ENV = 'WORKFLOW_TEMPLATE'
 WORKFLOW_TEST_TYPE = 'test'
 
-WORKFLOW_TEMPLATE = Literal[WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE, WORKFLOW_TEST_TYPE]
-
+WORKFLOW_TEMPLATE_OPTION = Literal[WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE, WORKFLOW_TEST_TYPE]

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

@@ -2,7 +2,7 @@ import os
 import pdb
 
 from ...app_config import AppConfig
-from ...constants import SERVICE_HOSTNAME, SERVICE_HOSTNAME_ENV, SERVICE_NAME, STOOBLY_HOME_DIR, WORKFLOW_NAME
+from ...constants import SERVICE_HOSTNAME, SERVICE_HOSTNAME_ENV, WORKFLOW_TEMPLATE
 from ...service_config import ServiceConfig
 from ..app_builder import AppBuilder
 from ..builder import Builder
@@ -92,7 +92,7 @@ class ServiceBuilder(Builder):
   def build_init_base(self):
     environment = {}
     self.with_service(self.init_base, {
-      'command': ['bin/.init'],
+      'command': [f"/usr/local/bin/workflows/{WORKFLOW_TEMPLATE}/.init", 'bin/init'],
       'environment': environment,
       'extends': {
         'file': os.path.relpath(self.app_builder.compose_file_path, self.dir_path),
@@ -103,7 +103,7 @@ class ServiceBuilder(Builder):
   def build_configure_base(self):
     environment = {}
     self.with_service(self.configure_base, {
-      'command': ['bin/.configure'],
+      'command': [f"/usr/local/bin/workflows/{WORKFLOW_TEMPLATE}/.configure", 'bin/configure'],
       'environment': environment,
       'extends': {
         'file': os.path.relpath(self.app_builder.compose_file_path, self.dir_path),

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

@@ -1,4 +1,4 @@
-FROM stoobly/agent:1.5
+FROM stoobly/agent:1.6
 
 ARG USER_ID
 

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

@@ -70,7 +70,7 @@ ca-cert/install: stoobly/install
 		fi \
 	fi
 certs:
-	@export EXEC_COMMAND=bin/.mkcert && \
+	@export EXEC_COMMAND=.mkcert && \
 	$(stoobly_exec)
 command/install:
 	$(eval COMMAND=install)
@@ -91,10 +91,10 @@ nameservers: tmpdir
 		exit 1; \
 	fi
 intercept/disable:
-	@export EXEC_COMMAND=bin/.disable && \
+	@export EXEC_COMMAND=.disable && \
 	$(stoobly_exec)
 intercept/enable:
-	@export EXEC_COMMAND=bin/.enable && \
+	@export EXEC_COMMAND=.enable && \
 	export EXEC_ARGS=$(scenario_key) && \
 	$(stoobly_exec)
 mock: workflow/mock ca-cert/install workflow/hostname/install nameservers workflow/up
@@ -117,30 +117,30 @@ record/services: workflow/record workflow/services
 record/logs: workflow/record workflow/logs
 scenario/create:
 # Create a scenario
-	@export EXEC_COMMAND=bin/.create && \
+	@export EXEC_COMMAND=.create && \
 	export EXEC_OPTIONS="$(options)" && \
 	export EXEC_ARGS="$(name)" && \
 	$(stoobly_exec)
 scenario/delete:
 # Delete a scenario
-	@export EXEC_COMMAND=bin/.delete && \
+	@export EXEC_COMMAND=.delete && \
 	export EXEC_OPTIONS="$(options)" && \
 	export EXEC_ARGS="$(key)" && \
 	$(stoobly_exec)
 scenario/list:
 # List scenarios
-	@export EXEC_COMMAND=bin/.list && \
+	@export EXEC_COMMAND=.list && \
 	export EXEC_OPTIONS="$(options)" && \
 	$(stoobly_exec)
 scenario/reset:
 # Resets a scenario to its last snapshot
-	@export EXEC_COMMAND=bin/.reset && \:
+	@export EXEC_COMMAND=.reset && \:
 	export EXEC_OPTIONS="$(options)" && \
 	export EXEC_ARGS="$(key)" && \
 	$(stoobly_exec)
 scenario/snapshot:
 # Create committable files for a scenario
-	@export EXEC_COMMAND=bin/.snapshot && \
+	@export EXEC_COMMAND=.snapshot && \
 	export EXEC_OPTIONS="$(options)" && \
 	export EXEC_ARGS="$(key)" && \
 	$(stoobly_exec)
@@ -156,7 +156,7 @@ test/down: workflow/test workflow/down exec/down
 tmpdir:
 	@mkdir -p $(app_tmp_dir)
 workflow/down:
-	@export EXEC_COMMAND=bin/.down && \
+	@export EXEC_COMMAND=.down && \
 	export EXEC_OPTIONS="$(user_id_option) $(workflow_run_options) $(options)" && \
 	export EXEC_ARGS="$(WORKFLOW)" && \
 	$(stoobly_exec_run) && \
@@ -176,7 +176,7 @@ workflow/hostname: stoobly/install
 workflow/hostname/install: command/install workflow/hostname
 workflow/hostname/uninstall: command/uninstall workflow/hostname  
 workflow/logs:
-	@export EXEC_COMMAND=bin/.logs && \
+	@export EXEC_COMMAND=.logs && \
 	export EXEC_OPTIONS="$(workflow_run_options) $(options)" && \
 	export EXEC_ARGS="$(WORKFLOW)" && \
 	$(stoobly_exec_run) && \
@@ -186,14 +186,14 @@ workflow/mock:
 workflow/record:
 	$(eval WORKFLOW=record)
 workflow/services:
-	@export EXEC_COMMAND=bin/.services && \
+	@export EXEC_COMMAND=.services && \
 	export EXEC_OPTIONS="$(workflow_service_options) $(options)" && \
 	export EXEC_ARGS="$(WORKFLOW)" && \
 	$(stoobly_exec_run)
 workflow/test:
 	$(eval WORKFLOW=test)
 workflow/up:
-	@export EXEC_COMMAND=bin/.up && \
+	@export EXEC_COMMAND=.up && \
 	export EXEC_OPTIONS="$(user_id_option) $(workflow_up_options) $(workflow_run_options) $(options)" && \
 	export EXEC_ARGS="$(WORKFLOW)" && \
 	$(stoobly_exec_run) && \

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

@@ -1,14 +1,16 @@
 services:
-  build.init_base:
+  build.configure_base:
     command: 
-    - bin/.init
+    - /usr/local/bin/services/${SERVICE_NAME}/${WORKFLOW_TEMPLATE}/.configure
+    - bin/configure
     extends:
       file: ../.docker-compose.base.yml
       service: context_base
     working_dir: /home/stoobly/.stoobly/docker/build/${WORKFLOW_NAME}
-  build.configure_base:
+  build.init_base:
     command: 
-    - bin/.configure
+    - /usr/local/bin/services/${SERVICE_NAME}/${WORKFLOW_TEMPLATE}/.init
+    - bin/init
     extends:
       file: ../.docker-compose.base.yml
       service: context_base

stoobly_agent/app/cli/scaffold/templates/app/build/mock/bin/configure

@@ -1 +1,3 @@
-#!/bin/bash
+#!/bin/bash
+
+# Add custom configuration here

stoobly_agent/app/cli/scaffold/templates/app/build/mock/bin/init

@@ -1 +1,3 @@
-#! /bin/bash
+#! /bin/bash
+
+# Add custom initialization here

stoobly_agent/app/cli/scaffold/templates/app/build/record/bin/init

@@ -1 +1,3 @@
-#! /bin/bash
+#! /bin/bash
+
+# Add custom initialization here

stoobly_agent/app/cli/scaffold/templates/app/build/test/bin/configure

@@ -1 +1,3 @@
-#!/bin/bash
+#!/bin/bash
+
+# Add custom configuration here

stoobly_agent/app/cli/scaffold/templates/app/build/test/bin/init

@@ -1 +1,3 @@
-#! /bin/bash
+#! /bin/bash
+
+# Add custom initialization here

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

@@ -2,7 +2,8 @@ networks: {}
 services:
   entrypoint.configure_base:
     command:
-    - bin/.configure
+    - /usr/local/bin/services/${SERVICE_NAME}/${WORKFLOW_TEMPLATE}/.configure
+    - bin/configure
     environment: {}
     extends:
       file: ../.docker-compose.base.yml
@@ -10,7 +11,8 @@ services:
     working_dir: /home/stoobly/.stoobly/docker/entrypoint/${WORKFLOW_NAME}
   entrypoint.init_base:
     command:
-    - bin/.init
+    - /usr/local/bin/services/${SERVICE_NAME}/${WORKFLOW_TEMPLATE}/.init
+    - bin/init
     environment: {}
     extends:
       file: ../.docker-compose.base.yml

stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/bin/configure

@@ -1 +1,3 @@
-#!/bin/bash
+#!/bin/bash
+
+# Add custom configuration here

stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/bin/init

@@ -1 +1,3 @@
-#! /bin/bash
+#! /bin/bash
+
+# Add custom initialization here

stoobly_agent/app/cli/scaffold/templates/app/entrypoint/record/bin/configure

@@ -1 +1,3 @@
-#!/bin/bash
+#!/bin/bash
+
+# Add custom configuration here

stoobly_agent/app/cli/scaffold/templates/app/entrypoint/record/bin/init

@@ -1 +1,3 @@
-#! /bin/bash
+#! /bin/bash
+
+# Add custom initialization here

stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/bin/configure

@@ -1 +1,3 @@
-#!/bin/bash
+#!/bin/bash
+
+# Add custom configuration here

stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/bin/init

@@ -1 +1,3 @@
-#! /bin/bash
+#! /bin/bash
+
+# Add custom initialization here

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

@@ -1,6 +1,6 @@
 services:
   stoobly_ui.command:
-    command: ['.stoobly/docker/stoobly-ui/exec/${EXEC_COMMAND}', '${EXEC_ARGS}']
+    command: ['/usr/local/bin/workflows/exec/${EXEC_COMMAND}', '${EXEC_ARGS}']
     environment:
       EXEC_OPTIONS: ${EXEC_OPTIONS}
     extends:

stoobly_agent/app/cli/scaffold/templates/{app/build/record/bin → build/services/build/mock}/.configure

@@ -5,4 +5,8 @@
 
 stoobly-agent config reset
 
-cd $(dirname -- "$0") && ./configure
+entrypoint=$1
+
+if [ -e "$entrypoint" ]; then
+  "$entrypoint"
+fi

stoobly_agent/app/cli/scaffold/templates/{app/build/record/bin → build/services/build/mock}/.init

@@ -5,4 +5,8 @@
 
 stoobly-agent snapshot apply
 
-cd $(dirname -- "$0") && ./init
+entrypoint=$1
+
+if [ -e "$entrypoint" ]; then
+  "$entrypoint"
+fi

stoobly_agent/app/cli/scaffold/templates/build/services/build/record/.configure

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# This file was automatically generated. DO NOT EDIT.
+# Any changes made to this file will be overwritten.
+
+stoobly-agent config reset
+
+entrypoint=$1
+
+if [ -e "$entrypoint" ]; then
+  "$entrypoint"
+fi

stoobly_agent/app/cli/scaffold/templates/build/services/build/record/.init

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# This file was automatically generated. DO NOT EDIT.
+# Any changes made to this file will be overwritten.
+
+stoobly-agent snapshot apply
+
+entrypoint=$1
+
+if [ -e "$entrypoint" ]; then
+  "$entrypoint"
+fi

stoobly_agent/app/cli/scaffold/templates/build/services/build/test/.configure

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# This file was automatically generated. DO NOT EDIT.
+# Any changes made to this file will be overwritten.
+
+stoobly-agent config reset
+
+entrypoint=$1
+
+if [ -e "$entrypoint" ]; then
+  "$entrypoint"
+fi

stoobly_agent/app/cli/scaffold/templates/build/services/build/test/.init

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# This file was automatically generated. DO NOT EDIT.
+# Any changes made to this file will be overwritten.
+
+stoobly-agent snapshot apply
+
+entrypoint=$1
+
+if [ -e "$entrypoint" ]; then
+  "$entrypoint"
+fi

stoobly_agent/app/cli/scaffold/templates/{app/entrypoint/test/bin → build/services/entrypoint/mock}/.configure

@@ -1,12 +1,15 @@
 #!/bin/bash
 
+# This file was automatically generated. DO NOT EDIT.
+# Any changes made to this file will be overwritten.
+
 echo "Configuring intercept..."
 stoobly-agent intercept configure --mode mock --policy all
 
 echo "Enabling intercept..."
 stoobly-agent intercept enable
 
-entrypoint=$(dirname -- "$0")/configure
+entrypoint=$1
 
 if [ -e "$entrypoint" ]; then
   "$entrypoint"

stoobly_agent/app/cli/scaffold/templates/build/services/entrypoint/mock/.init

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# This file was automatically generated. DO NOT EDIT.
+# Any changes made to this file will be overwritten.
+
+entrypoint=$1
+
+if [ -e "$entrypoint" ]; then
+  "$entrypoint"
+fi

stoobly_agent/app/cli/scaffold/templates/{app/entrypoint/record/bin → build/services/entrypoint/record}/.configure

@@ -1,12 +1,15 @@
 #!/bin/bash
 
+# This file was automatically generated. DO NOT EDIT.
+# Any changes made to this file will be overwritten.
+
 echo "Configuring intercept..."
 stoobly-agent intercept configure --mode record --policy all
 
 echo "Disabling intercept..."
 stoobly-agent intercept disable
 
-entrypoint=$(dirname -- "$0")/configure
+entrypoint=$1
 
 if [ -e "$entrypoint" ]; then
   "$entrypoint"

stoobly_agent/app/cli/scaffold/templates/build/services/entrypoint/record/.init

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# This file was automatically generated. DO NOT EDIT.
+# Any changes made to this file will be overwritten.
+
+entrypoint=$1
+
+if [ -e "$entrypoint" ]; then
+  "$entrypoint"
+fi

stoobly_agent/app/cli/scaffold/templates/{app/entrypoint/mock/bin → build/services/entrypoint/test}/.configure

@@ -1,12 +1,15 @@
 #!/bin/bash
 
+# This file was automatically generated. DO NOT EDIT.
+# Any changes made to this file will be overwritten.
+
 echo "Configuring intercept..."
 stoobly-agent intercept configure --mode mock --policy all
 
 echo "Enabling intercept..."
 stoobly-agent intercept enable
 
-entrypoint=$(dirname -- "$0")/configure
+entrypoint=$1
 
 if [ -e "$entrypoint" ]; then
   "$entrypoint"

stoobly_agent/app/cli/scaffold/templates/build/services/entrypoint/test/.init

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# This file was automatically generated. DO NOT EDIT.
+# Any changes made to this file will be overwritten.
+
+entrypoint=$1
+
+if [ -e "$entrypoint" ]; then
+  "$entrypoint"
+fi

stoobly_agent/app/cli/scaffold/templates/{workflow/record/bin → build/workflows/mock}/.configure

@@ -3,7 +3,7 @@
 # This file was automatically generated. DO NOT EDIT.
 # Any changes made to this file will be overwritten.
 
-entrypoint=$(dirname -- "$0")/configure
+entrypoint=$1
 
 if [ -e "$entrypoint" ]; then
   "$entrypoint"

stoobly_agent/app/cli/scaffold/templates/{workflow/mock/bin → build/workflows/mock}/.init

@@ -7,7 +7,7 @@ if [ -n "$SERVICE_HOSTNAME" ] && [ "$SERVICE_SCHEME" = "https" ]; then
   stoobly-agent ca-cert mkcert $SERVICE_HOSTNAME
 fi
 
-entrypoint=$(dirname -- "$0")/init
+entrypoint=$1
 if [ -e "$entrypoint" ]; then
   "$entrypoint"
 fi

stoobly_agent/app/cli/scaffold/templates/{workflow/test/bin → build/workflows/record}/.configure

@@ -3,7 +3,7 @@
 # This file was automatically generated. DO NOT EDIT.
 # Any changes made to this file will be overwritten.
 
-entrypoint=$(dirname -- "$0")/configure
+entrypoint=$1
 
 if [ -e "$entrypoint" ]; then
   "$entrypoint"

stoobly_agent/app/cli/scaffold/templates/{workflow/record/bin → build/workflows/record}/.init

@@ -7,7 +7,7 @@ if [ -n "$SERVICE_HOSTNAME" ] && [ "$SERVICE_SCHEME" = "https" ] ; then
   stoobly-agent ca-cert mkcert $SERVICE_HOSTNAME
 fi
 
-entrypoint=$(dirname -- "$0")/init
+entrypoint=$1
 if [ -e "$entrypoint" ]; then
   "$entrypoint"
 fi

stoobly_agent/app/cli/scaffold/templates/{workflow/mock/bin → build/workflows/test}/.configure

@@ -3,7 +3,7 @@
 # This file was automatically generated. DO NOT EDIT.
 # Any changes made to this file will be overwritten.
 
-entrypoint=$(dirname -- "$0")/configure
+entrypoint=$1
 
 if [ -e "$entrypoint" ]; then
   "$entrypoint"

stoobly_agent/app/cli/scaffold/templates/{workflow/test/bin → build/workflows/test}/.init

@@ -7,7 +7,7 @@ if [ -n "$SERVICE_HOSTNAME" ] && [ "$SERVICE_SCHEME" = "https" ]; then
   stoobly-agent ca-cert mkcert $SERVICE_HOSTNAME
 fi
 
-entrypoint=$(dirname -- "$0")/init
+entrypoint=$1
 if [ -e "$entrypoint" ]; then
   "$entrypoint"
 fi

stoobly_agent/app/cli/scaffold/workflow_command.py

@@ -5,10 +5,10 @@ import yaml
 from stoobly_agent.lib.logger import Logger
 
 from .app import App
-from .config import Config
 from .constants import BIN_FOLDER_NAME, COMPOSE_TEMPLATE, CONFIG_FILE, ENV_FILE, PUBLIC_FOLDER_NAME
 from .docker.constants import DOCKER_COMPOSE_CUSTOM
 from .service_command import ServiceCommand
+from .workflow_config import WorkflowConfig
 
 LOG_ID = 'WorkflowCommand'
 
@@ -18,6 +18,7 @@ class WorkflowCommand(ServiceCommand):
     super().__init__(app, **kwargs)
 
     self.__workflow_name = kwargs['workflow_name']
+    self.__config = WorkflowConfig(self.workflow_path, **kwargs)
 
   @property
   def bin_dir_path(self):
@@ -93,7 +94,7 @@ class WorkflowCommand(ServiceCommand):
 
   @property
   def workflow_config(self):
-    return Config(self.workflow_config_path).read()
+    return self.__config
 
   @property
   def workflow_config_path(self):

stoobly_agent/app/cli/scaffold/workflow_config.py

@@ -0,0 +1,47 @@
+# Wraps the .config.yml file in the workflow folder
+import pdb
+
+from .config import Config
+from .constants import WORKFLOW_TEMPLATE_ENV
+
+class WorkflowConfig(Config):
+
+  def __init__(self, dir: str, **kwargs):
+    super().__init__(dir)
+
+    self.__template = None
+
+    self.load()
+
+    if 'template' in kwargs:
+      self.__template = kwargs.get('template')
+
+  @property
+  def empty(self):
+    return not self.template
+
+  @property
+  def template(self):
+    return (self.__template or '').strip()
+
+  @template.setter
+  def template(self, v):
+    self.__template = v
+
+  def load(self, config = None):
+    config = config or self.read()
+
+    self.template = config.get(WORKFLOW_TEMPLATE_ENV)
+
+  def to_dict(self):
+    return {
+      'template': self.template,
+    }
+
+  def write(self):
+    config = {}
+
+    if self.template:
+      config[WORKFLOW_TEMPLATE_ENV] = self.template
+
+    super().write(config)

stoobly_agent/app/cli/scaffold/workflow_create_command.py

@@ -5,7 +5,7 @@ import shutil
 from typing import List, TypedDict, Union
 
 from .app import App
-from .constants import WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE, WORKFLOW_TEST_TYPE, WORKFLOW_TEMPLATE
+from .constants import WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE, WORKFLOW_TEST_TYPE, WORKFLOW_TEMPLATE_OPTION
 from .docker.service.builder import ServiceBuilder
 from .docker.workflow.mock_decorator import MockDecorator
 from .docker.workflow.reverse_proxy_decorator import ReverseProxyDecorator
@@ -18,7 +18,7 @@ CORE_WORKFLOWS = [WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE, WORKFLOW_TEST_TYPE]
 class BuildOptions(TypedDict):
   builder_class: type 
   service_builder: ServiceBuilder
-  template: WORKFLOW_TEMPLATE
+  template: WORKFLOW_TEMPLATE_OPTION
   workflow_decorators: List[Union[MockDecorator, ReverseProxyDecorator]]
 
 class WorkflowCreateCommand(WorkflowCommand):
@@ -54,10 +54,13 @@ class WorkflowCreateCommand(WorkflowCommand):
     workflow_builder = self.__write_docker_compose_file(**kwargs)
     self.__copy_templates(workflow_builder, kwargs.get('template'))
 
+    if not self.workflow_config.empty:
+      self.workflow_config.write()
+
   def build_workflow_templates_path(self, workflow_name: str):
     return os.path.join(self.workflow_templates_root_dir, workflow_name)
 
-  def __copy_templates(self, workflow_builder: WorkflowBuilder, template: WORKFLOW_TEMPLATE = None):
+  def __copy_templates(self, workflow_builder: WorkflowBuilder, template: WORKFLOW_TEMPLATE_OPTION = None):
     if not template:
       templates_path = self.workflow_templates_path
     else:

stoobly_agent/app/cli/scaffold/workflow_run_command.py

@@ -3,6 +3,7 @@ import os
 import pdb
 import subprocess
 import re
+import yaml
 
 from typing import TypedDict
 
@@ -12,7 +13,7 @@ from stoobly_agent.lib.logger import Logger
 from .app import App
 from .constants import (
   APP_DIR_ENV, APP_NETWORK_ENV, CA_CERTS_DIR_ENV, CERTS_DIR_ENV, CONTEXT_DIR_ENV, NAMESERVERS_FILE, 
-  SERVICE_DNS_ENV, SERVICE_NAME_ENV, USER_ID_ENV, WORKFLOW_NAME_ENV, WORKFLOW_NAMESPACE_ENV
+  SERVICE_DNS_ENV, SERVICE_NAME_ENV, USER_ID_ENV, WORKFLOW_NAME_ENV, WORKFLOW_NAMESPACE_ENV, WORKFLOW_TEMPLATE_ENV
 )
 from .docker.constants import DOCKERFILE_CONTEXT
 from .workflow_command import WorkflowCommand
@@ -137,9 +138,10 @@ class WorkflowRunCommand(WorkflowCommand):
     # Add docker compose file
     command_options.append(f"-f {os.path.relpath(self.compose_path, self.__current_working_dir)}")
 
+    can_build = False
+
     # Add custom docker compose file
     custom_services = self.custom_services
-  
     if custom_services:
       uses_profile = False
       for service_name in custom_services:
@@ -153,10 +155,18 @@ class WorkflowRunCommand(WorkflowCommand):
         # TODO: looking into why warning does not print in docker
         Logger.instance(LOG_ID).error(f"Missing {self.workflow_name} profile in custom compose file")
 
-      command_options.append(f"-f {os.path.relpath(self.custom_compose_path, self.__current_working_dir)}")
+      compose_file_path = os.path.relpath(self.custom_compose_path, self.__current_working_dir)
+      command_options.append(f"-f {compose_file_path}")
+
+      if self.__can_build(compose_file_path):
+        can_build = True
 
     if options.get('extra_compose_path'):
-      command_options.append(f"-f {os.path.relpath(options['extra_compose_path'], self.__current_working_dir)}")
+      compose_file_path = os.path.relpath(options['extra_compose_path'], self.__current_working_dir)
+      command_options.append(f"-f {compose_file_path}")
+
+      if self.__can_build(compose_file_path):
+        can_build = True
 
     command_options.append(f"--profile {self.workflow_name}") 
 
@@ -167,7 +177,7 @@ class WorkflowRunCommand(WorkflowCommand):
     command += command_options
     command.append('up')
 
-    if options.get('build'):
+    if options.get('build') and can_build:
       command.append('--build')
 
     if options.get('pull'):
@@ -257,6 +267,7 @@ class WorkflowRunCommand(WorkflowCommand):
     _config[SERVICE_NAME_ENV] = self.service_name
     _config[USER_ID_ENV] = user_id or os.getuid()
     _config[WORKFLOW_NAME_ENV] = self.workflow_name
+    _config[WORKFLOW_TEMPLATE_ENV] = self.workflow_name
     
     if namespace:
       _config[WORKFLOW_NAMESPACE_ENV] = namespace
@@ -272,6 +283,20 @@ class WorkflowRunCommand(WorkflowCommand):
     WorkflowEnv(self.workflow_path).write(env_vars)
     return env_vars
 
+  def __can_build(self, compose_path: str) -> bool:
+    if not os.path.exists(compose_path):
+        return False
+
+    with open(compose_path, 'r') as f:
+        compose = yaml.safe_load(f)
+
+    services = compose.get('services', {})
+    for service_name, service in services.items():
+        if 'build' in service:
+            # Either build is a string (context) or dict (with context/Dockerfile)
+            return True
+    return False
+
   def __find_nameservers(self, dns_resolver: dns.resolver.Resolver):
     nameservers = dns_resolver.nameservers
 

stoobly_agent/app/cli/scaffold_cli.py

@@ -226,7 +226,7 @@ def update(**kwargs):
 @click.option('--env', multiple=True, help='Specify an environment variable.')
 @click.option('--force', is_flag=True, help='Overwrite maintained scaffolded workflow files.')
 @click.option('--service', multiple=True, help='Specify the service(s) to create the workflow for.')
-@click.option('--template', type=click.Choice([WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE, WORKFLOW_TEST_TYPE]), help='Select which workflow to use as a template.')
+@click.option('--template', required=True, type=click.Choice([WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE, WORKFLOW_TEST_TYPE]), help='Select which workflow to use as a template.')
 @click.argument('workflow_name')
 def create(**kwargs):
   __validate_app_dir(kwargs['app_dir_path'])

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

@@ -1 +1 @@
-1.5.8
+1.6.1

{stoobly_agent-1.5.9.dist-info → stoobly_agent-1.6.1.dist-info}/METADATA

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

{stoobly_agent-1.5.9.dist-info → stoobly_agent-1.6.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-stoobly_agent/__init__.py,sha256=qFqPw64rsr5m-G-KbM1i4k70UIxv4d2nVfpjBrAffEA,44
+stoobly_agent/__init__.py,sha256=iNNlTNbNNPYIjvmJh6qArdUsWMo0EWYVZbrMdnBK2AA,44
 stoobly_agent/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/api/__init__.py,sha256=ctkB8KR-eXO0SFhj602huHiyvQ3PslFWd8fkcufgrAI,1000
 stoobly_agent/app/api/application_http_request_handler.py,sha256=Vvz53yB0bR7J-QqMAkLlhcZrA4P64ZEN7w8cMbgl6o0,5261
@@ -73,7 +73,7 @@ stoobly_agent/app/cli/scaffold/app_config.py,sha256=Gs-BynV1vY7_PpTOenn2mqc7lBIu
 stoobly_agent/app/cli/scaffold/app_create_command.py,sha256=sy4017eiir9MK0TEbTi1NyG9mhOGlenGGVnq0GsGUrQ,966
 stoobly_agent/app/cli/scaffold/command.py,sha256=aoTsdkkBzyu7TkVSMdNQQGk0Gj874jNgFcjR14y3TuM,254
 stoobly_agent/app/cli/scaffold/config.py,sha256=HZU5tkvr3dkPr4JMXZtrJlu2wxxO-134Em6jReFFcq0,688
-stoobly_agent/app/cli/scaffold/constants.py,sha256=Vn7TLVmxbiLOb7_wFDE4mlwkcr4vs0ZEgMxhS1ANizA,2084
+stoobly_agent/app/cli/scaffold/constants.py,sha256=s6AR9p9fVsPukfcCQ2QIGPtPKMbXkGnZ5a5CJGwou5E,2205
 stoobly_agent/app/cli/scaffold/containerized_app.py,sha256=dAjn4RwcZV3aEL0POUmrbF_DC-r9h6s1zx7gT2t45v0,175
 stoobly_agent/app/cli/scaffold/docker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/cli/scaffold/docker/app_builder.py,sha256=7z5pk5JKlRDHx2USxY-WurttLyyUkIVYfl34_u1x9dE,501
@@ -81,7 +81,7 @@ stoobly_agent/app/cli/scaffold/docker/builder.py,sha256=BQzjpDZmkUrii3VDcRCBXQko
 stoobly_agent/app/cli/scaffold/docker/constants.py,sha256=xfFBSF-1GQKNnUPTlz08Nm9HZDspUnvPvjwaLViQwVw,419
 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=ZU7z4bkvdS3OK5O4fJhlA9_PNwnFtZW6t7vNF7V5obQ,1003
-stoobly_agent/app/cli/scaffold/docker/service/builder.py,sha256=a7jxzXEwHaNcnG281BrOtNlf5Nmc4Z97DQrm68xdCCU,3219
+stoobly_agent/app/cli/scaffold/docker/service/builder.py,sha256=37VrkckPxTkIZTfrbml9Tp22teFhJu_pQYu6V7z40lE,3304
 stoobly_agent/app/cli/scaffold/docker/service/set_gateway_ports.py,sha256=MH71h24nX5lAd6xNfSjjNyw6PjBsAXv-3kOFEe86huk,1417
 stoobly_agent/app/cli/scaffold/docker/service/types.py,sha256=qB-yYHlu-PZDc0HYgTUvE5bWNpHxaSThC3JUG8okR1k,88
 stoobly_agent/app/cli/scaffold/docker/workflow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -103,46 +103,34 @@ stoobly_agent/app/cli/scaffold/service_docker_compose.py,sha256=OMUN1-ujQYIZXxDv
 stoobly_agent/app/cli/scaffold/service_workflow.py,sha256=sQ_Edy_wGHKMXpD0DmhnOWkGEKz7gSgEGNI8f7aXOdg,444
 stoobly_agent/app/cli/scaffold/service_workflow_validate_command.py,sha256=iORyPZEQurgWVxrdMgkdD3VsCz3ar2D15dmyY3RoeKw,9904
 stoobly_agent/app/cli/scaffold/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-stoobly_agent/app/cli/scaffold/templates/app/.Dockerfile.context,sha256=EVoSqGJH_H7Xw1Ktan5GH2SWaOXIr916NUpptr2hkiA,158
-stoobly_agent/app/cli/scaffold/templates/app/.Makefile,sha256=OvoE2bOAc5w1Nm_vwv6O75elYdojnNp2uABNwoF1g-g,8438
+stoobly_agent/app/cli/scaffold/templates/app/.Dockerfile.context,sha256=xnUFSlP8YvEs04lTh1Jj_ggNcwyVjyzZjzF0Vh9pris,158
+stoobly_agent/app/cli/scaffold/templates/app/.Makefile,sha256=zXj6WEYfFhgxB9BioUIlXxOAGI1gpDVWpc57K4AamE4,8390
 stoobly_agent/app/cli/scaffold/templates/app/.docker-compose.base.yml,sha256=6tFqXh3ine8vaD0FCL5TMoY5NjKx2wLUR8XpW3tJtew,245
 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
-stoobly_agent/app/cli/scaffold/templates/app/build/.docker-compose.base.yml,sha256=H43dtzQkuwWeeB-XzwQNqdKqwS04Ph_Al8AVCOjxCkQ,420
+stoobly_agent/app/cli/scaffold/templates/app/build/.docker-compose.base.yml,sha256=A9TI3J6182Bg9YH0GqetEqBz5_5Lf99XLHgHDuesK64,569
 stoobly_agent/app/cli/scaffold/templates/app/build/mock/.docker-compose.mock.yml,sha256=3DJ8LTq3QScaz0SA_tXQqJ0kljSCeqkPyDbhLOxBJvc,414
-stoobly_agent/app/cli/scaffold/templates/app/build/mock/bin/.configure,sha256=dix1ZVrqllsX6eYmQz7Jwslu-F3nA__IKmtRxb_KGSo,185
-stoobly_agent/app/cli/scaffold/templates/app/build/mock/bin/.init,sha256=4PElJS6sdbdDftf0R2An5bJ8mdOL6MnW5OasEbzh2S4,182
-stoobly_agent/app/cli/scaffold/templates/app/build/mock/bin/configure,sha256=Nme7aSLA-IH1NXgmqRMPzOlKcUSRXqZd-kcuZa47IEk,11
-stoobly_agent/app/cli/scaffold/templates/app/build/mock/bin/init,sha256=O7czui9GFHbcoEC5I9MwkRyZvDGY42IwlyQwIWcgylY,12
+stoobly_agent/app/cli/scaffold/templates/app/build/mock/bin/configure,sha256=dEOGIKUKJf5kjOwJRdTgZkS0ZjmQHWVuAmKrWUjPij4,44
+stoobly_agent/app/cli/scaffold/templates/app/build/mock/bin/init,sha256=YxWVVQMEdGarcMtBcE1Sj2kdLgUgwY9kXp3MjPsVcmg,46
 stoobly_agent/app/cli/scaffold/templates/app/build/record/.docker-compose.record.yml,sha256=hgPOxIInxGAzGr28-ytB4tVfmsqgpZdPMOpMRbV2R0g,418
-stoobly_agent/app/cli/scaffold/templates/app/build/record/bin/.configure,sha256=dix1ZVrqllsX6eYmQz7Jwslu-F3nA__IKmtRxb_KGSo,185
-stoobly_agent/app/cli/scaffold/templates/app/build/record/bin/.init,sha256=4PElJS6sdbdDftf0R2An5bJ8mdOL6MnW5OasEbzh2S4,182
 stoobly_agent/app/cli/scaffold/templates/app/build/record/bin/configure,sha256=Nme7aSLA-IH1NXgmqRMPzOlKcUSRXqZd-kcuZa47IEk,11
-stoobly_agent/app/cli/scaffold/templates/app/build/record/bin/init,sha256=O7czui9GFHbcoEC5I9MwkRyZvDGY42IwlyQwIWcgylY,12
+stoobly_agent/app/cli/scaffold/templates/app/build/record/bin/init,sha256=YxWVVQMEdGarcMtBcE1Sj2kdLgUgwY9kXp3MjPsVcmg,46
 stoobly_agent/app/cli/scaffold/templates/app/build/test/.docker-compose.test.yml,sha256=Rn_7qL1MVK1jNlRepSvNHH9_iFrlE86_aRxjwIim0mY,414
-stoobly_agent/app/cli/scaffold/templates/app/build/test/bin/.configure,sha256=dix1ZVrqllsX6eYmQz7Jwslu-F3nA__IKmtRxb_KGSo,185
-stoobly_agent/app/cli/scaffold/templates/app/build/test/bin/.init,sha256=4PElJS6sdbdDftf0R2An5bJ8mdOL6MnW5OasEbzh2S4,182
-stoobly_agent/app/cli/scaffold/templates/app/build/test/bin/configure,sha256=Nme7aSLA-IH1NXgmqRMPzOlKcUSRXqZd-kcuZa47IEk,11
-stoobly_agent/app/cli/scaffold/templates/app/build/test/bin/init,sha256=O7czui9GFHbcoEC5I9MwkRyZvDGY42IwlyQwIWcgylY,12
+stoobly_agent/app/cli/scaffold/templates/app/build/test/bin/configure,sha256=dEOGIKUKJf5kjOwJRdTgZkS0ZjmQHWVuAmKrWUjPij4,44
+stoobly_agent/app/cli/scaffold/templates/app/build/test/bin/init,sha256=YxWVVQMEdGarcMtBcE1Sj2kdLgUgwY9kXp3MjPsVcmg,46
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/.config.yml,sha256=T9VQz6OwAQpKdIoFrnfKAxuX_to0c6EhuWRLKM34Sr4,22
-stoobly_agent/app/cli/scaffold/templates/app/entrypoint/.docker-compose.base.yml,sha256=IHLz4eJyZDfQdKd8HG218Zc3egtOCK1IR8vfkMNJ0Ug,491
+stoobly_agent/app/cli/scaffold/templates/app/entrypoint/.docker-compose.base.yml,sha256=FzDOFouP61eSeklhjQ7qpsE8rSc8r3DuT8aytIiZwN8,640
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/.docker-compose.mock.yml,sha256=-YbHd6BrAlBpT8PYg8kOsq0GyDeZ3g_q8IB0B0rGluU,551
-stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/bin/.configure,sha256=dZNsKDou-7IS4yj8hYPudjoUIa8YlUbuE8pBkSIVtyE,255
-stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/bin/.init,sha256=5xJbfpwGOmRj5lwK5e0JNlVpNd3WFUkZ0GaCUK40aDk,97
-stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/bin/configure,sha256=Nme7aSLA-IH1NXgmqRMPzOlKcUSRXqZd-kcuZa47IEk,11
-stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/bin/init,sha256=O7czui9GFHbcoEC5I9MwkRyZvDGY42IwlyQwIWcgylY,12
+stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/bin/configure,sha256=dEOGIKUKJf5kjOwJRdTgZkS0ZjmQHWVuAmKrWUjPij4,44
+stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/bin/init,sha256=YxWVVQMEdGarcMtBcE1Sj2kdLgUgwY9kXp3MjPsVcmg,46
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/docker-compose.yml,sha256=Zh8h8yUqVXZMi_Y4aUPE48qw2DU-ONO4-rrSTh4E_Ts,591
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/record/.docker-compose.record.yml,sha256=aIcgjelss4V86lxS3-xN8j_2eR-0YkzhtN_b-g3Y0nE,555
-stoobly_agent/app/cli/scaffold/templates/app/entrypoint/record/bin/.configure,sha256=HKul_kbkob_EzSudYKRyQMk_YHE2jEBTarGHl3pCc18,259
-stoobly_agent/app/cli/scaffold/templates/app/entrypoint/record/bin/.init,sha256=5xJbfpwGOmRj5lwK5e0JNlVpNd3WFUkZ0GaCUK40aDk,97
-stoobly_agent/app/cli/scaffold/templates/app/entrypoint/record/bin/configure,sha256=Nme7aSLA-IH1NXgmqRMPzOlKcUSRXqZd-kcuZa47IEk,11
-stoobly_agent/app/cli/scaffold/templates/app/entrypoint/record/bin/init,sha256=O7czui9GFHbcoEC5I9MwkRyZvDGY42IwlyQwIWcgylY,12
+stoobly_agent/app/cli/scaffold/templates/app/entrypoint/record/bin/configure,sha256=dEOGIKUKJf5kjOwJRdTgZkS0ZjmQHWVuAmKrWUjPij4,44
+stoobly_agent/app/cli/scaffold/templates/app/entrypoint/record/bin/init,sha256=YxWVVQMEdGarcMtBcE1Sj2kdLgUgwY9kXp3MjPsVcmg,46
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/record/docker-compose.yml,sha256=5n4bZBHI9MtwBF55ugu1RTdwMy7T6SsYGQ_3sulFUj8,595
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/.docker-compose.test.yml,sha256=9-qPnSisun4adnrDcZsJiyeMjhIlCHBJap_cmdzUPVg,552
-stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/bin/.configure,sha256=dZNsKDou-7IS4yj8hYPudjoUIa8YlUbuE8pBkSIVtyE,255
-stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/bin/.init,sha256=5xJbfpwGOmRj5lwK5e0JNlVpNd3WFUkZ0GaCUK40aDk,97
-stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/bin/configure,sha256=Nme7aSLA-IH1NXgmqRMPzOlKcUSRXqZd-kcuZa47IEk,11
-stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/bin/init,sha256=O7czui9GFHbcoEC5I9MwkRyZvDGY42IwlyQwIWcgylY,12
+stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/bin/configure,sha256=dEOGIKUKJf5kjOwJRdTgZkS0ZjmQHWVuAmKrWUjPij4,44
+stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/bin/init,sha256=YxWVVQMEdGarcMtBcE1Sj2kdLgUgwY9kXp3MjPsVcmg,46
 stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/docker-compose.yml,sha256=E4gGJwHfnZoFo9-0vM17-Qg5LPjx7vIPpcz2K7eiZg0,591
 stoobly_agent/app/cli/scaffold/templates/app/gateway/.config.yml,sha256=XnLQZMzzMMIwVycjyPN5QXsmRztkTFAna1kIHYuDfJQ,19
 stoobly_agent/app/cli/scaffold/templates/app/gateway/.docker-compose.base.template.yml,sha256=bgBvyDhyehS75D2ObEi7sl9DLGV6U3c9JhCAncsvjq8,251
@@ -150,37 +138,49 @@ stoobly_agent/app/cli/scaffold/templates/app/gateway/mock/.docker-compose.mock.y
 stoobly_agent/app/cli/scaffold/templates/app/gateway/record/.docker-compose.record.yml,sha256=FvPqOUs1k6Vc-rncnpgiRTZeEQlrizmcGkT8a4HdvUE,226
 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=bxrtZqf3YtaJCukzScslh5PgWC5q8xkGIP1wKJf33LA,111
-stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/.docker-compose.exec.yml,sha256=n-p_lIfsmpOJ78Zd0J2TdnV2M8hcn-K2TP9qOccbw1c,306
-stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/bin/.create,sha256=EZe84bLAKB-mrB9PGMx-amyMjp6x-ESUZKC8wxrWdLE,245
-stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/bin/.delete,sha256=RspRDQ7WT5jpN2o-6qXOlH-A2VpN4981pD4ZJljk9Rw,260
-stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/bin/.disable,sha256=xVf4Pk1RLvJm7Ff0rbGoWhYHPv0ME5e93fxS2yFqLnE,45
-stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/bin/.down,sha256=WtEjm2hJ01-1GGxRmmcUqZq7VjEe5JfZZKvm8TNhNEs,219
-stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/bin/.enable,sha256=sfUSPG4uHdXX95BLgivXQYLbsLBP2DjJIiSTXRtvXuY,188
-stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/bin/.list,sha256=BdX3ARC-Piuwk0vFzBrcxEwtHjdFncpORzqP-hP4IwE,84
-stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/bin/.logs,sha256=4CJVEVLn9VTQN9LAjOJpijwd_DZ5IuIXL1aFCYkelxk,178
-stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/bin/.mkcert,sha256=vyHaXmvy-7oL2RD8rIxwT-fdJS5kXmB0yHK5fRMo_cM,46
-stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/bin/.reset,sha256=_pvbLk-ektsCHEh_egDtd6c0sVqCPunwUWggarfoli0,238
-stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/bin/.services,sha256=sAbaKzBxNDXimyUNinB_a2Kt47vUCa0Kd3Z1QAp2GrU,161
-stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/bin/.snapshot,sha256=Kav1QNhKG7f0DBzc4-9dmxZMmmVTxmPqakT_W4kVYKk,241
-stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/bin/.up,sha256=S88O31UgsabaMvSwkQJjLF9C7mrFkyEk9x6JDE6qSXI,228
+stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/.docker-compose.exec.yml,sha256=JN89sU5uRf6YqHvN_O63K8rwQIAPJHbhFDLFmuUjKNM,304
 stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/mock/.docker-compose.mock.yml,sha256=FnCn64DjxyAiB2P_1JUwFmXslMR961nVZHkYiEXytlg,232
 stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/record/.docker-compose.record.yml,sha256=t34FNYZboJSfrKnIB2oJ3UuE_mJaW77-hcbSn3sfWec,235
+stoobly_agent/app/cli/scaffold/templates/build/services/build/mock/.configure,sha256=006exiS9OpKavy4fNWioWo0d8hrulQiWjaB3yXHdGig,212
+stoobly_agent/app/cli/scaffold/templates/build/services/build/mock/.init,sha256=HRAXOsnAKhYw2giorsQA2Dvli4J5xJpvv-79yFgSszM,214
+stoobly_agent/app/cli/scaffold/templates/build/services/build/record/.configure,sha256=006exiS9OpKavy4fNWioWo0d8hrulQiWjaB3yXHdGig,212
+stoobly_agent/app/cli/scaffold/templates/build/services/build/record/.init,sha256=HRAXOsnAKhYw2giorsQA2Dvli4J5xJpvv-79yFgSszM,214
+stoobly_agent/app/cli/scaffold/templates/build/services/build/test/.configure,sha256=006exiS9OpKavy4fNWioWo0d8hrulQiWjaB3yXHdGig,212
+stoobly_agent/app/cli/scaffold/templates/build/services/build/test/.init,sha256=HRAXOsnAKhYw2giorsQA2Dvli4J5xJpvv-79yFgSszM,214
+stoobly_agent/app/cli/scaffold/templates/build/services/entrypoint/mock/.configure,sha256=SKvht2K_3tW08K24rl8_j0jMYOhq1k-GsVwhoHwjxYA,337
+stoobly_agent/app/cli/scaffold/templates/build/services/entrypoint/mock/.init,sha256=xWJGhCKQejtVLFAOEZMWnaCeGAc9tuqEh_WsG3xfA_0,184
+stoobly_agent/app/cli/scaffold/templates/build/services/entrypoint/record/.configure,sha256=dnbPZUrYZDCEx0MxhIsrY-lTgH_9tN_Iixy3XrPIW8w,341
+stoobly_agent/app/cli/scaffold/templates/build/services/entrypoint/record/.init,sha256=xWJGhCKQejtVLFAOEZMWnaCeGAc9tuqEh_WsG3xfA_0,184
+stoobly_agent/app/cli/scaffold/templates/build/services/entrypoint/test/.configure,sha256=SKvht2K_3tW08K24rl8_j0jMYOhq1k-GsVwhoHwjxYA,337
+stoobly_agent/app/cli/scaffold/templates/build/services/entrypoint/test/.init,sha256=xWJGhCKQejtVLFAOEZMWnaCeGAc9tuqEh_WsG3xfA_0,184
+stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/.create,sha256=EZe84bLAKB-mrB9PGMx-amyMjp6x-ESUZKC8wxrWdLE,245
+stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/.delete,sha256=RspRDQ7WT5jpN2o-6qXOlH-A2VpN4981pD4ZJljk9Rw,260
+stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/.disable,sha256=xVf4Pk1RLvJm7Ff0rbGoWhYHPv0ME5e93fxS2yFqLnE,45
+stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/.down,sha256=WtEjm2hJ01-1GGxRmmcUqZq7VjEe5JfZZKvm8TNhNEs,219
+stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/.enable,sha256=sfUSPG4uHdXX95BLgivXQYLbsLBP2DjJIiSTXRtvXuY,188
+stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/.list,sha256=BdX3ARC-Piuwk0vFzBrcxEwtHjdFncpORzqP-hP4IwE,84
+stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/.logs,sha256=4CJVEVLn9VTQN9LAjOJpijwd_DZ5IuIXL1aFCYkelxk,178
+stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/.mkcert,sha256=vyHaXmvy-7oL2RD8rIxwT-fdJS5kXmB0yHK5fRMo_cM,46
+stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/.reset,sha256=_pvbLk-ektsCHEh_egDtd6c0sVqCPunwUWggarfoli0,238
+stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/.services,sha256=sAbaKzBxNDXimyUNinB_a2Kt47vUCa0Kd3Z1QAp2GrU,161
+stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/.snapshot,sha256=Kav1QNhKG7f0DBzc4-9dmxZMmmVTxmPqakT_W4kVYKk,241
+stoobly_agent/app/cli/scaffold/templates/build/workflows/exec/.up,sha256=S88O31UgsabaMvSwkQJjLF9C7mrFkyEk9x6JDE6qSXI,228
+stoobly_agent/app/cli/scaffold/templates/build/workflows/mock/.configure,sha256=xWJGhCKQejtVLFAOEZMWnaCeGAc9tuqEh_WsG3xfA_0,184
+stoobly_agent/app/cli/scaffold/templates/build/workflows/mock/.init,sha256=_gFs--JjDN1G0VpswmPegKYU9ozwLnvWOKj__V_VoB4,307
+stoobly_agent/app/cli/scaffold/templates/build/workflows/record/.configure,sha256=xWJGhCKQejtVLFAOEZMWnaCeGAc9tuqEh_WsG3xfA_0,184
+stoobly_agent/app/cli/scaffold/templates/build/workflows/record/.init,sha256=5sH8Ft7N_cyFgTBknJWOjIMd5A2RZexRTeUkhKxSzx0,308
+stoobly_agent/app/cli/scaffold/templates/build/workflows/test/.configure,sha256=xWJGhCKQejtVLFAOEZMWnaCeGAc9tuqEh_WsG3xfA_0,184
+stoobly_agent/app/cli/scaffold/templates/build/workflows/test/.init,sha256=_gFs--JjDN1G0VpswmPegKYU9ozwLnvWOKj__V_VoB4,307
 stoobly_agent/app/cli/scaffold/templates/constants.py,sha256=EXBiBB_gnSINGrIqfXMaJ2w0HEaICw4FxVjwIHPBqYw,1457
 stoobly_agent/app/cli/scaffold/templates/factory.py,sha256=t7QExf7o22oAiw05XFBWTfoTcuQqK33gQZHo3j1dzTY,1749
-stoobly_agent/app/cli/scaffold/templates/workflow/mock/bin/.configure,sha256=z135hJDmBWYOhZbjuzC8-C6a0VtQ9NPx5mfCpVZliEA,210
-stoobly_agent/app/cli/scaffold/templates/workflow/mock/bin/.init,sha256=Qwkc9ckplXTmGDdcYm9g_0zOa7WAvOjruGAtaf1U7eU,328
 stoobly_agent/app/cli/scaffold/templates/workflow/mock/bin/configure,sha256=2cpOVTA0Tm8s8cIhbrFAsYe5A1JXa8vVtGwoPCwVB_g,270
 stoobly_agent/app/cli/scaffold/templates/workflow/mock/bin/init,sha256=YxWVVQMEdGarcMtBcE1Sj2kdLgUgwY9kXp3MjPsVcmg,46
 stoobly_agent/app/cli/scaffold/templates/workflow/mock/fixtures.yml,sha256=CJlZ_kugygZpmyqIauBjNZxqk7XyLaa3yl3AWj8KV28,259
 stoobly_agent/app/cli/scaffold/templates/workflow/mock/lifecycle_hooks.py,sha256=U7mlzT_wBR3uhHSG6CAyt5tBUNAvdIrCw33gdB-F294,467
 stoobly_agent/app/cli/scaffold/templates/workflow/mock/public/.gitignore,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-stoobly_agent/app/cli/scaffold/templates/workflow/record/bin/.configure,sha256=z135hJDmBWYOhZbjuzC8-C6a0VtQ9NPx5mfCpVZliEA,210
-stoobly_agent/app/cli/scaffold/templates/workflow/record/bin/.init,sha256=GekadmBjLyAxgTJbCA_NKgUXRwKFs8iX4qtV5YlvUXk,329
 stoobly_agent/app/cli/scaffold/templates/workflow/record/bin/configure,sha256=bkMZexceMEfoh5AqybtzpGPBrCGxl7Azn6QbR-qAuWM,750
 stoobly_agent/app/cli/scaffold/templates/workflow/record/bin/init,sha256=YxWVVQMEdGarcMtBcE1Sj2kdLgUgwY9kXp3MjPsVcmg,46
 stoobly_agent/app/cli/scaffold/templates/workflow/record/lifecycle_hooks.py,sha256=4vaVc_gnDTCLEqtcZybIk5dcmXrKmGuesF6gc3-_kX8,473
-stoobly_agent/app/cli/scaffold/templates/workflow/test/bin/.configure,sha256=z135hJDmBWYOhZbjuzC8-C6a0VtQ9NPx5mfCpVZliEA,210
-stoobly_agent/app/cli/scaffold/templates/workflow/test/bin/.init,sha256=Qwkc9ckplXTmGDdcYm9g_0zOa7WAvOjruGAtaf1U7eU,328
 stoobly_agent/app/cli/scaffold/templates/workflow/test/bin/configure,sha256=2cpOVTA0Tm8s8cIhbrFAsYe5A1JXa8vVtGwoPCwVB_g,270
 stoobly_agent/app/cli/scaffold/templates/workflow/test/bin/init,sha256=YxWVVQMEdGarcMtBcE1Sj2kdLgUgwY9kXp3MjPsVcmg,46
 stoobly_agent/app/cli/scaffold/templates/workflow/test/fixtures.yml,sha256=CJlZ_kugygZpmyqIauBjNZxqk7XyLaa3yl3AWj8KV28,259
@@ -189,14 +189,15 @@ stoobly_agent/app/cli/scaffold/templates/workflow/test/public/.gitignore,sha256=
 stoobly_agent/app/cli/scaffold/validate_command.py,sha256=OjAbX-YNx165od6HCwKmgdyF3upNdyQsL_vXTsOK2mo,2426
 stoobly_agent/app/cli/scaffold/validate_exceptions.py,sha256=Jtjl4OkbbSRWm0hy7Kf_50zcFh2J324HhNcnwJKH_Oc,54
 stoobly_agent/app/cli/scaffold/workflow.py,sha256=KlbWT9CIo9EpZxKU1WVZtmodhxK7CpmLUHPNk4Mh6DA,1570
-stoobly_agent/app/cli/scaffold/workflow_command.py,sha256=s9GFo30Rm7-GvTW0xKCDXCrnKmd1-uTCxLOJr-cvhbQ,3289
+stoobly_agent/app/cli/scaffold/workflow_command.py,sha256=eI9I5LLgO0U3b46QhHusy-4BV2zUDVai6jErcluYCRI,3344
+stoobly_agent/app/cli/scaffold/workflow_config.py,sha256=ghnbcnCyb6ECdylUJCAJ6A8ulzaFY9bu7RvRuYeiRkk,901
 stoobly_agent/app/cli/scaffold/workflow_copy_command.py,sha256=R9hh5dWVz7vGld7pENAA_a9gW56EkgG2K35nBQYXwyI,1462
-stoobly_agent/app/cli/scaffold/workflow_create_command.py,sha256=bjNRph9TiOzleDiG6vYAExHWLVLAROBCPt6bPxtAmDo,3408
+stoobly_agent/app/cli/scaffold/workflow_create_command.py,sha256=WmGKoqJqOkhL40oLCo8PnWhBKdfbY0dO2UtRn1IKynE,3504
 stoobly_agent/app/cli/scaffold/workflow_env.py,sha256=x8V5pJmIiklD3f2q2-qq-CORf4YaXYq_r2JpR2MmSwk,416
 stoobly_agent/app/cli/scaffold/workflow_log_command.py,sha256=Bke4lMOMxuDUFuAx9nlXHbKgYMO4KAg9ASHvjz4aVWc,1372
-stoobly_agent/app/cli/scaffold/workflow_run_command.py,sha256=GXteRAgco7NCb0Ov1B2_xs1DMyLg8vdDsCvH7whrlcE,9854
+stoobly_agent/app/cli/scaffold/workflow_run_command.py,sha256=1XFlosc3a3Amev5uW3tECwZoIBYVCJsFqG2bGtAHvgg,10652
 stoobly_agent/app/cli/scaffold/workflow_validate_command.py,sha256=fhHciJXg_u32Wmh8us8LhgQj8D1SxkBADtuBBF4K0FM,4377
-stoobly_agent/app/cli/scaffold_cli.py,sha256=9Z90MKOjrGMmr41vcaU-V1LVhM7ekaVlfN0OZ3v-cfw,28301
+stoobly_agent/app/cli/scaffold_cli.py,sha256=AoWqSRXXQrqK0YeSHLJkNRTOC23PHrjJBNrq_A8KZnc,28316
 stoobly_agent/app/cli/scenario_cli.py,sha256=3J1EiJOvunkfWrEkOsanw-XrKkOk78ij_GjBlE9p7CE,8229
 stoobly_agent/app/cli/snapshot_cli.py,sha256=cpCjxFYBuVwLuq_b2lIUu-5zWqupRlrp4xWgDytirSM,10047
 stoobly_agent/app/cli/trace_cli.py,sha256=K7E-vx3JUcqEDSWOdIOi_AieKNQz7dBfmRrVvKDkzFI,4605
@@ -696,7 +697,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=eal7o-kq5ffI3jI_qSKhNuayimZKQKQ55EzOoY7U6Xw,5
+stoobly_agent/test/app/models/schemas/.stoobly/db/VERSION,sha256=_f4T1QzFg0lLC81UhhuJRJ7MIzez92MEH4M0zL1X0Wc,5
 stoobly_agent/test/app/models/schemas/.stoobly/db/stoobly_agent.sqlite3,sha256=ch8gNx6zIelLKQx65gwFx_LRNqUD3EC5xcHZ0ukIQiU,188416
 stoobly_agent/test/app/models/schemas/.stoobly/settings.yml,sha256=vLwMjweKOdod6tSLtIlyBefPQuNXq9wio4kBaODKtAU,726
 stoobly_agent/test/app/models/schemas/.stoobly/tmp/options.json,sha256=OTRzarwus48CTrItedXCrgQttJHSEZonEYc7R_knvYg,2212
@@ -737,8 +738,8 @@ stoobly_agent/test/mock_data/scaffold/docker-compose-local-service.yml,sha256=_t
 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.9.dist-info/LICENSE,sha256=o93sj12cdoEOsTCjPaPFsw3Xq0SXs3pPcY-9reE2sEw,548
-stoobly_agent-1.5.9.dist-info/METADATA,sha256=fZaHhToQFvNE2J3oh6SPYqY41pRYLfEaE0CluhOvm7U,3087
-stoobly_agent-1.5.9.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-stoobly_agent-1.5.9.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
-stoobly_agent-1.5.9.dist-info/RECORD,,
+stoobly_agent-1.6.1.dist-info/LICENSE,sha256=o93sj12cdoEOsTCjPaPFsw3Xq0SXs3pPcY-9reE2sEw,548
+stoobly_agent-1.6.1.dist-info/METADATA,sha256=daCy3CxjBe_8ieKmVXg26SO_pDfCnh-ErkWJf2h_-wI,3087
+stoobly_agent-1.6.1.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+stoobly_agent-1.6.1.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
+stoobly_agent-1.6.1.dist-info/RECORD,,

stoobly_agent/app/cli/scaffold/templates/app/build/mock/bin/.configure

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# This file was automatically generated. DO NOT EDIT.
-# Any changes made to this file will be overwritten.
-
-stoobly-agent config reset
-
-cd $(dirname -- "$0") && ./configure

stoobly_agent/app/cli/scaffold/templates/app/build/mock/bin/.init

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# This file was automatically generated. DO NOT EDIT.
-# Any changes made to this file will be overwritten.
-
-stoobly-agent snapshot apply
-
-cd $(dirname -- "$0") && ./init

stoobly_agent/app/cli/scaffold/templates/app/build/test/bin/.configure

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# This file was automatically generated. DO NOT EDIT.
-# Any changes made to this file will be overwritten.
-
-stoobly-agent config reset
-
-cd $(dirname -- "$0") && ./configure

stoobly_agent/app/cli/scaffold/templates/app/build/test/bin/.init

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# This file was automatically generated. DO NOT EDIT.
-# Any changes made to this file will be overwritten.
-
-stoobly-agent snapshot apply
-
-cd $(dirname -- "$0") && ./init

stoobly_agent/app/cli/scaffold/templates/app/entrypoint/mock/bin/.init

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-entrypoint=$(dirname -- "$0")/init
-
-if [ -e "$entrypoint" ]; then
-  "$entrypoint"
-fi

stoobly_agent/app/cli/scaffold/templates/app/entrypoint/record/bin/.init

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-entrypoint=$(dirname -- "$0")/init
-
-if [ -e "$entrypoint" ]; then
-  "$entrypoint"
-fi

stoobly_agent/app/cli/scaffold/templates/app/entrypoint/test/bin/.init

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-entrypoint=$(dirname -- "$0")/init
-
-if [ -e "$entrypoint" ]; then
-  "$entrypoint"
-fi