stoobly-agent 1.10.1__py3-none-any.whl → 1.10.2__py3-none-any.whl

stoobly_agent/app/cli/scaffold/workflow_create_command.py

@@ -4,21 +4,21 @@ import shutil
 
 from typing import List, TypedDict, Union
 
+from stoobly_agent.app.cli.scaffold.local.service.builder import ServiceBuilder
+
 from .app import App
-from .constants import WORKFLOW_TEMPLATE_OPTION
-from .docker.service.builder import ServiceBuilder
-from .docker.workflow.mock_decorator import MockDecorator
-from .docker.workflow.reverse_proxy_decorator import ReverseProxyDecorator
-from .docker.workflow.builder import WorkflowBuilder
+from .constants import RUN_ON_DOCKER, WORKFLOW_TEMPLATE_OPTION
+from .docker.service.builder import DockerServiceBuilder
+
+from .docker.workflow.builder import DockerWorkflowBuilder
 from .templates.factory import custom_files, maintained_files
+from .local.workflow.builder import WorkflowBuilder
 from .workflow_command import WorkflowCommand
 
-
 class BuildOptions(TypedDict):
-  builder_class: type 
-  service_builder: ServiceBuilder
+  service_builder: DockerServiceBuilder
   template: WORKFLOW_TEMPLATE_OPTION
-  workflow_decorators: List[Union[MockDecorator, ReverseProxyDecorator]]
+  workflow_decorators: list
 
 class WorkflowCreateCommand(WorkflowCommand):
 
@@ -40,6 +40,11 @@ class WorkflowCreateCommand(WorkflowCommand):
   def force(self):
     return self.__force
 
+  @property
+  def create_docker_files(self):
+    """Determine if Docker files should be created based on app config run-on setting."""
+    return RUN_ON_DOCKER in self.app_config.run_on
+
   def build(self, **kwargs: BuildOptions):
     # Create workflow folder
     dest = os.path.join(self.workflow_path)
@@ -49,8 +54,23 @@ class WorkflowCreateCommand(WorkflowCommand):
     if not os.path.exists(dest):
       os.makedirs(dest) 
 
-    # Create workflow maintained compose file
-    workflow_builder = self.__write_docker_compose_file(**kwargs)
+    service_builder = kwargs.get('service_builder')
+    workflow_builder = None
+
+    # Create workflow maintained compose file only if Docker files are enabled
+    if self.create_docker_files:
+      if not service_builder:
+        service_builder = DockerServiceBuilder(self.service_config)
+        service_builder.load()
+
+      workflow_builder = DockerWorkflowBuilder(self.workflow_path, service_builder)
+      workflow_builder.build(kwargs.get('workflow_decorators'))
+    else:
+      if not service_builder:
+        service_builder = ServiceBuilder(self.service_config)
+
+      workflow_builder = WorkflowBuilder(self.workflow_path, service_builder)
+    
     self.__copy_templates(workflow_builder, kwargs.get('template'))
 
     if not self.workflow_config.empty:
@@ -76,21 +96,3 @@ class WorkflowCreateCommand(WorkflowCommand):
     custom_workflow_files = custom_files(template or self.workflow_name, workflow_builder)
     self.copy_files_no_replace(templates_path, custom_workflow_files, self.workflow_path)
 
-  def __write_docker_compose_file(self, **kwargs: BuildOptions):
-    builder_class = kwargs.get('builder_class') or WorkflowBuilder
-    service_builder = kwargs.get('service_builder') 
-    if not service_builder:
-      service_builder = ServiceBuilder(self.service_config)
-      service_builder.load()
-    workflow_decorators: List[Union[MockDecorator, ReverseProxyDecorator]] = kwargs.get('workflow_decorators')
-
-    workflow_builder = builder_class(self.workflow_path, service_builder)
-    workflow_builder.build_all()
-
-    if isinstance(workflow_decorators, list):
-      for workflow_decorator in workflow_decorators:
-        workflow_decorator(workflow_builder).decorate()
-
-    workflow_builder.write()
-
-    return workflow_builder

stoobly_agent/app/cli/scaffold/workflow_run_command.py

@@ -4,9 +4,7 @@ import pdb
 import subprocess
 import re
 
-
 from stoobly_agent.config.data_dir import DataDir
