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

stoobly_agent/__init__.py

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

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
 
@@ -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'):
@@ -273,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/test/app/models/schemas/.stoobly/db/VERSION

@@ -1 +1 @@
-1.6.0
+1.6.1

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: stoobly-agent
-Version: 1.6.0
+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.6.0.dist-info → stoobly_agent-1.6.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-stoobly_agent/__init__.py,sha256=TM4vLT3nBQHUT5LNq3_-gdGwhi2Hi7Wi03PL9m0OyhU,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
@@ -195,7 +195,7 @@ stoobly_agent/app/cli/scaffold/workflow_copy_command.py,sha256=R9hh5dWVz7vGld7pE
 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=RxedzSKZu3W-vfrX7NQuVoPUrUTbXaPFzb_QE26c3eU,9933
+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=AoWqSRXXQrqK0YeSHLJkNRTOC23PHrjJBNrq_A8KZnc,28316
 stoobly_agent/app/cli/scenario_cli.py,sha256=3J1EiJOvunkfWrEkOsanw-XrKkOk78ij_GjBlE9p7CE,8229
@@ -697,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=ViNosgpkvpVlG7gka3Qg9_zlVTjf-Zmu-qeGYqFNDTk,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
@@ -738,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.6.0.dist-info/LICENSE,sha256=o93sj12cdoEOsTCjPaPFsw3Xq0SXs3pPcY-9reE2sEw,548
-stoobly_agent-1.6.0.dist-info/METADATA,sha256=PLIHPqK1X6t0ryAPpFqbk-mDEeaxzBmsl-QYeZVIQRo,3087
-stoobly_agent-1.6.0.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-stoobly_agent-1.6.0.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
-stoobly_agent-1.6.0.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,,