stoobly-agent 1.0.7__py3-none-any.whl → 1.0.9__py3-none-any.whl

stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.0.7'
+VERSION = '1.0.9'

stoobly_agent/app/cli/scaffold/constants.py

@@ -1,5 +1,8 @@
 from typing import Literal
 
+from stoobly_agent.config.data_dir import DATA_DIR_NAME
+
+
 APP_NETWORK_ENV = 'APP_NETWORK'
 CA_CERTS_DIR_ENV = 'CA_CERTS_DIR'
 CERTS_DIR_ENV = 'CERTS_DIR'
@@ -26,11 +29,16 @@ SERVICE_PORT = '${SERVICE_PORT}'
 SERVICE_PORT_ENV = 'SERVICE_PORT'
 SERVICE_PRIORITY_ENV = 'SERVICE_PRIORITY'
 STOOBLY_HOME_DIR = '/home/stoobly'
+STOOBLY_DATA_DIR = f"{STOOBLY_HOME_DIR}/{DATA_DIR_NAME}"
 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_MOCK_TYPE = 'mock'
 WORKFLOW_NAME_ENV = 'WORKFLOW_NAME'
 WORKFLOW_RECORD_TYPE = 'record'
 WORKFLOW_TEST_TYPE = 'test'
 
-WORKFLOW_TEMPLATE = Literal[WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE, WORKFLOW_TEST_TYPE]
+WORKFLOW_TEMPLATE = Literal[WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE, WORKFLOW_TEST_TYPE]
+

stoobly_agent/app/cli/scaffold/docker/constants.py

@@ -5,3 +5,9 @@ DOCKERFILE_CONTEXT = '.Dockerfile.context'
 DOCKERFILE_PROXY = '.Dockerfile.proxy'
 DOCKERFILE_SERVICE = 'Dockerfile.source'
 GATEWAY_NETWORK = 'gateway'
+
+# TODO: add scaffold container name templates here
+
+# Example:
+# COMPOSE_TEMPLATE = 'docker-compose.{workflow}.yml'
+

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

@@ -182,7 +182,6 @@ class WorkflowBuilder(Builder):
 
     depends_on = {}
     environment = { **self.env_dict() }
-    extra_hosts = []
     networks = [self.service_builder.service_name]
     volumes = []
 
@@ -190,7 +189,6 @@ class WorkflowBuilder(Builder):
       'build': self.proxy_build, 
       'depends_on': depends_on,
       'environment': environment,
-      'extra_hosts': extra_hosts,
       'extends': self.service_builder.build_extends_proxy_base(self.dir_path),
       'networks': networks,
       'profiles': self.profiles,

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

@@ -37,4 +37,4 @@ class MockDecorator():
     services[proxy_name] = { 
       **proxy_service,
       **{ 'command': command, 'hostname': f"{SERVICE_HOSTNAME}" },
-    }
+    }

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

@@ -62,4 +62,3 @@ class ReverseProxyDecorator():
 
     services[proxy_name] = service 
 
-

stoobly_agent/app/cli/scaffold/managed_services_docker_compose.py

@@ -0,0 +1,9 @@
+
+class ManagedServicesDockerCompose():
+  def __init__(self, target_workflow_name):
+    self.init_container_name = f"{target_workflow_name}-build.init-1"
+    self.configure_container_name = f"{target_workflow_name}-build.configure-1"
+    self.gateway_container_name = f"{target_workflow_name}-gateway.service-1"
+    self.mock_ui_container_name = f"{target_workflow_name}-stoobly_ui.service-1"
+    self.entrypoint_init_container_name = f"{target_workflow_name}-entrypoint.init-1"
+    self.entrypoint_configure_container_name = f"{target_workflow_name}-entrypoint.configure-1"

stoobly_agent/app/cli/scaffold/service_command.py

@@ -5,6 +5,7 @@ from .app import App
 from .app_command import AppCommand
 from .service_config import ServiceConfig
 
