stoobly-agent 1.0.14__py3-none-any.whl → 1.1.0__py3-none-any.whl

stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.0.14'
+VERSION = '1.1.0'

stoobly_agent/app/cli/scaffold/constants.py

@@ -36,7 +36,13 @@ USER_ID_ENV = 'USER_ID'
 VIRTUAL_HOST_ENV = 'VIRTUAL_HOST'
 VIRTUAL_PORT_ENV = 'VIRTUAL_PORT'
 VIRTUAL_PROTO_ENV = 'VIRTUAL_PROTO'
-WORKFLOW_CUSTOM_FILTER = 'custom'
+WORKFLOW_CONTAINER_CONFIGURE = 'configure'
+WORKFLOW_CONTAINER_INIT = 'init'
+WORKFLOW_CONTAINER_PROXY = 'proxy'
+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_MOCK_TYPE = 'mock'
 WORKFLOW_NAME_ENV = 'WORKFLOW_NAME'
 WORKFLOW_RECORD_TYPE = 'record'

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

@@ -4,11 +4,11 @@ import pdb
 from typing import List
 
 from ...constants import (
-  COMPOSE_TEMPLATE, SERVICE_HOSTNAME, SERVICE_HOSTNAME_ENV, SERVICE_NAME_ENV, SERVICE_PORT, SERVICE_PORT_ENV, SERVICE_SCHEME, 
-  SERVICE_SCHEME_ENV, STOOBLY_HOME_DIR, WORKFLOW_NAME_ENV
+  COMPOSE_TEMPLATE, STOOBLY_HOME_DIR, SERVICE_HOSTNAME, SERVICE_HOSTNAME_ENV, SERVICE_NAME_ENV, 
+  SERVICE_PORT, SERVICE_PORT_ENV, SERVICE_SCHEME, SERVICE_SCHEME_ENV, 
+  WORKFLOW_CONTAINER_CONFIGURE_TEMPLATE, WORKFLOW_CONTAINER_INIT_TEMPLATE, WORKFLOW_CONTAINER_PROXY_TEMPLATE, WORKFLOW_NAME_ENV
 )
 from ...templates.constants import SERVICE_HOSTNAME_BUILD_ARG
-from ...workflow_env import WorkflowEnv
 from ..builder import Builder
 from ..service.builder import ServiceBuilder
 
@@ -44,7 +44,7 @@ class WorkflowBuilder(Builder):
 
   @property
   def init(self):
-    return f"{self.namespace}.init"
+    return WORKFLOW_CONTAINER_INIT_TEMPLATE.format(service_name=self.namespace)
 
   @property
   def config(self):
@@ -52,7 +52,7 @@ class WorkflowBuilder(Builder):
 
   @property
   def configure(self):
-    return f"{self.namespace}.configure"
+    return WORKFLOW_CONTAINER_CONFIGURE_TEMPLATE.format(service_name=self.namespace)
 
   @property
   def context(self):
@@ -79,7 +79,7 @@ class WorkflowBuilder(Builder):
 
   @property
   def proxy(self):
-    return f"{self.namespace}.proxy"
+    return WORKFLOW_CONTAINER_PROXY_TEMPLATE.format(service_name=self.namespace)
 
   @property
   def proxy_build(self):

stoobly_agent/app/cli/scaffold/hosts_file_reader.py

