stoobly-agent 1.10.5__py3-none-any.whl → 1.10.6__py3-none-any.whl

stoobly_agent/__init__.py

@@ -1,2 +1,2 @@
 COMMAND = 'stoobly-agent'
-VERSION = '1.10.5'
+VERSION = '1.10.6'

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

@@ -435,6 +435,11 @@ class DockerWorkflowRunCommand(WorkflowRunCommand):
     if folder != self.workflow_name:
       workflow_name = file_name.split(self.timestamp_file_extension)[0]
 
+    # If the workflow is namespaced, allow it to run at the same time
+    # Same workflow with same namespace is allowed, workflow will be restarted
+    if workflow_name == self.workflow_name:
+      return
+
     Logger.instance(LOG_ID).error(f"Workflow '{workflow_name}' is running, please stop it first.")
 
     if folder != workflow_name:

stoobly_agent/app/cli/scaffold/local/workflow/run_command.py

@@ -283,9 +283,16 @@ class LocalWorkflowRunCommand(WorkflowRunCommand):
     else:
       file_name = os.path.basename(pid_file_path)
       workflow_name = self.workflow_name
+
+      # If the folder is not the same as the workflow name, then the workflow is namespaced, get the real workflow name
       if folder != self.workflow_name:
         workflow_name = file_name.split(self.pid_file_extension)[0]
 
+      # If the workflow is namespaced, allow it to run at the same time
+      # Same workflow with same namespace is covered by pid_file_path check
+      if workflow_name == self.workflow_name:
+        return
+
       Logger.instance(LOG_ID).error(f"Workflow {workflow_name} is already running with PID {pid}")
 
       if folder != workflow_name:

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

@@ -110,10 +110,10 @@ intercept/disable:
 intercept/enable:
 	@export EXEC_COMMAND=intercept/.enable EXEC_OPTIONS="" EXEC_ARGS=$(scenario_key) && \
 	$(stoobly_exec)
-mock: workflow/mock ca-cert/install workflow/up nameservers workflow/hostname/install workflow/run
+mock: workflow/mock ca-cert/install workflow/up nameservers workflow/hostname/install workflow/up/run
 mock/services: workflow/mock workflow/services
-mock/logs: workflow/mock workflow/logs workflow/run
-mock/down: workflow/mock workflow/down workflow/run workflow/hostname/uninstall
+mock/logs: workflow/mock workflow/logs workflow/logs/run
+mock/down: workflow/mock workflow/down workflow/down/run workflow/hostname/uninstall
 pipx/install:
 	@if ! command -v pipx >/dev/null 2>&1; then \
 		echo "pipx is not installed. Installing pipx..."; \
@@ -124,10 +124,10 @@ python/validate:
 		echo "Error: Python 3.10, 3.11, or 3.12 is required."; \
 		exit 1; \
 	fi
-record: workflow/record ca-cert/install workflow/up nameservers workflow/hostname/install workflow/run
-record/down: workflow/record workflow/down workflow/run workflow/hostname/uninstall
+record: workflow/record ca-cert/install workflow/up nameservers workflow/hostname/install workflow/up/run
+record/down: workflow/record workflow/down workflow/down/run workflow/hostname/uninstall
 record/services: workflow/record workflow/services
-record/logs: workflow/record workflow/logs workflow/run
+record/logs: workflow/record workflow/logs workflow/logs/run
 scenario/create:
 # Create a scenario
 	@export EXEC_COMMAND=scenario/.create EXEC_OPTIONS="$(options)" EXEC_ARGS="$(name)" && \
@@ -157,15 +157,17 @@ stoobly/install: python/validate pipx/install
 		echo "stoobly-agent not found. Installing..."; \
 		pipx install stoobly-agent || { echo "Failed to install stoobly-agent"; exit 1; }; \
 	fi
-test: workflow/test workflow/up workflow/run
+test: workflow/test workflow/up workflow/up/run
 test/services: workflow/test workflow/services
-test/logs: workflow/test workflow/logs workflow/run
-test/down: workflow/test workflow/down workflow/run
+test/logs: workflow/test workflow/logs workflow/logs/run
+test/down: workflow/test workflow/down workflow/down/run
 tmpdir:
 	@mkdir -p $(app_tmp_dir)
 workflow/down: dotenv
 	@export EXEC_COMMAND=scaffold/.down EXEC_OPTIONS="$(workflow_down_options) $(workflow_run_options) $(options)" EXEC_ARGS="$(workflow)" && \
 	$(stoobly_exec_run)