+
 class ServiceCommand(AppCommand):
 
   def __init__(self, app: App, **kwargs):
@@ -47,4 +48,5 @@ class ServiceCommand(AppCommand):
     _config = self.app_config.read()
     _config.update(self.service_config.read())
     _config.update(_c)
-    return _config
+    return _config
+

stoobly_agent/app/cli/scaffold/service_config.py

@@ -210,4 +210,5 @@ class ServiceConfig(Config):
       
     # Split the DNS servers string into a list
     dns_servers = match[0].strip().split("\n")
-    return list(map(lambda dns_server: dns_server.strip(), dns_servers))
+    return list(map(lambda dns_server: dns_server.strip(), dns_servers))
+

stoobly_agent/app/cli/scaffold/service_docker_compose.py

@@ -0,0 +1,15 @@
+from stoobly_agent.config.data_dir import DataDir
+
+
+class ServiceDockerCompose():
+  def __init__(self, app_dir_path, target_workflow_name, service_name, hostname):
+    self.service_name = service_name
+    self.hostname = hostname
+    self.container_name = f"{target_workflow_name}-{service_name}-1"
+    self.proxy_container_name = f"{target_workflow_name}-{service_name}.proxy-1"
+    self.init_container_name = f"{target_workflow_name}-{service_name}.init-1"
+    self.configure_container_name = f"{target_workflow_name}-{service_name}.configure-1"
+
+    data_dir_path = DataDir.instance(app_dir_path).path
+    self.docker_compose_path = f"{data_dir_path}/docker/{service_name}/{target_workflow_name}/docker-compose.yml"
+    self.init_script_path = f"{data_dir_path}/docker/{service_name}/{target_workflow_name}/bin/init"

stoobly_agent/app/cli/scaffold/service_workflow_validate_command.py

