stoobly-agent 1.2.3__py3-none-any.whl → 1.4.0__py3-none-any.whl

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

@@ -1,5 +1,8 @@
 #!/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/record/bin/.init

@@ -1,5 +1,8 @@
 #!/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/.docker-compose.test.yml

@@ -1,22 +1,18 @@
 services:
   build.init:
-    build:
-      context: ./
-      dockerfile: ../../.Dockerfile.context
     extends:
       file: ../.docker-compose.base.yml
       service: build.init_base
+    image: stoobly.${USER_ID}
     profiles:
       - test
   build.configure:
-    build:
-      context: ./
-      dockerfile: ../../.Dockerfile.context
     depends_on:
       build.init:
         condition: service_completed_successfully
     extends:
       file: ../.docker-compose.base.yml
       service: build.configure_base
+    image: stoobly.${USER_ID}
     profiles:
       - test

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

@@ -1,5 +1,8 @@
 #!/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,5 +1,8 @@
 #!/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/.docker-compose.base.yml

@@ -7,6 +7,7 @@ services:
     extends:
       file: ../.docker-compose.base.yml
       service: context_base
+    working_dir: /home/stoobly/.stoobly/docker/entrypoint/${WORKFLOW_NAME}
   entrypoint.init_base:
     command:
     - bin/.init
@@ -14,3 +15,4 @@ services:
     extends:
       file: ../.docker-compose.base.yml
       service: context_base
+    working_dir: /home/stoobly/.stoobly/docker/entrypoint/${WORKFLOW_NAME}

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

@@ -3,9 +3,6 @@ networks:
     name: entrypoint
 services:
   entrypoint.configure:
-    build:
-      context: ./
-      dockerfile: ../../.Dockerfile.context
     depends_on:
       entrypoint.init:
         condition: service_completed_successfully
@@ -13,19 +10,16 @@ services:
     extends:
       file: ../.docker-compose.base.yml
       service: entrypoint.configure_base
+    image: stoobly.${USER_ID}
     profiles:
       - mock
     volumes: []
   entrypoint.init:
-    build:
-      context: ./
-      dockerfile: ../../.Dockerfile.context
     environment: {}
     extends:
       file: ../.docker-compose.base.yml
       service: entrypoint.init_base
+    image: stoobly.${USER_ID}
     profiles:
       - mock
-    volumes:
-      - ./dist:/home/stoobly/dist
 volumes: {}

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

@@ -3,9 +3,6 @@ networks:
     name: entrypoint
 services:
   entrypoint.configure:
-    build:
-      context: ./
-      dockerfile: ../../.Dockerfile.context
     depends_on:
       entrypoint.init:
         condition: service_completed_successfully
@@ -13,19 +10,16 @@ services:
     extends:
       file: ../.docker-compose.base.yml
       service: entrypoint.configure_base
+    image: stoobly.${USER_ID}
     profiles:
       - record
     volumes: []
   entrypoint.init:
-    build:
-      context: ./
-      dockerfile: ../../.Dockerfile.context
     environment: {}
     extends:
       file: ../.docker-compose.base.yml
       service: entrypoint.init_base
+    image: stoobly.${USER_ID}
     profiles:
       - record
-    volumes:
-      - ./dist:/home/stoobly/dist
 volumes: {}

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

@@ -3,9 +3,6 @@ networks:
     name: entrypoint
 services:
   entrypoint.configure:
-    build:
-      context: ./
-      dockerfile: ../../.Dockerfile.context
     depends_on:
       entrypoint.init:
         condition: service_completed_successfully
@@ -13,19 +10,16 @@ services:
     extends:
       file: ../.docker-compose.base.yml
       service: entrypoint.configure_base
+    image: stoobly.${USER_ID}
     profiles:
       - test
     volumes: []
   entrypoint.init:
-    build:
-      context: ./
-      dockerfile: ../../.Dockerfile.context
     environment: {}
     extends:
       file: ../.docker-compose.base.yml
       service: entrypoint.init_base
+    image: stoobly.${USER_ID}
     profiles:
       - test
-    volumes:
-      - ./dist:/home/stoobly/dist
 volumes: {}

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

@@ -1,12 +1,11 @@
 services:
   stoobly_ui.command:
-    build:
-      dockerfile: ../../.Dockerfile.context
-    command: ['${EXEC_COMMAND}', '${EXEC_ARGS}']
+    command: ['.stoobly/docker/stoobly-ui/exec/${EXEC_COMMAND}', '${EXEC_ARGS}']
     environment:
       EXEC_OPTIONS: ${EXEC_OPTIONS}
     extends:
       file: ../.docker-compose.base.yml
       service: stoobly_ui.base
+    image: stoobly.${USER_ID}
     profiles:
       - exec

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