+workflow/down/run:
+	@bash "$(app_dir)/$(workflow_script)"
 workflow/hostname: stoobly/install
 	@if [ -n "$$STOOBLY_HOSTNAME_INSTALL_CONFIRM" ]; then \
 		confirm="$$STOOBLY_HOSTNAME_INSTALL_CONFIRM"; \
@@ -187,14 +189,14 @@ workflow/hostname/uninstall: action/uninstall workflow/hostname
 workflow/logs:
 	@export EXEC_COMMAND=scaffold/.logs EXEC_OPTIONS="$(workflow_log_options) $(workflow_run_options) $(options)" EXEC_ARGS="$(workflow)" && \
 	$(stoobly_exec_run)
+workflow/logs/run:
+	@bash "$(app_dir)/$(workflow_script)"
 workflow/mock:
 	$(eval workflow=mock)
 workflow/namespace: tmpdir
 	@mkdir -p $(workflow_namespace_dir)
 workflow/record:
 	$(eval workflow=record)
-workflow/run:
-	@bash "$(app_dir)/$(workflow_script)"
 workflow/services:
 	@export EXEC_COMMAND=scaffold/.services EXEC_OPTIONS="$(workflow_service_options) $(options)" EXEC_ARGS="$(workflow)" && \
 	$(stoobly_exec_run)
@@ -203,3 +205,5 @@ workflow/test:
 workflow/up: dotenv
 	@export EXEC_COMMAND=scaffold/.up EXEC_OPTIONS="$(workflow_up_options) $(workflow_run_options) $(options)" EXEC_ARGS="$(workflow)" && \
 	$(stoobly_exec_run)
+workflow/up/run:
+	@bash "$(app_dir)/$(workflow_script)"