@@ -0,0 +1,234 @@
+import os
+import pdb
+import ssl
+from collections import Counter
+from pathlib import Path
+
+import requests
+import yaml
+from docker.models.containers import Container
+from requests.adapters import HTTPAdapter
+from urllib3 import Retry
+
+from stoobly_agent.app.cli.scaffold.constants import (
+  FIXTURES_FOLDER_NAME,
+  STOOBLY_DATA_DIR,
+  STOOBLY_HOME_DIR,
+  VIRTUAL_HOST_ENV,
+  VIRTUAL_PORT_ENV,
+  VIRTUAL_PROTO_ENV,
+  WORKFLOW_RECORD_TYPE,
+  WORKFLOW_TEST_TYPE,
+)
+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
+from stoobly_agent.app.cli.scaffold.validate_exceptions import ScaffoldValidateException
+from stoobly_agent.config.data_dir import DATA_DIR_NAME
+
+from .app import App
+
+
+class ServiceWorkflowValidateCommand(ServiceCommand, ValidateCommand):
+  def __init__(self, app: App, **kwargs):
+    ServiceCommand.__init__(self, app, **kwargs)
+    ValidateCommand.__init__(self)
+
+    self.workflow_name = kwargs['workflow_name']
+    self.hostname = self.service_config.hostname
+    self.service_docker_compose = ServiceDockerCompose(app_dir_path=app.dir_path, target_workflow_name=self.workflow_name, service_name=self.service_name, hostname=self.hostname)
+
+  @property
+  def fixtures_dir_path(self):
+    return os.path.join(self.workflow_path, FIXTURES_FOLDER_NAME)
+  
+  @property
+  def workflow_path(self):
+    return os.path.join(
+      self.scaffold_dir_path,
+      self.workflow_relative_path
+    )
+  @property
+  def workflow_relative_path(self):
+    return os.path.join(
+      self.service_relative_path,
+      self.workflow_name
+    )
+
+  def is_local(self):
+    with open (self.service_docker_compose.docker_compose_path,'rb') as f:
+      docker_compose_file_content = yaml.safe_load(f)
+      if docker_compose_file_content and docker_compose_file_content.get('services'):
+        return True
+
+      # We can potentially check the port too someday
+
+    return False
+
+  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 validate_hostname(self, url: str) -> None:
+    print(f"Validating hostname: {url}")
+    self.hostname_reachable(url)
+
+    # TODO: check logs of proxy. lifecycle hook for custom logging? Does mitmproxy support json logging?
+
+  def validate_internal_hostname(self, url: str) -> None:
+    print(f"Validating hostname inside Docker network, url: {url}")
+    
+    timeout_seconds = 1
+    output = self.docker_client.containers.run(
+      image='curlimages/curl:8.11.0',
+      command=f"curl --max-time {timeout_seconds} {url} --verbose",
+      network=self.app_config.network,
+      stderr=True,
+      remove=True,
+    )
+
+    # Note: 499 error could also mean success because it shows the proxy
+    # connection is working, but we haven't recorded anything yet
+    logs = output.decode('ascii')
+    if ('200 OK' not in logs) and ('499' not in logs):
+      raise ScaffoldValidateException(f"Error reaching {url} from inside Docker network")
+
+  # Check fixtures folder mounted into container
+  def validate_fixtures_folder(self, container: Container):
+    
+    if self.workflow_name == WORKFLOW_RECORD_TYPE:
+      print(f"Skipping validating fixtures folder in workflow: {self.workflow_name}, container: {container.name}")
+      return
+
+    print(f"Validating fixtures folder in container: {container.name}")
+
+    data_dir_mounted = False
+    volume_mounts = container.attrs['Mounts']
+
+    for volume_mount in volume_mounts:
+      if volume_mount['Destination'] == STOOBLY_DATA_DIR:
+        data_dir_mounted = True
+        break
+    if not data_dir_mounted:
+      raise ScaffoldValidateException(f"Data directory is not mounted for: {container.name}")
+
+    # Only the running proxy containers will be checkable
+    if container.status == 'exited':
+      print(f"Skipping validating fixtures folder contents because container is exited: {container.name}")
+      return
+
+    # Check contents of fixtures folder to confirm it's shared
+    fixtures_folder_path = f"{STOOBLY_HOME_DIR}/{self.workflow_name}/{FIXTURES_FOLDER_NAME}"
+    exec_result = container.exec_run(f"ls -A {fixtures_folder_path}")
+    output = exec_result.output
+
+    fixtures_folder_contents_container = output.decode('ascii').split('\n')
+    if fixtures_folder_contents_container[-1] == '':
+      fixtures_folder_contents_container.pop()
+    fixtures_folder_contents_scaffold = os.listdir(self.fixtures_dir_path)
+
+    if Counter(fixtures_folder_contents_container) != Counter(fixtures_folder_contents_scaffold):
+      raise ScaffoldValidateException(f"Fixtures was not mounted properly, expected {self.fixtures_dir_path} to exist in container path {fixtures_folder_path}")
+
+  # Note: might not need this if the hostname is reachable and working
+  def proxy_environment_variables_exist(self, container: Container) -> None:
+    environment_variables = container.attrs['Config']['Env']
+    virtual_host_exists = False
+    virtual_port_exists = False
+    virtual_proto_exists = False
+
+    for environment_variable in environment_variables:
+      environment_variable_name, environment_variable_value = environment_variable.split('=')
+      if environment_variable_name == VIRTUAL_HOST_ENV:
+        virtual_host_exists = True
+      elif environment_variable_name == VIRTUAL_PORT_ENV:
+        virtual_port_exists = True
+      elif environment_variable_name == VIRTUAL_PROTO_ENV:
+        virtual_proto_exists = True
+
+    if not virtual_host_exists:
+      raise ScaffoldValidateException(f"VIRTUAL_HOST environment variable is missing from container: {container.name}")
+    if not virtual_port_exists:
+      raise ScaffoldValidateException(f"VIRTUAL_POST environment variable is missing from container: {container.name}")
+    if not virtual_proto_exists:
+      raise ScaffoldValidateException(f"VIRTUAL_PROTO environment variable is missing from container: {container.name}")
+
+  
+  def validate_proxy_container(self, service_proxy_container: Container):
+    print(f"Validating proxy container: {service_proxy_container.name}")
+    if not service_proxy_container.attrs:
+      raise ScaffoldValidateException(f"Container attributes are missing for: {container.name}")
+
+    if not self.service_config.detached:
+      self.validate_fixtures_folder(service_proxy_container)
+
+    self.proxy_environment_variables_exist(service_proxy_container)
+
+  def validate_service_container(self):
+    pass
+  
+  def validate(self) -> bool:
+    print(f"Validating service: {self.service_name}")
+
+    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)
+    
+    # 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
+    if self.service_config.hostname and self.workflow_name == WORKFLOW_TEST_TYPE and self.service_config.detached:
+      self.validate_internal_hostname(url)
+
+    self.validate_init_containers(self.service_docker_compose.init_container_name, self.service_docker_compose.configure_container_name)
+
+    # Service init containers have a mounted dist folder unlike the core init container
+    init_container = self.docker_client.containers.get(self.service_docker_compose.init_container_name)
+    self.validate_fixtures_folder(init_container)
+
+    if self.service_config.hostname:
+      service_proxy_container = self.docker_client.containers.get(self.service_docker_compose.proxy_container_name)
+      self.validate_proxy_container(service_proxy_container)
+
+    if self.is_local():
+      print(f"Validating local user defined service: {self.service_name}")
+      # Validate docker-compose path exists
+      docker_compose_path = f"{self.app_dir_path}/{DATA_DIR_NAME}/docker/{self.service_docker_compose.service_name}/{self.workflow_name}/docker-compose.yml"
+      destination_path = Path(docker_compose_path)
+      if not destination_path.is_file():
+        raise ScaffoldValidateException(f"Docker compose path is not a file: {destination_path}")
+
+      # Validate docker-compose.yml file has the service defined
+      with open(destination_path) as f:
+        if self.service_name not in f.read():
+          raise ScaffoldValidateException(f"Local service is not defined in Docker Compose file: {destination_path}")
+
+      service_container = self.docker_client.containers.get(self.service_docker_compose.container_name)
+      if service_container.status == 'exited':
+        return False
+
+    if self.service_config.detached:
+      service_container = self.docker_client.containers.get(self.service_docker_compose.container_name)
+      self.validate_detached(service_container)
+
+    print(f"Done validating service: {self.service_name}, success!")
+    print()
+
+    return True
+

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