@@ -6,5 +6,6 @@ workflow=$1
 stoobly-agent scaffold workflow logs \
   --app-dir-path "$(pwd)" \
   --dry-run \
+  --log-level warning \
   $extra_options \
   $workflow > .stoobly/tmp/run.sh

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

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+extra_options=$EXEC_OPTIONS
+workflow=$1
+
+stoobly-agent scaffold service list \
+  --app-dir-path "$(pwd)" \
+  --workflow $workflow \
+  $extra_options

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

@@ -1,11 +1,10 @@
 services:
   stoobly_ui.service:
-    build:
-      dockerfile: ../../.Dockerfile.context
     command: --ui-port 4200
     extends:
       file: ../.docker-compose.base.yml
       service: stoobly_ui.base
+    image: stoobly.${USER_ID}
     ports:
       - '4200:4200'
     profiles:

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

@@ -1,11 +1,10 @@
 services:
   stoobly_ui.service:
-    build:
-      dockerfile: ../../.Dockerfile.context
     command: --ui-port 4200
     extends:
       file: ../.docker-compose.base.yml
       service: stoobly_ui.base
+    image: stoobly.${USER_ID}
     ports:
       - '4200:4200'
     profiles:

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

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

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

@@ -1,7 +1,13 @@
 #!/bin/bash
 
-entrypoint=$(dirname -- "$0")/init
+# This file was automatically generated. DO NOT EDIT.
+# Any changes made to this file will be overwritten.
+
+if [ -n "$SERVICE_HOSTNAME" ] && [ "$SERVICE_SCHEME" = "https" ]; then
+  stoobly-agent ca-cert mkcert $SERVICE_HOSTNAME
+fi
 
+entrypoint=$(dirname -- "$0")/init
 if [ -e "$entrypoint" ]; then
   "$entrypoint"
 fi

stoobly_agent/app/cli/scaffold/templates/workflow/record/bin/.configure

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

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

@@ -1,7 +1,13 @@
 #!/bin/bash
 
-entrypoint=$(dirname -- "$0")/init
+# This file was automatically generated. DO NOT EDIT.
+# Any changes made to this file will be overwritten.
+
+if [ -n "$SERVICE_HOSTNAME" ] && [ "$SERVICE_SCHEME" = "https" ] ; then
+  stoobly-agent ca-cert mkcert $SERVICE_HOSTNAME
+fi
 
+entrypoint=$(dirname -- "$0")/init
 if [ -e "$entrypoint" ]; then
   "$entrypoint"
 fi

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

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

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

@@ -1,7 +1,13 @@
 #!/bin/bash
 
-entrypoint=$(dirname -- "$0")/init
+# This file was automatically generated. DO NOT EDIT.
+# Any changes made to this file will be overwritten.
+
+if [ -n "$SERVICE_HOSTNAME" ] && [ "$SERVICE_SCHEME" = "https" ]; then
+  stoobly-agent ca-cert mkcert $SERVICE_HOSTNAME
+fi
 
+entrypoint=$(dirname -- "$0")/init
 if [ -e "$entrypoint" ]; then
   "$entrypoint"
 fi

stoobly_agent/app/cli/scaffold/validate_command.py

@@ -35,7 +35,7 @@ class ValidateCommand():
     if logs and re.search('error', str(logs), re.IGNORECASE):
       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}")
+      raise ScaffoldValidateException(f"init container {init_container_name} exited with: {init_container.attrs['State']['ExitCode']}")
 
     configure_container = self.__get_container(configure_container_name)
 
@@ -43,7 +43,7 @@ class ValidateCommand():
     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}")
+      raise ScaffoldValidateException(f"configure container {configure_container_name} exited with: {configure_container.attrs['State']['ExitCode']}")
   
   def validate_detached(self, container: Container) -> None:
     print(f"Validating detached for: {container.name}")

stoobly_agent/app/cli/scaffold/workflow.py

@@ -33,14 +33,15 @@ class Workflow():
 
   @property
   def service_paths(self):
-    return self.app.service_paths
+    all_service_paths = self.app.service_paths
+    return list(filter(lambda path: os.path.exists(os.path.join(path, self.workflow_name)), all_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_dir = os.path.join(self.app.data_dir_path, self.app.scaffold_namespace)
 
     services = []
     for filename in os.listdir(services_dir):
@@ -56,5 +57,5 @@ class Workflow():
     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))
+    scaffold_namespace_path = self.app.scaffold_namespace_path
+    return list(map(lambda service: os.path.join(scaffold_namespace_path, service), services))

stoobly_agent/app/cli/scaffold/workflow_command.py

@@ -26,7 +26,7 @@ class WorkflowCommand(ServiceCommand):
   @property
   def compose_path(self):
     return os.path.join(
-      self.scaffold_dir_path,
+      self.data_dir_path,
       self.compose_relative_path
     )
 