{stoobly_agent-1.10.5.dist-info → stoobly_agent-1.10.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: stoobly-agent
-Version: 1.10.5
+Version: 1.10.6
 Summary: Record, mock, and test HTTP(s) requests. CLI agent for Stoobly
 License: Apache-2.0
 License-File: LICENSE

{stoobly_agent-1.10.5.dist-info → stoobly_agent-1.10.6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-stoobly_agent/__init__.py,sha256=sxrNGBqNJn6xpatZ-k8nV1eIVOpFpk1_oBfoMJlWMWA,45
+stoobly_agent/__init__.py,sha256=CjtLB5bT2uBXBd0Xa_QPnx4Folf55LeK5oi441a3lco,45
 stoobly_agent/__main__.py,sha256=tefOkFZeCFU4l3C-Y4R_lR9Yt-FETISiXGUnbh6Os54,146
 stoobly_agent/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/api/__init__.py,sha256=NIgcbX7iiWrApsCITXlmhr4SYbWS0fwb01x-F3jTFdo,666
@@ -95,7 +95,7 @@ stoobly_agent/app/cli/scaffold/docker/workflow/dns_decorator.py,sha256=DGaSlbOvA
 stoobly_agent/app/cli/scaffold/docker/workflow/local_decorator.py,sha256=xp1TmP8drOyl9Zhm5B1ci6NqPqRFDr2yxipmvSljgiE,717
 stoobly_agent/app/cli/scaffold/docker/workflow/mock_decorator.py,sha256=QO1TbAj6QthIyHvy7itV_d9NteNcjClYaan1GX-0kLc,1201
 stoobly_agent/app/cli/scaffold/docker/workflow/reverse_proxy_decorator.py,sha256=tSPnscsBZusBaSt_NlB4exrZ2MnWMRAUJgw_NaEdHiw,1199
-stoobly_agent/app/cli/scaffold/docker/workflow/run_command.py,sha256=aqRVHTbCooan8zTMfKjxEjssf255YTEdLzoPUXna29o,18010
+stoobly_agent/app/cli/scaffold/docker/workflow/run_command.py,sha256=LLiC7KCgo9ZlmXcdaidmcN449GuDK_8dYykCNFjfhyo,18217
 stoobly_agent/app/cli/scaffold/env.py,sha256=dT33tHoQaUxfsFCYm8kfaAv-qPVrUPmNFQmLnFQhZeQ,1107
 stoobly_agent/app/cli/scaffold/hosts_file_manager.py,sha256=zNX5wh6zXQ4J2BA0YYdD7_CPqDz02b_ghXsY3oTjjB4,4999
 stoobly_agent/app/cli/scaffold/local/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -103,7 +103,7 @@ stoobly_agent/app/cli/scaffold/local/service/__init__.py,sha256=47DEQpj8HBSa-_TI
 stoobly_agent/app/cli/scaffold/local/service/builder.py,sha256=uZNPIQWo4UcLy3bcE6Wvntle6ONPpWjS5oAq3g0Punk,1852
 stoobly_agent/app/cli/scaffold/local/workflow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 stoobly_agent/app/cli/scaffold/local/workflow/builder.py,sha256=O8Iwyd231-ciQWkiGB5HAiFJXMDUtXIoyl0S_Jrj3lQ,806
-stoobly_agent/app/cli/scaffold/local/workflow/run_command.py,sha256=BJrG5g-c4kf_cgQ1hE41KUKQsvtwVVKzaTgQ7eCaPUk,15625
+stoobly_agent/app/cli/scaffold/local/workflow/run_command.py,sha256=7XhI6X-TKAGv-HuOvh6Knm7R5DDpfi8ZZ8BJnHQwGtY,15956
 stoobly_agent/app/cli/scaffold/managed_services_docker_compose.py,sha256=-wLBXUi7DCWsfm5KzZzd_kdJKOTl1NT924XR7dyjbSY,574
 stoobly_agent/app/cli/scaffold/service.py,sha256=74JwjTRRkk6lo-k9hre1iGztbKa9zDqjPVx3Qgpze-s,699
 stoobly_agent/app/cli/scaffold/service_command.py,sha256=j-lkG5Zth_CBHa6Z9Kv3dJwxX9gylFBZMZbW691R8ZU,1480
@@ -117,7 +117,7 @@ stoobly_agent/app/cli/scaffold/service_workflow.py,sha256=sQ_Edy_wGHKMXpD0DmhnOW
 stoobly_agent/app/cli/scaffold/service_workflow_validate_command.py,sha256=DPYLBAwUsh4C8ho-4SwjBe32xuBSUpWlWgRF9JIbKRc,11768
 stoobly_agent/app/cli/scaffold/templates/__init__.py,sha256=x8C_a0VoO_vUbosp4_6IC1U7Ge9NnUdVKDPpVMtMkeY,171
 stoobly_agent/app/cli/scaffold/templates/app/.Dockerfile.context,sha256=9DQK-OXnRKjjKWsUSIRAio6dkR4eGxD1vizPT7Q5sp8,159
-stoobly_agent/app/cli/scaffold/templates/app/.Makefile,sha256=9E46Dzs3xCKy2fP6L6Q4DxourYxrwKCcoUhEf3Y7DEs,9619
+stoobly_agent/app/cli/scaffold/templates/app/.Makefile,sha256=6zIVTZl23rLR8jetIr76B1dXi_Zy1SUMGZok6BTaa4A,9777
 stoobly_agent/app/cli/scaffold/templates/app/.docker-compose.base.yml,sha256=SABod6_InBFyOm-uulK7r27SR0sWRUiL0h69g_jvNJA,249
 stoobly_agent/app/cli/scaffold/templates/app/.docker-compose.networks.yml,sha256=I4PbJpQjFHb5IbAUWNvYM6okDEtmwtKFDQg-yog05WM,141
 stoobly_agent/app/cli/scaffold/templates/app/Makefile,sha256=TEmPG7Bf0KZOnmfsgdzza3UdwcVMmM5Lj1YdLc4cgjA,79
@@ -797,8 +797,8 @@ stoobly_agent/test/mock_data/scaffold/docker-compose-local-service.yml,sha256=1W
 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=6v4AHeqYPw7vtRoxET_ubmRWPJoSmTR_DVHay3FxNbQ,1299
-stoobly_agent-1.10.5.dist-info/METADATA,sha256=7QB_Saw0H6Pz_qkMRM9HKiXta5p-noQJIMFN5lGVm4g,3203
-stoobly_agent-1.10.5.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-stoobly_agent-1.10.5.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
-stoobly_agent-1.10.5.dist-info/licenses/LICENSE,sha256=o93sj12cdoEOsTCjPaPFsw3Xq0SXs3pPcY-9reE2sEw,548
-stoobly_agent-1.10.5.dist-info/RECORD,,
+stoobly_agent-1.10.6.dist-info/METADATA,sha256=lhF6K4LrkdmPLu3ze3whqIrmF9V1yWQJO4qPrF3OAlY,3203
+stoobly_agent-1.10.6.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+stoobly_agent-1.10.6.dist-info/entry_points.txt,sha256=aq5wix5oC8MDQtmyPGU0xaFrsjJg7WH28NmXh2sc3Z8,56
+stoobly_agent-1.10.6.dist-info/licenses/LICENSE,sha256=o93sj12cdoEOsTCjPaPFsw3Xq0SXs3pPcY-9reE2sEw,548
+stoobly_agent-1.10.6.dist-info/RECORD,,