@@ -8,7 +8,7 @@
 
 # Constants
 DIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
-WORKFLOW_NAME := exec
+EXEC_WORKFLOW_NAME := exec
 
 CONTEXT_DIR_DEFAULT := $(realpath $(DIR)/../..)
 
@@ -27,7 +27,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 $(WORKFLOW_NAME) -p $(WORKFLOW_NAME) up --build --remove-orphans
+stoobly_exec_args=--profile $(EXEC_WORKFLOW_NAME) -p $(EXEC_WORKFLOW_NAME) up --build --remove-orphans
 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)
 

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

@@ -1 +1,14 @@
-# Define services here
+# Define networks and services here
+#
+# If a container service needs access to a Stoobly defined service, 
+# then the container service needs to add the service name to the 'networks' property
+# e.g. If we have defined a 'upstream' service, then the following should be added
+# networks:
+#   - upstream
+# 
+# Container services that are intended to be run as part of a workflow need to have the workflow name added to the 'profiles' property
+# e.g. If we want to run a service as part of the 'mock' workflow, then the following should be added
+# profiles:
+#   - mock
+networks: {}
+services: {}

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

@@ -1 +1,14 @@
-# Define services here
+# Define networks and services here
+#
+# If a container service needs access to a Stoobly defined service, 
+# then the container service needs to add the service name to the 'networks' property
+# e.g. If we have defined a 'upstream' service, then the following should be added
+# networks:
+#   - upstream
+# 
+# Container services that are intended to be run as part of a workflow need to have the workflow name added to the 'profiles' property
+# e.g. If we want to run a service as part of the 'record' workflow, then the following should be added
+# profiles:
+#   - record
+networks: {}
+services: {}

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