@@ -70,7 +70,7 @@ class WorkflowCommand(ServiceCommand):
   @property
   def custom_compose_path(self):
     return os.path.join(
-      self.scaffold_dir_path,
+      self.data_dir_path,
       self.custom_compose_relative_path
     )
 
@@ -114,7 +114,7 @@ class WorkflowCommand(ServiceCommand):
   @property
   def workflow_path(self):
     return os.path.join(
-      self.scaffold_dir_path,
+      self.data_dir_path,
       self.workflow_relative_path
     )
 

stoobly_agent/app/cli/scaffold/workflow_create_command.py

@@ -17,7 +17,6 @@ CORE_WORKFLOWS = [WORKFLOW_MOCK_TYPE, WORKFLOW_RECORD_TYPE, WORKFLOW_TEST_TYPE]
 
 class BuildOptions(TypedDict):
   builder_class: type 
-  headless: bool
   service_builder: ServiceBuilder
   template: WORKFLOW_TEMPLATE
   workflow_decorators: List[Union[MockDecorator, ReverseProxyDecorator]]

stoobly_agent/app/cli/scaffold/workflow_run_command.py

@@ -12,42 +12,47 @@ from stoobly_agent.lib.logger import Logger
 from .app import App
 from .constants import (
   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
+  SERVICE_DNS_ENV, SERVICE_NAME_ENV, USER_ID_ENV, WORKFLOW_NAME_ENV, WORKFLOW_NAMESPACE_ENV
 )
+from .docker.constants import DOCKERFILE_CONTEXT
 from .workflow_command import WorkflowCommand
 from .workflow_env import WorkflowEnv
 
 LOG_ID = 'WorkflowRunCommand'
 
-class UpOptions(TypedDict):
-  attached: bool
+class ComposeOptions(TypedDict):
   namespace: str
-  no_cache: bool
+  user_id: str
+
+class BuildOptions(ComposeOptions):
+  user_id: str
   verbose: bool
 
+class DownOptions(ComposeOptions):
+  extra_compose_path: str
+  rmi: bool
+
+class UpOptions(ComposeOptions):
+  attached: bool
+  extra_compose_path: str
+  pull: bool
+
 class WorkflowRunCommand(WorkflowCommand):
   def __init__(self, app: App, **kwargs):
     super().__init__(app, **kwargs)
 
     self.__current_working_dir = os.getcwd()
-    self.__ca_certs_dir_path = app.ca_certs_dir_path
-    self.__certs_dir_path = app.certs_dir_path
-    self.__context_dir_path = app.context_dir_path
-    self.__extra_compose_path = kwargs.get('extra_compose_path')
+    self.__ca_certs_dir_path = kwargs.get('ca_certs_dir_path') or app.ca_certs_dir_path
+    self.__certs_dir_path = kwargs.get('certs_dir_path') or app.certs_dir_path
+    self.__context_dir_path = kwargs.get('context_dir_path') or app.context_dir_path
     self.__network = kwargs.get('network') or self.app_config.network
 
   @property
   def ca_certs_dir_path(self):
-    if not os.path.exists(self.__ca_certs_dir_path):
-      os.makedirs(self.__ca_certs_dir_path)
-
     return self.__ca_certs_dir_path
 
   @property
   def certs_dir_path(self):
-    if not os.path.exists(self.__certs_dir_path):
-      os.makedirs(self.__certs_dir_path)
-
     return self.__certs_dir_path
 
   @property
@@ -66,10 +71,6 @@ class WorkflowRunCommand(WorkflowCommand):
   def current_working_dir(self, v):
     self.__current_working_dir = v
 
-  @property
-  def extra_compose_path(self):
-    return self.__extra_compose_path
-
   @property
   def nameservers(self):
     path = self.nameservers_path
@@ -88,17 +89,43 @@ class WorkflowRunCommand(WorkflowCommand):
   def network(self):
     return self.__network
 
+  def create_image(self, **options: BuildOptions):
+    relative_namespace_path = os.path.relpath(self.scaffold_namespace_path, self.__current_working_dir)
+    dockerfile_path = os.path.join(relative_namespace_path, DOCKERFILE_CONTEXT)
+    user_id = options['user_id'] or os.getuid()
+    
+    command = ['docker', 'build']
+    command.append(f"-f {dockerfile_path}")
+    command.append(f"-t stoobly.{user_id}")
+    command.append(f"--build-arg USER_ID={user_id}")
+
+    if not os.environ.get('STOOBLY_IMAGE_USE_LOCAL'):
+      command.append('--pull')
+
+    if not options.get('verbose'):
+      command.append('--quiet')
+
+    # To avoid large context transfer times, should be a folder with relatively low number of files
+    command.append(relative_namespace_path) 
+
+    return ' '.join(command)
+
+  def remove_image(self, user_id: str = None):
+    user_id = user_id or os.getuid()
+    command = ['docker', 'rmi', f"stoobly.{user_id}", '&>', '/dev/null']
+    command.append('|| true')
+    return ' '.join(command)
+
   def create_network(self):