@@ -0,0 +1,65 @@
+import pdb
+import platform
+from dataclasses import dataclass
+from typing import Union
+
+
+class HostsFileReader():
+
+  @dataclass
+  class IpAddressToHostnames:
+    ip_address: str
+    hostnames: list[str]
+
+  def __get_hosts_file_path(self) -> str:
+    system = platform.system()
+    if system == 'Linux' or system == 'Darwin':
+      return '/etc/hosts'
+    else:
+      print(f"Unsupported system: {system}, for hosts file validation, skipping")
+
+    return ''
+
+  # Split IP address and hostnames. Don't include inline comments
+  def __split_hosts_line(self, line: str) -> list[str]:
+    ip_addr_hosts_split = line.split('#')[0].split()
+    return ip_addr_hosts_split
+
+
+  # Parses hosts file and returns a mapping of IP address to hostnames in a list.
+  def get_hosts(self) -> list[IpAddressToHostnames]:
+    hosts_file_path = self.__get_hosts_file_path()
+
+    if not hosts_file_path:
+      return []
+
+    with open(hosts_file_path, 'r') as f:
+      hostlines = f.readlines()
+
+    # Skip comments and empty lines
+    hostlines = [line.strip() for line in hostlines
+                 if not line.startswith('#') and line.strip() != '']
+
+    hosts = []
+    for line in hostlines:
+      ip_addr_hosts_split = self.__split_hosts_line(line)
+      ip_address = ip_addr_hosts_split[0]
+      hostnames = ip_addr_hosts_split[1:]
+      ipAddressToHostnames = self.IpAddressToHostnames(ip_address, hostnames)
+
+      hosts.append(ipAddressToHostnames)
+
+    return hosts
+
+  def find_host(self, hostname) -> Union[IpAddressToHostnames, None]:
+    hosts = self.get_hosts()
+
+    for mapping in hosts:
+      if ((mapping.ip_address == '0.0.0.0' or mapping.ip_address == '127.0.0.1') and
+        hostname in mapping.hostnames):
+
+        return mapping
+
+    return None
+
+

stoobly_agent/app/cli/scaffold/service_delete_command.py

@@ -0,0 +1,35 @@
+import glob
+import os
+import pdb
+import shutil
+
+from .app import App
+from .service_command import ServiceCommand
+from stoobly_agent.lib.logger import Logger
+
+
+LOG_ID = 'ServiceDeleteCommand'
+
+class ServiceDeleteCommand(ServiceCommand):
+  def __init__(self, app: App, **kwargs):
+    super().__init__(app, **kwargs)
+
+  def delete(self) -> None:
+    Logger.instance(LOG_ID).debug(f"Deleting service: {self.service_name}, path: {self.service_path}")
+
+    # Delete service directory
+    shutil.rmtree(self.service_path)
+
+    # Delete certs for that hostname if HTTPS
+    if self.service_config.scheme == 'https':
+      certs_dir_path_escaped = glob.escape(self.app.certs_dir_path)
+      hostname = self.service_config.hostname
+      pattern = os.path.join(certs_dir_path_escaped, f"{hostname}*")
+
+      cert_paths = glob.glob(pattern)
+      for cert_path in cert_paths:
+        Logger.instance(LOG_ID).debug(f"Deleting cert_path: {cert_path}")
+        os.remove(cert_path)
+
+    return None
+

stoobly_agent/app/cli/scaffold/service_workflow_validate_command.py

@@ -1,6 +1,8 @@
 import os
 import pdb
+import socket
 import ssl
+import time
 from collections import Counter
 from pathlib import Path
 
@@ -20,6 +22,7 @@ from stoobly_agent.app.cli.scaffold.constants import (
   WORKFLOW_RECORD_TYPE,
   WORKFLOW_TEST_TYPE,
 )
+from stoobly_agent.app.cli.scaffold.hosts_file_reader import HostsFileReader
 from stoobly_agent.app.cli.scaffold.service_command import ServiceCommand
 from stoobly_agent.app.cli.scaffold.service_docker_compose import ServiceDockerCompose
 from stoobly_agent.app.cli.scaffold.validate_command import ValidateCommand
@@ -68,26 +71,40 @@ class ServiceWorkflowValidateCommand(ServiceCommand, ValidateCommand):
   def is_external(self):
     return not self.is_local()
 