@@ -1 +1,14 @@
-# Define services here
+# Define networks and services here
+#
+# If a container service needs access to a Stoobly defined service, 
+# then the container service needs to add the service name to the 'networks' property
+# e.g. If we have defined a 'upstream' service, then the following should be added
+# networks:
+#   - upstream
+# 
+# Container services that are intended to be run as part of a workflow need to have the workflow name added to the 'profiles' property
+# e.g. If we want to run a service as part of the 'test' workflow, then the following should be added
+# profiles:
+#   - test
+networks: {}
+services: {}

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

@@ -3,6 +3,8 @@
 extra_options=$EXEC_OPTIONS
 workflow=$1
 
+mkdir -p .stoobly/tmp
+
 stoobly-agent scaffold workflow run \
   --app-dir-path "$(pwd)" \
   --dry-run \

stoobly_agent/app/cli/scaffold/templates/constants.py

@@ -1,9 +1,9 @@
 import os
 
 CORE_BUILD_SERVICE_NAME = 'build'
-CORE_MOCK_UI_SERVICE_NAME = 'stoobly-ui'
-CORE_GATEWAY_SERVICE_NAME = 'gateway'
 CORE_ENTRYPOINT_SERVICE_NAME = 'entrypoint'
+CORE_GATEWAY_SERVICE_NAME = 'gateway'
+CORE_MOCK_UI_SERVICE_NAME = 'stoobly-ui'
 CORE_SERVICES = [
   CORE_BUILD_SERVICE_NAME, CORE_ENTRYPOINT_SERVICE_NAME, CORE_MOCK_UI_SERVICE_NAME, CORE_GATEWAY_SERVICE_NAME 
 ]
@@ -60,4 +60,4 @@ TEST_WORKFLOW_CUSTOM_FILES = [
   CUSTOM_LIFECYCLE_HOOKS
 ]
 
-SERVICE_HOSTNAME_BUILD_ARG = 'SERVICE_HOSTNAME'
+SERVICE_HOSTNAME_BUILD_ARG = 'SERVICE_HOSTNAME'

stoobly_agent/app/cli/scaffold/validate_command.py

@@ -0,0 +1,59 @@
+import pdb
+from time import sleep
+
+import docker
+from docker import errors as docker_errors
+from docker.models.containers import Container
+
+from stoobly_agent.app.cli.scaffold.validate_exceptions import ScaffoldValidateException
+from stoobly_agent.config.data_dir import DATA_DIR_NAME
+
+
+class ValidateCommand():
+  def __init__(self):
+    self.docker_client = docker.from_env()
+
+  # Some containers like init and configure can take longer than expected to finish so retry
+  def __get_container(self, container_name: str) -> Container:
+    tries = 30
+    for _ in range(tries):
+      try:
+        container = self.docker_client.containers.get(container_name)
+        return container
+      except docker_errors.NotFound:
+        sleep(0.5)
+
+    raise ScaffoldValidateException(f"Container not found: {container_name}")
+
+  def validate_init_containers(self, init_container_name, configure_container_name) -> None:
+    print(f"Validating setup containers: {init_container_name}, {configure_container_name}")
+
+
+    init_container = self.__get_container(init_container_name)
+    logs = init_container.logs()
+    if logs:
+      raise ScaffoldValidateException(f"Error logs potentially detected in: {init_container_name}")
+    if init_container.status != 'exited' or init_container.attrs['State']['ExitCode'] != 0:
+      raise ScaffoldValidateException(f"init container has not exited like expected: {init_container_name}")
+
+    configure_container = self.__get_container(configure_container_name)
+
+    configure_container_ran = False
+    if configure_container.status == 'exited' and configure_container.attrs['State']['ExitCode'] == 0:
+      configure_container_ran = True
+    if not configure_container_ran:
+      raise ScaffoldValidateException(f"Configure container has not ran as expected: {configure_container_name}")
+  
+  def validate_detached(self, container: Container) -> None:
+    print(f"Validating detached for: {container.name}")
+    
+    if not container.attrs:
+      raise ScaffoldValidateException(f"Container is missing: {container.name}")
+
+    volume_mounts = container.attrs['Mounts']
+    for volume_mount in volume_mounts:
+      if DATA_DIR_NAME in volume_mount['Source']:
+        return
+
+    raise ScaffoldValidateException(f"Data directory is missing from container: {container.name}")
+