-    return f"docker network create {self.network} 2> /dev/null"
+    return f"docker network create {self.network} &> /dev/null"
 
   def remove_network(self):
-    return f"docker network rm {self.network} > /dev/null"
+    return f"docker network rm {self.network} &> /dev/null || true"
 
   def up(self, **options: UpOptions):
     if not os.path.exists(self.compose_path):
       return ''
 
-    build_command = ['docker', 'compose']
     command = ['COMPOSE_IGNORE_ORPHANS=true', 'docker', 'compose']
     command_options = []
 
@@ -123,27 +150,24 @@ class WorkflowRunCommand(WorkflowCommand):
 
       command_options.append(f"-f {os.path.relpath(self.custom_compose_path, self.__current_working_dir)}")
 
-    if self.extra_compose_path:
-      command_options.append(f"-f {os.path.relpath(self.extra_compose_path, self.__current_working_dir)}")
+    if options.get('extra_compose_path'):
+      command_options.append(f"-f {os.path.relpath(options['extra_compose_path'], self.__current_working_dir)}")
 
     command_options.append(f"--profile {self.workflow_name}") 
 
-    if options.get('namespace'):
-      command_options.append(f"-p {options['namespace']}")
-
-    build_command += command_options
-    build_command.append('build')
-    build_command.append('--pull')
-
-    if not options.get('verbose'):
-      build_command.append('--quiet')
-
-    if options.get('no_cache'):
-      build_command.append('--no-cache')
+    if not options.get('namespace'):
+      options['namespace'] = self.workflow_name
+    command_options.append(f"-p {options['namespace']}")
 
     command += command_options
     command.append('up')
 
+    if options.get('build'):
+      command.append('--build')
+
+    if options.get('pull'):
+      command.append('--pull missing')
+
     if not options.get('attached'):
       command.append('-d')
     else:
@@ -159,11 +183,11 @@ class WorkflowRunCommand(WorkflowCommand):
       # Otherwise, even if a service exits with a non-zero exit code, exit code 0 is returned
       command.append(option)
 
-    self.write_env()
+    self.write_env(**options)
 
-    return ' && '.join([' '.join(build_command), ' '.join(command)]) 
+    return ' '.join(command)
 
-  def down(self, **options):
+  def down(self, **options: DownOptions):
     if not os.path.exists(self.compose_path):
       return ''
   
@@ -176,18 +200,21 @@ class WorkflowRunCommand(WorkflowCommand):
     if self.custom_services:
       command.append(f"-f {os.path.relpath(self.custom_compose_path, self.__current_working_dir)}")
 
-    if self.extra_compose_path:
-      command.append(f"-f {os.path.relpath(self.extra_compose_path, self.__current_working_dir)}")
+    if options.get('extra_compose_path'):
+      command.append(f"-f {os.path.relpath(options['extra_compose_path'], self.__current_working_dir)}")
 
     command.append(f"--profile {self.workflow_name}") 
 
-    if options.get('namespace'):
-      command.append(f"-p {options['namespace']}")
+    if not options.get('namespace'):
+      options['namespace'] = self.workflow_name
+    command.append(f"-p {options['namespace']}")
 
     command.append('down')
 
     if options.get('rmi'):
-      command.append(f"--rmi local")
+      command.append('--rmi local')
+
+    self.write_env(**options)
 
     return ' '.join(command)
 
@@ -212,14 +239,20 @@ class WorkflowRunCommand(WorkflowCommand):
       if nameservers:
         fp.write("\n".join(nameservers))
 
-  def write_env(self):
+  def write_env(self, **options: ComposeOptions):
+    namespace = options.get('namespace')
+    user_id = options.get('user_id')
+
     _config = {}
     _config[CA_CERTS_DIR_ENV] = self.ca_certs_dir_path
     _config[CERTS_DIR_ENV] = self.certs_dir_path
     _config[CONTEXT_DIR_ENV] = self.context_dir_path
     _config[SERVICE_NAME_ENV] = self.service_name
-    _config[USER_ID_ENV] = os.getuid()
+    _config[USER_ID_ENV] = user_id or os.getuid()
     _config[WORKFLOW_NAME_ENV] = self.workflow_name
+    
+    if namespace:
+      _config[WORKFLOW_NAMESPACE_ENV] = namespace
 
     if self.network:
       _config[APP_NETWORK_ENV] = self.network