-  def hostname_reachable(self, url: str) -> None:
-    # Retry HTTP request. Source: https://stackoverflow.com/questions/15431044/can-i-set-max-retries-for-requests-request
-    session = requests.Session()
-    retries = Retry(total=5,
-                    backoff_factor=0.1,
-                    status_forcelist=[ 500, 502, 503, 504 ])
-    session.mount('http://', HTTPAdapter(max_retries=retries))
-    session.mount('https://', HTTPAdapter(max_retries=retries))
-
-    # Use default OpenSSL path to CA certs on the system
-    default_ssl_verify_paths = ssl.get_default_verify_paths()
-    default_capath = default_ssl_verify_paths.capath
-
-    response = session.get(url=url, verify=default_capath)
-    if not response.ok:
-      raise ScaffoldValidateException(f"Host is not reachable: {url}")
+  def hostname_reachable(self, hostname: str, port: int) -> bool:
+    print(f"Validating connection to hostname: {hostname}, port: {port}")
+    timeout = 1
+    retries = 15
+    delay = 0.100
+
+    for attempt in range(retries):
+      try:
+        with socket.create_connection((hostname, port), timeout=timeout):
+          return True
+      except (socket.timeout, socket.error):
+        if attempt < retries - 1:
+          time.sleep(delay)
+
+    raise ScaffoldValidateException(f"Connection failed to hostname: {hostname}, port: {port}")
+
+  # Check if hostname is defined in hosts file
+  def hostname_exists(self, hostname: str) -> bool:
+    print(f"Validating hostname exists in hosts file for hostname: {hostname}")
+
+    hosts_file_reader = HostsFileReader()
+    host_mapping = hosts_file_reader.find_host(hostname)
+    if host_mapping:
+      print(f"Correct hosts mapping found for {hostname}")
+      return True
+
+    raise ScaffoldValidateException(f"Missing hosts mapping for {hostname}")
  
-  def validate_hostname(self, url: str) -> None:
-    print(f"Validating hostname: {url}")
-    self.hostname_reachable(url)
+  def validate_hostname(self, hostname: str, port: int) -> None:
+    print(f"Validating hostname: {hostname}")
+
+    self.hostname_exists(hostname)
+
+    self.hostname_reachable(hostname, port)
 
     # TODO: check logs of proxy. lifecycle hook for custom logging? Does mitmproxy support json logging?
 
@@ -189,7 +206,7 @@ class ServiceWorkflowValidateCommand(ServiceCommand, ValidateCommand):
     url = f"{self.service_config.scheme}://{self.hostname}"
 
     if self.service_config.hostname and self.workflow_name not in [WORKFLOW_TEST_TYPE]:
-      self.validate_hostname(url)
+      self.validate_hostname(self.hostname, self.service_config.port)
     
     # Test workflow won't expose services that are detached and have a hostname to the host such as assets.
     # Need to test connection from inside the Docker network

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

@@ -28,7 +28,7 @@ docker_compose_command=docker compose
 source_env=set -a; [ -f .env ] && source .env; set +a
 
 docker_compose_file_path=$(app_data_dir)/docker/stoobly-ui/exec/.docker-compose.exec.yml
-stoobly_exec_args=--profile $(EXEC_WORKFLOW_NAME) -p $(EXEC_WORKFLOW_NAME) up --build --remove-orphans --pull always
+stoobly_exec_args=--profile $(EXEC_WORKFLOW_NAME) -p $(EXEC_WORKFLOW_NAME) up --build --remove-orphans --pull always 
 stoobly_exec_env=export CONTEXT_DIR=$(context_dir) && export USER_ID=$$UID && export CA_CERTS_DIR="$(ca_certs_dir)"
 stoobly_exec=$(stoobly_exec_env) && $(source_env) && $(docker_compose_command) -f "$(docker_compose_file_path)" $(stoobly_exec_args)
 
@@ -68,6 +68,12 @@ mock: nameservers
 	export EXEC_ARGS="mock" && \
 	$(stoobly_exec_run) && \
 	$(workflow_run)
+mock/logs: 
+	@export EXEC_COMMAND=bin/.logs && \
+	export EXEC_OPTIONS="$(options)" && \
+	export EXEC_ARGS="mock" && \
+	$(stoobly_exec_run) && \
+	$(workflow_run)
 mock/stop:
 	@export EXEC_COMMAND=bin/.stop && \
 	export EXEC_OPTIONS="$(options)" && \
@@ -80,6 +86,12 @@ record: nameservers
 	export EXEC_ARGS="record" && \
 	$(stoobly_exec_run) && \
 	$(workflow_run)
+record/logs: 
+	@export EXEC_COMMAND=bin/.logs && \
+	export EXEC_OPTIONS="$(options)" && \
+	export EXEC_ARGS="record" && \
+	$(stoobly_exec_run) && \
+	$(workflow_run)
 record/stop:
 	@export EXEC_COMMAND=bin/.stop && \
 	export EXEC_OPTIONS="$(options)" && \
@@ -121,6 +133,12 @@ test:
 	export EXEC_ARGS="test" && \
 	$(stoobly_exec_run) && \
 	$(workflow_run)