stoobly_agent/app/cli/scaffold/validate_exceptions.py

@@ -0,0 +1,5 @@
+
+
+class ScaffoldValidateException(Exception):
+  pass
+

stoobly_agent/app/cli/scaffold/workflow.py

@@ -1,9 +1,10 @@
 import os
-
+import pdb
 from typing import List
 
 from .app import App
 
+
 class Workflow():
 
   def __init__(self, workflow_name: str, app: App):
@@ -34,6 +35,26 @@ class Workflow():
   def service_paths(self):
     return self.app.service_paths
 
+  # TODO: merge into 1 services property
+
+  # Returns services that run in this specific workflow
+  @property
+  def services_ran(self) -> List[str]:
+    services_dir = os.path.join(self.app.scaffold_dir_path, self.app.namespace)
+
+    services = []
+    for filename in os.listdir(services_dir):
+      path = os.path.join(services_dir, filename)
+      if not os.path.isdir(path):
+        continue
+
+      for sub_path in os.scandir(path):
+        if os.path.isdir(sub_path):
+          if sub_path.name == self.workflow_name:
+            services.append(filename)
+
+    return services
+
   def service_paths_from_services(self, services: List[str]):
     app_namespace_path = self.app.namespace_path
     return list(map(lambda service: os.path.join(app_namespace_path, service), services))

stoobly_agent/app/cli/scaffold/workflow_run_command.py

@@ -1,6 +1,8 @@
 import os
 import pdb
 
+from typing import TypedDict
+
 from stoobly_agent.config.data_dir import DataDir
 from stoobly_agent.lib.logger import Logger
 
@@ -11,6 +13,10 @@ from .workflow_command import WorkflowCommand
 
 LOG_ID = 'WorkflowRunCommand'
 
+class UpOptions(TypedDict):
+  attached: bool
+  namespace: str
+
 class WorkflowRunCommand(WorkflowCommand):
   def __init__(self, app: App, **kwargs):
     super().__init__(app, **kwargs)
@@ -63,7 +69,7 @@ class WorkflowRunCommand(WorkflowCommand):
   def create_network(self):
     return f"docker network create {self.network} 2> /dev/null"
 
-  def up(self):
+  def up(self, **options: UpOptions):
     if not os.path.exists(self.compose_path):
       return ''
 
@@ -94,8 +100,15 @@ class WorkflowRunCommand(WorkflowCommand):
       command.append(f"-f {os.path.relpath(self.extra_compose_path, self.__current_working_dir)}")
 
     command.append(f"--profile {self.workflow_name}") 
+
+    if options.get('namespace'):
+      command.append(f"-p {options['namespace']}")
+
     command.append('up')
-    command.append('-d')
+
+    if not options.get('attached'):
+      command.append('-d')
+
     command.append('--build')
 
     self.write_env()
@@ -137,4 +150,5 @@ class WorkflowRunCommand(WorkflowCommand):
 
     env_vars = self.config(_config)
     env_path = self.workflow_env_path
-    Env(env_path).write(env_vars)
+    Env(env_path).write(env_vars)
+