-from stoobly_agent.lib.logger import Logger
 
 from .app import App
 from .constants import (
@@ -14,11 +12,11 @@ from .constants import (
   SERVICE_DNS_ENV, SERVICE_NAME_ENV, SERVICE_SCRIPTS_DIR,  SERVICE_SCRIPTS_ENV, USER_ID_ENV, 
   WORKFLOW_NAME_ENV, WORKFLOW_NAMESPACE_ENV, WORKFLOW_SCRIPTS_DIR, WORKFLOW_SCRIPTS_ENV, WORKFLOW_TEMPLATE_ENV
 )
-from .docker.constants import APP_EGRESS_NETWORK_TEMPLATE, APP_INGRESS_NETWORK_TEMPLATE, DOCKERFILE_CONTEXT
+
 from .workflow_command import WorkflowCommand
 from .workflow_env import WorkflowEnv
 from .workflow_namesapce import WorkflowNamespace
-from ..types.workflow_run_command import BuildOptions, ComposeOptions, DownOptions, UpOptions
+from ..types.workflow_run_command import ComposeOptions
 
 LOG_ID = 'WorkflowRunCommand'
 
@@ -31,8 +29,12 @@ class WorkflowRunCommand(WorkflowCommand):
     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.__dry_run = kwargs.get('dry_run', False)
     self.__namespace = kwargs.get('namespace') or self.workflow_name
-    self.__network = f"{self.__namespace}.{kwargs.get('network') or app.network}"
+    self.__network = f"{self.__namespace}.{app.network}"
+    self.__workflow_namespace = kwargs.get('workflow_namespace') or WorkflowNamespace(app, self.__namespace)
+
+    self.__workflow_namespace.copy_dotenv()
     
   @property
   def app_dir_path(self):
@@ -49,7 +51,7 @@ class WorkflowRunCommand(WorkflowCommand):
   @property
   def context_dir_path(self):
     if not self.__context_dir_path:
-      data_dir = DataDir.instance()
+      data_dir: DataDir = DataDir.instance()
       return os.path.dirname(data_dir.path) 
 
     return self.__context_dir_path
@@ -64,7 +66,11 @@ class WorkflowRunCommand(WorkflowCommand):
 
   @property
   def dotenv_path(self):
-    return WorkflowNamespace(self.app, self.namespace).dotenv_path
+    return self.__workflow_namespace.dotenv_path
+
+  @property
+  def dry_run(self):
+    return self.__dry_run
 
   @property
   def nameservers(self):
@@ -78,7 +84,7 @@ class WorkflowRunCommand(WorkflowCommand):
 
   @property
   def nameservers_path(self):
-    return WorkflowNamespace(self.app, self.namespace).nameservers_path
+    return self.__workflow_namespace.nameservers_path
 
   @property
   def namespace(self):
@@ -88,149 +94,6 @@ 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_egress_network(self):
-    return f"docker network create {APP_EGRESS_NETWORK_TEMPLATE.format(network=self.network)} &> /dev/null"
-
-  def create_ingress_network(self):
-    return f"docker network create {APP_INGRESS_NETWORK_TEMPLATE.format(network=self.network)} &> /dev/null"
-
-  def remove_egress_network(self):
-    return f"docker network rm {APP_EGRESS_NETWORK_TEMPLATE.format(network=self.network)} &> /dev/null || true"
-
-  def remove_ingress_network(self):
-    return f"docker network rm {APP_INGRESS_NETWORK_TEMPLATE.format(network=self.network)} &> /dev/null || true"
-
-  def up(self, **options: UpOptions):
-    if not os.path.exists(self.compose_path):
-      return ''
-
-    command = ['COMPOSE_IGNORE_ORPHANS=true', 'docker', 'compose']
-    command_options = []
-
-    # Add docker compose file
-    command_options.append(f"-f {os.path.relpath(self.compose_path, self.__current_working_dir)}")
-
-    # Add docker compose networks file
-    command_options.append(f"-f {os.path.relpath(self.networks_compose_path, os.getcwd())}")
-
-    # Add custom docker compose file
-    custom_services = self.custom_services
-    if custom_services:
-      uses_profile = False
-      for service_name in custom_services:
-        service = custom_services[service_name]
-        profiles = service.get('profiles')
-        if isinstance(profiles, list):
-          if self.workflow_name in profiles:
-            uses_profile = True
-            break
-      if not uses_profile:
-        # 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")
-
-      compose_file_path = os.path.relpath(self.custom_compose_path, self.__current_working_dir)
-      command_options.append(f"-f {compose_file_path}")
-
-    if options.get('extra_compose_path'):
-      compose_file_path = os.path.relpath(options['extra_compose_path'], self.__current_working_dir)
-      command_options.append(f"-f {compose_file_path}")
-
-    command_options.append(f"--profile {self.workflow_name}") 
-
-    if not options.get('namespace'):
-      options['namespace'] = self.workflow_name
-    command_options.append(f"-p {options['namespace']}")
-
-    command += command_options
-    command.append('up')
-
-    if not options.get('no_build'):
-      command.append('--build')
-
-    if options.get('pull'):
-      command.append('--pull missing')
-
-    if not options.get('attached'):
-      command.append('-d')
-    else:
-      major_version = 2
-      minor_version = 27
-      patch_version = 0
-      min_version = major_version * 10000 + minor_version * 100 + patch_version
-      formula = "'{print $1*10000 + $2*100 + $3}'"
-      option = f"$(test $(echo $(docker compose version --short) | awk -F. {formula}) -ge {min_version} && echo '--abort-on-container-failure')"
-
-      # This option enables docker compose to return exit code 1 
-      # when one of the services exits with a non-zero exit code
-      # Otherwise, even if a service exits with a non-zero exit code, exit code 0 is returned
-      command.append(option)
-
-    self.write_env(**options)
-
-    return ' '.join(command)
-
-  def down(self, **options: DownOptions):
-    if not os.path.exists(self.compose_path):
-      return ''
-  
-    command = ['docker', 'compose']
-
-    # Add docker compose file
-    command.append(f"-f {os.path.relpath(self.compose_path, os.getcwd())}")
-
-    # Add docker compose networks file
-    command.append(f"-f {os.path.relpath(self.networks_compose_path, os.getcwd())}")
-
-    # Add custom docker compose file
-    if self.custom_services:
-      command.append(f"-f {os.path.relpath(self.custom_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 not options.get('namespace'):
-      options['namespace'] = self.workflow_name
-    command.append(f"-p {options['namespace']}")
-
-    command.append('down')
-    command.append('--volumes')
-
-    if options.get('rmi'):
-      command.append('--rmi local')
-
-    self.write_env(**options)
-
-    return ' '.join(command)
-
   def write_nameservers(self):
     # If hostname is set then the service is external and we will need to configure the container's DNS.
     # If we don't configure the container's DNS, then Docker's embedded DNS will potentially
@@ -252,6 +115,10 @@ class WorkflowRunCommand(WorkflowCommand):
       if nameservers:
         fp.write("\n".join(nameservers))
 
+  @property
+  def workflow_namespace(self):
+    return self.__workflow_namespace
+
   def write_env(self, **options: ComposeOptions):
     namespace = options.get('namespace')
     user_id = options.get('user_id')