+test/logs: 
+	@export EXEC_COMMAND=bin/.logs && \
+	export EXEC_OPTIONS="$(options)" && \
+	export EXEC_ARGS="test" && \
+	$(stoobly_exec_run) && \
+	$(workflow_run)
 test/stop:
 	@export EXEC_COMMAND=bin/.stop && \
 	export EXEC_OPTIONS="$(options)" && \

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

@@ -1,9 +1,9 @@
 services:
   gateway_base:
+    environment:
+      TRUST_DOWNSTREAM_PROXY: true
     image: nginxproxy/nginx-proxy:1.5
-    ports:
-      - '80:80'
-      - '443:443' # Entry port
+    ports: {}
     profiles:
       - gateway_base
     volumes:

stoobly_agent/app/cli/scaffold/templates/app/stoobly-ui/exec/bin/.logs

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+extra_options=$EXEC_OPTIONS
+workflow=$1
+
+stoobly-agent scaffold workflow logs \
+  --app-dir-path "$(pwd)" \
+  --dry-run \
+  $extra_options \
+  $workflow > .stoobly/tmp/run.sh

stoobly_agent/app/cli/scaffold/workflow_command.py

@@ -39,7 +39,6 @@ class WorkflowCommand(ServiceCommand):
 
   @property
   def containers(self):
-    _containers = []
     if not os.path.exists(self.compose_path):
       return []
 
@@ -49,11 +48,8 @@ class WorkflowCommand(ServiceCommand):
       if not isinstance(services, dict):
         return []
 
-      for service in services:
-        _containers.append(f"{self.workflow_name}-{service}-1")
+      return services
         
-    return _containers
-
   @property
   def custom_compose(self):
     if os.path.exists(self.custom_compose_path):

stoobly_agent/app/cli/scaffold/workflow_log_command.py

@@ -1,21 +1,46 @@
-import os
 import pdb
-import yaml
+
+from typing import TypedDict
+
+from stoobly_agent.lib.logger import DEBUG
 
 from .app import App
+from .constants import WORKFLOW_CONTAINER_TEMPLATE
 from .workflow_command import WorkflowCommand
 
+class WorkflowLogCommand(TypedDict):
+  container: str
+  follow: bool
+  namespace: str
+
 class WorkflowLogCommand(WorkflowCommand):
   def __init__(self, app: App, **kwargs):
     super().__init__(app, **kwargs)
 
-  def all(self):
+  def build(self, **options: WorkflowLogCommand):
     commands = []
     containers = self.containers
+    allowed_containers = list(
+      map(
+        lambda container: WORKFLOW_CONTAINER_TEMPLATE.format(
+          container=container, service_name=self.service_name
+        ), options.get('containers') or []
+      )
+    )
 
-    for container in containers:
-      command = ['docker', 'logs', container]
+    for index, container in enumerate(containers):
+      if container not in allowed_containers:
+        continue
 
+      container_name = self.container_name(container, options.get('namespace'))
+      commands.append(f"echo \"=== Logging {container_name}\"")
+      if options.get('follow') and index == len(containers) - 1:
+        command = ['docker', 'logs', '--follow', container_name]
+      else:
+        command = ['docker', 'logs', container_name]
       commands.append(' '.join(command))
 
     return commands
+
+  def container_name(self, container, namespace=None):
+    return f"{namespace or self.workflow_name}-{container}-1"

stoobly_agent/app/cli/scaffold/workflow_run_command.py

@@ -142,7 +142,6 @@ class WorkflowRunCommand(WorkflowCommand):
       command.append(option)
 
     command.append('--build')
-    command.append('--pull always')
 
     self.write_env()
 

stoobly_agent/app/cli/scaffold_cli.py

@@ -9,15 +9,15 @@ from stoobly_agent.app.cli.helpers.certificate_authority import CertificateAutho
 from stoobly_agent.app.cli.helpers.shell import exec_stream
 from stoobly_agent.app.cli.scaffold.app import App
 from stoobly_agent.app.cli.scaffold.app_create_command import AppCreateCommand
-from stoobly_agent.app.cli.scaffold.constants import DOCKER_NAMESPACE, WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE, WORKFLOW_TEST_TYPE
 from stoobly_agent.app.cli.scaffold.constants import (
-  DOCKER_NAMESPACE, WORKFLOW_CUSTOM_FILTER, WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE, WORKFLOW_TEST_TYPE
+  DOCKER_NAMESPACE, WORKFLOW_CONTAINER_PROXY, WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE, WORKFLOW_TEST_TYPE
 )
 from stoobly_agent.app.cli.scaffold.docker.service.set_gateway_ports import set_gateway_ports
 from stoobly_agent.app.cli.scaffold.docker.workflow.decorators_factory import get_workflow_decorators
 from stoobly_agent.app.cli.scaffold.service import Service
 from stoobly_agent.app.cli.scaffold.service_config import ServiceConfig
 from stoobly_agent.app.cli.scaffold.service_create_command import ServiceCreateCommand
+from stoobly_agent.app.cli.scaffold.service_delete_command import ServiceDeleteCommand
 from stoobly_agent.app.cli.scaffold.service_workflow_validate_command import ServiceWorkflowValidateCommand
 from stoobly_agent.app.cli.scaffold.templates.constants import CORE_SERVICES
 from stoobly_agent.app.cli.scaffold.validate_exceptions import ScaffoldValidateException
@@ -143,6 +143,24 @@ def create(**kwargs):
   else:
     print(f"{service.dir_path} already exists, use option '--force' to continue")
 
+@service.command(
+  help="Delete a service",
+)
+@click.option('--app-dir-path', default=os.getcwd(), help='Path to application directory.')
+@click.argument('service_name')
+def delete(**kwargs):
+  __validate_app_dir(kwargs['app_dir_path'])
+
+  app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
+  service = Service(kwargs['service_name'], app)
+
+  if not os.path.exists(service.dir_path):
+    print(f"Service does not exist, so not deleting")
+  else:
+    print(f"Deleting service: {service.service_name}")
+    __scaffold_delete(app, **kwargs)
+    print(f"Successfully deleted service: {service.service_name}")
+
 @service.command(
   help="Update a service config"
 )
@@ -227,8 +245,6 @@ def copy(**kwargs):
 @click.option('--app-dir-path', default=os.getcwd(), help='Path to application directory.')
 @click.option('--context-dir-path', default=DataDir.instance().context_dir_path, help='Path to Stoobly data directory.')
 @click.option('--dry-run', default=False, is_flag=True)
-
-@click.option('--filter', multiple=True, type=click.Choice([WORKFLOW_CUSTOM_FILTER]), help='Select which service groups to run. Defaults to all.')
 @click.option('--log-level', default=INFO, type=click.Choice([DEBUG, INFO, WARNING, ERROR]), help='''
     Log levels can be "debug", "info", "warning", or "error"
 ''')
@@ -250,7 +266,7 @@ def stop(**kwargs):
     sys.exit(1)
 
   workflow = Workflow(kwargs['workflow_name'], app)
-  services = __get_services(workflow.services, filter=kwargs['filter'], service=kwargs['service'])
+  services = __get_services(workflow.services, service=kwargs['service'])
 
   commands: List[WorkflowRunCommand] = []
   for service in services:
@@ -276,11 +292,18 @@ def stop(**kwargs):
 
 @workflow.command()
 @click.option('--app-dir-path', default=os.getcwd(), help='Path to application directory.')
-@click.option('--dry-run', default=False, is_flag=True)
-@click.option('--filter', multiple=True, type=click.Choice([WORKFLOW_CUSTOM_FILTER]), help='Select which service groups to run. Defaults to all.')
+@click.option(
+  '--container', multiple=True, help=f"Select which containers to log. Defaults to '{WORKFLOW_CONTAINER_PROXY}'"
+)
+@click.option('--dry-run', default=False, is_flag=True, help='If set, prints commands.')
+@click.option('--follow', is_flag=True, help='Follow last container log output.')
+@click.option('--namespace', help='Workflow namespace.')
 @click.option('--service', multiple=True, help='Select which services to log. Defaults to all.')
 @click.argument('workflow_name')
 def logs(**kwargs):
+  if len(kwargs['container']) == 0:
+    kwargs['container'] = [WORKFLOW_CONTAINER_PROXY]
+
   app = App(kwargs['app_dir_path'], DOCKER_NAMESPACE)
 
   if not app.exists:
@@ -288,12 +311,18 @@ def logs(**kwargs):
     sys.exit(1)
 
   workflow = Workflow(kwargs['workflow_name'], app)
-  services = __get_services(workflow.services, filter=kwargs['filter'], service=kwargs['service'])
+  services = __get_services(workflow.services, service=kwargs['service'])
 
   commands: List[WorkflowLogCommand] = []
   for service in services:
-    if len(kwargs['service']) > 0 and service not in kwargs['service']:
-      continue
+    if len(kwargs['service']) == 0:
+      # If no filter is specified, ignore CORE_SERVICES
+      if service in CORE_SERVICES:
+        continue
+    else:
+      # If a filter is specified, ignore all other services
+      if service not in kwargs['service']:
+        continue
 
     config = { **kwargs }
     config['service_name'] = service 
@@ -302,10 +331,15 @@ def logs(**kwargs):
 
   commands = sorted(commands, key=lambda command: command.service_config.priority)
 
-  for command in commands:
+  for index, command in enumerate(commands):
     __print_header(f"SERVICE {command.service_name}")
 
-    for shell_command in command.all():
+    follow = kwargs['follow'] and index == len(commands) - 1
+    shell_commands = command.build(
+      containers=kwargs['container'], follow=follow, namespace=kwargs['namespace']
+    )
+
+    for shell_command in shell_commands:
       print(shell_command)
 
       if not kwargs['dry_run']:
@@ -317,7 +351,6 @@ def logs(**kwargs):
 @click.option('--certs-dir-path', help='Path to certs directory. Defaults to the certs dir of the context.')
 @click.option('--context-dir-path', default=DataDir.instance().context_dir_path, help='Path to Stoobly data directory.')
 @click.option('--detached', is_flag=True, help='If set, will not run the highest priority service in the foreground.')
-@click.option('--filter', multiple=True, type=click.Choice([WORKFLOW_CUSTOM_FILTER]), help='Select which service groups to run. Defaults to all.')
 @click.option('--dry-run', default=False, is_flag=True, help='If set, prints commands.')
 @click.option('--extra-compose-path', help='Path to extra compose configuration files.')
 @click.option('--log-level', default=INFO, type=click.Choice([DEBUG, INFO, WARNING, ERROR]), help='''
@@ -352,7 +385,7 @@ def run(**kwargs):
     sys.exit(1)
 
   workflow = Workflow(kwargs['workflow_name'], app)
-  services = __get_services(workflow.services, filter=kwargs['filter'], service=kwargs['service'])
+  services = __get_services(workflow.services, service=kwargs['service'])
 
   # Gateway ports are dynamically set depending on the workflow run
   set_gateway_ports(workflow.service_paths_from_services(services))
@@ -432,17 +465,9 @@ def __get_services(services: List[str], **kwargs):
   if missing_services:
     Logger.instance(LOG_ID).warn(f"Service(s) {','.join(missing_services)} are not found")
 
-  filter = kwargs.get('filter') or []
   if kwargs['service']:
     # If service is specified, run only those services
     services = list(kwargs['service'])
-
-    if WORKFLOW_CUSTOM_FILTER not in filter:
-      services += CORE_SERVICES
-  else:
-    if WORKFLOW_CUSTOM_FILTER in filter:
-      # If this filter is set, then the user does not want to run core services
-      services = list(filter(lambda service: service not in CORE_SERVICES, services))
     
   return list(set(services))
 
@@ -457,6 +482,11 @@ def __scaffold_build(app, **kwargs):
 
   command.build()
 
+def __scaffold_delete(app, **kwargs):
+  command = ServiceDeleteCommand(app, **kwargs)
+
+  command.delete()
+
 def __validate_app_dir(app_dir_path):
   if not os.path.exists(app_dir_path):
     print(f"Error: {app_dir_path} does not exist", file=sys.stderr)
@@ -476,4 +506,4 @@ def __workflow_build(app, **kwargs):
     headless=kwargs['headless'],
     template=kwargs['template'],
     workflow_decorators=workflow_decorators
-  )
+  )

stoobly_agent/app/proxy/replay/multipart.py

@@ -73,4 +73,7 @@ def decode(hdrs, content):
             r.append((part.name, part.raw))
         else:
             r.append((part.name, part.value))
+
+        # Free up resources after use
+        part.close()
     return r